From cb1f2886a9c46bfdcb039018e184c47713d62934 Mon Sep 17 00:00:00 2001 From: Gerson Felipe Schwinn Date: Fri, 12 Dec 2025 09:41:36 -0300 Subject: [PATCH 1/5] Including PHP 8.4 and 8.5 --- .github/workflows/tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2f758f9..e084874 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -32,6 +32,8 @@ jobs: - "8.1" - "8.2" - "8.3" + - "8.4" + - "8.5" operating-system: [ubuntu-latest, windows-latest] steps: From 5f9ae2b419fce10238d3e5b965e519ac5a61f39e Mon Sep 17 00:00:00 2001 From: Gerson Felipe Schwinn Date: Fri, 12 Dec 2025 10:01:21 -0300 Subject: [PATCH 2/5] Updating mockery dependency --- .github/workflows/tests.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e084874..9514a25 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -48,7 +48,13 @@ jobs: extensions: "mbstring, gd, bcmath, bz2" tools: composer:v2 ini-values: error_reporting=-1 - + + - name: "Update dependencies" + if: "${{ matrix.php-versions >= '8.4' }}" + run: | + composer remove --dev mockery/mockery --no-interaction --no-progress + composer require --dev mockery/mockery --no-interaction --no-progress + - name: "Install dependencies" run: "composer install --no-interaction --no-progress" From 09f53248c4df7ef499c0ad952ffa469464cd765f Mon Sep 17 00:00:00 2001 From: Gerson Felipe Schwinn Date: Fri, 12 Dec 2025 10:05:21 -0300 Subject: [PATCH 3/5] Fix variable name --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9514a25..69a46d9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -50,7 +50,7 @@ jobs: ini-values: error_reporting=-1 - name: "Update dependencies" - if: "${{ matrix.php-versions >= '8.4' }}" + if: "${{ matrix.php-version >= '8.4' }}" run: | composer remove --dev mockery/mockery --no-interaction --no-progress composer require --dev mockery/mockery --no-interaction --no-progress From e37eaa409b9885ec84e53d8c515b2ed25ebf3acb Mon Sep 17 00:00:00 2001 From: Gerson Felipe Schwinn Date: Fri, 12 Dec 2025 10:08:52 -0300 Subject: [PATCH 4/5] Ignoring deprecated function --- src/Output/Png.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Output/Png.php b/src/Output/Png.php index 5cdaebd..1ea004f 100644 --- a/src/Output/Png.php +++ b/src/Output/Png.php @@ -57,7 +57,10 @@ public function output(QrCode $qrCode, $w = 100, $background = [255, 255, 255], $data = ob_get_contents(); ob_end_clean(); - imagedestroy($im); + //This function has been DEPRECATED as of PHP 8.5.0 + if (PHP_VERSION_ID < 80500) { + imagedestroy($im); + } return $data; } From f76008702dd0b5e71c84175b6e39658ab0d3109b Mon Sep 17 00:00:00 2001 From: Gerson Felipe Schwinn Date: Fri, 12 Dec 2025 10:24:23 -0300 Subject: [PATCH 5/5] Updating dev dependency --- .github/workflows/tests.yml | 6 ------ composer.json | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 69a46d9..f86449e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -48,12 +48,6 @@ jobs: extensions: "mbstring, gd, bcmath, bz2" tools: composer:v2 ini-values: error_reporting=-1 - - - name: "Update dependencies" - if: "${{ matrix.php-version >= '8.4' }}" - run: | - composer remove --dev mockery/mockery --no-interaction --no-progress - composer require --dev mockery/mockery --no-interaction --no-progress - name: "Install dependencies" run: "composer install --no-interaction --no-progress" diff --git a/composer.json b/composer.json index 4e372da..fb4a16f 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "require-dev": { "yoast/phpunit-polyfills": "^1.0", - "mockery/mockery": "^0.9.5", + "mockery/mockery": "^0.9.5 || ^1.0", "squizlabs/php_codesniffer": "^3.4", "tracy/tracy": "^2.5" },