Add support for nullable default parameters

selective-php · May 3, 2020 · b3351f9 · b3351f9
1 parent 35192eb
commit b3351f9
Showing 1 changed file with 37 additions and 20 deletions.
diff --git a/src/Resolver/ConstructorResolver.php b/src/Resolver/ConstructorResolver.php
@@ -7,6 +7,7 @@
 use Psr\Container\ContainerInterface;
 use ReflectionClass;
 use ReflectionMethod;
+use ReflectionParameter;
 use Selective\Container\Exceptions\InvalidDefinitionException;
 use Throwable;
 
@@ -51,11 +52,12 @@ public function resolve(string $id)
         $reflectionClass = new ReflectionClass($id);
 
         try {
-            if ($reflectionClass->getConstructor() === null) {
+            $constructor = $reflectionClass->getConstructor();
+            if ($constructor === null) {
                 return $reflectionClass->newInstance();
             }
 
-            return $reflectionClass->newInstanceArgs($this->resolveParameters($id, $reflectionClass->getConstructor()));
+            return $reflectionClass->newInstanceArgs($this->resolveParameters($id, $constructor));
         } catch (Throwable $exception) {
             throw InvalidDefinitionException::create(sprintf(
                 'Entry "%s" cannot be resolved: the class is not instantiable',
@@ -70,8 +72,6 @@ public function resolve(string $id)
      * @param string $id The id
      * @param ReflectionMethod $method The method
      *
-     * @throws InvalidDefinitionException
-     *
      * @return array<mixed> The resolved parameters
      */
     private function resolveParameters(string $id, ReflectionMethod $method = null): array
@@ -83,28 +83,45 @@ private function resolveParameters(string $id, ReflectionMethod $method = null):
         $arguments = [];
 
         foreach ($method->getParameters() as $parameter) {
-            $reflectionClass = $parameter->getClass();
-
-            if ($reflectionClass === null) {
-                throw InvalidDefinitionException::create(sprintf(
-                    'Parameter $%s of %s has no value defined or guessable',
-                    $parameter->getName(),
-                    $id
-                ));
-            }
+            $arguments[] = $this->resolveParameter($id, $parameter);
+        }
 
-            // If the parameter is optional and wasn't specified, we take its default value
-            if ($parameter->isDefaultValueAvailable() || $parameter->isOptional()) {
-                $arguments[] = $parameter->getDefaultValue();
+        return $arguments;
+    }
 
-                continue;
-            }
+    /**
+     * Resolve paramameter value.
+     *
+     * @param string $id The id
+     * @param ReflectionParameter $parameter The parameter
+     *
+     * @throws InvalidDefinitionException
+     *
+     * @return mixed The value
+     */
+    private function resolveParameter(string $id, ReflectionParameter $parameter)
+    {
+        $reflectionClass = $parameter->getClass();
 
+        if ($reflectionClass !== null) {
             // Look in the definitions or try to create it
-            $arguments[] = $this->container->get($reflectionClass->getName());
+            $className = $reflectionClass->getName();
+
+            if ($this->container->has($className)) {
+                return $this->container->get($className);
+            }
         }
 
-        return $arguments;
+        // If the parameter is optional and wasn't specified, we take its default value
+        if ($parameter->isDefaultValueAvailable() || $parameter->isOptional()) {
+            return $parameter->getDefaultValue();
+        }
+
+        throw InvalidDefinitionException::create(sprintf(
+            'Parameter $%s of %s has no value defined or guessable',
+            $parameter->getName(),
+            $id
+        ));
     }
 
     /**