move

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

Hide file tree

Showing 17 changed files with 44 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -101,10 +101,7 @@ Receiver::factory($config, $api)->receive($inputName)->send();
 
 ```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';
 

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')) {

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
 {

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,13 @@
 <?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;
 
 class DropzoneTest extends TestCase
 {

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;