diff --git a/src/Driver/DropzoneUploadDriver.php b/src/Driver/DropzoneUploadDriver.php index 38a2c00..d37f953 100644 --- a/src/Driver/DropzoneUploadDriver.php +++ b/src/Driver/DropzoneUploadDriver.php @@ -4,7 +4,7 @@ use Closure; use CodingSocks\ChunkUploader\Helper\ChunkHelpers; -use CodingSocks\ChunkUploader\Range\ZeroBasedRequestBodyRange; +use CodingSocks\ChunkUploader\Range\DropzoneRange; use CodingSocks\ChunkUploader\Response\PercentageJsonResponse; use CodingSocks\ChunkUploader\StorageConfig; use Illuminate\Http\Request; @@ -128,7 +128,7 @@ private function saveMonolith(UploadedFile $file, StorageConfig $config, Closure private function saveChunk(UploadedFile $file, Request $request, StorageConfig $config, Closure $fileUploaded = null): Response { try { - $range = new ZeroBasedRequestBodyRange( + $range = new DropzoneRange( $request, 'dzchunkindex', 'dztotalchunkcount', diff --git a/src/Driver/ResumableJsUploadDriver.php b/src/Driver/ResumableJsUploadDriver.php index 69d1993..dbeff50 100644 --- a/src/Driver/ResumableJsUploadDriver.php +++ b/src/Driver/ResumableJsUploadDriver.php @@ -4,7 +4,7 @@ use Closure; use CodingSocks\ChunkUploader\Helper\ChunkHelpers; -use CodingSocks\ChunkUploader\Range\OneBasedRequestBodyRange; +use CodingSocks\ChunkUploader\Range\ResumableJsRange; use CodingSocks\ChunkUploader\Response\PercentageJsonResponse; use CodingSocks\ChunkUploader\StorageConfig; use Illuminate\Http\JsonResponse; @@ -90,7 +90,7 @@ public function resume(Request $request, StorageConfig $config): Response $this->validateChunkRequest($request); try { - $range = new OneBasedRequestBodyRange( + $range = new ResumableJsRange( $request->query, $this->buildParameterName('chunk-number'), $this->buildParameterName('total-chunks'), @@ -154,7 +154,7 @@ private function validateChunkRequest(Request $request): void private function saveChunk(UploadedFile $file, Request $request, StorageConfig $config, Closure $fileUploaded = null): Response { try { - $range = new OneBasedRequestBodyRange( + $range = new ResumableJsRange( $request, $this->buildParameterName('chunk-number'), $this->buildParameterName('total-chunks'), diff --git a/src/Range/ZeroBasedRequestBodyRange.php b/src/Range/DropzoneRange.php similarity index 97% rename from src/Range/ZeroBasedRequestBodyRange.php rename to src/Range/DropzoneRange.php index 4b7a98a..1751821 100644 --- a/src/Range/ZeroBasedRequestBodyRange.php +++ b/src/Range/DropzoneRange.php @@ -4,7 +4,7 @@ use InvalidArgumentException; -class ZeroBasedRequestBodyRange extends RequestBodyRange +class DropzoneRange extends RequestBodyRange { /** * @param string $indexKey diff --git a/src/Range/OneBasedRequestBodyRange.php b/src/Range/ResumableJsRange.php similarity index 97% rename from src/Range/OneBasedRequestBodyRange.php rename to src/Range/ResumableJsRange.php index c944572..43d0feb 100644 --- a/src/Range/OneBasedRequestBodyRange.php +++ b/src/Range/ResumableJsRange.php @@ -4,7 +4,7 @@ use InvalidArgumentException; -class OneBasedRequestBodyRange extends RequestBodyRange +class ResumableJsRange extends RequestBodyRange { /** * @param string $numberOfChunksKey diff --git a/tests/Range/ZeroBasedRequestBodyRangeTest.php b/tests/Range/DropzoneRangeTest.php similarity index 92% rename from tests/Range/ZeroBasedRequestBodyRangeTest.php rename to tests/Range/DropzoneRangeTest.php index 9e7e113..ca7a4d9 100644 --- a/tests/Range/ZeroBasedRequestBodyRangeTest.php +++ b/tests/Range/DropzoneRangeTest.php @@ -2,13 +2,13 @@ namespace CodingSocks\ChunkUploader\Tests\Range; -use CodingSocks\ChunkUploader\Range\ZeroBasedRequestBodyRange; +use CodingSocks\ChunkUploader\Range\DropzoneRange; use Illuminate\Http\Request; use InvalidArgumentException; use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\ParameterBag; -class ZeroBasedRequestBodyRangeTest extends TestCase +class DropzoneRangeTest extends TestCase { public function invalidArgumentProvider() { @@ -117,7 +117,7 @@ public function testCreateFromRequest() 'totalSize' => 190, ]); - $range = new ZeroBasedRequestBodyRange($request, 'index', 'numberOfChunks', 'chunkSize', 'totalSize'); + $range = new DropzoneRange($request, 'index', 'numberOfChunks', 'chunkSize', 'totalSize'); $this->assertEquals(80, $range->getStart()); $this->assertEquals(99, $range->getEnd()); @@ -130,7 +130,7 @@ public function testCreateFromRequest() * @param int $chunkSize * @param float $totalSize * - * @return \CodingSocks\ChunkUploader\Range\ZeroBasedRequestBodyRange + * @return \CodingSocks\ChunkUploader\Range\DropzoneRange */ private function createRequestBodyRange(int $index, int $numberOfChunks, int $chunkSize, float $totalSize) { @@ -141,6 +141,6 @@ private function createRequestBodyRange(int $index, int $numberOfChunks, int $ch 'totalSize' => (string) $totalSize, ]); - return new ZeroBasedRequestBodyRange($request, 'index', 'numberOfChunks', 'chunkSize', 'totalSize'); + return new DropzoneRange($request, 'index', 'numberOfChunks', 'chunkSize', 'totalSize'); } } diff --git a/tests/Range/OneBasedRequestBodyRangeTest.php b/tests/Range/ResumableJsRangeTest.php similarity index 92% rename from tests/Range/OneBasedRequestBodyRangeTest.php rename to tests/Range/ResumableJsRangeTest.php index 368a77e..f2ba324 100644 --- a/tests/Range/OneBasedRequestBodyRangeTest.php +++ b/tests/Range/ResumableJsRangeTest.php @@ -2,13 +2,13 @@ namespace CodingSocks\ChunkUploader\Tests\Range; -use CodingSocks\ChunkUploader\Range\OneBasedRequestBodyRange; +use CodingSocks\ChunkUploader\Range\ResumableJsRange; use Illuminate\Http\Request; use InvalidArgumentException; use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\ParameterBag; -class OneBasedRequestBodyRangeTest extends TestCase +class ResumableJsRangeTest extends TestCase { public function invalidArgumentProvider() { @@ -116,7 +116,7 @@ public function testCreateFromRequest() 'totalSize' => 190, ]); - $range = new OneBasedRequestBodyRange($request, 'index', 'numberOfChunks', 'chunkSize', 'totalSize'); + $range = new ResumableJsRange($request, 'index', 'numberOfChunks', 'chunkSize', 'totalSize'); $this->assertEquals(80, $range->getStart()); $this->assertEquals(99, $range->getEnd()); @@ -129,7 +129,7 @@ public function testCreateFromRequest() * @param int $chunkSize * @param float $totalSize * - * @return \CodingSocks\ChunkUploader\Range\OneBasedRequestBodyRange + * @return \CodingSocks\ChunkUploader\Range\ResumableJsRange */ private function createRequestBodyRange(int $index, int $numberOfChunks, int $chunkSize, float $totalSize) { @@ -140,6 +140,6 @@ private function createRequestBodyRange(int $index, int $numberOfChunks, int $ch 'totalSize' => (string) $totalSize, ]); - return new OneBasedRequestBodyRange($request, 'index', 'numberOfChunks', 'chunkSize', 'totalSize'); + return new ResumableJsRange($request, 'index', 'numberOfChunks', 'chunkSize', 'totalSize'); } }