Merge pull request #194 from jasonvarga/master

Save pjpg as jpg when including file extensions
thephpleague · May 9, 2017 · 8077f52 · 8077f52
2 parents 0075841 + 0d8a660
commit 8077f52
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/Server.php b/src/Server.php
@@ -281,7 +281,9 @@ public function getCachePath($path, array $params = [])
         }
 
         if ($this->cacheWithFileExtensions) {
-            $cachedPath .= '.'.(isset($params['fm']) ? $params['fm'] : pathinfo($path)['extension']);
+            $ext = (isset($params['fm']) ? $params['fm'] : pathinfo($path)['extension']);
+            $ext = ($ext === 'pjpg') ? 'jpg' : $ext;
+            $cachedPath .= '.'.$ext;
         }
 
         return $cachedPath;

diff --git a/tests/ServerTest.php b/tests/ServerTest.php
@@ -205,13 +205,26 @@ public function testGetCachePathWithExtensionAndFmParam()
         $this->assertEquals('image.jpg/eb6091e07fb06219634a3c82afb88239.gif', $this->server->getCachePath('image.jpg', ['fm' => 'gif']));
     }
 
+    public function testGetCachePathWithExtensionAndPjpgFmParam()
+    {
+        $this->server->setCacheWithFileExtensions(true);
+        $this->assertEquals('image.jpg/ce5cb75f4a37dec0a0a49854e94123eb.jpg', $this->server->getCachePath('image.jpg', ['fm' => 'pjpg']));
+    }
+
     public function testGetCachePathWithExtensionAndFmFromDefaults()
     {
         $this->server->setCacheWithFileExtensions(true);
         $this->server->setDefaults(['fm' => 'gif']);
         $this->assertEquals('image.jpg/eb6091e07fb06219634a3c82afb88239.gif', $this->server->getCachePath('image.jpg', []));
     }
 
+    public function testGetCachePathWithExtensionAndPjpgFmFromDefaults()
+    {
+        $this->server->setCacheWithFileExtensions(true);
+        $this->server->setDefaults(['fm' => 'pjpg']);
+        $this->assertEquals('image.jpg/ce5cb75f4a37dec0a0a49854e94123eb.jpg', $this->server->getCachePath('image.jpg', []));
+    }
+
     public function testGetCachePathWithExtensionAndFmFromPreset()
     {
         $this->server->setCacheWithFileExtensions(true);
@@ -223,6 +236,17 @@ public function testGetCachePathWithExtensionAndFmFromPreset()
         $this->assertEquals('image.jpg/eb6091e07fb06219634a3c82afb88239.gif', $this->server->getCachePath('image.jpg', ['p' => 'gif']));
     }
 
+    public function testGetCachePathWithExtensionAndPjpgFmFromPreset()
+    {
+        $this->server->setCacheWithFileExtensions(true);
+
+        $this->server->setPresets(['pjpg' => [
+            'fm' => 'pjpg',
+        ]]);
+
+        $this->assertEquals('image.jpg/ce5cb75f4a37dec0a0a49854e94123eb.jpg', $this->server->getCachePath('image.jpg', ['p' => 'pjpg']));
+    }
+
     public function testCacheFileExists()
     {
         $this->server->setCache(Mockery::mock('League\Flysystem\FilesystemInterface', function ($mock) {