Resolve: Bug: rules() "required" is generated before "*_default" #22

src/lib/ValidationRulesBuilder.php

@@ -10,8 +10,6 @@
 use cebe\yii2openapi\lib\items\Attribute;
 use cebe\yii2openapi\lib\items\DbModel;
 use cebe\yii2openapi\lib\items\ValidationRule;
-use yii\helpers\VarDumper;
-use yii\validators\DateValidator;
 use function count;
 use function implode;
 use function in_array;
@@ -53,9 +51,6 @@ public function build():array
             $this->rules['trim'] = new ValidationRule($this->typeScope['trim'], 'trim');
         }
 
-        if (!empty($this->typeScope['required'])) {
-            $this->rules['required'] = new ValidationRule($this->typeScope['required'], 'required');
-        }
         if (!empty($this->typeScope['ref'])) {
             $this->addExistRules($this->typeScope['ref']);
         }
@@ -77,6 +72,9 @@ public function build():array
         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;
     }
 

tests/DbTestCase.php

@@ -3,12 +3,12 @@
 namespace tests;
 
 use cebe\yii2openapi\generator\ApiGenerator;
+use SamIT\Yii2\MariaDb\Schema as MariaDbSchema;
 use Yii;
-use yii\di\Container;
 use yii\db\mysql\Schema as MySqlSchema;
 use yii\db\pgsql\Schema as PgSqlSchema;
-use \SamIT\Yii2\MariaDb\Schema as MariaDbSchema;
-use yii\helpers\{ArrayHelper, VarDumper, StringHelper, Console};
+use yii\di\Container;
+use yii\helpers\{ArrayHelper, StringHelper};
 use yii\helpers\FileHelper;
 
 class DbTestCase extends \PHPUnit\Framework\TestCase
@@ -101,7 +101,6 @@ protected function compareFiles(array $actual, string $testFile)
         foreach ($actual as $file) {
             $expectedFile = str_replace('@app', substr($testFile, 0, -4), $file);
             $actualFile = str_replace('@app', Yii::getAlias('@app'), $file);
-            // exec('cp '.$actualFile.' '.$expectedFile);
             $this->checkFiles([$actualFile], [$expectedFile]);
         }
     }
@@ -127,6 +126,7 @@ protected function checkFiles(array $actual, array $expected)
                 );
             }
 
+            // exec('cp '.$file.' '.$expectedFilePath);
             $this->assertFileEquals($expectedFilePath, $file, "Failed asserting that file contents of\n$file\nare equal to file contents of\n$expectedFilePath \n\n cp $file $expectedFilePath \n\n ");
         }
     }

tests/specs/blog/models/base/Category.php

@@ -22,11 +22,11 @@ public function rules()
     {
         return [
             'trim' => [['title'], 'trim'],
-            'required' => [['title', 'active'], 'required'],
             'title_unique' => [['title'], 'unique'],
             'title_string' => [['title'], 'string', 'max' => 255],
             'active_boolean' => [['active'], 'boolean'],
             'active_default' => [['active'], 'default', 'value' => false],
+            'required' => [['title', 'active'], 'required'],
         ];
     }
 

tests/specs/blog/models/base/Comment.php

@@ -26,7 +26,6 @@ public function rules()
     {
         return [
             'trim' => [['post_id'], 'trim'],
-            'required' => [['post_id', 'author_id', 'message', 'created_at'], 'required'],
             'post_id_string' => [['post_id'], 'string', 'max' => 128],
             'post_id_exist' => [['post_id'], 'exist', 'targetRelation' => 'Post'],
             'author_id_integer' => [['author_id'], 'integer'],
@@ -35,6 +34,7 @@ public function rules()
             'meta_data_default' => [['meta_data'], 'default', 'value' => []],
             'created_at_integer' => [['created_at'], 'integer'],
             'safe' => [['message', 'meta_data'], 'safe'],
+            'required' => [['post_id', 'author_id', 'message', 'created_at'], 'required'],
         ];
     }
 

tests/specs/blog/models/base/Post.php

@@ -28,7 +28,6 @@ public function rules()
     {
         return [
             'trim' => [['title', 'slug', 'created_at'], 'trim'],
-            'required' => [['title', 'category_id', 'active'], 'required'],
             'category_id_integer' => [['category_id'], 'integer'],
             'category_id_exist' => [['category_id'], 'exist', 'targetRelation' => 'Category'],
             'created_by_id_integer' => [['created_by_id'], 'integer'],
@@ -40,6 +39,7 @@ public function rules()
             'active_boolean' => [['active'], 'boolean'],
             'active_default' => [['active'], 'default', 'value' => false],
             'created_at_date' => [['created_at'], 'date', 'format' => 'php:Y-m-d'],
+            'required' => [['title', 'category_id', 'active'], 'required'],
         ];
     }
 

tests/specs/blog/models/base/User.php

@@ -25,7 +25,6 @@ public function rules()
     {
         return [
             'trim' => [['username', 'email', 'password', 'role', 'created_at'], 'trim'],
-            'required' => [['username', 'email', 'password'], 'required'],
             'username_unique' => [['username'], 'unique'],
             'email_unique' => [['email'], 'unique'],
             'username_string' => [['username'], 'string', 'max' => 200],
@@ -37,6 +36,7 @@ public function rules()
             'flags_integer' => [['flags'], 'integer'],
             'flags_default' => [['flags'], 'default', 'value' => 0],
             'created_at_datetime' => [['created_at'], 'datetime', 'format' => 'php:Y-m-d H:i:s'],
+            'required' => [['username', 'email', 'password'], 'required'],
         ];
     }
 }

tests/specs/blog_v2/models/base/Category.php

@@ -23,10 +23,10 @@ public function rules()
     {
         return [
             'trim' => [['title', 'cover'], 'trim'],
-            'required' => [['title', 'cover', 'active'], 'required'],
             'title_string' => [['title'], 'string', 'max' => 100],
             'cover_string' => [['cover'], 'string'],
             'active_boolean' => [['active'], 'boolean'],
+            'required' => [['title', 'cover', 'active'], 'required'],
         ];
     }
 

tests/specs/blog_v2/models/base/Comment.php

@@ -26,7 +26,6 @@ public function rules()
     {
         return [
             'trim' => [['message', 'meta_data', 'created_at'], 'trim'],
-            'required' => [['post_id', 'message', 'created_at'], 'required'],
             'post_id_integer' => [['post_id'], 'integer'],
             'post_id_exist' => [['post_id'], 'exist', 'targetRelation' => 'Post'],
             'user_id_integer' => [['user_id'], 'integer'],
@@ -35,6 +34,7 @@ public function rules()
             'meta_data_string' => [['meta_data'], 'string', 'min' => 1, 'max' => 300],
             'meta_data_default' => [['meta_data'], 'default', 'value' => ''],
             'created_at_datetime' => [['created_at'], 'datetime', 'format' => 'php:Y-m-d H:i:s'],
+            'required' => [['post_id', 'message', 'created_at'], 'required'],
         ];
     }
 

tests/specs/blog_v2/models/base/Post.php

@@ -30,7 +30,6 @@ public function rules()
     {
         return [
             'trim' => [['title', 'slug', 'created_at'], 'trim'],
-            'required' => [['title', 'category_id', 'active'], 'required'],
             'category_id_integer' => [['category_id'], 'integer'],
             'category_id_exist' => [['category_id'], 'exist', 'targetRelation' => 'Category'],
             'created_by_id_integer' => [['created_by_id'], 'integer'],
@@ -46,6 +45,7 @@ public function rules()
             'lang_default' => [['lang'], 'default', 'value' => 'ru'],
             'active_boolean' => [['active'], 'boolean'],
             'created_at_date' => [['created_at'], 'date', 'format' => 'php:Y-m-d'],
+            'required' => [['title', 'category_id', 'active'], 'required'],
         ];
     }
 

tests/specs/blog_v2/models/base/Tag.php

@@ -22,14 +22,14 @@ public function rules()
     {
         return [
             'trim' => [['name'], 'trim'],
-            'required' => [['name', 'lang'], 'required'],
             'name_unique' => [['name'], 'unique'],
             'name_string' => [['name'], 'string', 'max' => 100],
             'lang_string' => [['lang'], 'string'],
             'lang_in' => [['lang'], 'in', 'range' => [
                 'ru',
                 'eng',
             ]],
+            'required' => [['name', 'lang'], 'required'],
         ];
     }
 

tests/specs/blog_v2/models/base/User.php

@@ -25,7 +25,6 @@ public function rules()
     {
         return [
             'trim' => [['login', 'email', 'password', 'created_at'], 'trim'],
-            'required' => [['login', 'email', 'password'], 'required'],
             'login_unique' => [['login'], 'unique'],
             'email_unique' => [['email'], 'unique'],
             'login_string' => [['login'], 'string'],
@@ -41,6 +40,7 @@ public function rules()
             'flags_integer' => [['flags'], 'integer'],
             'flags_default' => [['flags'], 'default', 'value' => 0],
             'created_at_datetime' => [['created_at'], 'datetime', 'format' => 'php:Y-m-d H:i:s'],
+            'required' => [['login', 'email', 'password'], 'required'],
         ];
     }
 }

tests/specs/change_column_name/maria/app/models/base/ColumnNameChange.php

@@ -21,8 +21,8 @@ public function rules()
     {
         return [
             'trim' => [['name'], 'trim'],
-            'required' => [['name'], 'required'],
             'name_string' => [['name'], 'string', 'max' => 255],
+            'required' => [['name'], 'required'],
         ];
     }
 }

tests/specs/change_column_name/mysql/app/models/base/ColumnNameChange.php

@@ -21,8 +21,8 @@ public function rules()
     {
         return [
             'trim' => [['name'], 'trim'],
-            'required' => [['name'], 'required'],
             'name_string' => [['name'], 'string', 'max' => 255],
+            'required' => [['name'], 'required'],
         ];
     }
 }

tests/specs/change_column_name/pgsql/app/models/base/ColumnNameChange.php

@@ -21,8 +21,8 @@ public function rules()
     {
         return [
             'trim' => [['name'], 'trim'],
-            'required' => [['name'], 'required'],
             'name_string' => [['name'], 'string', 'max' => 255],
+            'required' => [['name'], 'required'],
         ];
     }
 }

tests/specs/fk_col_name/app/models/base/User.php

@@ -20,8 +20,8 @@ public function rules()
     {
         return [
             'trim' => [['name'], 'trim'],
-            'required' => [['name'], 'required'],
             'name_string' => [['name'], 'string'],
+            'required' => [['name'], 'required'],
         ];
     }
 }

tests/specs/fk_col_name_index/app/models/base/User.php

@@ -20,8 +20,8 @@ public function rules()
     {
         return [
             'trim' => [['name'], 'trim'],
-            'required' => [['name'], 'required'],
             'name_string' => [['name'], 'string'],
+            'required' => [['name'], 'required'],
         ];
     }
 }

tests/specs/id_not_in_rules/app/models/base/Fruit.php

@@ -20,8 +20,8 @@ public function rules()
     {
         return [
             'trim' => [['name'], 'trim'],
-            'required' => [['name'], 'required'],
             'name_string' => [['name'], 'string'],
+            'required' => [['name'], 'required'],
         ];
     }
 }

tests/specs/issue_fix/153_nullable_false_in_required/app/models/base/Pristine.php

@@ -19,9 +19,9 @@ public static function tableName()
     public function rules()
     {
         return [
-            'required' => [['billing_factor'], 'required'],
             'billing_factor_integer' => [['billing_factor'], 'integer'],
             'billing_factor_default' => [['billing_factor'], 'default', 'value' => 100],
+            'required' => [['billing_factor'], 'required'],
         ];
     }
 }

tests/specs/issue_fix/158_bug_giiapi_generated_rules_enum_with_trim/maria/models/base/Mailing.php

@@ -21,14 +21,14 @@ public function rules()
     {
         return [
             'trim' => [['name'], 'trim'],
-            'required' => [['name'], 'required'],
             'name_string' => [['name'], 'string', 'max' => 128],
             'paymentMethodName_string' => [['paymentMethodName'], 'string'],
             'paymentMethodName_in' => [['paymentMethodName'], 'in', 'range' => [
                 'card',
                 'cash',
                 'ewallet',
             ]],
+            'required' => [['name'], 'required'],
         ];
     }
 }

tests/specs/issue_fix/159_bug_giiapi_generated_rules_emailid/maria/models/base/Contact.php

@@ -23,12 +23,12 @@ public function rules()
     {
         return [
             'trim' => [['nickname'], 'trim'],
-            'required' => [['mailing_id'], 'required'],
             'mailing_id_integer' => [['mailing_id'], 'integer'],
             'mailing_id_exist' => [['mailing_id'], 'exist', 'targetRelation' => 'Mailing'],
             'active_boolean' => [['active'], 'boolean'],
             'active_default' => [['active'], 'default', 'value' => false],
             'nickname_string' => [['nickname'], 'string'],
+            'required' => [['mailing_id'], 'required'],
         ];
     }
 

tests/specs/issue_fix/159_bug_giiapi_generated_rules_emailid/maria/models/base/Mailing.php

@@ -21,9 +21,9 @@ public function rules()
     {
         return [
             'trim' => [['name', 'paymentMethodName'], 'trim'],
-            'required' => [['name'], 'required'],
             'name_string' => [['name'], 'string', 'max' => 128],
             'paymentMethodName_string' => [['paymentMethodName'], 'string'],
+            'required' => [['name'], 'required'],
         ];
     }
 }

tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/Account.php

@@ -21,9 +21,9 @@ public function rules()
     {
         return [
             'trim' => [['name', 'paymentMethodName'], 'trim'],
-            'required' => [['name'], 'required'],
             'name_string' => [['name'], 'string', 'max' => 128],
             'paymentMethodName_string' => [['paymentMethodName'], 'string'],
+            'required' => [['name'], 'required'],
         ];
     }
 }

tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/Contact.php

@@ -23,12 +23,12 @@ public function rules()
     {
         return [
             'trim' => [['nickname'], 'trim'],
-            'required' => [['account_id'], 'required'],
             'account_id_integer' => [['account_id'], 'integer'],
             'account_id_exist' => [['account_id'], 'exist', 'targetRelation' => 'Account'],
             'active_boolean' => [['active'], 'boolean'],
             'active_default' => [['active'], 'default', 'value' => false],
             'nickname_string' => [['nickname'], 'string'],
+            'required' => [['account_id'], 'required'],
         ];
     }
 

tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/PaymentMethod.php

@@ -20,9 +20,9 @@ public function rules()
     {
         return [
             'trim' => [['name'], 'trim'],
-            'required' => [['name'], 'required'],
             'name_unique' => [['name'], 'unique'],
             'name_string' => [['name'], 'string', 'max' => 150],
+            'required' => [['name'], 'required'],
         ];
     }
 }

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

@@ -0,0 +1,13 @@
+<?php
+
+return [
+    'openApiPath' => '@specs/issue_fix/22_bug_rules_required_is_generated_before_default/index.yaml',
+    'generateUrls' => false,
+    'generateModels' => true,
+    'excludeModels' => [
+        'Error',
+    ],
+    'generateControllers' => false,
+    'generateMigrations' => true,
+    'generateModelFaker' => true, // `generateModels` must be `true` in order to use `generateModelFaker` as `true`
+];

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

@@ -0,0 +1,35 @@
+openapi: 3.0.3
+
+info:
+  title: 'Bug: rules() "required" is generated before "*_default" #22'
+  version: 1.0.0
+
+components:
+  schemas:
+    Account:
+      description: Account
+      type: object
+      required:
+        - id
+        - name
+        - verified
+      properties:
+        id:
+          type: integer
+          readOnly: true
+        name:
+          description: account name
+          type: string
+          maxLength: 128
+        paymentMethodName:
+          type: string
+        verified:
+            type: boolean
+            default: false
+
+paths:
+  '/account':
+    get:
+      responses:
+        '200':
+          description: Account info