Merge pull request #171 from jasonvarga/master

Fix source being trimmed when it begins with the baseUrl
thephpleague · Jan 19, 2017 · eded0a9 · eded0a9
2 parents fef5073 + 49de68e
commit eded0a9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/Server.php b/src/Server.php
@@ -136,9 +136,11 @@ public function getSourcePathPrefix()
     public function getSourcePath($path)
     {
         $path = trim($path, '/');
+
+        $baseUrl = $this->baseUrl.'/';
 
-        if (substr($path, 0, strlen($this->baseUrl)) === $this->baseUrl) {
-            $path = trim(substr($path, strlen($this->baseUrl)), '/');
+        if (substr($path, 0, strlen($baseUrl)) === $baseUrl) {
+            $path = trim(substr($path, strlen($baseUrl)), '/');
         }
 
         if ($path === '') {

diff --git a/tests/ServerTest.php b/tests/ServerTest.php
@@ -78,6 +78,16 @@ public function testGetSourcePathWithPrefix()
         $this->assertEquals('img/image.jpg', $this->server->getSourcePath('image.jpg'));
     }
 
+    public function testGetsSourcePathWithBaseUrl()
+    {
+        $this->server->setBaseUrl('img/');
+        $this->assertEquals('image.jpg', $this->server->getSourcePath('image.jpg'));
+
+        // Test for a bug where if the path starts with the same substring as the base url, the source
+        // path would trim the base url off the filename. eg, the following would've returned 'ur.jpg'
+        $this->assertEquals('imgur.jpg', $this->server->getSourcePath('imgur.jpg'));
+    }
+
     public function testGetSourcePathWithMissingPath()
     {
         $this->setExpectedException(