Merge branch 'feature-fix-basepath' of /~https://github.com/rafalwrzesz…

…cz/zf2 into hotfix/view-helper-basepath
zendframework · Jan 6, 2012 · b0695b0 · b0695b0
9 parents 702ec03 + 14c7cd8 + 5a55cdf + c9e475e + 1fa3bfc + 3a78ba4 + a774960 + c3a8db3 + 8f1532b
commit b0695b0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/Helper/BasePath.php b/src/Helper/BasePath.php
@@ -72,7 +72,7 @@ public function __invoke($file = null)
      */
     public function setBasePath($basePath)
     {
-        $this->basePath = $basePath;
+        $this->basePath = rtrim($basePath, '/');
         return $this;
     }
 }
diff --git a/test/Helper/BasePathTest.php b/test/Helper/BasePathTest.php
@@ -54,6 +54,14 @@ public function testBasePathWithFile()
         $this->assertEquals('/foo/bar', $helper('bar'));
     }
 
+    public function testBasePathNoDoubleSlashes()
+    {
+        $helper = new BasePath();
+        $helper->setBasePath('/');
+
+        $this->assertEquals('/', $helper('/'));
+    }
+
     public function testBasePathWithFilePrefixedBySlash()
     {
         $helper = new BasePath();