correct constructor check in ReflectionWithConstructor

nelmio · Dec 23, 2015 · 699b71b · 699b71b
1 parent f9afb65
commit 699b71b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/Nelmio/Alice/Instances/Instantiator/Methods/ReflectionWithConstructor.php b/src/Nelmio/Alice/Instances/Instantiator/Methods/ReflectionWithConstructor.php
@@ -38,7 +38,7 @@ public function __construct(Processor $processor, TypeHintChecker $typeHintCheck
      */
     public function canInstantiate(Fixture $fixture)
     {
-        $refl = new \ReflectionMethod($fixture->getClass(), '__construct');
+        $refl = new \ReflectionMethod($fixture->getClass(), $fixture->getConstructorMethod());
 
         return $fixture->shouldUseConstructor() && $refl->getNumberOfRequiredParameters() <= count($fixture->getConstructorArgs());
     }

diff --git a/tests/Nelmio/Alice/Fixtures/FixtureTest.php b/tests/Nelmio/Alice/Fixtures/FixtureTest.php
@@ -151,16 +151,16 @@ public function testHasNameFlagWillReturnIfNameFLagExists()
 
     public function testGetConstructorMethodWillReturnTheMethodName()
     {
-        $fixture = new Fixture(self::USER, 'user', ['__construct' => ['create' => ['1', '2', '3']]], null);
+        $fixture = new Fixture(self::USER, 'user', ['__construct' => ['create' => ['1']]], null);
 
         $this->assertEquals('create', $fixture->getConstructorMethod());
     }
 
     public function testGetConstructorArgsWillReturnTheArgumentsList()
     {
-        $fixture = new Fixture(self::USER, 'user', ['__construct' => ['create' => ['1', '2', '3']]], null);
+        $fixture = new Fixture(self::USER, 'user', ['__construct' => ['create' => ['1']]], null);
 
-        $this->assertEquals(['1', '2', '3'], $fixture->getConstructorArgs());
+        $this->assertEquals(['1'], $fixture->getConstructorArgs());
     }
 
     public function testShouldUseConstructorWillReturnTrueIfThereIsNoConstructorInTheSpec()

diff --git a/tests/Nelmio/Alice/support/models/User.php b/tests/Nelmio/Alice/support/models/User.php
@@ -19,9 +19,9 @@ public function __construct($username = null, $email = null, \DateTime $birthDat
         $this->birthDate = $birthDate;
     }
 
-    public static function create($username = null, $email = null, \DateTime $birthDate = null)
+    public static function create($username = null)
     {
-        return new static($username . '-from-create', $email, $birthDate);
+        return new static($username . '-from-create', null, null);
     }
 
     public static function bogusCreate($username = null, $email = null, \DateTime $birthDate = null)