Skip to content

Commit cb0b3d5

Browse files
committed
Fix failing tests 2
1 parent bfaae12 commit cb0b3d5

File tree

22 files changed

+38
-38
lines changed

22 files changed

+38
-38
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ public function rules()
2424
{
2525
return [
2626
'trim' => [['name'], 'trim'],
27-
'name_string' => [['name'], 'string'],
2827
'required' => [['name'], 'required'],
28+
'name_string' => [['name'], 'string'],
2929
];
3030
}
3131
}

tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Ubigpk.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public function rules()
3030
{
3131
return [
3232
'trim' => [['name', 'f'], 'trim'],
33+
'size_default' => [['size'], 'default', 'value' => 'x-small'],
3334
'name_string' => [['name'], 'string', 'max' => 150],
3435
'size_string' => [['size'], 'string'],
3536
'size_in' => [['size'], 'in', 'range' => [
@@ -39,7 +40,6 @@ public function rules()
3940
'large',
4041
'x-large',
4142
]],
42-
'size_default' => [['size'], 'default', 'value' => 'x-small'],
4343
'd_integer' => [['d'], 'integer'],
4444
'e_integer' => [['e'], 'integer'],
4545
'f_string' => [['f'], 'string', 'max' => 12],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ public static function tableName()
2323
public function rules()
2424
{
2525
return [
26-
'billing_factor_integer' => [['billing_factor'], 'integer'],
2726
'billing_factor_default' => [['billing_factor'], 'default', 'value' => 100],
2827
'required' => [['billing_factor'], 'required'],
28+
'billing_factor_integer' => [['billing_factor'], 'integer'],
2929
];
3030
}
3131
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ public function rules()
2525
{
2626
return [
2727
'trim' => [['name'], 'trim'],
28+
'required' => [['name'], 'required'],
2829
'name_string' => [['name'], 'string', 'max' => 128],
2930
'paymentMethodName_string' => [['paymentMethodName'], 'string'],
3031
'paymentMethodName_in' => [['paymentMethodName'], 'in', 'range' => [
3132
'card',
3233
'cash',
3334
'ewallet',
3435
]],
35-
'required' => [['name'], 'required'],
3636
];
3737
}
3838
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ public function rules()
2727
{
2828
return [
2929
'trim' => [['nickname'], 'trim'],
30-
'mailing_id_integer' => [['mailing_id'], 'integer'],
31-
'mailing_id_exist' => [['mailing_id'], 'exist', 'targetRelation' => 'mailing'],
32-
'active_boolean' => [['active'], 'boolean'],
3330
'active_default' => [['active'], 'default', 'value' => false],
34-
'nickname_string' => [['nickname'], 'string'],
3531
'required' => [['mailing_id'], 'required'],
32+
'active_boolean' => [['active'], 'boolean'],
33+
'nickname_string' => [['nickname'], 'string'],
34+
'mailing_id_integer' => [['mailing_id'], 'integer'],
35+
'mailing_id_exist' => [['mailing_id'], 'exist', 'targetRelation' => 'mailing'],
3636
];
3737
}
3838

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ public function rules()
2525
{
2626
return [
2727
'trim' => [['name', 'paymentMethodName'], 'trim'],
28+
'required' => [['name'], 'required'],
2829
'name_string' => [['name'], 'string', 'max' => 128],
2930
'paymentMethodName_string' => [['paymentMethodName'], 'string'],
30-
'required' => [['name'], 'required'],
3131
];
3232
}
3333

tests/specs/issue_fix/162_bug_dollarref_with_x_faker/app/models/base/Order.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ public function rules()
2727
{
2828
return [
2929
'trim' => [['name', 'name2'], 'trim'],
30-
'invoice_id_integer' => [['invoice_id'], 'integer'],
31-
'invoice_id_exist' => [['invoice_id'], 'exist', 'targetRelation' => 'invoice'],
3230
'name_string' => [['name'], 'string'],
3331
'name2_string' => [['name2'], 'string'],
32+
'invoice_id_integer' => [['invoice_id'], 'integer'],
33+
'invoice_id_exist' => [['invoice_id'], 'exist', 'targetRelation' => 'invoice'],
3434
];
3535
}
3636

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ public function rules()
2525
{
2626
return [
2727
'trim' => [['name', 'paymentMethodName'], 'trim'],
28+
'required' => [['name'], 'required'],
2829
'name_string' => [['name'], 'string', 'max' => 128],
2930
'paymentMethodName_string' => [['paymentMethodName'], 'string'],
30-
'required' => [['name'], 'required'],
3131
];
3232
}
3333

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ public function rules()
2727
{
2828
return [
2929
'trim' => [['nickname'], 'trim'],
30-
'account_id_integer' => [['account_id'], 'integer'],
31-
'account_id_exist' => [['account_id'], 'exist', 'targetRelation' => 'account'],
32-
'active_boolean' => [['active'], 'boolean'],
3330
'active_default' => [['active'], 'default', 'value' => false],
34-
'nickname_string' => [['nickname'], 'string'],
3531
'required' => [['account_id'], 'required'],
32+
'active_boolean' => [['active'], 'boolean'],
33+
'nickname_string' => [['nickname'], 'string'],
34+
'account_id_integer' => [['account_id'], 'integer'],
35+
'account_id_exist' => [['account_id'], 'exist', 'targetRelation' => 'account'],
3636
];
3737
}
3838

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ public function rules()
2424
{
2525
return [
2626
'trim' => [['name'], 'trim'],
27-
'name_unique' => [['name'], 'unique'],
28-
'name_string' => [['name'], 'string', 'max' => 150],
2927
'required' => [['name'], 'required'],
28+
'name_string' => [['name'], 'string', 'max' => 150],
29+
'name_unique' => [['name'], 'unique'],
3030
];
3131
}
3232
}

0 commit comments

Comments
 (0)