release v1.0.12

Author: aminyazdanpanah

README.md

@@ -32,7 +32,10 @@
         }
     },
     "require": {
-        "php": "^7.1.0"
+        "php": "^7.1.0",
+        "aminyazdanpanah/php-ffmpeg-video-streaming": "dev-master",
+        "gumlet/php-image-resize": "1.9.*",
+        "wapmorgan/unified-archive": "~0.1.2"
     },
     "suggest": {
         "aminyazdanpanah/php-ffmpeg-video-streaming": "aminyazdanpanah/php-ffmpeg-video-streaming is suggested for validate video files and create DASH and HLS files."

composer.json

@@ -42,7 +42,7 @@ public function file($filename)
     private function getFile()
     {
         if (!isset($_FILES[$this->filename])) {
-            throw new Exception("There is no \"" .$this->filename . "\" key in the \$_FILES. Be sure your key name is correct", 500);
+            throw new Exception("There is no \"" .$this->filename . "\" key in the \$_FILES. Be sure your key name is correct");
         }
 
         if($code = $_FILES[$this->filename]['error']){
@@ -115,31 +115,31 @@ private function throwErrorException($code)
     {
         switch ($code){
             case 1:
-                throw new Exception("The uploaded file exceeds the upload_max_filesize directive in php.ini",500);
+                throw new Exception("The uploaded file exceeds the upload_max_filesize directive in php.ini");
                 break;
             case 2:
-                throw new Exception("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form",500);
+                throw new Exception("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form");
                 break;
             case 3:
-                throw new Exception("The uploaded file was only partially uploaded",500);
+                throw new Exception("The uploaded file was only partially uploaded");
                 break;
             case 4:
-                throw new Exception("No file was uploaded",500);
+                throw new Exception("No file was uploaded");
                 break;
             case 5:
-                throw new Exception("Unknown error occurred.",500);
+                throw new Exception("Unknown error occurred.");
                 break;
             case 6:
-                throw new Exception("Missing a temporary folder.",500);
+                throw new Exception("Missing a temporary folder.");
                 break;
             case 7:
-                throw new Exception("Failed to write file to disk",500);
+                throw new Exception("Failed to write file to disk");
                 break;
             case 8:
-                throw new Exception("A PHP extension stopped the file upload",500);
+                throw new Exception("A PHP extension stopped the file upload");
                 break;
             default:
-                throw new Exception("Unknown error occurred.",500);
+                throw new Exception("Unknown error occurred.");
         }
 
 

examples/example.php

@@ -19,7 +19,7 @@
 namespace AYazdanpanah\SaveUploadedFiles;
 
 
-class Filter
+class Filter implements \Countable
 {
     private $extractions;
 

src/File.php

@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Copyright 2019 Amin Yazdanpanah<http://www.aminyazdanpanah.com>.
+ *
+ * Licensed under the MIT License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://opensource.org/licenses/MIT
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace AYazdanpanah\SaveUploadedFiles;
+
+
+class Helper
+{
+    /**
+     * @param $type
+     * @param $filename
+     * @return bool
+     */
+    public static function isType($type, $filename): bool
+    {
+        return boolval(strstr(mime_content_type($filename), $type));
+    }
+
+    /**
+     * @param int $length
+     * @return bool|string
+     */
+    public static function str_random($length = 10)
+    {
+        return substr(str_shuffle(str_repeat($x = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', ceil($length / strlen($x)))), 1, $length);
+    }
+
+    /**
+     * @return array
+     */
+    public static function videoTypes(): array
+    {
+        return [
+            'webm', 'mkv', 'flv', 'vob', 'ogv', 'ogg', 'drc', 'gif', 'gifv', 'avi',
+            'MTS', 'M2TS', 'mov', 'qt', 'yuv', 'rm', 'rmvb', 'asf', 'amv', 'mp4',
+            'm4p ', 'm4v', 'mpg', 'mp2', 'mpeg', 'mpe', 'mpg', 'mpeg', 'm2v', '3gp',
+            '3g2', 'mxf', 'roq', 'nsv', 'flv', 'f4v', 'f4p', 'f4a', 'f4b',
+        ];
+    }
+}

src/Filter.php

@@ -49,6 +49,11 @@ abstract class Save implements FileInterface
      */
     private $save_as;
 
+    /**
+     * @var mixed
+     */
+    private $export_data;
+
     /**
      * Save constructor.
      * @param Validator $validator
@@ -60,18 +65,20 @@ public function __construct(Validator $validator)
 
     /**
      * @param $path
+     * @param callable $export
      * @return array
      */
-    public function save($path)
+    public function save($path, callable $export)
     {
         $this->path = $path;
 
         try {
             $this->validate();
             $this->moveFile();
-            return $this->message(true, "The file \"" . $this->getBaseNameFile() . "\" has been uploaded.");
+            $this->export($export);
+            return $this->output(true, "The file \"" . $this->getBaseNameFile() . "\" has been uploaded.");
         } catch (SaveExceptionInterface $e) {
-            return $this->message(false, $e->getMessage());
+            return $this->output(false, $e->getMessage());
         }
     }
 
@@ -112,19 +119,19 @@ private function moveFile()
 
     /**
      * @param $status
-     * @param $message
+     * @param $output
      * @return array
      */
-    private function message($status, $message)
+    private function output($status, $output)
     {
-        $message = [
+        $output = [
             'status' => $status,
-            'message' => $message,
+            'output' => $output,
         ];
 
         try {
-            $message = array_merge(
-                $message,
+            $output = array_merge(
+                $output,
                 [
                     'file_details' => [
                         'name' => $this->getFileName(),
@@ -137,13 +144,16 @@ private function message($status, $message)
                         'dir_path' => $this->path,
                         'file_path' => $this->file_path,
                         'upload_datetime' => date("Y-m-d H:i:s"),
-                        'stat' => stat($this->file_path)
+                        'stat' => !is_file($this->file_path)?:stat($this->file_path),
+                        'mime_content_type' => !is_file($this->file_path)?:mime_content_type($this->file_path),
+                        'export' => $this->export_data,
                     ]
                 ]
             );
-        } catch (Exception $e) {}
+        } catch (Exception $e) {
+        }
 
-        return $message;
+        return $output;
     }
 
     /**
@@ -181,4 +191,9 @@ public function getSaveAs()
     {
         return $this->save_as;
     }
+
+    private function export(callable $export)
+    {
+        $this->export_data = $export($this->file_path);
+    }
 }

src/Helper.php

@@ -21,7 +21,7 @@
 
 use AYazdanpanah\SaveUploadedFiles\Exception\Exception;
 
-class Files
+class Upload
 {
     /**
      * @param $files
@@ -31,19 +31,24 @@ class Files
     public static function files($files)
     {
         if (!is_array($files) && count($files) > 0) {
-            throw new Exception("File must be an array", 500);
+            throw new Exception("File must be an array");
         }
 
         $extractions = [];
 
         foreach ($files as $file) {
             if (!isset($file['name'], $file['save_to'])) {
-                throw new Exception("Filename or path is not specified", 500);
+                throw new Exception("Filename or path is not specified");
             }
 
             $validator = static::validator(static::mockValidator());
             $override = false;
             $save_as = null;
+            $export = static::mockCallback();
+
+            if(isset($file['export'])){
+                $export = $file['export'];
+            }
 
             if (isset($file['validator'])) {
                 $validator = static::validator($file['validator']);
@@ -61,7 +66,7 @@ public static function files($files)
                 ->file($file['name'])
                 ->setOverride($override)
                 ->setSaveAs($save_as)
-                ->save($file['save_to']);
+                ->save($file['save_to'], $export);
         }
 
         return new Filter($extractions);
@@ -74,26 +79,33 @@ public static function files($files)
      */
     private static function validator($validator): Validator
     {
-        if (!isset($validator['min_size'], $validator['max_size'], $validator['types']) || !is_array($validator['types'])) {
-            throw new Exception("Invalid validator inputs: check min_size, max_size, and types again", 500);
+        if (!isset($validator['min_size'], $validator['max_size'], $validator['allowed_extensions']) || !is_array($validator['allowed_extensions'])) {
+            throw new Exception("Invalid validator inputs: check min_size, max_size, and types again");
         }
 
         return (new Validator())
             ->setMinSize($validator['min_size'])
             ->setMaxSize($validator['max_size'])
-            ->setType($validator['types']);
+            ->setType($validator['allowed_extensions']);
     }
 
     /**
      * @return array
      */
-    private static function mockValidator()
+    private static function mockValidator():array
     {
         return [
             'min_size' => 1,
             'max_size' => 999999,
-            'types' => ['*']
+            'allowed_extensions' => ['*']
 
         ];
     }
+
+    private static function mockCallback(): callable
+    {
+        return function ($filename){
+            return $filename;
+        };
+    }
 }

src/Save.php

@@ -39,7 +39,7 @@ public function validate()
             throw new Exception("The file size is " . intval($this->getFileSize() / 1024) . "KB! It must be at least " . intval($this->getMinSize() / 1024) . "KB");
         }
 
-        if (!in_array($this->getFileExtension(), $this->getType()) && !in_array("*", $this->getType())) {
+        if (!in_array(strtolower($this->getFileExtension()), $this->getTypes()) && !in_array("*", $this->getTypes())) {
             throw new Exception("Sorry, the \"" . $this->getFileExtension() . "\" files are not allowed! Only " . implode(", ", $this->getType()) . " files are allowed. ");
         }
     }

src/Files.php renamed to src/Upload.php

@@ -44,7 +44,7 @@ public function getMaxSize()
     /**
      * @return mixed
      */
-    public function getType()
+    public function getTypes()
     {
         return $this->type;
     }