[Flysystem 1] Better check if file exists. (#502)

* [Flysystem 1] Better check if file exists.

* Updated change log

Author: Nyholm

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.3.2
+
+### Fixed
+
+- Better check if file exists.
+
 ## 0.3.1
 
 ### Added

src/S3FilesystemV1.php

@@ -173,22 +173,12 @@ public function has($path)
     {
         $location = $this->applyPathPrefix($path);
 
-        $result = $this->client->getObject(array_merge($this->options, [
+        $result = $this->client->objectExists(array_merge($this->options, [
             'Bucket' => $this->bucket,
             'Key' => $location,
         ]));
 
-        try {
-            $result->resolve();
-
-            return true;
-        } catch (ClientException $e) {
-            if (404 !== $e->getResponse()->getStatusCode()) {
-                throw $e;
-            }
-        }
-
-        return $this->doesDirectoryExist($location);
+        return $result->isSuccess();
     }
 
     /**
@@ -547,30 +537,6 @@ protected function normalizeResponse(object $output, ?string $path = null): arra
         return array_merge($result, $this->resultMap($output), ['type' => 'file']);
     }
 
-    protected function doesDirectoryExist(string $location): bool
-    {
-        // Maybe this isn't an actual key, but a prefix.
-        // Do a prefix listing of objects to determine.
-        $result = $this->client->listObjectsV2([
-            'Bucket' => $this->bucket,
-            'Prefix' => rtrim($location, '/') . '/',
-            'MaxKeys' => 1,
-        ]
-        );
-
-        try {
-            $result->resolve();
-
-            return !empty($result->getContents()) || !empty($result->getCommonPrefixes());
-        } catch (ClientException $e) {
-            if (403 === $e->getResponse()->getStatusCode()) {
-                return false;
-            }
-
-            throw $e;
-        }
-    }
-
     private function retrievePaginatedListing(array $options): array
     {
         $result = $this->client->listObjectsV2($options);

tests/Unit/S3FilesystemV1Test.php

@@ -6,6 +6,7 @@
 
 use AsyncAws\Core\Test\ResultMockFactory;
 use AsyncAws\Core\Test\SimpleResultStream;
+use AsyncAws\Core\Waiter;
 use AsyncAws\Flysystem\S3\S3FilesystemV1;
 use AsyncAws\S3\Enum\StorageClass;
 use AsyncAws\S3\Result\CopyObjectOutput;
@@ -14,6 +15,7 @@
 use AsyncAws\S3\Result\GetObjectOutput;
 use AsyncAws\S3\Result\HeadObjectOutput;
 use AsyncAws\S3\Result\ListObjectsV2Output;
+use AsyncAws\S3\Result\ObjectExistsWaiter;
 use AsyncAws\S3\Result\PutObjectAclOutput;
 use AsyncAws\S3\Result\PutObjectOutput;
 use AsyncAws\S3\S3Client;
@@ -244,11 +246,11 @@ public function testHasFile()
 
         $s3Client = $this->getMockBuilder(S3Client::class)
             ->disableOriginalConstructor()
-            ->onlyMethods(['getObject'])
+            ->onlyMethods(['objectExists'])
             ->getMock();
 
         $s3Client->expects(self::once())
-            ->method('getObject')
+            ->method('objectExists')
             ->with(self::callback(function (array $input) use ($path) {
                 if ($input['Key'] !== self::PREFIX . '/' . $path) {
                     return false;
@@ -259,7 +261,7 @@ public function testHasFile()
                 }
 
                 return true;
-            }))->willReturn(ResultMockFactory::create(GetObjectOutput::class));
+            }))->willReturn(ResultMockFactory::waiter(ObjectExistsWaiter::class, Waiter::STATE_SUCCESS));
 
         $filesystem = new S3FilesystemV1($s3Client, self::BUCKCET, self::PREFIX);