php8-mod: Optimize compiled factory definitions

ovos · Jan 13, 2023 · 2c70d32 · 2c70d32
1 parent 48bf3bb
commit 2c70d32
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/src/Compiler/Compiler.php b/src/Compiler/Compiler.php
@@ -23,12 +23,12 @@
 use function file_put_contents;
 use InvalidArgumentException;
 use Laravel\SerializableClosure\Support\ReflectionClosure;
+use ReflectionFunction;
+use ReflectionFunctionAbstract;
 use function rename;
 use function sprintf;
 use function tempnam;
 use function unlink;
-use ReflectionFunction;
-use ReflectionFunctionAbstract;
 
 /**
  * Compiles the container into PHP code much more optimized for performances.
@@ -294,9 +294,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);',
@@ -440,7 +438,7 @@ public function resolveFactoryParameters(
         array $definitionParameters = [],
         array $parametersByClassName = [],
         array $defaultParameters = []
-    ) {
+    ) : array {
         $resolvedParameters = [];
         $parameters = $reflection->getParameters();
 
@@ -451,19 +449,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);
             }
         }