Fix failing tests 2

SOHELAHMED7 · SOHELAHMED7 · commit cb0b3d5e790e · 2025-02-20T15:51:33.000+05:30
diff --git a/tests/specs/id_not_in_rules/app/models/base/Fruit.php b/tests/specs/id_not_in_rules/app/models/base/Fruit.php
@@ -24,8 +24,8 @@ public function rules()
     {
         return [
             'trim' => [['name'], 'trim'],
-            'name_string' => [['name'], 'string'],
             'required' => [['name'], 'required'],
+            'name_string' => [['name'], 'string'],
         ];
     }
 }
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Ubigpk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Ubigpk.php
@@ -30,6 +30,7 @@ public function rules()
     {
         return [
             'trim' => [['name', 'f'], 'trim'],
+            'size_default' => [['size'], 'default', 'value' => 'x-small'],
             'name_string' => [['name'], 'string', 'max' => 150],
             'size_string' => [['size'], 'string'],
             'size_in' => [['size'], 'in', 'range' => [
@@ -39,7 +40,6 @@ public function rules()
                 'large',
                 'x-large',
             ]],
-            'size_default' => [['size'], 'default', 'value' => 'x-small'],
             'd_integer' => [['d'], 'integer'],
             'e_integer' => [['e'], 'integer'],
             'f_string' => [['f'], 'string', 'max' => 12],
diff --git a/tests/specs/issue_fix/153_nullable_false_in_required/app/models/base/Pristine.php b/tests/specs/issue_fix/153_nullable_false_in_required/app/models/base/Pristine.php
@@ -23,9 +23,9 @@ public static function tableName()
     public function rules()
     {
         return [
-            'billing_factor_integer' => [['billing_factor'], 'integer'],
             'billing_factor_default' => [['billing_factor'], 'default', 'value' => 100],
             'required' => [['billing_factor'], 'required'],
+            'billing_factor_integer' => [['billing_factor'], 'integer'],
         ];
     }
 }
diff --git a/tests/specs/issue_fix/158_bug_giiapi_generated_rules_enum_with_trim/maria/models/base/Mailing.php b/tests/specs/issue_fix/158_bug_giiapi_generated_rules_enum_with_trim/maria/models/base/Mailing.php
@@ -25,14 +25,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'],
         ];
     }
 }
diff --git a/tests/specs/issue_fix/159_bug_giiapi_generated_rules_emailid/maria/models/base/Contact.php b/tests/specs/issue_fix/159_bug_giiapi_generated_rules_emailid/maria/models/base/Contact.php
@@ -27,12 +27,12 @@ public function rules()
     {
         return [
             'trim' => [['nickname'], 'trim'],
-            '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'],
+            'active_boolean' => [['active'], 'boolean'],
+            'nickname_string' => [['nickname'], 'string'],
+            'mailing_id_integer' => [['mailing_id'], 'integer'],
+            'mailing_id_exist' => [['mailing_id'], 'exist', 'targetRelation' => 'mailing'],
         ];
     }
 
diff --git a/tests/specs/issue_fix/159_bug_giiapi_generated_rules_emailid/maria/models/base/Mailing.php b/tests/specs/issue_fix/159_bug_giiapi_generated_rules_emailid/maria/models/base/Mailing.php
@@ -25,9 +25,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'],
         ];
     }
 
diff --git a/tests/specs/issue_fix/162_bug_dollarref_with_x_faker/app/models/base/Order.php b/tests/specs/issue_fix/162_bug_dollarref_with_x_faker/app/models/base/Order.php
@@ -27,10 +27,10 @@ public function rules()
     {
         return [
             'trim' => [['name', 'name2'], 'trim'],
-            'invoice_id_integer' => [['invoice_id'], 'integer'],
-            'invoice_id_exist' => [['invoice_id'], 'exist', 'targetRelation' => 'invoice'],
             'name_string' => [['name'], 'string'],
             'name2_string' => [['name2'], 'string'],
+            'invoice_id_integer' => [['invoice_id'], 'integer'],
+            'invoice_id_exist' => [['invoice_id'], 'exist', 'targetRelation' => 'invoice'],
         ];
     }
 
diff --git a/tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/Account.php b/tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/Account.php
@@ -25,9 +25,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'],
         ];
     }
 
diff --git a/tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/Contact.php b/tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/Contact.php
@@ -27,12 +27,12 @@ public function rules()
     {
         return [
             'trim' => [['nickname'], 'trim'],
-            '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'],
+            'active_boolean' => [['active'], 'boolean'],
+            'nickname_string' => [['nickname'], 'string'],
+            'account_id_integer' => [['account_id'], 'integer'],
+            'account_id_exist' => [['account_id'], 'exist', 'targetRelation' => 'account'],
         ];
     }
 
diff --git a/tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/PaymentMethod.php b/tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/PaymentMethod.php
@@ -24,9 +24,9 @@ public function rules()
     {
         return [
             'trim' => [['name'], 'trim'],
-            'name_unique' => [['name'], 'unique'],
-            'name_string' => [['name'], 'string', 'max' => 150],
             'required' => [['name'], 'required'],
+            'name_string' => [['name'], 'string', 'max' => 150],
+            'name_unique' => [['name'], 'unique'],
         ];
     }
 }
diff --git a/tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/base/Account.php b/tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/base/Account.php
@@ -32,14 +32,14 @@ public function rules()
         return [
             'trim' => [['name', 'paymentMethodName'], 'trim'],
             'required' => [['name'], 'required'],
+            'name_string' => [['name'], 'string', 'max' => 128],
+            'paymentMethodName_string' => [['paymentMethodName'], 'string'],
             'user_id_integer' => [['user_id'], 'integer'],
             'user_id_exist' => [['user_id'], 'exist', 'targetRelation' => 'user'],
             'user2_id_integer' => [['user2_id'], 'integer'],
             'user2_id_exist' => [['user2_id'], 'exist', 'targetRelation' => 'user2'],
             'user3_integer' => [['user3'], 'integer'],
             'user3_exist' => [['user3'], 'exist', 'targetRelation' => 'user3Rel'],
-            'name_string' => [['name'], 'string', 'max' => 128],
-            'paymentMethodName_string' => [['paymentMethodName'], 'string'],
         ];
     }
 
diff --git a/tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/base/Menu.php b/tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/base/Menu.php
@@ -28,9 +28,9 @@ public function rules()
         return [
             'trim' => [['name'], 'trim'],
             'required' => [['name'], 'required'],
+            'name_string' => [['name'], 'string', 'min' => 3, 'max' => 100],
             'parent_id_integer' => [['parent_id'], 'integer'],
             'parent_id_exist' => [['parent_id'], 'exist', 'targetRelation' => 'parent'],
-            'name_string' => [['name'], 'string', 'min' => 3, 'max' => 100],
         ];
     }
 
diff --git a/tests/specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/mysql/models/base/Post.php b/tests/specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/mysql/models/base/Post.php
@@ -26,9 +26,9 @@ public function rules()
     {
         return [
             'trim' => [['content'], 'trim'],
+            'content_string' => [['content'], 'string'],
             'user_integer' => [['user'], 'integer'],
             'user_exist' => [['user'], 'exist', 'targetRelation' => 'userRel'],
-            'content_string' => [['content'], 'string'],
         ];
     }
 
diff --git a/tests/specs/issue_fix/3_bug_add_remove_property_and_at_the_same_time_change_it_at_x_indexes/mysql/models/base/Address.php b/tests/specs/issue_fix/3_bug_add_remove_property_and_at_the_same_time_change_it_at_x_indexes/mysql/models/base/Address.php
@@ -26,13 +26,13 @@ public function rules()
     {
         return [
             'trim' => [['name', 'shortName', 'postCode'], 'trim'],
+            'name_string' => [['name'], 'string', 'max' => 64],
+            'shortName_string' => [['shortName'], 'string', 'max' => 64],
+            'postCode_string' => [['postCode'], 'string', 'max' => 64],
             'shortName_postCode_unique' => [['shortName', 'postCode'], 'unique', 'targetAttribute' => [
                 'shortName',
                 'postCode',
             ]],
-            'name_string' => [['name'], 'string', 'max' => 64],
-            'shortName_string' => [['shortName'], 'string', 'max' => 64],
-            'postCode_string' => [['postCode'], 'string', 'max' => 64],
         ];
     }
 }
diff --git a/tests/specs/issue_fix/model_name_more_than_once_in_faker_148/app/models/base/Account.php b/tests/specs/issue_fix/model_name_more_than_once_in_faker_148/app/models/base/Account.php
@@ -24,8 +24,8 @@ public function rules()
     {
         return [
             'trim' => [['name'], 'trim'],
-            'name_string' => [['name'], 'string', 'max' => 40],
             'required' => [['name'], 'required'],
+            'name_string' => [['name'], 'string', 'max' => 40],
         ];
     }
 
diff --git a/tests/specs/issue_fix/model_name_more_than_once_in_faker_148/app/models/base/E123.php b/tests/specs/issue_fix/model_name_more_than_once_in_faker_148/app/models/base/E123.php
@@ -30,13 +30,13 @@ public function rules()
     {
         return [
             'trim' => [['name'], 'trim'],
+            'name_string' => [['name'], 'string'],
             'account_id_integer' => [['account_id'], 'integer'],
             'account_id_exist' => [['account_id'], 'exist', 'targetRelation' => 'account'],
             'account_2_id_integer' => [['account_2_id'], 'integer'],
             'account_2_id_exist' => [['account_2_id'], 'exist', 'targetRelation' => 'account2'],
             'account_3_id_integer' => [['account_3_id'], 'integer'],
             'account_3_id_exist' => [['account_3_id'], 'exist', 'targetRelation' => 'account3'],
-            'name_string' => [['name'], 'string'],
         ];
     }
 
diff --git a/tests/specs/relations_in_faker/app/models/base/A123.php b/tests/specs/relations_in_faker/app/models/base/A123.php
@@ -26,9 +26,9 @@ public function rules()
     {
         return [
             'trim' => [['name'], 'trim'],
+            'name_string' => [['name'], 'string'],
             'b123_id_integer' => [['b123_id'], 'integer'],
             'b123_id_exist' => [['b123_id'], 'exist', 'targetRelation' => 'b123'],
-            'name_string' => [['name'], 'string'],
         ];
     }
 
diff --git a/tests/specs/relations_in_faker/app/models/base/Account.php b/tests/specs/relations_in_faker/app/models/base/Account.php
@@ -24,8 +24,8 @@ public function rules()
     {
         return [
             'trim' => [['name'], 'trim'],
-            'name_string' => [['name'], 'string', 'max' => 40],
             'required' => [['name'], 'required'],
+            'name_string' => [['name'], 'string', 'max' => 40],
         ];
     }
 
diff --git a/tests/specs/relations_in_faker/app/models/base/B123.php b/tests/specs/relations_in_faker/app/models/base/B123.php
@@ -26,9 +26,9 @@ public function rules()
     {
         return [
             'trim' => [['name'], 'trim'],
+            'name_string' => [['name'], 'string'],
             'c123_id_integer' => [['c123_id'], 'integer'],
             'c123_id_exist' => [['c123_id'], 'exist', 'targetRelation' => 'c123'],
-            'name_string' => [['name'], 'string'],
         ];
     }
 
diff --git a/tests/specs/relations_in_faker/app/models/base/Domain.php b/tests/specs/relations_in_faker/app/models/base/Domain.php
@@ -28,10 +28,10 @@ public function rules()
     {
         return [
             'trim' => [['name'], 'trim'],
+            'required' => [['name', 'account_id'], 'required'],
+            'name_string' => [['name'], 'string', 'max' => 128],
             'account_id_integer' => [['account_id'], 'integer'],
             'account_id_exist' => [['account_id'], 'exist', 'targetRelation' => 'account'],
-            'name_string' => [['name'], 'string', 'max' => 128],
-            'required' => [['name', 'account_id'], 'required'],
         ];
     }
 
diff --git a/tests/specs/relations_in_faker/app/models/base/E123.php b/tests/specs/relations_in_faker/app/models/base/E123.php
@@ -26,9 +26,9 @@ public function rules()
     {
         return [
             'trim' => [['name'], 'trim'],
+            'name_string' => [['name'], 'string'],
             'b123_id_integer' => [['b123_id'], 'integer'],
             'b123_id_exist' => [['b123_id'], 'exist', 'targetRelation' => 'b123'],
-            'name_string' => [['name'], 'string'],
         ];
     }
 
diff --git a/tests/specs/relations_in_faker/app/models/base/Routing.php b/tests/specs/relations_in_faker/app/models/base/Routing.php
@@ -34,17 +34,17 @@ public function rules()
     {
         return [
             'trim' => [['path', 'service'], 'trim'],
+            'required' => [['domain_id'], 'required'],
+            'path_string' => [['path'], 'string', 'max' => 255],
+            'ssl_boolean' => [['ssl'], 'boolean'],
+            'redirect_to_ssl_boolean' => [['redirect_to_ssl'], 'boolean'],
+            'service_string' => [['service'], 'string', 'max' => 255],
             'domain_id_integer' => [['domain_id'], 'integer'],
             'domain_id_exist' => [['domain_id'], 'exist', 'targetRelation' => 'domain'],
             'd123_id_integer' => [['d123_id'], 'integer'],
             'd123_id_exist' => [['d123_id'], 'exist', 'targetRelation' => 'd123'],
             'a123_id_integer' => [['a123_id'], 'integer'],
             'a123_id_exist' => [['a123_id'], 'exist', 'targetRelation' => 'a123'],
-            'path_string' => [['path'], 'string', 'max' => 255],
-            'ssl_boolean' => [['ssl'], 'boolean'],
-            'redirect_to_ssl_boolean' => [['redirect_to_ssl'], 'boolean'],
-            'service_string' => [['service'], 'string', 'max' => 255],
-            'required' => [['domain_id'], 'required'],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ public function rules()`
`24`	`24`	`{`
`25`	`25`	`return [`
`26`	`26`	`'trim' => [['name'], 'trim'],`
`27`		`- 'name_string' => [['name'], 'string'],`
`28`	`27`	`'required' => [['name'], 'required'],`
	`28`	`+ 'name_string' => [['name'], 'string'],`
`29`	`29`	`];`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,9 @@ public static function tableName()`
`23`	`23`	`public function rules()`
`24`	`24`	`{`
`25`	`25`	`return [`
`26`		`- 'billing_factor_integer' => [['billing_factor'], 'integer'],`
`27`	`26`	`'billing_factor_default' => [['billing_factor'], 'default', 'value' => 100],`
`28`	`27`	`'required' => [['billing_factor'], 'required'],`
	`28`	`+ 'billing_factor_integer' => [['billing_factor'], 'integer'],`
`29`	`29`	`];`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,14 +25,14 @@ public function rules()`
`25`	`25`	`{`
`26`	`26`	`return [`
`27`	`27`	`'trim' => [['name'], 'trim'],`
	`28`	`+ 'required' => [['name'], 'required'],`
`28`	`29`	`'name_string' => [['name'], 'string', 'max' => 128],`
`29`	`30`	`'paymentMethodName_string' => [['paymentMethodName'], 'string'],`
`30`	`31`	`'paymentMethodName_in' => [['paymentMethodName'], 'in', 'range' => [`
`31`	`32`	`'card',`
`32`	`33`	`'cash',`
`33`	`34`	`'ewallet',`
`34`	`35`	`]],`
`35`		`- 'required' => [['name'], 'required'],`
`36`	`36`	`];`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@ public function rules()`
`25`	`25`	`{`
`26`	`26`	`return [`
`27`	`27`	`'trim' => [['name', 'paymentMethodName'], 'trim'],`
	`28`	`+ 'required' => [['name'], 'required'],`
`28`	`29`	`'name_string' => [['name'], 'string', 'max' => 128],`
`29`	`30`	`'paymentMethodName_string' => [['paymentMethodName'], 'string'],`
`30`		`- 'required' => [['name'], 'required'],`
`31`	`31`	`];`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,10 @@ public function rules()`
`27`	`27`	`{`
`28`	`28`	`return [`
`29`	`29`	`'trim' => [['name', 'name2'], 'trim'],`
`30`		`- 'invoice_id_integer' => [['invoice_id'], 'integer'],`
`31`		`- 'invoice_id_exist' => [['invoice_id'], 'exist', 'targetRelation' => 'invoice'],`
`32`	`30`	`'name_string' => [['name'], 'string'],`
`33`	`31`	`'name2_string' => [['name2'], 'string'],`
	`32`	`+ 'invoice_id_integer' => [['invoice_id'], 'integer'],`
	`33`	`+ 'invoice_id_exist' => [['invoice_id'], 'exist', 'targetRelation' => 'invoice'],`
`34`	`34`	`];`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@ public function rules()`
`24`	`24`	`{`
`25`	`25`	`return [`
`26`	`26`	`'trim' => [['name'], 'trim'],`
`27`		`- 'name_unique' => [['name'], 'unique'],`
`28`		`- 'name_string' => [['name'], 'string', 'max' => 150],`
`29`	`27`	`'required' => [['name'], 'required'],`
	`28`	`+ 'name_string' => [['name'], 'string', 'max' => 150],`
	`29`	`+ 'name_unique' => [['name'], 'unique'],`
`30`	`30`	`];`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,9 @@ public function rules()`
`26`	`26`	`{`
`27`	`27`	`return [`
`28`	`28`	`'trim' => [['content'], 'trim'],`
	`29`	`+ 'content_string' => [['content'], 'string'],`
`29`	`30`	`'user_integer' => [['user'], 'integer'],`
`30`	`31`	`'user_exist' => [['user'], 'exist', 'targetRelation' => 'userRel'],`
`31`		`- 'content_string' => [['content'], 'string'],`
`32`	`32`	`];`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,13 @@ public function rules()`
`26`	`26`	`{`
`27`	`27`	`return [`
`28`	`28`	`'trim' => [['name', 'shortName', 'postCode'], 'trim'],`
	`29`	`+ 'name_string' => [['name'], 'string', 'max' => 64],`
	`30`	`+ 'shortName_string' => [['shortName'], 'string', 'max' => 64],`
	`31`	`+ 'postCode_string' => [['postCode'], 'string', 'max' => 64],`
`29`	`32`	`'shortName_postCode_unique' => [['shortName', 'postCode'], 'unique', 'targetAttribute' => [`
`30`	`33`	`'shortName',`
`31`	`34`	`'postCode',`
`32`	`35`	`]],`
`33`		`- 'name_string' => [['name'], 'string', 'max' => 64],`
`34`		`- 'shortName_string' => [['shortName'], 'string', 'max' => 64],`
`35`		`- 'postCode_string' => [['postCode'], 'string', 'max' => 64],`
`36`	`36`	`];`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,13 +30,13 @@ public function rules()`
`30`	`30`	`{`
`31`	`31`	`return [`
`32`	`32`	`'trim' => [['name'], 'trim'],`
	`33`	`+ 'name_string' => [['name'], 'string'],`
`33`	`34`	`'account_id_integer' => [['account_id'], 'integer'],`
`34`	`35`	`'account_id_exist' => [['account_id'], 'exist', 'targetRelation' => 'account'],`
`35`	`36`	`'account_2_id_integer' => [['account_2_id'], 'integer'],`
`36`	`37`	`'account_2_id_exist' => [['account_2_id'], 'exist', 'targetRelation' => 'account2'],`
`37`	`38`	`'account_3_id_integer' => [['account_3_id'], 'integer'],`
`38`	`39`	`'account_3_id_exist' => [['account_3_id'], 'exist', 'targetRelation' => 'account3'],`
`39`		`- 'name_string' => [['name'], 'string'],`
`40`	`40`	`];`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,10 @@ public function rules()`
`28`	`28`	`{`
`29`	`29`	`return [`
`30`	`30`	`'trim' => [['name'], 'trim'],`
	`31`	`+ 'required' => [['name', 'account_id'], 'required'],`
	`32`	`+ 'name_string' => [['name'], 'string', 'max' => 128],`
`31`	`33`	`'account_id_integer' => [['account_id'], 'integer'],`
`32`	`34`	`'account_id_exist' => [['account_id'], 'exist', 'targetRelation' => 'account'],`
`33`		`- 'name_string' => [['name'], 'string', 'max' => 128],`
`34`		`- 'required' => [['name', 'account_id'], 'required'],`
`35`	`35`	`];`
`36`	`36`	`}`
`37`	`37`