Refactoring

Author: leandrogehlen

src/LinkManyBehavior.php

@@ -180,59 +180,45 @@ protected function prepareRelation($definition, $data)
         $owner = $this->owner;
         $name = $definition->name;
 
-        $relation = $owner->getRelation($name);
         $records = [];
+        $relation = $owner->getRelation($name);
 
-        if ($owner->getIsNewRecord()) {
-            foreach ($data[$name] as $item) {
-                $modelClass = $relation->modelClass;
-                $model = $relation->via ? $modelClass::findOne($item) : new $modelClass();
+        $relateds =  $owner->{$name};
+        $references = $this->initReferences($relateds);
+        $relatedData = !$relation->via ? $this->normalizeData($data[$name], $relation) : $data[$name];
 
-                if (!$relation->via) {
-                    $this->fillRelation($model, $item, $definition->formName);
-                }
+        foreach ($relatedData as $item) {
+            $primaryKey = $this->extractPrimaryKey($item, $relation);
+            $index = !$owner->getIsNewRecord() ? array_search($primaryKey, $references) : false;
 
-                if ($model !== null) {
-                    $this->_inserteds[$name][] = $model;
-                    $records[] = $model;
-                }
+            if ($index === false) {
+                $modelClass = $relation->modelClass;
+                $model = $relation->via ? $modelClass::findOne($item) : new $modelClass();
+            } else {
+                $model = $relateds[$index];
             }
-        } else {
-            $relateds =  $owner->{$name};
-            $references = $this->initReferences($relateds);
-            $relatedData = !$relation->via ? $this->normalizeData($data[$name], $relation) : $data[$name];
-
-            foreach ($relatedData as $item) {
-                $primaryKey = $this->extractPrimaryKey($item, $relation);
 
-                if (($index = array_search($primaryKey, $references)) === false) {
-                    $modelClass = $relation->modelClass;
-                    $model = $relation->via ? $modelClass::findOne($item) : new $modelClass();
-
-                    if ($model !== null) {
-                        $this->_inserteds[$name][] = $model;
-                    }
+            if ($model !== null) {
+                if ($index === false) {
+                    $this->_inserteds[$name][] = $model;
                 } else {
-                    $model = $relateds[$index];
                     $this->_updateds[$name][] = $model;
                 }
 
-                if ($model !== null) {
-                    if (!$relation->via) {
-                        $this->fillRelation($model, $item, $definition->formName);
-                    }
-
-                    $records[] = $model;
+                if (!$relation->via) {
+                    $this->fillRelation($model, $item, $definition->formName);
                 }
+
+                $records[] = $model;
             }
+        }
 
-            $references = $this->initReferences($records);
-            foreach ($relateds as $i => $related) {
-                $primaryKey = $this->normalizePrimaryKey($related->getPrimaryKey());
+        $references = $this->initReferences($records);
+        foreach ($relateds as $i => $related) {
+            $primaryKey = $this->normalizePrimaryKey($related->getPrimaryKey());
 
-                if (array_search($primaryKey, $references) === false) {
-                    $this->_deleteds[$name][] = $relateds[$i];
-                }
+            if (array_search($primaryKey, $references) === false) {
+                $this->_deleteds[$name][] = $relateds[$i];
             }
         }