Merge pull request #134 from mhl2014/2.x

Minor repairs
masbug · Oct 22, 2024 · 9908278 · 9908278
2 parents b2ed8b5 + 66ea053
commit 9908278
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/src/GoogleDriveAdapter.php b/src/GoogleDriveAdapter.php
@@ -28,6 +28,7 @@
 use League\Flysystem\Visibility;
 use League\MimeTypeDetection\FinfoMimeTypeDetector;
 use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
 use Throwable;
 
@@ -550,7 +551,7 @@ public function copy(string $location, string $destination, Config $config): voi
             return;
         }
 
-        throw UnableToCopyFile::fromLocationTo($path, $newpath, 'Unable To Copy File');
+        throw UnableToCopyFile::fromLocationTo($path, $newpath);
     }
 
     /**
@@ -560,7 +561,7 @@ public function copy(string $location, string $destination, Config $config): voi
     public function move(string $source, string $destination, Config $config): void
     {
         if (!$this->fileExists($source)) {
-            throw UnableToMoveFile::fromLocationTo($source, $destination, new Exception("File {$source} not exist."));
+            throw UnableToMoveFile::fromLocationTo($source, $destination);
         }
         try {
             $this->refreshToken();
@@ -768,7 +769,7 @@ public function read(string $location): string
         } else {
             [, $fileId] = $this->splitPath($path);
         }
-        /** @var RequestInterface $response */
+        /** @var ResponseInterface $response */
         if (($response = $this->service->files->get(/** @scrutinizer ignore-type */ $fileId, $this->applyDefaultParams(['alt' => 'media'], 'files.get')))) {
             return (string)$response->getBody();
         }
@@ -950,7 +951,7 @@ private function fileAttributes(string $path, string $type = ''): FileAttributes
 
         if (!isset($fileAttributes) || !$fileAttributes instanceof FileAttributes) {
             if (!$type) {
-                throw UnableToRetrieveMetadata::create($path, '', $exception);
+                throw UnableToRetrieveMetadata::create($path, '', '', $exception);
             } else {
                 throw UnableToRetrieveMetadata::$type($path, '', $exception);
             }

diff --git a/tests/GoogleDriveAdapterTests.php b/tests/GoogleDriveAdapterTests.php
@@ -12,16 +12,6 @@ class GoogleDriveAdapterTests extends FilesystemAdapterTestCase
 {
     protected $exceptionTypeToRetryOn = null;
 
-    /**
-     * @var string
-     */
-    private static $adapterPrefix = 'ci';
-
-    public static function setUpBeforeClass(): void
-    {
-        static::$adapterPrefix = 'ci/'.bin2hex(random_bytes(10));
-    }
-
     protected function retryOnException(string $className, int $timout = 2): void
     {
         $this->exceptionTypeToRetryOn = null;