Merge pull request #74 from tinect/fix/solveFileExistanceCheck

Author: sifex

src/BunnyCDNAdapter.php

@@ -478,7 +478,7 @@ public function delete($path): void
      */
     public function directoryExists(string $path): bool
     {
-        return $this->fileExists($path);
+        return $this->exists(StorageAttributes::TYPE_DIRECTORY, $path);
     }
 
     /**
@@ -487,16 +487,7 @@ public function directoryExists(string $path): bool
      */
     public function fileExists(string $path): bool
     {
-        $list = new DirectoryListing($this->listContents(
-            Util::splitPathIntoDirectoryAndFile($path)['dir'],
-            false
-        ));
-
-        $count = $list->filter(function (StorageAttributes $item) use ($path) {
-            return Util::normalizePath($item->path()) === Util::normalizePath($path);
-        })->toArray();
-
-        return (bool) count($count);
+        return $this->exists(StorageAttributes::TYPE_FILE, $path);
     }
 
     /**
@@ -559,4 +550,18 @@ private static function parse_bunny_timestamp(string $timestamp): int
     {
         return (date_create_from_format('Y-m-d\TH:i:s.u', $timestamp) ?: date_create_from_format('Y-m-d\TH:i:s', $timestamp))->getTimestamp();
     }
+
+    private function exists(string $type, string $path): bool
+    {
+        $list = new DirectoryListing($this->listContents(
+            Util::splitPathIntoDirectoryAndFile($path)['dir'],
+            false
+        ));
+
+        $count = $list->filter(function (StorageAttributes $item) use ($path, $type) {
+            return $item->type() === $type && Util::normalizePath($item->path()) === Util::normalizePath($path);
+        })->toArray();
+
+        return (bool) count($count);
+    }
 }

tests/FlysystemAdapterTest.php

@@ -75,6 +75,36 @@ public function generating_a_temporary_url(): void
         $this->markTestSkipped('No temporary URL support is provided for BunnyCDN');
     }
 
+    /**
+     * @test
+     */
+    public function file_exists_on_directory_is_false(): void
+    {
+        $this->runScenario(function () {
+            $adapter = $this->adapter();
+
+            $this->assertFalse($adapter->directoryExists('test'));
+            $adapter->createDirectory('test', new Config());
+            $this->assertTrue($adapter->directoryExists('test'));
+            $this->assertFalse($adapter->fileExists('test'));
+        });
+    }
+
+    /**
+     * @test
+     */
+    public function directory_exists_on_file_is_false(): void
+    {
+        $this->runScenario(function () {
+            $adapter = $this->adapter();
+
+            $this->assertFalse($adapter->fileExists('test.txt'));
+            $adapter->write('test.txt', 'aaa', new Config());
+            $this->assertTrue($adapter->fileExists('test.txt'));
+            $this->assertFalse($adapter->directoryExists('test.txt'));
+        });
+    }
+
     /**
      * @test
      */