Merge pull request #56 from jingu/fix-param-inject

Support nullable param in ParamInjector
ray-di · Apr 9, 2024 · 9f79cab · 9f79cab
2 parents 242be73 + ae6d3f9
commit 9f79cab
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/ParamInjector.php b/src/ParamInjector.php
@@ -37,7 +37,8 @@ public function getArgumentes(MethodInvocation $invocation): array
         foreach ($parameters as $parameter) {
             $pos = $parameter->getPosition();
             /** @psalm-suppress MixedAssignment */
-            $namedArgs[$parameter->getName()] = $args[$pos] ?? $this->getInjectedParam($parameter);
+            $namedArgs[$parameter->getName()] = array_key_exists($pos, $args)
+                ? $args[$pos] : $this->getInjectedParam($parameter);
         }
 
         return $namedArgs;

diff --git a/tests/FakeParamInjectMethod.php b/tests/FakeParamInjectMethod.php
@@ -12,7 +12,7 @@ public function noInject(int $a): void
     {
     }
 
-    public function paramInject(DateTimeInterface|null $dateTime = null): void
+    public function paramInject(string|null $nullableString, DateTimeInterface|null $dateTime = null): void
     {
     }
 

diff --git a/tests/ParamInjectorTest.php b/tests/ParamInjectorTest.php
@@ -33,7 +33,7 @@ public function testNoInjection(): void
 
     public function testGetArgumentes(): void
     {
-        $namedArgs = $this->injector->getArgumentes(new ReflectiveMethodInvocation(new FakeParamInjectMethod(), 'paramInject', []));
+        $namedArgs = $this->injector->getArgumentes(new ReflectiveMethodInvocation(new FakeParamInjectMethod(), 'paramInject', [null]));
         $this->assertInstanceOf(DateTimeImmutable::class, $namedArgs['dateTime']);
     }