Support parameters name binding

yiisoft · Feb 13, 2024 · 7ea68b6 · 7ea68b6
1 parent 9512d94
commit 7ea68b6
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/src/DefinitionStorage.php b/src/DefinitionStorage.php
@@ -96,12 +96,33 @@ public function set(string $id, mixed $definition): void
      *
      * @throws CircularReferenceException
      */
-    private function isResolvable(string $id, array $building): bool
+    private function isResolvable(string $id, array $building, ?string $parameterName = null): bool
     {
         if (isset($this->definitions[$id])) {
             return true;
         }
 
+        if (
+            $parameterName !== null
+            && isset($this->definitions[$id . '$'.$parameterName])
+        ) {
+            $buildingClass = array_key_last($building);
+            $definition = $this->definitions[$buildingClass] ?? null;
+            $temporaryDefinition = ArrayDefinition::fromConfig([
+                \Yiisoft\Definitions\ArrayDefinition::CLASS_NAME => $buildingClass,
+                \Yiisoft\Definitions\ArrayDefinition::CONSTRUCTOR => [
+                    $parameterName => Reference::to($this->definitions[$id . '$' . $parameterName])
+                ]
+            ]);
+            if ($definition instanceof ArrayDefinition) {
+                $this->definitions[$buildingClass] = $definition->merge($temporaryDefinition);
+            } else {
+                $this->definitions[$buildingClass] = $temporaryDefinition;
+            }
+
+            return true;
+        }
+
         if ($this->useStrictMode || !class_exists($id)) {
             $this->buildStack += $building + [$id => 1];
             return false;
@@ -210,7 +231,7 @@ private function isResolvable(string $id, array $building): bool
                     }
 
                     if (
-                        !$this->isResolvable($typeName, $building)
+                        !$this->isResolvable($typeName, $building, $parameter->getName())
                         && ($this->delegateContainer === null || !$this->delegateContainer->has($typeName))
                     ) {
                         $isResolvable = false;
@@ -222,7 +243,7 @@ private function isResolvable(string $id, array $building): bool
             $this->buildStack += $building;
         }
 
-        if ($isResolvable) {
+        if ($isResolvable && !isset($this->definitions[$id])) {
             $this->definitions[$id] = $id;
         }
 

diff --git a/src/Helpers/Normalizer.php b/src/Helpers/Normalizer.php
@@ -53,6 +53,10 @@ public static function normalize(mixed $definition, ?string $class = null): Defi
             return $definition;
         }
 
+        if ($definition instanceof DefinitionInterface) {
+            return $definition;
+        }
+
         if (is_string($definition)) {
             // Current class
             if (