Add param onlyCoreValidators for getFileRules

Author: rkit

src/actions/UploadAction.php

@@ -56,11 +56,6 @@ class UploadAction extends Action
      * @var ActiveRecord $model
      */
     private $model;
-    /**
-     * @see http://www.yiiframework.com/doc-2.0/guide-tutorial-core-validators.html
-     * @var array $rules
-     */
-    private $rules;
 
     public function init()
     {
@@ -69,12 +64,6 @@ public function init()
         }
 
         $this->model = new $this->modelName();
-        $this->rules = $this->model->getFileRules($this->attribute);
-
-        if (isset($this->rules['imageSize'])) {
-            $this->rules = array_merge($this->rules, $this->rules['imageSize']);
-            unset($this->rules['imageSize']);
-        }
     }
 
     public function run()
@@ -87,8 +76,10 @@ public function run()
             );
         }
 
+        $rules = $this->model->getFileRules($this->attribute, true);
+
         $model = new DynamicModel(compact('file'));
-        $model->addRule('file', $this->type, $this->rules)->validate();
+        $model->addRule('file', $this->type, $rules)->validate();
 
         if ($model->hasErrors()) {
             return $this->response(['error' => $model->getFirstError('file')]);

src/behaviors/FileBehavior.php

@@ -272,11 +272,17 @@ public function isFileProtected($attribute)
      * Get rules
      *
      * @param string $attribute Attribute of a model
+     * @param bool $onlyCoreValidators Only core validators
      * @return array
      */
-    public function getFileRules($attribute)
+    public function getFileRules($attribute, $onlyCoreValidators = false)
     {
-        return ArrayHelper::getValue($this->attributes[$attribute], 'rules', []);
+        $rules = ArrayHelper::getValue($this->attributes[$attribute], 'rules', []);
+        if ($onlyCoreValidators && isset($rules['imageSize'])) {
+            $rules = array_merge($rules, $rules['imageSize']);
+            unset($rules['imageSize']);
+        }
+        return $rules;
     }
 
     /**

tests/RulesTest.php

@@ -13,7 +13,31 @@
 
 class RulesTest extends \PHPUnit_Framework_TestCase
 {
-    public function testBaseFileRules()
+    public function testRules()
+    {
+        $model = new News();
+
+        $rules = $model->getFileRules('image_path');
+        $this->assertArrayHasKey('imageSize', $rules);
+        $this->assertArrayHasKey('mimeTypes', $rules);
+        $this->assertArrayHasKey('extensions', $rules);
+        $this->assertArrayHasKey('maxSize', $rules);
+        $this->assertArrayHasKey('tooBig', $rules);
+    }
+
+    public function testRulesWithOnlyCoreValidators()
+    {
+        $model = new News();
+
+        $rules = $model->getFileRules('image_path', true);
+        $this->assertArrayNotHasKey('imageSize', $rules);
+        $this->assertArrayHasKey('mimeTypes', $rules);
+        $this->assertArrayHasKey('extensions', $rules);
+        $this->assertArrayHasKey('maxSize', $rules);
+        $this->assertArrayHasKey('tooBig', $rules);
+    }
+
+    public function testDescription()
     {
         $model = new News();
 
@@ -23,15 +47,15 @@ public function testBaseFileRules()
         $this->assertContains('File types: JPG, JPEG, PNG', $rules);
     }
 
-    public function testImageWithStrictSize()
+    public function testDescriptionImageWithStrictSize()
     {
         $model = new News();
 
         $rules = $model->getFileRulesDescription('image_strict_size');
         $this->assertContains('Image size: 300x300px', $rules);
     }
 
-    public function testImageWithMinAndMaxSize()
+    public function testDescriptionImageWithMinAndMaxSize()
     {
         $model = new News();
 
@@ -40,47 +64,47 @@ public function testImageWithMinAndMaxSize()
         $this->assertContains('Max. size of image: 300x300px', $rules);
     }
 
-    public function testImageWithMinSize()
+    public function testDescriptionImageWithMinSize()
     {
         $model = new News();
 
         $rules = $model->getFileRulesDescription('image_min_size');
         $this->assertContains('Min. size of image: 300x300px', $rules);
     }
 
-    public function testImageWithMaxSize()
+    public function testDescriptionImageWithMaxSize()
     {
         $model = new News();
 
         $rules = $model->getFileRulesDescription('image_max_size');
         $this->assertContains('Max. size of image: 300x300px', $rules);
     }
 
-    public function testImageWithOnlyMaxWidth()
+    public function testDescriptionImageWithOnlyMaxWidth()
     {
         $model = new News();
 
         $rules = $model->getFileRulesDescription('image_only_maxwidth');
         $this->assertContains('Max. width 300px', $rules);
     }
 
-    public function testImageWithOnlyMaxHeight()
+    public function testDescriptionImageWithOnlyMaxHeight()
     {
         $model = new News();
 
         $rules = $model->getFileRulesDescription('image_only_maxheight');
         $this->assertContains('Max. height 300px', $rules);
     }
 
-    public function testImageWithOnlyMinWidth()
+    public function testDescriptionImageWithOnlyMinWidth()
     {
         $model = new News();
 
         $rules = $model->getFileRulesDescription('image_only_minwidth');
         $this->assertContains('Min. width 300px', $rules);
     }
 
-    public function testImageWithOnlyMinHeight()
+    public function testDescriptionImageWithOnlyMinHeight()
     {
         $model = new News();