Skip to content

Commit b18b0a0

Browse files
committed
#AC-10721::Investigate the league/flysystem Composer dependencies upgrading to latest version- fixes for mftf and static failures
1 parent a5ae492 commit b18b0a0

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

app/code/Magento/AwsS3/Driver/AwsS3.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -509,11 +509,7 @@ private function isTypeDirectory($path)
509509
private function directoryExists(string $path): bool
510510
{
511511
try {
512-
if($this->isTypeDirectory($path)) {
513-
return $this->adapter->directoryExists($path);
514-
} else {
515-
return $this->adapter->fileExists($path);
516-
}
512+
return $this->adapter->fileExists($path);
517513
} catch (Throwable $e) {
518514
// catch closed iterator
519515
return false;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
5959
</after>
6060

61-
61+
<magentoCLI command="remote-storage:sync" timeout="120" stepKey="syncRemoteStorage"/>
6262
<!-- Verify Images & Directories in S3 & Local File System -->
6363
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertFileExists" stepKey="assertS3BaseImageExists">
6464
<argument name="filePath">media/wysiwyg/{{AdminMediaGalleryFolderData.name}}/{{AdminMediaGalleryFolder2Data.name}}/{{ImageUpload.file}}</argument>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
5555
</after>
5656

57-
57+
<magentoCLI command="remote-storage:sync" timeout="120" stepKey="syncRemoteStorage"/>
5858
<!-- Verify Images & Directories in S3 & Local File System -->
5959
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertFileExists" stepKey="assertS3BaseImageExists">
6060
<argument name="filePath">media/wysiwyg/{{AdminMediaGalleryFolderData.name}}/{{ImageUpload.file}}</argument>

lib/internal/Magento/Framework/Filesystem/ExtendedDriverInterface.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
* Provides extension for Driver interface.
1414
*
1515
* @see DriverInterface
16-
*
17-
* @deprecated Method will be moved to DriverInterface
18-
* @see DriverInterface
1916
*/
2017
interface ExtendedDriverInterface extends DriverInterface
2118
{
@@ -45,11 +42,14 @@ interface ExtendedDriverInterface extends DriverInterface
4542
* @throws FileSystemException
4643
*
4744
* @deprecated Method will be moved to DriverInterface
45+
* @see DriverInterface
4846
*/
4947
public function getMetadata(string $path): array;
5048

5149
/**
52-
* @param $path
50+
* To check if directory exists
51+
*
52+
* @param string $path
5353
* @return bool
5454
*/
5555
public function isDirectoryExists($path): bool;

0 commit comments

Comments
 (0)