From 56a3489a6322829c775ffdf5715497f18835653f Mon Sep 17 00:00:00 2001 From: Aaron Bauman Date: Mon, 9 Mar 2026 13:04:13 -0400 Subject: [PATCH 1/6] Update dependency on webmozart/assert. Fixes https://github.com/mailgun/mailgun-php/issues/948 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 77ea4ed2..fedcf8bb 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "php-http/discovery": "^1.19", "php-http/multipart-stream-builder": "^1.1.2", "psr/http-client": "^1.0", - "webmozart/assert": "^1.9.1" + "webmozart/assert": "^1.9.1 || ^2" }, "require-dev": { "ergebnis/composer-normalize": "^2.43", From db3b8a16e5f753bcd9ba59f83efe5552c32420ca Mon Sep 17 00:00:00 2001 From: Aaron Bauman Date: Mon, 9 Mar 2026 13:46:43 -0400 Subject: [PATCH 2/6] Fix assertion definition --- src/Assert.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Assert.php b/src/Assert.php index 58052b85..04bfb32b 100644 --- a/src/Assert.php +++ b/src/Assert.php @@ -26,7 +26,7 @@ final class Assert extends \Webmozart\Assert\Assert * @param mixed $message * @return void */ - protected static function reportInvalidArgument($message): void + protected static function reportInvalidArgument(string $message): never { throw new InvalidArgumentException($message); } From 765c863a702862411832cee6ced85ae7c50f3cf3 Mon Sep 17 00:00:00 2001 From: Aaron Bauman Date: Mon, 9 Mar 2026 13:54:03 -0400 Subject: [PATCH 3/6] Cannot be compatible with both webmozart/assert ^1 an ^2 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fedcf8bb..cf2080fe 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "php-http/discovery": "^1.19", "php-http/multipart-stream-builder": "^1.1.2", "psr/http-client": "^1.0", - "webmozart/assert": "^1.9.1 || ^2" + "webmozart/assert": "^2" }, "require-dev": { "ergebnis/composer-normalize": "^2.43", From 7c016859eac2fbad55655467ff7fea66e9d30267 Mon Sep 17 00:00:00 2001 From: Aaron Bauman Date: Mon, 9 Mar 2026 13:59:28 -0400 Subject: [PATCH 4/6] Update minimum PHP version to 8.2 --- .github/workflows/php.yml | 4 ++-- .github/workflows/static.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index d4775342..1b62acbf 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -8,7 +8,7 @@ jobs: php: strategy: matrix: - php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4'] + php-versions: ['8.2', '8.3', '8.4'] runs-on: 'ubuntu-latest' @@ -36,7 +36,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@2.9.0 with: - php-version: 7.4 + php-version: 8.2 coverage: pcov - name: Checkout code diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 8e74f903..f377cbcd 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -13,7 +13,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.1 + php-version: 8.2 coverage: none tools: phpstan:0.12.92, cs2pr @@ -34,7 +34,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.1 + php-version: 8.2 coverage: none tools: php-cs-fixer:3.9.5, cs2pr @@ -51,7 +51,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.0 + php-version: 8.2 coverage: none tools: vimeo/psalm:4.8.1 From 675433f6d0445c71ad21fa81089aac4274a9f296 Mon Sep 17 00:00:00 2001 From: Aaron Bauman Date: Mon, 9 Mar 2026 14:03:51 -0400 Subject: [PATCH 5/6] Patch nyholm/nsa dev requirement --- composer.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index cf2080fe..2559633f 100644 --- a/composer.json +++ b/composer.json @@ -8,6 +8,12 @@ "email": "travis@mailgunhq.com" } ], + "repositories": [ + { + "type": "git", + "url": "https://github.com/Chris53897/NSA.git" + } + ], "require": { "php": "^7.4 || ^8.0", "php-http/client-common": "^2.2.1", @@ -18,7 +24,7 @@ }, "require-dev": { "ergebnis/composer-normalize": "^2.43", - "nyholm/nsa": "^1.2.1", + "nyholm/nsa": "dev-patch-1", "nyholm/psr7": "^1.3.1", "phpcompatibility/php-compatibility": "^9.3", "phpunit/phpunit": "^9.3", From b1262299524465bbfcf67f1128320eaf19bbb3ce Mon Sep 17 00:00:00 2001 From: Aaron Bauman Date: Mon, 9 Mar 2026 14:09:00 -0400 Subject: [PATCH 6/6] Vimeo module compat --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2559633f..a205ff17 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "phpunit/phpunit": "^9.3", "squizlabs/php_codesniffer": "^3.7", "symfony/http-client": "^5.4 || ^6.3", - "vimeo/psalm": "^4.0 || ^5.25" + "vimeo/psalm": "^4.0 || ^5.25 || ^6" }, "suggest": { "nyholm/psr7": "PSR-7 message implementation",