[bug] allow default parameter values

zenstruck · Jul 19, 2021 · fef4acf · fef4acf
1 parent c9f7823
commit fef4acf
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/Callback/Argument.php b/src/Callback/Argument.php
@@ -78,6 +78,19 @@ public function isUnionType(): bool
         return \count($this->types()) > 1;
     }
 
+    public function isOptional(): bool
+    {
+        return $this->parameter->isOptional();
+    }
+
+    /**
+     * @return mixed
+     */
+    public function defaultValue()
+    {
+        return $this->parameter->getDefaultValue();
+    }
+
     /**
      * @param string $type    The type to check if this argument supports
      * @param int    $options {@see EXACT}, {@see COVARIANCE}, {@see CONTRAVARIANCE}

diff --git a/src/Callback/Parameter.php b/src/Callback/Parameter.php
@@ -63,7 +63,15 @@ final public function optional(): self
      */
     final public function resolve(Argument $argument)
     {
-        $value = $this->valueFor($argument);
+        try {
+            $value = $this->valueFor($argument);
+        } catch (UnresolveableArgument $e) {
+            if ($argument->isOptional()) {
+                return $argument->defaultValue();
+            }
+
+            throw $e;
+        }
 
         if ($value instanceof ValueFactory) {
             $value = $value($argument);