[DependencyInjection] Add tests for AutowireLocator/AutowireIterator

Author: kbond

Tests/Compiler/IntegrationTest.php

@@ -15,6 +15,7 @@
 use Psr\Container\ContainerInterface;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
 use Symfony\Component\DependencyInjection\ChildDefinition;
@@ -32,6 +33,7 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\AutoconfiguredInterface2;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\AutoconfiguredService1;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\AutoconfiguredService2;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\AutowireIteratorConsumer;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\AutowireLocatorConsumer;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\BarTagClass;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\FooBarTaggedClass;
@@ -392,6 +394,7 @@ public function testTaggedServiceWithIndexAttributeAndDefaultMethod()
     public function testLocatorConfiguredViaAttribute()
     {
         $container = new ContainerBuilder();
+        $container->setParameter('some.parameter', 'foo');
         $container->register(BarTagClass::class)
             ->setPublic(true)
         ;
@@ -411,6 +414,36 @@ public function testLocatorConfiguredViaAttribute()
         self::assertSame($container->get(BarTagClass::class), $s->locator->get(BarTagClass::class));
         self::assertSame($container->get(FooTagClass::class), $s->locator->get('with_key'));
         self::assertFalse($s->locator->has('nullable'));
+        self::assertSame('foo', $s->locator->get('subscribed'));
+    }
+
+    public function testIteratorConfiguredViaAttribute()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('some.parameter', 'foo');
+        $container->register(BarTagClass::class)
+            ->setPublic(true)
+        ;
+        $container->register(FooTagClass::class)
+            ->setPublic(true)
+        ;
+        $container->register(AutowireIteratorConsumer::class)
+            ->setAutowired(true)
+            ->setPublic(true)
+        ;
+
+        $container->compile();
+
+        /** @var AutowireIteratorConsumer $s */
+        $s = $container->get(AutowireIteratorConsumer::class);
+
+        self::assertInstanceOf(RewindableGenerator::class, $s->iterator);
+
+        $values = iterator_to_array($s->iterator);
+        self::assertCount(3, $values);
+        self::assertSame($container->get(BarTagClass::class), $values[BarTagClass::class]);
+        self::assertSame($container->get(FooTagClass::class), $values['with_key']);
+        self::assertSame('foo', $values['subscribed']);
     }
 
     public function testTaggedServiceWithIndexAttributeAndDefaultMethodConfiguredViaAttribute()

Tests/Fixtures/AutowireIteratorConsumer.php

@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * 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\Attribute\Autowire;
+use Symfony\Component\DependencyInjection\Attribute\AutowireIterator;
+use Symfony\Contracts\Service\Attribute\SubscribedService;
+
+final class AutowireIteratorConsumer
+{
+    public function __construct(
+        #[AutowireIterator([
+            BarTagClass::class,
+            'with_key' => FooTagClass::class,
+            'nullable' => '?invalid',
+            'subscribed' => new SubscribedService(type: 'string', attributes: new Autowire('%some.parameter%')),
+        ])]
+        public readonly iterable $iterator,
+    ) {
+    }
+}

Tests/Fixtures/AutowireLocatorConsumer.php

@@ -12,7 +12,9 @@
 namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
 
 use Psr\Container\ContainerInterface;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\DependencyInjection\Attribute\AutowireLocator;
+use Symfony\Contracts\Service\Attribute\SubscribedService;
 
 final class AutowireLocatorConsumer
 {
@@ -21,6 +23,7 @@ public function __construct(
             BarTagClass::class,
             'with_key' => FooTagClass::class,
             'nullable' => '?invalid',
+            'subscribed' => new SubscribedService(type: 'string', attributes: new Autowire('%some.parameter%')),
         ])]
         public readonly ContainerInterface $locator,
     ) {

Tests/Fixtures/TaggedIteratorConsumer.php

@@ -11,12 +11,12 @@
 
 namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
 
-use Symfony\Component\DependencyInjection\Attribute\TaggedIterator;
+use Symfony\Component\DependencyInjection\Attribute\AutowireIterator;
 
 final class TaggedIteratorConsumer
 {
     public function __construct(
-        #[TaggedIterator('foo_bar', indexAttribute: 'foo')]
+        #[AutowireIterator('foo_bar', indexAttribute: 'foo')]
         private iterable $param,
     ) {
     }

Tests/Fixtures/TaggedLocatorConsumer.php

@@ -12,12 +12,12 @@
 namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
 
 use Psr\Container\ContainerInterface;
-use Symfony\Component\DependencyInjection\Attribute\TaggedLocator;
+use Symfony\Component\DependencyInjection\Attribute\AutowireLocator;
 
 final class TaggedLocatorConsumer
 {
     public function __construct(
-        #[TaggedLocator('foo_bar', indexAttribute: 'foo')]
+        #[AutowireLocator('foo_bar', indexAttribute: 'foo')]
         private ContainerInterface $locator,
     ) {
     }