Coffecode PHP8 Uploader

composer.json

@@ -24,7 +24,7 @@
     }
   ],
   "require": {
-    "php": ">=7.2",
+    "php": ">=8.0",
     "ext-gd": "*",
     "ext-mbstring": "*",
     "ext-exif": "*"

example/send.php

@@ -2,6 +2,7 @@
 
 <div class="form">
     <form name="env" method="post" enctype="multipart/form-data">
+        <p>Envie um arquivo AI (postscript)</p>
         <?php
         require __DIR__ . "/../src/Uploader.php";
         require __DIR__ . "/../src/Send.php";

src/File.php

@@ -2,6 +2,8 @@
 
 namespace CoffeeCode\Uploader;
 
+use Exception;
+
 /**
  * Class CoffeeCode File
  *
@@ -15,7 +17,7 @@ class File extends Uploader
      * @var array allowed file types
      * https://www.freeformatter.com/mime-types-list.html
      */
-    protected static $allowTypes = [
+    protected static array $allowTypes = [
         "application/zip",
         'application/x-rar-compressed',
         'application/x-bzip',
@@ -33,7 +35,7 @@ class File extends Uploader
      * Allowed extensions to types.
      * @var array
      */
-    protected static $extensions = [
+    protected static array $extensions = [
         "zip",
         "rar",
         "bz",
@@ -50,15 +52,15 @@ class File extends Uploader
     /**
      * @param array $file
      * @param string $name
-     * @return null|string
-     * @throws \Exception
+     * @return string
+     * @throws Exception
      */
     public function upload(array $file, string $name): string
     {
-        $this->ext = mb_strtolower(pathinfo($file['name'])['extension']);
+        $this->ext($file);
 
         if (!in_array($file['type'], static::$allowTypes) || !in_array($this->ext, static::$extensions)) {
-            throw new \Exception("Not a valid file type or extension");
+            throw new Exception("Not a valid file type or extension");
         }
 
         $this->name($name);

src/Image.php

@@ -2,6 +2,8 @@
 
 namespace CoffeeCode\Uploader;
 
+use Exception;
+
 /**
  * Class CoffeeCode Image
  *
@@ -14,7 +16,7 @@ class Image extends Uploader
      * Allow jpg, png and gif images, use from check. For new extensions check the imageCrete method
      * @var array allowed media types
      */
-    protected static $allowTypes = [
+    protected static array $allowTypes = [
         "image/jpeg",
         "image/png",
         "image/gif",
@@ -26,20 +28,20 @@ class Image extends Uploader
      * @param int $width
      * @param array|null $quality
      * @return string
-     * @throws \Exception
+     * @throws Exception
      */
     public function upload(array $image, string $name, int $width = 2000, ?array $quality = null): string
     {
         if (empty($image['type'])) {
-            throw new \Exception("Not a valid data from image");
+            throw new Exception("Not a valid data from image");
         }
 
         if (!$this->imageCreate($image)) {
-            throw new \Exception("Not a valid image type or extension");
-        } else {
-            $this->name($name);
+            throw new Exception("Not a valid image type or extension");
         }
 
+        $this->name($name);
+
         if ($this->ext == "gif") {
             move_uploaded_file("{$image['tmp_name']}", "{$this->path}/{$this->name}");
             return "{$this->path}/{$this->name}";
@@ -61,7 +63,6 @@ protected function imageCreate(array $image): bool
         if ($image['type'] == "image/jpeg") {
             $this->file = imagecreatefromjpeg($image['tmp_name']);
             $this->ext = "jpg";
-            $this->checkAngle($image);
             return true;
         }
 
@@ -85,10 +86,10 @@ protected function imageCreate(array $image): bool
      */
     private function imageGenerate(int $width, array $quality): void
     {
-        $fileX = imagesx($this->file);
-        $fileY = imagesy($this->file);
-        $imageW = ($width < $fileX ? $width : $fileX);
-        $imageH = ($imageW * $fileY) / $fileX;
+        $fileX = intval(imagesx($this->file));
+        $fileY = intval(imagesy($this->file));
+        $imageW = ($width < $fileX ? (int)$width : (int)$fileX);
+        $imageH = intval(($imageW * $fileY) / $fileX);
         $imageCreate = imagecreatetruecolor($imageW, $imageH);
 
         if ($this->ext == "jpg") {
@@ -106,28 +107,4 @@ private function imageGenerate(int $width, array $quality): void
         imagedestroy($this->file);
         imagedestroy($imageCreate);
     }
-
-    /**
-     * Check image (JPG, PNG) angle and rotate from exif data.
-     * @param $image
-     */
-    private function checkAngle($image): void
-    {
-        $exif = @exif_read_data($image["tmp_name"]);
-        $orientation = (!empty($exif["Orientation"]) ? $exif["Orientation"] : null);
-
-        switch ($orientation) {
-            case 8:
-                $this->file = imagerotate($this->file, 90, 0);
-                break;
-            case 3:
-                $this->file = imagerotate($this->file, 180, 0);
-                break;
-            case 6:
-                $this->file = imagerotate($this->file, -90, 0);
-                break;
-        }
-
-        return;
-    }
 }

src/Media.php

@@ -2,6 +2,8 @@
 
 namespace CoffeeCode\Uploader;
 
+use Exception;
+
 /**
  * Class CoffeeCode Media
  *
@@ -15,7 +17,7 @@ class Media extends Uploader
      * @var array allowed media types
      * https://www.freeformatter.com/mime-types-list.html
      */
-    protected static $allowTypes = [
+    protected static array $allowTypes = [
         "audio/mp3",
         "audio/mpeg",
         "video/mp4",
@@ -25,23 +27,23 @@ class Media extends Uploader
      * Allowed extensions to types.
      * @var array
      */
-    protected static $extensions = [
+    protected static array $extensions = [
         "mp3",
         "mp4"
     ];
 
     /**
      * @param array $media
      * @param string $name
-     * @return null|string
-     * @throws \Exception
+     * @return string
+     * @throws Exception
      */
     public function upload(array $media, string $name): string
     {
-        $this->ext = mb_strtolower(pathinfo($media['name'])['extension']);
+        $this->ext($media);
 
         if (!in_array($media['type'], static::$allowTypes) || !in_array($this->ext, static::$extensions)) {
-            throw new \Exception("Not a valid media type or extension");
+            throw new Exception("Not a valid media type or extension");
         }
 
         $this->name($name);

src/Send.php

@@ -2,6 +2,8 @@
 
 namespace CoffeeCode\Uploader;
 
+use Exception;
+
 /**
  * Class CoffeeCode Send
  *
@@ -36,14 +38,14 @@ public function __construct(
      * @param array $file
      * @param string $name
      * @return string
-     * @throws \Exception
+     * @throws Exception
      */
     public function upload(array $file, string $name): string
     {
-        $this->ext = mb_strtolower(pathinfo($file['name'])['extension']);
+        $this->ext($file);
 
         if (!in_array($file['type'], static::$allowTypes) || !in_array($this->ext, static::$extensions)) {
-            throw new \Exception("Not a valid file type or extension");
+            throw new Exception("Not a valid file type or extension");
         }
 
         $this->name($name);

src/Uploader.php

@@ -11,22 +11,22 @@
 abstract class Uploader
 {
     /** @var string */
-    protected $path;
+    protected string $path;
 
     /** @var resource */
     protected $file;
 
     /** @var string */
-    protected $name;
+    protected string $name;
 
     /** @var string */
-    protected $ext;
+    protected string $ext;
 
     /** @var array */
-    protected static $allowTypes = [];
+    protected static array $allowTypes = [];
 
     /** @var array */
-    protected static $extensions = [];
+    protected static array $extensions = [];
 
     /**
      * @param string $uploadDir
@@ -67,11 +67,14 @@ public static function isExtension(): array
      */
     protected function name(string $name): string
     {
-        $name = filter_var(mb_strtolower($name), FILTER_SANITIZE_STRIPPED);
+        $name = filter_var(mb_strtolower($name), FILTER_UNSAFE_RAW);
         $formats = 'ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜüÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûýýþÿRr"!@#$%&*()_-+={[}]/?;:.,\\\'<>°ºª';
         $replace = 'aaaaaaaceeeeiiiidnoooooouuuuuybsaaaaaaaceeeeiiiidnoooooouuuyybyRr                                 ';
-        $name = str_replace(["-----", "----", "---", "--"], "-",
-            str_replace(" ", "-", trim(strtr(utf8_decode($name), utf8_decode($formats), $replace))));
+        $name = str_replace(
+            ["-----", "----", "---", "--"],
+            "-",
+            str_replace(" ", "-", trim(strtr(utf8_decode($name), utf8_decode($formats), $replace)))
+        );
 
         $this->name = "{$name}." . $this->ext;
 
@@ -104,6 +107,14 @@ protected function path(string $path): void
         $this->path = "{$path}/{$yearPath}/{$mothPath}";
     }
 
+    /**
+     * @param array $file
+     */
+    protected function ext(array $file): void
+    {
+        $this->ext = mb_strtolower(pathinfo($file['name'])['extension']);
+    }
+
     /**
      * @param $inputName
      * @param $files