From 5b5f8f9c774ed2d101d70e5518c277d866020bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20G=C3=B6r=C3=B6g?= Date: Fri, 14 Aug 2020 11:28:16 +0200 Subject: [PATCH] all: rename package Closes #68 --- .scrutinizer.yml | 4 +- README.md | 32 +++++++------- composer.json | 12 ++---- ...{chunk-uploader.php => upload-handler.php} | 2 +- phpunit.xml.dist | 2 +- .../{UploadDriver.php => BaseHandler.php} | 18 ++++---- ...ploadDriver.php => BlueimpBaseHandler.php} | 26 ++++++------ ...loadDriver.php => DropzoneBaseHandler.php} | 20 ++++----- ...owJsUploadDriver.php => FlowJsHandler.php} | 6 +-- ...loadDriver.php => MonolithBaseHandler.php} | 16 +++---- ...UploadDriver.php => NgFileBaseHandler.php} | 24 +++++------ ...loadDriver.php => PluploadBaseHandler.php} | 24 +++++------ ...dDriver.php => ResumableJsBaseHandler.php} | 26 ++++++------ ...Driver.php => SimpleUploaderJsHandler.php} | 6 +-- src/Event/FileUploaded.php | 2 +- .../ChecksumMismatchHttpException.php | 2 +- .../InternalServerErrorHttpException.php | 2 +- .../RequestEntityTooLargeHttpException.php | 2 +- src/Helper/ChunkHelpers.php | 20 ++++----- src/Identifier/AuthIdentifier.php | 2 +- src/Identifier/Identifier.php | 2 +- src/Identifier/NopIdentifier.php | 2 +- src/Identifier/SessionIdentifier.php | 2 +- src/IdentityManager.php | 12 +++--- src/Range/ContentRange.php | 2 +- src/Range/DropzoneRange.php | 2 +- src/Range/NgFileUploadRange.php | 2 +- src/Range/PluploadRange.php | 2 +- src/Range/Range.php | 2 +- src/Range/RequestBodyRange.php | 2 +- src/Range/ResumableJsRange.php | 2 +- src/Response/PercentageJsonResponse.php | 2 +- src/StorageConfig.php | 2 +- src/UploadHandler.php | 10 ++--- ...r.php => UploadHandlerServiceProvider.php} | 24 +++++------ src/UploadManager.php | 42 +++++++++---------- ...rTest.php => BlueimpUploadHandlerTest.php} | 24 +++++------ ...Test.php => DropzoneUploadHandlerTest.php} | 22 +++++----- ...erTest.php => FlowJsUploadHandlerTest.php} | 24 +++++------ ...Test.php => MonolithUploadHandlerTest.php} | 20 ++++----- ...erTest.php => NgFileUploadHandlerTest.php} | 24 +++++------ ...Test.php => PluploadUploadHandlerTest.php} | 24 +++++------ ...t.php => ResumableJsUploadHandlerTest.php} | 24 +++++------ ...hp => SimpleUploaderUploadHandlerTest.php} | 24 +++++------ tests/Identifier/AuthIdentifierTest.php | 6 +-- tests/Identifier/NopIdentifierTest.php | 6 +-- tests/Identifier/SessionIdentifierTest.php | 6 +-- tests/Range/ContentRangeTest.php | 4 +- tests/Range/DropzoneRangeTest.php | 6 +-- tests/Range/NgFileUploadRangeTest.php | 6 +-- tests/Range/PluploadRangeTest.php | 6 +-- tests/Range/ResumableJsRangeTest.php | 6 +-- tests/Response/PercentageJsonResponseTest.php | 2 +- tests/TestCase.php | 6 +-- tests/UploadManagerTest.php | 16 +++---- 55 files changed, 306 insertions(+), 310 deletions(-) rename config/{chunk-uploader.php => upload-handler.php} (99%) rename src/Driver/{UploadDriver.php => BaseHandler.php} (85%) rename src/Driver/{BlueimpUploadDriver.php => BlueimpBaseHandler.php} (88%) rename src/Driver/{DropzoneUploadDriver.php => DropzoneBaseHandler.php} (89%) rename src/Driver/{FlowJsUploadDriver.php => FlowJsHandler.php} (90%) rename src/Driver/{MonolithUploadDriver.php => MonolithBaseHandler.php} (85%) rename src/Driver/{NgFileUploadDriver.php => NgFileBaseHandler.php} (88%) rename src/Driver/{PluploadUploadDriver.php => PluploadBaseHandler.php} (81%) rename src/Driver/{ResumableJsUploadDriver.php => ResumableJsBaseHandler.php} (88%) rename src/Driver/{SimpleUploaderJsUploadDriver.php => SimpleUploaderJsHandler.php} (89%) rename src/{ChunkUploaderServiceProvider.php => UploadHandlerServiceProvider.php} (71%) rename tests/Driver/{BlueimpUploadDriverTest.php => BlueimpUploadHandlerTest.php} (90%) rename tests/Driver/{DropzoneUploadDriverTest.php => DropzoneUploadHandlerTest.php} (91%) rename tests/Driver/{FlowJsUploadDriverTest.php => FlowJsUploadHandlerTest.php} (93%) rename tests/Driver/{MonolithUploadDriverTest.php => MonolithUploadHandlerTest.php} (87%) rename tests/Driver/{NgFileUploadDriverTest.php => NgFileUploadHandlerTest.php} (92%) rename tests/Driver/{PluploadUploadDriverTest.php => PluploadUploadHandlerTest.php} (89%) rename tests/Driver/{ResumableJsUploadDriverTest.php => ResumableJsUploadHandlerTest.php} (93%) rename tests/Driver/{SimpleUploaderUploadDriverTest.php => SimpleUploaderUploadHandlerTest.php} (92%) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 1fdd5a5..f6ab215 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -14,7 +14,7 @@ build: coverage: tests: override: - - command: ./vendor/bin/phpunit --coverage-clover=coverage.clover + - command: ./vendor/bin/phpunit --coverage-clover=build/coverage.clover coverage: - file: coverage.clover + file: build/coverage.clover format: clover diff --git a/README.md b/README.md index 73ccf8f..c74ba20 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# Laravel Chunk Uploader +# Laravel Upload Handler -Chunk Uploader Package For Laravel +Upload Handler Package For Laravel -[![Github Actions Badge](https://github.com/coding-socks/laravel-chunk-uploader/workflows/test/badge.svg)](https://github.com/coding-socks/laravel-chunk-uploader/actions?query=workflow%3A"test") -[![Downloads Badge](https://poser.pugx.org/coding-socks/laravel-chunk-uploader/downloads)](https://packagist.org/packages/coding-socks/laravel-chunk-uploader) -[![Version Badge](https://poser.pugx.org/coding-socks/laravel-chunk-uploader/version)](https://packagist.org/packages/coding-socks/laravel-chunk-uploader) -[![Coverage Badge](https://scrutinizer-ci.com/g/coding-socks/laravel-chunk-uploader/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/coding-socks/laravel-chunk-uploader/) -[![License Badge](https://poser.pugx.org/coding-socks/laravel-chunk-uploader/license)](https://packagist.org/packages/coding-socks/laravel-chunk-uploader) +[![Github Actions Badge](https://github.com/coding-socks/laravel-upload-handler/workflows/test/badge.svg)](https://github.com/coding-socks/laravel-upload-handler/actions?query=workflow%3A"test") +[![Downloads Badge](https://poser.pugx.org/coding-socks/laravel-upload-handler/downloads)](https://packagist.org/packages/coding-socks/laravel-upload-handler) +[![Version Badge](https://poser.pugx.org/coding-socks/laravel-upload-handler/version)](https://packagist.org/packages/coding-socks/laravel-upload-handler) +[![Coverage Badge](https://scrutinizer-ci.com/g/coding-socks/laravel-upload-handler/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/coding-socks/laravel-upload-handler/) +[![License Badge](https://poser.pugx.org/coding-socks/laravel-upload-handler/license)](https://packagist.org/packages/coding-socks/laravel-upload-handler) This package helps integrate a Laravel application with chunk uploader libraries eg. [DropzoneJS](https://www.dropzonejs.com/) and @@ -53,7 +53,7 @@ project at the moment is [tus](https://tus.io/). You can easily install this package using Composer, by running the following command: ```bash -composer require coding-socks/laravel-chunk-uploader +composer require coding-socks/laravel-upload-handler ``` ### Requirements @@ -73,7 +73,7 @@ Route::any('/my-route', 'MyController@myFunction'); - Using dependency injection ```php use Illuminate\Http\Request; -use CodingSocks\ChunkUploader\UploadHandler; +use CodingSocks\UploadHandler\UploadHandler; class MyController extends Controller { @@ -86,7 +86,7 @@ class MyController extends Controller - Resolving from the app container ```php use Illuminate\Http\Request; -use CodingSocks\ChunkUploader\UploadHandler; +use CodingSocks\UploadHandler\UploadHandler; class MyController extends Controller { @@ -110,7 +110,7 @@ library can be differ very much. Also, when possible the library gives the oppor ### Events -Once a file upload is finished a `\CodingSocks\ChunkUploader\Event\FileUploaded` is triggered. This event contains +Once a file upload is finished a `\CodingSocks\UploadHandler\Event\FileUploaded` is triggered. This event contains the disk and the path of the uploaded file. [Registering Events & Listeners from Laravel](https://laravel.com/docs/5.8/events#registering-events-and-listeners) @@ -139,8 +139,8 @@ app()->make(UploadManager::class)->extend('my_driver', function () { }); ``` -If you are adding a driver you need to extend the `\CodingSocks\ChunkUploader\Driver\UploadDriver` abstract class, for -which you can use the shipped drivers (e.g. `\CodingSocks\ChunkUploader\Driver\BlueimpUploadDriver`) as an example as to +If you are adding a driver you need to extend the `\CodingSocks\UploadHandler\Driver\UploadDriver` abstract class, for +which you can use the shipped drivers (e.g. `\CodingSocks\UploadHandler\Driver\BlueimpUploadDriver`) as an example as to how. If you wrote a custom driver that others might find useful, please consider adding it to the package via a pull request. @@ -182,7 +182,7 @@ This driver handles requests made by the DropzoneJS client library. This driver handles requests made by the Flow.js client library. -Because of [Issue #44](https://github.com/coding-socks/laravel-chunk-uploader/issues/44) you must use `forceChunkSize` +Because of [Issue #44](https://github.com/coding-socks/laravel-upload-handler/issues/44) you must use `forceChunkSize` option. ### ng-file-upload driver @@ -203,7 +203,7 @@ This driver handles requests made by the Plupload client library. This driver handles requests made by the Resumable.js client library. -Because of [Issue #44](https://github.com/coding-socks/laravel-chunk-uploader/issues/44) you must use `forceChunkSize` +Because of [Issue #44](https://github.com/coding-socks/laravel-upload-handler/issues/44) you must use `forceChunkSize` option. ### simple-uploader.js driver @@ -212,7 +212,7 @@ option. This driver handles requests made by the simple-uploader.js client library. -Because of [Issue #44](https://github.com/coding-socks/laravel-chunk-uploader/issues/44) you must use `forceChunkSize` +Because of [Issue #44](https://github.com/coding-socks/laravel-upload-handler/issues/44) you must use `forceChunkSize` option. ## Identifiers diff --git a/composer.json b/composer.json index cde70da..8944778 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "coding-socks/laravel-chunk-uploader", + "name": "coding-socks/laravel-upload-handler", "description": "This package helps integrate a Laravel application with chunk uploader libraries eg. DropzoneJS and Resumable.js", "type": "library", "license": "MIT", @@ -11,10 +11,6 @@ { "name": "Choraimy Kroonstuiver", "homepage": "https://github.com/axlon" - }, - { - "name": "Raed Yak", - "homepage": "https://github.com/yak0d3" } ], "require": { @@ -29,12 +25,12 @@ }, "autoload": { "psr-4": { - "CodingSocks\\ChunkUploader\\": "src/" + "CodingSocks\\UploadHandler\\": "src/" } }, "autoload-dev": { "psr-4": { - "CodingSocks\\ChunkUploader\\Tests\\": "tests/" + "CodingSocks\\UploadHandler\\Tests\\": "tests/" } }, "config": { @@ -46,7 +42,7 @@ }, "laravel": { "providers": [ - "CodingSocks\\ChunkUploader\\ChunkUploaderServiceProvider" + "CodingSocks\\UploadHandler\\UploadHandlerServiceProvider" ] } } diff --git a/config/chunk-uploader.php b/config/upload-handler.php similarity index 99% rename from config/chunk-uploader.php rename to config/upload-handler.php index b2ef67d..a66cce8 100644 --- a/config/chunk-uploader.php +++ b/config/upload-handler.php @@ -17,7 +17,7 @@ | */ - 'uploader' => env('UPLOAD_DRIVER', 'monolith'), + 'handler' => env('UPLOAD_HANDLER', 'monolith'), /* |-------------------------------------------------------------------------- diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 8edd0cd..930e0e7 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -16,7 +16,7 @@ verbose="true" > - + ./tests diff --git a/src/Driver/UploadDriver.php b/src/Driver/BaseHandler.php similarity index 85% rename from src/Driver/UploadDriver.php rename to src/Driver/BaseHandler.php index cdb8a17..56ae121 100644 --- a/src/Driver/UploadDriver.php +++ b/src/Driver/BaseHandler.php @@ -1,11 +1,11 @@ app['config']['chunk-uploader.identifier']; + return $this->app['config']['upload-handler.identifier']; } /** @@ -43,6 +43,6 @@ public function getDefaultDriver() */ public function setDefaultDriver($name) { - $this->app['config']['chunk-uploader.identifier'] = $name; + $this->app['config']['upload-handler.identifier'] = $name; } } diff --git a/src/Range/ContentRange.php b/src/Range/ContentRange.php index cc1a577..39f9f92 100644 --- a/src/Range/ContentRange.php +++ b/src/Range/ContentRange.php @@ -1,6 +1,6 @@ driver = $driver; $this->config = $config; diff --git a/src/ChunkUploaderServiceProvider.php b/src/UploadHandlerServiceProvider.php similarity index 71% rename from src/ChunkUploaderServiceProvider.php rename to src/UploadHandlerServiceProvider.php index 78a1f17..451a138 100644 --- a/src/ChunkUploaderServiceProvider.php +++ b/src/UploadHandlerServiceProvider.php @@ -1,10 +1,10 @@ publishes([$source => config_path('chunk-uploader.php')]); + $source = realpath(__DIR__ . '/../config/upload-handler.php'); + $this->publishes([$source => config_path('upload-handler.php')]); - $this->mergeConfigFrom($source, 'chunk-uploader'); + $this->mergeConfigFrom($source, 'upload-handler'); } /** @@ -36,7 +36,7 @@ protected function setupConfig() */ public function register() { - $this->registerChunkUploader(); + $this->registerUploadHandler(); } /** @@ -44,16 +44,16 @@ public function register() * * @return void */ - protected function registerChunkUploader() + protected function registerUploadHandler() { $this->registerUploadManager(); $this->registerIdentityManager(); $this->app->singleton(UploadHandler::class, function () { /** @var \Illuminate\Support\Manager $uploadManager */ - $uploadManager = $this->app['chunk-uploader.upload-manager']; + $uploadManager = $this->app['upload-handler.upload-manager']; - $storageConfig = new StorageConfig($this->app->make('config')->get('chunk-uploader')); + $storageConfig = new StorageConfig($this->app->make('config')->get('upload-handler')); return new UploadHandler($uploadManager->driver(), $storageConfig); }); @@ -66,7 +66,7 @@ protected function registerChunkUploader() */ protected function registerUploadManager() { - $this->app->singleton('chunk-uploader.upload-manager', function () { + $this->app->singleton('upload-handler.upload-manager', function () { return new UploadManager($this->app); }); } @@ -78,7 +78,7 @@ protected function registerUploadManager() */ protected function registerIdentityManager() { - $this->app->singleton('chunk-uploader.identity-manager', function () { + $this->app->singleton('upload-handler.identity-manager', function () { return new IdentityManager($this->app); }); } @@ -92,7 +92,7 @@ public function provides() { return [ UploadHandler::class, - 'chunk-uploader.upload-manager', + 'upload-handler.upload-manager', ]; } } diff --git a/src/UploadManager.php b/src/UploadManager.php index 266a79a..85d83a9 100644 --- a/src/UploadManager.php +++ b/src/UploadManager.php @@ -1,60 +1,60 @@ app['config']['chunk-uploader.monolith']); + return new MonolithBaseHandler($this->app['config']['upload-handler.monolith']); } public function createBlueimpDriver() { /** @var \Illuminate\Support\Manager $identityManager */ - $identityManager = $this->app['chunk-uploader.identity-manager']; + $identityManager = $this->app['upload-handler.identity-manager']; - return new BlueimpUploadDriver($this->app['config']['chunk-uploader.blueimp'], $identityManager->driver()); + return new BlueimpBaseHandler($this->app['config']['upload-handler.blueimp'], $identityManager->driver()); } public function createDropzoneDriver() { - return new DropzoneUploadDriver($this->app['config']['chunk-uploader.dropzone']); + return new DropzoneBaseHandler($this->app['config']['upload-handler.dropzone']); } public function createFlowJsDriver() { - return new FlowJsUploadDriver($this->app['config']['chunk-uploader.resumable-js'], $this->identityManager()->driver()); + return new FlowJsHandler($this->app['config']['upload-handler.resumable-js'], $this->identityManager()->driver()); } public function createNgFileUploadDriver() { - return new NgFileUploadDriver($this->identityManager()->driver()); + return new NgFileBaseHandler($this->identityManager()->driver()); } public function createPluploadDriver() { - return new PluploadUploadDriver($this->identityManager()->driver()); + return new PluploadBaseHandler($this->identityManager()->driver()); } public function createResumableJsDriver() { - return new ResumableJsUploadDriver($this->app['config']['chunk-uploader.resumable-js'], $this->identityManager()->driver()); + return new ResumableJsBaseHandler($this->app['config']['upload-handler.resumable-js'], $this->identityManager()->driver()); } public function createSimpleUploaderJsDriver() { - return new SimpleUploaderJsUploadDriver($this->app['config']['chunk-uploader.simple-uploader-js'], $this->identityManager()->driver()); + return new SimpleUploaderJsHandler($this->app['config']['upload-handler.simple-uploader-js'], $this->identityManager()->driver()); } /** @@ -62,7 +62,7 @@ public function createSimpleUploaderJsDriver() */ protected function identityManager() { - return $this->app['chunk-uploader.identity-manager']; + return $this->app['upload-handler.identity-manager']; } /** @@ -72,7 +72,7 @@ protected function identityManager() */ public function getDefaultDriver() { - return $this->app['config']['chunk-uploader.uploader']; + return $this->app['config']['upload-handler.handler']; } /** @@ -84,6 +84,6 @@ public function getDefaultDriver() */ public function setDefaultDriver($name) { - $this->app['config']['chunk-uploader.uploader'] = $name; + $this->app['config']['upload-handler.handler'] = $name; } } diff --git a/tests/Driver/BlueimpUploadDriverTest.php b/tests/Driver/BlueimpUploadHandlerTest.php similarity index 90% rename from tests/Driver/BlueimpUploadDriverTest.php rename to tests/Driver/BlueimpUploadHandlerTest.php index 45ac41d..93b21f6 100644 --- a/tests/Driver/BlueimpUploadDriverTest.php +++ b/tests/Driver/BlueimpUploadHandlerTest.php @@ -1,12 +1,12 @@ app->make('config')->set('chunk-uploader.identifier', 'nop'); - $this->app->make('config')->set('chunk-uploader.uploader', 'blueimp'); - $this->app->make('config')->set('chunk-uploader.sweep', false); + $this->app->make('config')->set('upload-handler.identifier', 'nop'); + $this->app->make('config')->set('upload-handler.handler', 'blueimp'); + $this->app->make('config')->set('upload-handler.sweep', false); $this->handler = $this->app->make(UploadHandler::class); Storage::fake('local'); @@ -39,9 +39,9 @@ protected function setUp(): void public function testDriverInstance() { - $manager = $this->app->make('chunk-uploader.upload-manager'); + $manager = $this->app->make('upload-handler.upload-manager'); - $this->assertInstanceOf(BlueimpUploadDriver::class, $manager->driver()); + $this->assertInstanceOf(BlueimpBaseHandler::class, $manager->driver()); } public function testInfo() diff --git a/tests/Driver/DropzoneUploadDriverTest.php b/tests/Driver/DropzoneUploadHandlerTest.php similarity index 91% rename from tests/Driver/DropzoneUploadDriverTest.php rename to tests/Driver/DropzoneUploadHandlerTest.php index f7ae5be..21ff93f 100644 --- a/tests/Driver/DropzoneUploadDriverTest.php +++ b/tests/Driver/DropzoneUploadHandlerTest.php @@ -1,12 +1,12 @@ app->make('config')->set('chunk-uploader.uploader', 'dropzone'); - $this->app->make('config')->set('chunk-uploader.sweep', false); + $this->app->make('config')->set('upload-handler.handler', 'dropzone'); + $this->app->make('config')->set('upload-handler.sweep', false); $this->handler = $this->app->make(UploadHandler::class); Storage::fake('local'); @@ -36,9 +36,9 @@ protected function setUp(): void public function testDriverInstance() { - $manager = $this->app->make('chunk-uploader.upload-manager'); + $manager = $this->app->make('upload-handler.upload-manager'); - $this->assertInstanceOf(DropzoneUploadDriver::class, $manager->driver()); + $this->assertInstanceOf(DropzoneBaseHandler::class, $manager->driver()); } public function testUploadWhenFileParameterIsEmpty() diff --git a/tests/Driver/FlowJsUploadDriverTest.php b/tests/Driver/FlowJsUploadHandlerTest.php similarity index 93% rename from tests/Driver/FlowJsUploadDriverTest.php rename to tests/Driver/FlowJsUploadHandlerTest.php index 86f3d52..c5623e6 100644 --- a/tests/Driver/FlowJsUploadDriverTest.php +++ b/tests/Driver/FlowJsUploadHandlerTest.php @@ -1,12 +1,12 @@ app->make('config')->set('chunk-uploader.identifier', 'nop'); - $this->app->make('config')->set('chunk-uploader.uploader', 'flow-js'); - $this->app->make('config')->set('chunk-uploader.sweep', false); + $this->app->make('config')->set('upload-handler.identifier', 'nop'); + $this->app->make('config')->set('upload-handler.handler', 'flow-js'); + $this->app->make('config')->set('upload-handler.sweep', false); $this->handler = $this->app->make(UploadHandler::class); Storage::fake('local'); @@ -39,9 +39,9 @@ protected function setUp(): void public function testDriverInstance() { - $manager = $this->app->make('chunk-uploader.upload-manager'); + $manager = $this->app->make('upload-handler.upload-manager'); - $this->assertInstanceOf(FlowJsUploadDriver::class, $manager->driver()); + $this->assertInstanceOf(FlowJsHandler::class, $manager->driver()); } public function notAllowedRequestMethods() diff --git a/tests/Driver/MonolithUploadDriverTest.php b/tests/Driver/MonolithUploadHandlerTest.php similarity index 87% rename from tests/Driver/MonolithUploadDriverTest.php rename to tests/Driver/MonolithUploadHandlerTest.php index 192e237..98dea18 100644 --- a/tests/Driver/MonolithUploadDriverTest.php +++ b/tests/Driver/MonolithUploadHandlerTest.php @@ -1,12 +1,12 @@ app->make('config')->set('chunk-uploader.uploader', 'monolith'); + $this->app->make('config')->set('upload-handler.handler', 'monolith'); $this->handler = $this->app->make(UploadHandler::class); Storage::fake('local'); @@ -37,9 +37,9 @@ protected function setUp(): void public function testDriverInstance() { - $manager = $this->app->make('chunk-uploader.upload-manager'); + $manager = $this->app->make('upload-handler.upload-manager'); - $this->assertInstanceOf(MonolithUploadDriver::class, $manager->driver()); + $this->assertInstanceOf(MonolithBaseHandler::class, $manager->driver()); } public function testDownload() diff --git a/tests/Driver/NgFileUploadDriverTest.php b/tests/Driver/NgFileUploadHandlerTest.php similarity index 92% rename from tests/Driver/NgFileUploadDriverTest.php rename to tests/Driver/NgFileUploadHandlerTest.php index 318627d..86ef8a3 100644 --- a/tests/Driver/NgFileUploadDriverTest.php +++ b/tests/Driver/NgFileUploadHandlerTest.php @@ -1,12 +1,12 @@ app->make('config')->set('chunk-uploader.identifier', 'nop'); - $this->app->make('config')->set('chunk-uploader.uploader', 'ng-file-upload'); - $this->app->make('config')->set('chunk-uploader.sweep', false); + $this->app->make('config')->set('upload-handler.identifier', 'nop'); + $this->app->make('config')->set('upload-handler.handler', 'ng-file-upload'); + $this->app->make('config')->set('upload-handler.sweep', false); $this->handler = $this->app->make(UploadHandler::class); Storage::fake('local'); @@ -38,9 +38,9 @@ protected function setUp(): void public function testDriverInstance() { - $manager = $this->app->make('chunk-uploader.upload-manager'); + $manager = $this->app->make('upload-handler.upload-manager'); - $this->assertInstanceOf(NgFileUploadDriver::class, $manager->driver()); + $this->assertInstanceOf(NgFileBaseHandler::class, $manager->driver()); } public function notAllowedRequestMethods() diff --git a/tests/Driver/PluploadUploadDriverTest.php b/tests/Driver/PluploadUploadHandlerTest.php similarity index 89% rename from tests/Driver/PluploadUploadDriverTest.php rename to tests/Driver/PluploadUploadHandlerTest.php index 1539e5a..16f2012 100644 --- a/tests/Driver/PluploadUploadDriverTest.php +++ b/tests/Driver/PluploadUploadHandlerTest.php @@ -1,12 +1,12 @@ app->make('config')->set('chunk-uploader.identifier', 'nop'); - $this->app->make('config')->set('chunk-uploader.uploader', 'plupload'); - $this->app->make('config')->set('chunk-uploader.sweep', false); + $this->app->make('config')->set('upload-handler.identifier', 'nop'); + $this->app->make('config')->set('upload-handler.handler', 'plupload'); + $this->app->make('config')->set('upload-handler.sweep', false); $this->handler = $this->app->make(UploadHandler::class); Storage::fake('local'); @@ -38,9 +38,9 @@ protected function setUp(): void public function testDriverInstance() { - $manager = $this->app->make('chunk-uploader.upload-manager'); + $manager = $this->app->make('upload-handler.upload-manager'); - $this->assertInstanceOf(PluploadUploadDriver::class, $manager->driver()); + $this->assertInstanceOf(PluploadBaseHandler::class, $manager->driver()); } public function notAllowedRequestMethods() diff --git a/tests/Driver/ResumableJsUploadDriverTest.php b/tests/Driver/ResumableJsUploadHandlerTest.php similarity index 93% rename from tests/Driver/ResumableJsUploadDriverTest.php rename to tests/Driver/ResumableJsUploadHandlerTest.php index a573a2d..5f53a37 100644 --- a/tests/Driver/ResumableJsUploadDriverTest.php +++ b/tests/Driver/ResumableJsUploadHandlerTest.php @@ -1,12 +1,12 @@ app->make('config')->set('chunk-uploader.identifier', 'nop'); - $this->app->make('config')->set('chunk-uploader.uploader', 'resumable-js'); - $this->app->make('config')->set('chunk-uploader.sweep', false); + $this->app->make('config')->set('upload-handler.identifier', 'nop'); + $this->app->make('config')->set('upload-handler.handler', 'resumable-js'); + $this->app->make('config')->set('upload-handler.sweep', false); $this->handler = $this->app->make(UploadHandler::class); Storage::fake('local'); @@ -39,9 +39,9 @@ protected function setUp(): void public function testDriverInstance() { - $manager = $this->app->make('chunk-uploader.upload-manager'); + $manager = $this->app->make('upload-handler.upload-manager'); - $this->assertInstanceOf(ResumableJsUploadDriver::class, $manager->driver()); + $this->assertInstanceOf(ResumableJsBaseHandler::class, $manager->driver()); } public function notAllowedRequestMethods() diff --git a/tests/Driver/SimpleUploaderUploadDriverTest.php b/tests/Driver/SimpleUploaderUploadHandlerTest.php similarity index 92% rename from tests/Driver/SimpleUploaderUploadDriverTest.php rename to tests/Driver/SimpleUploaderUploadHandlerTest.php index 907f434..00c4c29 100644 --- a/tests/Driver/SimpleUploaderUploadDriverTest.php +++ b/tests/Driver/SimpleUploaderUploadHandlerTest.php @@ -1,12 +1,12 @@ app->make('config')->set('chunk-uploader.identifier', 'nop'); - $this->app->make('config')->set('chunk-uploader.uploader', 'simple-uploader-js'); - $this->app->make('config')->set('chunk-uploader.sweep', false); + $this->app->make('config')->set('upload-handler.identifier', 'nop'); + $this->app->make('config')->set('upload-handler.handler', 'simple-uploader-js'); + $this->app->make('config')->set('upload-handler.sweep', false); $this->handler = $this->app->make(UploadHandler::class); Storage::fake('local'); @@ -39,9 +39,9 @@ protected function setUp(): void public function testDriverInstance() { - $manager = $this->app->make('chunk-uploader.upload-manager'); + $manager = $this->app->make('upload-handler.upload-manager'); - $this->assertInstanceOf(SimpleUploaderJsUploadDriver::class, $manager->driver()); + $this->assertInstanceOf(SimpleUploaderJsHandler::class, $manager->driver()); } public function notAllowedRequestMethods() diff --git a/tests/Identifier/AuthIdentifierTest.php b/tests/Identifier/AuthIdentifierTest.php index 6b15e1e..92ab0cf 100644 --- a/tests/Identifier/AuthIdentifierTest.php +++ b/tests/Identifier/AuthIdentifierTest.php @@ -1,8 +1,8 @@ manager->driver('monolith'); - $this->assertInstanceOf(MonolithUploadDriver::class, $driver); + $this->assertInstanceOf(MonolithBaseHandler::class, $driver); } public function testBlueimpDriverCreation() { $driver = $this->manager->driver('blueimp'); - $this->assertInstanceOf(BlueimpUploadDriver::class, $driver); + $this->assertInstanceOf(BlueimpBaseHandler::class, $driver); } public function testDropzoneDriverCreation() { $driver = $this->manager->driver('dropzone'); - $this->assertInstanceOf(DropzoneUploadDriver::class, $driver); + $this->assertInstanceOf(DropzoneBaseHandler::class, $driver); } }