Validate method now optional and not mandatory

Author: Fredrick Peter

README.md

@@ -11,11 +11,12 @@
 * [Requirements](#requirements)
 * [Installation](#installation)
 * [Instantiate](#instantiate)
-* [Amazon Aws Dump](#amazon-aws-dump)
+* [Amazon Aws S3](#amazon-aws-s3)
 * [Global Config](#global-config)
 * [Response Data](#response-data)
     * [Get Message](#get-message)
     * [Get Status](#get-status)
+    * [Get Class](#get-class)
     * [First](#first)
     * [Get](#get)
 * [Usage](#usage)
@@ -81,7 +82,8 @@ $file = new Tamedevelopers\File\File();
 $file = TameFile();
 ```
 
-## Amazon Aws Dump
+## Amazon Aws S3
+- To use s3 first require `composer require aws/aws-sdk-php`
 - By default Aws load entire SDK we won't be needing
     - Copy the below code into your root `composer.json` and then run `composer update` in terminal.
 
@@ -102,10 +104,11 @@ $file = TameFile();
     - Define as `named argument`
 
 
-| Key           |  Types            |      Description                                  |
-|---------------|-------------------|---------------------------------------------------|
-| message       |  Assoc `array`    | Create all error message in different language    |
-| config        |  Assoc `array`    | Create all needed config data                     |
+| Key           |  Types            |      Description                  |
+|---------------|-------------------|-----------------------------------|
+| message       |  Assoc `array`    | Create all error messages         |
+| config        |  Assoc `array`    | Create all needed config data     |
+| class         |  Assoc `array`    | Create error and success class    |
 
 ```config
 FileConfig(
@@ -135,6 +138,10 @@ FileConfig(
         'driver'        => 'local',
         'structure'     => 'default', // default|year|month|day
         'generate'      => true, // will always generate a unique() name for each uploaded file
+    ],
+    class: [
+        'error'     => 'bg-danger',
+        'success'   => 'bg-success',
     ]
 );
 ```
@@ -144,7 +151,6 @@ FileConfig(
 
 ### Get Message
 - This will return error message
-
 ```
 $file = File::name('html_input_name');
 
@@ -153,13 +159,20 @@ $file->getMessage();
 
 ### Get Status
 - This will return error status code
-
 ```
 $file = File::name('html_input_name');
 
 $file->getStatus();
 ```
 
+### Get Class
+- This will only return msg, if there's an error or success
+```
+$file = File::name('html_input_name');
+
+$file->getClass();
+```
+
 ### First
 - This will get the first uploaded data 
     - You can pass and [optional] param as string `name` \| `url`
@@ -174,9 +187,7 @@ $file->getStatus();
 
 - `or`
 ```
-$upload = File::name('avatar')
-            ->validate()
-            ->save();
+$upload = File::name('avatar')->save();
 
 $upload->first('url);
 $upload->first('name);
@@ -196,7 +207,6 @@ $upload->first('name);
 - `or`
 ```
 $upload = File::name('avatar')
-            ->validate()
             ->save();
 
 $upload->first();
@@ -348,7 +358,6 @@ File::name('avatar')
 | general_media     |   `['audio/mpeg','audio/x-wav', 'video/mp4','video/mpeg','video/quicktime','video/x-msvideo','video/x-ms-wmv']`   |
 | general_file      |   `['application/msword','application/pdf','text/plain','application/zip', 'application/x-zip-compressed', 'multipart/x-zip','application/x-zip-compressed' 'application/x-rar-compressed', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']`|
 
-
 ```
 File::name('avatar')
     ->mime('images');
@@ -378,35 +387,28 @@ File::name('avatar')
 ```
 
 ### Validate
-- Takes an [optional] param as a `callable\|closure` function.
-    - The method needs to be called to validate upload errors before saving
+- [optional] Method can be use, to return error message.
+    - Takes an [optional] param as a `callable\|closure` function.
 
-```
-File::name('banner')
-    ->folder('upload/banner')
-    ->width(700)
-    ->height(400)
-    ->validate();
-```
 
-- `or`
 ```
 File::name('banner')
     ->folder('upload/banner')
     ->validate(function($response){
 
         // perform any other needed task in here
+        echo $response->getMessage();
+        return;
     });
 ```
 
 ### Save
 - Takes an [optional] param as a `callable\|closure` function.
-    - Calling this [method] will automatically save uploaded data on `success`.
+    - Calling this [method] will automatically save the data.
 
 ```
 File::name('banner')
     ->folder('upload/banner')
-    ->validate()
     ->save(function($response){
 
         // perform any other needed task in here
@@ -417,7 +419,6 @@ File::name('banner')
 ```
 $file = File::name('banner')
             ->folder('upload/banner')
-            ->validate()
             ->save();
 
 dd(
@@ -433,7 +434,6 @@ dd(
 ```
 File::name()
     ->folder('upload/banner')
-    ->validate('avatar')
     ->save(function($response){
 
         // perform resize
@@ -459,7 +459,6 @@ File::name()
 ```
 File::name('avatar')
     ->folder('upload/banner')
-    ->validate()
     ->save(function($response){
 
         // perform watermark
@@ -473,7 +472,6 @@ File::name('avatar')
 ```
 File::name('avatar')
     ->folder('upload/banner')
-    ->validate()
     ->save(function($response){
 
         // perform compressor

composer.json

@@ -16,8 +16,7 @@
     ],
     "require": {
         "php": ">=8.0",
-        "tamedevelopers/support": "^1.0.2",
-        "aws/aws-sdk-php": "^3.282.0"
+        "tamedevelopers/support": "^1.0.2"
     },
     "suggest": {
         "aws/aws-sdk-php": "Required to use Amazon `s3` composer require aws/aws-sdk-php (^3.282.0)."
@@ -30,14 +29,5 @@
             "src/helpers.php"
         ]
     },
-    "scripts": {
-        "pre-autoload-dump": "Aws\\Script\\Composer\\Composer::removeUnusedServices"
-    },
-    "extra": {
-        "aws/aws-sdk-php": [
-            "Ec2",
-            "CloudWatch"
-        ]
-    },
     "minimum-stability": "stable"
 }

src/File.php

@@ -58,7 +58,7 @@ static public function name($name = null)
             self::convertToFileHelper()
         );
     }
-    
+
     /**
      * Begin Upload Validation
      *
@@ -83,6 +83,8 @@ public function validate(callable $function = null)
      */
     public function save(callable $function = null)
     {
+        $this->ignoreIfValidatorHasBeenCalled();
+
         if($this->success){
             if(empty($this->folder)){
                 $this->folder = 'public/images';
@@ -320,6 +322,30 @@ public function getStatus()
         return (int) $this->data['status'];
     }
 
+    /**
+     * Get Class Error
+     *
+     * @return string
+     */
+    public function getClass()
+    {
+        if($this->hasError()){
+            return $this->class['error'];
+        }
+
+        return $this->success ? $this->class['success'] : null;
+    }
+
+    /**
+     * Get Uploader name
+     * 
+     * @return string|null
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+    
     /**
      * Check if upload has an error
      *

src/FileStorage.php

@@ -2,10 +2,14 @@
 
 namespace Tamedevelopers\File;
 
+use Exception;
+use Tamedevelopers\Support\Env;
 use Tamedevelopers\Support\Tame;
 use Tamedevelopers\File\Methods\FileMethod;
 use Tamedevelopers\File\Traits\CommonTrait;
+use Tamedevelopers\Support\Capsule\Manager;
 use Tamedevelopers\File\Traits\FileStorageTrait;
+use Tamedevelopers\Support\Capsule\CustomException;
 
 class FileStorage extends FileMethod{
 
@@ -83,8 +87,16 @@ public function handle()
 
         // check if driver is local
         if(!$this->isLocalDriver()){
+            // driver
+            $driver = $this->config['driver'];
+
+            // validate if package is installed
+            $this->isDriverPackageInstalled(
+                $this->getCloudAssociateClass($driver)
+            );
+
             // initialize third-party bucket
-            $bucket = new $this->driverTypes[$this->config['driver']]();
+            $bucket = new $this->driverTypes[$driver]();
 
             // get filename without extension
             $fileName = pathinfo($migrate['name'], PATHINFO_FILENAME);
@@ -133,4 +145,53 @@ private function migrate()
         ]);
     }
 
+    
+    /**
+     * Get Class Associated with drivers, for selected Cloud storage
+     *
+     * @param  string|null $mode
+     * @return void
+     */
+    private function getCloudAssociateClass($mode = null)
+    {
+        return [
+            's3' => [
+                'exists'    => class_exists('Aws\S3\S3Client'),
+                'message'   => "Class Aws\S3\S3Client not found: \nRequire the package by running: `composer require aws/aws-sdk-php`\n",
+            ],
+        ][$mode] ?? [
+            'exists'    => false,
+            'message'   => "Unkown Driver Bucket Selected",
+        ];
+    }
+    
+    /**
+     * Check If Driver Package has been installed
+     *
+     * @param  mixed $class
+     * @return void
+     */
+    static private function isDriverPackageInstalled($data = '')
+    {
+        try {
+            if (!$data['exists']) {
+                throw new CustomException(
+                    $data['message'] . (new Exception)->getTraceAsString()
+                );
+            } 
+        } catch (CustomException $e) {
+            // Handle the exception silently (turn off error reporting)
+            error_reporting(0);
+
+            Manager::setHeaders(404, function() use($e){
+
+                // create error logger
+                Env::bootLogger();
+
+                // Trigger a custom error
+                trigger_error($e->getMessage(), E_USER_ERROR);
+            });
+        }
+    }
+
 }

src/ImageWatermark.php

@@ -118,7 +118,7 @@ private function applyWaterMark($imageSource, $watermarkSource, $position, $sour
         }
 
         // Add the watermark to the source image.
-        if (!imagecopy($imageSource, $watermarkSource, $watermark_x, $watermark_y, 0, 0, $watermark_width, $watermark_height)) {
+        if (!imagecopy($imageSource, $watermarkSource, (int) $watermark_x, (int) $watermark_y, 0, 0, (int) $watermark_width, (int) $watermark_height)) {
             return false;
         }
 

src/Traits/CommonTrait.php

@@ -2,11 +2,21 @@
 
 namespace Tamedevelopers\File\Traits;
 
-/**
- * @property mixed $config
- */
+
 trait CommonTrait{
 
+    /**
+     * Only ignore if validate metho, has been manually called
+     *
+     * @return mixed
+     */
+    public function ignoreIfValidatorHasBeenCalled()
+    {
+        if(!$this->isValidatedCalled){
+            $this->validate();
+        }
+    }
+    
     /**
      * Check if is local driver
      *