php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-12-19 07:07:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix magic getter for ActiveRecord (#15696)

Browse Source
This commit is contained in:
Elvira Sheina
2018-02-20 18:54:17 +05:00
parent 313be2a5d7
commit ef9600234e
4 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/CHANGELOG.md
View File

@@ -4,7 +4,7 @@ Yii Framework 2 Change Log
2.0.15 under development
------------------------
- no changes in this release.
- Bug #15696: Fix magic getter for ActiveRecord (developeruz)
2.0.14 February 18, 2018

2
framework/db/BaseActiveRecord.php
View File

@@ -1728,7 +1728,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
*/
private function setRelationDependencies($name, $relation)
{
if (empty($relation->via)) {
if (empty($relation->via) && $relation->link) {
foreach ($relation->link as $attribute) {
$this->_relationsDependencies[$attribute][$name] = $name;
}

5
tests/data/ar/OrderItem.php
View File

@@ -44,4 +44,9 @@ class OrderItem extends ActiveRecord
{
return $this->hasOne(self::className(), ['item_id' => 'item_id', 'order_id' => 'order_id']);
}
public function getCustom()
{
return Order::find();
}
}

6
tests/framework/db/ActiveRecordTest.php
View File

@@ -1725,4 +1725,10 @@ abstract class ActiveRecordTest extends DatabaseTestCase
->all();
$this->assertCount(3, $orders);
}
public function testCustomARRelation()
{
$orderItem = OrderItem::findOne(1);
$this->assertInstanceOf(Order::class, $orderItem->custom);
}
}