Skip to content

Commit ae229f4

Browse files
committed
Fix more failing tests
1 parent 165ea0c commit ae229f4

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed

tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/MenuFaker.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ public static function dependentOn()
4444
{
4545
return [
4646
// just model class names
47-
'Menu',
4847

4948
];
5049
}

tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/base/Account.php

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<?php
22

3+
/**
4+
* This file is generated by Gii, do not change manually!
5+
*/
6+
37
namespace app\models\base;
48

59
/**
@@ -14,7 +18,7 @@
1418
*
1519
* @property \app\models\User $user
1620
* @property \app\models\User $user2
17-
* @property \app\models\User $user3
21+
* @property \app\models\User $user3Rel
1822
*/
1923
abstract class Account extends \yii\db\ActiveRecord
2024
{
@@ -29,11 +33,11 @@ public function rules()
2933
'trim' => [['name', 'paymentMethodName'], 'trim'],
3034
'required' => [['name'], 'required'],
3135
'user_id_integer' => [['user_id'], 'integer'],
32-
'user_id_exist' => [['user_id'], 'exist', 'targetRelation' => 'User'],
36+
'user_id_exist' => [['user_id'], 'exist', 'targetRelation' => 'user'],
3337
'user2_id_integer' => [['user2_id'], 'integer'],
34-
'user2_id_exist' => [['user2_id'], 'exist', 'targetRelation' => 'User2'],
38+
'user2_id_exist' => [['user2_id'], 'exist', 'targetRelation' => 'user2'],
3539
'user3_integer' => [['user3'], 'integer'],
36-
'user3_exist' => [['user3'], 'exist', 'targetRelation' => 'User3'],
40+
'user3_exist' => [['user3'], 'exist', 'targetRelation' => 'user3Rel'],
3741
'name_string' => [['name'], 'string', 'max' => 128],
3842
'paymentMethodName_string' => [['paymentMethodName'], 'string'],
3943
];
@@ -49,7 +53,7 @@ public function getUser2()
4953
return $this->hasOne(\app\models\User::class, ['id' => 'user2_id']);
5054
}
5155

52-
public function getUser3()
56+
public function getUser3Rel()
5357
{
5458
return $this->hasOne(\app\models\User::class, ['id' => 'user3']);
5559
}

tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/base/Menu.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
<?php
22

3+
/**
4+
* This file is generated by Gii, do not change manually!
5+
*/
6+
37
namespace app\models\base;
48

59
/**
6-
*
10+
* This is the model class for table "menus".
711
*
812
* @property int $id
913
* @property string $name
@@ -25,7 +29,7 @@ public function rules()
2529
'trim' => [['name'], 'trim'],
2630
'required' => [['name'], 'required'],
2731
'parent_id_integer' => [['parent_id'], 'integer'],
28-
'parent_id_exist' => [['parent_id'], 'exist', 'targetRelation' => 'Parent'],
32+
'parent_id_exist' => [['parent_id'], 'exist', 'targetRelation' => 'parent'],
2933
'name_string' => [['name'], 'string', 'min' => 3, 'max' => 100],
3034
];
3135
}

tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/base/User.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
<?php
22

3+
/**
4+
* This file is generated by Gii, do not change manually!
5+
*/
6+
37
namespace app\models\base;
48

59
/**
6-
*
10+
* This is the model class for table "users".
711
*
812
* @property int $id
913
* @property string $name

0 commit comments

Comments
 (0)