From 5c9ce13f1467e2c4c7457a0a81b14adedc6584eb Mon Sep 17 00:00:00 2001 From: chadicus Date: Thu, 7 Aug 2025 09:00:51 -0400 Subject: [PATCH 1/5] Add PHP 8.3 and 8.4 builds --- .github/workflows/php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 44b6e9a..e421913 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2'] + php-versions: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4'] steps: - name: Checkout uses: actions/checkout@v2 From 444a65d27fa436024dbdd2ca96277b286b2bc68a Mon Sep 17 00:00:00 2001 From: chadicus Date: Thu, 7 Aug 2025 10:07:19 -0400 Subject: [PATCH 2/5] Ignore dot files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2d25a98..5072a22 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /nbproject/private/ composer.lock phpunit.xml +.* From fbe377776d1e3f7bdf140838700eaa3e1f858f1a Mon Sep 17 00:00:00 2001 From: chadicus Date: Thu, 7 Aug 2025 10:07:41 -0400 Subject: [PATCH 3/5] Set error reporting in PHPUnit config --- phpunit.xml.dist | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 9654ad0..df7ecc6 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,4 +1,8 @@ + + + + tests From b78d87ba3a49d77bb6a473cd537af8fd68be406b Mon Sep 17 00:00:00 2001 From: chadicus Date: Thu, 7 Aug 2025 10:08:00 -0400 Subject: [PATCH 4/5] Cast parameters to integers --- src/Image.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Image.php b/src/Image.php index 339880e..391051c 100644 --- a/src/Image.php +++ b/src/Image.php @@ -386,7 +386,7 @@ public static function resizeMulti(\Imagick $source, array $boxSizes, array $opt //put image in box $canvas = self::getBackgroundCanvas($source, $color, $blurBackground, $blurValue, $boxWidth, $boxHeight); - if ($canvas->compositeImage($clone, \Imagick::COMPOSITE_ATOP, $targetX, $targetY) !== true) { + if ($canvas->compositeImage($clone, \Imagick::COMPOSITE_ATOP, (int)$targetX, (int)$targetY) !== true) { //cumbersome to test throw new \Exception('Imagick::compositeImage() did not return true');//@codeCoverageIgnore } From 5823531180d6d5d895103ca9d0885006c23539ee Mon Sep 17 00:00:00 2001 From: chadicus Date: Thu, 7 Aug 2025 10:13:27 -0400 Subject: [PATCH 5/5] Use PHPUnit < 11 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2614bc1..bc133ad 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "traderinteractive/util": "^3.0||^4.0" }, "require-dev": { - "phpunit/phpunit": ">=6.5", + "phpunit/phpunit": ">=6.5 <11.0", "squizlabs/php_codesniffer": "^3.2" }, "autoload": {