[Routing] Remove a weird dependency

Author: vicb

CHANGELOG-2.1.md

@@ -242,6 +242,7 @@ To get the diff between two versions, go to https://github.com/symfony/symfony/c
 
 ### Routing
 
+ * the UrlMatcher does not throw a \LogicException any more when the required scheme is not the current one
  * added a TraceableUrlMatcher
  * added the possibility to define default values and requirements for placeholders in prefix, including imported routes
  * added RouterInterface::getRouteCollection

src/Symfony/Component/Routing/Matcher/RedirectableUrlMatcher.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Routing\Matcher;
 
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\Route;
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
@@ -20,8 +21,6 @@
  */
 abstract class RedirectableUrlMatcher extends UrlMatcher implements RedirectableUrlMatcherInterface
 {
- private $trailingSlashTest = false;
-
  /**
  * @see UrlMatcher::match()
  *
@@ -36,18 +35,28 @@ public function match($pathinfo)
  throw $e;
  }
 
- // try with a / at the end
- $this->trailingSlashTest = true;
-
- return $this->match($pathinfo.'/');
+ try {
+ parent::match($pathinfo.'/');
+ return $this->redirect($pathinfo.'/', null);
+ } catch (ResourceNotFoundException $e2) {
+ throw $e;
+ }
  }
 
- if ($this->trailingSlashTest) {
-  $this->trailingSlashTest = false;
+ return $parameters;
+ }
 
- return $this->redirect($pathinfo, null);
+ /**
+ * {@inheritDoc}
+ */
+ protected function handleRouteRequirements($pathinfo, $name, Route $route)
+ {
+ // check HTTP scheme requirement
+ $scheme = $route->getRequirement('_scheme');
+ if ($scheme && $this->context->getScheme() !== $scheme) {
+ return array(self::ROUTE_MATCH, $this->redirect($pathinfo, $name, $scheme));
  }
 
- return $parameters;
+ return array(self::REQUIREMENT_MATCH, null);
  }
 }

src/Symfony/Component/Routing/Matcher/UrlMatcher.php

@@ -15,7 +15,7 @@
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RequestContext;
-use Symfony\Component\Routing\Matcher\RedirectableUrlMatcherInterface;
+use Symfony\Component\Routing\Route;
 
 /**
  * UrlMatcher matches URL based on a set of routes.
@@ -26,6 +26,10 @@
  */
 class UrlMatcher implements UrlMatcherInterface
 {
+ const REQUIREMENT_MATCH = 0;
+ const REQUIREMENT_MISMATCH = 1;
+ const ROUTE_MATCH = 2;
+
  protected $context;
 
  private $routes;
@@ -84,6 +88,17 @@ public function match($pathinfo)
  : new ResourceNotFoundException();
  }
 
+ /**
+ * Tries to match a URL with a set of routes.
+ *
+ * @param string $pathinfo The path info to be parsed
+ * @param RouteCollection $routes The set of routes
+ *
+ * @return array An array of parameters
+ *
+ * @throws ResourceNotFoundException If the resource could not be found
+ * @throws MethodNotAllowedException If the resource was found but the request method is not allowed
+ */
  protected function matchCollection($pathinfo, RouteCollection $routes)
  {
  $pathinfo = urldecode($pathinfo);
@@ -126,21 +141,38 @@ protected function matchCollection($pathinfo, RouteCollection $routes)
  }
  }
 
- // check HTTP scheme requirement
- if ($scheme = $route->getRequirement('_scheme')) {
- if (!$this instanceof RedirectableUrlMatcherInterface) {
- throw new \LogicException('The "_scheme" requirement is only supported for URL matchers that implement RedirectableUrlMatcherInterface.');
- }
+ $status = $this->handleRouteRequirements($pathinfo, $name, $route);
 
- if ($this->context->getScheme() !== $scheme) {
- return $this->redirect($pathinfo, $name, $scheme);
- }
+ if (self::ROUTE_MATCH === $status[0]) {
+ return $status[1];
+ }
+
+ if (self::REQUIREMENT_MISMATCH === $status[0]) {
+ continue;
  }
 
  return array_merge($this->mergeDefaults($matches, $route->getDefaults()), array('_route' => $name));
  }
  }
 
+ /**
+ * Handles specific route requirements.
+ *
+ * @param string $pathinfo The path
+ * @param string $name The route name
+ * @param string $route The route
+ *
+ * @return array The first element represents the status, the second contains additional information
+ */
+ protected function handleRouteRequirements($pathinfo, $name, Route $route)
+ {
+ // check HTTP scheme requirement
+ $scheme = $route->getRequirement('_scheme');
+ $status = $scheme && $scheme !== $this->context->getScheme() ? self::REQUIREMENT_MISMATCH : self::REQUIREMENT_MATCH;
+
+ return array($status, null);
+ }
+
  protected function mergeDefaults($params, $defaults)
  {
  $parameters = $defaults;

tests/Symfony/Tests/Component/Routing/Matcher/UrlMatcherTest.php

@@ -207,14 +207,13 @@ public function testMatchRegression()
  }
 
  /**
- * @expectedException \LogicException
+ * @expectedException Symfony\Component\Routing\Exception\ResourceNotFoundException
  */
  public function testSchemeRequirement()
  {
  $coll = new RouteCollection();
  $coll->add('foo', new Route('/foo', array(), array('_scheme' => 'https')));
-
  $matcher = new UrlMatcher($coll, new RequestContext());
  $matcher->match('/foo');
  }
-}
+}