@@ -586,7 +586,7 @@ discard block |
||
| 586 | 586 | ); |
| 587 | 587 | |
| 588 | 588 | // Deleted relations |
| 589 | - $initialModels = ArrayHelper::index($this->_oldRelationValue[$relationName], function (BaseActiveRecord $model) { |
|
| 589 | + $initialModels = ArrayHelper::index($this->_oldRelationValue[$relationName], function(BaseActiveRecord $model) { |
|
| 590 | 590 | return implode('-', $model->getPrimaryKey(true)); |
| 591 | 591 | }); |
| 592 | 592 | $initialRelations = $owner->{$relationName}; |
@@ -597,7 +597,7 @@ discard block |
||
| 597 | 597 | // Added relations |
| 598 | 598 | $actualModels = ArrayHelper::index( |
| 599 | 599 | $junctionTablePropertiesUsed ? $initialRelations : $owner->{$relationName}, |
| 600 | - function (BaseActiveRecord $model) { |
|
| 600 | + function(BaseActiveRecord $model) { |
|
| 601 | 601 | return implode('-', $model->getPrimaryKey(true)); |
| 602 | 602 | } |
| 603 | 603 | ); |
@@ -644,10 +644,10 @@ discard block |
||
| 644 | 644 | private function _computePkDiff($initialRelations, $updatedRelations, $forceSave = false) |
| 645 | 645 | { |
| 646 | 646 | // Compute differences between initial relations and the current ones |
| 647 | - $oldPks = ArrayHelper::getColumn($initialRelations, function (BaseActiveRecord $model) { |
|
| 647 | + $oldPks = ArrayHelper::getColumn($initialRelations, function(BaseActiveRecord $model) { |
|
| 648 | 648 | return implode('-', $model->getPrimaryKey(true)); |
| 649 | 649 | }); |
| 650 | - $newPks = ArrayHelper::getColumn($updatedRelations, function (BaseActiveRecord $model) { |
|
| 650 | + $newPks = ArrayHelper::getColumn($updatedRelations, function(BaseActiveRecord $model) { |
|
| 651 | 651 | return implode('-', $model->getPrimaryKey(true)); |
| 652 | 652 | }); |
| 653 | 653 | if ($forceSave) { |
@@ -735,7 +735,7 @@ discard block |
||
| 735 | 735 | /** @var BaseActiveRecord $owner */ |
| 736 | 736 | $owner = $this->owner; |
| 737 | 737 | foreach ($this->_relations as $relationName) { |
| 738 | - if($this->checkRelationsSafe && !$owner->isAttributeSafe($relationName)) continue; |
|
| 738 | + if ($this->checkRelationsSafe && !$owner->isAttributeSafe($relationName)) continue; |
|
| 739 | 739 | $keyName = $this->_getRelationKeyName($relationName); |
| 740 | 740 | if (array_key_exists($keyName, $data)) { |
| 741 | 741 | $owner->{$relationName} = $data[$keyName]; |
@@ -735,7 +735,9 @@ |
||
| 735 | 735 | /** @var BaseActiveRecord $owner */ |
| 736 | 736 | $owner = $this->owner; |
| 737 | 737 | foreach ($this->_relations as $relationName) { |
| 738 | - if($this->checkRelationsSafe && !$owner->isAttributeSafe($relationName)) continue; |
|
| 738 | + if($this->checkRelationsSafe && !$owner->isAttributeSafe($relationName)) { |
|
| 739 | + continue; |
|
| 740 | + } |
|
| 739 | 741 | $keyName = $this->_getRelationKeyName($relationName); |
| 740 | 742 | if (array_key_exists($keyName, $data)) { |
| 741 | 743 | $owner->{$relationName} = $data[$keyName]; |