Cleanup

Author: SOHELAHMED7

src/lib/ValidationRulesBuilder.php

@@ -151,7 +151,6 @@ private function addRulesByAttributeName(Attribute $attribute):void
         foreach ($patterns as $pattern => $validator) {
             if (empty($attribute->reference) # ignore column name based rules in case of reference/relation # https://github.com/cebe/yii2-openapi/issues/159
                 && preg_match($pattern, strtolower($attribute->columnName))) {
-
                 if (in_array($validator, ['image', 'file'], true)) {
                     if ($attribute->dbType === 'binary') {
                         $addRule($attribute, $validator);

tests/specs/issue_fix/30_add_validation_rules_by_attribute_name_or_pattern/index.php

@@ -9,6 +9,6 @@
     ],
     'generateControllers' => false,
     'generateMigrations' => false,
-    'generateModelFaker' => true, // `generateModels` must be `true` in order to use `generateModelFaker` as `true`
+    'generateModelFaker' => false, // `generateModels` must be `true` in order to use `generateModelFaker` as `true`
 ];
 

tests/specs/issue_fix/30_add_validation_rules_by_attribute_name_or_pattern/mysql/models/User.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class User extends \app\models\base\User
+{
+
+
+}
+

tests/specs/issue_fix/30_add_validation_rules_by_attribute_name_or_pattern/mysql/models/base/User.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace app\models\base;
+
+/**
+ *
+ *
+ * @property int $id
+ * @property string $name name
+ * @property string $photo
+ * @property string $profile_photo
+ * @property string $pdf
+ * @property string $a_file
+ * @property string $profile
+ *
+ */
+abstract class User extends \yii\db\ActiveRecord
+{
+    public static function tableName()
+    {
+        return '{{%users}}';
+    }
+
+    public function rules()
+    {
+        return [
+            'trim' => [['name', 'photo', 'profile_photo', 'pdf', 'a_file', 'profile'], 'trim'],
+            'required' => [['name'], 'required'],
+            'name_string' => [['name'], 'string', 'max' => 128],
+            'photo_image' => [['photo'], 'image'],
+            'profile_photo_image' => [['profile_photo'], 'image'],
+            'pdf_file' => [['pdf'], 'file'],
+            'a_file_file' => [['a_file'], 'file'],
+            'profile_string' => [['profile'], 'string'],
+        ];
+    }
+}

tests/unit/IssueFixTest.php

@@ -366,12 +366,12 @@ public function test30AddValidationRulesByAttributeNameOrPattern()
     {
         $testFile = Yii::getAlias("@specs/issue_fix/30_add_validation_rules_by_attribute_name_or_pattern/index.php");
         $this->runGenerator($testFile);
-//        $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
-//            'recursive' => true,
-//        ]);
-//        $expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/30_add_validation_rules_by_attribute_name_or_pattern/mysql"), [
-//            'recursive' => true,
-//        ]);
-//        $this->checkFiles($actualFiles, $expectedFiles);
+       $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
+           'recursive' => true,
+       ]);
+       $expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/30_add_validation_rules_by_attribute_name_or_pattern/mysql"), [
+           'recursive' => true,
+       ]);
+       $this->checkFiles($actualFiles, $expectedFiles);
     }
 }