diff --git a/.laminas-ci.json b/.laminas-ci.json index 18707e2..6238f6f 100644 --- a/.laminas-ci.json +++ b/.laminas-ci.json @@ -1,3 +1,6 @@ { + "ignore_php_platform_requirements": { + "8.4": true + }, "backwardCompatibilityCheck": true } diff --git a/composer.json b/composer.json index 51fdaaf..9be4d05 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ } }, "require": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0", "ext-json": "*", "dflydev/fig-cookies": "^3.0", "psr/container": "^1.0 || ^2.0", @@ -41,10 +41,10 @@ }, "require-dev": { "laminas/laminas-coding-standard": "~2.5.0", - "laminas/laminas-diactoros": "^3.3.0", - "phpunit/phpunit": "^10.5.10", + "laminas/laminas-diactoros": "^3.4.0", + "phpunit/phpunit": "^10.5.36", "psalm/plugin-phpunit": "^0.19.0", - "vimeo/psalm": "^5.21.1" + "vimeo/psalm": "^5.26.1" }, "suggest": { "mezzio/mezzio-csrf": "^1.0 || ^1.0-dev for CSRF protection capabilities", diff --git a/composer.lock b/composer.lock index 4e6b72a..7b6df8e 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": "2b2a37b5135b770a9ee75f14386c068e", + "content-hash": "ca12f2a34dc589747b2e031fded10ada", "packages": [ { "name": "dflydev/fig-cookies", @@ -4359,14 +4359,14 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": {}, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0", "ext-json": "*" }, - "platform-dev": {}, + "platform-dev": [], "platform-overrides": { "php": "8.1.99" }, diff --git a/phpunit.xml.dist b/phpunit.xml.dist index cdf04b9..3474ff4 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -7,10 +7,15 @@ cacheDirectory=".phpunit.cache" displayDetailsOnTestsThatTriggerErrors="true" displayDetailsOnTestsThatTriggerDeprecations="true" + displayDetailsOnPhpunitDeprecations="true" displayDetailsOnTestsThatTriggerNotices="true" displayDetailsOnTestsThatTriggerWarnings="true" displayDetailsOnIncompleteTests="true" displayDetailsOnSkippedTests="true" + failOnPhpunitDeprecation="true" + failOnWarning="true" + failOnNotice="true" + failOnDeprecation="true" > diff --git a/test/Persistence/CacheHeadersGeneratorTraitTest.php b/test/Persistence/CacheHeadersGeneratorTraitTest.php index fb7b5a0..886d30d 100644 --- a/test/Persistence/CacheHeadersGeneratorTraitTest.php +++ b/test/Persistence/CacheHeadersGeneratorTraitTest.php @@ -250,12 +250,12 @@ private static function assertEqualDateWithDelta(string $expect, string $actual, /** * @return array */ public static function provideCacheLimiterValues(): array @@ -266,44 +266,44 @@ public static function provideCacheLimiterValues(): array return [ 'empty' => [ - 'cache_expire' => $cacheExpire, - 'cache_limiter' => '', - 'expected_expires' => '', - 'expected_last_modified' => '', - 'expected_cache_control' => '', - 'expected_pragma' => '', + 'cacheExpire' => $cacheExpire, + 'cacheLimiter' => '', + 'expectedExpires' => '', + 'expectedLastModified' => '', + 'expectedCacheControl' => '', + 'expectedPragma' => '', ], 'not-valid' => [ - 'cache_expire' => $cacheExpire, - 'cache_limiter' => 'not-valid', - 'expected_expires' => '', - 'expected_last_modified' => '', - 'expected_cache_control' => '', - 'expected_pragma' => '', + 'cacheExpire' => $cacheExpire, + 'cacheLimiter' => 'not-valid', + 'expectedExpires' => '', + 'expectedLastModified' => '', + 'expectedCacheControl' => '', + 'expectedPragma' => '', ], 'nocache' => [ - 'cache_expire' => $cacheExpire, - 'cache_limiter' => 'nocache', - 'expected_expires' => Http::CACHE_PAST_DATE, - 'expected_last_modified' => '', - 'expected_cache_control' => 'no-store, no-cache, must-revalidate', - 'expected_pragma' => 'no-cache', + 'cacheExpire' => $cacheExpire, + 'cacheLimiter' => 'nocache', + 'expectedExpires' => Http::CACHE_PAST_DATE, + 'expectedLastModified' => '', + 'expectedCacheControl' => 'no-store, no-cache, must-revalidate', + 'expectedPragma' => 'no-cache', ], 'public' => [ - 'cache_expire' => $cacheExpire, - 'cache_limiter' => 'public', - 'expected_expires' => gmdate(Http::DATE_FORMAT, time() + (60 * $cacheExpire)), - 'expected_last_modified' => (string) $lastModified, - 'expected_cache_control' => 'public, max-age=' . $maxAge, - 'expected_pragma' => '', + 'cacheExpire' => $cacheExpire, + 'cacheLimiter' => 'public', + 'expectedExpires' => gmdate(Http::DATE_FORMAT, time() + (60 * $cacheExpire)), + 'expectedLastModified' => (string) $lastModified, + 'expectedCacheControl' => 'public, max-age=' . $maxAge, + 'expectedPragma' => '', ], 'private' => [ - 'cache_expire' => $cacheExpire, - 'cache_limiter' => 'private', - 'expected_expires' => Http::CACHE_PAST_DATE, - 'expected_last_modified' => (string) $lastModified, - 'expected_cache_control' => 'private, max-age=' . $maxAge, - 'expected_pragma' => '', + 'cacheExpire' => $cacheExpire, + 'cacheLimiter' => 'private', + 'expectedExpires' => Http::CACHE_PAST_DATE, + 'expectedLastModified' => (string) $lastModified, + 'expectedCacheControl' => 'private, max-age=' . $maxAge, + 'expectedPragma' => '', ], ]; }