make candidates filter out invalid paths

Author: dbu

Admin/RouteAdmin.php

@@ -163,6 +163,13 @@ protected function configureFieldsForDefaults($dynamicDefaults)
             }
         }
 
+        if ($route && $route->getOption('add_format_pattern')) {
+            $defaults['_format'] = array('_format', 'text', array('required' => true));
+        }
+        if ($route && $route->getOption('add_locale_pattern')) {
+            $defaults['_locale'] = array('_format', 'text', array('required' => false));
+        }
+
         return $defaults;
     }
 

Doctrine/Phpcr/PrefixCandidates.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr;
 
+use PHPCR\Util\PathHelper;
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ODM\PHPCR\DocumentManager;
 use Doctrine\ODM\PHPCR\Query\Builder\QueryBuilder;
@@ -68,7 +69,9 @@ public function isCandidate($name)
     {
         foreach ($this->getPrefixes() as $prefix) {
             // $name is the route document path
-            if ($name === $prefix || 0 === strpos($name, $prefix . '/')) {
+            if (($name === $prefix || 0 === strpos($name, $prefix . '/'))
+                && PathHelper::assertValidAbsolutePath($name, false, false)
+            ) {
                 return true;
             }
         }
@@ -113,6 +116,13 @@ public function getCandidates(Request $request)
             }
         }
 
+        // filter out things like double // or trailing / - this would trigger an exception on the document manager.
+        foreach ($candidates as $key => $candidate) {
+            if (! PathHelper::assertValidAbsolutePath($candidate, false, false)) {
+                unset($candidates[$key]);
+            }
+        }
+
         return $candidates;
     }
 

Tests/Functional/Doctrine/Phpcr/RouteProviderTest.php

@@ -99,11 +99,17 @@ public function testGetRouteCollectionForRequestFormat()
         $this->assertEquals(null, $root->getDefault('_format'));
     }
 
+    /**
+     * The root route will always be found.
+     */
     public function testGetRouteCollectionForRequestNophpcrUrl()
     {
         $collection = $this->repository->getRouteCollectionForRequest(Request::create(':///'));
         $this->assertInstanceOf('Symfony\Component\Routing\RouteCollection', $collection);
-        $this->assertCount(0, $collection);
+        $this->assertCount(1, $collection);
+        $routes = $collection->all();
+        list ($key, $route) = each($routes);
+        $this->assertEquals(self::ROUTE_ROOT, $key);
     }
 
     public function testGetRoutesByNames()
@@ -113,6 +119,7 @@ public function testGetRoutesByNames()
         $routeNames = array(
             self::ROUTE_ROOT . '/testroute/noroute/child',
             self::ROUTE_ROOT . '/testroute/noroute',
+            self::ROUTE_ROOT . '/testroute/', // trailing slash is invalid for phpcr
             self::ROUTE_ROOT . '/testroute'
         );