[FrameworkBundle] fix routing container param resolving to not access deprecated requirements while maintaining BC

Tobion · Tobion · commit 9af0ff2fb2fb · 2015-01-13T13:22:41.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
@@ -77,8 +77,10 @@ public function warmUp($cacheDir)
      * Replaces placeholders with service container parameter values in:
      * - the route defaults,
      * - the route requirements,
-     * - the route pattern.
-     * - the route host.
+     * - the route path,
+     * - the route host,
+     * - the route schemes,
+     * - the route methods.
      *
      * @param RouteCollection $collection
      */
@@ -90,11 +92,27 @@ private function resolveParameters(RouteCollection $collection)
             }
 
             foreach ($route->getRequirements() as $name => $value) {
+                if ('_scheme' === $name || '_method' === $name) {
+                    continue; // ignore deprecated requirements to not trigger deprecation warnings
+                }
+
                 $route->setRequirement($name, $this->resolve($value));
             }
 
             $route->setPath($this->resolve($route->getPath()));
             $route->setHost($this->resolve($route->getHost()));
+
+            $schemes = array();
+            foreach ($route->getSchemes() as $scheme) {
+                $schemes = array_merge($schemes, explode('|', $this->resolve($scheme)));
+            }
+            $route->setSchemes($schemes);
+
+            $methods = array();
+            foreach ($route->getMethods() as $method) {
+                $methods = array_merge($methods, explode('|', $this->resolve($method)));
+            }
+            $route->setMethods($methods);
         }
     }
 
