Merge branch '5.4' into 6.0

* 5.4:
  fix merge
  Fix non-existent parameter in test.session.listener

Author: nicolas-grekas

Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php

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