return Illuminate\Http\UploadedFile

recca0120 · May 1, 2023 · 2e54413 · 2e54413
1 parent d2445dd
commit 2e54413
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 32 deletions.
diff --git a/src/Api.php b/src/Api.php
@@ -83,14 +83,14 @@ public function cleanDirectory(string $path): ApiContract
      * @throws ResourceOpenException
      * @throws FileNotFoundException
      */
-    public function receive(string $name)
+    public function receive(string $name): UploadedFile
     {
         return $this->isChunked($name)
             ? $this->receiveChunked($name)
             : $this->request->file($name);
     }
 
-    public function deleteUploadedFile($uploadedFile): ApiContract
+    public function deleteUploadedFile(UploadedFile $uploadedFile): ApiContract
     {
         $file = $uploadedFile->getPathname();
         if ($this->files->isFile($file) === true) {
@@ -130,10 +130,8 @@ abstract protected function isChunked(string $name): bool;
     abstract protected function isCompleted(string $name): bool;
 
     /**
-     * @return UploadedFile|\Symfony\Component\HttpFoundation\File\UploadedFile
-     *
      * @throws FileNotFoundException
      * @throws ResourceOpenException
      */
-    abstract protected function receiveChunked(string $name);
+    abstract protected function receiveChunked(string $name): UploadedFile;
 }
diff --git a/src/ChunkFile.php b/src/ChunkFile.php
@@ -3,6 +3,7 @@
 namespace Recca0120\Upload;
 
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
+use Illuminate\Http\UploadedFile;
 use Recca0120\Upload\Exceptions\ResourceOpenException;
 
 class ChunkFile
@@ -93,7 +94,7 @@ public function appendFile($source, int $index = 0): ChunkFile
     /**
      * @throws FileNotFoundException
      */
-    public function createUploadedFile($chunks = null, $storageFile = null)
+    public function createUploadedFile($chunks = null, $storageFile = null): UploadedFile
     {
         $chunkFile = $this->chunkFile();
 

diff --git a/src/Contracts/Api.php b/src/Contracts/Api.php
@@ -5,7 +5,6 @@
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\UploadedFile;
 use Recca0120\Upload\Exceptions\ChunkedResponseException;
-use Symfony\Component\HttpFoundation\File\UploadedFile as SymfonyUploadedFile;
 
 interface Api
 {
@@ -18,16 +17,11 @@ public function makeDirectory(string $path): Api;
     public function cleanDirectory(string $path): Api;
 
     /**
-     * @return UploadedFile|SymfonyUploadedFile
-     *
      * @throws ChunkedResponseException
      */
-    public function receive(string $name);
+    public function receive(string $name): UploadedFile;
 
-    /**
-     * @param  UploadedFile|SymfonyUploadedFile  $uploadedFile
-     */
-    public function deleteUploadedFile($uploadedFile): Api;
+    public function deleteUploadedFile(UploadedFile $uploadedFile): Api;
 
     public function completedResponse(JsonResponse $response): JsonResponse;
 }
diff --git a/src/Dropzone.php b/src/Dropzone.php
@@ -3,6 +3,7 @@
 namespace Recca0120\Upload;
 
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\UploadedFile;
 use Recca0120\Upload\Exceptions\ChunkedResponseException;
 
 class Dropzone extends FineUploader
@@ -29,7 +30,7 @@ protected function isCompleted(string $name): bool
         return $totalChunkCount - 1 === $chunkIndex;
     }
 
-    protected function receiveChunked(string $name)
+    protected function receiveChunked(string $name): UploadedFile
     {
         $uploadedFile = $this->request->file($name);
         $originalName = $uploadedFile->getClientOriginalName();

diff --git a/src/FileAPI.php b/src/FileAPI.php
@@ -2,6 +2,7 @@
 
 namespace Recca0120\Upload;
 
+use Illuminate\Http\UploadedFile;
 use Recca0120\Upload\Exceptions\ChunkedResponseException;
 
 class FileAPI extends Api
@@ -42,7 +43,7 @@ protected function isCompleted(string $name): bool
         return $end >= $total - 1;
     }
 
-    protected function receiveChunked(string $name)
+    protected function receiveChunked(string $name): UploadedFile
     {
         $contentDisposition = (string) $this->request->header('content-disposition');
         [$start, $end] = $this->parseContentRange();

diff --git a/src/FilePond.php b/src/FilePond.php
@@ -2,6 +2,7 @@
 
 namespace Recca0120\Upload;
 
+use Illuminate\Http\UploadedFile;
 use Recca0120\Upload\Exceptions\ChunkedResponseException;
 
 class FilePond extends Api
@@ -20,7 +21,7 @@ protected function isCompleted(string $name): bool
         return $offset + $length >= $size;
     }
 
-    protected function receiveChunked(string $name)
+    protected function receiveChunked(string $name): UploadedFile
     {
         if (! $this->request->headers->has('Upload-Name')) {
             throw new ChunkedResponseException(md5(uniqid('file-pond-', true)));

diff --git a/src/Filesystem.php b/src/Filesystem.php
@@ -2,14 +2,13 @@
 
 namespace Recca0120\Upload;
 
-use Illuminate\Filesystem\Filesystem as IlluminateFilesystem;
+use Illuminate\Filesystem\Filesystem as BaseFilesystem;
 use Illuminate\Http\UploadedFile;
 use Recca0120\Upload\Exceptions\ResourceOpenException;
-use Symfony\Component\HttpFoundation\File\UploadedFile as SymfonyUploadedFile;
 use TypeError;
 use ValueError;
 
-class Filesystem extends IlluminateFilesystem
+class Filesystem extends BaseFilesystem
 {
     public function basename($path): string
     {
@@ -39,11 +38,9 @@ public function appendStream($output, $input, int $offset): void
         fclose($input);
     }
 
-    public function createUploadedFile(string $path, string $originalName, string $mimeType)
+    public function createUploadedFile(string $path, string $originalName, string $mimeType): UploadedFile
     {
-        $class = class_exists(UploadedFile::class) === true ? UploadedFile::class : SymfonyUploadedFile::class;
-
-        return new $class($path, $originalName, $mimeType, UPLOAD_ERR_OK, true);
+        return new UploadedFile($path, $originalName, $mimeType, UPLOAD_ERR_OK, true);
     }
 
     /**

diff --git a/src/FineUploader.php b/src/FineUploader.php
@@ -3,6 +3,7 @@
 namespace Recca0120\Upload;
 
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\UploadedFile;
 use Recca0120\Upload\Exceptions\ChunkedResponseException;
 
 class FineUploader extends Api
@@ -26,7 +27,7 @@ protected function isCompleted(string $name): bool
         return empty($this->request->file($name));
     }
 
-    protected function receiveChunked(string $name)
+    protected function receiveChunked(string $name): UploadedFile
     {
         $uploadedFile = $this->request->file($name);
         $uuid = $this->request->get('qquuid');

diff --git a/src/Plupload.php b/src/Plupload.php
@@ -3,6 +3,7 @@
 namespace Recca0120\Upload;
 
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\UploadedFile;
 use Recca0120\Upload\Exceptions\ChunkedResponseException;
 
 class Plupload extends Api
@@ -25,7 +26,7 @@ protected function isCompleted(string $name): bool
         return $chunk >= $chunks - 1;
     }
 
-    protected function receiveChunked(string $name)
+    protected function receiveChunked(string $name): UploadedFile
     {
         $uploadedFile = $this->request->file($name);
         $originalName = $this->request->get('name');

diff --git a/tests/ApiTest.php b/tests/ApiTest.php
@@ -10,7 +10,6 @@
 use PHPUnit\Framework\TestCase;
 use Recca0120\Upload\Api as ApiBase;
 use Recca0120\Upload\Filesystem;
-use Symfony\Component\HttpFoundation\File\UploadedFile as SymfonyUploadedFile;
 
 class ApiTest extends TestCase
 {
@@ -73,7 +72,7 @@ public function testDeleteUploadedFile(): void
         $request = m::mock(Request::class);
         $request->allows('root')->once()->andReturn('root');
 
-        $uploadedFile = m::mock(SymfonyUploadedFile::class);
+        $uploadedFile = m::mock(UploadedFile::class);
         $uploadedFile->allows('getPathname')->once()->andReturn($file = __FILE__);
 
         $files = m::mock(Filesystem::class);
@@ -117,7 +116,8 @@ protected function isCompleted(string $name): bool
         return true;
     }
 
-    protected function receiveChunked(string $name)
+    protected function receiveChunked(string $name): UploadedFile
     {
+        return UploadedFile::fake()->create('test.png');
     }
 }
diff --git a/tests/ChunkFileTest.php b/tests/ChunkFileTest.php
@@ -3,13 +3,13 @@
 namespace Recca0120\Upload\Tests;
 
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
+use Illuminate\Http\UploadedFile;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
 use Recca0120\Upload\ChunkFile;
 use Recca0120\Upload\Exceptions\ResourceOpenException;
 use Recca0120\Upload\Filesystem;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class ChunkFileTest extends TestCase
 {

diff --git a/tests/FilesystemTest.php b/tests/FilesystemTest.php
@@ -2,13 +2,13 @@
 
 namespace Recca0120\Upload\Tests;
 
+use Illuminate\Http\UploadedFile;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use org\bovigo\vfs\content\LargeFileContent;
 use org\bovigo\vfs\vfsStream;
 use PHPUnit\Framework\TestCase;
 use Recca0120\Upload\Exceptions\ResourceOpenException;
 use Recca0120\Upload\Filesystem;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class FilesystemTest extends TestCase
 {

diff --git a/tests/ReceiverTest.php b/tests/ReceiverTest.php
@@ -3,6 +3,7 @@
 namespace Recca0120\Upload\Tests;
 
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\UploadedFile;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
@@ -12,7 +13,6 @@
 use Recca0120\Upload\Plupload;
 use Recca0120\Upload\Receiver;
 use ReflectionClass;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\Response;
 
 class ReceiverTest extends TestCase