Merge branch '5.4' into 6.0

* 5.4:
  [Translation] [Bridge] [Lokalise] do not export empty strings
  [Lock] Use platform to identify the PDO driver
  fix merge
  [HttpFoundation] Update http messages of statuses 413 and 422
  [DependencyInjection] fix support for "new" in initializers on PHP 8.1
  added missing trasnlations in Greek
  add translation for zh_TW
  41830 missing translations for serbian sr latn
  Changed some translations to be more in line with native Serbian language
  [HttpFoundation] Fix ianaCodesReasonPhrasesProvider to consume a local file
  Add armenian translation for #41835
  Add swedish translation for #41835
  Added missing danish translations and fixed typo in validators.da.xlf
  [FrameworkBundle] Minor improvement - No `array_merge` in loop

Author: derrabus

Routing/Router.php

@@ -130,15 +130,15 @@ private function resolveParameters(RouteCollection $collection)
 
             $schemes = [];
             foreach ($route->getSchemes() as $scheme) {
-                $schemes = array_merge($schemes, explode('|', $this->resolve($scheme)));
+                $schemes[] = explode('|', $this->resolve($scheme));
             }
-            $route->setSchemes($schemes);
+            $route->setSchemes(array_merge([], ...$schemes));
 
             $methods = [];
             foreach ($route->getMethods() as $method) {
-                $methods = array_merge($methods, explode('|', $this->resolve($method)));
+                $methods[] = explode('|', $this->resolve($method));
             }
-            $route->setMethods($methods);
+            $route->setMethods(array_merge([], ...$methods));
             $route->setCondition($this->resolve($route->getCondition()));
         }
     }

Tests/Routing/RouterTest.php

@@ -553,6 +553,44 @@ public function testCacheValidityWithContainerParameters($parameter)
         }
     }
 
+    public function testResolvingSchemes()
+    {
+        $routes = new RouteCollection();
+
+        $route = new Route('/test', [], [], [], '', ['%parameter.http%', '%parameter.https%']);
+        $routes->add('foo', $route);
+
+        $sc = $this->getPsr11ServiceContainer($routes);
+        $parameters = $this->getParameterBag([
+            'parameter.http' => 'http',
+            'parameter.https' => 'https',
+        ]);
+
+        $router = new Router($sc, 'foo', [], null, $parameters);
+        $route = $router->getRouteCollection()->get('foo');
+
+        $this->assertEquals(['http', 'https'], $route->getSchemes());
+    }
+
+    public function testResolvingMethods()
+    {
+        $routes = new RouteCollection();
+
+        $route = new Route('/test', [], [], [], '', [], ['%parameter.get%', '%parameter.post%']);
+        $routes->add('foo', $route);
+
+        $sc = $this->getPsr11ServiceContainer($routes);
+        $parameters = $this->getParameterBag([
+            'PARAMETER.GET' => 'GET',
+            'PARAMETER.POST' => 'POST',
+        ]);
+
+        $router = new Router($sc, 'foo', [], null, $parameters);
+        $route = $router->getRouteCollection()->get('foo');
+
+        $this->assertEquals(['GET', 'POST'], $route->getMethods());
+    }
+
     public function getContainerParameterForRoute()
     {
         yield 'String' => ['"foo"'];