#AC-10721::Investigate the league/flysystem Composer dependencies upgrading to latest version- implementation changes

Author: glo05363

app/code/Magento/AwsS3/Test/Mftf/Helper/S3FileAssertions.php

@@ -213,7 +213,7 @@ public function assertDirectoryExists($path, $message = ''): void
      */
     public function assertDirectoryDoesNotExist($path, $message = ''): void
     {
-        $this->assertFalse($this->driver->isDirectory($path), "Failed asserting $path does not exist. " . $message);
+        $this->assertFalse($this->driver->isDirectoryExists($path), "Failed asserting $path does not exist. " . $message);
     }
 
     /**

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

@@ -16,11 +16,7 @@
             <description value="Verify that when a user deletes a folder in Media Gallery that the directory gets
             deleted in S3 and in the local file system."/>
             <severity value="CRITICAL"/>
-            <skip>
-                <issueId value="AC-11388">Excluding to make s3 backward compatible with flysystem lib</issueId>
-            </skip>
             <group value="remote_storage_aws_s3_media_gallery_ui"/>
-            <group value="pr_exclude"/>
         </annotations>
 
         <before>

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

@@ -16,11 +16,7 @@
             <description value="Verify that when a user deletes an image in Media Gallery that the image gets deleted
             in S3 and in the local file system."/>
             <severity value="CRITICAL"/>
-            <skip>
-                <issueId value="AC-11388">Excluding to make s3 backward compatible with flysystem lib</issueId>
-            </skip>
             <group value="remote_storage_aws_s3_media_gallery_ui"/>
-            <group value="pr_exclude"/>
         </annotations>
 
         <before>

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

@@ -177,6 +177,16 @@ public function directoryExists(string $path): bool
 
         $exists = $this->adapter->directoryExists($path);
 
+        if (!$exists) {
+            try {
+                // check if target is a directory
+                $exists = iterator_count($this->adapter->listContents($path, false)) > 0;
+            } catch (\Throwable $e) {
+                // catch closed iterator
+                $exists = false;
+            }
+        }
+
         if ($exists) {
             $cacheEntry = ['type' => 'dir', 'path' => $path];
             $this->cache->updateMetadata($path, $cacheEntry, true);