Updated validation

Author: bor-attila

docs/01-basic-configuration.md

@@ -1,21 +1,12 @@
 ## Basic configuration
 
-The full default configuration looks like this and this is a common configuration, independent if you are using a file
-system or using a cloud provider.
+The minimal configuration:
 
 ```
-protected function _initializeSchema(TableSchemaInterface $schema): TableSchemaInterface
-{
-    // you must define the `photo`'s column file time
-    $schema->setColumnType('photo', 'upload.file');
-    
-    // ... 
-
-    return parent::_initializeSchema($schema);
-}
+$this->addBehavior(\FileUploader\Model\Behavior\UploadBehavior::class, ['photo']);
 ```
 
-then add behavior:
+The minimal configuration equal with the basic configuration:
 
 ```
 $this->addBehavior(\FileUploader\Model\Behavior\UploadBehavior::class, [
@@ -30,6 +21,8 @@ $this->addBehavior(\FileUploader\Model\Behavior\UploadBehavior::class, [
 ]);
 ```
 
+This minimal configuration uses the file system, if you want to use a cloud provider you can extend this config.
+
 ***filePathProcessor***
 
 Default value: null

docs/05-validation.md

@@ -4,6 +4,7 @@ This plugin offers basic validation.
 
 You can validate your file against:
 
+* existence
 * mime type
 * extension
 * file size
@@ -14,6 +15,7 @@ Example:
 $this->addBehavior(\FileUploader\Model\Behavior\UploadBehavior::class, ['image' => [
     // ... your other configs here ....
     'validation' => [
+        'allowEmptyFile' => true,
         'allowedExtensions' => ['jpg', 'pdf'],
         'allowedMimeTypes' => ['application/pdf', 'image/jpg'],
         'fileSize' => [
@@ -24,6 +26,12 @@ $this->addBehavior(\FileUploader\Model\Behavior\UploadBehavior::class, ['image'
 ]]);
 ```
 
+***validation.allowEmptyFile***
+
+Default value: true
+
+The file is required or optional. Possible values: true, false, 'created', 'updated'
+
 ***validation.allowedExtensions***
 
 Default value: []
@@ -61,6 +69,7 @@ $this->addBehavior(\FileUploader\Model\Behavior\UploadBehavior::class, ['image'
     'table' => \App\Model\Table\MyUploadedFilesTable::class,
     'validation' => [
         'method' => 'image',
+        'allowEmptyFile' => true,
         'allowedExtensions' => ['jpg', 'pdf'],
         'allowedMimeTypes' => ['application/pdf', 'image/jpg'],
         'fileSize' => [

src/Model/Behavior/UploadBehavior.php

@@ -12,6 +12,8 @@
 use Cake\ORM\Behavior;
 use Cake\ORM\TableRegistry;
 use Cake\Utility\Hash;
+use Cake\Utility\Text;
+use Cake\Validation\Validation;
 use FileUploader\FilePathProcessor\CloudProcessor;
 use FileUploader\FilePathProcessor\DefaultProcessor;
 use FileUploader\Model\Table\UploadedFilesTable;
@@ -72,11 +74,76 @@ public function initialize(array $config): void
         $this->_config = $configs;
 
         $schema = $this->table()->getSchema();
+        $validator = $this->table()->getValidator();
+
         /** @var string $field */
         foreach (array_keys($this->getConfig()) as $field) {
             $schema->setColumnType($field, 'upload.file');
+            $this->table()->setSchema($schema);
+
+            // set validation rules
+            $validator->allowEmptyFile(
+                $field,
+                __d('file_uploader', 'This field is required'),
+                $this->getConfig($field . '.validation.allowEmptyFile', true)
+            );
+
+            $allowedExtensions = $this->getConfig($field . '.validation.allowedExtensions');
+            if (is_array($allowedExtensions) && !empty($allowedExtensions)) {
+                $validator->add(
+                    $field,
+                    'extension',
+                    [
+                        'rule' => ['extension', $allowedExtensions],
+                        'message' => __d(
+                            'file_uploader',
+                            'Invalid file extension. Allowed file types are: {0}',
+                            implode(', ', $allowedExtensions)
+                        )
+                    ]
+                );
+            }
+
+            $allowedMimeTypes = $this->getConfig($field . '.validation.allowedMimeTypes');
+            if (is_array($allowedExtensions) && !empty($allowedMimeTypes)) {
+                $validator->add(
+                    $field,
+                    'mimeType',
+                    [
+                        'rule' => ['mimeType', $allowedMimeTypes],
+                        'message' => __d(
+                            'file_uploader',
+                            'Invalid file type. Allowed file types are: {0}',
+                            implode(', ', $allowedMimeTypes)
+                        )
+                    ]
+                );
+            }
+
+            $minSize = $this->getConfig($field . '.validation.fileSize.min');
+            if (is_string($minSize)) {
+                $validator->add(
+                    $field,
+                    'fizeSizeMin',
+                    [
+                        'rule' => ['fileSize', Validation::COMPARE_GREATER_OR_EQUAL, Text::parseFileSize($minSize)],
+                        'message' => __d('file_uploader', 'The file must be at least {0}', $minSize)
+                    ]
+                );
+            }
+
+            $maxSize = $this->getConfig($field . '.validation.fileSize.max');
+            if (is_string($maxSize)) {
+                $validator->add(
+                    $field,
+                    'fizeSizeMax',
+                    [
+                        'rule' => ['fileSize', Validation::COMPARE_LESS_OR_EQUAL, Text::parseFileSize($maxSize)],
+                        'message' => __d('file_uploader', 'The file must not exceed {0}', $maxSize)
+                    ]
+                );
+            }
         }
-        $this->table()->setSchema($schema);
     }
 
     /**