Merge pull request #17 from cedricziel/issue-11

Adapter::has should check if a directory object exists

Author: cedricziel

src/GoogleCloudStorageAdapter.php

@@ -288,7 +288,13 @@ public function has($path)
         $path = $this->applyPathPrefix($path);
         $object = $this->bucket->object($path);
 
-        return $object->exists();
+        if ($object->exists()) {
+            return true;
+        }
+
+        // flysystem strips trailing slashes so we need to check
+        // for directory objects
+        return $this->bucket->object(sprintf('%s/', $path))->exists();
     }
 
     /**

tests/GoogleCloudStorageAdapterTest.php

@@ -513,4 +513,26 @@ public function testUrlCanBeCreated(): void
 
         self::assertEquals(sprintf('%s/%s/%s', GoogleCloudStorageAdapter::GCS_BASE_URL, $adapterConfig['bucket'], $objectName), $url);
     }
+
+    /**
+     * @see https://github.com/cedricziel/flysystem-gcs/issues/11
+     *
+     * @covers \CedricZiel\FlysystemGcs\GoogleCloudStorageAdapter::has()
+     */
+    public function testHasWorksCorrectlyForDirectories(): void
+    {
+        $testId = uniqid('', true);
+        $adapterConfig = [
+            'bucket' => $this->bucket,
+            'projectId' => $this->project,
+        ];
+
+        $directoryName = sprintf('%s', sprintf('icon-%s', $testId));
+
+        $adapter = new GoogleCloudStorageAdapter(null, $adapterConfig);
+        $fs = new Filesystem($adapter);
+        $fs->createDir($directoryName);
+
+        self::assertTrue($fs->has($directoryName));
+    }
 }