From e8c755183132770d632457e53ee8f86481810217 Mon Sep 17 00:00:00 2001 From: dyktek Date: Mon, 21 May 2018 12:09:21 +0200 Subject: [PATCH 1/3] Handler for simple-uploader --- .../ChunksInRequestSimpleUploadHandler.php | 27 +++++++++++++++++++ src/Handler/ChunksInRequestUploadHandler.php | 18 ++++++++++--- src/Handler/HandlerFactory.php | 3 ++- 3 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 src/Handler/ChunksInRequestSimpleUploadHandler.php diff --git a/src/Handler/ChunksInRequestSimpleUploadHandler.php b/src/Handler/ChunksInRequestSimpleUploadHandler.php new file mode 100644 index 0000000..2746119 --- /dev/null +++ b/src/Handler/ChunksInRequestSimpleUploadHandler.php @@ -0,0 +1,27 @@ +has('chunk') && $request->has('chunks'); + return $request->has(static::KEY_CHUNK_NUMBER) && $request->has(static::KEY_ALL_CHUNKS); } /** @@ -82,7 +94,7 @@ public function startSaving($chunkStorage) protected function getCurrentChunkFromRequest(Request $request) { // the chunk is indexed from zero (for 5 chunks: 0,1,2,3,4) - return intval($request->get('chunk')) + 1; + return intval($request->get(static::KEY_CHUNK_NUMBER)) + 1; } /** @@ -94,7 +106,7 @@ protected function getCurrentChunkFromRequest(Request $request) */ protected function getTotalChunksFromRequest(Request $request) { - return intval($request->get("chunks")); + return intval($request->get(static::KEY_ALL_CHUNKS)); } /** diff --git a/src/Handler/HandlerFactory.php b/src/Handler/HandlerFactory.php index a2e88b4..6fce6e3 100644 --- a/src/Handler/HandlerFactory.php +++ b/src/Handler/HandlerFactory.php @@ -13,7 +13,8 @@ class HandlerFactory ContentRangeUploadHandler::class, ChunksInRequestUploadHandler::class, ResumableJSUploadHandler::class, - DropZoneUploadHandler::class + DropZoneUploadHandler::class, + ChunksInRequestSimpleUploadHandler::class ); /** From fd93b2deab9e1d427be70bb4ebde48811fef64fd Mon Sep 17 00:00:00 2001 From: dyktek Date: Mon, 21 May 2018 14:17:30 +0200 Subject: [PATCH 2/3] removed visibility from const --- src/Handler/ChunksInRequestUploadHandler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Handler/ChunksInRequestUploadHandler.php b/src/Handler/ChunksInRequestUploadHandler.php index 4fdaf35..69899b2 100644 --- a/src/Handler/ChunksInRequestUploadHandler.php +++ b/src/Handler/ChunksInRequestUploadHandler.php @@ -23,13 +23,13 @@ class ChunksInRequestUploadHandler extends AbstractHandler * Key for number of sending chunk * @static string */ - protected const KEY_CHUNK_NUMBER = 'chunk'; + const KEY_CHUNK_NUMBER = 'chunk'; /** * Key for number of all chunks * @static string */ - protected const KEY_ALL_CHUNKS = 'chunks'; + const KEY_ALL_CHUNKS = 'chunks'; /** * The current chunk progress From 77f8bb00801cb0a63506b88f7e076836bd911917 Mon Sep 17 00:00:00 2001 From: dyktek Date: Mon, 21 May 2018 16:47:14 +0200 Subject: [PATCH 3/3] removed visibility from const --- src/Handler/ChunksInRequestSimpleUploadHandler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Handler/ChunksInRequestSimpleUploadHandler.php b/src/Handler/ChunksInRequestSimpleUploadHandler.php index 2746119..d105933 100644 --- a/src/Handler/ChunksInRequestSimpleUploadHandler.php +++ b/src/Handler/ChunksInRequestSimpleUploadHandler.php @@ -17,11 +17,11 @@ class ChunksInRequestSimpleUploadHandler extends ChunksInRequestUploadHandler * Key for number of sending chunk * @static string */ - protected const KEY_CHUNK_NUMBER = 'chunkNumber'; + const KEY_CHUNK_NUMBER = 'chunkNumber'; /** * Key for number of all chunks * @static string */ - protected const KEY_ALL_CHUNKS = 'totalChunks'; + const KEY_ALL_CHUNKS = 'totalChunks'; }