Make it possible to set related models, not just plain values.

ddinchev · Feb 19, 2015 · aa5638a · aa5638a
1 parent ad502da
commit aa5638a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/YiiFactoryGirl/Factory.php b/src/YiiFactoryGirl/Factory.php
@@ -224,17 +224,20 @@ public function build($class, array $args = array(), $alias = null)
         $factory = $this->getFactoryData($class);
         $attributes = $factory->getAttributes($args, $alias);
         foreach ($attributes as $key => $value) {
-            if ($obj->hasAttribute($key)) {
-                $obj->setAttribute($key, $value);
-            } else if ($reflection->hasProperty($key)) {
+            if ($reflection->hasProperty($key)) {
                 $property = $reflection->getProperty($key);
                 $property->setAccessible(true);
                 $property->setValue($value);
             } else {
-                throw new FactoryException(\Yii::t(self::LOG_CATEGORY, 'Unknown attribute "{attr} for class {class}.', array(
-                    '{attr}' => $key,
-                    '{class}' => $class
-                )));
+                try {
+                    $obj->__set($key, $value);
+                } catch(\CException $e) {
+                    \Yii::log($e->getMessage(), \CLogger::LEVEL_ERROR);
+                    throw new FactoryException(\Yii::t(self::LOG_CATEGORY, 'Unknown attribute "{attr} for class {class}.', array(
+                        '{attr}' => $key,
+                        '{class}' => $class
+                    )));
+                }
             }
         }
         return $obj;

diff --git a/src/YiiFactoryGirl/FactoryData.php b/src/YiiFactoryGirl/FactoryData.php
@@ -47,7 +47,7 @@ public function getAttributes($args = array(), $alias = null)
         }
         $attributes = array_merge($attributes, $args);
         foreach ($attributes as $key => $value) {
-            $attributes[$key] = Sequence::get($value);
+            $attributes[$key] = is_object($value) ? $value : Sequence::get($value);
         }
         return $attributes;
     }