From 0250861124e46c450e0c5b6df42d289fdf542b49 Mon Sep 17 00:00:00 2001 From: Alban Jubert Date: Sun, 18 Mar 2018 17:31:37 +0100 Subject: [PATCH] More refactoring --- src/SaveRelationsBehavior.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SaveRelationsBehavior.php b/src/SaveRelationsBehavior.php index 3f2747e..10cb599 100644 --- a/src/SaveRelationsBehavior.php +++ b/src/SaveRelationsBehavior.php @@ -200,7 +200,7 @@ class SaveRelationsBehavior extends Behavior if (empty($fks)) { // Get the right link definition if ($relation->via instanceof BaseActiveRecord) { - /** @var object|array $viaQuery */ + /** @var BaseActiveRecord|array $viaQuery */ $viaQuery = $relation->via; $link = $viaQuery->link; } elseif (is_array($relation->via)) { @@ -297,7 +297,7 @@ class SaveRelationsBehavior extends Behavior if ($relation->multiple === false) { $this->_prepareHasOneRelation($model, $relationName, $event); } else { - $this->_prepareHasManyRelation($model, $relationName, $event); + $this->_prepareHasManyRelation($model, $relationName); } } } @@ -501,7 +501,7 @@ class SaveRelationsBehavior extends Behavior /** @var ActiveQuery $relationModel */ foreach ($owner->{$relationName} as $i => $relationModel) { if ($relationModel->isNewRecord) { - if ($relation->via !== null) { + if (!empty($relation->via)) { if ($relationModel->validate()) { $relationModel->save(); } else { @@ -583,7 +583,7 @@ class SaveRelationsBehavior extends Behavior * @param BaseActiveRecord $model * @param $relationName */ - private function _prepareHasManyRelation(BaseActiveRecord $model, $relationName, ModelEvent $event) + private function _prepareHasManyRelation(BaseActiveRecord $model, $relationName) { /** @var BaseActiveRecord $relationModel */ foreach ($model->{$relationName} as $i => $relationModel) {