Refactor duplicate code into protected methods.

Move duplicated code into protected methods. Fewer LOC is generally easier to maintain.
cakephp · Dec 19, 2013 · 2cf8641 · 2cf8641
1 parent 67224bc
commit 2cf8641
Showing 1 changed file with 27 additions and 35 deletions.
diff --git a/Cake/ORM/Associations.php b/Cake/ORM/Associations.php
@@ -98,30 +98,7 @@ public function saveParents(Table $table, Entity $entity, $associations, $option
 		if (empty($associations)) {
 			return $entity;
 		}
-		foreach ($associations as $alias => $nested) {
-			if (is_int($alias)) {
-				$alias = $nested;
-				$nested = [];
-			}
-			$relation = $this->get($alias);
-			if (!$relation) {
-				$msg = __d(
-					'cake_dev',
-					'Cannot save %s, it is not associated to %s',
-					$alias,
-					$table->alias()
-				);
-				throw new \InvalidArgumentException($msg);
-			}
-			if ($relation->isOwningSide($table)) {
-				continue;
-			}
-			if (!empty($nested)) {
-				$options = (array)$nested + $options;
-			}
-			$this->_save($relation, $entity, $options);
-		}
-		return $entity;
+		return $this->_saveAssociations($table, $entity, $associations, $options, false);
 	}
 
 /**
@@ -142,6 +119,21 @@ public function saveChildren(Table $table, Entity $entity, $associations, $optio
 		if (empty($associations)) {
 			return $entity;
 		}
+		return $this->_saveAssociations($table, $entity, $associations, $options, true);
+	}
+
+/**
+ * Helper method for saving an association's data.
+ *
+ * @param Table $table The table the save is currently operating on
+ * @param Entity $entity The entity to save
+ * @param array $associations Array of associations to save.
+ * @param array $options Original options
+ * @param boolean $owningSide Compared with association classes'
+ *   isOwningSide method.
+ * @return void
+ */
+	protected function _saveAssociations($table, $entity, $associations, $options, $owningSide) {
 		foreach ($associations as $alias => $nested) {
 			if (is_int($alias)) {
 				$alias = $nested;
@@ -157,30 +149,30 @@ public function saveChildren(Table $table, Entity $entity, $associations, $optio
 				);
 				throw new \InvalidArgumentException($msg);
 			}
-			if (!$relation->isOwningSide($table)) {
+			if ($relation->isOwningSide($table) !== $owningSide) {
 				continue;
 			}
-			if (!empty($nested)) {
-				$options = (array)$nested + $options;
-			}
-			$this->_save($relation, $entity, $options);
+			$this->_save($relation, $entity, $nested, $options);
 		}
 		return $entity;
 	}
 
 /**
  * Helper method for saving an association's data.
  *
- * @param Association $association
- * @param Entity $entity
- * @param array $options
+ * @param Association $association The association object to save with.
+ * @param Entity $entity The entity to save
+ * @param array $nested Options for deeper associations
+ * @param array $options Original options
  * @return void
  */
-	protected function _save($association, $entity, $options) {
-		$property = $association->property();
-		if (!$entity->dirty($property)) {
+	protected function _save($association, $entity, $nested, $options) {
+		if (!$entity->dirty($association->property())) {
 			return;
 		}
+		if (!empty($nested)) {
+			$options = (array)$nested + $options;
+		}
 		$association->save($entity, $options);
 	}