Parameter name binding

src/DefinitionStorage.php

@@ -96,12 +96,33 @@
      *
      * @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([
+                ArrayDefinition::CLASS_NAME => $buildingClass,
+                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 @@
                     }
 
                     if (
-                        !$this->isResolvable($typeName, $building)
+                        !$this->isResolvable($typeName, $building, $parameter->getName())
                         && ($this->delegateContainer === null || !$this->delegateContainer->has($typeName))
                     ) {
                         $isResolvable = false;
@@ -222,7 +243,7 @@
             $this->buildStack += $building;
         }
 
-        if ($isResolvable) {
+        if ($isResolvable && !isset($this->definitions[$id])) {
             $this->definitions[$id] = $id;
         }
 

src/Helpers/Normalizer.php

@@ -53,6 +53,10 @@
             return $definition;
         }
 
+        if ($definition instanceof DefinitionInterface) {
+            return $definition;
+        }
+
         if (is_string($definition)) {
             // Current class
             if (
@@ -88,7 +92,7 @@
         }
 
         // Ready object
         if (is_object($definition) && !($definition instanceof DefinitionInterface)) {
             return new ValueDefinition($definition);
         }