Merge pull request liip#1402 from liip/fix-runtime-config-asset-version

asset versions: have & instead of second ? when image url already has a query string

Templating/LazyFilterRuntime.php

@@ -42,11 +42,8 @@ public function filter(string $path, string $filter, array $config = [], ?string
     {
         $path = $this->cleanPath($path);
         $path = $this->cache->getBrowserPath($path, $filter, $config, $resolver, $referenceType);
-        if ($this->assetVersion) {
-            $path .= '?'.$this->assetVersion;
-        }
 
-        return $path;
+        return $this->appendAssetVersion($path);
     }
 
     /**
@@ -61,11 +58,8 @@ public function filterCache(string $path, string $filter, array $config = [], ?s
             $path = $this->cache->getRuntimePath($path, $config);
         }
         $path = $this->cache->resolve($path, $filter, $resolver);
-        if ($this->assetVersion) {
-            $path .= '?'.$this->assetVersion;
-        }
 
-        return $path;
+        return $this->appendAssetVersion($path);
     }
 
     private function cleanPath(string $path): string
@@ -81,4 +75,15 @@ private function cleanPath(string $path): string
 
         return $path;
     }
+
+    private function appendAssetVersion(string $path): string
+    {
+        if (!$this->assetVersion) {
+            return $path;
+        }
+
+        $separator = false !== mb_strpos($path, '?') ? '&' : '?';
+
+        return $path.$separator.$this->assetVersion;
+    }
 }