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

Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php

@@ -249,7 +249,8 @@ public function testNoExceptionOnNonExistentTypeHintOptionalArg()
         $pass->process($container);
 
         $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
-        $this->assertSame(['foo::barAction', 'foo::fooAction'], array_keys($locator));
+
+        $this->assertEqualsCanonicalizing(['foo::barAction', 'foo::fooAction'], array_keys($locator));
     }
 
     public function testArgumentWithNoTypeHintIsOk()
@@ -396,7 +397,10 @@ public function testAlias()
         $pass->process($container);
 
         $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
-        $this->assertSame([RegisterTestController::class.'::fooAction', 'foo::fooAction'], array_keys($locator));
+
+        $services = array_keys($locator);
+        sort($services);
+        $this->assertSame([RegisterTestController::class.'::fooAction', 'foo::fooAction'], $services);
     }
 
     public function testBindWithTarget()

Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php

@@ -57,7 +57,7 @@ public function testProcess()
             'Symfony\Component\HttpKernel\DependencyInjection\RemoveEmptyControllerArgumentLocatorsPass: Removing method "setTestCase" of service "c2" from controller candidates: the method is called at instantiation, thus cannot be an action.',
         ];
 
-        $this->assertSame($expectedLog, $container->getCompiler()->getLog());
+        $this->assertEqualsCanonicalizing($expectedLog, $container->getCompiler()->getLog());
     }
 
     public function testInvoke()