Allow service locators to be ordered by priority.

longwave · longwave · commit 2b098d11a927 · 2024-06-07T10:45:03.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php
@@ -131,7 +131,6 @@ public static function map(array $services): array
 
             $services[$k] = new ServiceClosureArgument($v);
         }
-        ksort($services);
 
         return $services;
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php
@@ -619,7 +619,7 @@ public function testTaggedLocatorWithDefaultPriorityMethodConfiguredViaAttribute
         // We need to check priority of instances in the factories
         $factories = (new \ReflectionClass($locator))->getProperty('factories');
 
-        self::assertSame([BarTagClass::class, FooTagClass::class], array_keys($factories->getValue($locator)));
+        self::assertSame([FooTagClass::class, BarTagClass::class], array_keys($factories->getValue($locator)));
     }
 
     public function testTaggedLocatorWithDefaultIndexMethodAndWithDefaultPriorityMethodConfiguredViaAttribute()
@@ -648,7 +648,7 @@ public function testTaggedLocatorWithDefaultIndexMethodAndWithDefaultPriorityMet
         // We need to check priority of instances in the factories
         $factories = (new \ReflectionClass($locator))->getProperty('factories');
 
-        self::assertSame(['bar_tag_class', 'foo_tag_class'], array_keys($factories->getValue($locator)));
+        self::assertSame(['foo_tag_class', 'bar_tag_class'], array_keys($factories->getValue($locator)));
         self::assertSame($container->get(BarTagClass::class), $locator->get('bar_tag_class'));
         self::assertSame($container->get(FooTagClass::class), $locator->get('foo_tag_class'));
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
@@ -452,7 +452,7 @@ public static function getSubscribedServices(): array
             'autowired' => new ServiceClosureArgument(new TypedReference('service.id', 'stdClass', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, 'autowired', [new Autowire(service: 'service.id')])),
             'autowired.nullable' => new ServiceClosureArgument(new TypedReference('service.id', 'stdClass', ContainerInterface::IGNORE_ON_INVALID_REFERENCE, 'autowired.nullable', [new Autowire(service: 'service.id')])),
             'autowired.parameter' => new ServiceClosureArgument('foobar'),
-            'autowire.decorated' => new ServiceClosureArgument(new Reference('.service_locator.4qmCWv..inner', ContainerInterface::NULL_ON_INVALID_REFERENCE)),
+            'autowire.decorated' => new ServiceClosureArgument(new Reference('.service_locator.PIYLhDv.inner', ContainerInterface::NULL_ON_INVALID_REFERENCE)),
             'target' => new ServiceClosureArgument(new TypedReference('stdClass', 'stdClass', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, 'target', [new Target('someTarget')])),
         ];
         $this->assertEquals($expected, $container->getDefinition((string) $locator->getFactory()[0])->getArgument(0));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ServiceLocatorTagPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ServiceLocatorTagPassTest.php
@@ -214,7 +214,7 @@ public function testDefinitionOrderIsTheSame()
         $locator = $container->getDefinition($locator);
         $factories = $locator->getArguments()[0];
 
-        static::assertSame(['service-1', 'service-2'], array_keys($factories));
+        static::assertSame(['service-2', 'service-1'], array_keys($factories));
     }
 
     public function testBindingsAreProcessed()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
@@ -65,14 +65,14 @@ protected static function getTestServiceSubscriberService($container)
     protected static function getFooServiceService($container)
     {
         return $container->services['foo_service'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber((new \Symfony\Component\DependencyInjection\Argument\ServiceLocator($container->getService ??= $container->getService(...), [
-            'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => ['privates', 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition', 'getCustomDefinitionService', false],
             'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber' => ['services', 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber', 'getTestServiceSubscriberService', false],
+            'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => ['privates', 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition', 'getCustomDefinitionService', false],
             'bar' => ['services', 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber', 'getTestServiceSubscriberService', false],
             'baz' => ['privates', 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition', 'getCustomDefinitionService', false],
             'late_alias' => ['services', 'late_alias', 'getLateAliasService', false],
         ], [
-            'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition',
             'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber',
+            'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition',
             'bar' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition',
             'baz' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition',
             'late_alias' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestDefinition1',

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,6 @@ public static function map(array $services): array`
`131`	`131`
`132`	`132`	`$services[$k] = new ServiceClosureArgument($v);`
`133`	`133`	`}`
`134`		`- ksort($services);`
`135`	`134`
`136`	`135`	`return $services;`
`137`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -619,7 +619,7 @@ public function testTaggedLocatorWithDefaultPriorityMethodConfiguredViaAttribute`
`619`	`619`	`// We need to check priority of instances in the factories`
`620`	`620`	`$factories = (new \ReflectionClass($locator))->getProperty('factories');`
`621`	`621`
`622`		`- self::assertSame([BarTagClass::class, FooTagClass::class], array_keys($factories->getValue($locator)));`
	`622`	`+ self::assertSame([FooTagClass::class, BarTagClass::class], array_keys($factories->getValue($locator)));`
`623`	`623`	`}`
`624`	`624`
`625`	`625`	`public function testTaggedLocatorWithDefaultIndexMethodAndWithDefaultPriorityMethodConfiguredViaAttribute()`
`@@ -648,7 +648,7 @@ public function testTaggedLocatorWithDefaultIndexMethodAndWithDefaultPriorityMet`
`648`	`648`	`// We need to check priority of instances in the factories`
`649`	`649`	`$factories = (new \ReflectionClass($locator))->getProperty('factories');`
`650`	`650`
`651`		`- self::assertSame(['bar_tag_class', 'foo_tag_class'], array_keys($factories->getValue($locator)));`
	`651`	`+ self::assertSame(['foo_tag_class', 'bar_tag_class'], array_keys($factories->getValue($locator)));`
`652`	`652`	`self::assertSame($container->get(BarTagClass::class), $locator->get('bar_tag_class'));`
`653`	`653`	`self::assertSame($container->get(FooTagClass::class), $locator->get('foo_tag_class'));`
`654`	`654`	`}`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ public function testDefinitionOrderIsTheSame()`
`214`	`214`	`$locator = $container->getDefinition($locator);`
`215`	`215`	`$factories = $locator->getArguments()[0];`
`216`	`216`
`217`		`- static::assertSame(['service-1', 'service-2'], array_keys($factories));`
	`217`	`+ static::assertSame(['service-2', 'service-1'], array_keys($factories));`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`public function testBindingsAreProcessed()`