Fixes phpstan errors

phpstan.neon

@@ -24,6 +24,21 @@ parameters:
         - '#Cannot call method getRealPath\(\) on mixed\.#'
         - '#Cannot call method getBasename\(\) on mixed\.#'
         - '#Method Symfony\\Contracts\\EventDispatcher\\EventDispatcherInterface::dispatch\(\) invoked with 2 parameters, 1 required\.#'
+        -
+            message: '#Cannot use array destructuring on array<int, string>\|false\.#'
+            path: '%currentWorkingDirectory%/src/Controller/BlueimpController.php'
+        -
+            message: '#Binary operation "/" between string and int results in an error\.#'
+            path: '%currentWorkingDirectory%/src/Controller/BlueimpController.php'
+        -
+            message: '#Dead catch - Gaufrette\\Exception\\FileNotFound is never thrown in the try block\.#'
+            path: '%currentWorkingDirectory%/src/Uploader/Chunk/Storage/GaufretteStorage.php'
+        -
+            message: '#Parameter \#1 \$finfo of function finfo_file|finfo_close expects finfo, resource given\.#'
+            path: '%currentWorkingDirectory%/src/Uploader/File/GaufretteFile.php'
+        -
+            message: '#Parameter \#2 ...\$values of function sprintf expects bool\|float\|int\|string\|null, mixed given\.#'
+            path: '%currentWorkingDirectory%/src/Controller/PluploadController.php'
         -
             message: '#Parameter \#1 \$parameters of class Symfony\\Component\\HttpFoundation\\FileBag constructor expects array<Symfony\\Component\\HttpFoundation\\File\\UploadedFile>, array<int, Symfony\\Component\\HttpFoundation\\File\\UploadedFile\|null> given\.#'
-            path: '%currentWorkingDirectory%/tests/Controller/FileBagExtractorTest.php'
+            path: '%currentWorkingDirectory%/tests/Controller/FileBagExtractorTest.php'

src/Controller/AbstractChunkedController.php

@@ -7,6 +7,7 @@
 use Oneup\UploaderBundle\Event\PostChunkUploadEvent;
 use Oneup\UploaderBundle\Uploader\Chunk\ChunkManagerInterface;
 use Oneup\UploaderBundle\Uploader\Response\ResponseInterface;
+use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -70,7 +71,11 @@ protected function handleChunkedUpload(UploadedFile $file, ResponseInterface $re
         // with reassembling the parts
         if ($last) {
             $path = $assembled->getPath();
-            $this->handleUpload($assembled, $response, $request);
+            if ($assembled instanceof File) {
+                $this->handleUpload($assembled, $response, $request);
+            } else {
+                // @todo $assembled is of type mixed, so would error without check
+            }
 
             $chunkManager->cleanup($path);
         }

src/Controller/BlueimpController.php

@@ -46,6 +46,7 @@ public function progress(): JsonResponse
 
         // ref: https://github.com/blueimp/jQuery-File-Upload/wiki/PHP-Session-Upload-Progress
         $key = sprintf('%s.%s', $prefix, $value);
+        /** @var array<string, mixed> $value */
         $value = $session->get($key);
 
         $progress = [

src/Controller/DropzoneController.php

@@ -53,10 +53,11 @@ protected function parseChunkedRequest(Request $request): array
         $uuid = $request->get('dzuuid');
 
         /**
-         * @var UploadedFile
+         * @var UploadedFile $file
          */
-        $file = $request->files->get('file')->getClientOriginalName();
-        $orig = $file;
+        $file = $request->files->get('file');
+        $fileName = $file->getClientOriginalName();
+        $orig = $fileName;
 
         return [$last, $uuid, $index, $orig];
     }

src/Controller/MooUploadController.php

@@ -74,7 +74,9 @@ protected function parseChunkedRequest(Request $request): array
 
         try {
             // loop through every file that has been uploaded before
-            foreach ($chunkManager->getChunks((string) $uuid) as $file) {
+            /** @var iterable $chunks */
+            $chunks = $chunkManager->getChunks((string) $uuid);
+            foreach ($chunks as $file) {
                 $size += $file->getSize();
             }
         } catch (\InvalidArgumentException $e) {

src/DependencyInjection/OneupUploaderExtension.php

@@ -108,12 +108,12 @@ protected function createController(string $key, array $config): string
         } else {
             $customFrontend = $config['custom_frontend'];
 
-            $controllerName = sprintf('oneup_uploader.controller.%s', $customFrontend['name']);
-            $controllerType = $customFrontend['class'];
-
-            if (empty($controllerName) || empty($controllerType)) {
+            if (empty($customFrontend['name']) || empty($customFrontend['class'])) {
                 throw new ServiceNotFoundException('Empty controller class or name. If you really want to use a custom frontend implementation, be sure to provide a class and a name.');
             }
+
+            $controllerName = sprintf('oneup_uploader.controller.%s', $customFrontend['name']);
+            $controllerType = $customFrontend['class'];
         }
 
         $errorHandler = $this->createErrorHandler($config);
@@ -285,6 +285,9 @@ protected function registerFilesystem(string $type, string $key, string $class,
             ->addArgument($prefix);
     }
 
+    /**
+     * @param mixed $input
+     */
     protected function getMaxUploadSize($input): int
     {
         $input = $this->getValueInBytes($input);
@@ -298,9 +301,16 @@ protected function getMaxUploadSize($input): int
         return min(min($input, $maxPost), $maxFile);
     }
 
+    /**
+     * @param mixed $input
+     */
     protected function getValueInBytes($input): int
     {
         // see: http://www.php.net/manual/en/function.ini-get.php
+        if (!is_scalar($input)) {
+            return -1;
+        }
+
         $input = trim((string) $input);
         $last = strtolower($input[\strlen($input) - 1]);
         $numericInput = (float) substr($input, 0, -1);

src/Routing/RouteLoader.php

@@ -16,6 +16,7 @@ public function __construct(protected array $controllers)
     }
 
     /**
+     * @param mixed $resource
      * @param string|null $type
      */
     public function supports($resource, $type = null): bool
@@ -24,6 +25,7 @@ public function supports($resource, $type = null): bool
     }
 
     /**
+     * @param mixed $resource
      * @param string|null $type
      */
     public function load($resource, $type = null): RouteCollection

src/Templating/Helper/UploaderHelper.php

@@ -38,6 +38,9 @@ public function uploadKey(): string
         return (string) \ini_get('session.upload_progress.name');
     }
 
+    /**
+     * @return int
+     */
     public function maxSize(string $key)
     {
         if (!\array_key_exists($key, $this->maxsize)) {

src/Twig/Extension/UploaderExtension.php

@@ -50,6 +50,9 @@ public function uploadKey(): string
         return $this->helper->uploadKey();
     }
 
+    /**
+     * @return int
+     */
     public function maxSize(string $key)
     {
         return $this->helper->maxSize($key);

src/Uploader/Chunk/ChunkManager.php

@@ -23,6 +23,11 @@ public function addChunk(string $uuid, int $index, UploadedFile $chunk, string $
         return $this->storage->addChunk($uuid, $index, $chunk, $original);
     }
 
+    /**
+     * @param mixed $chunks
+     * @param bool $removeChunk
+     * @param bool $renameChunk
+     */
     public function assembleChunks($chunks, $removeChunk = true, $renameChunk = false): mixed
     {
         return $this->storage->assembleChunks($chunks, $removeChunk, $renameChunk);

src/Uploader/Chunk/ChunkManagerInterface.php

@@ -4,26 +4,32 @@
 
 namespace Oneup\UploaderBundle\Uploader\Chunk;
 
-use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 interface ChunkManagerInterface
 {
     /**
      * Adds a new Chunk to a given uuid.
+     *
+     * @return mixed
      */
     public function addChunk(string $uuid, int $index, UploadedFile $chunk, string $original);
 
     /**
      * Assembles the given chunks and return the resulting file.
      *
+     * @param mixed $chunks
      * @param bool $removeChunk remove the chunk file once its assembled
      * @param bool $renameChunk rename the chunk file once its assembled
+     *
+     * @return mixed
      */
     public function assembleChunks($chunks, $removeChunk = true, $renameChunk = false);
 
     /**
      * Get chunks associated with the given uuid.
+     *
+     * @return mixed
      */
     public function getChunks(string $uuid);
 

src/Uploader/Chunk/Storage/ChunkStorageInterface.php

@@ -10,11 +10,21 @@ interface ChunkStorageInterface
 {
     public function clear(int $maxAge): void;
 
+    /**
+     * @return mixed
+     */
     public function addChunk(string $uuid, int $index, UploadedFile $chunk, string $original);
 
+    /**
+     * @param mixed $chunks
+     * @return mixed
+     */
     public function assembleChunks($chunks, bool $removeChunk, bool $renameChunk);
 
     public function cleanup(string $path): void;
 
+    /**
+     * @return mixed
+     */
     public function getChunks(string $uuid);
 }

src/Uploader/File/FileInterface.php

@@ -4,8 +4,6 @@
 
 namespace Oneup\UploaderBundle\Uploader\File;
 
-use Symfony\Component\HttpFoundation\File\File;
-
 /**
  * Every function in this interface should be considered unsafe.
  * They are only meant to abstract away some basic file functionality.
@@ -55,5 +53,8 @@ public function getBasename();
      */
     public function getExtension(): string;
 
+    /**
+     * @return mixed
+     */
     public function getFileSystem();
 }

src/Uploader/File/FilesystemFile.php

@@ -23,6 +23,9 @@ public function getExtension(): string
         return $this->getClientOriginalExtension();
     }
 
+    /**
+     * @return null
+     */
     public function getFileSystem()
     {
         return null;

src/Uploader/Response/AbstractResponse.php

@@ -38,6 +38,8 @@ public function offsetGet($offset)
      * The \ArrayAccess interface does not support multi-dimensional array syntax such as $array["foo"][] = bar
      * This function will take a path of arrays and add a new element to it, creating the path if needed.
      *
+     * @param array $value
+     *
      * @throws \InvalidArgumentException if the path contains non-array items
      */
     public function addToOffset($value, array $offsets): void

src/Uploader/Response/MooUploadResponse.php

@@ -7,7 +7,7 @@
 class MooUploadResponse extends AbstractResponse
 {
     /**
-     * @var int|string
+     * @var int|string|null
      */
     protected $id;
 
@@ -45,13 +45,19 @@ public function assemble(): array
         return $data;
     }
 
+    /**
+     * @param int|string|null $id
+     */
     public function setId($id): self
     {
         $this->id = $id;
 
         return $this;
     }
 
+    /**
+     * @return int|string|null
+     */
     public function getId()
     {
         return $this->id;
@@ -69,6 +75,9 @@ public function getName(): ?string
         return $this->name;
     }
 
+    /**
+     * @param mixed $size
+     */
     public function setSize($size): self
     {
         $this->size = (int) $size;

src/Uploader/Storage/FlysystemStorage.php

@@ -55,8 +55,10 @@ public function upload($file, string $name, string $path = null)
         }
 
         if ($file instanceof FileInterface) {
+            /** @var FilesystemOperator $filesystem */
+            $filesystem = $file->getFilesystem();
             $manager = new MountManager([
-                'chunks' => $file->getFilesystem(),
+                'chunks' => $filesystem,
                 'dest' => $this->filesystem,
             ]);
 

tests/Controller/AbstractUploadTest.php

@@ -87,5 +87,5 @@ public function testEvents(): void
 
     abstract protected function getRequestParameters(): array;
 
-    abstract protected function getRequestFile();
+    abstract protected function getRequestFile(): mixed;
 }

tests/Controller/FileBagExtractorTest.php

@@ -83,7 +83,7 @@ public function testWithMultipleFiles(): void
         $this->assertCount(3, $result);
     }
 
-    protected function invoke(FileBag $bag)
+    protected function invoke(FileBag $bag): mixed
     {
         return $this->method->invoke($this->mock, $bag);
     }

tests/Uploader/Chunk/Storage/FlysystemStorageTest.php

@@ -74,6 +74,7 @@ public function testGetChunks(): void
         $system->dumpFile($dir . '/chunk3', 'test');
         $timeTo = time();
 
+        /** @var array $files */
         $files = $this->storage->getChunks($uuid);
         $this->assertCount(3, $files);
         $file = $files[0];