Skip to content

Commit a054818

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authored
Merge branch '2.4-develop' into AC-12593-2
2 parents ac6af9a + 672a2e6 commit a054818

File tree

14 files changed

+312
-212
lines changed

14 files changed

+312
-212
lines changed

‎app/code/Magento/AwsS3/Test/Unit/Driver/AwsS3Test.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,8 +439,8 @@ public function testSearchDirectory(): void
439439
$this->metadataProviderMock->expects(self::any())->method('getMetadata')
440440
->willReturnMap([
441441
['path', ['type' => AwsS3::TYPE_DIR]],
442-
['path/1', ['type' => AwsS3::TYPE_FILE]],
443-
['path/2', ['type' => AwsS3::TYPE_FILE]],
442+
['path/1', ['type' => AwsS3::TYPE_DIR]],
443+
['path/2', ['type' => AwsS3::TYPE_DIR]],
444444
]);
445445
$this->adapterMock->expects(self::atLeastOnce())->method('listContents')
446446
->willReturn(new \ArrayIterator($subPaths));

‎app/code/Magento/RemoteStorage/Driver/Adapter/CachedAdapter.php‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function __construct(
5050
}
5151

5252
/**
53-
* {@inheritdoc}
53+
* @inheritdoc
5454
*/
5555
public function write(string $path, string $contents, Config $config): void
5656
{
@@ -63,7 +63,7 @@ public function write(string $path, string $contents, Config $config): void
6363
}
6464

6565
/**
66-
* {@inheritdoc}
66+
* @inheritdoc
6767
*/
6868
public function writeStream(string $path, $contents, Config $config): void
6969
{
@@ -76,7 +76,7 @@ public function writeStream(string $path, $contents, Config $config): void
7676
}
7777

7878
/**
79-
* {@inheritdoc}
79+
* @inheritdoc
8080
*/
8181
public function move(string $source, string $destination, Config $config): void
8282
{
@@ -85,7 +85,7 @@ public function move(string $source, string $destination, Config $config): void
8585
}
8686

8787
/**
88-
* {@inheritdoc}
88+
* @inheritdoc
8989
*/
9090
public function copy(string $source, string $destination, Config $config): void
9191
{
@@ -94,7 +94,7 @@ public function copy(string $source, string $destination, Config $config): void
9494
}
9595

9696
/**
97-
* {@inheritdoc}
97+
* @inheritdoc
9898
*/
9999
public function delete(string $path): void
100100
{
@@ -103,7 +103,7 @@ public function delete(string $path): void
103103
}
104104

105105
/**
106-
* {@inheritdoc}
106+
* @inheritdoc
107107
*/
108108
public function deleteDirectory(string $path): void
109109
{
@@ -112,7 +112,7 @@ public function deleteDirectory(string $path): void
112112
}
113113

114114
/**
115-
* {@inheritdoc}
115+
* @inheritdoc
116116
*/
117117
public function createDirectory(string $path, Config $config): void
118118
{
@@ -123,7 +123,7 @@ public function createDirectory(string $path, Config $config): void
123123
}
124124

125125
/**
126-
* {@inheritdoc}
126+
* @inheritdoc
127127
*/
128128
public function setVisibility(string $path, string $visibility): void
129129
{
@@ -132,7 +132,7 @@ public function setVisibility(string $path, string $visibility): void
132132
}
133133

134134
/**
135-
* {@inheritdoc}
135+
* @inheritdoc
136136
*/
137137
public function fileExists(string $path): bool
138138
{
@@ -165,31 +165,31 @@ public function fileExists(string $path): bool
165165
}
166166

167167
/**
168-
* {@inheritdoc}
168+
* @inheritdoc
169169
*/
170170
public function read(string $path): string
171171
{
172172
return $this->adapter->read($path);
173173
}
174174

175175
/**
176-
* {@inheritdoc}
176+
* @inheritdoc
177177
*/
178178
public function readStream(string $path)
179179
{
180180
return $this->adapter->readStream($path);
181181
}
182182

183183
/**
184-
* {@inheritdoc}
184+
* @inheritdoc
185185
*/
186186
public function listContents(string $path, bool $deep): iterable
187187
{
188188
return $this->adapter->listContents($path, $deep);
189189
}
190190

191191
/**
192-
* {@inheritdoc}
192+
* @inheritdoc
193193
*/
194194
public function fileSize(string $path): FileAttributes
195195
{
@@ -198,7 +198,7 @@ public function fileSize(string $path): FileAttributes
198198
}
199199

200200
/**
201-
* {@inheritdoc}
201+
* @inheritdoc
202202
*/
203203
public function mimeType(string $path): FileAttributes
204204
{
@@ -207,7 +207,7 @@ public function mimeType(string $path): FileAttributes
207207
}
208208

209209
/**
210-
* {@inheritdoc}
210+
* @inheritdoc
211211
*/
212212
public function lastModified(string $path): FileAttributes
213213
{
@@ -216,11 +216,19 @@ public function lastModified(string $path): FileAttributes
216216
}
217217

218218
/**
219-
* {@inheritdoc}
219+
* @inheritdoc
220220
*/
221221
public function visibility(string $path): FileAttributes
222222
{
223223
$result = $this->metadataProvider->getMetadata($path);
224224
return new FileAttributes($path, null, $result['visibility']);
225225
}
226+
227+
/**
228+
* @inheritdoc
229+
*/
230+
public function directoryExists(string $path): bool
231+
{
232+
return $this->adapter->directoryExists($path);
233+
}
226234
}

‎app/code/Magento/RemoteStorage/Driver/Adapter/MetadataProvider.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function __construct(
5050
private function isDirectory($path): bool
5151
{
5252
try {
53-
return iterator_count($this->adapter->listContents($path, false)) > 0;
53+
return $this->adapter->directoryExists($path);
5454
} catch (\Throwable $e) {
5555
// catch closed iterator
5656
return false;

‎app/etc/di.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1858,6 +1858,7 @@
18581858
<arguments>
18591859
<argument name="supportedVersionPatterns" xsi:type="array">
18601860
<item name="MySQL-8" xsi:type="string">^8\.0\.</item>
1861+
<item name="MySQL-8.4" xsi:type="string">^8\.4\.</item>
18611862
<item name="MySQL-5.7" xsi:type="string">^5\.7\.</item>
18621863
<item name="MariaDB-(10.2-10.6)" xsi:type="string">^10\.[2-6]\.</item>
18631864
</argument>

‎composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"colinmollenhour/cache-backend-file": "^1.4",
3939
"colinmollenhour/cache-backend-redis": "^1.16",
4040
"colinmollenhour/credis": "^1.15",
41-
"colinmollenhour/php-redis-session-abstract": "^1.5",
41+
"colinmollenhour/php-redis-session-abstract": "^2.0",
4242
"composer/composer": "^2.0, !=2.2.16",
4343
"elasticsearch/elasticsearch": "~7.17.0 || ~8.5.0",
4444
"ezyang/htmlpurifier": "^4.17",
@@ -66,8 +66,8 @@
6666
"laminas/laminas-stdlib": "^3.11",
6767
"laminas/laminas-uri": "^2.9",
6868
"laminas/laminas-validator": "^2.23",
69-
"league/flysystem": "^2.4",
70-
"league/flysystem-aws-s3-v3": "^2.4",
69+
"league/flysystem": "^3.0",
70+
"league/flysystem-aws-s3-v3": "^3.0",
7171
"magento/composer": "^1.10.0-beta1",
7272
"magento/composer-dependency-version-audit-plugin": "^0.1",
7373
"magento/magento-composer-installer": ">=0.4.0",

0 commit comments

Comments
 (0)