From 21cfeecb3e754bb15e001f3a8e5bd63b58be5bd4 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <359867+desrosj@users.noreply.github.com>
Date: Fri, 15 May 2026 11:58:03 -0400
Subject: [PATCH 1/6] Bump xDebug to `3.5.1` in PHP 8.0-8.4.

---
 images/7.2/php/Dockerfile |  4 ++--
 images/7.3/php/Dockerfile |  4 ++--
 images/7.4/php/Dockerfile |  4 ++--
 images/8.0/php/Dockerfile |  4 ++--
 images/8.1/php/Dockerfile |  4 ++--
 images/8.2/php/Dockerfile |  4 ++--
 images/8.3/php/Dockerfile |  4 ++--
 images/8.4/php/Dockerfile |  4 ++--
 update.php                | 40 +++++++++++++++++++++++++++++++++------
 9 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/images/7.2/php/Dockerfile b/images/7.2/php/Dockerfile
index b35841b..2796730 100644
--- a/images/7.2/php/Dockerfile
+++ b/images/7.2/php/Dockerfile
@@ -31,10 +31,10 @@ RUN set -ex; \
 	\
 	docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
 	\
-	pecl install imagick; \
-	docker-php-ext-enable imagick; \
 	pecl install xdebug-3.1.6; \
 	pecl install memcached-3.3.0; \
+	pecl install imagick; \
+	docker-php-ext-enable imagick; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
 	curl --silent --fail --location --retry 3 --output /tmp/installer.sig --url https://composer.github.io/installer.sig; \
diff --git a/images/7.3/php/Dockerfile b/images/7.3/php/Dockerfile
index b332ab1..453842b 100644
--- a/images/7.3/php/Dockerfile
+++ b/images/7.3/php/Dockerfile
@@ -27,10 +27,10 @@ RUN set -ex; \
 	\
 	docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
 	\
-	pecl install imagick; \
-	docker-php-ext-enable imagick; \
 	pecl install xdebug-3.1.6; \
 	pecl install memcached-3.3.0; \
+	pecl install imagick; \
+	docker-php-ext-enable imagick; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
 	curl --silent --fail --location --retry 3 --output /tmp/installer.sig --url https://composer.github.io/installer.sig; \
diff --git a/images/7.4/php/Dockerfile b/images/7.4/php/Dockerfile
index 74080c6..d6461ca 100644
--- a/images/7.4/php/Dockerfile
+++ b/images/7.4/php/Dockerfile
@@ -27,10 +27,10 @@ RUN set -ex; \
 	\
 	docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
 	\
-	pecl install imagick; \
-	docker-php-ext-enable imagick; \
 	pecl install xdebug-3.1.6; \
 	pecl install memcached-3.3.0; \
+	pecl install imagick; \
+	docker-php-ext-enable imagick; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
 	curl --silent --fail --location --retry 3 --output /tmp/installer.sig --url https://composer.github.io/installer.sig; \
diff --git a/images/8.0/php/Dockerfile b/images/8.0/php/Dockerfile
index 0a4c66d..d53f266 100644
--- a/images/8.0/php/Dockerfile
+++ b/images/8.0/php/Dockerfile
@@ -27,10 +27,10 @@ RUN set -ex; \
 	\
 	docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
 	\
-	pecl install imagick; \
-	docker-php-ext-enable imagick; \
 	pecl install memcached-3.4.0; \
 	pecl install xdebug-3.5.1; \
+	pecl install imagick; \
+	docker-php-ext-enable imagick; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
 	curl --silent --fail --location --retry 3 --output /tmp/installer.sig --url https://composer.github.io/installer.sig; \
diff --git a/images/8.1/php/Dockerfile b/images/8.1/php/Dockerfile
index 26ee959..476778c 100644
--- a/images/8.1/php/Dockerfile
+++ b/images/8.1/php/Dockerfile
@@ -27,10 +27,10 @@ RUN set -ex; \
 	\
 	docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
 	\
-	pecl install imagick; \
-	docker-php-ext-enable imagick; \
 	pecl install memcached-3.4.0; \
 	pecl install xdebug-3.5.1; \
+	pecl install imagick; \
+	docker-php-ext-enable imagick; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
 	curl --silent --fail --location --retry 3 --output /tmp/installer.sig --url https://composer.github.io/installer.sig; \
diff --git a/images/8.2/php/Dockerfile b/images/8.2/php/Dockerfile
index 5b125e9..681f804 100644
--- a/images/8.2/php/Dockerfile
+++ b/images/8.2/php/Dockerfile
@@ -27,10 +27,10 @@ RUN set -ex; \
 	\
 	docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
 	\
-	pecl install imagick; \
-	docker-php-ext-enable imagick; \
 	pecl install memcached-3.4.0; \
 	pecl install xdebug-3.5.1; \
+	pecl install imagick; \
+	docker-php-ext-enable imagick; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
 	curl --silent --fail --location --retry 3 --output /tmp/installer.sig --url https://composer.github.io/installer.sig; \
diff --git a/images/8.3/php/Dockerfile b/images/8.3/php/Dockerfile
index ade383d..fcd8da2 100644
--- a/images/8.3/php/Dockerfile
+++ b/images/8.3/php/Dockerfile
@@ -27,10 +27,10 @@ RUN set -ex; \
 	\
 	docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
 	\
-	pecl install imagick; \
-	docker-php-ext-enable imagick; \
 	pecl install memcached-3.4.0; \
 	pecl install xdebug-3.5.1; \
+	pecl install imagick; \
+	docker-php-ext-enable imagick; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
 	curl --silent --fail --location --retry 3 --output /tmp/installer.sig --url https://composer.github.io/installer.sig; \
diff --git a/images/8.4/php/Dockerfile b/images/8.4/php/Dockerfile
index b95178a..ddf32dd 100644
--- a/images/8.4/php/Dockerfile
+++ b/images/8.4/php/Dockerfile
@@ -27,10 +27,10 @@ RUN set -ex; \
 	\
 	docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
 	\
-	pecl install imagick; \
-	docker-php-ext-enable imagick; \
 	pecl install memcached-3.4.0; \
 	pecl install xdebug-3.5.1; \
+	pecl install imagick; \
+	docker-php-ext-enable imagick; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
 	curl --silent --fail --location --retry 3 --output /tmp/installer.sig --url https://composer.github.io/installer.sig; \
diff --git a/update.php b/update.php
index 8342ac1..0d294e9 100644
--- a/update.php
+++ b/update.php
@@ -27,12 +27,40 @@
  * }
  */
 $php_versions = array(
+	'7.2' => array(
+		'php' => array(
+			'base_name'       => 'php:7.2-fpm',
+			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
+			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
+			'pecl_extensions' => array( 'xdebug-3.1.6', 'memcached-3.3.0', 'imagick' ),
+			'composer'        => true,
+		),
+		'phpunit' => 7,
+		'cli' => array(
+			'mysql_client' => 'virtual-mysql-client',
+			'download_url' => 'https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar',
+		),
+	),
+	'7.3' => array(
+		'php' => array(
+			'base_name'       => 'php:7.3-fpm',
+			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
+			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
+			'pecl_extensions' => array( 'xdebug-3.1.6', 'memcached-3.3.0', 'imagick' ),
+			'composer'        => true,
+		),
+		'phpunit' => 7,
+		'cli' => array(
+			'mysql_client' => 'virtual-mysql-client',
+			'download_url' => 'https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar',
+		),
+	),
 	'7.4' => array(
 		'php' => array(
 			'base_name'       => 'php:7.4-fpm',
 			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
 			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
-			'pecl_extensions' => array( 'imagick', 'xdebug-3.1.6', 'memcached-3.3.0' ),
+			'pecl_extensions' => array( 'xdebug-3.1.6', 'memcached-3.3.0', 'imagick' ),
 			'composer'        => true,
 		),
 		'phpunit' => 7,
@@ -46,7 +74,7 @@
 			'base_name'       => 'php:8.0-fpm',
 			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
 			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
-			'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'xdebug-3.5.1' ),
+			'pecl_extensions' => array( 'memcached-3.4.0', 'xdebug-3.5.1', 'imagick' ),
 			'composer'        => true,
 		),
 		'phpunit' => 9,
@@ -60,7 +88,7 @@
 			'base_name'       => 'php:8.1-fpm',
 			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
 			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
-			'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'xdebug-3.5.1' ),
+			'pecl_extensions' => array( 'memcached-3.4.0', 'xdebug-3.5.1', 'imagick' ),
 			'composer'        => true,
 		),
 		'phpunit' => 9,
@@ -74,7 +102,7 @@
 			'base_name'       => 'php:8.2-fpm',
 			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
 			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
-			'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'xdebug-3.5.1' ),
+			'pecl_extensions' => array( 'memcached-3.4.0', 'xdebug-3.5.1', 'imagick' ),
 			'composer'        => true,
 		),
 		'phpunit' => 9,
@@ -88,7 +116,7 @@
 			'base_name'       => 'php:8.3-fpm',
 			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
 			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
-			'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'xdebug-3.5.1' ),
+			'pecl_extensions' => array( 'memcached-3.4.0', 'xdebug-3.5.1', 'imagick' ),
 			'composer'        => true,
 		),
 		'phpunit' => 9,
@@ -102,7 +130,7 @@
 			'base_name'       => 'php:8.4-fpm',
 			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libdav1d-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
 			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
-			'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'xdebug-3.5.1' ),
+			'pecl_extensions' => array( 'memcached-3.4.0', 'xdebug-3.5.1', 'imagick' ),
 			'composer'        => true,
 		),
 		'phpunit' => 9,

From f378513f41f631c5108b7f4d295d19a032c290ba Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <359867+desrosj@users.noreply.github.com>
Date: Fri, 15 May 2026 12:00:49 -0400
Subject: [PATCH 2/6] Alphabetize PECL extensions.

---
 images/7.2/php/Dockerfile |  4 ++--
 images/7.3/php/Dockerfile |  4 ++--
 images/7.4/php/Dockerfile |  4 ++--
 images/8.0/php/Dockerfile |  4 ++--
 images/8.1/php/Dockerfile |  4 ++--
 images/8.2/php/Dockerfile |  4 ++--
 images/8.3/php/Dockerfile |  4 ++--
 images/8.4/php/Dockerfile |  4 ++--
 update.php                | 16 ++++++++--------
 9 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/images/7.2/php/Dockerfile b/images/7.2/php/Dockerfile
index 2796730..b35841b 100644
--- a/images/7.2/php/Dockerfile
+++ b/images/7.2/php/Dockerfile
@@ -31,10 +31,10 @@ RUN set -ex; \
 	\
 	docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
 	\
-	pecl install xdebug-3.1.6; \
-	pecl install memcached-3.3.0; \
 	pecl install imagick; \
 	docker-php-ext-enable imagick; \
+	pecl install xdebug-3.1.6; \
+	pecl install memcached-3.3.0; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
 	curl --silent --fail --location --retry 3 --output /tmp/installer.sig --url https://composer.github.io/installer.sig; \
diff --git a/images/7.3/php/Dockerfile b/images/7.3/php/Dockerfile
index 453842b..b332ab1 100644
--- a/images/7.3/php/Dockerfile
+++ b/images/7.3/php/Dockerfile
@@ -27,10 +27,10 @@ RUN set -ex; \
 	\
 	docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
 	\
-	pecl install xdebug-3.1.6; \
-	pecl install memcached-3.3.0; \
 	pecl install imagick; \
 	docker-php-ext-enable imagick; \
+	pecl install xdebug-3.1.6; \
+	pecl install memcached-3.3.0; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
 	curl --silent --fail --location --retry 3 --output /tmp/installer.sig --url https://composer.github.io/installer.sig; \
diff --git a/images/7.4/php/Dockerfile b/images/7.4/php/Dockerfile
index d6461ca..74080c6 100644
--- a/images/7.4/php/Dockerfile
+++ b/images/7.4/php/Dockerfile
@@ -27,10 +27,10 @@ RUN set -ex; \
 	\
 	docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
 	\
-	pecl install xdebug-3.1.6; \
-	pecl install memcached-3.3.0; \
 	pecl install imagick; \
 	docker-php-ext-enable imagick; \
+	pecl install xdebug-3.1.6; \
+	pecl install memcached-3.3.0; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
 	curl --silent --fail --location --retry 3 --output /tmp/installer.sig --url https://composer.github.io/installer.sig; \
diff --git a/images/8.0/php/Dockerfile b/images/8.0/php/Dockerfile
index d53f266..0a4c66d 100644
--- a/images/8.0/php/Dockerfile
+++ b/images/8.0/php/Dockerfile
@@ -27,10 +27,10 @@ RUN set -ex; \
 	\
 	docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
 	\
-	pecl install memcached-3.4.0; \
-	pecl install xdebug-3.5.1; \
 	pecl install imagick; \
 	docker-php-ext-enable imagick; \
+	pecl install memcached-3.4.0; \
+	pecl install xdebug-3.5.1; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
 	curl --silent --fail --location --retry 3 --output /tmp/installer.sig --url https://composer.github.io/installer.sig; \
diff --git a/images/8.1/php/Dockerfile b/images/8.1/php/Dockerfile
index 476778c..26ee959 100644
--- a/images/8.1/php/Dockerfile
+++ b/images/8.1/php/Dockerfile
@@ -27,10 +27,10 @@ RUN set -ex; \
 	\
 	docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
 	\
-	pecl install memcached-3.4.0; \
-	pecl install xdebug-3.5.1; \
 	pecl install imagick; \
 	docker-php-ext-enable imagick; \
+	pecl install memcached-3.4.0; \
+	pecl install xdebug-3.5.1; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
 	curl --silent --fail --location --retry 3 --output /tmp/installer.sig --url https://composer.github.io/installer.sig; \
diff --git a/images/8.2/php/Dockerfile b/images/8.2/php/Dockerfile
index 681f804..5b125e9 100644
--- a/images/8.2/php/Dockerfile
+++ b/images/8.2/php/Dockerfile
@@ -27,10 +27,10 @@ RUN set -ex; \
 	\
 	docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
 	\
-	pecl install memcached-3.4.0; \
-	pecl install xdebug-3.5.1; \
 	pecl install imagick; \
 	docker-php-ext-enable imagick; \
+	pecl install memcached-3.4.0; \
+	pecl install xdebug-3.5.1; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
 	curl --silent --fail --location --retry 3 --output /tmp/installer.sig --url https://composer.github.io/installer.sig; \
diff --git a/images/8.3/php/Dockerfile b/images/8.3/php/Dockerfile
index fcd8da2..ade383d 100644
--- a/images/8.3/php/Dockerfile
+++ b/images/8.3/php/Dockerfile
@@ -27,10 +27,10 @@ RUN set -ex; \
 	\
 	docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
 	\
-	pecl install memcached-3.4.0; \
-	pecl install xdebug-3.5.1; \
 	pecl install imagick; \
 	docker-php-ext-enable imagick; \
+	pecl install memcached-3.4.0; \
+	pecl install xdebug-3.5.1; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
 	curl --silent --fail --location --retry 3 --output /tmp/installer.sig --url https://composer.github.io/installer.sig; \
diff --git a/images/8.4/php/Dockerfile b/images/8.4/php/Dockerfile
index ddf32dd..b95178a 100644
--- a/images/8.4/php/Dockerfile
+++ b/images/8.4/php/Dockerfile
@@ -27,10 +27,10 @@ RUN set -ex; \
 	\
 	docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
 	\
-	pecl install memcached-3.4.0; \
-	pecl install xdebug-3.5.1; \
 	pecl install imagick; \
 	docker-php-ext-enable imagick; \
+	pecl install memcached-3.4.0; \
+	pecl install xdebug-3.5.1; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
 	curl --silent --fail --location --retry 3 --output /tmp/installer.sig --url https://composer.github.io/installer.sig; \
diff --git a/update.php b/update.php
index 0d294e9..258c9fd 100644
--- a/update.php
+++ b/update.php
@@ -32,7 +32,7 @@
 			'base_name'       => 'php:7.2-fpm',
 			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
 			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
-			'pecl_extensions' => array( 'xdebug-3.1.6', 'memcached-3.3.0', 'imagick' ),
+			'pecl_extensions' => array( 'imagick', 'xdebug-3.1.6', 'memcached-3.3.0' ),
 			'composer'        => true,
 		),
 		'phpunit' => 7,
@@ -46,7 +46,7 @@
 			'base_name'       => 'php:7.3-fpm',
 			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
 			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
-			'pecl_extensions' => array( 'xdebug-3.1.6', 'memcached-3.3.0', 'imagick' ),
+			'pecl_extensions' => array( 'imagick', 'xdebug-3.1.6', 'memcached-3.3.0' ),
 			'composer'        => true,
 		),
 		'phpunit' => 7,
@@ -60,7 +60,7 @@
 			'base_name'       => 'php:7.4-fpm',
 			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
 			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
-			'pecl_extensions' => array( 'xdebug-3.1.6', 'memcached-3.3.0', 'imagick' ),
+			'pecl_extensions' => array( 'imagick', 'xdebug-3.1.6', 'memcached-3.3.0' ),
 			'composer'        => true,
 		),
 		'phpunit' => 7,
@@ -74,7 +74,7 @@
 			'base_name'       => 'php:8.0-fpm',
 			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
 			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
-			'pecl_extensions' => array( 'memcached-3.4.0', 'xdebug-3.5.1', 'imagick' ),
+			'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'xdebug-3.5.1' ),
 			'composer'        => true,
 		),
 		'phpunit' => 9,
@@ -88,7 +88,7 @@
 			'base_name'       => 'php:8.1-fpm',
 			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
 			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
-			'pecl_extensions' => array( 'memcached-3.4.0', 'xdebug-3.5.1', 'imagick' ),
+			'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'xdebug-3.5.1' ),
 			'composer'        => true,
 		),
 		'phpunit' => 9,
@@ -102,7 +102,7 @@
 			'base_name'       => 'php:8.2-fpm',
 			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
 			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
-			'pecl_extensions' => array( 'memcached-3.4.0', 'xdebug-3.5.1', 'imagick' ),
+			'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'xdebug-3.5.1' ),
 			'composer'        => true,
 		),
 		'phpunit' => 9,
@@ -116,7 +116,7 @@
 			'base_name'       => 'php:8.3-fpm',
 			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
 			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
-			'pecl_extensions' => array( 'memcached-3.4.0', 'xdebug-3.5.1', 'imagick' ),
+			'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'xdebug-3.5.1' ),
 			'composer'        => true,
 		),
 		'phpunit' => 9,
@@ -130,7 +130,7 @@
 			'base_name'       => 'php:8.4-fpm',
 			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libdav1d-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
 			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
-			'pecl_extensions' => array( 'memcached-3.4.0', 'xdebug-3.5.1', 'imagick' ),
+			'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'xdebug-3.5.1' ),
 			'composer'        => true,
 		),
 		'phpunit' => 9,

From 03f27c9d1e069e655a4372fc927798f61fc9e430 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <359867+desrosj@users.noreply.github.com>
Date: Fri, 15 May 2026 12:16:50 -0400
Subject: [PATCH 3/6] Add `pcov` to PHP 7.4-8.5 images.

---
 images/7.4/php/Dockerfile |  1 +
 images/8.0/php/Dockerfile |  1 +
 images/8.1/php/Dockerfile |  1 +
 images/8.2/php/Dockerfile |  1 +
 images/8.3/php/Dockerfile |  1 +
 images/8.4/php/Dockerfile |  1 +
 images/8.5/php/Dockerfile |  1 +
 update.php                | 14 +++++++-------
 8 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/images/7.4/php/Dockerfile b/images/7.4/php/Dockerfile
index 74080c6..bbc4ec8 100644
--- a/images/7.4/php/Dockerfile
+++ b/images/7.4/php/Dockerfile
@@ -30,6 +30,7 @@ RUN set -ex; \
 	pecl install imagick; \
 	docker-php-ext-enable imagick; \
 	pecl install xdebug-3.1.6; \
+	pecl install pcov; \
 	pecl install memcached-3.3.0; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
diff --git a/images/8.0/php/Dockerfile b/images/8.0/php/Dockerfile
index 0a4c66d..a72dc61 100644
--- a/images/8.0/php/Dockerfile
+++ b/images/8.0/php/Dockerfile
@@ -30,6 +30,7 @@ RUN set -ex; \
 	pecl install imagick; \
 	docker-php-ext-enable imagick; \
 	pecl install memcached-3.4.0; \
+	pecl install pcov; \
 	pecl install xdebug-3.5.1; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
diff --git a/images/8.1/php/Dockerfile b/images/8.1/php/Dockerfile
index 26ee959..8bb538b 100644
--- a/images/8.1/php/Dockerfile
+++ b/images/8.1/php/Dockerfile
@@ -30,6 +30,7 @@ RUN set -ex; \
 	pecl install imagick; \
 	docker-php-ext-enable imagick; \
 	pecl install memcached-3.4.0; \
+	pecl install pcov; \
 	pecl install xdebug-3.5.1; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
diff --git a/images/8.2/php/Dockerfile b/images/8.2/php/Dockerfile
index 5b125e9..9fae39c 100644
--- a/images/8.2/php/Dockerfile
+++ b/images/8.2/php/Dockerfile
@@ -30,6 +30,7 @@ RUN set -ex; \
 	pecl install imagick; \
 	docker-php-ext-enable imagick; \
 	pecl install memcached-3.4.0; \
+	pecl install pcov; \
 	pecl install xdebug-3.5.1; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
diff --git a/images/8.3/php/Dockerfile b/images/8.3/php/Dockerfile
index ade383d..6b7c145 100644
--- a/images/8.3/php/Dockerfile
+++ b/images/8.3/php/Dockerfile
@@ -30,6 +30,7 @@ RUN set -ex; \
 	pecl install imagick; \
 	docker-php-ext-enable imagick; \
 	pecl install memcached-3.4.0; \
+	pecl install pcov; \
 	pecl install xdebug-3.5.1; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
diff --git a/images/8.4/php/Dockerfile b/images/8.4/php/Dockerfile
index b95178a..8e4ec19 100644
--- a/images/8.4/php/Dockerfile
+++ b/images/8.4/php/Dockerfile
@@ -30,6 +30,7 @@ RUN set -ex; \
 	pecl install imagick; \
 	docker-php-ext-enable imagick; \
 	pecl install memcached-3.4.0; \
+	pecl install pcov; \
 	pecl install xdebug-3.5.1; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
diff --git a/images/8.5/php/Dockerfile b/images/8.5/php/Dockerfile
index feca94b..eb0e441 100644
--- a/images/8.5/php/Dockerfile
+++ b/images/8.5/php/Dockerfile
@@ -30,6 +30,7 @@ RUN set -ex; \
 	pecl install memcached-3.4.0; \
 	pecl install imagick; \
 	docker-php-ext-enable imagick; \
+	pecl install pcov; \
 	pecl install xdebug-3.5.1; \
 	\
 	curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
diff --git a/update.php b/update.php
index 258c9fd..aaf32e1 100644
--- a/update.php
+++ b/update.php
@@ -60,7 +60,7 @@
 			'base_name'       => 'php:7.4-fpm',
 			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
 			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
-			'pecl_extensions' => array( 'imagick', 'xdebug-3.1.6', 'memcached-3.3.0' ),
+			'pecl_extensions' => array( 'imagick', 'xdebug-3.1.6', 'pcov', 'memcached-3.3.0' ),
 			'composer'        => true,
 		),
 		'phpunit' => 7,
@@ -74,7 +74,7 @@
 			'base_name'       => 'php:8.0-fpm',
 			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
 			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
-			'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'xdebug-3.5.1' ),
+			'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'pcov', 'xdebug-3.5.1' ),
 			'composer'        => true,
 		),
 		'phpunit' => 9,
@@ -88,7 +88,7 @@
 			'base_name'       => 'php:8.1-fpm',
 			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
 			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
-			'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'xdebug-3.5.1' ),
+			'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'pcov', 'xdebug-3.5.1' ),
 			'composer'        => true,
 		),
 		'phpunit' => 9,
@@ -102,7 +102,7 @@
 			'base_name'       => 'php:8.2-fpm',
 			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
 			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
-			'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'xdebug-3.5.1' ),
+			'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'pcov', 'xdebug-3.5.1' ),
 			'composer'        => true,
 		),
 		'phpunit' => 9,
@@ -116,7 +116,7 @@
 			'base_name'       => 'php:8.3-fpm',
 			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
 			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
-			'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'xdebug-3.5.1' ),
+			'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'pcov', 'xdebug-3.5.1' ),
 			'composer'        => true,
 		),
 		'phpunit' => 9,
@@ -130,7 +130,7 @@
 			'base_name'       => 'php:8.4-fpm',
 			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libdav1d-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
 			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
-			'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'xdebug-3.5.1' ),
+			'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'pcov', 'xdebug-3.5.1' ),
 			'composer'        => true,
 		),
 		'phpunit' => 9,
@@ -144,7 +144,7 @@
 			'base_name'       => 'php:8.5-fpm',
 			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libdav1d-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync' ),
 			'extensions'      => array( 'gd', 'mysqli', 'zip', 'exif', 'intl', 'mbstring' ),
-			'pecl_extensions' => array( 'memcached-3.4.0', 'imagick', 'xdebug-3.5.1' ),
+			'pecl_extensions' => array( 'memcached-3.4.0', 'imagick', 'pcov', 'xdebug-3.5.1' ),
 			'composer'        => true,
 		),
 		'phpunit' => 9,

From 1334135d05dbb940f44ebe6a47cb48e39fef5fb4 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <359867+desrosj@users.noreply.github.com>
Date: Fri, 15 May 2026 12:47:20 -0400
Subject: [PATCH 4/6] Account for PCOV in the `common.sh` file.

---
 entrypoint/common.sh     | 11 +++++++++++
 images/7.2/php/common.sh | 11 +++++++++++
 images/7.3/php/common.sh | 11 +++++++++++
 images/7.4/php/common.sh | 11 +++++++++++
 images/8.0/php/common.sh | 11 +++++++++++
 images/8.1/php/common.sh | 11 +++++++++++
 images/8.2/php/common.sh | 11 +++++++++++
 images/8.3/php/common.sh | 11 +++++++++++
 images/8.4/php/common.sh | 11 +++++++++++
 images/8.5/php/common.sh | 11 +++++++++++
 10 files changed, 110 insertions(+)

diff --git a/entrypoint/common.sh b/entrypoint/common.sh
index bc62f21..f60dd03 100644
--- a/entrypoint/common.sh
+++ b/entrypoint/common.sh
@@ -41,6 +41,17 @@ else
 	rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
 fi
 
+# If LOCAL_PHP_PCOV=true the PCOV extension will be enabled.
+if [ "$LOCAL_PHP_PCOV" = true ]; then
+	if extension_available "pcov"; then
+		docker-php-ext-enable pcov
+	else
+		echo "Warning: PCOV extension not available, skipping..."
+	fi
+else
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
+fi
+
 ### Change UID/GID
 WP_PHP_UID="${PHP_FPM_UID-1000}"
 WP_PHP_GID="${PHP_FPM_GID-1000}"
diff --git a/images/7.2/php/common.sh b/images/7.2/php/common.sh
index bc62f21..f60dd03 100644
--- a/images/7.2/php/common.sh
+++ b/images/7.2/php/common.sh
@@ -41,6 +41,17 @@ else
 	rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
 fi
 
+# If LOCAL_PHP_PCOV=true the PCOV extension will be enabled.
+if [ "$LOCAL_PHP_PCOV" = true ]; then
+	if extension_available "pcov"; then
+		docker-php-ext-enable pcov
+	else
+		echo "Warning: PCOV extension not available, skipping..."
+	fi
+else
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
+fi
+
 ### Change UID/GID
 WP_PHP_UID="${PHP_FPM_UID-1000}"
 WP_PHP_GID="${PHP_FPM_GID-1000}"
diff --git a/images/7.3/php/common.sh b/images/7.3/php/common.sh
index bc62f21..f60dd03 100644
--- a/images/7.3/php/common.sh
+++ b/images/7.3/php/common.sh
@@ -41,6 +41,17 @@ else
 	rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
 fi
 
+# If LOCAL_PHP_PCOV=true the PCOV extension will be enabled.
+if [ "$LOCAL_PHP_PCOV" = true ]; then
+	if extension_available "pcov"; then
+		docker-php-ext-enable pcov
+	else
+		echo "Warning: PCOV extension not available, skipping..."
+	fi
+else
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
+fi
+
 ### Change UID/GID
 WP_PHP_UID="${PHP_FPM_UID-1000}"
 WP_PHP_GID="${PHP_FPM_GID-1000}"
diff --git a/images/7.4/php/common.sh b/images/7.4/php/common.sh
index bc62f21..f60dd03 100644
--- a/images/7.4/php/common.sh
+++ b/images/7.4/php/common.sh
@@ -41,6 +41,17 @@ else
 	rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
 fi
 
+# If LOCAL_PHP_PCOV=true the PCOV extension will be enabled.
+if [ "$LOCAL_PHP_PCOV" = true ]; then
+	if extension_available "pcov"; then
+		docker-php-ext-enable pcov
+	else
+		echo "Warning: PCOV extension not available, skipping..."
+	fi
+else
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
+fi
+
 ### Change UID/GID
 WP_PHP_UID="${PHP_FPM_UID-1000}"
 WP_PHP_GID="${PHP_FPM_GID-1000}"
diff --git a/images/8.0/php/common.sh b/images/8.0/php/common.sh
index bc62f21..f60dd03 100644
--- a/images/8.0/php/common.sh
+++ b/images/8.0/php/common.sh
@@ -41,6 +41,17 @@ else
 	rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
 fi
 
+# If LOCAL_PHP_PCOV=true the PCOV extension will be enabled.
+if [ "$LOCAL_PHP_PCOV" = true ]; then
+	if extension_available "pcov"; then
+		docker-php-ext-enable pcov
+	else
+		echo "Warning: PCOV extension not available, skipping..."
+	fi
+else
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
+fi
+
 ### Change UID/GID
 WP_PHP_UID="${PHP_FPM_UID-1000}"
 WP_PHP_GID="${PHP_FPM_GID-1000}"
diff --git a/images/8.1/php/common.sh b/images/8.1/php/common.sh
index bc62f21..f60dd03 100644
--- a/images/8.1/php/common.sh
+++ b/images/8.1/php/common.sh
@@ -41,6 +41,17 @@ else
 	rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
 fi
 
+# If LOCAL_PHP_PCOV=true the PCOV extension will be enabled.
+if [ "$LOCAL_PHP_PCOV" = true ]; then
+	if extension_available "pcov"; then
+		docker-php-ext-enable pcov
+	else
+		echo "Warning: PCOV extension not available, skipping..."
+	fi
+else
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
+fi
+
 ### Change UID/GID
 WP_PHP_UID="${PHP_FPM_UID-1000}"
 WP_PHP_GID="${PHP_FPM_GID-1000}"
diff --git a/images/8.2/php/common.sh b/images/8.2/php/common.sh
index bc62f21..f60dd03 100644
--- a/images/8.2/php/common.sh
+++ b/images/8.2/php/common.sh
@@ -41,6 +41,17 @@ else
 	rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
 fi
 
+# If LOCAL_PHP_PCOV=true the PCOV extension will be enabled.
+if [ "$LOCAL_PHP_PCOV" = true ]; then
+	if extension_available "pcov"; then
+		docker-php-ext-enable pcov
+	else
+		echo "Warning: PCOV extension not available, skipping..."
+	fi
+else
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
+fi
+
 ### Change UID/GID
 WP_PHP_UID="${PHP_FPM_UID-1000}"
 WP_PHP_GID="${PHP_FPM_GID-1000}"
diff --git a/images/8.3/php/common.sh b/images/8.3/php/common.sh
index bc62f21..f60dd03 100644
--- a/images/8.3/php/common.sh
+++ b/images/8.3/php/common.sh
@@ -41,6 +41,17 @@ else
 	rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
 fi
 
+# If LOCAL_PHP_PCOV=true the PCOV extension will be enabled.
+if [ "$LOCAL_PHP_PCOV" = true ]; then
+	if extension_available "pcov"; then
+		docker-php-ext-enable pcov
+	else
+		echo "Warning: PCOV extension not available, skipping..."
+	fi
+else
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
+fi
+
 ### Change UID/GID
 WP_PHP_UID="${PHP_FPM_UID-1000}"
 WP_PHP_GID="${PHP_FPM_GID-1000}"
diff --git a/images/8.4/php/common.sh b/images/8.4/php/common.sh
index bc62f21..f60dd03 100644
--- a/images/8.4/php/common.sh
+++ b/images/8.4/php/common.sh
@@ -41,6 +41,17 @@ else
 	rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
 fi
 
+# If LOCAL_PHP_PCOV=true the PCOV extension will be enabled.
+if [ "$LOCAL_PHP_PCOV" = true ]; then
+	if extension_available "pcov"; then
+		docker-php-ext-enable pcov
+	else
+		echo "Warning: PCOV extension not available, skipping..."
+	fi
+else
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
+fi
+
 ### Change UID/GID
 WP_PHP_UID="${PHP_FPM_UID-1000}"
 WP_PHP_GID="${PHP_FPM_GID-1000}"
diff --git a/images/8.5/php/common.sh b/images/8.5/php/common.sh
index bc62f21..f60dd03 100644
--- a/images/8.5/php/common.sh
+++ b/images/8.5/php/common.sh
@@ -41,6 +41,17 @@ else
 	rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
 fi
 
+# If LOCAL_PHP_PCOV=true the PCOV extension will be enabled.
+if [ "$LOCAL_PHP_PCOV" = true ]; then
+	if extension_available "pcov"; then
+		docker-php-ext-enable pcov
+	else
+		echo "Warning: PCOV extension not available, skipping..."
+	fi
+else
+	rm -f /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
+fi
+
 ### Change UID/GID
 WP_PHP_UID="${PHP_FPM_UID-1000}"
 WP_PHP_GID="${PHP_FPM_GID-1000}"

From f20bf5e481e479bc0bd872915708d82b411e7eee Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <359867+desrosj@users.noreply.github.com>
Date: Fri, 15 May 2026 13:13:30 -0400
Subject: [PATCH 5/6] Undo changes to PHP 7.2 & 7.3 images.

---
 images/7.2/php/common.sh | 11 -----------
 images/7.3/php/common.sh | 11 -----------
 2 files changed, 22 deletions(-)

diff --git a/images/7.2/php/common.sh b/images/7.2/php/common.sh
index f60dd03..bc62f21 100644
--- a/images/7.2/php/common.sh
+++ b/images/7.2/php/common.sh
@@ -41,17 +41,6 @@ else
 	rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
 fi
 
-# If LOCAL_PHP_PCOV=true the PCOV extension will be enabled.
-if [ "$LOCAL_PHP_PCOV" = true ]; then
-	if extension_available "pcov"; then
-		docker-php-ext-enable pcov
-	else
-		echo "Warning: PCOV extension not available, skipping..."
-	fi
-else
-	rm -f /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
-fi
-
 ### Change UID/GID
 WP_PHP_UID="${PHP_FPM_UID-1000}"
 WP_PHP_GID="${PHP_FPM_GID-1000}"
diff --git a/images/7.3/php/common.sh b/images/7.3/php/common.sh
index f60dd03..bc62f21 100644
--- a/images/7.3/php/common.sh
+++ b/images/7.3/php/common.sh
@@ -41,17 +41,6 @@ else
 	rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
 fi
 
-# If LOCAL_PHP_PCOV=true the PCOV extension will be enabled.
-if [ "$LOCAL_PHP_PCOV" = true ]; then
-	if extension_available "pcov"; then
-		docker-php-ext-enable pcov
-	else
-		echo "Warning: PCOV extension not available, skipping..."
-	fi
-else
-	rm -f /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
-fi
-
 ### Change UID/GID
 WP_PHP_UID="${PHP_FPM_UID-1000}"
 WP_PHP_GID="${PHP_FPM_GID-1000}"

From 82b229cb286f7000a9fa673d86c8f888c0832569 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <359867+desrosj@users.noreply.github.com>
Date: Fri, 15 May 2026 15:26:15 -0400
Subject: [PATCH 6/6] Fix bad rebase.

---
 update.php | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/update.php b/update.php
index aaf32e1..55495f8 100644
--- a/update.php
+++ b/update.php
@@ -27,34 +27,6 @@
  * }
  */
 $php_versions = array(
-	'7.2' => array(
-		'php' => array(
-			'base_name'       => 'php:7.2-fpm',
-			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
-			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
-			'pecl_extensions' => array( 'imagick', 'xdebug-3.1.6', 'memcached-3.3.0' ),
-			'composer'        => true,
-		),
-		'phpunit' => 7,
-		'cli' => array(
-			'mysql_client' => 'virtual-mysql-client',
-			'download_url' => 'https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar',
-		),
-	),
-	'7.3' => array(
-		'php' => array(
-			'base_name'       => 'php:7.3-fpm',
-			'apt'             => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
-			'extensions'      => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ),
-			'pecl_extensions' => array( 'imagick', 'xdebug-3.1.6', 'memcached-3.3.0' ),
-			'composer'        => true,
-		),
-		'phpunit' => 7,
-		'cli' => array(
-			'mysql_client' => 'virtual-mysql-client',
-			'download_url' => 'https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar',
-		),
-	),
 	'7.4' => array(
 		'php' => array(
 			'base_name'       => 'php:7.4-fpm',