diff --git a/.laminas-ci.json b/.laminas-ci.json index 5e85b2f..3dbd79d 100644 --- a/.laminas-ci.json +++ b/.laminas-ci.json @@ -1,5 +1,7 @@ { "ignore_php_platform_requirements": { - "8.3": false - } + "8.3": false, + "8.4": true + }, + "backwardCompatibilityCheck": true } diff --git a/composer.json b/composer.json index f031813..256d867 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ } }, "require": { - "php": "~8.1 || ~8.2 || ~8.3", + "php": "~8.1 || ~8.2 || ~8.3 || ~8.4", "ext-json": "*", "laminas/laminas-escaper": "^2.9", "php-http/discovery": "^1.18.0", @@ -48,16 +48,19 @@ "require-dev": { "ext-curl": "*", "doctrine/coding-standard": "^12.0", - "laminas/laminas-diactoros": "^3.3.0", - "php-http/cache-plugin": "^2.0.0", - "php-http/curl-client": "^2.3.1", - "php-http/mock-client": "^1.6", - "phpunit/phpunit": "^10.5.9", + "laminas/laminas-diactoros": "^3.5.0", + "php-http/cache-plugin": "^2.0.1", + "php-http/curl-client": "^2.3.3", + "php-http/mock-client": "^1.6.1", + "phpunit/phpunit": "^10.5.38", "psalm/plugin-phpunit": "^0.19.0", "roave/security-advisories": "dev-latest", - "squizlabs/php_codesniffer": "^3.8.1", - "symfony/cache": "^6.4.2 || ^7.0", - "vimeo/psalm": "^5.20.0" + "symfony/cache": "^6.4.13 || ^7.0", + "vimeo/psalm": "^5.26.1" + }, + "conflict": { + "php-http/httplug": "<2.4.1", + "php-http/promise": "<1.3.1" }, "scripts": { "check": [ diff --git a/composer.lock b/composer.lock index deea5f4..d355a8a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "49b93184a8c6cd15d371365c5cab7806", + "content-hash": "d58b804a02bc9a549fd8acc479b5f7dd", "packages": [ { "name": "laminas/laminas-escaper", @@ -1762,16 +1762,16 @@ }, { "name": "php-http/curl-client", - "version": "2.3.2", + "version": "2.3.3", "source": { "type": "git", "url": "https://github.com/php-http/curl-client.git", - "reference": "0b869922458b1cde9137374545ed4fff7ac83623" + "reference": "f3eb48d266341afec0229a7a37a03521d3646b81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/curl-client/zipball/0b869922458b1cde9137374545ed4fff7ac83623", - "reference": "0b869922458b1cde9137374545ed4fff7ac83623", + "url": "https://api.github.com/repos/php-http/curl-client/zipball/f3eb48d266341afec0229a7a37a03521d3646b81", + "reference": "f3eb48d266341afec0229a7a37a03521d3646b81", "shasum": "" }, "require": { @@ -1791,7 +1791,7 @@ }, "require-dev": { "guzzlehttp/psr7": "^2.0", - "laminas/laminas-diactoros": "^2.0", + "laminas/laminas-diactoros": "^2.0 || ^3.0", "php-http/client-integration-tests": "^3.0", "php-http/message-factory": "^1.1", "phpunit/phpunit": "^7.5 || ^9.4" @@ -1821,9 +1821,9 @@ ], "support": { "issues": "https://github.com/php-http/curl-client/issues", - "source": "https://github.com/php-http/curl-client/tree/2.3.2" + "source": "https://github.com/php-http/curl-client/tree/2.3.3" }, - "time": "2024-03-03T08:21:07+00:00" + "time": "2024-10-31T07:36:58+00:00" }, { "name": "php-http/httplug", @@ -1953,16 +1953,16 @@ }, { "name": "php-http/mock-client", - "version": "1.6.0", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/php-http/mock-client.git", - "reference": "ae5d717334ecd68199667bea6e9db07276e69a2b" + "reference": "81f558234421f7da58ed015604a03808996017d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/mock-client/zipball/ae5d717334ecd68199667bea6e9db07276e69a2b", - "reference": "ae5d717334ecd68199667bea6e9db07276e69a2b", + "url": "https://api.github.com/repos/php-http/mock-client/zipball/81f558234421f7da58ed015604a03808996017d0", + "reference": "81f558234421f7da58ed015604a03808996017d0", "shasum": "" }, "require": { @@ -2009,9 +2009,9 @@ ], "support": { "issues": "https://github.com/php-http/mock-client/issues", - "source": "https://github.com/php-http/mock-client/tree/1.6.0" + "source": "https://github.com/php-http/mock-client/tree/1.6.1" }, - "time": "2023-05-21T08:31:38+00:00" + "time": "2024-10-31T10:30:18+00:00" }, { "name": "php-http/promise", @@ -2878,12 +2878,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "f7a59dd2b8c3ed9bc58f5679d8eda9ba3ebd86fb" + "reference": "b9d92910c727387dcb8f5dac744acab5a0190866" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/f7a59dd2b8c3ed9bc58f5679d8eda9ba3ebd86fb", - "reference": "f7a59dd2b8c3ed9bc58f5679d8eda9ba3ebd86fb", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/b9d92910c727387dcb8f5dac744acab5a0190866", + "reference": "b9d92910c727387dcb8f5dac744acab5a0190866", "shasum": "" }, "conflict": { @@ -3237,7 +3237,7 @@ "mautic/core-lib": ">=1.0.0.0-beta,<4.4.13|>=5.0.0.0-alpha,<5.1.1", "mdanter/ecc": "<2", "mediawiki/cargo": "<3.6.1", - "mediawiki/core": "<1.36.2", + "mediawiki/core": "<1.39.5|==1.40", "mediawiki/matomo": "<2.4.3", "mediawiki/semantic-media-wiki": "<4.0.2", "melisplatform/melis-asset-manager": "<5.0.1", @@ -3336,7 +3336,7 @@ "phenx/php-svg-lib": "<0.5.2", "php-censor/php-censor": "<2.0.13|>=2.1,<2.1.5", "php-mod/curl": "<2.3.2", - "phpbb/phpbb": "<3.2.10|>=3.3,<3.3.1", + "phpbb/phpbb": "<3.3.11", "phpems/phpems": ">=6,<=6.1.3", "phpfastcache/phpfastcache": "<6.1.5|>=7,<7.1.2|>=8,<8.0.7", "phpmailer/phpmailer": "<6.5", @@ -3542,7 +3542,7 @@ "tobiasbg/tablepress": "<=2.0.0.0-RC1", "topthink/framework": "<6.0.17|>=6.1,<=8.0.4", "topthink/think": "<=6.1.1", - "topthink/thinkphp": "<=3.2.3", + "topthink/thinkphp": "<=3.2.3|>=6.1.3,<=8.0.4", "torrentpier/torrentpier": "<=2.4.3", "tpwd/ke_search": "<4.0.3|>=4.1,<4.6.6|>=5,<5.0.2", "tribalsystems/zenario": "<=9.7.61188", @@ -3704,7 +3704,7 @@ "type": "tidelift" } ], - "time": "2024-10-29T22:05:01+00:00" + "time": "2024-10-30T23:05:00+00:00" }, { "name": "sebastian/cli-parser", @@ -6172,7 +6172,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~8.1 || ~8.2 || ~8.3", + "php": "~8.1 || ~8.2 || ~8.3 || ~8.4", "ext-json": "*" }, "platform-dev": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index f3b45e5..03f9460 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -8,10 +8,12 @@ displayDetailsOnTestsThatTriggerDeprecations="true" displayDetailsOnTestsThatTriggerNotices="true" displayDetailsOnTestsThatTriggerErrors="true" + displayDetailsOnPhpunitDeprecations="true" beStrictAboutTestsThatDoNotTestAnything="false" failOnNotice="true" failOnDeprecation="true" failOnWarning="true" + failOnPhpunitDeprecation="true" colors="true">