Move tests to IntegrationTest

GromNaN · GromNaN · commit b11cb5b477da · 2024-03-21T15:36:09.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AttributeAutoconfigurationPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AttributeAutoconfigurationPassTest.php
@@ -45,39 +45,4 @@ public function testAttributeConfiguratorCallableMissingType()
         $this->expectExceptionMessage('Argument "$reflector" of attribute autoconfigurator should have a type, use one or more of "\ReflectionClass|\ReflectionMethod|\ReflectionProperty|\ReflectionParameter|\Reflector" in ');
         (new AttributeAutoconfigurationPass())->process($container);
     }
-
-    public function testCallNearestParentConfigurator()
-    {
-        $calls = [];
-        $container = new ContainerBuilder();
-        $container->registerAttributeForAutoconfiguration(AsTaggedItem::class, function (ChildDefinition $definition, AsTaggedItem $attribute, \ReflectionClass $reflector) use (&$calls) {
-            $calls[] = $attribute;
-        });
-        $container->register('foo', ServiceTaggedWithFooIndex::class)
-            ->setAutoconfigured(true)
-        ;
-
-        (new AttributeAutoconfigurationPass())->process($container);
-
-        $this->assertSame([], $container->getDefinition('foo')->getInstanceofConditionals());
-        $this->assertCount(1, $calls);
-    }
-}
-
-#[\Attribute(\Attribute::TARGET_CLASS)]
-class AsTaggedItemWithFooIndex extends AsTaggedItem
-{
-    public function __construct(
-        ?int $priority = null,
-    ) {
-        parent::__construct(
-            index: 'foo',
-            priority: $priority
-        );
-    }
-}
-
-#[AsTaggedItemWithFooIndex]
-class ServiceTaggedWithFooIndex
-{
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php
@@ -57,6 +57,7 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\TaggedService3;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\TaggedService3Configurator;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\TaggedService4;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\TaggedService5;
 use Symfony\Contracts\Service\Attribute\SubscribedService;
 use Symfony\Contracts\Service\ServiceProviderInterface;
 use Symfony\Contracts\Service\ServiceSubscriberInterface;
@@ -993,6 +994,10 @@ static function (ChildDefinition $definition, CustomAnyAttribute $attribute, \Re
             ->setPublic(true)
             ->setAutoconfigured(true);
 
+        $container->register(TaggedService5::class)
+            ->setPublic(true)
+            ->setAutoconfigured(true);
+
         $container->register('failing_factory', \stdClass::class);
         $container->register('ccc', TaggedService4::class)
             ->setFactory([new Reference('failing_factory'), 'create'])
@@ -1018,6 +1023,12 @@ static function (ChildDefinition $definition, CustomAnyAttribute $attribute, \Re
                 ['property' => 'name'],
                 ['someAttribute' => 'on name', 'priority' => 0, 'property' => 'name'],
             ],
+            TaggedService5::class => [
+                ['class' => TaggedService5::class],
+                ['parameter' => 'param1'],
+                ['method' => 'fooAction'],
+                ['property' => 'name'],
+            ],
             'ccc' => [
                 ['class' => TaggedService4::class],
                 ['method' => 'fooAction'],
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Attribute/CustomAnyAttribute.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Attribute/CustomAnyAttribute.php
@@ -12,6 +12,6 @@
 namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Attribute;
 
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY | \Attribute::TARGET_PARAMETER)]
-final class CustomAnyAttribute
+class CustomAnyAttribute
 {
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Attribute/CustomChildAttribute.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Attribute/CustomChildAttribute.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Attribute;
+
+#[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY | \Attribute::TARGET_PARAMETER)]
+class CustomChildAttribute extends CustomAnyAttribute
+{
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/TaggedService5.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/TaggedService5.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Attribute\CustomChildAttribute;
+
+#[CustomChildAttribute]
+final class TaggedService5
+{
+    #[CustomChildAttribute]
+    public string $name;
+
+    public function __construct(
+        #[CustomChildAttribute]
+        private string $param1,
+    ) {}
+
+    #[CustomChildAttribute]
+    public function fooAction(
+        #[CustomChildAttribute]
+        string $param1
+    ) {}
+}

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@`
`12`	`12`	`namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Attribute;`
`13`	`13`
`14`	`14`	`#[\Attribute(\Attribute::TARGET_CLASS \| \Attribute::TARGET_METHOD \| \Attribute::TARGET_PROPERTY \| \Attribute::TARGET_PARAMETER)]`
`15`		`-final class CustomAnyAttribute`
	`15`	`+class CustomAnyAttribute`
`16`	`16`	`{`
`17`	`17`	`}`