Merge pull request symfony#36 from symfony-cmf/add_uri_filter_prefix

dbu · dbu · commit 4f5f38b93cf5 · 2012-12-03T06:30:17.000-08:00
add optional support for an uri filter pattern
diff --git a/DynamicRouter.php b/DynamicRouter.php
@@ -71,12 +71,21 @@ class DynamicRouter implements RouterInterface, ChainedRouterInterface
      */
     protected $context;
 
+    /**
+     * The regexp pattern that needs to be matched before a dynamic lookup is made
+     *
+     * @var string
+     */
+    protected $uriFilterRegexp;
+
     /**
      * @param RouteRepositoryInterface $routeRepository The repository to get routes from
+     * @param string $uriFilterRegexp The regexp pattern that needs to be matched before a dynamic lookup is made
      */
-    public function __construct(RouteRepositoryInterface $routeRepository)
+    public function __construct(RouteRepositoryInterface $routeRepository, $uriFilterRegexp = '')
     {
         $this->routeRepository = $routeRepository;
+        $this->uriFilterRegexp = $uriFilterRegexp;
     }
 
     /**
@@ -190,6 +199,10 @@ public function getRouteCollection()
      */
     public function match($url)
     {
+        if (! empty($this->uriFilterRegexp) && ! preg_match($this->uriFilterRegexp, $url)) {
+            throw new ResourceNotFoundException("$url does not match the '{$this->uriFilterRegexp}' pattern");
+        }
+
         $routes = $this->routeRepository->findManyByUrl($url);
         if (empty($routes)) {
             throw new ResourceNotFoundException("No routes found in the route repository for '$url'");
