perf: obtaining values obtained from variables that have default valu…

…es has been supported
lion-packages · Mar 3, 2024 · dff25be · dff25be
1 parent 4d0a4ed
commit dff25be
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/src/DependencyInjection/Container.php b/src/DependencyInjection/Container.php
@@ -120,7 +120,11 @@ private function getParameters(ReflectionFunctionAbstract $method, array $params
 
         foreach ($method->getParameters() as $parameter) {
             if ($parameter->isDefaultValueAvailable()) {
-                $args[] = $parameter->getDefaultValue();
+                if (!empty($params[$parameter->getName()])) {
+                    $args[] = $params[$parameter->getName()];
+                } else {
+                    $args[] = $parameter->getDefaultValue();
+                }
             } else {
                 if (!empty($params[$parameter->getName()])) {
                     $args[] = $params[$parameter->getName()];

diff --git a/tests/ContainerTest.php b/tests/ContainerTest.php
@@ -21,6 +21,7 @@ class ContainerTest extends Test
     use ContainerProviderTrait;
 
     const STR = 'test';
+    const DEFAULT_VALUE = 'default-value';
     const FOLDER = './tests/';
     const PATH_FILE = './Provider/CustomClass.php';
     const FILES = [
@@ -87,22 +88,43 @@ public function testGetParameters(): void
 
         $this->assertIsArray($parameters);
         $this->assertInstanceOf(FactoryProvider::class, reset($parameters));
+    }
 
+    public function testGetParametersWithDefaultValue(): void
+    {
         $parameters = $this->getPrivateMethod(
             'getParameters',
             [new ReflectionMethod(new CustomClass(), 'setMultiple')]
         );
 
         $this->assertIsArray($parameters);
 
-        $first = reset($parameters);
         $second = end($parameters);
 
-        $this->assertInstanceOf(FactoryProvider::class, $first);
+        $this->assertInstanceOf(FactoryProvider::class, reset($parameters));
         $this->assertIsString($second);
         $this->assertSame(self::STR, $second);
     }
 
+    public function testGetParametersWithDefaultDeclaredValue(): void
+    {
+        $parameters = $this->getPrivateMethod(
+            'getParameters',
+            [
+                new ReflectionMethod(new CustomClass(), 'setMultiple'),
+                ['str' => self::DEFAULT_VALUE]
+            ]
+        );
+
+        $this->assertIsArray($parameters);
+
+        $second = end($parameters);
+
+        $this->assertInstanceOf(FactoryProvider::class, reset($parameters));
+        $this->assertIsString($second);
+        $this->assertSame(self::DEFAULT_VALUE, $second);
+    }
+
     public function testInjectDependenciesMethod(): void
     {
         /** @var FactoryProvider $factoryProvider */