Merge pull request #303 from gquemener/feature/named-constructor

Support instanciation of object with named constructor

src/Nelmio/Alice/Instances/Instantiator/Methods/ReflectionWithoutConstructor.php

@@ -22,7 +22,7 @@ public function canInstantiate(Fixture $fixture)
     {
         $reflConstruct = new \ReflectionMethod($fixture->getClass(), '__construct');
 
-        return !$reflConstruct->isPublic() || (!$fixture->shouldUseConstructor() && !version_compare(PHP_VERSION, '5.4', '<'));
+        return (!$reflConstruct->isPublic() && '__construct' === $fixture->getConstructorMethod()) || (!$fixture->shouldUseConstructor() && !version_compare(PHP_VERSION, '5.4', '<'));
     }
 
     /**

tests/Nelmio/Alice/Fixtures/LoaderTest.php

@@ -22,6 +22,7 @@ class LoaderTest extends \PHPUnit_Framework_TestCase
     const GROUP = 'Nelmio\Alice\support\models\Group';
     const CONTACT = 'Nelmio\Alice\support\models\Contact';
     const PRIVATE_CONSTRUCTOR_CLASS = 'Nelmio\Alice\support\models\PrivateConstructorClass';
+    const NAMED_CONSTRUCTOR_CLASS = 'Nelmio\Alice\support\models\NamedConstructorClass';
 
     /**
      * @var \Nelmio\Alice\Fixtures\Loader
@@ -105,6 +106,20 @@ public function testCreatePrivateConstructorInstance()
         $this->assertInstanceOf(self::PRIVATE_CONSTRUCTOR_CLASS, $res['test1']);
     }
 
+    public function testCreateNamedConstructorInstance()
+    {
+        $res = $this->loadData([
+            self::NAMED_CONSTRUCTOR_CLASS => [
+                'foo' => [
+                    '__construct' => ['withLambda' => ['λ']],
+                ],
+            ],
+        ]);
+
+        $this->assertInstanceOf(self::NAMED_CONSTRUCTOR_CLASS, $res['foo']);
+        $this->assertSame('λ', $res['foo']->lambda);
+    }
+
     public function testLoadInvalidFile()
     {
         $file = __DIR__.'/../support/fixtures/invalid.php';

tests/Nelmio/Alice/support/models/NamedConstructorClass.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Nelmio\Alice\support\models;
+
+class NamedConstructorClass
+{
+   public $lambda;
+
+   private function __construct($lambda)
+   {
+       $this->lambda = $lambda;
+   }
+
+   public static function withLambda($lambda)
+   {
+       return new self($lambda);
+   }
+}