Doctrine: fix service fillData for collection

juzna · Jul 17, 2011 · 64609eb · 64609eb
1 parent ef2aafc
commit 64609eb
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Nella/Doctrine/Service.php b/Nella/Doctrine/Service.php
@@ -60,13 +60,14 @@ protected function fillData(IEntity $entity, $values)
 
 		foreach ($values as $key => $value) {
 			$method = 'set' . ucfirst($key);
-			if (method_exists($entity, 'get' . ucfirst($key)) && (is_array($value) || $value instanceof \Traversable)) {
+
+			if (method_exists($entity, $method)) {
+				$entity->$method($value);
+			} elseif (method_exists($entity, $method = 'get' . ucfirst($key)) && (is_array($value) || $value instanceof \Traversable)) {
 				$entity->$method()->clear();
 				foreach ($value as $item) {
 					$entity->$method()->add($item);
 				}
-			} elseif (method_exists($entity, $method)) {
-				$entity->$method($value);
 			}
 		}
 	}