Merge pull request #2643 from acrobat/fix-liip-imagine-incompatibility

[MediaBundle] Fix incompatibility with liip/imagine-bundle 2.2+

src/Kunstmaan/MediaBundle/Helper/Imagine/WebPathResolver.php

@@ -38,15 +38,21 @@ protected function getFileUrl($path, $filter)
         return parent::getFileUrl($path, $filter);
     }
 
+    protected function getFilePath($path, $filter)
+    {
+        $filterConf = $this->filterConfig->get($filter);
+        $path = $this->changeFileExtension($path, $filterConf['format']);
+        $fullPath = $this->getFullPath($path, $filter);
+
+        return $this->webRoot.'/'.$fullPath;
+    }
+
     /**
      * {@inheritdoc}
      */
     public function resolve($path, $filter)
     {
-        return sprintf('%s/%s',
-            $this->getBaseUrl(),
-            $this->getFileUrl($path, $filter)
-        );
+        return sprintf('%s/%s', $this->getBaseUrl(), $this->getFileUrl($path, $filter));
     }
 
     /**
@@ -66,4 +72,15 @@ private function changeFileExtension($path, $format)
 
         return $path;
     }
+
+    /**
+     * Copy from \Liip\ImagineBundle\Imagine\Cache\Resolver\WebPathResolver::getFullPath
+     */
+    private function getFullPath($path, $filter)
+    {
+        // crude way of sanitizing URL scheme ("protocol") part
+        $path = str_replace('://', '---', $path);
+
+        return $this->cachePrefix.'/'.$filter.'/'.ltrim($path, '/');
+    }
 }