[Routing] Route collection prefixes must start with a / and must not …

…end with a /
symfony · Apr 26, 2011 · 98e70f0 · 98e70f0 · Seldaek · Apr 26, 2011
1 parent b80bb9c
commit 98e70f0
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/Symfony/Component/Routing/RouteCollection.php b/src/Symfony/Component/Routing/RouteCollection.php
@@ -120,10 +120,18 @@ public function addCollection(RouteCollection $collection, $prefix = '')
      */
     public function addPrefix($prefix)
     {
+        // a prefix must not end with a slash
+        $prefix = rtrim($prefix, '/');
+
         if (!$prefix) {
             return;
         }
 
+        // a prefix must start with a slash
+        if ('/' !== $prefix[0]) {
+            $prefix = '/'.$prefix;
+        }
+
         $this->prefix = $prefix.$this->prefix;
 
         foreach ($this->all() as $route) {