Skip to content

Commit 40d6079

Browse files
committed
Refactor test
1 parent 6bcae10 commit 40d6079

File tree

3 files changed

+16
-16
lines changed
  • tests/specs/issue_fix/100_fix_numbering_issue_in_relation_names_in_case_of_more_than_one_similar_belongs_to_relation

3 files changed

+16
-16
lines changed

tests/specs/issue_fix/100_fix_numbering_issue_in_relation_names_in_case_of_more_than_one_similar_belongs_to_relation/index.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ components:
3636
properties:
3737
id:
3838
type: integer
39-
task:
39+
address:
4040
$ref: '#/components/schemas/Address'
41-
related_task:
41+
related_address:
4242
$ref: '#/components/schemas/Address'

tests/specs/issue_fix/100_fix_numbering_issue_in_relation_names_in_case_of_more_than_one_similar_belongs_to_relation/mysql/models/base/Address.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ public function getFoo()
3939
# belongs to relation
4040
public function getBar()
4141
{
42-
return $this->hasOne(\app\models\Bar::class, ['task_id' => 'id']);
42+
return $this->hasOne(\app\models\Bar::class, ['address_id' => 'id']);
4343
}
4444

4545
# belongs to relation
4646
public function getBar2()
4747
{
48-
return $this->hasOne(\app\models\Bar::class, ['related_task_id' => 'id']);
48+
return $this->hasOne(\app\models\Bar::class, ['related_address_id' => 'id']);
4949
}
5050
}

tests/specs/issue_fix/100_fix_numbering_issue_in_relation_names_in_case_of_more_than_one_similar_belongs_to_relation/mysql/models/base/Bar.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
* This is the model class for table "bars".
1111
*
1212
* @property int $id
13-
* @property int $task_id
14-
* @property int $related_task_id
13+
* @property int $address_id
14+
* @property int $related_address_id
1515
*
16-
* @property \app\models\Address $task
17-
* @property \app\models\Address $relatedTask
16+
* @property \app\models\Address $address
17+
* @property \app\models\Address $relatedAddress
1818
*/
1919
abstract class Bar extends \yii\db\ActiveRecord
2020
{
@@ -26,20 +26,20 @@ public static function tableName()
2626
public function rules()
2727
{
2828
return [
29-
'task_id_integer' => [['task_id'], 'integer'],
30-
'task_id_exist' => [['task_id'], 'exist', 'targetRelation' => 'task'],
31-
'related_task_id_integer' => [['related_task_id'], 'integer'],
32-
'related_task_id_exist' => [['related_task_id'], 'exist', 'targetRelation' => 'relatedTask'],
29+
'address_id_integer' => [['address_id'], 'integer'],
30+
'address_id_exist' => [['address_id'], 'exist', 'targetRelation' => 'address'],
31+
'related_address_id_integer' => [['related_address_id'], 'integer'],
32+
'related_address_id_exist' => [['related_address_id'], 'exist', 'targetRelation' => 'relatedAddress'],
3333
];
3434
}
3535

36-
public function getTask()
36+
public function getAddress()
3737
{
38-
return $this->hasOne(\app\models\Address::class, ['id' => 'task_id']);
38+
return $this->hasOne(\app\models\Address::class, ['id' => 'address_id']);
3939
}
4040

41-
public function getRelatedTask()
41+
public function getRelatedAddress()
4242
{
43-
return $this->hasOne(\app\models\Address::class, ['id' => 'related_task_id']);
43+
return $this->hasOne(\app\models\Address::class, ['id' => 'related_address_id']);
4444
}
4545
}

0 commit comments

Comments
 (0)