From b25c9dd4b8aac337acec960c4da2092badeae39e Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Mon, 21 Jul 2025 06:11:55 +0000 Subject: [PATCH 1/4] Add PHP devcontainer --- .devcontainer/devcontainer.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000..161f8cb --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,11 @@ +{ + "name": "PHP 8.2", + "image": "mcr.microsoft.com/devcontainers/php:8.2-bullseye", + "features": {}, + "postCreateCommand": "composer install", + "customizations": { + "vscode": { + "extensions": ["felixfbecker.php-intellisense"] + } + } +} From 23a8d0ae38712ce1ffd73dc44da46c4213cdafcb Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Mon, 21 Jul 2025 06:24:47 +0000 Subject: [PATCH 2/4] Fix codespace config --- .devcontainer/Dockerfile | 8 ++++++++ .devcontainer/devcontainer.json | 9 +++++---- 2 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 .devcontainer/Dockerfile diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 0000000..5d29a5e --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,8 @@ +FROM mcr.microsoft.com/devcontainers/php:8.2-bullseye + +# Install libraries needed to compile GD +RUN apt-get update \ + && apt-get install -y libpng-dev libjpeg-dev libfreetype6-dev \ + && docker-php-ext-configure gd --with-freetype --with-jpeg \ + && docker-php-ext-install gd \ + && rm -rf /var/lib/apt/lists/* diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 161f8cb..3af305c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,11 +1,12 @@ { - "name": "PHP 8.2", - "image": "mcr.microsoft.com/devcontainers/php:8.2-bullseye", - "features": {}, + "name": "PHP with GD", + "build": { "dockerfile": "Dockerfile" }, "postCreateCommand": "composer install", "customizations": { "vscode": { - "extensions": ["felixfbecker.php-intellisense"] + "extensions": [ + "felixfbecker.php-intellisense" + ] } } } From 159bb3212b6044e521b1c53ce6d7dde838cd2c38 Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Mon, 21 Jul 2025 06:27:13 +0000 Subject: [PATCH 3/4] Support PHPUnit 11.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1b76bfe..643abf9 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ ], "require": { "php": ">=8.1", - "phpunit/phpunit": "^10.1", + "phpunit/phpunit": "^10.1|^11.0", "ext-gd": "*" }, "require-dev": { From 3d0231f0b724f1eb08d6812a92c32f9913325559 Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Sat, 26 Jul 2025 16:15:59 -0700 Subject: [PATCH 4/4] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index dabed35..fe580b3 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ composer require --dev meyfa/phpunit-assert-gd | AssertGD version | Supported PHP version | Supported PHPUnit version | |:-----------------|:----------------------|:--------------------------| -| 4.* | >= 8.1 | 10.1 | +| 4.* | >= 8.1 | ^10.1 and ^11.0 | | 3.* | >= 7.3 | 9 | | 2.* | >= 7.2 | 8 | | 1.* | 5.3.3 - 8.0 | 4.8.36 - 6.5.0 | @@ -137,4 +137,4 @@ an exact match and 1 is the complete opposite. You may then provide an instance of the class as the 5th parameter of the `assertSimilarGD` or `assertNotSimilarGD` method to use this -calculation method for determining the image difference. \ No newline at end of file +calculation method for determining the image difference.