Refactor UploadedFile class and add unit tests for improved functionality

Author: Carlos Garcia

Core/UploadedFile.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * This file is part of FacturaScripts
- * Copyright (C) 2023-2024 Carlos Garcia Gomez <carlos@facturascripts.com>
+ * Copyright (C) 2023-2025 Carlos Garcia Gomez <carlos@facturascripts.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -30,15 +30,15 @@ final class UploadedFile
     /** @var int */
     public $size;
 
+    /** @var bool */
+    public $test = false;
+
     /** @var string */
     public $tmp_name;
 
     /** @var string */
     public $type;
 
-    /** @var bool */
-    public $test = false;
-
     public function __construct(array $data = [])
     {
         foreach ($data as $key => $value) {
@@ -68,39 +68,24 @@ public function getClientOriginalName(): string
 
     public function getErrorMessage(): string
     {
-        switch ($this->error) {
-            case UPLOAD_ERR_INI_SIZE:
-                return 'The uploaded file exceeds the upload_max_filesize directive in php.ini.';
-
-            case UPLOAD_ERR_FORM_SIZE:
-                return 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.';
-
-            case UPLOAD_ERR_PARTIAL:
-                return 'The uploaded file was only partially uploaded.';
-
-            case UPLOAD_ERR_NO_FILE:
-                return 'No file was uploaded.';
-
-            case UPLOAD_ERR_NO_TMP_DIR:
-                return 'Missing a temporary folder.';
-
-            case UPLOAD_ERR_CANT_WRITE:
-                return 'Failed to write file to disk.';
-
-            case UPLOAD_ERR_EXTENSION:
-                return 'A PHP extension stopped the file upload.';
-
-            default:
-                return 'Unknown upload error.';
-        }
+        return match ($this->error) {
+            UPLOAD_ERR_INI_SIZE => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
+            UPLOAD_ERR_FORM_SIZE => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.',
+            UPLOAD_ERR_PARTIAL => 'The uploaded file was only partially uploaded.',
+            UPLOAD_ERR_NO_FILE => 'No file was uploaded.',
+            UPLOAD_ERR_NO_TMP_DIR => 'Missing a temporary folder.',
+            UPLOAD_ERR_CANT_WRITE => 'Failed to write file to disk.',
+            UPLOAD_ERR_EXTENSION => 'A PHP extension stopped the file upload.',
+            default => 'Unknown upload error.',
+        };
     }
 
     public static function getMaxFilesize(): int
     {
-        $sizePostMax = self::parseFilesize(ini_get('post_max_size'));
-        $sizeUploadMax = self::parseFilesize(ini_get('upload_max_filesize'));
+        $postMax = self::parseFilesize(ini_get('post_max_size'));
+        $uploadMax = self::parseFilesize(ini_get('upload_max_filesize'));
 
-        return min($sizePostMax ?: PHP_INT_MAX, $sizeUploadMax ?: PHP_INT_MAX);
+        return min($postMax ?: PHP_INT_MAX, $uploadMax ?: PHP_INT_MAX);
     }
 
     public function getMimeType(): string
@@ -143,7 +128,9 @@ public function move(string $destiny, string $destinyName): bool
             $destiny .= DIRECTORY_SEPARATOR;
         }
 
-        return $this->test ? rename($this->tmp_name, $destiny . $destinyName) : move_uploaded_file($this->tmp_name, $destiny . $destinyName);
+        return $this->test ?
+            rename($this->tmp_name, $destiny . $destinyName) :
+            move_uploaded_file($this->tmp_name, $destiny . $destinyName);
     }
 
     public function moveTo(string $targetPath): bool
@@ -152,7 +139,9 @@ public function moveTo(string $targetPath): bool
             return false;
         }
 
-        return $this->test ? rename($this->tmp_name, $targetPath) : move_uploaded_file($this->tmp_name, $targetPath);
+        return $this->test ?
+            rename($this->tmp_name, $targetPath) :
+            move_uploaded_file($this->tmp_name, $targetPath);
     }
 
     private static function parseFilesize(string $size): int