added hasError() and size() convertion fix

Author: Fredrick Peter

README.md

@@ -37,6 +37,7 @@
   * [Get Mime Type](#get-mime-type)
   * [Not Empty](#not-empty)
   * [Is Empty](#is-empty)
+  * [Has Error](#has-error)
   * [Mime Types](#mime-types)
 * [Useful links](#useful-links)
 
@@ -434,6 +435,17 @@ File::has('avatar');
 File::isEmpty('avatar')
 ```
 
+### Has Error
+- Returns true or false. Check if there's an error in the upload
+
+```
+$file = File::name('avatar')
+
+if($file->hasError()){
+
+}
+```
+
 ### Mime Types
 ```
 'video'         =>  ['.mp4', '.mpeg', '.mov', '.avi', '.wmv'],

src/File.php

@@ -183,7 +183,7 @@ public function driver($driver = null)
         $driver = Str::lower($driver);
 
         // only change the default driver if found
-        if(in_array($driver, array_keys($this->driverTypes)) && Tame::isInternetAvailable()){
+        if(in_array($driver, array_keys($this->driverTypes))){
             $this->config['driver'] = $driver;
         }
 
@@ -228,8 +228,8 @@ public function structure($structure)
     public function size($size = null)
     {
         $this->config['size'] = Tame::sizeToBytes(
-            !empty($size) && $size >= 1024 
-                ? Tame::byteToUnit($size) 
+            !empty($size) && (int) $size >= 1024
+                ? Tame::byteToUnit($size)
                 : $size ?? '2mb'
         );
 
@@ -319,6 +319,22 @@ public function getStatus()
     {
         return $this->data['status'];
     }
+    
+    /**
+     * Check if upload has an error
+     *
+     * @return int|null
+     */
+    public function hasError()
+    {
+        $status = $this->getStatus();
+        if(!empty($status) && !$status == 0)
+        {
+            return true;
+        }
+
+        return false;
+    }
 
     /**
      * Get First Element of Uploads

src/Traits/FileTrait.php

@@ -81,7 +81,7 @@ public function globalConfig($message = [], $config = [], $filterError = [])
 
         // Convert size to Bytes
         $config['size'] = Tame::sizeToBytes(
-            !empty($config['size']) && $config['size'] >= 1024 
+            !empty($config['size']) && (int) $config['size'] >= 1024 
                 ? Tame::byteToUnit($config['size']) 
                 : $config['size'] ?? '2mb'
         );
@@ -96,7 +96,7 @@ public function globalConfig($message = [], $config = [], $filterError = [])
 
         // check for valid driver type
         // only change the default driver if found
-        if(in_array($config['driver'], array_keys($this->driverTypes)) && Tame::isInternetAvailable()){
+        if(in_array($config['driver'], array_keys($this->driverTypes))){
             $config['driver'] = $config['driver'];
         }
 

src/Traits/FileValidatorTrait.php

@@ -68,11 +68,11 @@ private function proceedToValidate()
     {
         // error tracking
         $errors = [];
+        $validationAttempt = false;
 
         // initilize configuration if not called
         $this->callConfigIfNotCalled();
 
-        
         /**
         * Select file to upload. - error 401
         */
@@ -90,7 +90,7 @@ private function proceedToValidate()
 
         // begin multple validation
         else{
-            
+            $validationAttempt = true;
             foreach($this->fileItemsData() as $key => $file){
 
                 // Mime types
@@ -180,11 +180,13 @@ private function proceedToValidate()
 
         // if no error was found in the error array
         if(empty($errors)){
-            $this->data = [
-                "status"    => 200,
-                "message"   => $this->translation('200'),
-            ];
-            $this->success = true;
+            if($validationAttempt){
+                $this->data = [
+                    "status"    => 200,
+                    "message"   => $this->translation('200'),
+                ];
+                $this->success = true;
+            }
         }
 
         return $this;

test/index1.php

@@ -24,17 +24,19 @@
 
 
 // or more methods chaining
-File::name('avatar')
+File::name('avatar2')
     ->limit(3)
     ->mime('files')
-    ->driver('s3')
+    // ->driver('s3')
     ->folder('public/images')
     ->validate()
     ->save();
 
 
 // closure/callable on save() and validate()
 $upload = File::name('banners')
+            ->size('50kb')
+            ->filterError([401])
             ->validate()
             ->save(function($response){
 
@@ -84,9 +86,12 @@
             Upload file
         </h3>
 
-        <div style="background: #f7b9b9; margin: 0 auto 50px; width: 100%; max-width: 600px; padding: 20px; font-size: 18px">
-            <?= $upload->getMessage(); ?>
-        </div>
+        <?php if($upload->hasError()) {?>
+            <div style="background: #f7b9b9; margin: 0 auto 50px; width: 100%; max-width: 600px; padding: 20px; font-size: 18px">
+                <?= $upload->getMessage(); ?>
+            </div>
+        <?php } ?>
+
 
         <!--file upload-->
         <div class="col-sm-12 mt-3" style="margin: 0 0 30px;">