From ca70d22fc7caacf28ddbb153b489b37730c815f9 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 19 Aug 2025 19:41:51 +0000
Subject: [PATCH 1/9] Initial plan


From a2c80d0b4b87f2af7ab61eba5abf517ebc76a282 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 19 Aug 2025 19:59:11 +0000
Subject: [PATCH 2/9] Add multi-PHP version support with separate Dockerfiles
 and updated GitHub Actions

Co-authored-by: joehoyle <161683+joehoyle@users.noreply.github.com>
---
 .github/workflows/image.yml |  7 ++++--
 Dockerfile                  | 33 +++++++++++++-----------
 Dockerfile.php8.0           | 50 +++++++++++++++++++++++++++++++++++++
 Dockerfile.php8.1           | 50 +++++++++++++++++++++++++++++++++++++
 Dockerfile.php8.2           | 50 +++++++++++++++++++++++++++++++++++++
 Dockerfile.php8.3           | 50 +++++++++++++++++++++++++++++++++++++
 README.md                   | 16 ++++++++++++
 7 files changed, 239 insertions(+), 17 deletions(-)
 create mode 100644 Dockerfile.php8.0
 create mode 100644 Dockerfile.php8.1
 create mode 100644 Dockerfile.php8.2
 create mode 100644 Dockerfile.php8.3

diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index fc8f7c1..27c2f52 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -30,6 +30,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
+          file: Dockerfile.php8.3
           platforms: linux/amd64,linux/arm64
           push: ${{ github.ref == 'refs/heads/master' }}
           tags: humanmade/plugin-tester:latest
@@ -39,6 +40,7 @@ jobs:
     strategy:
       matrix:
         wp_version: ['5.4', '5.5', '5.6', '5.7', '5.8', '5.9', '6.0', '6.1', '6.2', '6.3', '6.4', '6.5', '6.6', '6.7', '6.8']
+        php_version: ['8.0', '8.1', '8.2', '8.3']
     steps:
       -
         name: Checkout
@@ -56,13 +58,14 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
-        name: Build and push ${{ matrix.wp_version }}
+        name: Build and push WP ${{ matrix.wp_version }} PHP ${{ matrix.php_version }}
         uses: docker/build-push-action@v2
         with:
           context: .
+          file: Dockerfile.php${{ matrix.php_version }}
           build-args: |
             WP_VERSION=${{ matrix.wp_version }}
           platforms: linux/amd64,linux/arm64
           push: ${{ github.ref == 'refs/heads/master' }}
-          tags: humanmade/plugin-tester:wp-${{ matrix.wp_version }}
+          tags: humanmade/plugin-tester:wp-${{ matrix.wp_version }}-php${{ matrix.php_version }}
 
diff --git a/Dockerfile b/Dockerfile
index b2bf538..daad056 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.19
 
 ARG WP_VERSION=6.8
 
@@ -8,20 +8,23 @@ RUN apk add -u --no-cache \
 	imagemagick \
 	mysql \
 	mysql-client \
-	php7 \
-	php7-curl \
-	php7-dom \
-	php7-exif \
-	php7-mysqli \
-	php7-pecl-imagick \
-	php7-simplexml \
-	php7-tokenizer \
-	php7-xml \
-	php7-xmlwriter
-
-RUN apk add --no-cache php7-pear php7-dev gcc musl-dev make \
-	&& pecl install pcov && echo extension=pcov.so > /etc/php7/conf.d/pcov.ini \
-	&& apk del php7-pear php7-dev gcc musl-dev make
+	php83 \
+	php83-curl \
+	php83-dom \
+	php83-exif \
+	php83-mysqli \
+	php83-pecl-imagick \
+	php83-simplexml \
+	php83-tokenizer \
+	php83-xml \
+	php83-xmlwriter
+
+RUN apk add --no-cache php83-pear php83-dev gcc musl-dev make \
+	&& pecl83 install pcov && echo extension=pcov.so > /etc/php83/conf.d/pcov.ini \
+	&& apk del php83-pear php83-dev gcc musl-dev make
+
+# Create php symlink to php83
+RUN ln -sf /usr/bin/php83 /usr/bin/php
 
 RUN wget -nv -O /tmp/wordpress.tar.gz https://wordpress.org/wordpress-${WP_VERSION}.tar.gz \
 	&& mkdir /wordpress \
diff --git a/Dockerfile.php8.0 b/Dockerfile.php8.0
new file mode 100644
index 0000000..8188453
--- /dev/null
+++ b/Dockerfile.php8.0
@@ -0,0 +1,50 @@
+FROM alpine:3.19
+
+ARG WP_VERSION=6.8
+
+RUN apk add -u --no-cache \
+	composer \
+	git \
+	imagemagick \
+	mysql \
+	mysql-client \
+	php8 \
+	php8-curl \
+	php8-dom \
+	php8-exif \
+	php8-mysqli \
+	php8-pecl-imagick \
+	php8-simplexml \
+	php8-tokenizer \
+	php8-xml \
+	php8-xmlwriter
+
+RUN apk add --no-cache php8-pear php8-dev gcc musl-dev make \
+	&& pecl8 install pcov && echo extension=pcov.so > /etc/php8/conf.d/pcov.ini \
+	&& apk del php8-pear php8-dev gcc musl-dev make
+
+# Create php symlink to php8
+RUN ln -sf /usr/bin/php8 /usr/bin/php
+
+RUN wget -nv -O /tmp/wordpress.tar.gz https://wordpress.org/wordpress-${WP_VERSION}.tar.gz \
+	&& mkdir /wordpress \
+	&& tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C /wordpress \
+	&& rm /tmp/wordpress.tar.gz
+
+RUN wget -nv -O /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpunit/archive/${WP_VERSION}.0.tar.gz \
+	&& mkdir /wp-phpunit \
+	&& tar --strip-components=1 -zxmf /tmp/wp-phpunit.tar.gz -C /wp-phpunit \
+	&& rm /tmp/wp-phpunit.tar.gz
+
+RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && sleep 4 && mysql -u root -e "CREATE DATABASE wordpress"
+
+ENV WP_DEVELOP_DIR=/wp-phpunit
+ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
+
+VOLUME ["/code"]
+WORKDIR /code
+COPY ./docker-entrypoint.sh /entrypoint.sh
+COPY ./wp-tests-config.php /wp-tests-config.php
+RUN chmod 755 /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/Dockerfile.php8.1 b/Dockerfile.php8.1
new file mode 100644
index 0000000..dea2de9
--- /dev/null
+++ b/Dockerfile.php8.1
@@ -0,0 +1,50 @@
+FROM alpine:3.19
+
+ARG WP_VERSION=6.8
+
+RUN apk add -u --no-cache \
+	composer \
+	git \
+	imagemagick \
+	mysql \
+	mysql-client \
+	php81 \
+	php81-curl \
+	php81-dom \
+	php81-exif \
+	php81-mysqli \
+	php81-pecl-imagick \
+	php81-simplexml \
+	php81-tokenizer \
+	php81-xml \
+	php81-xmlwriter
+
+RUN apk add --no-cache php81-pear php81-dev gcc musl-dev make \
+	&& pecl81 install pcov && echo extension=pcov.so > /etc/php81/conf.d/pcov.ini \
+	&& apk del php81-pear php81-dev gcc musl-dev make
+
+# Create php symlink to php81
+RUN ln -sf /usr/bin/php81 /usr/bin/php
+
+RUN wget -nv -O /tmp/wordpress.tar.gz https://wordpress.org/wordpress-${WP_VERSION}.tar.gz \
+	&& mkdir /wordpress \
+	&& tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C /wordpress \
+	&& rm /tmp/wordpress.tar.gz
+
+RUN wget -nv -O /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpunit/archive/${WP_VERSION}.0.tar.gz \
+	&& mkdir /wp-phpunit \
+	&& tar --strip-components=1 -zxmf /tmp/wp-phpunit.tar.gz -C /wp-phpunit \
+	&& rm /tmp/wp-phpunit.tar.gz
+
+RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && sleep 4 && mysql -u root -e "CREATE DATABASE wordpress"
+
+ENV WP_DEVELOP_DIR=/wp-phpunit
+ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
+
+VOLUME ["/code"]
+WORKDIR /code
+COPY ./docker-entrypoint.sh /entrypoint.sh
+COPY ./wp-tests-config.php /wp-tests-config.php
+RUN chmod 755 /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/Dockerfile.php8.2 b/Dockerfile.php8.2
new file mode 100644
index 0000000..87b0d49
--- /dev/null
+++ b/Dockerfile.php8.2
@@ -0,0 +1,50 @@
+FROM alpine:3.19
+
+ARG WP_VERSION=6.8
+
+RUN apk add -u --no-cache \
+	composer \
+	git \
+	imagemagick \
+	mysql \
+	mysql-client \
+	php82 \
+	php82-curl \
+	php82-dom \
+	php82-exif \
+	php82-mysqli \
+	php82-pecl-imagick \
+	php82-simplexml \
+	php82-tokenizer \
+	php82-xml \
+	php82-xmlwriter
+
+RUN apk add --no-cache php82-pear php82-dev gcc musl-dev make \
+	&& pecl82 install pcov && echo extension=pcov.so > /etc/php82/conf.d/pcov.ini \
+	&& apk del php82-pear php82-dev gcc musl-dev make
+
+# Create php symlink to php82
+RUN ln -sf /usr/bin/php82 /usr/bin/php
+
+RUN wget -nv -O /tmp/wordpress.tar.gz https://wordpress.org/wordpress-${WP_VERSION}.tar.gz \
+	&& mkdir /wordpress \
+	&& tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C /wordpress \
+	&& rm /tmp/wordpress.tar.gz
+
+RUN wget -nv -O /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpunit/archive/${WP_VERSION}.0.tar.gz \
+	&& mkdir /wp-phpunit \
+	&& tar --strip-components=1 -zxmf /tmp/wp-phpunit.tar.gz -C /wp-phpunit \
+	&& rm /tmp/wp-phpunit.tar.gz
+
+RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && sleep 4 && mysql -u root -e "CREATE DATABASE wordpress"
+
+ENV WP_DEVELOP_DIR=/wp-phpunit
+ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
+
+VOLUME ["/code"]
+WORKDIR /code
+COPY ./docker-entrypoint.sh /entrypoint.sh
+COPY ./wp-tests-config.php /wp-tests-config.php
+RUN chmod 755 /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/Dockerfile.php8.3 b/Dockerfile.php8.3
new file mode 100644
index 0000000..c1a104b
--- /dev/null
+++ b/Dockerfile.php8.3
@@ -0,0 +1,50 @@
+FROM alpine:3.19
+
+ARG WP_VERSION=6.8
+
+RUN apk add -u --no-cache \
+	composer \
+	git \
+	imagemagick \
+	mysql \
+	mysql-client \
+	php83 \
+	php83-curl \
+	php83-dom \
+	php83-exif \
+	php83-mysqli \
+	php83-pecl-imagick \
+	php83-simplexml \
+	php83-tokenizer \
+	php83-xml \
+	php83-xmlwriter
+
+RUN apk add --no-cache php83-pear php83-dev gcc musl-dev make \
+	&& pecl83 install pcov && echo extension=pcov.so > /etc/php83/conf.d/pcov.ini \
+	&& apk del php83-pear php83-dev gcc musl-dev make
+
+# Create php symlink to php83
+RUN ln -sf /usr/bin/php83 /usr/bin/php
+
+RUN wget -nv -O /tmp/wordpress.tar.gz https://wordpress.org/wordpress-${WP_VERSION}.tar.gz \
+	&& mkdir /wordpress \
+	&& tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C /wordpress \
+	&& rm /tmp/wordpress.tar.gz
+
+RUN wget -nv -O /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpunit/archive/${WP_VERSION}.0.tar.gz \
+	&& mkdir /wp-phpunit \
+	&& tar --strip-components=1 -zxmf /tmp/wp-phpunit.tar.gz -C /wp-phpunit \
+	&& rm /tmp/wp-phpunit.tar.gz
+
+RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
+RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && sleep 4 && mysql -u root -e "CREATE DATABASE wordpress"
+
+ENV WP_DEVELOP_DIR=/wp-phpunit
+ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
+
+VOLUME ["/code"]
+WORKDIR /code
+COPY ./docker-entrypoint.sh /entrypoint.sh
+COPY ./wp-tests-config.php /wp-tests-config.php
+RUN chmod 755 /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/README.md b/README.md
index de01f6e..daa4269 100644
--- a/README.md
+++ b/README.md
@@ -4,12 +4,28 @@
 
 Simple Docker image for running unit tests for WordPress plugins.
 
+**Supports multiple PHP versions:** 8.0, 8.1, 8.2, 8.3
+
 To run the tests for your plugin, run this in your plugin directory:
 
 ```sh
 docker run --rm -v "$PWD:/code" humanmade/plugin-tester
 ```
 
+You can also specify a specific WordPress and PHP version combination:
+
+```sh
+docker run --rm -v "$PWD:/code" humanmade/plugin-tester:wp-6.8-php8.3
+```
+
+Available tags follow the pattern `wp-{version}-php{version}`, e.g.:
+- `humanmade/plugin-tester:wp-6.8-php8.3`
+- `humanmade/plugin-tester:wp-6.7-php8.2` 
+- `humanmade/plugin-tester:wp-6.6-php8.1`
+- etc.
+
+The `latest` tag uses the newest WordPress version with PHP 8.3.
+
 You will need `phpunit/phpunit` specified as a Composer dependency of your plugin. Additional arguments can be passed to PHPUnit on the CLI directly, e.g.:
 
 ```sh

From d910c41b8676ac4ca975c10f3c1b747ccc57a817 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 19 Aug 2025 20:20:24 +0000
Subject: [PATCH 3/9] Fix WordPress version and PHP 8.0 Alpine compatibility

Co-authored-by: joehoyle <161683+joehoyle@users.noreply.github.com>
---
 .github/workflows/image.yml | 2 +-
 Dockerfile                  | 2 +-
 Dockerfile.php8.0           | 4 ++--
 Dockerfile.php8.1           | 2 +-
 Dockerfile.php8.2           | 2 +-
 Dockerfile.php8.3           | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index 27c2f52..3f470da 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -39,7 +39,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        wp_version: ['5.4', '5.5', '5.6', '5.7', '5.8', '5.9', '6.0', '6.1', '6.2', '6.3', '6.4', '6.5', '6.6', '6.7', '6.8']
+        wp_version: ['5.4', '5.5', '5.6', '5.7', '5.8', '5.9', '6.0', '6.1', '6.2', '6.3', '6.4', '6.5', '6.6']
         php_version: ['8.0', '8.1', '8.2', '8.3']
     steps:
       -
diff --git a/Dockerfile b/Dockerfile
index daad056..a0f518c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.19
 
-ARG WP_VERSION=6.8
+ARG WP_VERSION=6.6
 
 RUN apk add -u --no-cache \
 	composer \
diff --git a/Dockerfile.php8.0 b/Dockerfile.php8.0
index 8188453..66f7ad1 100644
--- a/Dockerfile.php8.0
+++ b/Dockerfile.php8.0
@@ -1,6 +1,6 @@
-FROM alpine:3.19
+FROM alpine:3.16
 
-ARG WP_VERSION=6.8
+ARG WP_VERSION=6.6
 
 RUN apk add -u --no-cache \
 	composer \
diff --git a/Dockerfile.php8.1 b/Dockerfile.php8.1
index dea2de9..13d8af6 100644
--- a/Dockerfile.php8.1
+++ b/Dockerfile.php8.1
@@ -1,6 +1,6 @@
 FROM alpine:3.19
 
-ARG WP_VERSION=6.8
+ARG WP_VERSION=6.6
 
 RUN apk add -u --no-cache \
 	composer \
diff --git a/Dockerfile.php8.2 b/Dockerfile.php8.2
index 87b0d49..b769121 100644
--- a/Dockerfile.php8.2
+++ b/Dockerfile.php8.2
@@ -1,6 +1,6 @@
 FROM alpine:3.19
 
-ARG WP_VERSION=6.8
+ARG WP_VERSION=6.6
 
 RUN apk add -u --no-cache \
 	composer \
diff --git a/Dockerfile.php8.3 b/Dockerfile.php8.3
index c1a104b..4b5eda8 100644
--- a/Dockerfile.php8.3
+++ b/Dockerfile.php8.3
@@ -1,6 +1,6 @@
 FROM alpine:3.19
 
-ARG WP_VERSION=6.8
+ARG WP_VERSION=6.6
 
 RUN apk add -u --no-cache \
 	composer \

From 1cdc96be25b97ccdd6d5210bb79fa435576e9d08 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 19 Aug 2025 21:22:39 +0000
Subject: [PATCH 4/9] Switch Alpine base images to AWS ECR to avoid Docker Hub
 rate limits

Co-authored-by: joehoyle <161683+joehoyle@users.noreply.github.com>
---
 Dockerfile        | 2 +-
 Dockerfile.php8.0 | 2 +-
 Dockerfile.php8.1 | 2 +-
 Dockerfile.php8.2 | 2 +-
 Dockerfile.php8.3 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a0f518c..703a8ac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19
+FROM public.ecr.aws/docker/library/alpine:3.19
 
 ARG WP_VERSION=6.6
 
diff --git a/Dockerfile.php8.0 b/Dockerfile.php8.0
index 66f7ad1..83698ef 100644
--- a/Dockerfile.php8.0
+++ b/Dockerfile.php8.0
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM public.ecr.aws/docker/library/alpine:3.16
 
 ARG WP_VERSION=6.6
 
diff --git a/Dockerfile.php8.1 b/Dockerfile.php8.1
index 13d8af6..5d67786 100644
--- a/Dockerfile.php8.1
+++ b/Dockerfile.php8.1
@@ -1,4 +1,4 @@
-FROM alpine:3.19
+FROM public.ecr.aws/docker/library/alpine:3.19
 
 ARG WP_VERSION=6.6
 
diff --git a/Dockerfile.php8.2 b/Dockerfile.php8.2
index b769121..1a0ece6 100644
--- a/Dockerfile.php8.2
+++ b/Dockerfile.php8.2
@@ -1,4 +1,4 @@
-FROM alpine:3.19
+FROM public.ecr.aws/docker/library/alpine:3.19
 
 ARG WP_VERSION=6.6
 
diff --git a/Dockerfile.php8.3 b/Dockerfile.php8.3
index 4b5eda8..7c5cc64 100644
--- a/Dockerfile.php8.3
+++ b/Dockerfile.php8.3
@@ -1,4 +1,4 @@
-FROM alpine:3.19
+FROM public.ecr.aws/docker/library/alpine:3.19
 
 ARG WP_VERSION=6.6
 

From 6eadd83ce50ec5bfeb032036a8ea333c85e4daca Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 19 Aug 2025 21:48:19 +0000
Subject: [PATCH 5/9] Fix WordPress download by switching from wordpress.org to
 GitHub

The CI environment blocks access to wordpress.org, causing Docker builds to fail with HTTP 434 errors. Switch all Dockerfiles to download WordPress releases from GitHub instead of wordpress.org.

- Changed download URL from https://wordpress.org/wordpress-${WP_VERSION}.tar.gz
- To: https://codeload.github.com/WordPress/WordPress/tar.gz/refs/tags/${WP_VERSION}
- Tested local build successfully
- GitHub access is not blocked by CI firewall

Co-authored-by: joehoyle <161683+joehoyle@users.noreply.github.com>
---
 Dockerfile        | 2 +-
 Dockerfile.php8.0 | 2 +-
 Dockerfile.php8.1 | 2 +-
 Dockerfile.php8.2 | 2 +-
 Dockerfile.php8.3 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 703a8ac..806fecc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@ RUN apk add --no-cache php83-pear php83-dev gcc musl-dev make \
 # Create php symlink to php83
 RUN ln -sf /usr/bin/php83 /usr/bin/php
 
-RUN wget -nv -O /tmp/wordpress.tar.gz https://wordpress.org/wordpress-${WP_VERSION}.tar.gz \
+RUN wget -nv -O /tmp/wordpress.tar.gz https://codeload.github.com/WordPress/WordPress/tar.gz/refs/tags/${WP_VERSION} \
 	&& mkdir /wordpress \
 	&& tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C /wordpress \
 	&& rm /tmp/wordpress.tar.gz
diff --git a/Dockerfile.php8.0 b/Dockerfile.php8.0
index 83698ef..48e51ca 100644
--- a/Dockerfile.php8.0
+++ b/Dockerfile.php8.0
@@ -26,7 +26,7 @@ RUN apk add --no-cache php8-pear php8-dev gcc musl-dev make \
 # Create php symlink to php8
 RUN ln -sf /usr/bin/php8 /usr/bin/php
 
-RUN wget -nv -O /tmp/wordpress.tar.gz https://wordpress.org/wordpress-${WP_VERSION}.tar.gz \
+RUN wget -nv -O /tmp/wordpress.tar.gz https://codeload.github.com/WordPress/WordPress/tar.gz/refs/tags/${WP_VERSION} \
 	&& mkdir /wordpress \
 	&& tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C /wordpress \
 	&& rm /tmp/wordpress.tar.gz
diff --git a/Dockerfile.php8.1 b/Dockerfile.php8.1
index 5d67786..c3bc859 100644
--- a/Dockerfile.php8.1
+++ b/Dockerfile.php8.1
@@ -26,7 +26,7 @@ RUN apk add --no-cache php81-pear php81-dev gcc musl-dev make \
 # Create php symlink to php81
 RUN ln -sf /usr/bin/php81 /usr/bin/php
 
-RUN wget -nv -O /tmp/wordpress.tar.gz https://wordpress.org/wordpress-${WP_VERSION}.tar.gz \
+RUN wget -nv -O /tmp/wordpress.tar.gz https://codeload.github.com/WordPress/WordPress/tar.gz/refs/tags/${WP_VERSION} \
 	&& mkdir /wordpress \
 	&& tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C /wordpress \
 	&& rm /tmp/wordpress.tar.gz
diff --git a/Dockerfile.php8.2 b/Dockerfile.php8.2
index 1a0ece6..1e44fe9 100644
--- a/Dockerfile.php8.2
+++ b/Dockerfile.php8.2
@@ -26,7 +26,7 @@ RUN apk add --no-cache php82-pear php82-dev gcc musl-dev make \
 # Create php symlink to php82
 RUN ln -sf /usr/bin/php82 /usr/bin/php
 
-RUN wget -nv -O /tmp/wordpress.tar.gz https://wordpress.org/wordpress-${WP_VERSION}.tar.gz \
+RUN wget -nv -O /tmp/wordpress.tar.gz https://codeload.github.com/WordPress/WordPress/tar.gz/refs/tags/${WP_VERSION} \
 	&& mkdir /wordpress \
 	&& tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C /wordpress \
 	&& rm /tmp/wordpress.tar.gz
diff --git a/Dockerfile.php8.3 b/Dockerfile.php8.3
index 7c5cc64..82a1e34 100644
--- a/Dockerfile.php8.3
+++ b/Dockerfile.php8.3
@@ -26,7 +26,7 @@ RUN apk add --no-cache php83-pear php83-dev gcc musl-dev make \
 # Create php symlink to php83
 RUN ln -sf /usr/bin/php83 /usr/bin/php
 
-RUN wget -nv -O /tmp/wordpress.tar.gz https://wordpress.org/wordpress-${WP_VERSION}.tar.gz \
+RUN wget -nv -O /tmp/wordpress.tar.gz https://codeload.github.com/WordPress/WordPress/tar.gz/refs/tags/${WP_VERSION} \
 	&& mkdir /wordpress \
 	&& tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C /wordpress \
 	&& rm /tmp/wordpress.tar.gz

From 51313b9ca11ecbcbaebac4532554042862b56a7f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 20 Aug 2025 14:40:23 +0000
Subject: [PATCH 6/9] Address feedback: update WP versions to 6.0-6.8, remove
 main Dockerfile, make WP_VERSION required

Co-authored-by: joehoyle <161683+joehoyle@users.noreply.github.com>
---
 .github/workflows/image.yml |  4 ++-
 Dockerfile                  | 50 -------------------------------------
 Dockerfile.php8.0           |  2 +-
 Dockerfile.php8.1           |  2 +-
 Dockerfile.php8.2           |  2 +-
 Dockerfile.php8.3           |  2 +-
 6 files changed, 7 insertions(+), 55 deletions(-)
 delete mode 100644 Dockerfile

diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index 3f470da..2bcaeb6 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -31,6 +31,8 @@ jobs:
         with:
           context: .
           file: Dockerfile.php8.3
+          build-args: |
+            WP_VERSION=6.8
           platforms: linux/amd64,linux/arm64
           push: ${{ github.ref == 'refs/heads/master' }}
           tags: humanmade/plugin-tester:latest
@@ -39,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        wp_version: ['5.4', '5.5', '5.6', '5.7', '5.8', '5.9', '6.0', '6.1', '6.2', '6.3', '6.4', '6.5', '6.6']
+        wp_version: ['6.0', '6.1', '6.2', '6.3', '6.4', '6.5', '6.6', '6.7', '6.8']
         php_version: ['8.0', '8.1', '8.2', '8.3']
     steps:
       -
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 806fecc..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,50 +0,0 @@
-FROM public.ecr.aws/docker/library/alpine:3.19
-
-ARG WP_VERSION=6.6
-
-RUN apk add -u --no-cache \
-	composer \
-	git \
-	imagemagick \
-	mysql \
-	mysql-client \
-	php83 \
-	php83-curl \
-	php83-dom \
-	php83-exif \
-	php83-mysqli \
-	php83-pecl-imagick \
-	php83-simplexml \
-	php83-tokenizer \
-	php83-xml \
-	php83-xmlwriter
-
-RUN apk add --no-cache php83-pear php83-dev gcc musl-dev make \
-	&& pecl83 install pcov && echo extension=pcov.so > /etc/php83/conf.d/pcov.ini \
-	&& apk del php83-pear php83-dev gcc musl-dev make
-
-# Create php symlink to php83
-RUN ln -sf /usr/bin/php83 /usr/bin/php
-
-RUN wget -nv -O /tmp/wordpress.tar.gz https://codeload.github.com/WordPress/WordPress/tar.gz/refs/tags/${WP_VERSION} \
-	&& mkdir /wordpress \
-	&& tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C /wordpress \
-	&& rm /tmp/wordpress.tar.gz
-
-RUN wget -nv -O /tmp/wp-phpunit.tar.gz https://github.com/wp-phpunit/wp-phpunit/archive/${WP_VERSION}.0.tar.gz \
-	&& mkdir /wp-phpunit \
-	&& tar --strip-components=1 -zxmf /tmp/wp-phpunit.tar.gz -C /wp-phpunit \
-	&& rm /tmp/wp-phpunit.tar.gz
-
-RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql
-RUN sh -c 'mysqld_safe --datadir=/var/lib/mysql &' && sleep 4 && mysql -u root -e "CREATE DATABASE wordpress"
-
-ENV WP_DEVELOP_DIR=/wp-phpunit
-ENV WP_PHPUNIT__TESTS_CONFIG=/wp-tests-config.php
-
-VOLUME ["/code"]
-WORKDIR /code
-COPY ./docker-entrypoint.sh /entrypoint.sh
-COPY ./wp-tests-config.php /wp-tests-config.php
-RUN chmod 755 /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
diff --git a/Dockerfile.php8.0 b/Dockerfile.php8.0
index 48e51ca..286c9f7 100644
--- a/Dockerfile.php8.0
+++ b/Dockerfile.php8.0
@@ -1,6 +1,6 @@
 FROM public.ecr.aws/docker/library/alpine:3.16
 
-ARG WP_VERSION=6.6
+ARG WP_VERSION
 
 RUN apk add -u --no-cache \
 	composer \
diff --git a/Dockerfile.php8.1 b/Dockerfile.php8.1
index c3bc859..32d6f2f 100644
--- a/Dockerfile.php8.1
+++ b/Dockerfile.php8.1
@@ -1,6 +1,6 @@
 FROM public.ecr.aws/docker/library/alpine:3.19
 
-ARG WP_VERSION=6.6
+ARG WP_VERSION
 
 RUN apk add -u --no-cache \
 	composer \
diff --git a/Dockerfile.php8.2 b/Dockerfile.php8.2
index 1e44fe9..4da94dd 100644
--- a/Dockerfile.php8.2
+++ b/Dockerfile.php8.2
@@ -1,6 +1,6 @@
 FROM public.ecr.aws/docker/library/alpine:3.19
 
-ARG WP_VERSION=6.6
+ARG WP_VERSION
 
 RUN apk add -u --no-cache \
 	composer \
diff --git a/Dockerfile.php8.3 b/Dockerfile.php8.3
index 82a1e34..cd6b9ff 100644
--- a/Dockerfile.php8.3
+++ b/Dockerfile.php8.3
@@ -1,6 +1,6 @@
 FROM public.ecr.aws/docker/library/alpine:3.19
 
-ARG WP_VERSION=6.6
+ARG WP_VERSION
 
 RUN apk add -u --no-cache \
 	composer \

From 055e4a3ad921a08543c398967d4e5d81f359bf18 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 20 Aug 2025 14:51:51 +0000
Subject: [PATCH 7/9] Add WordPress version tags with default PHP 8.0

Co-authored-by: joehoyle <161683+joehoyle@users.noreply.github.com>
---
 .github/workflows/image.yml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index 2bcaeb6..ab595d8 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -37,6 +37,39 @@ jobs:
           push: ${{ github.ref == 'refs/heads/master' }}
           tags: humanmade/plugin-tester:latest
 
+  docker-wp-default:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        wp_version: ['6.0', '6.1', '6.2', '6.3', '6.4', '6.5', '6.6', '6.7', '6.8']
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Build and push WP ${{ matrix.wp_version }} (default PHP 8.0)
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: Dockerfile.php8.0
+          build-args: |
+            WP_VERSION=${{ matrix.wp_version }}
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.ref == 'refs/heads/master' }}
+          tags: humanmade/plugin-tester:wp-${{ matrix.wp_version }}
+
   docker-matrix:
     runs-on: ubuntu-latest
     strategy:

From 9b1639111a7819d0f59728a97c13cb7c510f28be Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 20 Aug 2025 14:57:16 +0000
Subject: [PATCH 8/9] Consolidate Docker build jobs with conditional tagging in
 matrix

Co-authored-by: joehoyle <161683+joehoyle@users.noreply.github.com>
---
 .github/workflows/image.yml | 68 +++----------------------------------
 1 file changed, 4 insertions(+), 64 deletions(-)

diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index ab595d8..112425e 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -7,69 +7,6 @@ on:
   pull_request:
 
 jobs:
-  docker-latest:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Build and push latest
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: Dockerfile.php8.3
-          build-args: |
-            WP_VERSION=6.8
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.ref == 'refs/heads/master' }}
-          tags: humanmade/plugin-tester:latest
-
-  docker-wp-default:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        wp_version: ['6.0', '6.1', '6.2', '6.3', '6.4', '6.5', '6.6', '6.7', '6.8']
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Build and push WP ${{ matrix.wp_version }} (default PHP 8.0)
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: Dockerfile.php8.0
-          build-args: |
-            WP_VERSION=${{ matrix.wp_version }}
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.ref == 'refs/heads/master' }}
-          tags: humanmade/plugin-tester:wp-${{ matrix.wp_version }}
-
   docker-matrix:
     runs-on: ubuntu-latest
     strategy:
@@ -102,5 +39,8 @@ jobs:
             WP_VERSION=${{ matrix.wp_version }}
           platforms: linux/amd64,linux/arm64
           push: ${{ github.ref == 'refs/heads/master' }}
-          tags: humanmade/plugin-tester:wp-${{ matrix.wp_version }}-php${{ matrix.php_version }}
+          tags: |
+            humanmade/plugin-tester:wp-${{ matrix.wp_version }}-php${{ matrix.php_version }}
+            ${{ matrix.php_version == '8.0' && format('humanmade/plugin-tester:wp-{0}', matrix.wp_version) || '' }}
+            ${{ matrix.php_version == '8.0' && matrix.wp_version == '6.8' && 'humanmade/plugin-tester:latest' || '' }}
 

From ff2557cd5c030dacac1cff7a818d6cb8e0be33b4 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 20 Aug 2025 15:01:39 +0000
Subject: [PATCH 9/9] Switch back to wordpress.org URLs for WordPress downloads

Co-authored-by: joehoyle <161683+joehoyle@users.noreply.github.com>
---
 Dockerfile.php8.0 | 2 +-
 Dockerfile.php8.1 | 2 +-
 Dockerfile.php8.2 | 2 +-
 Dockerfile.php8.3 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile.php8.0 b/Dockerfile.php8.0
index 286c9f7..544e741 100644
--- a/Dockerfile.php8.0
+++ b/Dockerfile.php8.0
@@ -26,7 +26,7 @@ RUN apk add --no-cache php8-pear php8-dev gcc musl-dev make \
 # Create php symlink to php8
 RUN ln -sf /usr/bin/php8 /usr/bin/php
 
-RUN wget -nv -O /tmp/wordpress.tar.gz https://codeload.github.com/WordPress/WordPress/tar.gz/refs/tags/${WP_VERSION} \
+RUN wget -nv -O /tmp/wordpress.tar.gz https://wordpress.org/wordpress-${WP_VERSION}.tar.gz \
 	&& mkdir /wordpress \
 	&& tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C /wordpress \
 	&& rm /tmp/wordpress.tar.gz
diff --git a/Dockerfile.php8.1 b/Dockerfile.php8.1
index 32d6f2f..1472291 100644
--- a/Dockerfile.php8.1
+++ b/Dockerfile.php8.1
@@ -26,7 +26,7 @@ RUN apk add --no-cache php81-pear php81-dev gcc musl-dev make \
 # Create php symlink to php81
 RUN ln -sf /usr/bin/php81 /usr/bin/php
 
-RUN wget -nv -O /tmp/wordpress.tar.gz https://codeload.github.com/WordPress/WordPress/tar.gz/refs/tags/${WP_VERSION} \
+RUN wget -nv -O /tmp/wordpress.tar.gz https://wordpress.org/wordpress-${WP_VERSION}.tar.gz \
 	&& mkdir /wordpress \
 	&& tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C /wordpress \
 	&& rm /tmp/wordpress.tar.gz
diff --git a/Dockerfile.php8.2 b/Dockerfile.php8.2
index 4da94dd..3d23a9d 100644
--- a/Dockerfile.php8.2
+++ b/Dockerfile.php8.2
@@ -26,7 +26,7 @@ RUN apk add --no-cache php82-pear php82-dev gcc musl-dev make \
 # Create php symlink to php82
 RUN ln -sf /usr/bin/php82 /usr/bin/php
 
-RUN wget -nv -O /tmp/wordpress.tar.gz https://codeload.github.com/WordPress/WordPress/tar.gz/refs/tags/${WP_VERSION} \
+RUN wget -nv -O /tmp/wordpress.tar.gz https://wordpress.org/wordpress-${WP_VERSION}.tar.gz \
 	&& mkdir /wordpress \
 	&& tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C /wordpress \
 	&& rm /tmp/wordpress.tar.gz
diff --git a/Dockerfile.php8.3 b/Dockerfile.php8.3
index cd6b9ff..6ac6a1a 100644
--- a/Dockerfile.php8.3
+++ b/Dockerfile.php8.3
@@ -26,7 +26,7 @@ RUN apk add --no-cache php83-pear php83-dev gcc musl-dev make \
 # Create php symlink to php83
 RUN ln -sf /usr/bin/php83 /usr/bin/php
 
-RUN wget -nv -O /tmp/wordpress.tar.gz https://codeload.github.com/WordPress/WordPress/tar.gz/refs/tags/${WP_VERSION} \
+RUN wget -nv -O /tmp/wordpress.tar.gz https://wordpress.org/wordpress-${WP_VERSION}.tar.gz \
 	&& mkdir /wordpress \
 	&& tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C /wordpress \
 	&& rm /tmp/wordpress.tar.gz