Add Laravel 9 support with support of old Laravel versions

Author: drjdr

composer.json

@@ -15,13 +15,12 @@
     "test": "./vendor/bin/phpunit"
   },
   "require": {
-    "illuminate/http": "5.2 - 5.8 | ^6.0 | ^7.0 | ^8.0",
-    "illuminate/console": "5.2 - 5.8 | ^6.0 | ^7.0 | ^8.0",
-    "illuminate/support": "5.2 - 5.8 | ^6.0 | ^7.0 | ^8.0",
-    "illuminate/filesystem": "5.2 - 5.8 | ^6.0 | ^7.0 | ^8.0"
+    "illuminate/http": "5.2 - 5.8 | ^6.0 | ^7.0 | ^8.0 | ^9.0",
+    "illuminate/console": "5.2 - 5.8 | ^6.0 | ^7.0 | ^8.0 | ^9.0",
+    "illuminate/support": "5.2 - 5.8 | ^6.0 | ^7.0 | ^8.0 | ^9.0",
+    "illuminate/filesystem": "5.2 - 5.8 | ^6.0 | ^7.0 | ^8.0 | ^9.0"
   },
   "require-dev": {
-    "laravel/laravel": "5.2 - 5.8 | ^6.0 | ^7.0 | ^8.0",
     "phpunit/phpunit": "5.7 | 6.0 | 7.0 | 7.5 | 8.4 | ^8.5 | ^9.3",
     "mockery/mockery": "^1.1.0 | ^1.3.0",
     "friendsofphp/php-cs-fixer": "^2.16.0",

src/Storage/ChunkStorage.php

@@ -4,7 +4,9 @@
 
 use Illuminate\Contracts\Filesystem\Filesystem as FilesystemContract;
 use Illuminate\Support\Collection;
+use Illuminate\Filesystem\FilesystemAdapter;
 use League\Flysystem\Adapter\Local;
+use League\Flysystem\Local\LocalFilesystemAdapter;
 use League\Flysystem\FilesystemInterface;
 use Pion\Laravel\ChunkUpload\ChunkFile;
 use Pion\Laravel\ChunkUpload\Config\AbstractConfig;
@@ -28,52 +30,61 @@ public static function storage()
      * @var AbstractConfig
      */
     protected $config;
-
     /**
      * The disk that holds the chunk files.
      *
-     * @var FilesystemAdapter
+     * @var FilesystemContract|FilesystemAdapter
      */
     protected $disk;
-
     /**
-     * @var Local
+     * @var Local|LocalFilesystemAdapter
      */
     protected $diskAdapter;
+    protected $isLocalDisk;
 
     /**
-     * Is provided disk a local drive.
-     *
-     * @var bool
+     * @var
      */
-    protected $isLocalDisk;
+    protected $usingDeprecatedLaravel;
 
     /**
-     * ChunkStorage constructor.
-     *
-     * @param FilesystemContract $disk   the desired disk for chunk storage
-     * @param AbstractConfig     $config
+     * @param FilesystemAdapter|FilesystemContract $disk the desired disk for chunk storage
+     * @param AbstractConfig    $config
      */
-    public function __construct(FilesystemContract $disk, $config)
+    public function __construct($disk, $config)
     {
         // save the config
         $this->config = $config;
-
-        // cache the storage path
+        $this->usingDeprecatedLaravel = class_exists(LocalFilesystemAdapter::class) === false;
         $this->disk = $disk;
 
-        $driver = $this->driver();
+        if ($this->usingDeprecatedLaravel === false) {
 
-        // try to get the adapter
-        if (!method_exists($driver, 'getAdapter')) {
-            throw new RuntimeException('FileSystem driver must have an adapter implemented');
-        }
+            // try to get the adapter
+            if (!method_exists($this->disk, 'getAdapter')) {
+                throw new RuntimeException('FileSystem driver must have an adapter implemented');
+            }
+
+            // get the disk adapter
+            $this->diskAdapter = $this->disk->getAdapter();
 
-        // get the disk adapter
-        $this->diskAdapter = $driver->getAdapter();
+            // check if its local adapter
+            $this->isLocalDisk = $this->diskAdapter instanceof LocalFilesystemAdapter;
+        } else {
+            $driver = $this->driver();
+
+            // try to get the adapter
+            if (!method_exists($driver, 'getAdapter')) {
+                throw new RuntimeException('FileSystem driver must have an adapter implemented');
+            }
+
+            // get the disk adapter
+            $this->diskAdapter = $driver->getAdapter();
+
+            // check if its local adapter
+            $this->isLocalDisk = $this->diskAdapter instanceof Local;
+        }
 
-        // check if its local adapter
-        $this->isLocalDisk = $this->diskAdapter instanceof Local;
     }
 
     /**
@@ -85,10 +96,14 @@ public function __construct(FilesystemContract $disk, $config)
      */
     public function getDiskPathPrefix()
     {
-        if ($this->isLocalDisk) {
+        if ($this->usingDeprecatedLaravel === true && $this->isLocalDisk) {
             return $this->diskAdapter->getPathPrefix();
         }
 
+        if ($this->isLocalDisk) {
+            return $this->disk->path('');
+        }
+
         throw new RuntimeException('The full path is not supported on current disk - local adapter supported only');
     }
 
@@ -99,7 +114,7 @@ public function getDiskPathPrefix()
      */
     public function directory()
     {
-        return $this->config->chunksStorageDirectory().'/';
+        return $this->config->chunksStorageDirectory() . '/';
     }
 
     /**
@@ -119,7 +134,7 @@ public function files($rejectClosure = null)
 
         return $filesCollection->reject(function ($file) use ($rejectClosure) {
             // ensure the file ends with allowed extension
-            $shouldReject = !preg_match('/.'.self::CHUNK_EXTENSION.'$/', $file);
+            $shouldReject = !preg_match('/.' . self::CHUNK_EXTENSION . '$/', $file);
             if ($shouldReject) {
                 return true;
             }
@@ -182,7 +197,7 @@ public function disk()
     /**
      * Returns the driver.
      *
-     * @return FilesystemInterface
+     * @return FilesystemOperator|FilesystemInterface
      */
     public function driver()
     {