refactor

recca0120 · May 2, 2023 · a402fcf · a402fcf
1 parent db18d4c
commit a402fcf
Show file tree

Hide file tree

Showing 19 changed files with 72 additions and 52 deletions.
diff --git a/README.md b/README.md
@@ -90,21 +90,14 @@ $config = [
     'path' => 'web_path'
 ];
 
-$inputName = 'file';
-$storagePath = 'relative path';
-$api = 'fileapi'; // or plupload
-
-Receiver::factory($config, $api)->receive($inputName)->send();
+Receiver::factory($config, 'fileapi')->receive('file')->send();
 ```
 
 ## Standalone
 
 ```php
 
-use Recca0120\Upload\Receiver;
-use Recca0120\Upload\FileAPI;
-use Recca0120\Upload\Plupload;
-use Illuminate\Http\JsonResponse;
+use Recca0120\Upload\Drivers\FileAPI;use Recca0120\Upload\Receiver;
 
 require __DIR__.'/vendor/autoload.php';
 
@@ -115,11 +108,8 @@ $config = [
     'path' => 'web_path'
 ];
 
-$inputName = 'file';
-$storagePath = 'relative path';
-
 // if use Plupload, new Recca0120\Upload\Plupload
 $receiver = new Receiver(new FileAPI($config));
-// save to $config['base_path'].'/'.$storagePath;
-$receiver->receive($inputName)->send();
+// save to $config['storage'];
+$receiver->receive('file')->send();
 ```
diff --git a/docs/demo/upload.php b/docs/demo/upload.php
@@ -1,10 +1,10 @@
 <?php
 
-use Recca0120\Upload\Dropzone;
-use Recca0120\Upload\FileAPI;
-use Recca0120\Upload\FilePond;
-use Recca0120\Upload\FineUploader;
-use Recca0120\Upload\Plupload;
+use Recca0120\Upload\Drivers\Dropzone;
+use Recca0120\Upload\Drivers\FileAPI;
+use Recca0120\Upload\Drivers\FilePond;
+use Recca0120\Upload\Drivers\FineUploader;
+use Recca0120\Upload\Drivers\Plupload;
 use Recca0120\Upload\Receiver;
 
 if (file_exists(__DIR__.'/../../vendor/autoload.php')) {
@@ -21,7 +21,7 @@
 ];
 
 $inputName = 'file';
-$api = isset($_GET['api']) ? $_GET['api'] : null;
+$api = $_GET['api'] ?? null;
 
 switch ($api) {
     case 'plupload':

diff --git a/src/Api.php → src/Drivers/Api.php b/src/Api.php → src/Drivers/Api.php
@@ -1,13 +1,15 @@
 <?php
 
-namespace Recca0120\Upload;
+namespace Recca0120\Upload\Drivers;
 
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\UploadedFile;
+use Recca0120\Upload\ChunkFile;
 use Recca0120\Upload\Contracts\Api as ApiContract;
 use Recca0120\Upload\Exceptions\ResourceOpenException;
+use Recca0120\Upload\Filesystem;
 
 abstract class Api implements ApiContract
 {

diff --git a/src/Dropzone.php → src/Drivers/Dropzone.php b/src/Dropzone.php → src/Drivers/Dropzone.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Recca0120\Upload;
+namespace Recca0120\Upload\Drivers;
 
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\UploadedFile;

diff --git a/src/FileAPI.php → src/Drivers/FileAPI.php b/src/FileAPI.php → src/Drivers/FileAPI.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Recca0120\Upload;
+namespace Recca0120\Upload\Drivers;
 
 use Illuminate\Http\UploadedFile;
 use Recca0120\Upload\Exceptions\ChunkedResponseException;

diff --git a/src/FilePond.php → src/Drivers/FilePond.php b/src/FilePond.php → src/Drivers/FilePond.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Recca0120\Upload;
+namespace Recca0120\Upload\Drivers;
 
 use Illuminate\Http\UploadedFile;
 use Recca0120\Upload\Exceptions\ChunkedResponseException;

diff --git a/src/FineUploader.php → src/Drivers/FineUploader.php b/src/FineUploader.php → src/Drivers/FineUploader.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Recca0120\Upload;
+namespace Recca0120\Upload\Drivers;
 
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\UploadedFile;

diff --git a/src/Plupload.php → src/Drivers/Plupload.php b/src/Plupload.php → src/Drivers/Plupload.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Recca0120\Upload;
+namespace Recca0120\Upload\Drivers;
 
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\UploadedFile;

diff --git a/src/Receiver.php b/src/Receiver.php
@@ -6,6 +6,11 @@
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Arr;
 use Recca0120\Upload\Contracts\Api as ApiContract;
+use Recca0120\Upload\Drivers\Dropzone;
+use Recca0120\Upload\Drivers\FileAPI;
+use Recca0120\Upload\Drivers\FilePond;
+use Recca0120\Upload\Drivers\FineUploader;
+use Recca0120\Upload\Drivers\Plupload;
 use Recca0120\Upload\Exceptions\ChunkedResponseException;
 use Symfony\Component\HttpFoundation\Response;
 

diff --git a/src/UploadManager.php b/src/UploadManager.php
@@ -5,6 +5,11 @@
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Http\Request;
 use Illuminate\Support\Manager;
+use Recca0120\Upload\Drivers\Dropzone;
+use Recca0120\Upload\Drivers\FileAPI;
+use Recca0120\Upload\Drivers\FilePond;
+use Recca0120\Upload\Drivers\FineUploader;
+use Recca0120\Upload\Drivers\Plupload;
 
 class UploadManager extends Manager
 {
@@ -32,26 +37,36 @@ public function getDefaultDriver(): string
 
     protected function createDropzoneDriver(): Receiver
     {
-        return new Receiver(new Dropzone($this->container['config']['upload'], $this->request, $this->files));
+        return $this->makeReceiver(Dropzone::class);
     }
 
     protected function createFileapiDriver(): Receiver
     {
-        return new Receiver(new FileAPI($this->container['config']['upload'], $this->request, $this->files));
+        return $this->makeReceiver(FileAPI::class);
     }
 
     protected function createFineUploaderDriver(): Receiver
     {
-        return new Receiver(new FineUploader($this->container['config']['upload'], $this->request, $this->files));
+        return $this->makeReceiver(FineUploader::class);
     }
 
     protected function createPluploadDriver(): Receiver
     {
-        return new Receiver(new Plupload($this->container['config']['upload'], $this->request, $this->files));
+        return $this->makeReceiver(Plupload::class);
     }
 
     protected function createFilePond(): Receiver
     {
-        return new Receiver(new FilePond($this->container['config']['upload'], $this->request, $this->files));
+        return $this->makeReceiver(FilePond::class);
+    }
+
+    private function makeReceiver($class): Receiver
+    {
+        return new Receiver(new $class($this->getConfig(), $this->request, $this->files));
+    }
+
+    private function getConfig()
+    {
+        return $this->container['config']['upload'];
     }
 }
diff --git a/src/UploadServiceProvider.php b/src/UploadServiceProvider.php
@@ -23,9 +23,8 @@ public function register()
     {
         $this->mergeConfigFrom(__DIR__.'/../config/upload.php', 'upload');
 
-        $this->app->singleton(Filesystem::class, Filesystem::class);
         $this->app->singleton(UploadManager::class, function ($app) {
-            return new UploadManager($app, $app['request'], $app->make(Filesystem::class));
+            return new UploadManager($app, $app['request'], new Filesystem());
         });
     }
 

diff --git a/tests/ApiTest.php → tests/Drivers/ApiTest.php b/tests/ApiTest.php → tests/Drivers/ApiTest.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Recca0120\Upload\Tests;
+namespace Recca0120\Upload\Tests\Drivers;
 
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\UploadedFile;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
-use Recca0120\Upload\Api as ApiBase;
+use Recca0120\Upload\Drivers\Api as ApiBase;
 use Recca0120\Upload\Filesystem;
 
 class ApiTest extends TestCase

diff --git a/tests/DropzoneTest.php → tests/Drivers/DropzoneTest.php b/tests/DropzoneTest.php → tests/Drivers/DropzoneTest.php
@@ -1,12 +1,14 @@
 <?php
 
-namespace Recca0120\Upload\Tests;
+namespace Recca0120\Upload\Tests\Drivers;
 
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Illuminate\Http\JsonResponse;
-use Recca0120\Upload\Dropzone;
+use Recca0120\Upload\Drivers\Dropzone;
 use Recca0120\Upload\Exceptions\ChunkedResponseException;
 use Recca0120\Upload\Exceptions\ResourceOpenException;
+use Recca0120\Upload\Tests\TestCase;
+use ReflectionException;
 
 class DropzoneTest extends TestCase
 {
@@ -29,7 +31,7 @@ public function testReceiveSingleFile(): void
     /**
      * @throws FileNotFoundException
      * @throws ResourceOpenException
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function testReceiveChunkedFile(): void
     {

diff --git a/tests/FileAPITest.php → tests/Drivers/FileAPITest.php b/tests/FileAPITest.php → tests/Drivers/FileAPITest.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace Recca0120\Upload\Tests;
+namespace Recca0120\Upload\Tests\Drivers;
 
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Illuminate\Http\JsonResponse;
+use Recca0120\Upload\Drivers\FileAPI;
 use Recca0120\Upload\Exceptions\ChunkedResponseException;
 use Recca0120\Upload\Exceptions\ResourceOpenException;
-use Recca0120\Upload\FileAPI;
+use Recca0120\Upload\Tests\TestCase;
 use ReflectionException;
 
 class FileAPITest extends TestCase

diff --git a/tests/FilePondTest.php → tests/Drivers/FilePondTest.php b/tests/FilePondTest.php → tests/Drivers/FilePondTest.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace Recca0120\Upload\Tests;
+namespace Recca0120\Upload\Tests\Drivers;
 
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
+use Recca0120\Upload\Drivers\FilePond;
 use Recca0120\Upload\Exceptions\ChunkedResponseException;
 use Recca0120\Upload\Exceptions\ResourceOpenException;
-use Recca0120\Upload\FilePond;
+use Recca0120\Upload\Tests\TestCase;
 use ReflectionException;
 
 class FilePondTest extends TestCase

diff --git a/tests/FineUploaderTest.php → tests/Drivers/FineUploaderTest.php b/tests/FineUploaderTest.php → tests/Drivers/FineUploaderTest.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace Recca0120\Upload\Tests;
+namespace Recca0120\Upload\Tests\Drivers;
 
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Illuminate\Http\JsonResponse;
+use Recca0120\Upload\Drivers\FineUploader;
 use Recca0120\Upload\Exceptions\ChunkedResponseException;
 use Recca0120\Upload\Exceptions\ResourceOpenException;
-use Recca0120\Upload\FineUploader;
+use Recca0120\Upload\Tests\TestCase;
 use ReflectionException;
 
 class FineUploaderTest extends TestCase

diff --git a/tests/PluploadTest.php → tests/Drivers/PluploadTest.php b/tests/PluploadTest.php → tests/Drivers/PluploadTest.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace Recca0120\Upload\Tests;
+namespace Recca0120\Upload\Tests\Drivers;
 
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Illuminate\Http\JsonResponse;
+use Recca0120\Upload\Drivers\Plupload;
 use Recca0120\Upload\Exceptions\ChunkedResponseException;
 use Recca0120\Upload\Exceptions\ResourceOpenException;
-use Recca0120\Upload\Plupload;
+use Recca0120\Upload\Tests\TestCase;
 use ReflectionException;
 
 class PluploadTest extends TestCase

diff --git a/tests/ReceiverTest.php → tests/Drivers/ReceiverTest.php b/tests/ReceiverTest.php → tests/Drivers/ReceiverTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Recca0120\Upload\Tests;
+namespace Recca0120\Upload\Tests\Drivers;
 
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\UploadedFile;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
 use Recca0120\Upload\Contracts\Api;
+use Recca0120\Upload\Drivers\FileAPI;
+use Recca0120\Upload\Drivers\Plupload;
 use Recca0120\Upload\Exceptions\ChunkedResponseException;
-use Recca0120\Upload\FileAPI;
-use Recca0120\Upload\Plupload;
 use Recca0120\Upload\Receiver;
 use ReflectionClass;
 use Symfony\Component\HttpFoundation\Response;

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -35,20 +35,23 @@ class_alias('PHPUnit_Framework_TestCase', 'PHPUnit\Framework\TestCase');
 Carbon::setTestNow(Carbon::now());
 
 if (! function_exists('storage_path')) {
-    function storage_path()
+    function storage_path(string $name): string
     {
+        return $name;
     }
 }
 
 if (! function_exists('public_path')) {
-    function public_path()
+    function public_path(string $name): string
     {
+        return $name;
     }
 }
 
 if (! function_exists('config_path')) {
-    function config_path()
+    function config_path($name)
     {
+        return $name;
     }
 }