Fix for #28

Author: sifex

src/BunnyCDNAdapter.php

@@ -23,6 +23,7 @@
 use League\Flysystem\Visibility;
 use League\MimeTypeDetection\FinfoMimeTypeDetector;
 use RuntimeException;
+use TypeError;
 
 class BunnyCDNAdapter implements FilesystemAdapter
 {
@@ -280,6 +281,8 @@ public function visibility(string $path): FileAttributes
             return new FileAttributes($this->getObject($path)->path(), null, $this->pullzone_url ? 'public' : 'private');
         } catch (UnableToReadFile $e) {
             throw new UnableToRetrieveMetadata($e->getMessage());
+        } catch (TypeError $e) {
+            throw new UnableToRetrieveMetadata('Cannot retrieve visibility of folder');
         }
     }
 
@@ -296,8 +299,8 @@ public function mimeType(string $path): FileAttributes
         try {
             $object = $this->getObject($path);
 
-            if ($object instanceof DirectoryAttributes) {
-                throw new UnableToRetrieveMetadata('Cannot retrieve mimetype of folder');
+            if($object instanceof DirectoryAttributes) {
+                throw new TypeError();
             }
 
             /** @var FileAttributes $object */
@@ -320,6 +323,8 @@ public function mimeType(string $path): FileAttributes
             return $object;
         } catch (UnableToReadFile $e) {
             throw new UnableToRetrieveMetadata($e->getMessage());
+        } catch (TypeError $e) {
+            throw new UnableToRetrieveMetadata('Cannot retrieve mimeType of folder');
         }
     }
 
@@ -356,6 +361,8 @@ public function lastModified(string $path): FileAttributes
             return $this->getObject($path);
         } catch (UnableToReadFile $e) {
             throw new UnableToRetrieveMetadata($e->getMessage());
+        } catch (TypeError $e) {
+            throw new UnableToRetrieveMetadata('Last Modified only accepts files as parameters, not directories');
         }
     }
 
@@ -366,17 +373,11 @@ public function lastModified(string $path): FileAttributes
     public function fileSize(string $path): FileAttributes
     {
         try {
-            $object = $this->getObject($path);
-
-            if ($object instanceof DirectoryAttributes) {
-                // @codeCoverageIgnoreStart
-                throw new UnableToRetrieveMetadata('Cannot retrieve size of folder');
-                // @codeCoverageIgnoreEnd
-            }
-
-            return $object;
+            return $this->getObject($path);
         } catch (UnableToReadFile $e) {
             throw new UnableToRetrieveMetadata($e->getMessage());
+        } catch (TypeError $e) {
+            throw new UnableToRetrieveMetadata('Cannot retrieve size of folder');
         }
     }
 

tests/FlysystemTestSuite.php

@@ -279,4 +279,63 @@ public function test_regression_issue_21()
         $this->assertIsArray($response);
         $this->assertCount(2, $response);
     }
+
+    /**
+     * Github Issue - 28
+     * https://github.com/PlatformCommunity/flysystem-bunnycdn/issues/28
+     *
+     * Issue present where a lot of TypeErrors will appear if you ask for lastModified on Directory (returns FileAttributes)
+     *
+     * @throws FilesystemException
+     */
+    public function test_regression_issue_29()
+    {
+        $client = new MockClient(self::STORAGE_ZONE, 'api-key');
+
+        for($i = 0; $i < 10; $i++) {
+            $client->add_response(
+                new Response(200, [], json_encode(
+                    [
+                        /**
+                         * First with the milliseconds
+                         */
+                        array_merge(
+                            $client::example_folder('/example_folder', self::STORAGE_ZONE),
+                            [
+                                'LastChanged' => date('Y-m-d\TH:i:s.v'),
+                                'DateCreated' => date('Y-m-d\TH:i:s.v'),
+                            ]
+                        ),
+                    ]
+                ))
+            );
+        }
+
+        $adapter = new Filesystem(new BunnyCDNAdapter($client));
+        $exception_count = 0;
+
+        try {
+            $adapter->fileSize('/example_folder');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf(UnableToRetrieveMetadata::class, $e);
+            $exception_count++;
+        }
+
+        try {
+            $adapter->mimeType('/example_folder');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf(UnableToRetrieveMetadata::class, $e);
+            $exception_count++;
+        }
+
+        try {
+            $adapter->lastModified('/example_folder');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf(UnableToRetrieveMetadata::class, $e);
+            $exception_count++;
+        }
+
+        // The fact that PHPUnit makes me do this is 🤬
+        $this->assertEquals(3, $exception_count);
+    }
 }