diff --git a/src/Handler/ChunksInRequestSimpleUploadHandler.php b/src/Handler/ChunksInRequestSimpleUploadHandler.php index 07bebb9..3067623 100644 --- a/src/Handler/ChunksInRequestSimpleUploadHandler.php +++ b/src/Handler/ChunksInRequestSimpleUploadHandler.php @@ -37,6 +37,6 @@ class ChunksInRequestSimpleUploadHandler extends ChunksInRequestUploadHandler protected function getCurrentChunkFromRequest(Request $request) { // the chunk is indexed from 1 (for 5 chunks: 1,2,3,4,5) - return intval($request->get(static::KEY_CHUNK_NUMBER)); + return intval($request->input(static::KEY_CHUNK_NUMBER)); } } diff --git a/src/Handler/ChunksInRequestUploadHandler.php b/src/Handler/ChunksInRequestUploadHandler.php index 2882ab5..21bca64 100644 --- a/src/Handler/ChunksInRequestUploadHandler.php +++ b/src/Handler/ChunksInRequestUploadHandler.php @@ -97,7 +97,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(static::KEY_CHUNK_NUMBER)) + 1; + return intval($request->input(static::KEY_CHUNK_NUMBER)) + 1; } /** @@ -109,7 +109,7 @@ protected function getCurrentChunkFromRequest(Request $request) */ protected function getTotalChunksFromRequest(Request $request) { - return intval($request->get(static::KEY_ALL_CHUNKS)); + return intval($request->input(static::KEY_ALL_CHUNKS)); } /** diff --git a/src/Handler/DropZoneUploadHandler.php b/src/Handler/DropZoneUploadHandler.php index b0ca765..cd25d02 100644 --- a/src/Handler/DropZoneUploadHandler.php +++ b/src/Handler/DropZoneUploadHandler.php @@ -35,7 +35,7 @@ class DropZoneUploadHandler extends ChunksInRequestUploadHandler public function __construct(Request $request, $file, $config) { parent::__construct($request, $file, $config); - $this->fileUuid = $request->get(self::CHUNK_UUID_INDEX); + $this->fileUuid = $request->input(self::CHUNK_UUID_INDEX); } /** @@ -57,7 +57,7 @@ public function getChunkFileName() */ protected function getCurrentChunkFromRequest(Request $request) { - return intval($request->get(self::CHUNK_INDEX, 0)) + 1; + return intval($request->input(self::CHUNK_INDEX, 0)) + 1; } /** @@ -69,7 +69,7 @@ protected function getCurrentChunkFromRequest(Request $request) */ protected function getTotalChunksFromRequest(Request $request) { - return intval($request->get(self::CHUNK_TOTAL_INDEX, 1)); + return intval($request->input(self::CHUNK_TOTAL_INDEX, 1)); } /** diff --git a/src/Handler/NgFileUploadHandler.php b/src/Handler/NgFileUploadHandler.php index 54fb6a3..015e318 100644 --- a/src/Handler/NgFileUploadHandler.php +++ b/src/Handler/NgFileUploadHandler.php @@ -88,15 +88,15 @@ protected static function checkChunkParams($request) && ctype_digit($request->input(static::KEY_CHUNK_SIZE)) && ctype_digit($request->input(static::KEY_CHUNK_CURRENT_SIZE)); - if ($request->get(static::KEY_CHUNK_SIZE) < $request->get(static::KEY_CHUNK_CURRENT_SIZE)) { + if ($request->input(static::KEY_CHUNK_SIZE) < $request->input(static::KEY_CHUNK_CURRENT_SIZE)) { throw new ChunkInvalidValueException(); } - if ($request->get(static::KEY_CHUNK_NUMBER) < 0) { + if ($request->input(static::KEY_CHUNK_NUMBER) < 0) { throw new ChunkInvalidValueException(); } - if ($request->get(static::KEY_TOTAL_SIZE) < 0) { + if ($request->input(static::KEY_TOTAL_SIZE) < 0) { throw new ChunkInvalidValueException(); } @@ -112,12 +112,12 @@ protected static function checkChunkParams($request) */ protected function getTotalChunksFromRequest(Request $request) { - if (!$request->get(static::KEY_CHUNK_SIZE)) { + if (!$request->input(static::KEY_CHUNK_SIZE)) { return 0; } return intval( - ceil($request->get(static::KEY_TOTAL_SIZE) / $request->get(static::KEY_CHUNK_SIZE)) + ceil($request->input(static::KEY_TOTAL_SIZE) / $request->input(static::KEY_CHUNK_SIZE)) ); } } diff --git a/src/Handler/ResumableJSUploadHandler.php b/src/Handler/ResumableJSUploadHandler.php index 7a70ae9..2307d84 100644 --- a/src/Handler/ResumableJSUploadHandler.php +++ b/src/Handler/ResumableJSUploadHandler.php @@ -33,7 +33,7 @@ public function __construct(Request $request, $file, $config) { parent::__construct($request, $file, $config); - $this->fileUuid = $request->get(self::CHUNK_UUID_INDEX); + $this->fileUuid = $request->input(self::CHUNK_UUID_INDEX); } /** @@ -55,7 +55,7 @@ public function getChunkFileName() */ protected function getCurrentChunkFromRequest(Request $request) { - return $request->get(self::CHUNK_NUMBER_INDEX); + return $request->input(self::CHUNK_NUMBER_INDEX); } /** @@ -67,7 +67,7 @@ protected function getCurrentChunkFromRequest(Request $request) */ protected function getTotalChunksFromRequest(Request $request) { - return $request->get(self::TOTAL_CHUNKS_INDEX); + return $request->input(self::TOTAL_CHUNKS_INDEX); } /**