Merge pull request thephpleague#1437 from thephpleague/bugfix/aws-s3-…

…v3-291

[BUGFIX] Ensure top-level directory is not returned in directory listing.

src/AwsS3V3/AwsS3V3Adapter.php

@@ -324,12 +324,8 @@ private function fetchFileMetadata(string $path, string $type): FileAttributes
         return $attributes;
     }
 
-    private function mapS3ObjectMetadata(array $metadata, string $path = null): StorageAttributes
+    private function mapS3ObjectMetadata(array $metadata, string $path): StorageAttributes
     {
-        if ($path === null) {
-            $path = $this->prefixer->stripPrefix($metadata['Key'] ?? $metadata['Prefix']);
-        }
-
         if (substr($path, -1) === '/') {
             return new DirectoryAttributes(rtrim($path, '/'));
         }
@@ -409,7 +405,13 @@ public function listContents(string $path, bool $deep): iterable
         $listing = $this->retrievePaginatedListing($options);
 
         foreach ($listing as $item) {
-            yield $this->mapS3ObjectMetadata($item);
+            $key = $item['Key'] ?? $item['Prefix'];
+
+            if ($key === $prefix) {
+                continue;
+            }
+
+            yield $this->mapS3ObjectMetadata($item, $this->prefixer->stripPrefix($key));
         }
     }
 

src/AwsS3V3/AwsS3V3AdapterTest.php

@@ -23,6 +23,7 @@
 use RuntimeException;
 
 use function getenv;
+use function iterator_to_array;
 
 /**
  * @group aws
@@ -118,6 +119,19 @@ public function writing_a_file_with_explicit_mime_type(): void
         $this->assertEquals('text/plain+special', $mimeType);
     }
 
+    /**
+     * @test
+     * @see https://github.com/thephpleague/flysystem-aws-s3-v3/issues/291
+     */
+    public function issue_291(): void
+    {
+        $adapter = $this->adapter();
+        $adapter->createDirectory('directory', new Config());
+        $listing = iterator_to_array($adapter->listContents('directory', true));
+
+        self::assertCount(0, $listing);
+    }
+
     /**
      * @test
      */