Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Handler/ChunksInRequestSimpleUploadHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}
4 changes: 2 additions & 2 deletions src/Handler/ChunksInRequestUploadHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/**
Expand All @@ -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));
}

/**
Expand Down
6 changes: 3 additions & 3 deletions src/Handler/DropZoneUploadHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand All @@ -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;
}

/**
Expand All @@ -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));
}

/**
Expand Down
10 changes: 5 additions & 5 deletions src/Handler/NgFileUploadHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand All @@ -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))
);
}
}
6 changes: 3 additions & 3 deletions src/Handler/ResumableJSUploadHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand All @@ -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);
}

/**
Expand All @@ -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);
}

/**
Expand Down