Replace plus operator with array_merge

Tiriel · Tiriel · commit 461b475ca2ee · 2024-01-22T11:01:21.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -300,14 +300,12 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
             };
 
             if ($checkAttributes) {
-                $autowire = $parameter->getAttributes(Autowire::class, \ReflectionAttribute::IS_INSTANCEOF);
-                $lazy = $parameter->getAttributes(Lazy::class, \ReflectionAttribute::IS_INSTANCEOF);
+                $attributes = \array_merge($parameter->getAttributes(Autowire::class, \ReflectionAttribute::IS_INSTANCEOF), $parameter->getAttributes(Lazy::class, \ReflectionAttribute::IS_INSTANCEOF));
 
-                if (\count($autowire) > 0 && \count($lazy) > 0) {
-                    throw new AutowiringFailedException($this->currentId, "'Lazy' and 'Autowire' attributes cannot be used on the same argument.");
+                if (1 < \count($attributes)) {
+                    throw new AutowiringFailedException($this->currentId, 'Using both attributes #[Lazy] and #[Autowire] on an argument is not allowed; use the "lazy" parameter of #[Autowire] instead.');
                 }
 
-                $attributes = $autowire + $lazy;
                 foreach ($attributes as $attribute) {
                     $attribute = $attribute->newInstance();
                     $invalidBehavior = $parameter->allowsNull() ? ContainerInterface::NULL_ON_INVALID_REFERENCE : ContainerBuilder::EXCEPTION_ON_INVALID_REFERENCE;
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RegisterAutoconfigureAttributesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RegisterAutoconfigureAttributesPass.php
@@ -43,7 +43,7 @@ public function accept(Definition $definition): bool
 
     public function processClass(ContainerBuilder $container, \ReflectionClass $class): void
     {
-        $attributes = $class->getAttributes(Autoconfigure::class, \ReflectionAttribute::IS_INSTANCEOF) + $class->getAttributes(Lazy::class, \ReflectionAttribute::IS_INSTANCEOF);
+        $attributes = array_merge($class->getAttributes(Autoconfigure::class, \ReflectionAttribute::IS_INSTANCEOF), $class->getAttributes(Lazy::class, \ReflectionAttribute::IS_INSTANCEOF));
         foreach ($attributes as $attribute) {
             self::registerForAutoconfiguration($container, $class, $attribute);
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -1390,7 +1390,7 @@ public function testLazyNotCompatibleWithAutowire()
         try {
             (new AutowirePass())->process($container);
         } catch (AutowiringFailedException $e) {
-            $this->assertSame("'Lazy' and 'Autowire' attributes cannot be used on the same argument.", $e->getMessage());
+            $this->assertSame('Using both attributes #[Lazy] and #[Autowire] on an argument is not allowed; use the "lazy" parameter of #[Autowire] instead.', $e->getMessage());
         }
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterAutoconfigureAttributesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterAutoconfigureAttributesPassTest.php
@@ -19,6 +19,7 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\AutoconfigureAttributed;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\AutoconfiguredInterface;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\LazyAutoconfigured;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\LazyLoaded;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\ParentNotExists;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\StaticConstructorAutoconfigure;
@@ -119,4 +120,18 @@ public function testLazyServiceAttribute()
         ;
         $this->assertEquals([LazyLoaded::class => $expected], $container->getAutoconfiguredInstanceof());
     }
+
+    public function testLazyAutoconfigureServiceAttribute()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', LazyAutoconfigured::class)
+            ->setAutoconfigured(true);
+
+        (new RegisterAutoconfigureAttributesPass())->process($container);
+
+        $expected = (new ChildDefinition(''))
+            ->setLazy(true)
+        ;
+        $this->assertEquals([LazyAutoconfigured::class => $expected], $container->getAutoconfiguredInstanceof());
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LazyAutoconfigured.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LazyAutoconfigured.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+use Symfony\Component\DependencyInjection\Attribute\Autoconfigure;
+use Symfony\Component\DependencyInjection\Attribute\Lazy;
+
+#[Lazy, Autoconfigure(lazy: true)]
+class LazyAutoconfigured
+{
+
+}

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function accept(Definition $definition): bool`
`43`	`43`
`44`	`44`	`public function processClass(ContainerBuilder $container, \ReflectionClass $class): void`
`45`	`45`	`{`
`46`		`- $attributes = $class->getAttributes(Autoconfigure::class, \ReflectionAttribute::IS_INSTANCEOF) + $class->getAttributes(Lazy::class, \ReflectionAttribute::IS_INSTANCEOF);`
	`46`	`+ $attributes = array_merge($class->getAttributes(Autoconfigure::class, \ReflectionAttribute::IS_INSTANCEOF), $class->getAttributes(Lazy::class, \ReflectionAttribute::IS_INSTANCEOF));`
`47`	`47`	`foreach ($attributes as $attribute) {`
`48`	`48`	`self::registerForAutoconfiguration($container, $class, $attribute);`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1390,7 +1390,7 @@ public function testLazyNotCompatibleWithAutowire()`
`1390`	`1390`	`try {`
`1391`	`1391`	`(new AutowirePass())->process($container);`
`1392`	`1392`	`} catch (AutowiringFailedException $e) {`
`1393`		`- $this->assertSame("'Lazy' and 'Autowire' attributes cannot be used on the same argument.", $e->getMessage());`
	`1393`	`+ $this->assertSame('Using both attributes #[Lazy] and #[Autowire] on an argument is not allowed; use the "lazy" parameter of #[Autowire] instead.', $e->getMessage());`
`1394`	`1394`	`}`
`1395`	`1395`	`}`
`1396`	`1396`	`}`