Merge branch 'release/1.4.34' into v1

Author: khalwat

CHANGELOG.md

@@ -1,5 +1,9 @@
 # ImageOptimize Changelog
 
+## 1.4.34 - 2018.07.12
+### Changed
+* Smarter appending of variant creator suffixes, to handle URLs that have query strings
+
 ## 1.4.33 - 2018.05.24
 ### Changed
 * Handle JPEGs coming in as both `jpg` & `jpeg` for the detected file format

composer.json

@@ -2,7 +2,7 @@
     "name": "nystudio107/craft-imageoptimize",
     "description": "Automatically create & optimize responsive image transforms, using either native Craft transforms or a service like Imgix, with zero template changes.",
     "type": "craft-plugin",
-    "version": "1.4.33",
+    "version": "1.4.34",
     "keywords": [
         "craft",
         "cms",

src/imagetransforms/CraftImageTransform.php

@@ -36,9 +36,7 @@ class CraftImageTransform extends ImageTransform implements ImageTransformInterf
      */
     public static function getTransformUrl(Asset $asset, $transform, array $params = [])
     {
-        $generateTransformsBeforePageLoad = isset($params['generateTransformsBeforePageLoad'])
-            ? $params['generateTransformsBeforePageLoad']
-            : true;
+        $generateTransformsBeforePageLoad = $params['generateTransformsBeforePageLoad'] ?? true;
         // Generate the URLs to the optimized images
         $assets = Craft::$app->getAssets();
         $url = $assets->getAssetUrl($asset, $transform, $generateTransformsBeforePageLoad);
@@ -53,7 +51,7 @@ public static function getTransformUrl(Asset $asset, $transform, array $params =
      */
     public static function getWebPUrl(string $url): string
     {
-        $url = $url.".webp";
+        $url = self::appendExtension($url, '.webp');
 
         return $url;
     }
@@ -65,9 +63,7 @@ public static function getTransformParams(): array
     {
         $settings = ImageOptimize::$plugin->getSettings();
         // Get our $generateTransformsBeforePageLoad setting
-        $generateTransformsBeforePageLoad = isset($settings->generateTransformsBeforePageLoad)
-            ? $settings->generateTransformsBeforePageLoad
-            : true;
+        $generateTransformsBeforePageLoad = $settings->generateTransformsBeforePageLoad ?? true;
         $params = [
             'generateTransformsBeforePageLoad' => $generateTransformsBeforePageLoad,
         ];

src/imagetransforms/ImageTransform.php

@@ -117,4 +117,56 @@ public static function prefetchRemoteFile($url)
         curl_exec($ch);
         curl_close($ch);
     }
+
+    /**
+     * Append an extension a passed url or path
+     *
+     * @param $pathOrUrl
+     * @param $extension
+     *
+     * @return string
+     */
+    public static function appendExtension($pathOrUrl, $extension): string
+    {
+        $path = self::decomposeUrl($pathOrUrl);
+        $path_parts = pathinfo($path['path']);
+        $new_path = $path_parts['filename'] . '.' . $path_parts['extension'] . $extension;
+        if (!empty($path_parts['dirname']) && $path_parts['dirname'] !== '.') {
+            $new_path = $path_parts['dirname'] . DIRECTORY_SEPARATOR . $new_path;
+            $new_path = preg_replace('#/+#', '/', $new_path);
+        }
+        $output = $path['prefix'] . $new_path . $path['suffix'];
+
+        return $output;
+    }
+
+    // Protected Methods
+    // =========================================================================
+
+    /**
+     * Decompose a url into a prefix, path, and suffix
+     *
+     * @param $pathOrUrl
+     *
+     * @return array
+     */
+    protected static function decomposeUrl($pathOrUrl): array
+    {
+        $result = array();
+
+        if (filter_var($pathOrUrl, FILTER_VALIDATE_URL)) {
+            $url_parts = parse_url($pathOrUrl);
+            $result['prefix'] = $url_parts['scheme'] . '://' . $url_parts['host'];
+            $result['path'] = $url_parts['path'];
+            $result['suffix'] = '';
+            $result['suffix'] .= empty($url_parts['query']) ? '' : '?' . $url_parts['query'];
+            $result['suffix'] .= empty($url_parts['fragment']) ? '' : '#' . $url_parts['fragment'];
+        } else {
+            $result['prefix'] = '';
+            $result['path'] = $pathOrUrl;
+            $result['suffix'] = '';
+        }
+
+        return $result;
+    }
 }