Create a non saved instance with 'instance' method

thephpleague · Feb 17, 2013 · 7c332cd · 7c332cd
1 parent 5ea52a1
commit 7c332cd
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 9 deletions.
diff --git a/src/Zizaco/FactoryMuff/Facade/FactoryMuff.php b/src/Zizaco/FactoryMuff/Facade/FactoryMuff.php
@@ -16,7 +16,7 @@ class FactoryMuff
      * @access private
      * @static
      */
-    private static $singletown;
+    private static $fmInstance;
 
 
     /**
@@ -27,14 +27,14 @@ class FactoryMuff
      *
      * @return Zizaco\FactoryMuff\FactoryMuff
      */
-    private static function instance()
+    private static function fmInstance()
     {
-        if (! static::$singletown)
+        if (! static::$fmInstance)
         {
-            static::$singletown = new \Zizaco\FactoryMuff\FactoryMuff;
+            static::$fmInstance = new \Zizaco\FactoryMuff\FactoryMuff;
         }
 
-        return static::$singletown;
+        return static::$fmInstance;
     }
 
     /**
@@ -51,7 +51,24 @@ private static function instance()
      */
     public static function create( $model, $attr = array() )
     {
-        return static::instance()->create( $model, $attr );
+        return static::fmInstance()->create( $model, $attr );
+    }
+
+    /**
+     * Creates and saves in db an instance
+     * of Model with mock attributes
+     * 
+     * @param string $model Model class name.
+     * @param array  $attr  Model attributes.
+     *
+     * @access public
+     * @static
+     *
+     * @return mixed Returns the model instance.
+     */
+    public static function instance( $model, $attr = array() )
+    {
+        return static::fmInstance()->instance( $model, $attr );
     }
 
     /**
@@ -68,6 +85,6 @@ public static function create( $model, $attr = array() )
      */
     public static function attributesFor( $model, $attr = array() )
     {
-        return static::instance()->attributesFor( $model, $attr );
+        return static::fmInstance()->attributesFor( $model, $attr );
     }
 }
diff --git a/src/Zizaco/FactoryMuff/FactoryMuff.php b/src/Zizaco/FactoryMuff/FactoryMuff.php
@@ -45,6 +45,15 @@ class FactoryMuff
      * @return mixed Returns the model instance.
      */
     public function create( $model, $attr = array() )
+    {
+        $obj = $this->instance( $model, $attr );
+
+        $obj->save();
+
+        return $obj;
+    }
+
+    public function instance( $model, $attr = array() )
     {
         // Get the factory attributes for that model
         $attr_array = $this->attributesFor( $model, $attr );
@@ -56,8 +65,6 @@ public function create( $model, $attr = array() )
             $obj->$attr = $value;
         }
 
-        $obj->save();
-
         return $obj;
     }