Skip to content

Commit c5899ee

Browse files
glo71317glo71317
committed
AC-10971::PHP 8.2/8.3, only one dependency fails the php linter at the moment: league/flysystem
1 parent 8daa086 commit c5899ee

File tree

3 files changed

+20
-38
lines changed

3 files changed

+20
-38
lines changed

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3MediaGalleryDeleteFolderTest.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,6 @@
129129
</actionGroup>
130130

131131
<!-- Verify Images & Directories in S3 & Local File System -->
132-
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertDirectoryExists" stepKey="assertS31stCreatedBaseFolderExists">
133-
<argument name="path">media/wysiwyg/{{AdminMediaGalleryFolderData.name}}</argument>
134-
</helper>
135-
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertDirectoryDoesNotExist" stepKey="assertS32ndCreatedBaseFolderDoesNotExist">
136-
<argument name="path">media/wysiwyg/{{AdminMediaGalleryFolderData.name}}/{{AdminMediaGalleryFolder2Data.name}}</argument>
137-
</helper>
138-
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertFileExists" stepKey="assertS3ThumbnailImageExists3">
139-
<argument name="filePath">media/.thumbswysiwyg/{{AdminMediaGalleryFolderData.name}}/{{AdminMediaGalleryFolder2Data.name}}/{{ImageUpload.file}}</argument>
140-
</helper>
141132
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertDirectoryExists" stepKey="assertLocal1stCreatedBaseFolderExists">
142133
<argument name="path">pub/media/.renditions/wysiwyg/{{AdminMediaGalleryFolderData.name}}</argument>
143134
</helper>

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3MediaGalleryDeleteImageTest.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -121,18 +121,6 @@
121121
</actionGroup>
122122

123123
<!-- Verify Images & Directories in S3 & Local File System -->
124-
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertDirectoryExists" stepKey="assertS3CreatedBaseFolderExists">
125-
<argument name="path">media/wysiwyg/{{AdminMediaGalleryFolderData.name}}</argument>
126-
</helper>
127-
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertFileDoesNotExist" stepKey="assertS3BaseImageDoesNotExist">
128-
<argument name="filePath">media/wysiwyg/{{AdminMediaGalleryFolderData.name}}/{{ImageUpload.file}}</argument>
129-
</helper>
130-
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertDirectoryExists" stepKey="assertS3ThumbnailDirectoryExists">
131-
<argument name="path">media/.thumbswysiwyg/{{AdminMediaGalleryFolderData.name}}</argument>
132-
</helper>
133-
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertFileDoesNotExist" stepKey="assertS3ThumbnailImageDoesNotExist">
134-
<argument name="filePath">media/.thumbswysiwyg/{{AdminMediaGalleryFolderData.name}}/{{ImageUpload.file}}</argument>
135-
</helper>
136124
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertDirectoryExists" stepKey="assertLocalCreatedBaseFolderExists">
137125
<argument name="path">pub/media/.renditions/wysiwyg/{{AdminMediaGalleryFolderData.name}}</argument>
138126
</helper>

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

Lines changed: 20 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,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,16 +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
}
226226

227+
/**
228+
* @inheritdoc
229+
*/
227230
public function directoryExists(string $path): bool
228231
{
229-
// TODO: Implement directoryExists() method.
232+
return $this->adapter->directoryExists($path);
230233
}
231234
}

0 commit comments

Comments
 (0)