Skip to content

Commit ae9ea09

Browse files
committed
#AC-10721::Investigate the league/flysystem Composer dependencies upgrading to latest version- fixes for static and unit tests
1 parent 1f5c27a commit ae9ea09

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,10 +432,10 @@ public function testSearchDirectory(): void
432432
$expression = '/*';
433433
$path = 'path';
434434
$subPaths = [
435-
new \League\Flysystem\DirectoryAttributes('path/1/'),
436-
new \League\Flysystem\DirectoryAttributes('path/2/')
435+
new \League\Flysystem\DirectoryAttributes('path/1'),
436+
new \League\Flysystem\DirectoryAttributes('path/2')
437437
];
438-
$expectedResult = [self::URL . 'path/1/', self::URL . 'path/2/'];
438+
$expectedResult = [self::URL . 'path/1', self::URL . 'path/2'];
439439
$this->metadataProviderMock->expects(self::any())->method('getMetadata')
440440
->willReturnMap([
441441
['path', ['type' => AwsS3::TYPE_DIR]],

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

Lines changed: 17 additions & 17 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,7 +165,7 @@ public function fileExists(string $path): bool
165165
}
166166

167167
/**
168-
* {@inheritdoc}
168+
* @inheritdoc
169169
*/
170170
public function directoryExists(string $path): bool
171171
{
@@ -189,31 +189,31 @@ public function directoryExists(string $path): bool
189189

190190

191191
/**
192-
* {@inheritdoc}
192+
* @inheritdoc
193193
*/
194194
public function read(string $path): string
195195
{
196196
return $this->adapter->read($path);
197197
}
198198

199199
/**
200-
* {@inheritdoc}
200+
* @inheritdoc
201201
*/
202202
public function readStream(string $path)
203203
{
204204
return $this->adapter->readStream($path);
205205
}
206206

207207
/**
208-
* {@inheritdoc}
208+
* @inheritdoc
209209
*/
210210
public function listContents(string $path, bool $deep): iterable
211211
{
212212
return $this->adapter->listContents($path, $deep);
213213
}
214214

215215
/**
216-
* {@inheritdoc}
216+
* @inheritdoc
217217
*/
218218
public function fileSize(string $path): FileAttributes
219219
{
@@ -222,7 +222,7 @@ public function fileSize(string $path): FileAttributes
222222
}
223223

224224
/**
225-
* {@inheritdoc}
225+
* @inheritdoc
226226
*/
227227
public function mimeType(string $path): FileAttributes
228228
{
@@ -231,7 +231,7 @@ public function mimeType(string $path): FileAttributes
231231
}
232232

233233
/**
234-
* {@inheritdoc}
234+
* @inheritdoc
235235
*/
236236
public function lastModified(string $path): FileAttributes
237237
{
@@ -240,7 +240,7 @@ public function lastModified(string $path): FileAttributes
240240
}
241241

242242
/**
243-
* {@inheritdoc}
243+
* @inheritdoc
244244
*/
245245
public function visibility(string $path): FileAttributes
246246
{

0 commit comments

Comments
 (0)