[Routing] fix dumping conditions that use the request

nicolas-grekas · nicolas-grekas · commit 09d5be8dac5f · 2018-11-06T21:24:23.000+01:00
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -400,7 +400,7 @@ private function compileRoute(Route $route, string $name, $vars, array &$conditi
 
         if ($condition = $route->getCondition()) {
             $condition = $this->getExpressionLanguage()->compile($condition, array('context', 'request'));
-            $condition = $conditions[$condition] ?? $conditions[$condition] = ((false !== strpos($condition, '$request')) - 1) * \count($conditions);
+            $condition = $conditions[$condition] ?? $conditions[$condition] = (false !== strpos($condition, '$request') ? 1 : -1) * \count($conditions);
         } else {
             $condition = 'null';
         }
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php
@@ -455,6 +455,9 @@ public function testRequestCondition()
     {
         $coll = new RouteCollection();
         $route = new Route('/foo/{bar}');
+        $route->setCondition('request.getBaseUrl() == "/bar"');
+        $coll->add('bar', $route);
+        $route = new Route('/foo/{bar}');
         $route->setCondition('request.getBaseUrl() == "/sub/front.php" and request.getPathInfo() == "/foo/bar"');
         $coll->add('foo', $route);
         $matcher = $this->getUrlMatcher($coll, new RequestContext('/sub/front.php'));

Original file line number	Diff line number	Diff line change
`@@ -400,7 +400,7 @@ private function compileRoute(Route $route, string $name, $vars, array &$conditi`
`400`	`400`
`401`	`401`	`if ($condition = $route->getCondition()) {`
`402`	`402`	`$condition = $this->getExpressionLanguage()->compile($condition, array('context', 'request'));`
`403`		`- $condition = $conditions[$condition] ?? $conditions[$condition] = ((false !== strpos($condition, '$request')) - 1) * \count($conditions);`
	`403`	`+ $condition = $conditions[$condition] ?? $conditions[$condition] = (false !== strpos($condition, '$request') ? 1 : -1) * \count($conditions);`
`404`	`404`	`} else {`
`405`	`405`	`$condition = 'null';`
`406`	`406`	`}`