Merge pull request #260 from symfony-cmf/handle_colon_in_url

do not allow colon inside a PHPCR route uri

Author: dbu

CHANGELOG.md

@@ -1,6 +1,8 @@
 Changelog
 =========
 
+* **2014-08-07**: PHPCR RouteProvider no longer allows colons in the URI as they are
+  interpreted as namespaces, leading to errors.
 * **2014-06-06**: Updated to PSR-4 autoloading
 
 1.2.0

Doctrine/Phpcr/RouteProvider.php

@@ -59,6 +59,20 @@ public function __construct(
         $this->logger = $logger;
     }
 
+    /**
+     * @param Request $request
+     *
+     * @return array a list of PHPCR-ODM ids
+     */
+    public function getCandidates(Request $request)
+    {
+        if (false !== strpos($request->getPathInfo(), ':')) {
+            return array();
+        }
+
+        return $this->candidatesStrategy->getCandidates($request);
+    }
+
     /**
      * {@inheritDoc}
      *
@@ -69,7 +83,7 @@ public function __construct(
      */
     public function getRouteCollectionForRequest(Request $request)
     {
-        $candidates = $this->candidatesStrategy->getCandidates($request);
+        $candidates = $this->getCandidates($request);
 
         $collection = new RouteCollection();
 

Tests/Functional/Doctrine/Phpcr/RouteProviderTest.php

@@ -101,16 +101,26 @@ public function testGetRouteCollectionForRequestFormat()
     /**
      * The root route will always be found.
      */
-    public function testGetRouteCollectionForRequestNophpcrUrl()
+    public function testGetRouteCollectionForRequestNonPhpcrUrl()
     {
-        $collection = $this->repository->getRouteCollectionForRequest(Request::create(':///'));
+        $collection = $this->repository->getRouteCollectionForRequest(Request::create('http:///'));
         $this->assertInstanceOf('Symfony\Component\Routing\RouteCollection', $collection);
         $this->assertCount(1, $collection);
         $routes = $collection->all();
         list ($key, $route) = each($routes);
         $this->assertEquals(self::ROUTE_ROOT, $key);
     }
 
+    /**
+     * The root route will always be found.
+     */
+    public function testGetRouteCollectionForRequestColonInUrl()
+    {
+        $collection = $this->repository->getRouteCollectionForRequest(Request::create('http://foo.com/jcr:content'));
+        $this->assertInstanceOf('Symfony\Component\Routing\RouteCollection', $collection);
+        $this->assertCount(0, $collection);
+    }
+
     public function testGetRoutesByNames()
     {
         $this->buildRoutes();