rename class

kbond · kbond · commit 0e0583f18d84 · 2023-08-16T08:50:40.000-04:00
diff --git a/src/Symfony/Component/DependencyInjection/Attribute/AutowireLocator.php b/src/Symfony/Component/DependencyInjection/Attribute/AutowireLocator.php
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -7,7 +7,7 @@ CHANGELOG
  * Allow using `#[Target]` with no arguments to state that a parameter must match a named autowiring alias
  * Deprecate `ContainerAwareInterface` and `ContainerAwareTrait`, use dependency injection instead
  * Add `defined` env var processor that returns `true` for defined and neither null nor empty env vars
- * Add `#[Locator]` attribute
+ * Add `#[AutowireLocator]` attribute
 
 6.3
 ---
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Attribute/AutowireLocatorTest.php b/src/Symfony/Component/DependencyInjection/Tests/Attribute/AutowireLocatorTest.php
@@ -13,15 +13,15 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
-use Symfony\Component\DependencyInjection\Attribute\Locator;
+use Symfony\Component\DependencyInjection\Attribute\AutowireLocator;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Reference;
 
-class LocatorTest extends TestCase
+class AutowireLocatorTest extends TestCase
 {
     public function testSimpleLocator()
     {
-        $locator = new Locator('foo', 'bar');
+        $locator = new AutowireLocator('foo', 'bar');
 
         $this->assertEquals(
             new ServiceLocatorArgument(['foo' => new Reference('foo'), 'bar' => new Reference('bar')]),
@@ -31,7 +31,7 @@ public function testSimpleLocator()
 
     public function testComplexLocator()
     {
-        $locator = new Locator(
+        $locator = new AutowireLocator(
             '?qux',
             foo: 'bar',
             bar: '?baz',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php
@@ -32,11 +32,11 @@
 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\AutowireLocatorConsumer;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\BarTagClass;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\FooBarTaggedClass;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\FooBarTaggedForDefaultPriorityClass;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\FooTagClass;
-use Symfony\Component\DependencyInjection\Tests\Fixtures\LocatorConsumer;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\StaticMethodTag;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\TaggedConsumerWithExclude;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\TaggedIteratorConsumer;
@@ -398,15 +398,15 @@ public function testLocatorConfiguredViaAttribute()
         $container->register(FooTagClass::class)
             ->setPublic(true)
         ;
-        $container->register(LocatorConsumer::class)
+        $container->register(AutowireLocatorConsumer::class)
             ->setAutowired(true)
             ->setPublic(true)
         ;
 
         $container->compile();
 
-        /** @var LocatorConsumer $s */
-        $s = $container->get(LocatorConsumer::class);
+        /** @var AutowireLocatorConsumer $s */
+        $s = $container->get(AutowireLocatorConsumer::class);
 
         self::assertSame($container->get(BarTagClass::class), $s->locator->get(BarTagClass::class));
         self::assertSame($container->get(FooTagClass::class), $s->locator->get('with_key'));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/AutowireLocatorConsumer.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/AutowireLocatorConsumer.php
@@ -12,12 +12,12 @@
 namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
 
 use Psr\Container\ContainerInterface;
-use Symfony\Component\DependencyInjection\Attribute\Locator;
+use Symfony\Component\DependencyInjection\Attribute\AutowireLocator;
 
-final class LocatorConsumer
+final class AutowireLocatorConsumer
 {
     public function __construct(
-        #[Locator(
+        #[AutowireLocator(
             BarTagClass::class,
             with_key: FooTagClass::class,
             nullable: '?invalid',
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -17,7 +17,7 @@
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\DependencyInjection\Attribute\AutowireCallable;
-use Symfony\Component\DependencyInjection\Attribute\Locator;
+use Symfony\Component\DependencyInjection\Attribute\AutowireLocator;
 use Symfony\Component\DependencyInjection\Attribute\TaggedIterator;
 use Symfony\Component\DependencyInjection\Attribute\TaggedLocator;
 use Symfony\Component\DependencyInjection\Attribute\Target;
@@ -676,7 +676,7 @@ class WithTaggedIteratorAndTaggedLocator
     public function fooAction(
         #[TaggedIterator('foobar')] iterable $iterator,
         #[TaggedLocator('foobar')] ServiceLocator $locator,
-        #[Locator('bar', 'baz')] ContainerInterface $container,
+        #[AutowireLocator('bar', 'baz')] ContainerInterface $container,
     ) {
     }
 }
