Merge pull request #72 from tinect/fix/ignore404OnDelete

PlatformCommunity · Apr 23, 2024 · 228cfb3 · 228cfb3
2 parents 30cc7fc + afb885b
commit 228cfb3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 18 deletions.
diff --git a/src/BunnyCDNAdapter.php b/src/BunnyCDNAdapter.php
@@ -27,6 +27,7 @@
 use League\Flysystem\UrlGeneration\PublicUrlGenerator;
 use League\Flysystem\Visibility;
 use League\MimeTypeDetection\FinfoMimeTypeDetector;
+use PlatformCommunity\Flysystem\BunnyCDN\Exceptions\NotFoundException;
 use RuntimeException;
 use TypeError;
 
@@ -252,6 +253,8 @@ public function deleteDirectory(string $path): void
                 rtrim($path, '/').'/'
             );
             // @codeCoverageIgnoreStart
+        } catch (NotFoundException) {
+            // nth
         } catch (Exceptions\BunnyCDNException $e) {
             throw UnableToDeleteDirectory::atLocation($path, $e->getMessage());
         }
@@ -462,10 +465,10 @@ public function delete($path): void
         try {
             $this->client->delete($path);
             // @codeCoverageIgnoreStart
+        } catch (NotFoundException) {
+            // nth
         } catch (Exceptions\BunnyCDNException $e) {
-            if (! str_contains($e->getMessage(), '404')) { // Urgh
-                throw UnableToDeleteFile::atLocation($path, $e->getMessage());
-            }
+            throw UnableToDeleteFile::atLocation($path, $e->getMessage());
         }
         // @codeCoverageIgnoreEnd
     }

diff --git a/src/BunnyCDNClient.php b/src/BunnyCDNClient.php
@@ -5,7 +5,6 @@
 use GuzzleHttp\Client as Guzzle;
 use GuzzleHttp\Exception\GuzzleException;
 use PlatformCommunity\Flysystem\BunnyCDN\Exceptions\BunnyCDNException;
-use PlatformCommunity\Flysystem\BunnyCDN\Exceptions\DirectoryNotEmptyException;
 use PlatformCommunity\Flysystem\BunnyCDN\Exceptions\NotFoundException;
 
 class BunnyCDNClient
@@ -204,7 +203,7 @@ public function make_directory(string $path): mixed
      * @return mixed
      *
      * @throws NotFoundException
-     * @throws DirectoryNotEmptyException|BunnyCDNException
+     * @throws BunnyCDNException
      */
     public function delete(string $path): mixed
     {
@@ -214,7 +213,6 @@ public function delete(string $path): mixed
         } catch (GuzzleException $e) {
             throw match ($e->getCode()) {
                 404 => new NotFoundException($e->getMessage()),
-                400 => new DirectoryNotEmptyException($e->getMessage()),
                 default => new BunnyCDNException($e->getMessage())
             };
         }

diff --git a/src/Exceptions/DirectoryNotEmptyException.php b/src/Exceptions/DirectoryNotEmptyException.php
diff --git a/tests/ClientTest.php b/tests/ClientTest.php
@@ -7,7 +7,6 @@
 use PlatformCommunity\Flysystem\BunnyCDN\BunnyCDNClient;
 use PlatformCommunity\Flysystem\BunnyCDN\BunnyCDNRegion;
 use PlatformCommunity\Flysystem\BunnyCDN\Exceptions\BunnyCDNException;
-use PlatformCommunity\Flysystem\BunnyCDN\Exceptions\DirectoryNotEmptyException;
 use PlatformCommunity\Flysystem\BunnyCDN\Exceptions\NotFoundException;
 
 if (\is_file(__DIR__.'/ClientDI.php')) {
@@ -167,7 +166,6 @@ public function test_make_directory()
      * @return void
      *
      * @throws BunnyCDNException
-     * @throws DirectoryNotEmptyException
      * @throws NotFoundException
      */
     public function test_delete_file()
@@ -187,7 +185,6 @@ public function test_delete_file()
      * @return void
      *
      * @throws BunnyCDNException
-     * @throws DirectoryNotEmptyException
      * @throws NotFoundException
      */
     public function test_delete_file_not_found()

diff --git a/tests/MockClient.php b/tests/MockClient.php
@@ -10,7 +10,6 @@
 use League\Flysystem\StorageAttributes;
 use PlatformCommunity\Flysystem\BunnyCDN\BunnyCDNClient;
 use PlatformCommunity\Flysystem\BunnyCDN\Exceptions\BunnyCDNException;
-use PlatformCommunity\Flysystem\BunnyCDN\Exceptions\DirectoryNotEmptyException;
 use PlatformCommunity\Flysystem\BunnyCDN\Exceptions\NotFoundException;
 use PlatformCommunity\Flysystem\BunnyCDN\Util;
 
@@ -109,7 +108,6 @@ public function make_directory(string $path): array
      *
      * @throws FilesystemException
      * @throws BunnyCDNException
-     * @throws DirectoryNotEmptyException
      * @throws NotFoundException
      */
     public function delete(string $path): array