From fcfaff63e6ddda7232c51993d591f51e842cb5a9 Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Sun, 1 Feb 2026 20:29:30 +0100
Subject: [PATCH 01/11] Add woocommerce compat class

---
 .../woocommerce/class-tiny-woocommerce.php    | 60 +++++++++++++++++++
 tiny-compress-images.php                      |  1 +
 2 files changed, 61 insertions(+)
 create mode 100644 src/compatibility/woocommerce/class-tiny-woocommerce.php

diff --git a/src/compatibility/woocommerce/class-tiny-woocommerce.php b/src/compatibility/woocommerce/class-tiny-woocommerce.php
new file mode 100644
index 0000000..1caaa05
--- /dev/null
+++ b/src/compatibility/woocommerce/class-tiny-woocommerce.php
@@ -0,0 +1,60 @@
+<?php
+/*
+* Tiny Compress Images - WordPress plugin.
+* Copyright (C) 2015-2018 Tinify B.V.
+*
+* This program is free software; you can redistribute it and/or modify it
+* under the terms of the GNU General Public License as published by the Free
+* Software Foundation; either version 2 of the License, or (at your option)
+* any later version.
+*
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+* more details.
+*
+* You should have received a copy of the GNU General Public License along
+* with this program; if not, write to the Free Software Foundation, Inc., 51
+* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+/**
+ * Handles WooCommerce compatibility
+ *
+ * @since 3.6.9
+ */
+class Tiny_WooCommerce
+{
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct()
+	{
+		$this->add_hooks();
+	}
+
+	private function add_hooks()
+	{
+		add_filter('tiny_skip_picture_wrap', array($this, 'skip_product_gallery_images'), 10, 2);
+	}
+
+	/**
+	 * Skip picture wrapping for WooCommerce product gallery images.
+	 *
+	 * Product gallery images need to remain as direct children of their parent
+	 * elements for WooCommerce's variation switcher to work correctly.
+	 *
+	 * @param bool   $should_skip Whether to skip this image. Default false.
+	 * @param string $img         The img tag HTML.
+	 * @return bool True if the image should be skipped, false otherwise.
+	 */
+	public function skip_product_gallery_images($should_skip, $img)
+	{
+		if ($should_skip) {
+			return $should_skip;
+		}
+
+		return stripos($img, 'woocommerce-product-gallery__image') !== false;
+	}
+}
diff --git a/tiny-compress-images.php b/tiny-compress-images.php
index 2e56b0c..5cbca7e 100644
--- a/tiny-compress-images.php
+++ b/tiny-compress-images.php
@@ -27,6 +27,7 @@
 require dirname( __FILE__ ) . '/src/class-tiny-picture.php';
 require dirname( __FILE__ ) . '/src/compatibility/wpml/class-tiny-wpml.php';
 require dirname( __FILE__ ) . '/src/compatibility/as3cf/class-tiny-as3cf.php';
+require dirname( __FILE__ ) . '/src/compatibility/woocommerce/class-tiny-woocommerce.php';
 
 if ( Tiny_PHP::client_supported() ) {
 	require dirname( __FILE__ ) . '/src/class-tiny-compress-client.php';

From 224160e4e9daf06ff5b3d0ce47daf9dea0b59079 Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Sun, 1 Feb 2026 20:29:57 +0100
Subject: [PATCH 02/11] feat: add filter to skip specific images

---
 src/class-tiny-picture.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/class-tiny-picture.php b/src/class-tiny-picture.php
index 1c9eaf9..e9b9afa 100644
--- a/src/class-tiny-picture.php
+++ b/src/class-tiny-picture.php
@@ -180,8 +180,21 @@ private function filter_images( $content ) {
 		if ( ! preg_match_all( '/<img\b[^>]*>/is', $content, $matches ) ) {
 			return array();
 		}
+
 		$images = array();
 		foreach ( $matches[0] as $img ) {
+			/**
+			 * Filters whether a specific image should be skipped from picture element wrapping.
+			 *
+			 * @since 3.6.9
+			 *
+			 * @param bool   $should_skip Whether to skip this image. Default false.
+			 * @param string $img         The img tag HTML.
+			 */
+			if ( apply_filters( 'tiny_skip_picture_wrap', false, $img ) ) {
+				continue;
+			}
+
 			$images[] = new Tiny_Source_Image(
 				$img,
 				$this->base_dir,

From 3782ed987d678e2423fe238f5a6687e8b46f1ddb Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Sun, 1 Feb 2026 22:25:24 +0100
Subject: [PATCH 03/11] Add filter for skipping html

---
 src/class-tiny-picture.php | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/class-tiny-picture.php b/src/class-tiny-picture.php
index e9b9afa..435cc4c 100644
--- a/src/class-tiny-picture.php
+++ b/src/class-tiny-picture.php
@@ -176,25 +176,21 @@ private function filter_images( $content ) {
 		// Strip <noscript> blocks to avoid altering their contents.
 		$content = preg_replace( '/<noscript\b.*?>.*?<\/noscript>/is', '', $content );
 
+		/**
+		 * Filters the HTML content before extracting images for picture element wrapping.
+		 * Useful when certain parts of the html should not be processed.
+		 *
+		 * @since 3.6.9
+		 *
+		 * @param string $content The HTML to keep searching images in
+		 */
+		$content = apply_filters( 'tiny_picture_filter_content', $content );
 		// Find all <img> tags with any attributes.
 		if ( ! preg_match_all( '/<img\b[^>]*>/is', $content, $matches ) ) {
 			return array();
 		}
-
 		$images = array();
 		foreach ( $matches[0] as $img ) {
-			/**
-			 * Filters whether a specific image should be skipped from picture element wrapping.
-			 *
-			 * @since 3.6.9
-			 *
-			 * @param bool   $should_skip Whether to skip this image. Default false.
-			 * @param string $img         The img tag HTML.
-			 */
-			if ( apply_filters( 'tiny_skip_picture_wrap', false, $img ) ) {
-				continue;
-			}
-
 			$images[] = new Tiny_Source_Image(
 				$img,
 				$this->base_dir,

From 40e7d27844904e0b531d4a7fd8b24b22449b88de Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Sun, 1 Feb 2026 22:55:39 +0100
Subject: [PATCH 04/11] add check for product page before replacing with
 picture

---
 src/class-tiny-picture.php                    | 35 ++++++++++---------
 src/class-tiny-plugin.php                     | 20 ++++-------
 .../woocommerce/class-tiny-woocommerce.php    | 31 ++++++++--------
 3 files changed, 41 insertions(+), 45 deletions(-)

diff --git a/src/class-tiny-picture.php b/src/class-tiny-picture.php
index 435cc4c..c9a6d0b 100644
--- a/src/class-tiny-picture.php
+++ b/src/class-tiny-picture.php
@@ -38,13 +38,17 @@ class Tiny_Picture extends Tiny_WP_Base {
 	/** @var array */
 	private $allowed_domains = array();
 
+	/** @var Tiny_Settings */
+	private $settings;
+
 	/**
 	 * Initialize the plugin.
 	 *
 	 * @param string $base_dir       Absolute path (e.g. ABSPATH)
 	 * @param array  $domains        List of allowed domain URLs
 	 */
-	public function __construct( $base_dir = ABSPATH, $domains = array() ) {
+	public function __construct(  $settings, $base_dir = ABSPATH, $domains = array() ) {
+		$this->settings		= $settings;
 		$this->base_dir        = $base_dir;
 		$this->allowed_domains = $domains;
 
@@ -64,12 +68,20 @@ public function __construct( $base_dir = ABSPATH, $domains = array() ) {
 			return;
 		}
 
-		add_action(
-			'template_redirect',
-			function () {
-				ob_start( array( $this, 'replace_sources' ), 1000 );
-			}
-		);
+		add_action( 'template_redirect', array($this, 'on_template_redirect' ) );
+	}
+
+	public function on_template_redirect() {
+		$conversion_enabled = $this->settings->get_conversion_enabled();
+		if ( apply_filters( 'tiny_replace_with_picture', $conversion_enabled ) ) {
+			/**
+			 * Controls wether the page should replace <img> with <picture> elements
+			 * converted sources.
+			 *
+			 * @since 3.6.9
+			 */
+			ob_start( array( $this, 'replace_sources' ), 1000 );
+		}
 	}
 
 	public function replace_sources( $content ) {
@@ -176,15 +188,6 @@ private function filter_images( $content ) {
 		// Strip <noscript> blocks to avoid altering their contents.
 		$content = preg_replace( '/<noscript\b.*?>.*?<\/noscript>/is', '', $content );
 
-		/**
-		 * Filters the HTML content before extracting images for picture element wrapping.
-		 * Useful when certain parts of the html should not be processed.
-		 *
-		 * @since 3.6.9
-		 *
-		 * @param string $content The HTML to keep searching images in
-		 */
-		$content = apply_filters( 'tiny_picture_filter_content', $content );
 		// Find all <img> tags with any attributes.
 		if ( ! preg_match_all( '/<img\b[^>]*>/is', $content, $matches ) ) {
 			return array();
diff --git a/src/class-tiny-plugin.php b/src/class-tiny-plugin.php
index 0beec97..1fc976c 100644
--- a/src/class-tiny-plugin.php
+++ b/src/class-tiny-plugin.php
@@ -72,18 +72,8 @@ public function init() {
 			dirname( plugin_basename( __FILE__ ) ) . '/languages'
 		);
 
-		if ( $this->settings->get_conversion_enabled() ) {
-			/**
-			 * Controls wether the page should replace <img> with <picture> elements
-			 * converted sources.
-			 *
-			 * @since 3.7.0
-			 */
-			$should_replace = apply_filters( 'tiny_replace_with_picture', true );
-			if ( $should_replace ) {
-				new Tiny_Picture( ABSPATH, array( get_site_url() ) );
-			}
-		}
+		new Tiny_Picture( $this->settings, ABSPATH, array( get_site_url() ) );
+		$this->tiny_compatibility();
 	}
 
 	public function cli_init() {
@@ -236,12 +226,14 @@ public function add_plugin_links( $current_links ) {
 
 	public function tiny_compatibility() {
 		if ( defined( 'ICL_SITEPRESS_VERSION' ) ) {
-			$tiny_wpml_compatibility = new Tiny_WPML();
+			new Tiny_WPML();
 		}
 
 		if ( Tiny_AS3CF::is_active() ) {
-			$tiny_as3cf = new Tiny_AS3CF( $this->settings );
+			new Tiny_AS3CF( $this->settings );
 		}
+
+		new Tiny_WooCommerce();
 	}
 
 	public function compress_original_retina_image( $attachment_id, $path ) {
diff --git a/src/compatibility/woocommerce/class-tiny-woocommerce.php b/src/compatibility/woocommerce/class-tiny-woocommerce.php
index 1caaa05..25ba4f3 100644
--- a/src/compatibility/woocommerce/class-tiny-woocommerce.php
+++ b/src/compatibility/woocommerce/class-tiny-woocommerce.php
@@ -25,36 +25,37 @@
  */
 class Tiny_WooCommerce
 {
-
-	/**
-	 * Constructor.
-	 */
 	public function __construct()
 	{
+		if (! class_exists('WooCommerce')) {
+			return;
+		}
+
 		$this->add_hooks();
 	}
 
 	private function add_hooks()
 	{
-		add_filter('tiny_skip_picture_wrap', array($this, 'skip_product_gallery_images'), 10, 2);
+		add_filter( 'tiny_replace_with_picture', array( $this, 'skip_on_product_pages' ), 10, 1 );
 	}
 
 	/**
-	 * Skip picture wrapping for WooCommerce product gallery images.
+	 * We are skipping single product pages for now.
+	 * Variation images in the product gallery are injected through JavaScript but might never
+	 * display because the sourceset takes priority over the root img. The replacement is on the image and not
+	 * on the srcset.
 	 *
-	 * Product gallery images need to remain as direct children of their parent
-	 * elements for WooCommerce's variation switcher to work correctly.
+	 * @since 3.6.9
 	 *
-	 * @param bool   $should_skip Whether to skip this image. Default false.
-	 * @param string $img         The img tag HTML.
-	 * @return bool True if the image should be skipped, false otherwise.
+	 * @param bool $should_replace Whether to replace images with picture elements.
+	 * @return bool False on product pages, otherwise unchanged.
 	 */
-	public function skip_product_gallery_images($should_skip, $img)
+	public function skip_on_product_pages( $should_replace )
 	{
-		if ($should_skip) {
-			return $should_skip;
+		if ( is_product() ) {
+			return false;
 		}
 
-		return stripos($img, 'woocommerce-product-gallery__image') !== false;
+		return $should_replace;
 	}
 }

From 09e671b0caf39ded96b1cb068ac1586d3e04b511 Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Mon, 2 Feb 2026 13:36:21 +0100
Subject: [PATCH 05/11] Add compat to autoloader

---
 test/unit/TinyPictureTest.php | 6 ++++--
 test/unit/TinyTestCase.php    | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/unit/TinyPictureTest.php b/test/unit/TinyPictureTest.php
index 6071312..79ee7fd 100644
--- a/test/unit/TinyPictureTest.php
+++ b/test/unit/TinyPictureTest.php
@@ -12,7 +12,8 @@ public function set_up()
     {
         parent::set_up();
 
-        $this->tiny_picture = new Tiny_Picture($this->vfs->url(), array('https://www.tinifytest.com'));
+        $settings = new Tiny_Settings();
+        $this->tiny_picture = new Tiny_Picture($settings, $this->vfs->url(), array('https://www.tinifytest.com'));
     }
 
     /**
@@ -335,7 +336,8 @@ public function test_does_not_register_hooks_when_pagebuilder_request()
             return false;
         });
         
-        $tiny_picture = new Tiny_Picture($this->vfs->url(), array('https://www.tinifytest.com'));
+        $settings = new Tiny_Settings();
+        $tiny_picture = new Tiny_Picture($settings, $this->vfs->url(), array('https://www.tinifytest.com'));
 
         $template_redirect_registered = false;
         foreach ($this->wp->getCalls('add_action') as $call) {
diff --git a/test/unit/TinyTestCase.php b/test/unit/TinyTestCase.php
index dab0ea4..4838a40 100644
--- a/test/unit/TinyTestCase.php
+++ b/test/unit/TinyTestCase.php
@@ -5,6 +5,9 @@
 require_once dirname( __FILE__ ) . '/../helpers/wordpress.php';
 require_once dirname( __FILE__ ) . '/../helpers/wordpress-cli.php';
 require_once dirname( __FILE__ ) . '/../../src/config/class-tiny-config.php';
+require_once dirname( __FILE__ ) . '/../../src/compatibility/wpml/class-tiny-wpml.php';
+require_once dirname( __FILE__ ) . '/../../src/compatibility/as3cf/class-tiny-as3cf.php';
+require_once dirname( __FILE__ ) . '/../../src/compatibility/woocommerce/class-tiny-woocommerce.php';
 require_once 'vendor/autoload.php';
 
 use org\bovigo\vfs\vfsStream;

From 0cf87165cb41671a827b56ab2415b23282334edd Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Mon, 2 Feb 2026 14:17:15 +0100
Subject: [PATCH 06/11] Up version to 3.6.9

---
 readme.txt               | 5 ++++-
 tiny-compress-images.php | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index 3926b45..565e7c6 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://tinypng.com/
 Tags: compress images, compression, image size, page speed, performance
 Requires at least: 4.0
 Tested up to: 6.9
-Stable tag: 3.6.8
+Stable tag: 3.6.9
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -174,6 +174,9 @@ A: You can upgrade to a paid account by adding your *Payment details* on your [a
 A: When the conversion feature is enabled (to convert images to AVIF or WebP), each image will use double the number of credits: one for compression and one for format conversion.
 
 == Changelog ==
+= 3.6.9 =
+* fix: prevent picture element on product pages (WooCommerce)
+
 = 3.6.8 =
 * feat: download logs and diagnostics
 * chore: updated phpcs rules and formatting
diff --git a/tiny-compress-images.php b/tiny-compress-images.php
index 2e56b0c..112e489 100644
--- a/tiny-compress-images.php
+++ b/tiny-compress-images.php
@@ -2,7 +2,7 @@
 /**
  * Plugin Name: TinyPNG - JPEG, PNG & WebP image compression
  * Description: Speed up your website. Optimize your JPEG, PNG, and WebP images automatically with TinyPNG.
- * Version: 3.6.8
+ * Version: 3.6.9
  * Author: TinyPNG
  * Author URI: https://tinypng.com
  * Text Domain: tiny-compress-images

From 7ca43b99b60ea633b6fbe76c6e912dc10b2aaba0 Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Mon, 2 Feb 2026 14:19:43 +0100
Subject: [PATCH 07/11] Format

---
 src/class-tiny-picture.php                        |  6 +++---
 .../woocommerce/class-tiny-woocommerce.php        | 15 ++++++---------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/class-tiny-picture.php b/src/class-tiny-picture.php
index c9a6d0b..4806a71 100644
--- a/src/class-tiny-picture.php
+++ b/src/class-tiny-picture.php
@@ -47,8 +47,8 @@ class Tiny_Picture extends Tiny_WP_Base {
 	 * @param string $base_dir       Absolute path (e.g. ABSPATH)
 	 * @param array  $domains        List of allowed domain URLs
 	 */
-	public function __construct(  $settings, $base_dir = ABSPATH, $domains = array() ) {
-		$this->settings		= $settings;
+	public function __construct( $settings, $base_dir = ABSPATH, $domains = array() ) {
+		$this->settings        = $settings;
 		$this->base_dir        = $base_dir;
 		$this->allowed_domains = $domains;
 
@@ -68,7 +68,7 @@ public function __construct(  $settings, $base_dir = ABSPATH, $domains = array()
 			return;
 		}
 
-		add_action( 'template_redirect', array($this, 'on_template_redirect' ) );
+		add_action( 'template_redirect', array( $this, 'on_template_redirect' ) );
 	}
 
 	public function on_template_redirect() {
diff --git a/src/compatibility/woocommerce/class-tiny-woocommerce.php b/src/compatibility/woocommerce/class-tiny-woocommerce.php
index 25ba4f3..3f0f7a6 100644
--- a/src/compatibility/woocommerce/class-tiny-woocommerce.php
+++ b/src/compatibility/woocommerce/class-tiny-woocommerce.php
@@ -23,19 +23,17 @@
  *
  * @since 3.6.9
  */
-class Tiny_WooCommerce
-{
-	public function __construct()
-	{
-		if (! class_exists('WooCommerce')) {
+class Tiny_WooCommerce {
+
+	public function __construct() {
+		if ( ! class_exists( 'WooCommerce' ) ) {
 			return;
 		}
 
 		$this->add_hooks();
 	}
 
-	private function add_hooks()
-	{
+	private function add_hooks() {
 		add_filter( 'tiny_replace_with_picture', array( $this, 'skip_on_product_pages' ), 10, 1 );
 	}
 
@@ -50,8 +48,7 @@ private function add_hooks()
 	 * @param bool $should_replace Whether to replace images with picture elements.
 	 * @return bool False on product pages, otherwise unchanged.
 	 */
-	public function skip_on_product_pages( $should_replace )
-	{
+	public function skip_on_product_pages( $should_replace ) {
 		if ( is_product() ) {
 			return false;
 		}

From b7b84831448af3327d9f09c201209b4fa6cb74c2 Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Tue, 3 Feb 2026 13:14:44 +0100
Subject: [PATCH 08/11] Use class based check because we are checking on init

---
 src/compatibility/as3cf/class-tiny-as3cf.php |  8 +--
 test/unit/compatibility/TinyAC3SFTest.php    | 75 ++++----------------
 2 files changed, 15 insertions(+), 68 deletions(-)

diff --git a/src/compatibility/as3cf/class-tiny-as3cf.php b/src/compatibility/as3cf/class-tiny-as3cf.php
index 6ad7ca2..314f65e 100644
--- a/src/compatibility/as3cf/class-tiny-as3cf.php
+++ b/src/compatibility/as3cf/class-tiny-as3cf.php
@@ -25,18 +25,14 @@ class Tiny_AS3CF {
 	 * Checks wether the lite version is active
 	 */
 	public static function lite_is_active() {
-		$lite_name = 'amazon-s3-and-cloudfront/wordpress-s3.php';
-
-		return is_plugin_active( $lite_name );
+		return class_exists( 'Amazon_S3_And_CloudFront' );
 	}
 
 	/**
 	 * Checks wether the pro version is active
 	 */
 	public static function pro_is_active() {
-		$pro_name = 'amazon-s3-and-cloudfront-pro/amazon-s3-and-cloudfront-pro.php';
-
-		return is_plugin_active( $pro_name );
+		return class_exists( 'Amazon_S3_And_CloudFront_Pro' );
 	}
 
 	public function __construct( $settings ) {
diff --git a/test/unit/compatibility/TinyAC3SFTest.php b/test/unit/compatibility/TinyAC3SFTest.php
index 42d6ce2..9fb95a7 100644
--- a/test/unit/compatibility/TinyAC3SFTest.php
+++ b/test/unit/compatibility/TinyAC3SFTest.php
@@ -3,6 +3,9 @@
 require_once dirname(__FILE__) . '/../TinyTestCase.php';
 require_once dirname(__FILE__) . '/../../../src/compatibility/as3cf/class-tiny-as3cf.php';
 
+class Amazon_S3_And_CloudFront_Pro {}
+class Amazon_S3_And_CloudFront {}
+
 class Tiny_AC3SF_Test extends Tiny_TestCase
 {
     public function set_up()
@@ -10,84 +13,39 @@ public function set_up()
         parent::set_up();
     }
 
+
     /**
-     * Stub is_plugin_active to return true for the pro plugin
-     * is_plugin_active will only work in admin area (after admin_init);
+     * Will check if AS3CF exists (pro version)
      */
-    public function test_is_active_when_pro_is_enabled()
+    public function test_is_active_when_pro_is_available()
     {
-        $this->wp->stub(
-            'is_plugin_active',
-            function ($plugin_name) {
-                return $plugin_name === 'amazon-s3-and-cloudfront-pro/amazon-s3-and-cloudfront-pro.php';
-            }
-        );
-
-        $tiny_settings = new Tiny_Settings();
-        $tiny_ac3sf = new Tiny_AS3CF($tiny_settings);
-
+        $this->assertTrue(Tiny_AS3CF::pro_is_active());
         $this->assertTrue(Tiny_AS3CF::is_active());
     }
 
+    /**
+     * Will check if AS3CF exists (lite version)
+     * @see https://github.com/deliciousbrains/wp-amazon-s3-and-cloudfront/blob/master/wordpress-s3.php
+     */
     public function test_is_active_when_lite_is_enabled()
     {
-        $this->wp->stub(
-            'is_plugin_active',
-            function ($plugin_name) {
-                return $plugin_name === 'amazon-s3-and-cloudfront/wordpress-s3.php';
-            }
-        );
-
-
+        // Amazon_S3_And_CloudFront stub class is defined at top of file
+        $this->assertTrue(Tiny_AS3CF::lite_is_active());
         $this->assertTrue(Tiny_AS3CF::is_active());
     }
 
-    public function test_is_not_active()
-    {
-        $this->wp->stub(
-            'is_plugin_active',
-            function ($plugin_name) {
-                return false;
-            }
-        );
-
-
-        $this->assertFalse(Tiny_AS3CF::is_active());
-    }
-
     public function test_remove_local_enabled_is_false_when_plugin_inactive()
     {
-        $this->wp->stub(
-            'is_plugin_active',
-            function ($plugin_name) {
-                return false;
-            }
-        );
-
         $this->assertFalse(Tiny_AS3CF::remove_local_files_setting_enabled());
     }
 
     public function test_remove_local_false_when_option_not_exists()
     {
-        $this->wp->stub(
-            'is_plugin_active',
-            function ($plugin_name) {
-                return true;
-            }
-        );
-
         $this->assertFalse(Tiny_AS3CF::remove_local_files_setting_enabled());
     }
 
     public function test_remove_local_false_when_option_is_false()
     {
-        $this->wp->stub(
-            'is_plugin_active',
-            function ($plugin_name) {
-                return true;
-            }
-        );
-
         $this->wp->addOption('tantan_wordpress_s3', array(
             'remove-local-file' => false,
         ));
@@ -97,13 +55,6 @@ function ($plugin_name) {
 
     public function test_remove_local_true_when_option_is_true()
     {
-        $this->wp->stub(
-            'is_plugin_active',
-            function ($plugin_name) {
-                return true;
-            }
-        );
-
         $this->wp->addOption('tantan_wordpress_s3', array(
             'remove-local-file' => true,
         ));

From 4a026c618fdd146c812cf3fdc7ff6712a6595d00 Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Tue, 3 Feb 2026 14:06:06 +0100
Subject: [PATCH 09/11] Grab first row when activating/decativating

---
 test/integration/utils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/utils.ts b/test/integration/utils.ts
index 5bcfbc7..7783da4 100644
--- a/test/integration/utils.ts
+++ b/test/integration/utils.ts
@@ -167,7 +167,7 @@ export async function getWPVersion(page: Page): Promise<number> {
 export async function activatePlugin(page: Page, pluginSlug: string) {
   await page.goto('/wp-admin/plugins.php');
 
-  const plugin = await page.locator('tr[data-slug="' + pluginSlug + '"]');
+  const plugin = page.locator('tr[data-slug="' + pluginSlug + '"]').first();
   if (!plugin) {
     throw Error(`Plug-in ${pluginSlug} not found. Are you sure it is installed?`);
   }
@@ -192,7 +192,7 @@ export async function deactivatePlugin(page: Page, pluginSlug: string) {
     return;
   }
 
-  const plugin = await page.locator('tr[data-slug="' + pluginSlug + '"]');
+  const plugin = await page.locator('tr[data-slug="' + pluginSlug + '"]').first();
   const className = await plugin.getAttribute('class');
   const pluginActivated = className === 'active';
   if (!pluginActivated) {

From 3038a7cbd566fc90787e9021a745ea3420653537 Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Tue, 3 Feb 2026 14:42:44 +0100
Subject: [PATCH 10/11] Skip as3cf on wp 5.9 and php 8.1

---
 .github/workflows/integration-tests.yml |  1 +
 test/integration/compatibility.spec.ts  | 13 ++++++++++---
 test/integration/utils.ts               | 12 ++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 0d98884..11283cb 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -73,6 +73,7 @@ jobs:
         run: npm run test:playwright
         env:
           WORDPRESS_PORT: 80${{ matrix.wp }}
+          PHP_VERSION: matrix.php
 
       - uses: actions/upload-artifact@v4
         if: ${{ !cancelled() }}
diff --git a/test/integration/compatibility.spec.ts b/test/integration/compatibility.spec.ts
index 935be5f..17f015c 100644
--- a/test/integration/compatibility.spec.ts
+++ b/test/integration/compatibility.spec.ts
@@ -1,5 +1,5 @@
 import { Page, expect, test } from '@playwright/test';
-import { activatePlugin, clearMediaLibrary, deactivatePlugin, enableCompressionSizes, getWPVersion, setAPIKey, setCompressionTiming, uploadMedia } from './utils';
+import { activatePlugin, clearMediaLibrary, deactivatePlugin, enableCompressionSizes, getPHPVersion, getWPVersion, setAPIKey, setCompressionTiming, uploadMedia } from './utils';
 
 test.describe.configure({ mode: 'serial' });
 
@@ -36,9 +36,16 @@ test.describe('as3cf', () => {
   test.beforeAll(async ({ browser }) => {
     page = await browser.newPage();
     WPVersion = await getWPVersion(page);
+    const phpVersion = getPHPVersion();
     
-    if (WPVersion < 5.5) {
-      // Skipping test as it WP Offload does not support WordPress < 5.5
+    if (WPVersion < 5.9) {
+      // Skipping test as it WP Offload does not support WordPress < 5.9
+      test.skip();
+      return;
+    }
+    
+    if (phpVersion < 81) {
+      // Skipping test as WP Offload Media requires PHP 8.1+
       test.skip();
       return;
     }
diff --git a/test/integration/utils.ts b/test/integration/utils.ts
index 7783da4..1208da7 100644
--- a/test/integration/utils.ts
+++ b/test/integration/utils.ts
@@ -160,6 +160,18 @@ export async function getWPVersion(page: Page): Promise<number> {
   return parsedText;
 }
 
+/**
+ * @returns {number} retrieves the current PHP version from environment variable
+ */
+export function getPHPVersion(): number {
+  const { PHP_VERSION } = process.env;
+  if (!PHP_VERSION) {
+    throw Error('PHP_VERSION is not set');
+  }
+
+  return +PHP_VERSION;
+}
+
 /**
  * @param  {Page} page context
  * @param  {string} pluginSlug slug of the plugin, ex 'tiny-compress-images'

From 64bc4c3c94c58c641a6bee1ee5fd52151acd4133 Mon Sep 17 00:00:00 2001
From: tijmen <tijmenbruggeman@gmail.com>
Date: Tue, 3 Feb 2026 15:01:21 +0100
Subject: [PATCH 11/11] Interpolate variable in playwright workflow

---
 .github/workflows/integration-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 11283cb..132cc1b 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -73,7 +73,7 @@ jobs:
         run: npm run test:playwright
         env:
           WORDPRESS_PORT: 80${{ matrix.wp }}
-          PHP_VERSION: matrix.php
+          PHP_VERSION: ${{ matrix.php }}
 
       - uses: actions/upload-artifact@v4
         if: ${{ !cancelled() }}