Fix: Optional method should be called inside closure so that each gen…

…erated value is optional
willdurand · May 16, 2014 · 5e6ad9c · 5e6ad9c
1 parent 09a6a05
commit 5e6ad9c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 7 deletions.
diff --git a/Factory/FormatterFactory.php b/Factory/FormatterFactory.php
@@ -23,14 +23,13 @@ public static function createClosure($generator, $method, array $parameters = ar
             $generator = $generator->unique();
         }
 
-        if (null !== $optional && $generator instanceof Generator) {
-            $generator = $generator->optional((double) $optional);
-        }
+        return function () use ($generator, $method, $parameters, $optional) {
 
-        if (0 === count($parameters)) {
-            return function () use ($generator, $method) { return $generator->$method(); };
-        }
+            if (null !== $optional && $generator instanceof Generator) {
+                $generator = $generator->optional((double)$optional);
+            }
 
-        return function () use ($generator, $method, $parameters) { return call_user_func_array(array($generator, $method), (array) $parameters); };
+            return call_user_func_array(array($generator, $method), (array)$parameters);
+        };
     }
 }
diff --git a/Tests/Factory/FormatterFactoryTest.php b/Tests/Factory/FormatterFactoryTest.php
@@ -22,13 +22,35 @@ public function testCreateClosureWithoutParameters()
             ->expects($this->once())
             ->method('foo')
         ;
+        $generator
+            ->expects($this->never())
+            ->method('optional')
+        ;
 
         $closure = FormatterFactory::createClosure($generator, 'foo');
 
         $this->assertTrue(is_callable($closure));
         $closure();
     }
 
+    public function testCreateClosureWithOptional()
+    {
+        $generator = $this->getMock('Faker\Generator', array('foo','optional'));
+        $generator
+            ->expects($this->once())
+            ->method('foo')
+        ;
+        $generator
+            ->expects($this->once())
+            ->method('optional')
+            ->willReturn($generator)
+        ;
+        $closure = FormatterFactory::createClosure($generator, 'foo', array(), null, 0.1);
+
+        $this->assertTrue(is_callable($closure));
+        $closure();
+    }
+
     public function withParameterProvider()
     {
         return array(