Merge branch 'release/1.6.10' into v1

Author: khalwat

CHANGELOG.md

@@ -1,5 +1,9 @@
 # ImageOptimize Changelog
 
+## 1.6.10 - 2020.02.11
+### Changed
+* Normalize the file format to lowercase before transforming
+
 ## 1.6.9 - 2020.02.06
 ### Changed
 * Properly documented how the data in the `imageTransformTypeSettings` config is stored

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.6.9",
+    "version": "1.6.10",
     "keywords": [
         "craft",
         "cms",

docs/docs/.vuepress/config.js

@@ -2,7 +2,7 @@ module.exports = {
     title: 'Image Optimize Documentation',
     description: 'Documentation for the Image Optimize plugin',
     base: '/docs/image-optimize/',
-    dest: '~/webdev/sites/nystudio107/web/docs/image-optimize',
+    dest: '../../../sites/nystudio107/web/docs/image-optimize',
     themeConfig: {
         displayAllHeaders: true,
         sidebar: [

src/services/Optimize.php

@@ -160,7 +160,6 @@ public function handleGetAssetUrlEvent(GetAssetUrlEvent $event)
             // For backwards compatibility
             if ($transform === null && ImageOptimize::$plugin->transformMethod instanceof ThumborImageTransform) {
                 $transform = new AssetTransform([
-                    'height'    => $asset->height,
                     'width'     => $asset->width,
                     'interlace' => 'line',
                 ]);
@@ -179,6 +178,8 @@ public function handleGetAssetUrlEvent(GetAssetUrlEvent $event)
             if ($finalFormat === 'svg') {
                 return null;
             }
+            // Normalize the extension to lowercase, for some transform methods that require this
+            $transform['format'] = strtolower($finalFormat);
             // Generate an image transform url
             $url = ImageOptimize::$plugin->transformMethod->getTransformUrl(
                 $asset,
@@ -206,6 +207,7 @@ public function handleGetAssetThumbUrlEvent(GetAssetThumbUrlEvent $event)
             if (ImageHelper::canManipulateAsImage($asset->getExtension())) {
                 $transform = new AssetTransform([
                     'width' => $event->width,
+		    'height' => $event->height,
                     'interlace' => 'line',
                 ]);
                 /** @var ImageTransform $transformMethod */
@@ -215,6 +217,8 @@ public function handleGetAssetThumbUrlEvent(GetAssetThumbUrlEvent $event)
                 if ($finalFormat === 'svg') {
                     return null;
                 }
+                // Normalize the extension to lowercase, for some transform methods that require this
+                $transform['format'] = strtolower($finalFormat);
                 // Generate an image transform url
                 if ($transformMethod->hasProperty('generateTransformsBeforePageLoad')) {
                     $transformMethod->generateTransformsBeforePageLoad = $event->generate;