Merge pull request #326 from GrahamCampbell/2.1-callback

[2.1] Fixed Callbacks

src/Factory.php

@@ -258,7 +258,7 @@ public function create($model, array $attr = array())
 
         $this->persist($object);
 
-        if ($this->triggerCallback($object)) {
+        if ($this->triggerCallback($object, $model)) {
             $this->persist($object);
         }
 
@@ -293,13 +293,12 @@ private function persist($object)
      * Trigger the callback if we have one.
      *
      * @param object $object The model instance.
+     * @param string $model  The model class name.
      *
      * @return bool
      */
-    private function triggerCallback($object)
+    private function triggerCallback($object, $model)
     {
-        $model = get_class($object);
-
         if ($callback = Arr::get($this->callbacks, $model)) {
             $saved = $this->isPendingOrSaved($object);
             $callback($object, $saved);
@@ -559,7 +558,7 @@ public function instance($model, array $attr = array())
     {
         $object = $this->make($model, $attr, false);
 
-        $this->triggerCallback($object);
+        $this->triggerCallback($object, $model);
 
         return $object;
     }

tests/DefinitionTest.php

@@ -72,6 +72,17 @@ public function testGroupDefineOverwrite()
         $this->assertContains('@', $user->email);
     }
 
+    public function testGroupCallback()
+    {
+        $user = FactoryMuffin::create('callbackgroup:UserModelStub');
+
+        $this->assertInstanceOf('UserModelStub', $user);
+        $this->assertEquals('bar', $user->test);
+        $this->assertInternalType('string', $user->name);
+        $this->assertInternalType('boolean', $user->active);
+        $this->assertContains('@', $user->email);
+    }
+
     /**
      * @expectedException \League\FactoryMuffin\Exceptions\NoDefinedFactoryException
      */

tests/factories/definition.php

@@ -22,6 +22,10 @@
     'active'  => 'false',
 ));
 
+FactoryMuffin::define('callbackgroup:UserModelStub', array(), function($obj) {
+    $obj->test = 'bar';
+});
+
 FactoryMuffin::define('foo:DogModelStub', array(
     'name' => 'firstNameMale',
     'age'  => 'numberBetween|1;15',