porting Optimize compiled factory definitions for php-di v7

ovos · Jan 11, 2024 · 9417366 · 9417366
1 parent 67125ae
commit 9417366
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/src/Compiler/Compiler.php b/src/Compiler/Compiler.php
@@ -295,9 +295,7 @@ private function compileDefinition(string $entryName, Definition $definition) :
                         $defaultParameters
                     );
 
-                    $definitionParameters = array_map(function ($value) {
-                        return $this->compileValue($value);
-                    }, $resolvedParameters);
+                    $definitionParameters = array_map(fn ($value) => $this->compileValue($value), $resolvedParameters);
 
                     $code = sprintf(
                         'return (%s)(%s);',
@@ -446,7 +444,7 @@ public function resolveFactoryParameters(
         array $definitionParameters = [],
         array $parametersByClassName = [],
         array $defaultParameters = []
-    ) {
+    ) : array {
         $resolvedParameters = [];
         $parameters = $reflection->getParameters();
 
@@ -457,19 +455,20 @@ public function resolveFactoryParameters(
                 continue;
             }
 
-            $parameterClass = $parameter->getClass();
-            if (!$parameterClass) {
+            $parameterType = $parameter->getType();
+            if (!$parameterType) {
                 if (array_key_exists($index, $defaultParameters)) {
                     // take default parameters, when no typehint
                     $resolvedParameters[$index] = $defaultParameters[$index];
                 }
                 continue;
             }
 
-            if (isset($parametersByClassName[$parameterClass->name])) {
-                $resolvedParameters[$index] = $parametersByClassName[$parameterClass->name];
+            $parameterTypeName = $parameterType->getName();
+            if (isset($parametersByClassName[$parameterTypeName])) {
+                $resolvedParameters[$index] = $parametersByClassName[$parameterTypeName];
             } else {
-                $resolvedParameters[$index] = new Reference($parameterClass->name);
+                $resolvedParameters[$index] = new Reference($parameterTypeName);
             }
         }