#AC-10721::Investigate the league/flysystem Composer dependencies upgrading to latest version- fixes for mftf and unit case

Author: glo05363

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

@@ -154,6 +154,29 @@ public function isExists($path): bool
         }
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function isDirectoryExists($path): bool
+    {
+        if ($path === '/') {
+            return true;
+        }
+
+        $path = $this->normalizeRelativePath($path, true);
+
+        if (!$path) {
+            return true;
+        }
+
+        try {
+            return $this->adapter->directoryExists($path);
+        } catch (FlysystemFilesystemException $e) {
+            $this->logger->error($e->getMessage());
+            return false;
+        }
+    }
+
     /**
      * @inheritDoc
      */

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

@@ -199,7 +199,7 @@ public function assertGlobbedFileExists($path, $pattern, $message = ''): void
      */
     public function assertDirectoryExists($path, $message = ''): void
     {
-        $this->assertTrue($this->driver->isDirectory($path), "Failed asserting $path exists. " . $message);
+        $this->assertTrue($this->driver->isDirectoryExists($path), "Failed asserting $path exists. " . $message);
     }
 
     /**

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

@@ -16,9 +16,6 @@
             <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="Skipping the test to check build time." />
-            </skip>
             <group value="remote_storage_aws_s3_media_gallery_ui"/>
         </annotations>
 

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

@@ -16,9 +16,6 @@
             <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="Skipping the test to check build time." />
-            </skip>
             <group value="remote_storage_aws_s3_media_gallery_ui"/>
         </annotations>
 

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

@@ -432,15 +432,15 @@ public function testSearchDirectory(): void
         $expression = '/*';
         $path = 'path';
         $subPaths = [
-            new \League\Flysystem\DirectoryAttributes('path/1'),
-            new \League\Flysystem\DirectoryAttributes('path/2')
+            new \League\Flysystem\DirectoryAttributes('path/1/'),
+            new \League\Flysystem\DirectoryAttributes('path/2/')
         ];
-        $expectedResult = [self::URL . 'path/1', self::URL . 'path/2'];
+        $expectedResult = [self::URL . 'path/1/', self::URL . 'path/2/'];
         $this->metadataProviderMock->expects(self::any())->method('getMetadata')
             ->willReturnMap([
                 ['path', ['type' => AwsS3::TYPE_DIR]],
-                ['path/1', ['type' => AwsS3::TYPE_FILE]],
-                ['path/2', ['type' => AwsS3::TYPE_FILE]],
+                ['path/1', ['type' => AwsS3::TYPE_DIR]],
+                ['path/2', ['type' => AwsS3::TYPE_DIR]],
             ]);
         $this->adapterMock->expects(self::atLeastOnce())->method('listContents')
             ->willReturn(new \ArrayIterator($subPaths));

app/code/Magento/RemoteStorage/Driver/Adapter/Cache/Generic.php

@@ -118,7 +118,7 @@ public function storeDirNotExists(string $path): void
         ];
         $this->cacheData[$path] = $object;
         $this->cacheAdapter->save(
-            $this->serializer->serialize([$path => $object]),
+            $this->serializer->serialize([$path => $this->cacheData[$path]]),
             $this->prefix . $path,
             [self::CACHE_TAG]
         );

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

@@ -47,4 +47,10 @@ interface ExtendedDriverInterface extends DriverInterface
      * @deprecated Method will be moved to DriverInterface
      */
     public function getMetadata(string $path): array;
+
+    /**
+     * @param $path
+     * @return bool
+     */
+    public function isDirectoryExists($path): bool;
 }