Use hash name for target filename

Author: nerg4l

src/Driver/ResumableJsUploadDriver.php

@@ -169,12 +169,7 @@ private function saveChunk(UploadedFile $file, Request $request, StorageConfig $
             return new PercentageJsonResponse($range->getPercentage($chunks));
         }
 
-        $targetFilename = $filename;
-
-        // On windows you can not create a file whose name ends with a dot
-        if ($file->getClientOriginalExtension()) {
-            $targetFilename .= '.' . $file->getClientOriginalExtension();
-        }
+        $targetFilename = $file->hashName();
 
         $path = $this->mergeChunks($config, $chunks, $targetFilename);
 

tests/Driver/ResumableJsUploadDriverTest.php

@@ -237,6 +237,7 @@ public function testUploadLastChunk()
     {
         $this->createFakeLocalFile('chunks/200-0jWZTB1ZDfRQU6VTcXy0mJnL9xKMeEz3HoSPU0Zftxt', '000-099');
 
+        $file = UploadedFile::fake()->create('test.txt', 100);
         $request = Request::create('', Request::METHOD_POST, [
             'resumableChunkNumber' => 2,
             'resumableTotalChunks' => 2,
@@ -248,8 +249,7 @@ public function testUploadLastChunk()
             'resumableCurrentChunkSize' => 100,
             'resumableType' => 'text/plain',
         ], [], [
-            'file' => UploadedFile::fake()
-                ->create('test.txt', 100),
+            'file' => $file,
         ]);
 
         /** @var \Illuminate\Foundation\Testing\TestResponse $response */
@@ -258,17 +258,18 @@ public function testUploadLastChunk()
         $response->assertJson(['done' => 100]);
 
         Storage::disk('local')->assertExists('chunks/200-0jWZTB1ZDfRQU6VTcXy0mJnL9xKMeEz3HoSPU0Zftxt/100-199');
-        Storage::disk('local')->assertExists('merged/200-0jWZTB1ZDfRQU6VTcXy0mJnL9xKMeEz3HoSPU0Zftxt.txt');
+        Storage::disk('local')->assertExists($file->hashName('merged'));
 
-        Event::assertDispatched(FileUploaded::class, function ($event) {
-            return $event->file = 'merged/200-0jWZTB1ZDfRQU6VTcXy0mJnL9xKMeEz3HoSPU0Zftxt.txt';
+        Event::assertDispatched(FileUploaded::class, function ($event) use ($file) {
+            return $event->file = $file->hashName('merged');
         });
     }
 
     public function testUploadLastChunkWithCallback()
     {
         $this->createFakeLocalFile('chunks/200-0jWZTB1ZDfRQU6VTcXy0mJnL9xKMeEz3HoSPU0Zftxt', '000-099');
 
+        $file = UploadedFile::fake()->create('test.txt', 100);
         $request = Request::create('', Request::METHOD_POST, [
             'resumableChunkNumber' => 2,
             'resumableTotalChunks' => 2,
@@ -280,19 +281,19 @@ public function testUploadLastChunkWithCallback()
             'resumableCurrentChunkSize' => 100,
             'resumableType' => 'text/plain',
         ], [], [
-            'file' => UploadedFile::fake()->create('test.txt', 100),
+            'file' => $file,
         ]);
 
         $callback = $this->createClosureMock(
             $this->once(),
             'local',
-            'merged/200-0jWZTB1ZDfRQU6VTcXy0mJnL9xKMeEz3HoSPU0Zftxt.txt'
+            $file->hashName('merged')
         );
 
         $this->handler->handle($request, $callback);
 
-        Event::assertDispatched(FileUploaded::class, function ($event) {
-            return $event->file = 'merged/200-0jWZTB1ZDfRQU6VTcXy0mJnL9xKMeEz3HoSPU0Zftxt.txt';
+        Event::assertDispatched(FileUploaded::class, function ($event) use ($file) {
+            return $event->file = $file->hashName('merged');
         });
     }
 }