Merge pull request #30 from PHP-DI/optional-parameters

Support optional parameters before required ones
PHP-DI · Oct 12, 2020 · e08a7c8 · e08a7c8
2 parents f33afc3 + c57a43c
commit e08a7c8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/ParameterResolver/DefaultValueResolver.php b/src/ParameterResolver/DefaultValueResolver.php
@@ -24,7 +24,7 @@ public function getParameters(
 
         foreach ($parameters as $index => $parameter) {
             \assert($parameter instanceof \ReflectionParameter);
-            if ($parameter->isOptional()) {
+            if ($parameter->isDefaultValueAvailable()) {
                 try {
                     $resolvedParameters[$index] = $parameter->getDefaultValue();
                 } catch (ReflectionException $e) {

diff --git a/tests/InvokerTest.php b/tests/InvokerTest.php
@@ -192,6 +192,7 @@ public function should_invoke_callable_with_null_for_nullable_parameters()
     }
 
     /**
+     * @see https://github.com/PHP-DI/Slim-Bridge/issues/37
      * @test
      */
     public function should_invoke_callable_with_null_for_non_optional_nullable_parameters()
@@ -203,6 +204,21 @@ public function should_invoke_callable_with_null_for_non_optional_nullable_param
         $this->assertNull($result);
     }
 
+    /**
+     * @see https://github.com/PHP-DI/PHP-DI/issues/562
+     * @test
+     */
+    public function should_invoke_callable_with_optional_parameter_before_required_parameter()
+    {
+        $result = $this->invoker->call(function ($baz = 'abc', $foo) {
+            return [$baz, $foo];
+        }, [
+            'foo' => 'bar',
+        ]);
+
+        $this->assertSame(['abc', 'bar'], $result);
+    }
+
     /**
      * @test
      */