Merge f38db3f into 3237097

PHP-DI · Nov 7, 2019 · 08dbeb5 · 08dbeb5
2 parents 3237097 + f38db3f
commit 08dbeb5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/Container.php b/src/Container.php
@@ -403,8 +403,8 @@ private function getInvoker() : InvokerInterface
                 new DefinitionParameterResolver($this->definitionResolver),
                 new NumericArrayResolver,
                 new AssociativeArrayResolver,
-                new DefaultValueResolver,
                 new TypeHintContainerResolver($this->delegateContainer),
+                new DefaultValueResolver,
             ]);
 
             $this->invoker = new Invoker($parameterResolver, $this);

diff --git a/tests/IntegrationTest/ContainerCallTest.php b/tests/IntegrationTest/ContainerCallTest.php
@@ -132,6 +132,22 @@ public function test_parameter_from_type_hint(ContainerBuilder $builder)
         $this->assertEquals($value, $result);
     }
 
+    /**
+     * @dataProvider provideContainer
+     */
+    public function test_parameter_from_type_hint_with_default(ContainerBuilder $builder)
+    {
+        $container = $builder->build();
+
+        $value = new \stdClass();
+        $container->set('stdClass', $value);
+
+        $result = $container->call(function (\stdClass $foo = null) {
+            return $foo;
+        });
+        $this->assertEquals($value, $result);
+    }
+
     /**
      * @test
      * @dataProvider provideContainer