B2B-1610 Upgrade to Flysystem 2.0

- tests fix

Author: Roman Hanin

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

@@ -443,16 +443,34 @@ public function isDirectory($path): bool
             return true;
         }
 
+        $path = $this->normalizeRelativePath($path, true);
+
         try {
-            return iterator_count(
-                $this->adapter->listContents(
-                    $this->normalizeRelativePath($path, true),
-                    false)
-                ) > 0;
-        } catch (\Throwable $e) {
-            // catch closed iterator
-            return false;
+            return $this->isMetadataTypeDirectory($path);
+        } catch (UnableToRetrieveMetadata $e) {
+            try {
+                return iterator_count($this->adapter->listContents($path, false)) > 0;
+            } catch (\Throwable $e) {
+                // catch closed iterator
+                return false;
+            }
+        }
+    }
+
+    /**
+     * Check is given path a directory in metadata.
+     *
+     * @param string $path
+     * @return bool
+     * @throws UnableToRetrieveMetadata
+     */
+    private function isMetadataTypeDirectory($path)
+    {
+        $meta = $this->metadataProvider->getMetadata($path);
+        if (isset($meta['type']) && $meta['type'] === self::TYPE_DIR) {
+            return true;
         }
+        return false;
     }
 
     /**
@@ -553,7 +571,7 @@ public function stat($path): array
             $metaInfo = $this->metadataProvider->getMetadata($path);
         } catch (UnableToRetrieveMetadata $exception) {
             if ($this->directoryExists($path)) {
-                $result['type'] = 'dir';
+                $result['type'] = self::TYPE_DIR;
             }
             return $result;
         }

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

@@ -217,28 +217,25 @@ public function getRelativePathDataProvider(): array
     public function testIsDirectory(
         string $path,
         string $normalizedPath,
-        bool $has,
         array $metadata,
         bool $expected,
         iterable $listContents,
-        \Exception $metadataException = null
+        \Throwable $listContentsException = null
     ): void {
-        $this->adapterMock->method('fileExists')
-            ->with($normalizedPath)
-            ->willReturn($has);
-        $this->adapterMock->method('listContents')
-            ->with($normalizedPath)
-            ->willReturn($listContents);
-        if (!$metadataException) {
+        if (!empty($metadata)) {
             $this->metadataProviderMock->method('getMetadata')
                 ->with($normalizedPath)
                 ->willReturn($metadata);
+        }
+        if ($listContentsException) {
+            $this->adapterMock->method('listContents')
+                ->with($normalizedPath)
+                ->willThrowException($listContentsException);
         } else {
-            $this->metadataProviderMock->method('getMetadata')
+            $this->adapterMock->method('listContents')
                 ->with($normalizedPath)
-                ->willThrowException($metadataException);
+                ->willReturn($listContents);
         }
-
         self::assertSame($expected, $this->driver->isDirectory($path));
     }
 
@@ -251,16 +248,14 @@ public function isDirectoryDataProvider(): array
             'empty metadata' => [
                 'some_directory/',
                 'some_directory',
-                false,
                 [],
                 false,
                 new \ArrayIterator([]),
-                new UnableToRetrieveMetadata('Can not fetch metadata.')
+                new \Exception('Closed iterator'),
             ],
             [
                 'some_directory',
                 'some_directory',
-                true,
                 [
                     'type' => AwsS3::TYPE_DIR
                 ],
@@ -270,38 +265,29 @@ public function isDirectoryDataProvider(): array
             [
                 self::URL . 'some_directory',
                 'some_directory',
-                true,
                 [
                     'type' => AwsS3::TYPE_DIR
                 ],
                 true,
                 new \ArrayIterator(['some_directory']),
             ],
-            [
-                self::URL . 'some_directory',
-                'some_directory',
-                true,
-                [
-                    'type' => AwsS3::TYPE_FILE
-                ],
-                false,
-                new \ArrayIterator(['some_directory']),
-            ],
             [
                 '',
                 '',
+                [
+                    'type' => AwsS3::TYPE_DIR
+                ],
                 true,
-                [],
-                true,
-                new \ArrayIterator(['some_directory']),
+                new \ArrayIterator(['']),
             ],
             [
                 '/',
                 '',
+                [
+                    'type' => AwsS3::TYPE_DIR
+                ],
                 true,
-                [],
-                true,
-                new \ArrayIterator(['some_directory']),
+                new \ArrayIterator(['']),
             ],
         ];
     }
@@ -433,19 +419,18 @@ 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'];
-        $this->metadataProviderMock->expects(self::atLeastOnce())->method('getMetadata')
+        $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]],
             ]);
         $this->adapterMock->expects(self::atLeastOnce())->method('listContents')
-            ->with($path, false)
-            ->willReturn($subPaths);
+            ->willReturn(new \ArrayIterator($subPaths));
 
         self::assertEquals($expectedResult, $this->driver->search($expression, $path));
     }
@@ -468,7 +453,7 @@ public function testSearchFiles(): void
                 ['path/1.jpg', ['type' => AwsS3::TYPE_FILE]],
                 ['path/2.png', ['type' => AwsS3::TYPE_FILE]],
             ]);
-        $this->adapterMock->expects(self::atLeastOnce())->method('listContents')->with($path, false)
+        $this->adapterMock->expects(self::atLeastOnce())->method('listContents')
             ->willReturn($subPaths);
 
         self::assertEquals($expectedResult, $this->driver->search($expression, $path));