Merge pull request #34 from tinect/features

feat: support deep listContents

Author: sifex

phpunit.xml

@@ -8,6 +8,7 @@
          processIsolation="false"
          stopOnFailure="false"
          verbose="true"
+         bootstrap="vendor/autoload.php"
 >
     <testsuites>
         <testsuite name="tests">

src/BunnyCDNAdapter.php

@@ -2,6 +2,7 @@
 
 namespace PlatformCommunity\Flysystem\BunnyCDN;
 
+use Exception;
 use League\Flysystem\Config;
 use League\Flysystem\DirectoryAttributes;
 use League\Flysystem\DirectoryListing;
@@ -113,15 +114,15 @@ public function listContents(string $path = '', bool $deep = false): iterable
         // @codeCoverageIgnoreEnd
 
         foreach ($entries as $item) {
-            yield $this->normalizeObject($item);
-        }
-
-//        return new DirectoryListing($contents, $deep);
-//        return array_map(function($item) {
-//            return $this->normalizeObject($item);
-//        }, $entries);
+            $content = $this->normalizeObject($item);
+            yield $content;
 
-//        return $entries;
+            if ($deep && $content instanceof DirectoryAttributes) {
+                foreach ($this->listContents($content->path(), $deep) as $deepItem) {
+                    yield $deepItem;
+                }
+            }
+        }
     }
 
     /**
@@ -184,9 +185,6 @@ private function extractExtraMetadata(array $bunny_file_array): array
      *
      * @param  string  $path
      * @return string
-     *
-     * @throws Exceptions\BunnyCDNException
-     * @throws Exceptions\NotFoundException
      */
     public function detectMimeType(string $path): string
     {
@@ -199,7 +197,7 @@ public function detectMimeType(string $path): string
             }
 
             return $mimeType;
-        } catch (\Exception $e) {
+        } catch (Exception) {
             return '';
         }
     }
@@ -219,12 +217,17 @@ public function writeStream($path, $contents, Config $config): void
      * @param $path
      * @return resource
      *
-     * @throws Exceptions\BunnyCDNException
-     * @throws Exceptions\NotFoundException
+     * @throws UnableToReadFile
      */
     public function readStream($path)
     {
-        return $this->client->stream($path);
+        try {
+            return $this->client->stream($path);
+            // @codeCoverageIgnoreStart
+        } catch (Exceptions\BunnyCDNException|Exceptions\NotFoundException $e) {
+            throw UnableToReadFile::fromLocation($path, $e->getMessage());
+        }
+        // @codeCoverageIgnoreEnd
     }
 
     /**
@@ -279,19 +282,15 @@ public function visibility(string $path): FileAttributes
     {
         try {
             return new FileAttributes($this->getObject($path)->path(), null, $this->pullzone_url ? 'public' : 'private');
-        } catch (UnableToReadFile $e) {
+        } catch (UnableToReadFile|TypeError $e) {
             throw new UnableToRetrieveMetadata($e->getMessage());
-        } catch (TypeError $e) {
-            throw new UnableToRetrieveMetadata('Cannot retrieve visibility of folder');
         }
     }
 
     /**
      * @param  string  $path
      * @return FileAttributes
      *
-     * @throws Exceptions\BunnyCDNException
-     * @throws Exceptions\NotFoundException
      * @codeCoverageIgnore
      */
     public function mimeType(string $path): FileAttributes
@@ -323,13 +322,13 @@ public function mimeType(string $path): FileAttributes
             return $object;
         } catch (UnableToReadFile $e) {
             throw new UnableToRetrieveMetadata($e->getMessage());
-        } catch (TypeError $e) {
+        } catch (TypeError) {
             throw new UnableToRetrieveMetadata('Cannot retrieve mimeType of folder');
         }
     }
 
     /**
-     * @param $path
+     * @param  string  $path
      * @return mixed
      */
     protected function getObject(string $path = ''): StorageAttributes
@@ -342,13 +341,15 @@ protected function getObject(string $path = ''): StorageAttributes
 
         if (count($list) === 1) {
             return $list[0];
-        } elseif (count($list) > 1) {
+        }
+
+        if (count($list) > 1) {
             // @codeCoverageIgnoreStart
             throw UnableToReadFile::fromLocation($path, 'More than one file was returned for path:"'.$path.'", contact package author.');
-        // @codeCoverageIgnoreEnd
-        } else {
-            throw UnableToReadFile::fromLocation($path, 'Error 404:"'.$path.'"');
+            // @codeCoverageIgnoreEnd
         }
+
+        throw UnableToReadFile::fromLocation($path, 'Error 404:"'.$path.'"');
     }
 
     /**
@@ -361,7 +362,7 @@ public function lastModified(string $path): FileAttributes
             return $this->getObject($path);
         } catch (UnableToReadFile $e) {
             throw new UnableToRetrieveMetadata($e->getMessage());
-        } catch (TypeError $e) {
+        } catch (TypeError) {
             throw new UnableToRetrieveMetadata('Last Modified only accepts files as parameters, not directories');
         }
     }
@@ -376,7 +377,7 @@ public function fileSize(string $path): FileAttributes
             return $this->getObject($path);
         } catch (UnableToReadFile $e) {
             throw new UnableToRetrieveMetadata($e->getMessage());
-        } catch (TypeError $e) {
+        } catch (TypeError) {
             throw new UnableToRetrieveMetadata('Cannot retrieve size of folder');
         }
     }
@@ -443,6 +444,7 @@ public function fileExists(string $path): bool
      * @param  string  $path
      * @return string
      * @codeCoverageIgnore
+     * @noinspection PhpUnused
      */
     public function getUrl(string $path): string
     {

tests/FlysystemTestSuite.php

@@ -87,11 +87,6 @@ public function setting_visibility(): void
         $this->markTestSkipped('No visibility supported');
     }
 
-    public function listing_contents_recursive(): void
-    {
-        $this->markTestSkipped('No recursive supported');
-    }
-
     /**
      * @test
      */