[bug] fix optional parameter issue

zenstruck · Jan 9, 2021 · 82cd9ac · 82cd9ac
1 parent 6934887
commit 82cd9ac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/Callback.php b/src/Callback.php
@@ -53,11 +53,11 @@ public function invoke(...$arguments)
                 continue;
             }
 
-            if (!\array_key_exists($key, $parameters) && !$argument->isOptional()) {
-                throw new \ArgumentCountError(\sprintf('No argument %d for callable. Expected type: "%s".', $key + 1, $argument->type()));
-            }
+            if (!\array_key_exists($key, $parameters)) {
+                if (!$argument->isOptional()) {
+                    throw new \ArgumentCountError(\sprintf('No argument %d for callable. Expected type: "%s".', $key + 1, $argument->type()));
+                }
 
-            if ($argument->isOptional()) {
                 $arguments[$key] = null;
 
                 continue;

diff --git a/tests/CallbackTest.php b/tests/CallbackTest.php
@@ -272,6 +272,12 @@ public function can_mark_invoke_parameter_arguments_as_optional(): void
         ;
 
         $this->assertSame('ret', $actual);
+
+        $actual = Callback::createFor(static function(string $v) { return $v; })
+            ->invoke(Parameter::typed('string', 'foobar')->optional())
+        ;
+
+        $this->assertSame('foobar', $actual);
     }
 }