Merge branch '5.4' into 6.0

* 5.4:
  [Translation] Translate translatable parameters
  Implement Message Stream for Postmark Mailer
  Sort services in service locator according to priority
  Relax service locator tests. Allow any order
  [Serializer] Add support for collecting type error during denormalization

Author: derrabus

Compiler/ServiceLocatorTagPass.php

@@ -102,7 +102,6 @@ public static function register(ContainerBuilder $container, array $refMap, stri
             }
             $refMap[$id] = new ServiceClosureArgument($ref);
         }
-        ksort($refMap);
 
         $locator = (new Definition(ServiceLocator::class))
             ->addArgument($refMap)

Loader/Configurator/ContainerConfigurator.php

@@ -147,9 +147,9 @@ function tagged_iterator(string $tag, string $indexAttribute = null, string $def
 /**
  * Creates a service locator by tag name.
  */
-function tagged_locator(string $tag, string $indexAttribute = null, string $defaultIndexMethod = null): ServiceLocatorArgument
+function tagged_locator(string $tag, string $indexAttribute = null, string $defaultIndexMethod = null, string $defaultPriorityMethod = null): ServiceLocatorArgument
 {
-    return new ServiceLocatorArgument(new TaggedIteratorArgument($tag, $indexAttribute, $defaultIndexMethod, true));
+    return new ServiceLocatorArgument(new TaggedIteratorArgument($tag, $indexAttribute, $defaultIndexMethod, true, $defaultPriorityMethod));
 }
 
 /**

Tests/Compiler/ServiceLocatorTagPassTest.php

@@ -177,6 +177,22 @@ public function testIndexedByServiceIdWithDecoration()
         static::assertFalse($locator->has(Decorated::class));
         static::assertInstanceOf(Decorated::class, $locator->get(Service::class));
     }
+
+    public function testDefinitionOrderIsTheSame()
+    {
+        $container = new ContainerBuilder();
+        $container->register('service-1');
+        $container->register('service-2');
+
+        $locator = ServiceLocatorTagPass::register($container, [
+            'service-2' => new Reference('service-2'),
+            'service-1' => new Reference('service-1'),
+        ]);
+        $locator = $container->getDefinition($locator);
+        $factories = $locator->getArguments()[0];
+
+        static::assertSame(['service-2', 'service-1'], array_keys($factories));
+    }
 }
 
 class Locator

Tests/Fixtures/php/services_subscriber.php

@@ -44,9 +44,9 @@ public function isCompiled(): bool
     public function getRemovedIds(): array
     {
         return [
-            '.service_locator.DlIAmAe' => true,
-            '.service_locator.DlIAmAe.foo_service' => true,
             '.service_locator.t5IGRMW' => true,
+            '.service_locator.zFfA7ng' => true,
+            '.service_locator.zFfA7ng.foo_service' => true,
             'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => true,
         ];
     }