From 416979299e28c4cea837fd964f5ad39a4eb35e33 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 Nov 2023 02:23:45 +0000 Subject: [PATCH 1/3] Lock file maintenance Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- composer.lock | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/composer.lock b/composer.lock index 367e96f8..127c77ad 100644 --- a/composer.lock +++ b/composer.lock @@ -5202,16 +5202,16 @@ }, { "name": "vimeo/psalm", - "version": "5.15.0", + "version": "5.16.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "5c774aca4746caf3d239d9c8cadb9f882ca29352" + "reference": "2897ba636551a8cb61601cc26f6ccfbba6c36591" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/5c774aca4746caf3d239d9c8cadb9f882ca29352", - "reference": "5c774aca4746caf3d239d9c8cadb9f882ca29352", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/2897ba636551a8cb61601cc26f6ccfbba6c36591", + "reference": "2897ba636551a8cb61601cc26f6ccfbba6c36591", "shasum": "" }, "require": { @@ -5236,8 +5236,8 @@ "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", "sebastian/diff": "^4.0 || ^5.0", "spatie/array-to-xml": "^2.17.0 || ^3.0", - "symfony/console": "^4.1.6 || ^5.0 || ^6.0", - "symfony/filesystem": "^5.4 || ^6.0" + "symfony/console": "^4.1.6 || ^5.0 || ^6.0 || ^7.0", + "symfony/filesystem": "^5.4 || ^6.0 || ^7.0" }, "conflict": { "nikic/php-parser": "4.17.0" @@ -5259,7 +5259,7 @@ "psalm/plugin-phpunit": "^0.18", "slevomat/coding-standard": "^8.4", "squizlabs/php_codesniffer": "^3.6", - "symfony/process": "^4.4 || ^5.0 || ^6.0" + "symfony/process": "^4.4 || ^5.0 || ^6.0 || ^7.0" }, "suggest": { "ext-curl": "In order to send data to shepherd", @@ -5272,7 +5272,7 @@ "psalm-refactor", "psalter" ], - "type": "library", + "type": "project", "extra": { "branch-alias": { "dev-master": "5.x-dev", @@ -5304,10 +5304,11 @@ "static analysis" ], "support": { + "docs": "https://psalm.dev/docs", "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/5.15.0" + "source": "https://github.com/vimeo/psalm" }, - "time": "2023-08-20T23:07:30+00:00" + "time": "2023-11-22T20:38:47+00:00" }, { "name": "webimpress/coding-standard", From ff7aa3c17bc6e7d111a8a1f9433e7a0a9cd7bb6c Mon Sep 17 00:00:00 2001 From: George Steel Date: Mon, 8 Jan 2024 20:35:29 +0000 Subject: [PATCH 2/3] Bump dev deps, refresh lock Signed-off-by: George Steel --- composer.json | 12 +-- composer.lock | 288 +++++++++++++++++++++++++++----------------------- 2 files changed, 163 insertions(+), 137 deletions(-) diff --git a/composer.json b/composer.json index bdad6024..ed21538c 100644 --- a/composer.json +++ b/composer.json @@ -38,16 +38,16 @@ "laminas/laminas-stdlib": "^3.18" }, "require-dev": { - "laminas/laminas-cache": "^3.10.1", + "laminas/laminas-cache": "^3.12.0", "laminas/laminas-cache-storage-adapter-memory": "^2.3", "laminas/laminas-coding-standard": "~2.5.0", "laminas/laminas-db": "^2.18.0", - "laminas/laminas-http": "^2.18", - "laminas/laminas-validator": "^2.30.1", - "mongodb/mongodb": "~1.16.0", - "phpunit/phpunit": "^9.6.13", + "laminas/laminas-http": "^2.19", + "laminas/laminas-validator": "^2.46.0", + "mongodb/mongodb": "~1.16.1", + "phpunit/phpunit": "^9.6.15", "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.15" + "vimeo/psalm": "^5.18" }, "suggest": { "laminas/laminas-cache": "Laminas\\Cache component", diff --git a/composer.lock b/composer.lock index 127c77ad..1129f3dd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "bc863c17f1a066006351f5d4bc39c80e", + "content-hash": "89b481860333ed528eb864c3bad861b4", "packages": [ { "name": "laminas/laminas-eventmanager", - "version": "3.12.0", + "version": "3.13.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-eventmanager.git", - "reference": "4a576922c00cc7838d60d004a7bd6f5a02c23b57" + "reference": "ce5ba8bde378fca5cb0cd514f01823637215b2f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/4a576922c00cc7838d60d004a7bd6f5a02c23b57", - "reference": "4a576922c00cc7838d60d004a7bd6f5a02c23b57", + "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/ce5ba8bde378fca5cb0cd514f01823637215b2f3", + "reference": "ce5ba8bde378fca5cb0cd514f01823637215b2f3", "shasum": "" }, "require": { @@ -29,12 +29,12 @@ }, "require-dev": { "laminas/laminas-coding-standard": "~2.5.0", - "laminas/laminas-stdlib": "^3.17", - "phpbench/phpbench": "^1.2.10", - "phpunit/phpunit": "^10.4.1", + "laminas/laminas-stdlib": "^3.18", + "phpbench/phpbench": "^1.2.15", + "phpunit/phpunit": "^10.5.5", "psalm/plugin-phpunit": "^0.18.4", "psr/container": "^1.1.2 || ^2.0.2", - "vimeo/psalm": "^5.11" + "vimeo/psalm": "^5.18" }, "suggest": { "laminas/laminas-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature", @@ -72,7 +72,7 @@ "type": "community_bridge" } ], - "time": "2023-10-18T16:36:45+00:00" + "time": "2024-01-03T17:43:50+00:00" }, { "name": "laminas/laminas-servicemanager", @@ -1015,16 +1015,16 @@ }, { "name": "fidry/cpu-core-counter", - "version": "0.5.1", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/theofidry/cpu-core-counter.git", - "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623" + "reference": "85193c0b0cb5c47894b5eaec906e946f054e7077" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/b58e5a3933e541dc286cc91fc4f3898bbc6f1623", - "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/85193c0b0cb5c47894b5eaec906e946f054e7077", + "reference": "85193c0b0cb5c47894b5eaec906e946f054e7077", "shasum": "" }, "require": { @@ -1032,13 +1032,13 @@ }, "require-dev": { "fidry/makefile": "^0.2.0", + "fidry/php-cs-fixer-config": "^1.1.2", "phpstan/extension-installer": "^1.2.0", "phpstan/phpstan": "^1.9.2", "phpstan/phpstan-deprecation-rules": "^1.0.0", "phpstan/phpstan-phpunit": "^1.2.2", "phpstan/phpstan-strict-rules": "^1.4.4", - "phpunit/phpunit": "^9.5.26 || ^8.5.31", - "theofidry/php-cs-fixer-config": "^1.0", + "phpunit/phpunit": "^8.5.31 || ^9.5.26", "webmozarts/strict-phpunit": "^7.5" }, "type": "library", @@ -1064,7 +1064,7 @@ ], "support": { "issues": "https://github.com/theofidry/cpu-core-counter/issues", - "source": "https://github.com/theofidry/cpu-core-counter/tree/0.5.1" + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.0.0" }, "funding": [ { @@ -1072,7 +1072,7 @@ "type": "github" } ], - "time": "2022-12-24T12:35:10+00:00" + "time": "2023-09-17T21:38:23+00:00" }, { "name": "jean85/pretty-package-versions", @@ -1671,16 +1671,16 @@ }, { "name": "laminas/laminas-validator", - "version": "2.43.0", + "version": "2.46.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-validator.git", - "reference": "8f6c2f5753dec64df924a86d18036113f3140f2b" + "reference": "98330256f8d8a1357a93f6f7f1a987036aff6329" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/8f6c2f5753dec64df924a86d18036113f3140f2b", - "reference": "8f6c2f5753dec64df924a86d18036113f3140f2b", + "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/98330256f8d8a1357a93f6f7f1a987036aff6329", + "reference": "98330256f8d8a1357a93f6f7f1a987036aff6329", "shasum": "" }, "require": { @@ -1695,15 +1695,15 @@ "require-dev": { "laminas/laminas-coding-standard": "^2.5", "laminas/laminas-db": "^2.18", - "laminas/laminas-filter": "^2.32", - "laminas/laminas-i18n": "^2.23", - "laminas/laminas-session": "^2.16", - "laminas/laminas-uri": "^2.10.0", - "phpunit/phpunit": "^10.3.3", + "laminas/laminas-filter": "^2.33", + "laminas/laminas-i18n": "^2.24.1", + "laminas/laminas-session": "^2.17", + "laminas/laminas-uri": "^2.11.0", + "phpunit/phpunit": "^10.5.2", "psalm/plugin-phpunit": "^0.18.4", - "psr/http-client": "^1.0.2", + "psr/http-client": "^1.0.3", "psr/http-factory": "^1.0.2", - "vimeo/psalm": "^5.15" + "vimeo/psalm": "^5.17" }, "suggest": { "laminas/laminas-db": "Laminas\\Db component, required by the (No)RecordExists validator", @@ -1751,7 +1751,7 @@ "type": "community_bridge" } ], - "time": "2023-11-20T01:23:15+00:00" + "time": "2024-01-03T12:43:04+00:00" }, { "name": "mongodb/mongodb", @@ -1938,16 +1938,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.17.1", + "version": "v4.18.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", "shasum": "" }, "require": { @@ -1988,9 +1988,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" }, - "time": "2023-08-13T19:53:39+00:00" + "time": "2023-12-10T21:03:43+00:00" }, { "name": "phar-io/manifest", @@ -2314,23 +2314,23 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.29", + "version": "9.2.30", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76" + "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76", - "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca2bd87d2f9215904682a9cb9bb37dda98e76089", + "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -2380,7 +2380,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.30" }, "funding": [ { @@ -2388,7 +2388,7 @@ "type": "github" } ], - "time": "2023-09-19T04:57:46+00:00" + "time": "2023-12-22T06:47:57+00:00" }, { "name": "phpunit/php-file-iterator", @@ -2633,16 +2633,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.13", + "version": "9.6.15", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be" + "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f3d767f7f9e191eab4189abe41ab37797e30b1be", - "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/05017b80304e0eb3f31d90194a563fd53a6021f1", + "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1", "shasum": "" }, "require": { @@ -2716,7 +2716,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.13" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.15" }, "funding": [ { @@ -2732,7 +2732,7 @@ "type": "tidelift" } ], - "time": "2023-09-19T05:39:22+00:00" + "time": "2023-12-01T16:55:19+00:00" }, { "name": "psalm/plugin-phpunit", @@ -3288,20 +3288,20 @@ }, { "name": "sebastian/complexity", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88" + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a", "shasum": "" }, "require": { - "nikic/php-parser": "^4.7", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3" }, "require-dev": { @@ -3333,7 +3333,7 @@ "homepage": "https://github.com/sebastianbergmann/complexity", "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", - "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2" + "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3" }, "funding": [ { @@ -3341,7 +3341,7 @@ "type": "github" } ], - "time": "2020-10-26T15:52:27+00:00" + "time": "2023-12-22T06:19:30+00:00" }, { "name": "sebastian/diff", @@ -3615,20 +3615,20 @@ }, { "name": "sebastian/lines-of-code", - "version": "1.0.3", + "version": "1.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc" + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5", "shasum": "" }, "require": { - "nikic/php-parser": "^4.6", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3" }, "require-dev": { @@ -3660,7 +3660,7 @@ "homepage": "https://github.com/sebastianbergmann/lines-of-code", "support": { "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3" + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4" }, "funding": [ { @@ -3668,7 +3668,7 @@ "type": "github" } ], - "time": "2020-11-28T06:42:11+00:00" + "time": "2023-12-22T06:20:34+00:00" }, { "name": "sebastian/object-enumerator", @@ -4135,16 +4135,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.7.2", + "version": "3.8.0", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879" + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", + "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879", - "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5805f7a4e4958dbb5e944ef1e6edae0a303765e7", + "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7", "shasum": "" }, "require": { @@ -4154,7 +4154,7 @@ "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" }, "bin": [ "bin/phpcs", @@ -4173,35 +4173,58 @@ "authors": [ { "name": "Greg Sherwood", - "role": "lead" + "role": "Former lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "Current lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" } ], "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", "keywords": [ "phpcs", "standards", "static analysis" ], "support": { - "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", - "source": "https://github.com/squizlabs/PHP_CodeSniffer", - "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" + "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues", + "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy", + "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki" }, - "time": "2023-02-22T23:07:41+00:00" + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2023-12-08T12:32:31+00:00" }, { "name": "symfony/console", - "version": "v6.3.8", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92" + "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/0d14a9f6d04d4ac38a8cea1171f4554e325dae92", - "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92", + "url": "https://api.github.com/repos/symfony/console/zipball/0254811a143e6bc6c8deea08b589a7e68a37f625", + "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625", "shasum": "" }, "require": { @@ -4209,7 +4232,7 @@ "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0", "symfony/service-contracts": "^2.5|^3", - "symfony/string": "^5.4|^6.0" + "symfony/string": "^5.4|^6.0|^7.0" }, "conflict": { "symfony/dependency-injection": "<5.4", @@ -4223,12 +4246,16 @@ }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/event-dispatcher": "^5.4|^6.0", - "symfony/lock": "^5.4|^6.0", - "symfony/process": "^5.4|^6.0", - "symfony/var-dumper": "^5.4|^6.0" + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/lock": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -4262,7 +4289,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.3.8" + "source": "https://github.com/symfony/console/tree/v6.4.2" }, "funding": [ { @@ -4278,7 +4305,7 @@ "type": "tidelift" } ], - "time": "2023-10-31T08:09:35+00:00" + "time": "2023-12-10T16:15:48+00:00" }, { "name": "symfony/deprecation-contracts", @@ -4349,16 +4376,16 @@ }, { "name": "symfony/filesystem", - "version": "v6.3.1", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae" + "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/edd36776956f2a6fcf577edb5b05eb0e3bdc52ae", - "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/952a8cb588c3bc6ce76f6023000fb932f16a6e59", + "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59", "shasum": "" }, "require": { @@ -4392,7 +4419,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.3.1" + "source": "https://github.com/symfony/filesystem/tree/v6.4.0" }, "funding": [ { @@ -4408,7 +4435,7 @@ "type": "tidelift" } ], - "time": "2023-06-01T08:30:39+00:00" + "time": "2023-07-26T17:27:13+00:00" }, { "name": "symfony/polyfill-ctype", @@ -4983,33 +5010,29 @@ }, { "name": "symfony/service-contracts", - "version": "v2.5.2", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0", + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0", "shasum": "" }, "require": { - "php": ">=7.2.5", - "psr/container": "^1.1", - "symfony/deprecation-contracts": "^2.1|^3" + "php": ">=8.1", + "psr/container": "^1.1|^2.0" }, "conflict": { "ext-psr": "<1.1|>=2" }, - "suggest": { - "symfony/service-implementation": "" - }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -5019,7 +5042,10 @@ "autoload": { "psr-4": { "Symfony\\Contracts\\Service\\": "" - } + }, + "exclude-from-classmap": [ + "/Test/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5046,7 +5072,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/service-contracts/tree/v3.4.1" }, "funding": [ { @@ -5062,20 +5088,20 @@ "type": "tidelift" } ], - "time": "2022-05-30T19:17:29+00:00" + "time": "2023-12-26T14:02:43+00:00" }, { "name": "symfony/string", - "version": "v6.3.8", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "13880a87790c76ef994c91e87efb96134522577a" + "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/13880a87790c76ef994c91e87efb96134522577a", - "reference": "13880a87790c76ef994c91e87efb96134522577a", + "url": "https://api.github.com/repos/symfony/string/zipball/7cb80bc10bfcdf6b5492741c0b9357dac66940bc", + "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc", "shasum": "" }, "require": { @@ -5089,11 +5115,11 @@ "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/error-handler": "^5.4|^6.0", - "symfony/http-client": "^5.4|^6.0", - "symfony/intl": "^6.2", + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/intl": "^6.2|^7.0", "symfony/translation-contracts": "^2.5|^3.0", - "symfony/var-exporter": "^5.4|^6.0" + "symfony/var-exporter": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -5132,7 +5158,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.3.8" + "source": "https://github.com/symfony/string/tree/v6.4.2" }, "funding": [ { @@ -5148,7 +5174,7 @@ "type": "tidelift" } ], - "time": "2023-11-09T08:28:21+00:00" + "time": "2023-12-10T16:15:48+00:00" }, { "name": "theseer/tokenizer", @@ -5202,16 +5228,16 @@ }, { "name": "vimeo/psalm", - "version": "5.16.0", + "version": "5.18.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "2897ba636551a8cb61601cc26f6ccfbba6c36591" + "reference": "b113f3ed0259fd6e212d87c3df80eec95a6abf19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/2897ba636551a8cb61601cc26f6ccfbba6c36591", - "reference": "2897ba636551a8cb61601cc26f6ccfbba6c36591", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/b113f3ed0259fd6e212d87c3df80eec95a6abf19", + "reference": "b113f3ed0259fd6e212d87c3df80eec95a6abf19", "shasum": "" }, "require": { @@ -5230,7 +5256,7 @@ "ext-tokenizer": "*", "felixfbecker/advanced-json-rpc": "^3.1", "felixfbecker/language-server-protocol": "^1.5.2", - "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1", + "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1 || ^1.0.0", "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", "nikic/php-parser": "^4.16", "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", @@ -5308,20 +5334,20 @@ "issues": "https://github.com/vimeo/psalm/issues", "source": "https://github.com/vimeo/psalm" }, - "time": "2023-11-22T20:38:47+00:00" + "time": "2023-12-16T09:37:35+00:00" }, { "name": "webimpress/coding-standard", - "version": "1.3.1", + "version": "1.3.2", "source": { "type": "git", "url": "https://github.com/webimpress/coding-standard.git", - "reference": "b26557e2386711ecb74f22718f4b4bde5ddbc899" + "reference": "710f71ac95d36d931e76b47132b599c39abfab11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webimpress/coding-standard/zipball/b26557e2386711ecb74f22718f4b4bde5ddbc899", - "reference": "b26557e2386711ecb74f22718f4b4bde5ddbc899", + "url": "https://api.github.com/repos/webimpress/coding-standard/zipball/710f71ac95d36d931e76b47132b599c39abfab11", + "reference": "710f71ac95d36d931e76b47132b599c39abfab11", "shasum": "" }, "require": { @@ -5329,7 +5355,7 @@ "squizlabs/php_codesniffer": "^3.7.2" }, "require-dev": { - "phpunit/phpunit": "^9.6.4" + "phpunit/phpunit": "^9.6.15" }, "type": "phpcodesniffer-standard", "extra": { @@ -5355,7 +5381,7 @@ ], "support": { "issues": "https://github.com/webimpress/coding-standard/issues", - "source": "https://github.com/webimpress/coding-standard/tree/1.3.1" + "source": "https://github.com/webimpress/coding-standard/tree/1.3.2" }, "funding": [ { @@ -5363,7 +5389,7 @@ "type": "github" } ], - "time": "2023-03-09T15:05:18+00:00" + "time": "2023-12-18T07:25:41+00:00" }, { "name": "webmozart/assert", From 136c24eca27917b79d6feb2563a1a72c3d8e8264 Mon Sep 17 00:00:00 2001 From: George Steel Date: Mon, 8 Jan 2024 20:35:55 +0000 Subject: [PATCH 3/3] Fix a range of minor psalm issues Signed-off-by: George Steel --- psalm-baseline.xml | 354 ++++++++---------- src/AbstractContainer.php | 12 +- src/SaveHandler/Cache.php | 6 +- src/SaveHandler/DbTableGateway.php | 6 +- src/SaveHandler/MongoDB.php | 4 +- src/Storage/AbstractSessionArrayStorage.php | 8 +- src/Storage/ArrayStorage.php | 19 +- test/SessionManagerTest.php | 4 +- test/TestAsset/TestSaveHandler.php | 7 +- .../TestSaveHandlerWithValidator.php | 7 +- 10 files changed, 185 insertions(+), 242 deletions(-) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 62c3bc7e..94967fc3 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + $this $this + + getIterator + offsetExists + offsetGet + offsetSet + offsetUnset + $container - $metadata['EXPIRE_HOPS_KEYS'] - $metadata['EXPIRE_KEYS'] + + $value $value - $metadata['EXPIRE_HOPS']['hops'] - $metadata['EXPIRE_HOPS']['ts'] - $metadata['EXPIRE_HOPS_KEYS'][$key] - $metadata['EXPIRE_HOPS_KEYS'][$key] - $metadata['EXPIRE_HOPS_KEYS'][$key]['hops'] - $metadata['EXPIRE_HOPS_KEYS'][$key]['hops'] - $metadata['EXPIRE_HOPS_KEYS'][$key]['ts'] - $metadata['EXPIRE_HOPS_KEYS'][$key]['ts'] - $metadata['EXPIRE_KEYS'][$key] - $metadata['EXPIRE_KEYS'][$key] + + + + + + + + + + $storage[$name][$key] $storage[$name][$key] $storage[$name][$key] @@ -44,36 +51,36 @@ $storage[$name][$key] - $metadata['EXPIRE_HOPS']['hops'] - $metadata['EXPIRE_HOPS']['ts'] - $metadata['EXPIRE_HOPS_KEYS'][$key] - $metadata['EXPIRE_HOPS_KEYS'][$key] - $metadata['EXPIRE_HOPS_KEYS'][$key] - $metadata['EXPIRE_HOPS_KEYS'][$key] - $metadata['EXPIRE_HOPS_KEYS'][$key]['hops'] - $metadata['EXPIRE_HOPS_KEYS'][$key]['hops'] - $metadata['EXPIRE_HOPS_KEYS'][$key]['ts'] - $metadata['EXPIRE_HOPS_KEYS'][$key]['ts'] + + + + + + + + + + $container $container $metadata $metadata - $metadata['EXPIRE_HOPS']['hops'] - $metadata['EXPIRE_HOPS_KEYS'][$key]['hops'] - $metadata['EXPIRE_HOPS_KEYS'][$key]['hops'] + + + $old - $storage[$name][$key] + $storage[$name][$offset] exchangeArray getArrayCopy - $metadata['EXPIRE_HOPS']['hops'] - $metadata['EXPIRE_HOPS_KEYS'][$key]['hops'] - $metadata['EXPIRE_HOPS_KEYS'][$key]['hops'] + + + getArrayCopy() : $container]]> @@ -93,6 +100,7 @@ $input + $offset $key @@ -116,9 +124,9 @@ $storage - $_SERVER['REQUEST_TIME'] - $_SERVER['REQUEST_TIME'] - $_SERVER['REQUEST_TIME'] + + + $manager @@ -141,9 +149,6 @@ $ts]]> ['hops' => $hops, 'ts' => $ts]]]> - - offsetSet - @@ -168,15 +173,12 @@ SessionConfig - [$this, 'handleError'] - [$this, 'handleError'] + + SessionConfig - - $hashBitsPerCharacter - $serializeHandler $validHashFunctions @@ -358,10 +360,10 @@ useCookies]]> - str_replace('_', ' ', $key) + - str_replace('_', ' ', $key) + (bool) $cookieHttpOnly @@ -390,15 +392,15 @@ + + offsetGet + $storage[$name][$key] Container - - offsetGet - @@ -417,7 +419,7 @@ true - ini_get('session.gc_maxlifetime') + tableGateway->delete( @@ -515,9 +517,6 @@ - - MongoDBOptions - saveOptions === ['w' => 1]]]> saveOptions === ['w' => 1]]]> @@ -533,6 +532,9 @@ setUseExpireAfterSecondsIndex + + MongoDBOptions + $options @@ -591,8 +593,8 @@ $config - $config['config_class'] - $config['config_class'] + + $config @@ -673,7 +675,7 @@ $oldSessionData - $_SERVER['REQUEST_TIME'] + $name @@ -694,10 +696,6 @@ - - serialize - unserialize - $_SESSION $this @@ -716,25 +714,29 @@ $_SESSION + + serialize + unserialize + - $_SESSION['__Laminas'] - $_SESSION['__Laminas'][$key] + + $locks $locks $locks - $_SESSION['__Laminas'][$key] + $_SESSION[$key] $_SESSION[$key] - $_SESSION[$key] - $_SESSION[$key] + $_SESSION[$offset] + $_SESSION[$offset] - $_SESSION[$key] - $_SESSION['__Laminas'][$key] + $_SESSION[$offset] + $locks $locks $readOnly @@ -770,52 +772,48 @@ $key $key $key - '__Laminas' - '__Laminas' - '__Laminas' - '__Laminas' - '__Laminas' - '__Laminas' - '__Laminas' - '__Laminas' - '__Laminas' - '__Laminas' - '__Laminas' - '__Laminas' + + + + + + + + + + + + - $key - $key - $key - $key $locks $locks $locks - $this['__Laminas'] - $this['__Laminas'][$key] + + $value - $this['__Laminas'] - $this['__Laminas'] + + $array[$key] - $this['__Laminas'][$key] - $this['__Laminas'][$key] + + - $this['__Laminas'][$key] - $this['__Laminas'][$key] - $this['__Laminas'][$key] + + + $array $locks $locks $readOnly - $this['__Laminas'] - $this['__Laminas'][$key] + + bool @@ -827,15 +825,16 @@ $metaData + $offset $key - $this['__Laminas'] + - $this['__Laminas'][$key] + ArrayStorage @@ -859,7 +858,7 @@ new $type($options) - $options['iterator_class'] + $flags @@ -885,9 +884,9 @@ - '_IMMUTABLE' - '_IMMUTABLE' - '_IMMUTABLE' + + + SessionStorage @@ -962,23 +961,23 @@ - new TestContainer('Default', $manager) + - 'InvalidArgumentException' + $handler $saveHandler - 'foobar_bogus' - 'foobar_bogus' - 'foobar_bogus' - 'foobar_bogus' - 'foobar_bogus' - 'foobar_bogus' - 'foobar_bogus' + + + + + + + 24 24 @@ -1046,14 +1045,14 @@ setHashFunction - 'foobar_bogus' - 'foobar_bogus' - 'foobar_bogus' - 'foobar_bogus' - 'foobar_bogus' - 'foobar_bogus' - 'foobar_bogus' - 'foobar_bogus' + + + + + + + + 24 24 @@ -1070,9 +1069,9 @@ $aliases[SessionManager::class] - $config['abstract_factories'] - $config['aliases'] - $config['factories'] + + + $config[LegacyConfigInterface::class] $config[LegacyManagerInterface::class] $config[LegacySessionManager::class] @@ -1112,28 +1111,28 @@ $metadata $metadata $metadata - $metadata['EXPIRE_HOPS_KEYS'] - $metadata['EXPIRE_KEYS'] + + - $metadata['EXPIRE'] - $metadata['EXPIRE'] - $metadata['EXPIRE_HOPS'] - $metadata['EXPIRE_HOPS_KEYS'] - $metadata['EXPIRE_HOPS_KEYS'] - $metadata['EXPIRE_HOPS_KEYS'] - $metadata['EXPIRE_HOPS_KEYS']['foo'] - $metadata['EXPIRE_KEYS'] - $metadata['EXPIRE_KEYS'] - $metadata['EXPIRE_KEYS'] - $metadata['EXPIRE_KEYS'] - $metadata['EXPIRE_KEYS'] - $metadata['EXPIRE_KEYS']['bat'] - $metadata['EXPIRE_KEYS']['baz'] - $metadata['EXPIRE_KEYS']['foo'] - $metadata['EXPIRE_KEYS']['foo'] - $storage['Default']['foo'] - $storage['foo']['baz'] + + + + + + + + + + + + + + + + + + container['foo']['bar']]]> @@ -1152,13 +1151,13 @@ manager->started]]> - $_SERVER['REQUEST_TIME'] - $_SERVER['REQUEST_TIME'] - $_SERVER['REQUEST_TIME'] - $_SERVER['REQUEST_TIME'] - $_SERVER['REQUEST_TIME'] - $_SERVER['REQUEST_TIME'] - $_SERVER['REQUEST_TIME'] + + + + + + + assertIsArray @@ -1215,7 +1214,6 @@ count - 0 123 123 123 @@ -1224,7 +1222,7 @@ 456 - getenv('TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MONGODB_CONNECTION_STRING') + mongoCollection]]> @@ -1297,8 +1295,8 @@ - $config['session_storage']['options'] - $config['session_storage']['options']['input'] + + $storage @@ -1318,14 +1316,14 @@ $_SESSION - $_SESSION['test']['foo'] + storage['foo']['bar']]]> storage['foo']['bar']]]> storage['foo']['bar']]]> storage['foo']['bar']['baz']]]> - $_SESSION['foo']['bar'] + storage['bar'][]]]> storage['baz']['foo']]]> @@ -1340,16 +1338,12 @@ error]]> 1 - 1 - [$this, 'handleErrors'] + $_SESSION - $_SESSION - $compare - $compare + 10 $header $header $header @@ -1358,28 +1352,14 @@ $header $header $header - $sName - $sName - $sName - $sName - $sName - $sName $value $_SESSION[$key] $_SESSION[$key] - $_SESSION['__Laminas']['_VALID'] + - $compare - $config - $config - $config - $config - $config - $config - $cookieTs $header $header $header @@ -1387,36 +1367,23 @@ $header $header $metaData - $sName - $sName - $sName - $sName - $sName - $sName - $ts - $ts - $ttl $value $value - - $compare - $ttl - key1]]> key2]]> $_SESSION + $_SESSION var_export($headers, 1) - var_export($headers, 1) - $_SERVER['REQUEST_TIME'] - $_SERVER['REQUEST_TIME'] + + $header @@ -1476,8 +1443,8 @@ - read destroy + read $id @@ -1523,7 +1490,6 @@ void void - void @@ -1532,19 +1498,7 @@ bool - string - - string - - - string - - - - - $bitsPerCharacter - diff --git a/src/AbstractContainer.php b/src/AbstractContainer.php index d2d333f5..4b394552 100644 --- a/src/AbstractContainer.php +++ b/src/AbstractContainer.php @@ -392,16 +392,16 @@ protected function expireByHops(Storage $storage, $name, $key) /** * Store a value within the container * - * @param string $key + * @param string $offset * @param mixed $value * @return void */ - public function offsetSet($key, $value) + public function offsetSet($offset, $value) { - $this->expireKeys($key); - $storage = $this->verifyNamespace(); - $name = $this->getName(); - $storage[$name][$key] = $value; + $this->expireKeys($offset); + $storage = $this->verifyNamespace(); + $name = $this->getName(); + $storage[$name][$offset] = $value; } /** diff --git a/src/SaveHandler/Cache.php b/src/SaveHandler/Cache.php index b8b02085..69668e22 100644 --- a/src/SaveHandler/Cache.php +++ b/src/SaveHandler/Cache.php @@ -45,15 +45,15 @@ public function __construct(CacheStorage $cacheStorage) /** * Open Session * - * @param string $savePath + * @param string $path * @param string $name * @return bool */ #[ReturnTypeWillChange] - public function open($savePath, $name) + public function open($path, $name) { // @todo figure out if we want to use these - $this->sessionSavePath = $savePath; + $this->sessionSavePath = $path; $this->sessionName = $name; return true; diff --git a/src/SaveHandler/DbTableGateway.php b/src/SaveHandler/DbTableGateway.php index b548c9c7..de859916 100644 --- a/src/SaveHandler/DbTableGateway.php +++ b/src/SaveHandler/DbTableGateway.php @@ -55,14 +55,14 @@ public function __construct( /** * Open Session * - * @param string $savePath + * @param string $path * @param string $name * @return bool */ #[ReturnTypeWillChange] - public function open($savePath, $name) + public function open($path, $name) { - $this->sessionSavePath = $savePath; + $this->sessionSavePath = $path; $this->sessionName = $name; $this->lifetime = ini_get('session.gc_maxlifetime'); diff --git a/src/SaveHandler/MongoDB.php b/src/SaveHandler/MongoDB.php index 9ced59c3..a8fecb11 100644 --- a/src/SaveHandler/MongoDB.php +++ b/src/SaveHandler/MongoDB.php @@ -71,12 +71,12 @@ public function __construct(protected $mongoClient, MongoDBOptions $options) /** * Open session * - * @param string $savePath + * @param string $path * @param string $name * @return bool */ #[ReturnTypeWillChange] - public function open($savePath, $name) + public function open($path, $name) { // Note: session save path is not used $this->sessionName = $name; diff --git a/src/Storage/AbstractSessionArrayStorage.php b/src/Storage/AbstractSessionArrayStorage.php index 58f61759..7686f9a7 100644 --- a/src/Storage/AbstractSessionArrayStorage.php +++ b/src/Storage/AbstractSessionArrayStorage.php @@ -150,9 +150,9 @@ public function offsetGet(mixed $key) * @return void */ #[ReturnTypeWillChange] - public function offsetSet(mixed $key, mixed $value) + public function offsetSet(mixed $offset, mixed $value) { - $_SESSION[$key] = $value; + $_SESSION[$offset] = $value; } /** @@ -161,9 +161,9 @@ public function offsetSet(mixed $key, mixed $value) * @return void */ #[ReturnTypeWillChange] - public function offsetUnset(mixed $key) + public function offsetUnset(mixed $offset) { - unset($_SESSION[$key]); + unset($_SESSION[$offset]); } /** diff --git a/src/Storage/ArrayStorage.php b/src/Storage/ArrayStorage.php index e9f80cf8..bdf2548f 100644 --- a/src/Storage/ArrayStorage.php +++ b/src/Storage/ArrayStorage.php @@ -85,31 +85,26 @@ public function getRequestAccessTime() * If the object is marked as isImmutable, or the object or key is marked as * locked, raises an exception. * - * @param string $key - * @param mixed $value + * @param array-key $offset + * @param mixed $value * @return void - */ - - /** - * @param mixed $key - * @param mixed $value * @throws Exception\RuntimeException */ #[ReturnTypeWillChange] - public function offsetSet($key, $value) + public function offsetSet($offset, $value) { if ($this->isImmutable()) { throw new Exception\RuntimeException( - sprintf('Cannot set key "%s" as storage is marked isImmutable', $key) + sprintf('Cannot set key "%s" as storage is marked isImmutable', $offset) ); } - if ($this->isLocked($key)) { + if ($this->isLocked($offset)) { throw new Exception\RuntimeException( - sprintf('Cannot set key "%s" due to locking', $key) + sprintf('Cannot set key "%s" due to locking', $offset) ); } - parent::offsetSet($key, $value); + parent::offsetSet($offset, $value); } /** diff --git a/test/SessionManagerTest.php b/test/SessionManagerTest.php index e550a4f7..4efe94b2 100644 --- a/test/SessionManagerTest.php +++ b/test/SessionManagerTest.php @@ -621,6 +621,7 @@ public function testRememberMeShouldSendNewSessionCookieWithUpdatedTimestamp(): self::assertTrue($found, 'No session cookie found: ' . var_export($headers, true)); + self::assertIsString($cookie); $ts = $this->getTimestampFromCookie($cookie); if (! $ts) { self::fail('Cookie did not contain expiry? ' . var_export($headers, true)); @@ -629,7 +630,7 @@ public function testRememberMeShouldSendNewSessionCookieWithUpdatedTimestamp(): self::assertGreaterThan( $_SERVER['REQUEST_TIME'], $ts->getTimestamp(), - 'Session cookie: ' . var_export($headers, 1) + 'Session cookie: ' . var_export($headers, true) ); } @@ -663,6 +664,7 @@ public function testRememberMeShouldSetTimestampBasedOnConfigurationByDefault(): } self::assertTrue($found, 'No session cookie found: ' . var_export($headers, true)); + self::assertIsString($cookie); $ts = $this->getTimestampFromCookie($cookie); if (! $ts) { diff --git a/test/TestAsset/TestSaveHandler.php b/test/TestAsset/TestSaveHandler.php index fee0c593..32bb1116 100644 --- a/test/TestAsset/TestSaveHandler.php +++ b/test/TestAsset/TestSaveHandler.php @@ -12,13 +12,10 @@ */ class TestSaveHandler implements SaveHandler { - /** - * @param string $savePath - * @param string $name - */ #[ReturnTypeWillChange] - public function open($savePath, $name): void + public function open(string $path, string $name): bool { + return true; } public function close(): bool diff --git a/test/TestAsset/TestSaveHandlerWithValidator.php b/test/TestAsset/TestSaveHandlerWithValidator.php index 1eb20c3f..880b33d3 100644 --- a/test/TestAsset/TestSaveHandlerWithValidator.php +++ b/test/TestAsset/TestSaveHandlerWithValidator.php @@ -12,12 +12,7 @@ */ class TestSaveHandlerWithValidator implements SaveHandler { - /** - * @param string $savePath - * @param string $name - * @return string - */ - public function open($savePath, $name): bool + public function open(string $path, string $name): bool { return true; }