From 710387f48b7115001932f6a0b4192b6b58794374 Mon Sep 17 00:00:00 2001 From: Rajesh Kumar Date: Tue, 10 Oct 2023 18:34:40 +0530 Subject: [PATCH 1/8] PHP 8.3 support added --- .laminas-ci.json | 2 +- composer.json | 2 +- composer.lock | 365 ++++++++++++++++++++++++----------------------- 3 files changed, 188 insertions(+), 181 deletions(-) diff --git a/.laminas-ci.json b/.laminas-ci.json index 96c36dfb..91c32b7f 100644 --- a/.laminas-ci.json +++ b/.laminas-ci.json @@ -5,6 +5,6 @@ "pgsql" ], "ignore_php_platform_requirements": { - "8.2": true + "8.3": true } } diff --git a/composer.json b/composer.json index 4eb23c15..0bb21f09 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ } }, "require": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0", + "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", "laminas/laminas-eventmanager": "^3.5", "laminas/laminas-servicemanager": "^3.15.1", "laminas/laminas-stdlib": "^3.10.1" diff --git a/composer.lock b/composer.lock index 7acb43d3..b1d71a5d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,24 +4,24 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3103c8857acc924b269af0f64f326254", + "content-hash": "7e1cf0edfb82414f562165460f40f7b7", "packages": [ { "name": "laminas/laminas-eventmanager", - "version": "3.10.0", + "version": "3.11.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-eventmanager.git", - "reference": "5a5114ab2d3fa4424faa46a2fb0a4e49a61f6eba" + "reference": "9cfa79ce247c567f05ce4b7c975c6bdf9698c5dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/5a5114ab2d3fa4424faa46a2fb0a4e49a61f6eba", - "reference": "5a5114ab2d3fa4424faa46a2fb0a4e49a61f6eba", + "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/9cfa79ce247c567f05ce4b7c975c6bdf9698c5dd", + "reference": "9cfa79ce247c567f05ce4b7c975c6bdf9698c5dd", "shasum": "" }, "require": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "container-interop/container-interop": "<1.2", @@ -72,7 +72,7 @@ "type": "community_bridge" } ], - "time": "2023-01-11T19:52:45+00:00" + "time": "2023-10-10T08:29:58+00:00" }, { "name": "laminas/laminas-servicemanager", @@ -585,16 +585,16 @@ }, { "name": "composer/semver", - "version": "3.3.2", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9" + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9", + "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", "shasum": "" }, "require": { @@ -644,9 +644,9 @@ "versioning" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.3.2" + "source": "https://github.com/composer/semver/tree/3.4.0" }, "funding": [ { @@ -662,7 +662,7 @@ "type": "tidelift" } ], - "time": "2022-04-01T19:23:25+00:00" + "time": "2023-08-31T09:50:34+00:00" }, { "name": "composer/xdebug-handler", @@ -1015,16 +1015,16 @@ }, { "name": "fidry/cpu-core-counter", - "version": "0.4.1", + "version": "0.5.1", "source": { "type": "git", "url": "https://github.com/theofidry/cpu-core-counter.git", - "reference": "79261cc280aded96d098e1b0e0ba0c4881b432c2" + "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/79261cc280aded96d098e1b0e0ba0c4881b432c2", - "reference": "79261cc280aded96d098e1b0e0ba0c4881b432c2", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/b58e5a3933e541dc286cc91fc4f3898bbc6f1623", + "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623", "shasum": "" }, "require": { @@ -1064,7 +1064,7 @@ ], "support": { "issues": "https://github.com/theofidry/cpu-core-counter/issues", - "source": "https://github.com/theofidry/cpu-core-counter/tree/0.4.1" + "source": "https://github.com/theofidry/cpu-core-counter/tree/0.5.1" }, "funding": [ { @@ -1072,7 +1072,7 @@ "type": "github" } ], - "time": "2022-12-16T22:01:02+00:00" + "time": "2022-12-24T12:35:10+00:00" }, { "name": "jean85/pretty-package-versions", @@ -1135,16 +1135,16 @@ }, { "name": "laminas/laminas-cache", - "version": "3.10.0", + "version": "3.10.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-cache.git", - "reference": "5807c51b92fd256bbf58eda6df4c1d27148bbfb8" + "reference": "7bda6c5b500b916cbb03d0504069865d31b3efa5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-cache/zipball/5807c51b92fd256bbf58eda6df4c1d27148bbfb8", - "reference": "5807c51b92fd256bbf58eda6df4c1d27148bbfb8", + "url": "https://api.github.com/repos/laminas/laminas-cache/zipball/7bda6c5b500b916cbb03d0504069865d31b3efa5", + "reference": "7bda6c5b500b916cbb03d0504069865d31b3efa5", "shasum": "" }, "require": { @@ -1231,7 +1231,7 @@ "type": "community_bridge" } ], - "time": "2023-01-10T14:17:43+00:00" + "time": "2023-03-31T18:59:17+00:00" }, { "name": "laminas/laminas-cache-storage-adapter-memory", @@ -1358,16 +1358,16 @@ }, { "name": "laminas/laminas-db", - "version": "2.17.0", + "version": "2.18.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-db.git", - "reference": "9020ba27ffa4966c03cac743144bfd6716fdab60" + "reference": "4df7a3f7ffe268e8683306fcec125c269408b295" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-db/zipball/9020ba27ffa4966c03cac743144bfd6716fdab60", - "reference": "9020ba27ffa4966c03cac743144bfd6716fdab60", + "url": "https://api.github.com/repos/laminas/laminas-db/zipball/4df7a3f7ffe268e8683306fcec125c269408b295", + "reference": "4df7a3f7ffe268e8683306fcec125c269408b295", "shasum": "" }, "require": { @@ -1425,7 +1425,7 @@ "type": "community_bridge" } ], - "time": "2023-01-31T12:09:24+00:00" + "time": "2023-05-05T16:22:28+00:00" }, { "name": "laminas/laminas-escaper", @@ -1824,16 +1824,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.11.0", + "version": "1.11.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614" + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", "shasum": "" }, "require": { @@ -1871,7 +1871,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" }, "funding": [ { @@ -1879,20 +1879,20 @@ "type": "tidelift" } ], - "time": "2022-03-03T13:19:32+00:00" + "time": "2023-03-08T13:26:56+00:00" }, { "name": "netresearch/jsonmapper", - "version": "v4.1.0", + "version": "v4.2.0", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f" + "reference": "f60565f8c0566a31acf06884cdaa591867ecc956" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/cfa81ea1d35294d64adb9c68aa4cb9e92400e53f", - "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/f60565f8c0566a31acf06884cdaa591867ecc956", + "reference": "f60565f8c0566a31acf06884cdaa591867ecc956", "shasum": "" }, "require": { @@ -1928,22 +1928,22 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.1.0" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.2.0" }, - "time": "2022-12-08T20:46:14+00:00" + "time": "2023-04-09T17:37:40+00:00" }, { "name": "nikic/php-parser", - "version": "v4.15.3", + "version": "v4.17.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039" + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039", - "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", "shasum": "" }, "require": { @@ -1984,9 +1984,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" }, - "time": "2023-01-16T22:05:37+00:00" + "time": "2023-08-13T19:53:39+00:00" }, { "name": "phar-io/manifest", @@ -2310,23 +2310,23 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.24", + "version": "9.2.29", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "2cf940ebc6355a9d430462811b5aaa308b174bed" + "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2cf940ebc6355a9d430462811b5aaa308b174bed", - "reference": "2cf940ebc6355a9d430462811b5aaa308b174bed", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76", + "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.14", + "nikic/php-parser": "^4.15", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -2341,8 +2341,8 @@ "phpunit/phpunit": "^9.3" }, "suggest": { - "ext-pcov": "*", - "ext-xdebug": "*" + "ext-pcov": "PHP extension that provides line coverage", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "type": "library", "extra": { @@ -2375,7 +2375,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.24" + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29" }, "funding": [ { @@ -2383,7 +2384,7 @@ "type": "github" } ], - "time": "2023-01-26T08:26:55+00:00" + "time": "2023-09-19T04:57:46+00:00" }, { "name": "phpunit/php-file-iterator", @@ -2628,16 +2629,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.28", + "version": "9.6.13", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e" + "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/954ca3113a03bf780d22f07bf055d883ee04b65e", - "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f3d767f7f9e191eab4189abe41ab37797e30b1be", + "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be", "shasum": "" }, "require": { @@ -2652,7 +2653,7 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.13", + "phpunit/php-code-coverage": "^9.2.28", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -2670,8 +2671,8 @@ "sebastian/version": "^3.0.2" }, "suggest": { - "ext-soap": "*", - "ext-xdebug": "*" + "ext-soap": "To be able to generate mocks based on WSDL files", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "bin": [ "phpunit" @@ -2679,7 +2680,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.5-dev" + "dev-master": "9.6-dev" } }, "autoload": { @@ -2710,7 +2711,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.28" + "security": "https://github.com/sebastianbergmann/phpunit/security/policy", + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.13" }, "funding": [ { @@ -2726,7 +2728,7 @@ "type": "tidelift" } ], - "time": "2023-01-14T12:32:24+00:00" + "time": "2023-09-19T05:39:22+00:00" }, { "name": "psalm/plugin-phpunit", @@ -2887,25 +2889,25 @@ }, { "name": "psr/http-message", - "version": "1.0.1", + "version": "1.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -2934,9 +2936,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/master" + "source": "https://github.com/php-fig/http-message/tree/1.1" }, - "time": "2016-08-06T14:39:51+00:00" + "time": "2023-04-04T09:50:52+00:00" }, { "name": "psr/log", @@ -3339,16 +3341,16 @@ }, { "name": "sebastian/diff", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d" + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", "shasum": "" }, "require": { @@ -3393,7 +3395,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" }, "funding": [ { @@ -3401,20 +3403,20 @@ "type": "github" } ], - "time": "2020-10-26T13:10:38+00:00" + "time": "2023-05-07T05:35:17+00:00" }, { "name": "sebastian/environment", - "version": "5.1.4", + "version": "5.1.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7" + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7", - "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", "shasum": "" }, "require": { @@ -3456,7 +3458,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4" + "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5" }, "funding": [ { @@ -3464,7 +3466,7 @@ "type": "github" } ], - "time": "2022-04-03T09:37:03+00:00" + "time": "2023-02-03T06:03:51+00:00" }, { "name": "sebastian/exporter", @@ -3545,16 +3547,16 @@ }, { "name": "sebastian/global-state", - "version": "5.0.5", + "version": "5.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2" + "reference": "bde739e7565280bda77be70044ac1047bc007e34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", + "reference": "bde739e7565280bda77be70044ac1047bc007e34", "shasum": "" }, "require": { @@ -3597,7 +3599,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" }, "funding": [ { @@ -3605,7 +3607,7 @@ "type": "github" } ], - "time": "2022-02-14T08:28:10+00:00" + "time": "2023-08-02T09:26:13+00:00" }, { "name": "sebastian/lines-of-code", @@ -3778,16 +3780,16 @@ }, { "name": "sebastian/recursion-context", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172" + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", "shasum": "" }, "require": { @@ -3826,10 +3828,10 @@ } ], "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5" }, "funding": [ { @@ -3837,7 +3839,7 @@ "type": "github" } ], - "time": "2020-10-26T13:17:30+00:00" + "time": "2023-02-03T06:07:39+00:00" }, { "name": "sebastian/resource-operations", @@ -3896,16 +3898,16 @@ }, { "name": "sebastian/type", - "version": "3.2.0", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e" + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", - "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", "shasum": "" }, "require": { @@ -3940,7 +3942,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.2.0" + "source": "https://github.com/sebastianbergmann/type/tree/3.2.1" }, "funding": [ { @@ -3948,7 +3950,7 @@ "type": "github" } ], - "time": "2022-09-12T14:47:03+00:00" + "time": "2023-02-03T06:13:03+00:00" }, { "name": "sebastian/version", @@ -4066,26 +4068,25 @@ }, { "name": "spatie/array-to-xml", - "version": "2.17.1", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/spatie/array-to-xml.git", - "reference": "5cbec9c6ab17e320c58a259f0cebe88bde4a7c46" + "reference": "f9ab39c808500c347d5a8b6b13310bd5221e39e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/5cbec9c6ab17e320c58a259f0cebe88bde4a7c46", - "reference": "5cbec9c6ab17e320c58a259f0cebe88bde4a7c46", + "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/f9ab39c808500c347d5a8b6b13310bd5221e39e7", + "reference": "f9ab39c808500c347d5a8b6b13310bd5221e39e7", "shasum": "" }, "require": { "ext-dom": "*", - "php": "^7.4|^8.0" + "php": "^8.0" }, "require-dev": { "mockery/mockery": "^1.2", "pestphp/pest": "^1.21", - "phpunit/phpunit": "^9.0", "spatie/pest-plugin-snapshots": "^1.1" }, "type": "library", @@ -4114,7 +4115,7 @@ "xml" ], "support": { - "source": "https://github.com/spatie/array-to-xml/tree/2.17.1" + "source": "https://github.com/spatie/array-to-xml/tree/3.2.0" }, "funding": [ { @@ -4126,20 +4127,20 @@ "type": "github" } ], - "time": "2022-12-26T08:22:07+00:00" + "time": "2023-07-19T18:30:26+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.7.1", + "version": "3.7.2", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619" + "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619", - "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879", + "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879", "shasum": "" }, "require": { @@ -4175,14 +4176,15 @@ "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", "keywords": [ "phpcs", - "standards" + "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" }, - "time": "2022-06-18T07:21:10+00:00" + "time": "2023-02-22T23:07:41+00:00" }, { "name": "stella-maris/clock", @@ -4458,16 +4460,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", "shasum": "" }, "require": { @@ -4482,7 +4484,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4520,7 +4522,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" }, "funding": [ { @@ -4536,20 +4538,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354" + "reference": "875e90aeea2777b6f135677f618529449334a612" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", + "reference": "875e90aeea2777b6f135677f618529449334a612", "shasum": "" }, "require": { @@ -4561,7 +4563,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4601,7 +4603,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" }, "funding": [ { @@ -4617,20 +4619,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", "shasum": "" }, "require": { @@ -4642,7 +4644,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4685,7 +4687,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" }, "funding": [ { @@ -4701,20 +4703,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" + "reference": "42292d99c55abe617799667f454222c54c60e229" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", + "reference": "42292d99c55abe617799667f454222c54c60e229", "shasum": "" }, "require": { @@ -4729,7 +4731,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4768,7 +4770,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" }, "funding": [ { @@ -4784,20 +4786,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-07-28T09:04:16+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", "shasum": "" }, "require": { @@ -4806,7 +4808,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4851,7 +4853,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" }, "funding": [ { @@ -4867,7 +4869,7 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/service-contracts", @@ -5089,22 +5091,22 @@ }, { "name": "vimeo/psalm", - "version": "5.6.0", + "version": "5.15.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "e784128902dfe01d489c4123d69918a9f3c1eac5" + "reference": "5c774aca4746caf3d239d9c8cadb9f882ca29352" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/e784128902dfe01d489c4123d69918a9f3c1eac5", - "reference": "e784128902dfe01d489c4123d69918a9f3c1eac5", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/5c774aca4746caf3d239d9c8cadb9f882ca29352", + "reference": "5c774aca4746caf3d239d9c8cadb9f882ca29352", "shasum": "" }, "require": { "amphp/amp": "^2.4.2", "amphp/byte-stream": "^1.5", - "composer/package-versions-deprecated": "^1.10.0", + "composer-runtime-api": "^2", "composer/semver": "^1.4 || ^2.0 || ^3.0", "composer/xdebug-handler": "^2.0 || ^3.0", "dnoegel/php-xdg-base-dir": "^0.1.1", @@ -5117,27 +5119,31 @@ "ext-tokenizer": "*", "felixfbecker/advanced-json-rpc": "^3.1", "felixfbecker/language-server-protocol": "^1.5.2", - "fidry/cpu-core-counter": "^0.4.0", + "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1", "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", - "nikic/php-parser": "^4.13", - "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0", + "nikic/php-parser": "^4.16", + "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", + "spatie/array-to-xml": "^2.17.0 || ^3.0", "symfony/console": "^4.1.6 || ^5.0 || ^6.0", "symfony/filesystem": "^5.4 || ^6.0" }, + "conflict": { + "nikic/php-parser": "4.17.0" + }, "provide": { "psalm/psalm": "self.version" }, "require-dev": { + "amphp/phpunit-util": "^2.0", "bamarni/composer-bin-plugin": "^1.4", - "brianium/paratest": "^6.0", + "brianium/paratest": "^6.9", "ext-curl": "*", "mockery/mockery": "^1.5", "nunomaduro/mock-final-classes": "^1.1", "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/phpdoc-parser": "^1.6", - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^9.6", "psalm/plugin-mockery": "^1.1", "psalm/plugin-phpunit": "^0.18", "slevomat/coding-standard": "^8.4", @@ -5183,34 +5189,35 @@ "keywords": [ "code", "inspection", - "php" + "php", + "static analysis" ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/5.6.0" + "source": "https://github.com/vimeo/psalm/tree/5.15.0" }, - "time": "2023-01-23T20:32:47+00:00" + "time": "2023-08-20T23:07:30+00:00" }, { "name": "webimpress/coding-standard", - "version": "1.2.4", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/webimpress/coding-standard.git", - "reference": "cd0c4b0b97440c337c1f7da17b524674ca2f9ca9" + "reference": "b26557e2386711ecb74f22718f4b4bde5ddbc899" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webimpress/coding-standard/zipball/cd0c4b0b97440c337c1f7da17b524674ca2f9ca9", - "reference": "cd0c4b0b97440c337c1f7da17b524674ca2f9ca9", + "url": "https://api.github.com/repos/webimpress/coding-standard/zipball/b26557e2386711ecb74f22718f4b4bde5ddbc899", + "reference": "b26557e2386711ecb74f22718f4b4bde5ddbc899", "shasum": "" }, "require": { "php": "^7.3 || ^8.0", - "squizlabs/php_codesniffer": "^3.6.2" + "squizlabs/php_codesniffer": "^3.7.2" }, "require-dev": { - "phpunit/phpunit": "^9.5.13" + "phpunit/phpunit": "^9.6.4" }, "type": "phpcodesniffer-standard", "extra": { @@ -5236,7 +5243,7 @@ ], "support": { "issues": "https://github.com/webimpress/coding-standard/issues", - "source": "https://github.com/webimpress/coding-standard/tree/1.2.4" + "source": "https://github.com/webimpress/coding-standard/tree/1.3.1" }, "funding": [ { @@ -5244,7 +5251,7 @@ "type": "github" } ], - "time": "2022-02-15T19:52:12+00:00" + "time": "2023-03-09T15:05:18+00:00" }, { "name": "webmozart/assert", @@ -5311,11 +5318,11 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" }, "platform-dev": [], "platform-overrides": { "php": "8.0.99" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From 866d053a3da0dc0db77a1d4df8259ab6b77a3c79 Mon Sep 17 00:00:00 2001 From: Rajesh Kumar Date: Thu, 2 Nov 2023 17:57:27 +0530 Subject: [PATCH 2/8] Fix the psalm errors --- README.md | 14 +- composer.json | 24 +- composer.lock | 571 +++++++++++++++---------- psalm-baseline.xml | 863 ++++++++++++++++++++------------------ src/AbstractContainer.php | 2 +- 5 files changed, 806 insertions(+), 668 deletions(-) diff --git a/README.md b/README.md index b9ed8e69..cc228672 100644 --- a/README.md +++ b/README.md @@ -4,19 +4,19 @@ [![Coverage Status](https://coveralls.io/repos/github/laminas/laminas-session/badge.svg?branch=master)](https://coveralls.io/github/laminas/laminas-session?branch=master) > ## πŸ‡·πŸ‡Ί Русским Π³Ρ€Π°ΠΆΠ΄Π°Π½Π°ΠΌ -> +> > ΠœΡ‹, участники Laminas, Ρ€ΠΎΠ΄ΠΈΠ»ΠΈΡΡŒ ΠΈ ΠΆΠΈΠ²Π΅ΠΌ Π² Ρ€Π°Π·Π½Ρ‹Ρ… странах. Π£ ΠΌΠ½ΠΎΠ³ΠΈΡ… ΠΈΠ· нас Π΅ΡΡ‚ΡŒ Π΄Ρ€ΡƒΠ·ΡŒΡ, родствСнники ΠΈ ΠΊΠΎΠ»Π»Π΅Π³ΠΈ ΠΊΠ°ΠΊ Π² России, Ρ‚Π°ΠΊ ΠΈ Π² Π£ΠΊΡ€Π°ΠΈΠ½Π΅. НСкоторыС ΠΈΠ· нас Ρ€ΠΎΠ΄ΠΈΠ»ΠΈΡΡŒ Π² России. НСкоторыС ΠΈΠ· нас ΠΆΠΈΠ²ΡƒΡ‚ Π² России. Π£ Π½Π΅ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Ρ… Π±Π°Π±ΡƒΡˆΠΊΠΈ ΠΈ Π΄Π΅Π΄ΡƒΡˆΠΊΠΈ ΡΡ€Π°ΠΆΠ°Π»ΠΈΡΡŒ с Ρ„Π°ΡˆΠΈΡΡ‚Π°ΠΌΠΈ Π²ΠΎ Π’Ρ‚ΠΎΡ€ΠΎΠΉ ΠΌΠΈΡ€ΠΎΠ²ΠΎΠΉ Π²ΠΎΠΉΠ½Π΅. Π—Π΄Π΅ΡΡŒ Π½ΠΈΠΊΡ‚ΠΎ Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅Ρ€ΠΆΠΈΠ²Π°Π΅Ρ‚ Ρ„Π°ΡˆΠΈΠ·ΠΌ. -> +> > Π£ ΠΎΠ΄Π½ΠΎΠ³ΠΎ ΠΈΠ· нас Π΅ΡΡ‚ΡŒ украинская родствСнница, которая спаслась ΠΈΠ· Π΄ΠΎΠΌΠ° вмСстС с сыном. ПоСзд задСрТался ΠΈΠ·-Π·Π° Π±ΠΎΠΌΠ±Π΅ΠΆΠΊΠΈ Π½Π° Π΄ΠΎΡ€ΠΎΠ³Π΅ Π²ΠΏΠ΅Ρ€Π΅Π΄ΠΈ. Π£ нас Π΅ΡΡ‚ΡŒ Π΄Ρ€ΡƒΠ·ΡŒΡ, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Π΅ прячутся Π² Π±ΠΎΠΌΠ±ΠΎΡƒΠ±Π΅ΠΆΠΈΡ‰Π°Ρ…. ΠœΡ‹ с Ρ‚Ρ€Π΅Π²ΠΎΠ³ΠΎΠΉ ΠΆΠ΄Π΅ΠΌ вСсточки ΠΎΡ‚ Π½ΠΈΡ… послС Π²ΠΎΠ·Π΄ΡƒΡˆΠ½Ρ‹Ρ… Π½Π°Π»Π΅Ρ‚ΠΎΠ², ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Π΅ бСспорядочно наносят ΡƒΠ΄Π°Ρ€Ρ‹ ΠΈ ΠΏΠΎΠΏΠ°Π΄Π°ΡŽΡ‚ ΠΏΠΎ Π±ΠΎΠ»ΡŒΠ½ΠΈΡ†Π°ΠΌ, школам, дСтским садам ΠΈ Π΄ΠΎΠΌΠ°ΠΌ. ΠœΡ‹ Π½Π΅ Π±Π΅Ρ€Π΅ΠΌ это ΠΈΠ· ΠΊΠ°ΠΊΠΈΡ…-Π»ΠΈΠ±ΠΎ БМИ. ΠœΡ‹ наблюдаСм это Π½Π°ΠΏΡ€ΡΠΌΡƒΡŽ. -> +> > Π’Ρ‹ довСряСтС Π½Π°ΠΌ достаточно, Ρ‡Ρ‚ΠΎΠ± ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚ΡŒ наши ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹, ΠΈ ΠΌΡ‹ просим вас Π΄ΠΎΠ²Π΅Ρ€ΠΈΡ‚ΡŒΡΡ Π½Π°ΠΌ вновь. ΠœΡ‹ нуТдаСмся Π² ΠΏΠΎΠΌΠΎΡ‰ΠΈ. Π’Ρ‹Ρ…ΠΎΠ΄ΠΈΡ‚Π΅ ΠΈ протСстуйтС ΠΏΡ€ΠΎΡ‚ΠΈΠ² этой бСсполСзной Π²ΠΎΠΉΠ½Ρ‹. ΠžΡΡ‚Π°Π½ΠΎΠ²ΠΈΡ‚Π΅ ΠΊΡ€ΠΎΠ²ΠΎΠΏΡ€ΠΎΠ»ΠΈΡ‚ΠΈΠ΅. Π‘ΠΊΠ°ΠΆΠΈΡ‚Π΅ "НСт Π²ΠΎΠΉΠ½Π΅!" -> +> > ## πŸ‡ΊπŸ‡Έ To Citizens of Russia -> +> > We at Laminas come from all over the world. Many of us have friends, family and colleagues in both Russia and Ukraine. Some of us were born in Russia. Some of us currently live in Russia. Some have grandparents who fought Nazis in World War II. Nobody here supports fascism. -> +> > One team member has a Ukrainian relative who fled her home with her son. The train was delayed due to bombing on the road ahead. We have friends who are hiding in bomb shelters. We anxiously follow up on them after the air raids, which indiscriminately fire at hospitals, schools, kindergartens and houses. We're not taking this from any media. These are our actual experiences. -> +> > You trust us enough to use our software. We ask that you trust us to say the truth on this. We need your help. Go out and protest this unnecessary war. Stop the bloodshed. Say "stop the war!" laminas-session manages PHP sessions using an object oriented interface. diff --git a/composer.json b/composer.json index 0bb21f09..4bae9fc2 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "config": { "sort-packages": true, "platform": { - "php": "8.0.99" + "php": "8.1.99" }, "allow-plugins": { "dealerdirect/phpcodesniffer-composer-installer": true, @@ -32,22 +32,22 @@ } }, "require": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", - "laminas/laminas-eventmanager": "^3.5", - "laminas/laminas-servicemanager": "^3.15.1", - "laminas/laminas-stdlib": "^3.10.1" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0", + "laminas/laminas-eventmanager": "^3.12", + "laminas/laminas-servicemanager": "^3.22.1", + "laminas/laminas-stdlib": "^3.18.0" }, "require-dev": { - "laminas/laminas-cache": "^3.9", - "laminas/laminas-cache-storage-adapter-memory": "^2.2", + "laminas/laminas-cache": "^3.11.0", + "laminas/laminas-cache-storage-adapter-memory": "^2.3", "laminas/laminas-coding-standard": "~2.5.0", - "laminas/laminas-db": "^2.16.3", + "laminas/laminas-db": "^2.18.0", "laminas/laminas-http": "^2.18", - "laminas/laminas-validator": "^2.29", - "mongodb/mongodb": "~1.13.0", - "phpunit/phpunit": "^9.5.27", + "laminas/laminas-validator": "^2.41.0", + "mongodb/mongodb": "~1.16.0", + "phpunit/phpunit": "^9.6.13", "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.4" + "vimeo/psalm": "^5.15" }, "suggest": { "laminas/laminas-cache": "Laminas\\Cache component", diff --git a/composer.lock b/composer.lock index b1d71a5d..308d697e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,24 +4,24 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7e1cf0edfb82414f562165460f40f7b7", + "content-hash": "0f60f8fd5cfbf7125d0b33985e520e41", "packages": [ { "name": "laminas/laminas-eventmanager", - "version": "3.11.0", + "version": "3.12.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-eventmanager.git", - "reference": "9cfa79ce247c567f05ce4b7c975c6bdf9698c5dd" + "reference": "4a576922c00cc7838d60d004a7bd6f5a02c23b57" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/9cfa79ce247c567f05ce4b7c975c6bdf9698c5dd", - "reference": "9cfa79ce247c567f05ce4b7c975c6bdf9698c5dd", + "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/4a576922c00cc7838d60d004a7bd6f5a02c23b57", + "reference": "4a576922c00cc7838d60d004a7bd6f5a02c23b57", "shasum": "" }, "require": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "container-interop/container-interop": "<1.2", @@ -29,12 +29,12 @@ }, "require-dev": { "laminas/laminas-coding-standard": "~2.5.0", - "laminas/laminas-stdlib": "^3.15", - "phpbench/phpbench": "^1.2.7", - "phpunit/phpunit": "^9.5.26", - "psalm/plugin-phpunit": "^0.18.0", + "laminas/laminas-stdlib": "^3.17", + "phpbench/phpbench": "^1.2.10", + "phpunit/phpunit": "^10.4.1", + "psalm/plugin-phpunit": "^0.18.4", "psr/container": "^1.1.2 || ^2.0.2", - "vimeo/psalm": "^5.0.0" + "vimeo/psalm": "^5.11" }, "suggest": { "laminas/laminas-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature", @@ -72,30 +72,30 @@ "type": "community_bridge" } ], - "time": "2023-10-10T08:29:58+00:00" + "time": "2023-10-18T16:36:45+00:00" }, { "name": "laminas/laminas-servicemanager", - "version": "3.20.0", + "version": "3.22.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-servicemanager.git", - "reference": "bc2c2cbe2dd90db8b9d16b0618f542692b76ab59" + "reference": "de98d297d4743956a0558a6d71616979ff779328" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/bc2c2cbe2dd90db8b9d16b0618f542692b76ab59", - "reference": "bc2c2cbe2dd90db8b9d16b0618f542692b76ab59", + "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/de98d297d4743956a0558a6d71616979ff779328", + "reference": "de98d297d4743956a0558a6d71616979ff779328", "shasum": "" }, "require": { - "laminas/laminas-stdlib": "^3.2.1", - "php": "~8.0.0 || ~8.1.0 || ~8.2.0", + "laminas/laminas-stdlib": "^3.17", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0", "psr/container": "^1.0" }, "conflict": { "ext-psr": "*", - "laminas/laminas-code": "<3.3.1", + "laminas/laminas-code": "<4.10.0", "zendframework/zend-code": "<3.3.1", "zendframework/zend-servicemanager": "*" }, @@ -107,18 +107,18 @@ }, "require-dev": { "composer/package-versions-deprecated": "^1.11.99.5", - "laminas/laminas-coding-standard": "~2.4.0", + "friendsofphp/proxy-manager-lts": "^1.0.14", + "laminas/laminas-code": "^4.10.0", + "laminas/laminas-coding-standard": "~2.5.0", "laminas/laminas-container-config-test": "^0.8", - "laminas/laminas-dependency-plugin": "^2.2", - "mikey179/vfsstream": "^1.6.11@alpha", - "ocramius/proxy-manager": "^2.14.1", - "phpbench/phpbench": "^1.2.7", - "phpunit/phpunit": "^9.5.26", - "psalm/plugin-phpunit": "^0.18.0", - "vimeo/psalm": "^5.0.0" + "mikey179/vfsstream": "^1.6.11", + "phpbench/phpbench": "^1.2.9", + "phpunit/phpunit": "^10.4", + "psalm/plugin-phpunit": "^0.18.4", + "vimeo/psalm": "^5.8.0" }, "suggest": { - "ocramius/proxy-manager": "ProxyManager ^2.1.1 to handle lazy initialization of services" + "friendsofphp/proxy-manager-lts": "ProxyManager ^2.1.1 to handle lazy initialization of services" }, "bin": [ "bin/generate-deps-for-config-factory", @@ -162,34 +162,34 @@ "type": "community_bridge" } ], - "time": "2022-12-01T17:03:38+00:00" + "time": "2023-10-24T11:19:47+00:00" }, { "name": "laminas/laminas-stdlib", - "version": "3.16.1", + "version": "3.18.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-stdlib.git", - "reference": "f4f773641807c7ccee59b758bfe4ac4ba33ecb17" + "reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/f4f773641807c7ccee59b758bfe4ac4ba33ecb17", - "reference": "f4f773641807c7ccee59b758bfe4ac4ba33ecb17", + "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf", + "reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf", "shasum": "" }, "require": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "zendframework/zend-stdlib": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "^2.4.0", - "phpbench/phpbench": "^1.2.7", - "phpunit/phpunit": "^9.5.26", - "psalm/plugin-phpunit": "^0.18.0", - "vimeo/psalm": "^5.0.0" + "laminas/laminas-coding-standard": "^2.5", + "phpbench/phpbench": "^1.2.14", + "phpunit/phpunit": "^10.3.3", + "psalm/plugin-phpunit": "^0.18.4", + "vimeo/psalm": "^5.15.0" }, "type": "library", "autoload": { @@ -221,7 +221,7 @@ "type": "community_bridge" } ], - "time": "2022-12-03T18:48:01+00:00" + "time": "2023-09-19T10:15:21+00:00" }, { "name": "psr/container", @@ -514,16 +514,16 @@ }, { "name": "composer/pcre", - "version": "3.1.0", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2" + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", - "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", + "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", "shasum": "" }, "require": { @@ -565,7 +565,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.0" + "source": "https://github.com/composer/pcre/tree/3.1.1" }, "funding": [ { @@ -581,7 +581,7 @@ "type": "tidelift" } ], - "time": "2022-11-17T09:50:14+00:00" + "time": "2023-10-11T07:11:09+00:00" }, { "name": "composer/semver", @@ -844,30 +844,30 @@ }, { "name": "doctrine/instantiator", - "version": "1.5.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", - "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^8.1" }, "require-dev": { - "doctrine/coding-standard": "^9 || ^11", + "doctrine/coding-standard": "^11", "ext-pdo": "*", "ext-phar": "*", - "phpbench/phpbench": "^0.16 || ^1", - "phpstan/phpstan": "^1.4", - "phpstan/phpstan-phpunit": "^1", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.30 || ^5.4" + "phpbench/phpbench": "^1.2", + "phpstan/phpstan": "^1.9.4", + "phpstan/phpstan-phpunit": "^1.3", + "phpunit/phpunit": "^9.5.27", + "vimeo/psalm": "^5.4" }, "type": "library", "autoload": { @@ -894,7 +894,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.5.0" + "source": "https://github.com/doctrine/instantiator/tree/2.0.0" }, "funding": [ { @@ -910,7 +910,7 @@ "type": "tidelift" } ], - "time": "2022-12-30T00:15:36+00:00" + "time": "2022-12-30T00:23:10+00:00" }, { "name": "felixfbecker/advanced-json-rpc", @@ -1135,30 +1135,31 @@ }, { "name": "laminas/laminas-cache", - "version": "3.10.1", + "version": "3.11.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-cache.git", - "reference": "7bda6c5b500b916cbb03d0504069865d31b3efa5" + "reference": "76cc49af422a9cf5deff9cd0f63cbda29ae88d14" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-cache/zipball/7bda6c5b500b916cbb03d0504069865d31b3efa5", - "reference": "7bda6c5b500b916cbb03d0504069865d31b3efa5", + "url": "https://api.github.com/repos/laminas/laminas-cache/zipball/76cc49af422a9cf5deff9cd0f63cbda29ae88d14", + "reference": "76cc49af422a9cf5deff9cd0f63cbda29ae88d14", "shasum": "" }, "require": { "laminas/laminas-cache-storage-implementation": "1.0", "laminas/laminas-eventmanager": "^3.4", - "laminas/laminas-servicemanager": "^3.18.0", + "laminas/laminas-servicemanager": "^3.21", "laminas/laminas-stdlib": "^3.6", - "php": "~8.0.0 || ~8.1.0 || ~8.2.0", + "php": "~8.1.0 || ~8.2.0", "psr/cache": "^1.0", + "psr/clock": "^1.0", "psr/simple-cache": "^1.0", - "stella-maris/clock": "^0.1.5", "webmozart/assert": "^1.9" }, "conflict": { + "stella-maris/clock": "<0.1.7", "symfony/console": "<5.1" }, "provide": { @@ -1231,25 +1232,25 @@ "type": "community_bridge" } ], - "time": "2023-03-31T18:59:17+00:00" + "time": "2023-07-31T10:31:52+00:00" }, { "name": "laminas/laminas-cache-storage-adapter-memory", - "version": "2.2.0", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-cache-storage-adapter-memory.git", - "reference": "e002c7d3fa0d4723589b550d7ab4586befa72366" + "reference": "d2c357a8b839ceb0e0781d5e9aebe46642dbf0b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-cache-storage-adapter-memory/zipball/e002c7d3fa0d4723589b550d7ab4586befa72366", - "reference": "e002c7d3fa0d4723589b550d7ab4586befa72366", + "url": "https://api.github.com/repos/laminas/laminas-cache-storage-adapter-memory/zipball/d2c357a8b839ceb0e0781d5e9aebe46642dbf0b2", + "reference": "d2c357a8b839ceb0e0781d5e9aebe46642dbf0b2", "shasum": "" }, "require": { "laminas/laminas-cache": "^3.0", - "php": "~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "laminas/laminas-servicemanager": "<3.11" @@ -1258,11 +1259,11 @@ "laminas/laminas-cache-storage-implementation": "1.0" }, "require-dev": { - "laminas/laminas-cache-storage-adapter-benchmark": "^1.0", - "laminas/laminas-cache-storage-adapter-test": "^2.0", - "laminas/laminas-coding-standard": "~2.4.0", - "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.9" + "laminas/laminas-cache-storage-adapter-benchmark": "^1.1.0", + "laminas/laminas-cache-storage-adapter-test": "^2.3.0", + "laminas/laminas-coding-standard": "~2.5.0", + "psalm/plugin-phpunit": "^0.18.0", + "vimeo/psalm": "^4.29.0" }, "type": "library", "extra": { @@ -1298,7 +1299,7 @@ "type": "community_bridge" } ], - "time": "2022-10-22T14:38:52+00:00" + "time": "2023-10-18T09:43:33+00:00" }, { "name": "laminas/laminas-coding-standard", @@ -1429,33 +1430,33 @@ }, { "name": "laminas/laminas-escaper", - "version": "2.12.0", + "version": "2.13.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-escaper.git", - "reference": "ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490" + "reference": "af459883f4018d0f8a0c69c7a209daef3bf973ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490", - "reference": "ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490", + "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/af459883f4018d0f8a0c69c7a209daef3bf973ba", + "reference": "af459883f4018d0f8a0c69c7a209daef3bf973ba", "shasum": "" }, "require": { "ext-ctype": "*", "ext-mbstring": "*", - "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "zendframework/zend-escaper": "*" }, "require-dev": { - "infection/infection": "^0.26.6", - "laminas/laminas-coding-standard": "~2.4.0", + "infection/infection": "^0.27.0", + "laminas/laminas-coding-standard": "~2.5.0", "maglnet/composer-require-checker": "^3.8.0", - "phpunit/phpunit": "^9.5.18", - "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.22.0" + "phpunit/phpunit": "^9.6.7", + "psalm/plugin-phpunit": "^0.18.4", + "vimeo/psalm": "^5.9" }, "type": "library", "autoload": { @@ -1487,7 +1488,7 @@ "type": "community_bridge" } ], - "time": "2022-10-10T10:11:09+00:00" + "time": "2023-10-10T08:35:13+00:00" }, { "name": "laminas/laminas-http", @@ -1556,20 +1557,20 @@ }, { "name": "laminas/laminas-loader", - "version": "2.9.0", + "version": "2.10.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-loader.git", - "reference": "51ed9c3fa42d1098a9997571730c0cbf42d078d3" + "reference": "e6fe952304ef40ce45cd814751ab35d42afdad12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-loader/zipball/51ed9c3fa42d1098a9997571730c0cbf42d078d3", - "reference": "51ed9c3fa42d1098a9997571730c0cbf42d078d3", + "url": "https://api.github.com/repos/laminas/laminas-loader/zipball/e6fe952304ef40ce45cd814751ab35d42afdad12", + "reference": "e6fe952304ef40ce45cd814751ab35d42afdad12", "shasum": "" }, "require": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "zendframework/zend-loader": "*" @@ -1608,26 +1609,26 @@ "type": "community_bridge" } ], - "time": "2022-10-16T12:50:49+00:00" + "time": "2023-10-18T09:58:51+00:00" }, { "name": "laminas/laminas-uri", - "version": "2.10.0", + "version": "2.11.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-uri.git", - "reference": "663b050294945c7345cc3a61f3ca661d5f9e1f80" + "reference": "e662c685125061d3115906e5eb30f966842cc226" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-uri/zipball/663b050294945c7345cc3a61f3ca661d5f9e1f80", - "reference": "663b050294945c7345cc3a61f3ca661d5f9e1f80", + "url": "https://api.github.com/repos/laminas/laminas-uri/zipball/e662c685125061d3115906e5eb30f966842cc226", + "reference": "e662c685125061d3115906e5eb30f966842cc226", "shasum": "" }, "require": { "laminas/laminas-escaper": "^2.9", - "laminas/laminas-validator": "^2.15", - "php": "~8.0.0 || ~8.1.0 || ~8.2.0" + "laminas/laminas-validator": "^2.39", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "zendframework/zend-uri": "*" @@ -1666,44 +1667,43 @@ "type": "community_bridge" } ], - "time": "2022-10-16T15:02:45+00:00" + "time": "2023-10-18T09:56:55+00:00" }, { "name": "laminas/laminas-validator", - "version": "2.30.1", + "version": "2.41.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-validator.git", - "reference": "b7d217b5e4951955fda9a3a5ada91b717b5c8d5c" + "reference": "ca27df621e12cbd4c138dab7abf3e7e5692c582c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/b7d217b5e4951955fda9a3a5ada91b717b5c8d5c", - "reference": "b7d217b5e4951955fda9a3a5ada91b717b5c8d5c", + "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/ca27df621e12cbd4c138dab7abf3e7e5692c582c", + "reference": "ca27df621e12cbd4c138dab7abf3e7e5692c582c", "shasum": "" }, "require": { - "laminas/laminas-servicemanager": "^3.12.0", + "laminas/laminas-servicemanager": "^3.21.0", "laminas/laminas-stdlib": "^3.13", - "php": "~8.0.0 || ~8.1.0 || ~8.2.0", - "psr/http-message": "^1.0.1" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0", + "psr/http-message": "^1.0.1 || ^2.0.0" }, "conflict": { "zendframework/zend-validator": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "^2.4.0", - "laminas/laminas-db": "^2.16", - "laminas/laminas-filter": "^2.28.1", - "laminas/laminas-http": "^2.18", - "laminas/laminas-i18n": "^2.19", - "laminas/laminas-session": "^2.15", + "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": "^9.5.26", - "psalm/plugin-phpunit": "^0.18.3", - "psr/http-client": "^1.0.1", - "psr/http-factory": "^1.0.1", - "vimeo/psalm": "^5.0" + "phpunit/phpunit": "^10.3.3", + "psalm/plugin-phpunit": "^0.18.4", + "psr/http-client": "^1.0.2", + "psr/http-factory": "^1.0.2", + "vimeo/psalm": "^5.15" }, "suggest": { "laminas/laminas-db": "Laminas\\Db component, required by the (No)RecordExists validator", @@ -1751,39 +1751,43 @@ "type": "community_bridge" } ], - "time": "2023-01-30T22:41:19+00:00" + "time": "2023-10-30T08:22:19+00:00" }, { "name": "mongodb/mongodb", - "version": "1.13.1", + "version": "1.16.1", "source": { "type": "git", "url": "https://github.com/mongodb/mongo-php-library.git", - "reference": "0b8555705d2f9c12ab2e5cebee6b594cdfe6b4e0" + "reference": "72d80889eb7567c0da4e7d4ddbdcf66dfea90ac3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mongodb/mongo-php-library/zipball/0b8555705d2f9c12ab2e5cebee6b594cdfe6b4e0", - "reference": "0b8555705d2f9c12ab2e5cebee6b594cdfe6b4e0", + "url": "https://api.github.com/repos/mongodb/mongo-php-library/zipball/72d80889eb7567c0da4e7d4ddbdcf66dfea90ac3", + "reference": "72d80889eb7567c0da4e7d4ddbdcf66dfea90ac3", "shasum": "" }, "require": { "ext-hash": "*", "ext-json": "*", - "ext-mongodb": "^1.14.0", - "jean85/pretty-package-versions": "^1.2 || ^2.0.1", + "ext-mongodb": "^1.16.0", + "jean85/pretty-package-versions": "^2.0.1", "php": "^7.2 || ^8.0", - "symfony/polyfill-php80": "^1.19" + "symfony/polyfill-php73": "^1.27", + "symfony/polyfill-php80": "^1.27", + "symfony/polyfill-php81": "^1.27" }, "require-dev": { - "doctrine/coding-standard": "^9.0", - "squizlabs/php_codesniffer": "^3.6", - "symfony/phpunit-bridge": "^5.2" + "doctrine/coding-standard": "^11.1", + "rector/rector": "^0.16.0", + "squizlabs/php_codesniffer": "^3.7", + "symfony/phpunit-bridge": "^5.2", + "vimeo/psalm": "^4.28" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13.x-dev" + "dev-master": "1.16.x-dev" } }, "autoload": { @@ -1818,9 +1822,9 @@ ], "support": { "issues": "https://github.com/mongodb/mongo-php-library/issues", - "source": "https://github.com/mongodb/mongo-php-library/tree/1.13.1" + "source": "https://github.com/mongodb/mongo-php-library/tree/1.16.1" }, - "time": "2022-09-08T03:32:09+00:00" + "time": "2023-09-26T15:44:10+00:00" }, { "name": "myclabs/deep-copy", @@ -2889,16 +2893,16 @@ }, { "name": "psr/http-message", - "version": "1.1", + "version": "2.0", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", - "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71", + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71", "shasum": "" }, "require": { @@ -2907,7 +2911,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -2922,7 +2926,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP messages", @@ -2936,9 +2940,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/1.1" + "source": "https://github.com/php-fig/http-message/tree/2.0" }, - "time": "2023-04-04T09:50:52+00:00" + "time": "2023-04-04T09:54:51+00:00" }, { "name": "psr/log", @@ -4186,71 +4190,25 @@ }, "time": "2023-02-22T23:07:41+00:00" }, - { - "name": "stella-maris/clock", - "version": "0.1.7", - "source": { - "type": "git", - "url": "https://github.com/stella-maris-solutions/clock.git", - "reference": "fa23ce16019289a18bb3446fdecd45befcdd94f8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/stella-maris-solutions/clock/zipball/fa23ce16019289a18bb3446fdecd45befcdd94f8", - "reference": "fa23ce16019289a18bb3446fdecd45befcdd94f8", - "shasum": "" - }, - "require": { - "php": "^7.0|^8.0", - "psr/clock": "^1.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "StellaMaris\\Clock\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Andreas Heigl", - "role": "Maintainer" - } - ], - "description": "A pre-release of the proposed PSR-20 Clock-Interface", - "homepage": "https://gitlab.com/stella-maris/clock", - "keywords": [ - "clock", - "datetime", - "point in time", - "psr20" - ], - "support": { - "source": "https://github.com/stella-maris-solutions/clock/tree/0.1.7" - }, - "time": "2022-11-25T16:15:06+00:00" - }, { "name": "symfony/console", - "version": "v6.0.19", + "version": "v6.3.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "c3ebc83d031b71c39da318ca8b7a07ecc67507ed" + "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/c3ebc83d031b71c39da318ca8b7a07ecc67507ed", - "reference": "c3ebc83d031b71c39da318ca8b7a07ecc67507ed", + "url": "https://api.github.com/repos/symfony/console/zipball/eca495f2ee845130855ddf1cf18460c38966c8b6", + "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6", "shasum": "" }, "require": { - "php": ">=8.0.2", + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0", - "symfony/service-contracts": "^1.1|^2|^3", + "symfony/service-contracts": "^2.5|^3", "symfony/string": "^5.4|^6.0" }, "conflict": { @@ -4272,12 +4230,6 @@ "symfony/process": "^5.4|^6.0", "symfony/var-dumper": "^5.4|^6.0" }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/lock": "", - "symfony/process": "" - }, "type": "library", "autoload": { "psr-4": { @@ -4305,12 +4257,12 @@ "homepage": "https://symfony.com", "keywords": [ "cli", - "command line", + "command-line", "console", "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.0.19" + "source": "https://github.com/symfony/console/tree/v6.3.4" }, "funding": [ { @@ -4326,29 +4278,29 @@ "type": "tidelift" } ], - "time": "2023-01-01T08:36:10+00:00" + "time": "2023-08-16T10:10:12+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.0.2", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c" + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c", - "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", "shasum": "" }, "require": { - "php": ">=8.0.2" + "php": ">=8.1" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -4377,7 +4329,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.2" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0" }, "funding": [ { @@ -4393,24 +4345,24 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:55:41+00:00" + "time": "2023-05-23T14:45:45+00:00" }, { "name": "symfony/filesystem", - "version": "v6.0.19", + "version": "v6.3.1", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "3d49eec03fda1f0fc19b7349fbbe55ebc1004214" + "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/3d49eec03fda1f0fc19b7349fbbe55ebc1004214", - "reference": "3d49eec03fda1f0fc19b7349fbbe55ebc1004214", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/edd36776956f2a6fcf577edb5b05eb0e3bdc52ae", + "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae", "shasum": "" }, "require": { - "php": ">=8.0.2", + "php": ">=8.1", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.8" }, @@ -4440,7 +4392,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.0.19" + "source": "https://github.com/symfony/filesystem/tree/v6.3.1" }, "funding": [ { @@ -4456,7 +4408,7 @@ "type": "tidelift" } ], - "time": "2023-01-20T17:44:14+00:00" + "time": "2023-06-01T08:30:39+00:00" }, { "name": "symfony/polyfill-ctype", @@ -4788,6 +4740,85 @@ ], "time": "2023-07-28T09:04:16+00:00" }, + { + "name": "symfony/polyfill-php73", + "version": "v1.28.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php73.git", + "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fe2f306d1d9d346a7fee353d0d5012e401e984b5", + "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.28-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php73/tree/v1.28.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-01-26T09:26:14+00:00" + }, { "name": "symfony/polyfill-php80", "version": "v1.28.0", @@ -4871,6 +4902,85 @@ ], "time": "2023-01-26T09:26:14+00:00" }, + { + "name": "symfony/polyfill-php81", + "version": "v1.28.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php81.git", + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b", + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.28-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-01-26T09:26:14+00:00" + }, { "name": "symfony/service-contracts", "version": "v2.5.2", @@ -4956,32 +5066,33 @@ }, { "name": "symfony/string", - "version": "v6.0.19", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "d9e72497367c23e08bf94176d2be45b00a9d232a" + "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/d9e72497367c23e08bf94176d2be45b00a9d232a", - "reference": "d9e72497367c23e08bf94176d2be45b00a9d232a", + "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339", + "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339", "shasum": "" }, "require": { - "php": ">=8.0.2", + "php": ">=8.1", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/translation-contracts": "<2.0" + "symfony/translation-contracts": "<2.5" }, "require-dev": { "symfony/error-handler": "^5.4|^6.0", "symfony/http-client": "^5.4|^6.0", - "symfony/translation-contracts": "^2.0|^3.0", + "symfony/intl": "^6.2", + "symfony/translation-contracts": "^2.5|^3.0", "symfony/var-exporter": "^5.4|^6.0" }, "type": "library", @@ -5021,7 +5132,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.0.19" + "source": "https://github.com/symfony/string/tree/v6.3.5" }, "funding": [ { @@ -5037,7 +5148,7 @@ "type": "tidelift" } ], - "time": "2023-01-01T08:36:10+00:00" + "time": "2023-09-18T10:38:32+00:00" }, { "name": "theseer/tokenizer", @@ -5318,11 +5429,11 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "platform-dev": [], "platform-overrides": { - "php": "8.0.99" + "php": "8.1.99" }, "plugin-api-version": "2.6.0" } diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 2af04cbc..79393289 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,28 +1,32 @@ - + - + + + null === $key null === $key null === static::$defaultManager - + new static::$managerDefaultClass() - + $container $this $this $this - + $container $metadata['EXPIRE_HOPS_KEYS'] $metadata['EXPIRE_KEYS'] $value $value - + $metadata['EXPIRE_HOPS']['hops'] $metadata['EXPIRE_HOPS']['ts'] $metadata['EXPIRE_HOPS_KEYS'][$key] @@ -39,7 +43,7 @@ $storage[$name][$key] $storage[$name][$key] - + $metadata['EXPIRE_HOPS']['hops'] $metadata['EXPIRE_HOPS']['ts'] $metadata['EXPIRE_HOPS_KEYS'][$key] @@ -51,7 +55,7 @@ $metadata['EXPIRE_HOPS_KEYS'][$key]['ts'] $metadata['EXPIRE_HOPS_KEYS'][$key]['ts'] - + $container $container $metadata @@ -62,148 +66,152 @@ $old $storage[$name][$key] - + exchangeArray getArrayCopy - + $metadata['EXPIRE_HOPS']['hops'] $metadata['EXPIRE_HOPS_KEYS'][$key]['hops'] $metadata['EXPIRE_HOPS_KEYS'][$key]['hops'] - - $container instanceof ArrayObject ? $container->getArrayCopy() : $container - $container instanceof ArrayObject ? $container->getArrayCopy() : $container + + getArrayCopy() : $container]]> + getArrayCopy() : $container]]> $old $old - - $old->getArrayCopy() + + getArrayCopy()]]> getIterator new ArrayIterator($container) - + Container Container Container - + $input - + $key $key $name $storage - + $storage[$name] - $storage[$this->getName()] + getName()]]]> - + $storage[$name] - + $name - + $storage $storage $storage - + $_SERVER['REQUEST_TIME'] $_SERVER['REQUEST_TIME'] $_SERVER['REQUEST_TIME'] - + $manager AbstractContainer AbstractContainer - - is_scalar($vars) && (null !== $vars) - is_scalar($vars) && null !== $vars + + + + is_array($vars) + is_array($vars) + null !== $key null !== $key null !== $vars - null !== $vars - - static fn() => $ts - static fn() => ['hops' => $hops, 'ts' => $ts] + + $ts]]> + ['hops' => $hops, 'ts' => $ts]]]> - - new $this->defaultConfigClass() - new $this->defaultStorageClass() + + defaultConfigClass()]]> + defaultStorageClass()]]> - + $saveHandler - + AbstractValidatorChainEM3 - + ! is_numeric($hashBitsPerCharacter) ! is_numeric($sidBitsPerCharacter) - + SessionConfig - + [$this, 'handleError'] [$this, 'handleError'] - + SessionConfig - + $hashBitsPerCharacter - + $serializeHandler $validHashFunctions - + $value - + $knownHandlers - + false|string - + $callback($module) $callback() - + false false - + (string) $iniGet - + (int) $hashBitsPerCharacter (int) $sidBitsPerCharacter (string) $cacheLimiter (string) $serializeHandler (string) $serializeHandler - + $prefix - - ! is_array($options) && ! $options instanceof Traversable + + ! is_numeric($sidLength) is_numeric($cacheExpire) is_numeric($cookieLifetime) @@ -215,18 +223,18 @@ is_numeric($rememberMeSeconds) is_numeric($sidBitsPerCharacter) is_string($cookieDomain) - null === $this->cookieDomain - null === $this->cookieHttpOnly - null === $this->cookieLifetime - null === $this->cookiePath - null === $this->cookieSameSite - null === $this->cookieSecure - null === $this->name - null === $this->rememberMeSeconds - null === $this->savePath - null === $this->useCookies + cookieDomain]]> + cookieHttpOnly]]> + cookieLifetime]]> + cookiePath]]> + cookieSameSite]]> + cookieSecure]]> + name]]> + rememberMeSeconds]]> + savePath]]> + useCookies]]> - + StandardConfig StandardConfig StandardConfig @@ -243,16 +251,16 @@ null|string string|null - + HostnameValidator::ALLOW_ALL - + mixed - + array - + $cookieDomain $cookieDomain $cookieHttpOnly @@ -273,26 +281,26 @@ $useCookies $useCookies - + $key $key - + $key - $this->cookieDomain - $this->cookieHttpOnly - $this->cookieLifetime - $this->cookiePath - $this->cookieSameSite - $this->cookieSecure - $this->name - $this->rememberMeSeconds - $this->savePath - $this->useCookies + cookieDomain]]> + cookieHttpOnly]]> + cookieLifetime]]> + cookiePath]]> + cookieSameSite]]> + cookieSecure]]> + name]]> + rememberMeSeconds]]> + savePath]]> + useCookies]]> $value $value - + bool bool|string bool|string @@ -314,39 +322,45 @@ string string|null - - $this->cookieDomain - $this->cookieDomain - $this->cookieHttpOnly - $this->cookieHttpOnly - $this->cookieLifetime - $this->cookieLifetime - $this->cookiePath - $this->cookiePath - $this->cookieSameSite - $this->cookieSameSite - $this->cookieSecure - $this->cookieSecure - $this->getOption('hash_function') - $this->name - $this->name - $this->options['cache_expire'] - $this->options['entropy_file'] - $this->options['entropy_length'] - $this->options['gc_divisor'] - $this->options['gc_maxlifetime'] - $this->options['gc_probability'] - $this->options['hash_bits_per_character'] - $this->options['sid_bits_per_character'] - $this->options['sid_length'] - $this->rememberMeSeconds - $this->rememberMeSeconds - $this->savePath - $this->savePath - $this->useCookies - $this->useCookies + + cookieDomain]]> + cookieDomain]]> + cookieHttpOnly]]> + cookieHttpOnly]]> + cookieLifetime]]> + cookieLifetime]]> + cookiePath]]> + cookiePath]]> + cookieSameSite]]> + cookieSameSite]]> + cookieSecure]]> + cookieSecure]]> + getOption('hash_function')]]> + name]]> + name]]> + options['cache_expire']]]> + options['entropy_file']]]> + options['entropy_length']]]> + options['gc_divisor']]]> + options['gc_maxlifetime']]]> + options['gc_probability']]]> + options['hash_bits_per_character']]]> + options['sid_bits_per_character']]]> + options['sid_length']]]> + rememberMeSeconds]]> + rememberMeSeconds]]> + savePath]]> + savePath]]> + useCookies]]> + useCookies]]> - + + str_replace('_', ' ', $key) + + + str_replace('_', ' ', $key) + + (bool) $cookieHttpOnly (bool) $cookieSecure (bool) $useCookies @@ -365,7 +379,7 @@ - + ConfigInterface StorageInterface \Zend\Session\ManagerInterface @@ -373,63 +387,71 @@ - + $storage[$name][$key] - + Container - + bool - + $sessionName $sessionSavePath - - (bool) $this->getCacheStorage()->removeItem($id) + + getCacheStorage()->removeItem($id)]]> - + true - + ini_get('session.gc_maxlifetime') - - + + tableGateway->delete( + sprintf( + '%s < %d', + $platform->quoteIdentifier($this->options->getModifiedColumn()), + time() - $this->lifetime + ) + )]]> + + true - + $row $rows - - $row->{$this->options->getModifiedColumn()} + + {$this->options->getModifiedColumn()}]]> - - $row->{$this->options->getDataColumn()} - $row->{$this->options->getLifetimeColumn()} - $row->{$this->options->getModifiedColumn()} + + {$this->options->getDataColumn()}]]> + {$this->options->getLifetimeColumn()}]]> + {$this->options->getModifiedColumn()}]]> - + $lifetime $sessionName $sessionSavePath - + (string) $data - + current current - + (string) $dataColumn (string) $idColumn (string) $lifetimeColumn @@ -438,75 +460,75 @@ - - null === ($collection = $options->getCollection()) - null === ($database = $options->getDatabase()) + + getCollection())]]> + getDatabase())]]> - + bool - - $this->options->getSaveOptions() - $this->options->getSaveOptions() - $this->options->getSaveOptions() + + options->getSaveOptions()]]> + options->getSaveOptions()]]> + options->getSaveOptions()]]> - - (string) $session[$this->options->getModifiedField()] + + options->getModifiedField()]]]> - + $timestamp $timestamp - + string - + getData - + $timestamp - - $session[$this->options->getDataField()]->getData() + + options->getDataField()]->getData()]]> - - $session[$this->options->getDataField()] - $session[$this->options->getLifetimeField()] - $session[$this->options->getModifiedField()] + + options->getDataField()]]]> + options->getLifetimeField()]]]> + options->getModifiedField()]]]> - + $lifetime $mongoCollection $sessionName - + (string) $data - - $this->saveOptions === ['w' => 1] - $this->saveOptions === ['w' => 1] + + saveOptions === ['w' => 1]]]> + saveOptions === ['w' => 1]]]> - + $saveOptions - ['safe' => true] - ['w' => 1] + true]]]> + 1]]]> - + $options - + setUseExpireAfterSecondsIndex - + $options - + $collection $database - + (bool) $useExpireAfterSecondsIndex (string) $collection (string) $dataField @@ -517,67 +539,67 @@ - + ContainerAbstractServiceFactory - + $config $sessionManager - + $config - - $config[$this->configKey] + + configKey]]]> - + $config $config - $this->sessionManager + sessionManager]]> - + null|ManagerInterface - - $this->sessionManager - $this->sessionManager + + sessionManager]]> + sessionManager]]> - + $container $container - - $this->sessionManager !== null - null !== $this->config + + sessionManager !== null]]> + config]]> - + SessionConfigFactory - + $config $config['config_class'] $config['config_class'] - + $config - + new $class() - + $services - + SessionManagerFactory - + $manager - + $config $configService $options @@ -585,82 +607,82 @@ $storage $validators - + SessionManager - + $services - + StorageFactory - + $options $type - + $config $options $type - + $services - + $_SESSION !== $storage - null === $this->name - null === $this->validatorChain + name]]> + validatorChain]]> - + $test - + initializeValidatorChain - + $validator - + $sid $validator $validatorValues - + new $validator(null) - + $id - + $oldSessionData - + $_SERVER['REQUEST_TIME'] - + $name $validatorChain SessionManager - - (bool) $config->getCookieHttpOnly() - (bool) $config->getCookieSecure() + + getCookieHttpOnly()]]> + getCookieSecure()]]> (bool) $deleteOldSession - - ! empty($oldSessionData) && is_array($oldSessionData) + + is_array($oldSessionData) - + $oldSessionData instanceof Traversable - + $_SESSION $this $this @@ -668,67 +690,67 @@ $values new ArrayIterator($_SESSION) - + SessionStorage SessionStorage array - array<TKey, TValue> + ]]> getIterator - + $_SESSION - + $_SESSION['__Laminas'] $_SESSION['__Laminas'][$key] $locks $locks $locks - + $_SESSION['__Laminas'][$key] - + $_SESSION[$key] $_SESSION[$key] $_SESSION[$key] $_SESSION[$key] - + $_SESSION[$key] $_SESSION['__Laminas'][$key] $locks $locks $readOnly - + bool float - - $this->getMetadata('_READONLY') - $this->getMetadata('_REQUEST_ACCESS_TIME') + + getMetadata('_READONLY')]]> + getMetadata('_REQUEST_ACCESS_TIME')]]> - + $metaData - + $key - + $_SESSION instanceof ArrayObject $locks - + is_object($input) - + $flags $iteratorClass - + $key $key $key @@ -745,7 +767,7 @@ '__Laminas' '__Laminas' - + $key $key $key @@ -757,21 +779,21 @@ $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 @@ -779,153 +801,156 @@ $this['__Laminas'] $this['__Laminas'][$key] - + bool float - - $this->getMetadata('_READONLY') - $this->getMetadata('_REQUEST_ACCESS_TIME') + + getMetadata('_READONLY')]]> + getMetadata('_REQUEST_ACCESS_TIME')]]> - + $metaData - + $key - + $this['__Laminas'] - + $this['__Laminas'][$key] - + ArrayStorage + + $locks + - + is_array($options) is_string($type) - + new $type($input) new $type($input, $flags, $iteratorClass) - + new $type($input) new $type($input, $flags, $iteratorClass) new $type($options) - + $options['iterator_class'] - + $flags $input - + new $type($options) - + AbstractSessionArrayStorage ArrayStorage StorageInterface - + $_SESSION[$key] $_SESSION[$key] - + '_IMMUTABLE' '_IMMUTABLE' '_IMMUTABLE' - + SessionStorage - - (array) $this->getArrayCopy() + + getArrayCopy()]]> - + $_SESSION !== $this $_SESSION !== $this $_SESSION instanceof ArrayObject - + is_object($input) is_object($input) - + ValidatorChainTrait - + CallbackHandler - - $this->attachValidator($eventName, $listener, $priority) + + attachValidator($eventName, $listener, $priority)]]> - + CallbackHandler - + $data $validator $validators - + new $validator($data) - + CallbackHandler - + $data - + $callback - + $data - + CallbackHandler|callable - + $callback - + $data $data $validator $validators - + new $validator($data) - + new TestContainer('Default', $manager) - + 'InvalidArgumentException' - + $handler $saveHandler 'foobar_bogus' @@ -938,52 +963,60 @@ 24 24 - + $handler $saveHandler - + 1 - + static function (?string $module = null) { static function (?string $module = null) { - + testCookieSameSiteAltersIniSetting testCookieSameSiteDefaultsToIniSettings testCookieSameSiteIsMutable - - var_export($this->config->toArray(), 1) + + config->toArray(), 1)]]> - + null - + assertFalse - - $this->config->getEntropyFile(); - $this->config->getEntropyLength(); - $this->config->getHashBitsPerCharacter(); - $this->config->getHashFunction(); - $this->config->setEntropyFile(__FILE__); - $this->config->setEntropyLength(0); - $this->config->setHashBitsPerCharacter(5); - $this->config->setHashFunction('foobar_bogus'); - $this->expectDeprecation(); - $this->expectDeprecation(); - $this->expectDeprecation(); - $this->expectDeprecation(); - $this->expectDeprecation(); - $this->expectDeprecation(); - $this->expectDeprecation(); - $this->expectDeprecation(); + + config->getEntropyFile();]]> + config->getEntropyLength();]]> + config->getHashBitsPerCharacter();]]> + config->getHashFunction();]]> + config->setEntropyFile(__FILE__);]]> + config->setEntropyLength(0);]]> + config->setHashBitsPerCharacter(5);]]> + config->setHashFunction('foobar_bogus');]]> + expectDeprecation();]]> + expectDeprecation();]]> + expectDeprecation();]]> + expectDeprecation();]]> + expectDeprecation();]]> + expectDeprecation();]]> + expectDeprecation();]]> + expectDeprecation();]]> - + + expectDeprecation + expectDeprecation + expectDeprecation + expectDeprecation + expectDeprecation + expectDeprecation + expectDeprecation + expectDeprecation getEntropyFile getEntropyLength getHashBitsPerCharacter @@ -993,7 +1026,7 @@ setHashBitsPerCharacter setHashFunction - + 'foobar_bogus' 'foobar_bogus' 'foobar_bogus' @@ -1005,18 +1038,18 @@ 24 24 - + testCookieSameSiteIsMutable - - (bool) $this->config->getUseCookies() + + config->getUseCookies()]]> - + $abstractFactories - + $aliases[SessionManager::class] $config['abstract_factories'] $config['aliases'] @@ -1028,25 +1061,25 @@ $factories[ConfigInterface::class] $factories[ManagerInterface::class] $factories[StorageInterface::class] - $this->config['dependencies']['aliases'] + config['dependencies']['aliases']]]> - + $config[LegacyConfigInterface::class] $config[LegacyManagerInterface::class] $config[LegacySessionManager::class] $config[LegacyStorageInterface::class] - + $abstractFactories $aliases $config $config $factories - + (new ConfigProvider())() - + LegacyConfigInterface LegacyManagerInterface LegacySessionManager @@ -1054,7 +1087,7 @@ - + $metadata $metadata $metadata @@ -1063,7 +1096,7 @@ $metadata['EXPIRE_HOPS_KEYS'] $metadata['EXPIRE_KEYS'] - + $metadata['EXPIRE'] $metadata['EXPIRE'] $metadata['EXPIRE_HOPS'] @@ -1082,9 +1115,9 @@ $metadata['EXPIRE_KEYS']['foo'] $storage['Default']['foo'] $storage['foo']['baz'] - $this->container['foo']['bar'] + container['foo']['bar']]]> - + $hops $metadata $metadata @@ -1096,10 +1129,10 @@ $metadata $metadata - - $this->manager->started + + manager->started]]> - + $_SERVER['REQUEST_TIME'] $_SERVER['REQUEST_TIME'] $_SERVER['REQUEST_TIME'] @@ -1108,51 +1141,45 @@ $_SERVER['REQUEST_TIME'] $_SERVER['REQUEST_TIME'] - + assertIsArray - + $container $container - - ! $this->adapter - $this->adapter + + adapter]]> + adapter]]> - + $data - + count - - $this->adapter + + adapter]]> assertTrue is_string($data) - + $data - + assertTrue is_string($data) - + CacheAdapter - - $firstArgs - $firstArgs - $firstArgs - $firstArgs - - + $options $options $options @@ -1161,14 +1188,14 @@ - + count count count count count - + 0 123 123 @@ -1177,46 +1204,46 @@ 456 456 - + getenv('TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MONGODB_CONNECTION_STRING') - - $this->mongoCollection + + mongoCollection]]> assertTrue is_string($data) - + $container - + getManager - + testServiceNotCreatedWhenInvalidSamesiteConfig - + $config - + getName - + $chain $chain $manager - + $listener[0] $validatorData[Validator\HttpUserAgent::class] $validatorData[Validator\RemoteAddr::class] - + $chain $chain $listener @@ -1233,7 +1260,7 @@ $manager $validatorData - + getConfig getSaveHandler getStorage @@ -1244,63 +1271,63 @@ start start - + $manager $manager - + $config['session_storage']['options'] $config['session_storage']['options']['input'] - + $storage $storage $test - + toArray - + $storage - + $_SESSION $_SESSION - + $_SESSION['test']['foo'] - $this->storage['foo']['bar'] - $this->storage['foo']['bar'] - $this->storage['foo']['bar'] - $this->storage['foo']['bar']['baz'] + storage['foo']['bar']]]> + storage['foo']['bar']]]> + storage['foo']['bar']]]> + storage['foo']['bar']['baz']]]> - + $_SESSION['foo']['bar'] - $this->storage['bar'][] - $this->storage['baz']['foo'] + storage['bar'][]]]> + storage['baz']['foo']]]> - + assertSame - + assertIsArray - - $this->error + + error]]> 1 1 [$this, 'handleErrors'] - + $_SESSION - + $_SESSION $compare $compare + 10 @@ -1320,12 +1347,12 @@ $sName $value - + $_SESSION[$key] $_SESSION[$key] $_SESSION['__Laminas']['_VALID'] - + $compare $config $config @@ -1353,62 +1380,62 @@ $value $value - + $compare $ttl - - $_SESSION->key1 - $_SESSION->key2 + + key1]]> + key2]]> - + $_SESSION - + var_export($headers, 1) var_export($headers, 1) - + $_SERVER['REQUEST_TIME'] $_SERVER['REQUEST_TIME'] - + $header $header - + assertFalse assertSame - + assertIsArray - + $origId - + getArrayCopy - + $_SESSION - - $this->storage['foo']['bar'] - $this->storage['foo']['bar'] - $this->storage['foo']['bar']['baz'] + + storage['foo']['bar']]]> + storage['foo']['bar']]]> + storage['foo']['bar']['baz']]]> - - $this->storage['foo']['bar'] - $this->storage['foo']['bar'] - $this->storage['foo']['bar']['baz'] + + storage['foo']['bar']]]> + storage['foo']['bar']]]> + storage['foo']['bar']['baz']]]> - + void void void @@ -1424,31 +1451,31 @@ - + TestContainer - + $id $id - + TestDbTableGatewaySaveHandler TestDbTableGatewaySaveHandler TestDbTableGatewaySaveHandler - + void void void - + ArrayStorage::class - + forgetMe getId getName @@ -1458,51 +1485,51 @@ sessionExists setValidatorChain - + TestManager - - class-string<StorageInterface> + + ]]> protected $storageDefaultClass = ArrayStorage::class; - + $data - + void void void - + $data - + bool string - + string - + string - + $bitsPerCharacter - + $backup - + $validator::$isValidCallCount diff --git a/src/AbstractContainer.php b/src/AbstractContainer.php index 3fca8412..d2d333f5 100644 --- a/src/AbstractContainer.php +++ b/src/AbstractContainer.php @@ -559,7 +559,7 @@ public function setExpirationHops($hops, $vars = null) $storage = $this->getStorage(); $ts = $storage->getRequestAccessTime(); - if (is_scalar($vars) && (null !== $vars)) { + if (is_scalar($vars)) { $vars = (array) $vars; } From 2511842867d7ddc7a605dba59f4f499a532a5a01 Mon Sep 17 00:00:00 2001 From: Rajesh Kumar Date: Thu, 2 Nov 2023 18:42:57 +0530 Subject: [PATCH 3/8] Fix the psalm errors --- psalm-baseline.xml | 25 +++++++++++++++++++++++ psalm.xml | 7 +++++++ src/SaveHandler/DbTableGatewayOptions.php | 2 ++ src/SaveHandler/MongoDBOptions.php | 2 ++ 4 files changed, 36 insertions(+) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 79393289..4aeb9541 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -141,6 +141,9 @@ $ts]]> ['hops' => $hops, 'ts' => $ts]]]> + + offsetSet + @@ -393,6 +396,9 @@ Container + + offsetGet + @@ -682,6 +688,10 @@ + + serialize + unserialize + $_SESSION $this @@ -859,6 +869,9 @@ + + offsetGet + $_SESSION[$key] $_SESSION[$key] @@ -946,7 +959,15 @@ new TestContainer('Default', $manager) + + + setAccessible + + + + setAccessible + 'InvalidArgumentException' @@ -1456,6 +1477,10 @@ + + read + destroy + $id $id diff --git a/psalm.xml b/psalm.xml index bece6c29..c1e5ca7c 100644 --- a/psalm.xml +++ b/psalm.xml @@ -14,6 +14,13 @@ + + + + + + + diff --git a/src/SaveHandler/DbTableGatewayOptions.php b/src/SaveHandler/DbTableGatewayOptions.php index 59a74152..2f6807fc 100644 --- a/src/SaveHandler/DbTableGatewayOptions.php +++ b/src/SaveHandler/DbTableGatewayOptions.php @@ -9,6 +9,8 @@ /** * DbTableGateway Save Handler Options + * + * @psalm-suppress MissingTemplateParam */ class DbTableGatewayOptions extends AbstractOptions { diff --git a/src/SaveHandler/MongoDBOptions.php b/src/SaveHandler/MongoDBOptions.php index e7e91bd4..2b41efa6 100644 --- a/src/SaveHandler/MongoDBOptions.php +++ b/src/SaveHandler/MongoDBOptions.php @@ -13,6 +13,8 @@ /** * MongoDB session save handler Options + * + * @psalm-suppress MissingTemplateParam */ class MongoDBOptions extends AbstractOptions { From bd2d86b17f9ff90b8b1ece70996578fe6fb00117 Mon Sep 17 00:00:00 2001 From: Rajesh Kumar Date: Fri, 3 Nov 2023 15:55:30 +0530 Subject: [PATCH 4/8] Resolve the pr comments --- composer.json | 8 ++++---- composer.lock | 18 +++++++++--------- psalm-baseline.xml | 8 -------- psalm.xml | 7 ------- test/Config/SessionConfigTest.php | 1 - test/ReflectionPropertyTrait.php | 1 - .../ContainerAbstractServiceFactoryTest.php | 2 +- test/Service/SessionConfigFactoryTest.php | 2 +- test/Service/SessionManagerFactoryTest.php | 2 +- test/Service/StorageFactoryTest.php | 2 +- 10 files changed, 17 insertions(+), 34 deletions(-) diff --git a/composer.json b/composer.json index 4bae9fc2..bdad6024 100644 --- a/composer.json +++ b/composer.json @@ -34,16 +34,16 @@ "require": { "php": "~8.1.0 || ~8.2.0 || ~8.3.0", "laminas/laminas-eventmanager": "^3.12", - "laminas/laminas-servicemanager": "^3.22.1", - "laminas/laminas-stdlib": "^3.18.0" + "laminas/laminas-servicemanager": "^3.22", + "laminas/laminas-stdlib": "^3.18" }, "require-dev": { - "laminas/laminas-cache": "^3.11.0", + "laminas/laminas-cache": "^3.10.1", "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.41.0", + "laminas/laminas-validator": "^2.30.1", "mongodb/mongodb": "~1.16.0", "phpunit/phpunit": "^9.6.13", "psalm/plugin-phpunit": "^0.18.4", diff --git a/composer.lock b/composer.lock index 308d697e..dcecf64f 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": "0f60f8fd5cfbf7125d0b33985e520e41", + "content-hash": "bc863c17f1a066006351f5d4bc39c80e", "packages": [ { "name": "laminas/laminas-eventmanager", @@ -1492,24 +1492,24 @@ }, { "name": "laminas/laminas-http", - "version": "2.18.0", + "version": "2.19.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-http.git", - "reference": "76de9008f889bc7088f85a41d0d2b06c2b59c53d" + "reference": "26dd6d1177e25d970058863c2afed12bb9dbff4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-http/zipball/76de9008f889bc7088f85a41d0d2b06c2b59c53d", - "reference": "76de9008f889bc7088f85a41d0d2b06c2b59c53d", + "url": "https://api.github.com/repos/laminas/laminas-http/zipball/26dd6d1177e25d970058863c2afed12bb9dbff4d", + "reference": "26dd6d1177e25d970058863c2afed12bb9dbff4d", "shasum": "" }, "require": { - "laminas/laminas-loader": "^2.8", + "laminas/laminas-loader": "^2.10", "laminas/laminas-stdlib": "^3.6", - "laminas/laminas-uri": "^2.9.1", + "laminas/laminas-uri": "^2.11", "laminas/laminas-validator": "^2.15", - "php": "~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "zendframework/zend-http": "*" @@ -1553,7 +1553,7 @@ "type": "community_bridge" } ], - "time": "2022-11-23T15:45:41+00:00" + "time": "2023-11-02T16:27:41+00:00" }, { "name": "laminas/laminas-loader", diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 4aeb9541..0798e21f 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -959,15 +959,7 @@ new TestContainer('Default', $manager) - - - setAccessible - - - - setAccessible - 'InvalidArgumentException' diff --git a/psalm.xml b/psalm.xml index c1e5ca7c..bece6c29 100644 --- a/psalm.xml +++ b/psalm.xml @@ -14,13 +14,6 @@ - - - - - - - diff --git a/test/Config/SessionConfigTest.php b/test/Config/SessionConfigTest.php index 28ea08eb..df6afe44 100644 --- a/test/Config/SessionConfigTest.php +++ b/test/Config/SessionConfigTest.php @@ -994,7 +994,6 @@ public function testSetPhpSaveHandlerRaisesExceptionForAttemptsToSetUserModule() public function testErrorSettingKnownSaveHandlerResultsInException(): void { $r = new ReflectionProperty($this->config, 'knownSaveHandlers'); - $r->setAccessible(true); $r->setValue($this->config, ['files', 'notreallyredis']); $this->expectException(Exception\InvalidArgumentException::class); diff --git a/test/ReflectionPropertyTrait.php b/test/ReflectionPropertyTrait.php index 0f6410a1..c6b14623 100644 --- a/test/ReflectionPropertyTrait.php +++ b/test/ReflectionPropertyTrait.php @@ -16,7 +16,6 @@ private function getReflectionProperty(object $object, string $property) { $reflectionObject = new ReflectionObject($object); $reflectionProperty = $reflectionObject->getProperty($property); - $reflectionProperty->setAccessible(true); return $reflectionProperty->getValue($object); } } diff --git a/test/Service/ContainerAbstractServiceFactoryTest.php b/test/Service/ContainerAbstractServiceFactoryTest.php index fb4564a6..aae86dcc 100644 --- a/test/Service/ContainerAbstractServiceFactoryTest.php +++ b/test/Service/ContainerAbstractServiceFactoryTest.php @@ -48,7 +48,7 @@ protected function setUp(): void ], ] ); - $this->services = new ServiceManager(); + $this->services = new ServiceManager($config); $config->configureServiceManager($this->services); } diff --git a/test/Service/SessionConfigFactoryTest.php b/test/Service/SessionConfigFactoryTest.php index 36de6996..47098560 100644 --- a/test/Service/SessionConfigFactoryTest.php +++ b/test/Service/SessionConfigFactoryTest.php @@ -30,7 +30,7 @@ protected function setUp(): void ], ] ); - $this->services = new ServiceManager(); + $this->services = new ServiceManager($config); $config->configureServiceManager($this->services); } diff --git a/test/Service/SessionManagerFactoryTest.php b/test/Service/SessionManagerFactoryTest.php index 87203be1..dd0b82d1 100644 --- a/test/Service/SessionManagerFactoryTest.php +++ b/test/Service/SessionManagerFactoryTest.php @@ -46,7 +46,7 @@ protected function setUp(): void ], ] ); - $this->services = new ServiceManager(); + $this->services = new ServiceManager($config); $config->configureServiceManager($this->services); } diff --git a/test/Service/StorageFactoryTest.php b/test/Service/StorageFactoryTest.php index d17046f8..9ed4a0b2 100644 --- a/test/Service/StorageFactoryTest.php +++ b/test/Service/StorageFactoryTest.php @@ -31,7 +31,7 @@ protected function setUp(): void ], ] ); - $this->services = new ServiceManager(); + $this->services = new ServiceManager($config); $config->configureServiceManager($this->services); } From 74bb73248ffdcd7a84f0520355c02b151dbbd1b4 Mon Sep 17 00:00:00 2001 From: Rajesh Kumar Date: Fri, 3 Nov 2023 18:23:24 +0530 Subject: [PATCH 5/8] Resolve the pr comments --- psalm-baseline.xml | 9 +++++++++ src/SaveHandler/DbTableGatewayOptions.php | 2 -- src/SaveHandler/MongoDBOptions.php | 2 -- test/Service/ContainerAbstractServiceFactoryTest.php | 8 ++------ test/Service/SessionConfigFactoryTest.php | 8 ++------ test/Service/SessionManagerFactoryTest.php | 8 ++------ test/Service/StorageFactoryTest.php | 8 ++------ 7 files changed, 17 insertions(+), 28 deletions(-) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 0798e21f..cbd11793 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -457,6 +457,9 @@ + + DbTableGatewayOptions + (string) $dataColumn (string) $idColumn @@ -512,6 +515,9 @@ + + MongoDBOptions + saveOptions === ['w' => 1]]]> saveOptions === ['w' => 1]]]> @@ -1227,6 +1233,9 @@ + + new Config + $container diff --git a/src/SaveHandler/DbTableGatewayOptions.php b/src/SaveHandler/DbTableGatewayOptions.php index 2f6807fc..59a74152 100644 --- a/src/SaveHandler/DbTableGatewayOptions.php +++ b/src/SaveHandler/DbTableGatewayOptions.php @@ -9,8 +9,6 @@ /** * DbTableGateway Save Handler Options - * - * @psalm-suppress MissingTemplateParam */ class DbTableGatewayOptions extends AbstractOptions { diff --git a/src/SaveHandler/MongoDBOptions.php b/src/SaveHandler/MongoDBOptions.php index 2b41efa6..e7e91bd4 100644 --- a/src/SaveHandler/MongoDBOptions.php +++ b/src/SaveHandler/MongoDBOptions.php @@ -13,8 +13,6 @@ /** * MongoDB session save handler Options - * - * @psalm-suppress MissingTemplateParam */ class MongoDBOptions extends AbstractOptions { diff --git a/test/Service/ContainerAbstractServiceFactoryTest.php b/test/Service/ContainerAbstractServiceFactoryTest.php index aae86dcc..1d46c6b1 100644 --- a/test/Service/ContainerAbstractServiceFactoryTest.php +++ b/test/Service/ContainerAbstractServiceFactoryTest.php @@ -34,8 +34,7 @@ class ContainerAbstractServiceFactoryTest extends TestCase protected function setUp(): void { - $config = new Config( - [ + $this->services = new ServiceManager([ 'services' => [ 'config' => $this->config, StorageInterface::class => new ArrayStorage(), @@ -46,10 +45,7 @@ protected function setUp(): void 'abstract_factories' => [ ContainerAbstractServiceFactory::class, ], - ] - ); - $this->services = new ServiceManager($config); - $config->configureServiceManager($this->services); + ]); } /** @psalm-return array */ diff --git a/test/Service/SessionConfigFactoryTest.php b/test/Service/SessionConfigFactoryTest.php index 47098560..9a0123cd 100644 --- a/test/Service/SessionConfigFactoryTest.php +++ b/test/Service/SessionConfigFactoryTest.php @@ -23,15 +23,11 @@ class SessionConfigFactoryTest extends TestCase protected function setUp(): void { - $config = new Config( - [ + $this->services = new ServiceManager([ 'factories' => [ ConfigInterface::class => SessionConfigFactory::class, ], - ] - ); - $this->services = new ServiceManager($config); - $config->configureServiceManager($this->services); + ]); } public function testCreatesSessionConfigByDefault(): void diff --git a/test/Service/SessionManagerFactoryTest.php b/test/Service/SessionManagerFactoryTest.php index dd0b82d1..19862882 100644 --- a/test/Service/SessionManagerFactoryTest.php +++ b/test/Service/SessionManagerFactoryTest.php @@ -37,17 +37,13 @@ class SessionManagerFactoryTest extends TestCase protected function setUp(): void { - $config = new Config( - [ + $this->services = new ServiceManager([ 'factories' => [ ManagerInterface::class => SessionManagerFactory::class, TestManager::class => SessionManagerFactory::class, TestSaveHandler::class => SessionManagerFactory::class, ], - ] - ); - $this->services = new ServiceManager($config); - $config->configureServiceManager($this->services); + ]); } public function testCreatesSessionManager(): void diff --git a/test/Service/StorageFactoryTest.php b/test/Service/StorageFactoryTest.php index 9ed4a0b2..321bfa12 100644 --- a/test/Service/StorageFactoryTest.php +++ b/test/Service/StorageFactoryTest.php @@ -24,15 +24,11 @@ class StorageFactoryTest extends TestCase protected function setUp(): void { - $config = new Config( - [ + $this->services = new ServiceManager([ 'factories' => [ StorageInterface::class => StorageFactory::class, ], - ] - ); - $this->services = new ServiceManager($config); - $config->configureServiceManager($this->services); + ]); } /** From 6285c3825a5ffc6b1d5cc1481cbd449cc8aee341 Mon Sep 17 00:00:00 2001 From: Rajesh Kumar Date: Fri, 3 Nov 2023 18:31:19 +0530 Subject: [PATCH 6/8] Fixed codesniffer errors --- .../ContainerAbstractServiceFactoryTest.php | 23 +++++++++---------- test/Service/SessionConfigFactoryTest.php | 9 ++++---- test/Service/SessionManagerFactoryTest.php | 13 +++++------ test/Service/StorageFactoryTest.php | 9 ++++---- 4 files changed, 25 insertions(+), 29 deletions(-) diff --git a/test/Service/ContainerAbstractServiceFactoryTest.php b/test/Service/ContainerAbstractServiceFactoryTest.php index 1d46c6b1..55d1c3bd 100644 --- a/test/Service/ContainerAbstractServiceFactoryTest.php +++ b/test/Service/ContainerAbstractServiceFactoryTest.php @@ -4,7 +4,6 @@ namespace LaminasTest\Session\Service; -use Laminas\ServiceManager\Config; use Laminas\ServiceManager\ServiceManager; use Laminas\Session\Container; use Laminas\Session\ManagerInterface; @@ -35,17 +34,17 @@ class ContainerAbstractServiceFactoryTest extends TestCase protected function setUp(): void { $this->services = new ServiceManager([ - 'services' => [ - 'config' => $this->config, - StorageInterface::class => new ArrayStorage(), - ], - 'factories' => [ - ManagerInterface::class => SessionManagerFactory::class, - ], - 'abstract_factories' => [ - ContainerAbstractServiceFactory::class, - ], - ]); + 'services' => [ + 'config' => $this->config, + StorageInterface::class => new ArrayStorage(), + ], + 'factories' => [ + ManagerInterface::class => SessionManagerFactory::class, + ], + 'abstract_factories' => [ + ContainerAbstractServiceFactory::class, + ], + ]); } /** @psalm-return array */ diff --git a/test/Service/SessionConfigFactoryTest.php b/test/Service/SessionConfigFactoryTest.php index 9a0123cd..dbc41083 100644 --- a/test/Service/SessionConfigFactoryTest.php +++ b/test/Service/SessionConfigFactoryTest.php @@ -4,7 +4,6 @@ namespace LaminasTest\Session\Service; -use Laminas\ServiceManager\Config; use Laminas\ServiceManager\Exception\ServiceNotCreatedException; use Laminas\ServiceManager\ServiceManager; use Laminas\Session\Config\ConfigInterface; @@ -24,10 +23,10 @@ class SessionConfigFactoryTest extends TestCase protected function setUp(): void { $this->services = new ServiceManager([ - 'factories' => [ - ConfigInterface::class => SessionConfigFactory::class, - ], - ]); + 'factories' => [ + ConfigInterface::class => SessionConfigFactory::class, + ], + ]); } public function testCreatesSessionConfigByDefault(): void diff --git a/test/Service/SessionManagerFactoryTest.php b/test/Service/SessionManagerFactoryTest.php index 19862882..793bda65 100644 --- a/test/Service/SessionManagerFactoryTest.php +++ b/test/Service/SessionManagerFactoryTest.php @@ -5,7 +5,6 @@ namespace LaminasTest\Session\Service; use Laminas\EventManager\Test\EventListenerIntrospectionTrait; -use Laminas\ServiceManager\Config; use Laminas\ServiceManager\Exception\ServiceNotCreatedException; use Laminas\ServiceManager\ServiceManager; use Laminas\Session\Config\ConfigInterface; @@ -38,12 +37,12 @@ class SessionManagerFactoryTest extends TestCase protected function setUp(): void { $this->services = new ServiceManager([ - 'factories' => [ - ManagerInterface::class => SessionManagerFactory::class, - TestManager::class => SessionManagerFactory::class, - TestSaveHandler::class => SessionManagerFactory::class, - ], - ]); + 'factories' => [ + ManagerInterface::class => SessionManagerFactory::class, + TestManager::class => SessionManagerFactory::class, + TestSaveHandler::class => SessionManagerFactory::class, + ], + ]); } public function testCreatesSessionManager(): void diff --git a/test/Service/StorageFactoryTest.php b/test/Service/StorageFactoryTest.php index 321bfa12..1268262c 100644 --- a/test/Service/StorageFactoryTest.php +++ b/test/Service/StorageFactoryTest.php @@ -5,7 +5,6 @@ namespace LaminasTest\Session\Service; use ArrayObject; -use Laminas\ServiceManager\Config; use Laminas\ServiceManager\Exception\ServiceNotCreatedException; use Laminas\ServiceManager\ServiceManager; use Laminas\Session\Config\StandardConfig; @@ -25,10 +24,10 @@ class StorageFactoryTest extends TestCase protected function setUp(): void { $this->services = new ServiceManager([ - 'factories' => [ - StorageInterface::class => StorageFactory::class, - ], - ]); + 'factories' => [ + StorageInterface::class => StorageFactory::class, + ], + ]); } /** From d1ea90898eb0c5d2dfdb2813a4c50b60ae9f0efa Mon Sep 17 00:00:00 2001 From: Rajesh Kumar Date: Thu, 9 Nov 2023 11:35:47 +0530 Subject: [PATCH 7/8] Adds PHP 8.3 as new supported version --- .laminas-ci/install-mongodb-extension-via-pecl.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.laminas-ci/install-mongodb-extension-via-pecl.sh b/.laminas-ci/install-mongodb-extension-via-pecl.sh index cf9e2efe..ac9d1385 100755 --- a/.laminas-ci/install-mongodb-extension-via-pecl.sh +++ b/.laminas-ci/install-mongodb-extension-via-pecl.sh @@ -2,13 +2,14 @@ PHP_VERSION="$1" -if ! [[ "${PHP_VERSION}" =~ 8\.2 ]]; then - echo "mongodb is only installed from pecl for PHP 8.2, ${PHP_VERSION} detected." +if ! [[ "${PHP_VERSION}" =~ 8\.3 ]]; then + echo "mongodb is only installed from pecl for PHP 8.3, ${PHP_VERSION} detected." exit 0; fi set +e +apt install make pecl install mongodb echo "extension=mongodb.so" > /etc/php/${PHP_VERSION}/mods-available/mongodb.ini -phpenmod -v ${PHP} -s cli mongodb +phpenmod -v ${PHP} -s cli mongodb \ No newline at end of file From b864dd7de5f776e6c80f14050812b5698530bdfa Mon Sep 17 00:00:00 2001 From: Rajesh Kumar Date: Thu, 9 Nov 2023 13:44:20 +0530 Subject: [PATCH 8/8] Config is no longer used, so no need to suppress --- psalm-baseline.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index cbd11793..62c3bc7e 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1233,9 +1233,6 @@ - - new Config - $container