Merge branch 'feature/php-di-7-service-locator' into mod7-merged

Author: partikus

src/Definition/Reference.php

@@ -22,6 +22,8 @@ class Reference implements Definition, SelfResolvingDefinition
 
     private bool $isServiceLocatorEntry;
 
+    private ?ServiceLocatorDefinition $serviceLocatorDefinition = null;
+
     public function __construct(
         /**
          * @var string Name of the target entry
@@ -30,8 +32,7 @@ public function __construct(
         /**
          * @var string|null name of an entry - holder of a definition requesting this entry
          */
-        private ?string $requestingName = null,
-        private ?ServiceLocatorDefinition $serviceLocatorDefinition = null
+        private ?string $requestingName = null
     ) {
         $this->isServiceLocatorEntry = $targetEntryName === self::$serviceLocatorClass;
     }

src/Definition/Source/AttributeBasedAutowiring.php

@@ -227,7 +227,9 @@ private function getMethodInjection(ReflectionMethod $method) : ?MethodInjection
             $entryName = $this->getMethodParameter($index, $parameter, $attributeParameters);
 
             if ($entryName !== null) {
-                $parameters[$index] = new Reference($entryName);
+                $parameters[$index] = $method->isConstructor() ?
+                    new Reference($entryName, $method->getDeclaringClass()->getName()) :
+                    new Reference($entryName);
             }
         }
 

tests/UnitTest/Definition/Source/AttributeBasedAutowiringTest.php

@@ -92,8 +92,8 @@ public function testConstructor()
 
         $parameters = $constructorInjection->getParameters();
         $this->assertCount(2, $parameters);
-        $this->assertEquals(new Reference('foo'), $parameters[0]);
-        $this->assertEquals(new Reference('bar'), $parameters[1]);
+        $this->assertEquals(new Reference('foo', AttributeFixture::class), $parameters[0]);
+        $this->assertEquals(new Reference('bar', AttributeFixture::class), $parameters[1]);
     }
 
     public function testMethod1()
@@ -253,7 +253,7 @@ public function testPromotedProperties(): void
 
         $parameters = $constructorInjection->getParameters();
         $this->assertCount(1, $parameters);
-        $this->assertEquals(new Reference('foo'), $parameters[0]);
+        $this->assertEquals(new Reference('foo', AttributeFixturePromotedProperty::class), $parameters[0]);
     }
 
     private function getMethodInjection(ObjectDefinition $definition, $name) : ?MethodInjection