Fix error on static factory with associative array

nelmio · Apr 14, 2017 · 16505e2 · 16505e2
1 parent 056f173
commit 16505e2
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 1 deletion.
diff --git a/src/Generator/Instantiator/Chainable/StaticFactoryInstantiator.php b/src/Generator/Instantiator/Chainable/StaticFactoryInstantiator.php
@@ -47,7 +47,7 @@ protected function createInstance(FixtureInterface $fixture)
             $arguments = [];
         }
 
-        $instance = $factory::$method(...$arguments);
+        $instance = $factory::$method(...array_values($arguments));
         if (false === $instance instanceof $class) {
             throw InstantiationExceptionFactory::createForInvalidInstanceType($fixture, $instance);
         }

diff --git a/tests/Generator/Instantiator/Chainable/StaticFactoryInstantiatorTest.php b/tests/Generator/Instantiator/Chainable/StaticFactoryInstantiatorTest.php
@@ -137,6 +137,27 @@ public function testInstantiatesObjectWithFactoryAndArguments()
         $this->assertEquals($expected, $actual);
     }
 
+    public function testInstantiatesObjectWithFactoryAndNamedArguments()
+    {
+        $fixture = new SimpleFixture(
+            'dummy',
+            DummyWithNamedConstructorAndOptionalParameters::class,
+            SpecificationBagFactory::create(
+                new MethodCallWithReference(
+                    new StaticReference(DummyWithNamedConstructorAndOptionalParameters::class),
+                    'namedConstruct',
+                    ['param' => 10]
+                )
+            )
+        );
+        $set = $this->instantiator->instantiate($fixture, ResolvedFixtureSetFactory::create(), new GenerationContext());
+
+        $expected = DummyWithNamedConstructorAndOptionalParameters::namedConstruct(10);
+        $actual = $set->getObjects()->get($fixture)->getInstance();
+
+        $this->assertEquals($expected, $actual);
+    }
+
     /**
      * @expectedException \Nelmio\Alice\Throwable\Exception\Generator\Instantiator\InstantiationException
      * @expectedExceptionMessage Could not instantiate fixture "dummy".

diff --git a/tests/Loader/LoaderIntegrationTest.php b/tests/Loader/LoaderIntegrationTest.php
@@ -1169,6 +1169,21 @@ public function provideFixturesToInstantiate()
             DummyWithNamedConstructorAndRequiredParameters::namedConstruct(100),
         ];
 
+        yield 'with named constructor and required parameters with named parameters - use factory function' => [
+            [
+                DummyWithNamedConstructorAndRequiredParameters::class => [
+                    'dummy' => [
+                        '__construct' => [
+                            'namedConstruct' => [
+                                'param' => 100,
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            DummyWithNamedConstructorAndRequiredParameters::namedConstruct(100),
+        ];
+
         yield 'with unknown named constructor' => [
             [
                 DummyWithDefaultConstructor::class => [