Implement feedback

Author: SOHELAHMED7

src/lib/ValidationRulesBuilder.php

@@ -53,30 +53,38 @@ public function build():array
             $this->rules['trim'] = new ValidationRule($this->typeScope['trim'], 'trim');
         }
 
-        if (!empty($this->typeScope['ref'])) {
-            $this->addExistRules($this->typeScope['ref']);
-        }
-        foreach ($this->model->indexes as $index) {
-            if ($index->isUnique) {
-                $this->addUniqueRule($index->columns);
+        foreach ($this->model->attributes as $attribute) {
+            if ($this->isIdColumn($attribute)) {
+                continue;
             }
+            $this->defaultRule($attribute);
+        }
+
+        if (!empty($this->typeScope['required'])) {
+            $this->rules['required'] = new ValidationRule($this->typeScope['required'], 'required');
         }
+
         foreach ($this->model->attributes as $attribute) {
-            // column/field/property with name `id` is considered as Primary Key by this library, and it is automatically handled by DB/Yii; so remove it from validation `rules()`
-            if (in_array($attribute->columnName, ['id', $this->model->pkName]) ||
-                in_array($attribute->propertyName, ['id', $this->model->pkName])
-            ) {
+            if ($this->isIdColumn($attribute)) {
                 continue;
             }
             $this->resolveAttributeRules($attribute);
         }
 
+        foreach ($this->model->indexes as $index) {
+            if ($index->isUnique) {
+                $this->addUniqueRule($index->columns);
+            }
+        }
+
+        if (!empty($this->typeScope['ref'])) {
+            $this->addExistRules($this->typeScope['ref']);
+        }
+
         if (!empty($this->typeScope['safe'])) {
             $this->rules['safe'] = new ValidationRule($this->typeScope['safe'], 'safe');
         }
-        if (!empty($this->typeScope['required'])) {
-            $this->rules['required'] = new ValidationRule($this->typeScope['required'], 'required');
-        }
+
         return $this->rules;
     }
 
@@ -93,7 +101,7 @@ private function resolveAttributeRules(Attribute $attribute):void
         }
         if ($attribute->phpType === 'bool' || $attribute->phpType === 'boolean') {
             $this->rules[$attribute->columnName . '_boolean'] = new ValidationRule([$attribute->columnName], 'boolean');
-            $this->defaultRule($attribute);
+//            $this->defaultRule($attribute);
             return;
         }
 
@@ -111,13 +119,13 @@ private function resolveAttributeRules(Attribute $attribute):void
             }
 
             $this->rules[$key] = new ValidationRule([$attribute->columnName], $attribute->dbType, $params);
-            $this->defaultRule($attribute);
+//            $this->defaultRule($attribute);
             return;
         }
 
         if (in_array($attribute->phpType, ['int', 'integer', 'double', 'float']) && !$attribute->isReference()) {
             $this->addNumericRule($attribute);
-            $this->defaultRule($attribute);
+//            $this->defaultRule($attribute);
             return;
         }
         if ($attribute->phpType === 'string' && !$attribute->isReference()) {
@@ -127,10 +135,10 @@ private function resolveAttributeRules(Attribute $attribute):void
             $key = $attribute->columnName . '_in';
             $this->rules[$key] =
                 new ValidationRule([$attribute->columnName], 'in', ['range' => $attribute->enumValues]);
-            $this->defaultRule($attribute);
+//            $this->defaultRule($attribute); // TODO remove
             return;
         }
-        $this->defaultRule($attribute);
+//        $this->defaultRule($attribute);
         $this->addRulesByAttributeName($attribute);
     }
 
@@ -278,4 +286,15 @@ public function __toString()
             }
         };
     }
+
+    private function isIdColumn(Attribute $attribute): bool
+    {
+        // column/field/property with name `id` is considered as Primary Key by this library, and it is automatically handled by DB/Yii; so remove it from validation `rules()`
+        if (in_array($attribute->columnName, ['id', $this->model->pkName]) ||
+            in_array($attribute->propertyName, ['id', $this->model->pkName])
+        ) {
+            return true;
+        }
+        return false;
+    }
 }

tests/specs/issue_fix/22_bug_rules_required_is_generated_before_default/index.yaml

@@ -23,6 +23,7 @@ components:
           maxLength: 128
         paymentMethodName:
           type: string
+          default: card
         verified:
             type: boolean
             default: false

tests/specs/issue_fix/22_bug_rules_required_is_generated_before_default/mysql/migrations_mysql_db/m200000_000000_create_table_accounts.php

@@ -9,7 +9,7 @@ public function up()
     {
         $this->createTable('{{%accounts}}', [
             'id' => $this->primaryKey(),
-            'name' => $this->string(128)->notNull(),
+            'name' => $this->string(128)->notNull()->comment('account name'),
             'paymentMethodName' => $this->text()->null(),
             'verified' => $this->boolean()->notNull()->defaultValue(false),
         ]);

tests/specs/issue_fix/22_bug_rules_required_is_generated_before_default/mysql/models/base/Account.php

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
@@ -22,11 +26,11 @@ public function rules()
     {
         return [
             'trim' => [['name', 'paymentMethodName'], 'trim'],
+            'required' => [['name', 'verified'], 'required'],
             'name_string' => [['name'], 'string', 'max' => 128],
             'paymentMethodName_string' => [['paymentMethodName'], 'string'],
             'verified_boolean' => [['verified'], 'boolean'],
             'verified_default' => [['verified'], 'default', 'value' => false],
-            'required' => [['name', 'verified'], 'required'],
         ];
     }
 }

tests/unit/IssueFixTest.php

@@ -1001,7 +1001,7 @@ public function test74InvalidSchemaReferenceError()
         $this->runActualMigrations();
     }
 
-        // https://github.com/php-openapi/yii2-openapi/issues/22
+    // https://github.com/php-openapi/yii2-openapi/issues/22
     public function test22BugRulesRequiredIsGeneratedBeforeDefault()
     {
         $testFile = Yii::getAlias("@specs/issue_fix/22_bug_rules_required_is_generated_before_default/index.php");
@@ -1014,5 +1014,4 @@ public function test22BugRulesRequiredIsGeneratedBeforeDefault()
         ]);
         $this->checkFiles($actualFiles, $expectedFiles);
     }
-
 }