Merge branch 'release/5.0.7' into v5

nystudio107 · Feb 13, 2025 · ae9f147 · ae9f147
2 parents 10813e1 + a8c8e9e
commit ae9f147
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # ImageOptimize Changelog
 
+## 5.0.7 - 2025.02.13
+### Fixed
+* Fixed an issue where an exception could be thrown using the default "shortcut" syntax due to a regression ([#422](https://github.com/nystudio107/craft-imageoptimize/issues/422))
+
 ## 5.0.6 - 2025.02.12
 ### Added
 * Added the `.placeholder('none')` parameter to allow specifying that no placeholder background image CSS should be used for lazy loaded images (useful for transparent PNGs) ([#410](https://github.com/nystudio107/craft-imageoptimize/issues/410))

diff --git a/buildchain/package-lock.json b/buildchain/package-lock.json
diff --git a/composer.json b/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": "5.0.6",
+  "version": "5.0.7",
   "keywords": [
     "craft",
     "cms",

diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/src/models/ImgTag.php b/src/models/ImgTag.php
@@ -37,11 +37,11 @@ class ImgTag extends BaseImageTag
     public array $imgAttrs = [];
 
     /**
-     * @param $config
+     * @inheritDoc
      */
-    public function __construct($config = [])
+    public function init(): void
     {
-        parent::__construct($config);
+        parent::init();
         // Populate the $imageAttrs
         $this->imgAttrs = [
             'class' => '',
@@ -53,14 +53,6 @@ public function __construct($config = [])
             'sizes' => '100vw',
             'loading' => '',
         ];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function init(): void
-    {
-        parent::init();
         // If the original image is an SVG or gif, don't add the placeholder box CSS so that transparency works as intended
         $path = parse_url($this->imgAttrs['src'], PHP_URL_PATH);
         $extension = pathinfo($path, PATHINFO_EXTENSION);

diff --git a/src/models/LinkPreloadTag.php b/src/models/LinkPreloadTag.php
@@ -27,11 +27,11 @@ class LinkPreloadTag extends BaseTag
     public array $linkAttrs = [];
 
     /**
-     * @param $config
+     * @inheritDoc
      */
-    public function __construct($config = [])
+    public function init(): void
     {
-        parent::__construct($config);
+        parent::init();
         // Any web browser that supports link rel="preload" as="image" also supports webp, so prefer that
         $srcset = $this->optimizedImage->optimizedImageUrls;
         if (!empty($this->optimizedImage->optimizedWebPImageUrls)) {

diff --git a/src/models/PictureTag.php b/src/models/PictureTag.php
@@ -47,11 +47,11 @@ class PictureTag extends BaseImageTag
     public array $imgAttrs = [];
 
     /**
-     * @param $config
+     * @inheritDoc
      */
-    public function __construct($config = [])
+    public function init(): void
     {
-        parent::__construct($config);
+        parent::init();
         // Populate the $imageAttrs
         $this->imgAttrs = [
             'class' => '',
@@ -65,14 +65,6 @@ public function __construct($config = [])
         $this->populateSourceAttrs($this->optimizedImage, []);
         // Populate the $pictureAttrs
         $this->pictureAttrs = [];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function init(): void
-    {
-        parent::init();
         // If the original image is an SVG or gif, don't add the placeholder box CSS so that transparency works as intended
         $path = parse_url($this->imgAttrs['src'], PHP_URL_PATH);
         $extension = pathinfo($path, PATHINFO_EXTENSION);