- improvement: uses match()

- improvement: do not create a storage variable if not needed

Author: kodeart

DIReflector.php

@@ -72,17 +72,13 @@ public function processMethodArguments(
      */
     public function newMethodFromCallable(callable $callable): ReflectionFunctionAbstract
     {
-        switch (\gettype($callable)) {
-            case 'array':
-                return new ReflectionMethod(...$callable);
-            case 'object':
-                if ($callable instanceof Closure) {
-                    return new ReflectionFunction($callable);
-                }
-                return (new ReflectionClass($callable))->getMethod('__invoke');
-            default:
-                return new ReflectionFunction($callable);
-        }
+        return match (\gettype($callable)) {
+            'array' => new ReflectionMethod(...$callable),
+            'object' => $callable instanceof Closure
+                ? new ReflectionFunction($callable)
+                : (new ReflectionClass($callable))->getMethod('__invoke'),
+            default => new ReflectionFunction($callable)
+        };
     }
 
     protected function getFromParameterType(
@@ -109,14 +105,14 @@ protected function getFromParameter(
         ReflectionParameter $parameter,
         mixed $value
     ): mixed {
-        $storage = $container->getStorage();
         try {
             $type = ($parameter->getType() ?? $parameter)->getName();
         } catch (\Error) {
             // i.e. for ReflectionUnionType, continue with processing
             return $value;
         }
 
+        $storage = $container->getStorage();
         if (isset($storage[DIContainer::BINDINGS][$type])) {
             $type = $storage[DIContainer::BINDINGS][$type];
         }
@@ -134,6 +130,7 @@ protected function getFromParameter(
         if (isset($storage[DIContainer::NAMED]['$' . $parameter->name])) {
             return $storage[DIContainer::NAMED]['$' . $parameter->name];
         }
+
         try {
             return $value ?? $parameter?->getDefaultValue();
         } catch (\ReflectionException $e) {