From a067c448bbe7abb3b325952d09519e6eab0ea078 Mon Sep 17 00:00:00 2001 From: George Steel Date: Thu, 25 Jan 2024 15:12:05 +0000 Subject: [PATCH 01/23] Note JSON view helper changes in v3 preparation guide Signed-off-by: George Steel --- docs/book/v2/migration/preparing-for-v3.md | 12 +++++++++++- test/Helper/JsonTest.php | 13 +++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/docs/book/v2/migration/preparing-for-v3.md b/docs/book/v2/migration/preparing-for-v3.md index 6787e769c..2ce872bdf 100644 --- a/docs/book/v2/migration/preparing-for-v3.md +++ b/docs/book/v2/migration/preparing-for-v3.md @@ -30,7 +30,7 @@ try { } ``` -## Deprecations +## Deprecations ### Undocumented Behaviour @@ -44,3 +44,13 @@ This deprecation can be safely ignored but in order to prepare for its removal i In version 2, the `TemplatePathStack` template resolver automatically registers a stream wrapper for templates when the php.ini setting `short_open_tag` was turned off. The purpose of the stream wrapper was to convert template files using the short open tag `` to `` so that templates would continue to be processed in environments where short_open_tag was turned off. Since PHP 5.4.0, `` in environments where `short_open_tag` is **off**. To mitigate the impact of this removal, you should ensure that, where relevant, all of your templates use the full `expectNotToPerformAssertions(); $this->helper->__invoke(['foo'], ['enableJsonExprFinder' => 'anything other than true']); } + + public function testTheHelperWillPrettyPrintWhenRequired(): void + { + $input = [ + 'dory' => 'blue', + 'nemo' => 'orange', + ]; + $expect = json_encode($input, JSON_THROW_ON_ERROR | JSON_PRETTY_PRINT); + self::assertSame($expect, ($this->helper)->__invoke($input, ['prettyPrint' => true])); + } } From fe4e6ae8d0364679716f1a76798e25ba3503a51f Mon Sep 17 00:00:00 2001 From: George Steel Date: Fri, 26 Jan 2024 09:48:50 +0000 Subject: [PATCH 02/23] Deprecate the JSON view helper entirely Signed-off-by: George Steel --- docs/book/v2/helpers/json.md | 41 +++++++++------------- docs/book/v2/migration/preparing-for-v3.md | 8 ++--- src/Helper/Json.php | 2 ++ test/Helper/JsonTest.php | 5 +++ 4 files changed, 26 insertions(+), 30 deletions(-) diff --git a/docs/book/v2/helpers/json.md b/docs/book/v2/helpers/json.md index 4a4056a02..a676cc9c1 100644 --- a/docs/book/v2/helpers/json.md +++ b/docs/book/v2/helpers/json.md @@ -1,5 +1,11 @@ # Json +> WARNING: **Deprecated** +> +> The JSON view helper has been deprecated and will be removed in version 3.0. +> There is no replacement; +> however, it is trivial to encode data by using PHP's built-in [`json_encode`](https://www.php.net/json_encode) function. + When creating views that return JSON, it's important to also set the appropriate response header. The JSON view helper does exactly that. In addition, by default, it disables layouts (if currently enabled), as layouts generally aren't @@ -20,28 +26,13 @@ determine how to handle the content. json($this->data) ?> ``` -> WARNING: **Deprecated** -> -> ### Enabling encoding using Laminas\Json\Expr -> -> **This feature of the Json view helper has been deprecated in version 2.16 and will be removed in version 3.0.** -> -> The JSON helper accepts an array of options that will be passed to `Laminas\Json\Json::encode()` and -> used internally to encode data. -> `Laminas\Json\Json::encode` allows the encoding of native JSON expressions using `Laminas\Json\Expr` -> objects. This option is disabled by default. To enable this option, pass a boolean `true` to the -> `enableJsonExprFinder` key of the options array: -> -> ```php -> json($this->data, ['enableJsonExprFinder' => true]) ?> -> `` -> -> The JSON helper accepts an array of options that will be passed to `Laminas\Json\Json::encode()` and -> used internally to encode data. -> `Laminas\Json\Json::encode` allows the encoding of native JSON expressions using `Laminas\Json\Expr` -> objects. This option is disabled by default. To enable this option, pass a boolean `true` to the -> `enableJsonExprFinder` key of the options array: -> -> ```php -> json($this->data, ['enableJsonExprFinder' => true]) ?> -> ``` +### Enabling encoding using Laminas\Json\Expr + +The JSON helper accepts an array of options that will be passed to `Laminas\Json\Json::encode()` and used internally to encode data. +`Laminas\Json\Json::encode` allows the encoding of native JSON expressions using `Laminas\Json\Expr` objects. +This option is disabled by default. +To enable this option, pass a boolean `true` to the `enableJsonExprFinder` key of the options array: + +```php +json($this->data, ['enableJsonExprFinder' => true]) ?> +``` diff --git a/docs/book/v2/migration/preparing-for-v3.md b/docs/book/v2/migration/preparing-for-v3.md index 2ce872bdf..fed3b39cb 100644 --- a/docs/book/v2/migration/preparing-for-v3.md +++ b/docs/book/v2/migration/preparing-for-v3.md @@ -47,10 +47,8 @@ The impact of this future removal will affect templates that use a regular short ## View Helper Changes -### [Json View Helper](../helpers/json.md) +### Deprecated View Helpers Scheduled for Removal in 3.0 -In version 3, the JSON view helper will no longer set response headers _(For MVC requests)_ when used. -If you are using this feature, you will need to refactor your controllers to return the correct mime-type rather than relying on the view helper to do it for you. +The following view helpers are deprecated and will be removed in version 3.0 of `laminas-view`. -Currently, the [Json View Helper](../helpers/json.md) makes use of the [laminas-json](https://docs.laminas.dev/laminas-json/) library enabling the encoding of [JSON Expressions](https://docs.laminas.dev/laminas-json/advanced/#json-expressions). -Support for JSON expressions is being removed in version 3, so you will need to ensure that you are not using this feature prior to upgrading. +- The [Json View Helper](../helpers/json.md) diff --git a/src/Helper/Json.php b/src/Helper/Json.php index e54a66fe8..ca285d299 100644 --- a/src/Helper/Json.php +++ b/src/Helper/Json.php @@ -14,6 +14,8 @@ /** * Helper for simplifying JSON responses * + * @deprecated This view helper is obsolete and will be removed in version 3.0 + * * @psalm-suppress DeprecatedProperty * @final */ diff --git a/test/Helper/JsonTest.php b/test/Helper/JsonTest.php index b46754d3b..1672a91f8 100644 --- a/test/Helper/JsonTest.php +++ b/test/Helper/JsonTest.php @@ -19,6 +19,11 @@ use const JSON_PRETTY_PRINT; use const JSON_THROW_ON_ERROR; +/** + * @deprecated To be removed with the Json View Helper in v3.0 + * + * @psalm-suppress DeprecatedClass + */ class JsonTest extends TestCase { private Response $response; From 092db0dcdebc264ff6fcfe9ebc0b3a9185ed98d3 Mon Sep 17 00:00:00 2001 From: George Steel Date: Fri, 26 Jan 2024 10:02:06 +0000 Subject: [PATCH 03/23] Baseline deprecation issue Signed-off-by: George Steel --- psalm-baseline.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 12f91ef14..c1d5abb8d 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -104,6 +104,11 @@ vars + + + self + + null === static::$registeredDoctypes From 7577f7dc472ff46a5096662281ac529ea89cb1eb Mon Sep 17 00:00:00 2001 From: George Steel Date: Fri, 26 Jan 2024 11:14:17 +0000 Subject: [PATCH 04/23] Correct markdown callout formatting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Frank Brückner Signed-off-by: George Steel --- docs/book/v2/helpers/json.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/book/v2/helpers/json.md b/docs/book/v2/helpers/json.md index a676cc9c1..455554cf3 100644 --- a/docs/book/v2/helpers/json.md +++ b/docs/book/v2/helpers/json.md @@ -1,10 +1,8 @@ # Json -> WARNING: **Deprecated** -> -> The JSON view helper has been deprecated and will be removed in version 3.0. -> There is no replacement; -> however, it is trivial to encode data by using PHP's built-in [`json_encode`](https://www.php.net/json_encode) function. +WARNING: **Deprecated** +The JSON view helper has been deprecated and will be removed in version 3.0. +There is no replacement; however, it is trivial to encode data by using PHP's built-in [`json_encode`](https://www.php.net/json_encode) function. When creating views that return JSON, it's important to also set the appropriate response header. The JSON view helper does exactly that. In addition, by From 242cc3df43f5486c4cf2cfb632d108c80b40644e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 02:29:07 +0000 Subject: [PATCH 05/23] Lock file maintenance Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index e66b091ac..e00a337b3 100644 --- a/composer.lock +++ b/composer.lock @@ -2620,16 +2620,16 @@ }, { "name": "netresearch/jsonmapper", - "version": "v4.2.0", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "f60565f8c0566a31acf06884cdaa591867ecc956" + "reference": "18133a2d8c24e10e58e02b700308ed3a4a60c97f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/f60565f8c0566a31acf06884cdaa591867ecc956", - "reference": "f60565f8c0566a31acf06884cdaa591867ecc956", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/18133a2d8c24e10e58e02b700308ed3a4a60c97f", + "reference": "18133a2d8c24e10e58e02b700308ed3a4a60c97f", "shasum": "" }, "require": { @@ -2640,7 +2640,7 @@ "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0", + "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0 || ~10.0", "squizlabs/php_codesniffer": "~3.5" }, "type": "library", @@ -2665,9 +2665,9 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.2.0" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.4.0" }, - "time": "2023-04-09T17:37:40+00:00" + "time": "2024-01-28T07:31:37+00:00" }, { "name": "nikic/php-parser", From f1933d29b5591c19b0be1e67e06bee54fc1a66ba Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 00:50:47 +0000 Subject: [PATCH 06/23] Lock file maintenance Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- composer.lock | 70 +++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/composer.lock b/composer.lock index e00a337b3..6780ea2e4 100644 --- a/composer.lock +++ b/composer.lock @@ -2620,16 +2620,16 @@ }, { "name": "netresearch/jsonmapper", - "version": "v4.4.0", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "18133a2d8c24e10e58e02b700308ed3a4a60c97f" + "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/18133a2d8c24e10e58e02b700308ed3a4a60c97f", - "reference": "18133a2d8c24e10e58e02b700308ed3a4a60c97f", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/132c75c7dd83e45353ebb9c6c9f591952995bbf0", + "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0", "shasum": "" }, "require": { @@ -2665,9 +2665,9 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.4.0" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.4.1" }, - "time": "2024-01-28T07:31:37+00:00" + "time": "2024-01-31T06:18:54+00:00" }, { "name": "nikic/php-parser", @@ -3368,16 +3368,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.9", + "version": "10.5.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe" + "reference": "50b8e314b6d0dd06521dc31d1abffa73f25f850c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe", - "reference": "0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/50b8e314b6d0dd06521dc31d1abffa73f25f850c", + "reference": "50b8e314b6d0dd06521dc31d1abffa73f25f850c", "shasum": "" }, "require": { @@ -3449,7 +3449,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.9" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.10" }, "funding": [ { @@ -3465,7 +3465,7 @@ "type": "tidelift" } ], - "time": "2024-01-22T14:35:40+00:00" + "time": "2024-02-04T09:07:51+00:00" }, { "name": "psalm/plugin-phpunit", @@ -4751,16 +4751,16 @@ }, { "name": "symfony/console", - "version": "v6.4.2", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625" + "reference": "2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/0254811a143e6bc6c8deea08b589a7e68a37f625", - "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625", + "url": "https://api.github.com/repos/symfony/console/zipball/2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e", + "reference": "2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e", "shasum": "" }, "require": { @@ -4825,7 +4825,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.2" + "source": "https://github.com/symfony/console/tree/v6.4.3" }, "funding": [ { @@ -4841,7 +4841,7 @@ "type": "tidelift" } ], - "time": "2023-12-10T16:15:48+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/deprecation-contracts", @@ -4912,16 +4912,16 @@ }, { "name": "symfony/filesystem", - "version": "v6.4.0", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59" + "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/952a8cb588c3bc6ce76f6023000fb932f16a6e59", - "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb", + "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb", "shasum": "" }, "require": { @@ -4955,7 +4955,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.4.0" + "source": "https://github.com/symfony/filesystem/tree/v6.4.3" }, "funding": [ { @@ -4971,7 +4971,7 @@ "type": "tidelift" } ], - "time": "2023-07-26T17:27:13+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5387,16 +5387,16 @@ }, { "name": "symfony/string", - "version": "v6.4.2", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc" + "reference": "7a14736fb179876575464e4658fce0c304e8c15b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/7cb80bc10bfcdf6b5492741c0b9357dac66940bc", - "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc", + "url": "https://api.github.com/repos/symfony/string/zipball/7a14736fb179876575464e4658fce0c304e8c15b", + "reference": "7a14736fb179876575464e4658fce0c304e8c15b", "shasum": "" }, "require": { @@ -5453,7 +5453,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.2" + "source": "https://github.com/symfony/string/tree/v6.4.3" }, "funding": [ { @@ -5469,7 +5469,7 @@ "type": "tidelift" } ], - "time": "2023-12-10T16:15:48+00:00" + "time": "2024-01-25T09:26:29+00:00" }, { "name": "theseer/tokenizer", @@ -5523,16 +5523,16 @@ }, { "name": "vimeo/psalm", - "version": "5.20.0", + "version": "5.21.1", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "3f284e96c9d9be6fe6b15c79416e1d1903dcfef4" + "reference": "8c473e2437be8b6a8fd8f630f0f11a16b114c494" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/3f284e96c9d9be6fe6b15c79416e1d1903dcfef4", - "reference": "3f284e96c9d9be6fe6b15c79416e1d1903dcfef4", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/8c473e2437be8b6a8fd8f630f0f11a16b114c494", + "reference": "8c473e2437be8b6a8fd8f630f0f11a16b114c494", "shasum": "" }, "require": { @@ -5629,7 +5629,7 @@ "issues": "https://github.com/vimeo/psalm/issues", "source": "https://github.com/vimeo/psalm" }, - "time": "2024-01-18T12:15:06+00:00" + "time": "2024-02-01T01:04:32+00:00" }, { "name": "webimpress/coding-standard", From b2f661ec3b1017c5aad2aa90f4fb4e666e3ae7e0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 01:37:43 +0000 Subject: [PATCH 07/23] Lock file maintenance Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- composer.lock | 84 ++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 48 deletions(-) diff --git a/composer.lock b/composer.lock index 6780ea2e4..0641241fb 100644 --- a/composer.lock +++ b/composer.lock @@ -1117,16 +1117,16 @@ }, { "name": "fidry/cpu-core-counter", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/theofidry/cpu-core-counter.git", - "reference": "85193c0b0cb5c47894b5eaec906e946f054e7077" + "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/85193c0b0cb5c47894b5eaec906e946f054e7077", - "reference": "85193c0b0cb5c47894b5eaec906e946f054e7077", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/f92996c4d5c1a696a6a970e20f7c4216200fcc42", + "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42", "shasum": "" }, "require": { @@ -1166,7 +1166,7 @@ ], "support": { "issues": "https://github.com/theofidry/cpu-core-counter/issues", - "source": "https://github.com/theofidry/cpu-core-counter/tree/1.0.0" + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.1.0" }, "funding": [ { @@ -1174,7 +1174,7 @@ "type": "github" } ], - "time": "2023-09-17T21:38:23+00:00" + "time": "2024-02-07T09:43:46+00:00" }, { "name": "laminas/laminas-authentication", @@ -4608,16 +4608,16 @@ }, { "name": "spatie/array-to-xml", - "version": "3.2.2", + "version": "3.2.3", "source": { "type": "git", "url": "https://github.com/spatie/array-to-xml.git", - "reference": "96be97e664c87613121d073ea39af4c74e57a7f8" + "reference": "c95fd4db94ec199f798d4b5b4a81757bd20d88ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/96be97e664c87613121d073ea39af4c74e57a7f8", - "reference": "96be97e664c87613121d073ea39af4c74e57a7f8", + "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/c95fd4db94ec199f798d4b5b4a81757bd20d88ab", + "reference": "c95fd4db94ec199f798d4b5b4a81757bd20d88ab", "shasum": "" }, "require": { @@ -4655,7 +4655,7 @@ "xml" ], "support": { - "source": "https://github.com/spatie/array-to-xml/tree/3.2.2" + "source": "https://github.com/spatie/array-to-xml/tree/3.2.3" }, "funding": [ { @@ -4667,7 +4667,7 @@ "type": "github" } ], - "time": "2023-11-14T14:08:51+00:00" + "time": "2024-02-07T10:39:02+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -4975,16 +4975,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", "shasum": "" }, "require": { @@ -4998,9 +4998,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -5037,7 +5034,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" }, "funding": [ { @@ -5053,20 +5050,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "875e90aeea2777b6f135677f618529449334a612" + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", - "reference": "875e90aeea2777b6f135677f618529449334a612", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", "shasum": "" }, "require": { @@ -5077,9 +5074,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -5118,7 +5112,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" }, "funding": [ { @@ -5134,20 +5128,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" + "reference": "bc45c394692b948b4d383a08d7753968bed9a83d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", - "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", + "reference": "bc45c394692b948b4d383a08d7753968bed9a83d", "shasum": "" }, "require": { @@ -5158,9 +5152,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -5202,7 +5193,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" }, "funding": [ { @@ -5218,20 +5209,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "42292d99c55abe617799667f454222c54c60e229" + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", - "reference": "42292d99c55abe617799667f454222c54c60e229", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", "shasum": "" }, "require": { @@ -5245,9 +5236,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -5285,7 +5273,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" }, "funding": [ { @@ -5301,7 +5289,7 @@ "type": "tidelift" } ], - "time": "2023-07-28T09:04:16+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/service-contracts", From 29183740d3d68f0d2392b74b9bb730e393336472 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 00:04:20 +0000 Subject: [PATCH 08/23] Lock file maintenance Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- composer.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/composer.lock b/composer.lock index 0641241fb..ccaf4d225 100644 --- a/composer.lock +++ b/composer.lock @@ -2338,16 +2338,16 @@ }, { "name": "laminas/laminas-session", - "version": "2.17.0", + "version": "2.18.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-session.git", - "reference": "2f255f1b4349a9f330ba1a26dcf4e2773a6a8226" + "reference": "da3d651f0f7d5350cefd6b160761651b35fc3cde" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-session/zipball/2f255f1b4349a9f330ba1a26dcf4e2773a6a8226", - "reference": "2f255f1b4349a9f330ba1a26dcf4e2773a6a8226", + "url": "https://api.github.com/repos/laminas/laminas-session/zipball/da3d651f0f7d5350cefd6b160761651b35fc3cde", + "reference": "da3d651f0f7d5350cefd6b160761651b35fc3cde", "shasum": "" }, "require": { @@ -2360,16 +2360,16 @@ "zendframework/zend-session": "*" }, "require-dev": { - "laminas/laminas-cache": "^3.10.1", + "laminas/laminas-cache": "^3.12.0", "laminas/laminas-cache-storage-adapter-memory": "^2.3", "laminas/laminas-coding-standard": "~2.5.0", "laminas/laminas-db": "^2.18.0", - "laminas/laminas-http": "^2.18", - "laminas/laminas-validator": "^2.30.1", - "mongodb/mongodb": "~1.16.0", - "phpunit/phpunit": "^9.6.13", + "laminas/laminas-http": "^2.19", + "laminas/laminas-validator": "^2.46.0", + "mongodb/mongodb": "~1.16.1", + "phpunit/phpunit": "^9.6.15", "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.15" + "vimeo/psalm": "^5.18" }, "suggest": { "laminas/laminas-cache": "Laminas\\Cache component", @@ -2415,7 +2415,7 @@ "type": "community_bridge" } ], - "time": "2023-11-10T12:20:40+00:00" + "time": "2024-02-14T10:46:39+00:00" }, { "name": "laminas/laminas-uri", @@ -4671,16 +4671,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.8.1", + "version": "3.9.0", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "14f5fff1e64118595db5408e946f3a22c75807f7" + "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/14f5fff1e64118595db5408e946f3a22c75807f7", - "reference": "14f5fff1e64118595db5408e946f3a22c75807f7", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b", + "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b", "shasum": "" }, "require": { @@ -4747,7 +4747,7 @@ "type": "open_collective" } ], - "time": "2024-01-11T20:47:48+00:00" + "time": "2024-02-16T15:06:51+00:00" }, { "name": "symfony/console", @@ -5511,16 +5511,16 @@ }, { "name": "vimeo/psalm", - "version": "5.21.1", + "version": "5.22.1", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "8c473e2437be8b6a8fd8f630f0f11a16b114c494" + "reference": "e9dad66e11274315dac27e08349c628c7d6a1a43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/8c473e2437be8b6a8fd8f630f0f11a16b114c494", - "reference": "8c473e2437be8b6a8fd8f630f0f11a16b114c494", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/e9dad66e11274315dac27e08349c628c7d6a1a43", + "reference": "e9dad66e11274315dac27e08349c628c7d6a1a43", "shasum": "" }, "require": { @@ -5543,7 +5543,7 @@ "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", "nikic/php-parser": "^4.16", "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", - "sebastian/diff": "^4.0 || ^5.0", + "sebastian/diff": "^4.0 || ^5.0 || ^6.0", "spatie/array-to-xml": "^2.17.0 || ^3.0", "symfony/console": "^4.1.6 || ^5.0 || ^6.0 || ^7.0", "symfony/filesystem": "^5.4 || ^6.0 || ^7.0" @@ -5617,7 +5617,7 @@ "issues": "https://github.com/vimeo/psalm/issues", "source": "https://github.com/vimeo/psalm" }, - "time": "2024-02-01T01:04:32+00:00" + "time": "2024-02-15T22:52:31+00:00" }, { "name": "webimpress/coding-standard", From 8ec5a8172fbac78a4cb8c1f0faae55649f82e71c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 01:04:48 +0000 Subject: [PATCH 09/23] Lock file maintenance Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- composer.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/composer.lock b/composer.lock index ccaf4d225..2cda81314 100644 --- a/composer.lock +++ b/composer.lock @@ -2477,16 +2477,16 @@ }, { "name": "laminas/laminas-validator", - "version": "2.47.0", + "version": "2.49.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-validator.git", - "reference": "5c3fc8c4f1263cda5c5f14aed874fdadd5b90bbd" + "reference": "d58c2e7d3cd420554400dd8cca694fafa3b8e45f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/5c3fc8c4f1263cda5c5f14aed874fdadd5b90bbd", - "reference": "5c3fc8c4f1263cda5c5f14aed874fdadd5b90bbd", + "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/d58c2e7d3cd420554400dd8cca694fafa3b8e45f", + "reference": "d58c2e7d3cd420554400dd8cca694fafa3b8e45f", "shasum": "" }, "require": { @@ -2500,16 +2500,16 @@ }, "require-dev": { "laminas/laminas-coding-standard": "^2.5", - "laminas/laminas-db": "^2.18", - "laminas/laminas-filter": "^2.33", - "laminas/laminas-i18n": "^2.24.1", - "laminas/laminas-session": "^2.17", + "laminas/laminas-db": "^2.19", + "laminas/laminas-filter": "^2.34", + "laminas/laminas-i18n": "^2.26.0", + "laminas/laminas-session": "^2.18", "laminas/laminas-uri": "^2.11.0", - "phpunit/phpunit": "^10.5.2", + "phpunit/phpunit": "^10.5.10", "psalm/plugin-phpunit": "^0.18.4", "psr/http-client": "^1.0.3", "psr/http-factory": "^1.0.2", - "vimeo/psalm": "^5.17" + "vimeo/psalm": "^5.22.1" }, "suggest": { "laminas/laminas-db": "Laminas\\Db component, required by the (No)RecordExists validator", @@ -2557,7 +2557,7 @@ "type": "community_bridge" } ], - "time": "2024-01-17T11:31:50+00:00" + "time": "2024-02-22T16:46:06+00:00" }, { "name": "myclabs/deep-copy", @@ -3368,16 +3368,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.10", + "version": "10.5.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "50b8e314b6d0dd06521dc31d1abffa73f25f850c" + "reference": "0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/50b8e314b6d0dd06521dc31d1abffa73f25f850c", - "reference": "50b8e314b6d0dd06521dc31d1abffa73f25f850c", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4", + "reference": "0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4", "shasum": "" }, "require": { @@ -3449,7 +3449,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.10" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.11" }, "funding": [ { @@ -3465,7 +3465,7 @@ "type": "tidelift" } ], - "time": "2024-02-04T09:07:51+00:00" + "time": "2024-02-25T14:05:00+00:00" }, { "name": "psalm/plugin-phpunit", @@ -5511,16 +5511,16 @@ }, { "name": "vimeo/psalm", - "version": "5.22.1", + "version": "5.22.2", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "e9dad66e11274315dac27e08349c628c7d6a1a43" + "reference": "d768d914152dbbf3486c36398802f74e80cfde48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/e9dad66e11274315dac27e08349c628c7d6a1a43", - "reference": "e9dad66e11274315dac27e08349c628c7d6a1a43", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/d768d914152dbbf3486c36398802f74e80cfde48", + "reference": "d768d914152dbbf3486c36398802f74e80cfde48", "shasum": "" }, "require": { @@ -5617,7 +5617,7 @@ "issues": "https://github.com/vimeo/psalm/issues", "source": "https://github.com/vimeo/psalm" }, - "time": "2024-02-15T22:52:31+00:00" + "time": "2024-02-22T23:39:07+00:00" }, { "name": "webimpress/coding-standard", From 7ee1d2033378916b64f290820f32f5d02dd2bda9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 01:34:33 +0000 Subject: [PATCH 10/23] Lock file maintenance Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- composer.lock | 132 ++++++++++++++++++++++++++------------------------ 1 file changed, 70 insertions(+), 62 deletions(-) diff --git a/composer.lock b/composer.lock index 2cda81314..7996e9e19 100644 --- a/composer.lock +++ b/composer.lock @@ -2338,16 +2338,16 @@ }, { "name": "laminas/laminas-session", - "version": "2.18.0", + "version": "2.19.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-session.git", - "reference": "da3d651f0f7d5350cefd6b160761651b35fc3cde" + "reference": "cbcd9f719df26d7b7a2c569f12b7f6357853f8bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-session/zipball/da3d651f0f7d5350cefd6b160761651b35fc3cde", - "reference": "da3d651f0f7d5350cefd6b160761651b35fc3cde", + "url": "https://api.github.com/repos/laminas/laminas-session/zipball/cbcd9f719df26d7b7a2c569f12b7f6357853f8bb", + "reference": "cbcd9f719df26d7b7a2c569f12b7f6357853f8bb", "shasum": "" }, "require": { @@ -2366,7 +2366,7 @@ "laminas/laminas-db": "^2.18.0", "laminas/laminas-http": "^2.19", "laminas/laminas-validator": "^2.46.0", - "mongodb/mongodb": "~1.16.1", + "mongodb/mongodb": "~1.17.0", "phpunit/phpunit": "^9.6.15", "psalm/plugin-phpunit": "^0.18.4", "vimeo/psalm": "^5.18" @@ -2415,7 +2415,7 @@ "type": "community_bridge" } ], - "time": "2024-02-14T10:46:39+00:00" + "time": "2024-02-29T19:40:20+00:00" }, { "name": "laminas/laminas-uri", @@ -2727,20 +2727,21 @@ }, { "name": "phar-io/manifest", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/phar-io/manifest.git", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53" + "reference": "54750ef60c58e43759730615a392c31c80e23176" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176", + "reference": "54750ef60c58e43759730615a392c31c80e23176", "shasum": "" }, "require": { "ext-dom": "*", + "ext-libxml": "*", "ext-phar": "*", "ext-xmlwriter": "*", "phar-io/version": "^3.0.1", @@ -2781,9 +2782,15 @@ "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", "support": { "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/2.0.3" + "source": "https://github.com/phar-io/manifest/tree/2.0.4" }, - "time": "2021-07-20T11:28:43+00:00" + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2024-03-03T12:33:53+00:00" }, { "name": "phar-io/version", @@ -3047,16 +3054,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "10.1.11", + "version": "10.1.12", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "78c3b7625965c2513ee96569a4dbb62601784145" + "reference": "842f72662d6b9edda84c4b6f13885fd9cd53dc63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/78c3b7625965c2513ee96569a4dbb62601784145", - "reference": "78c3b7625965c2513ee96569a4dbb62601784145", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/842f72662d6b9edda84c4b6f13885fd9cd53dc63", + "reference": "842f72662d6b9edda84c4b6f13885fd9cd53dc63", "shasum": "" }, "require": { @@ -3113,7 +3120,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.11" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.12" }, "funding": [ { @@ -3121,7 +3128,7 @@ "type": "github" } ], - "time": "2023-12-21T15:38:30+00:00" + "time": "2024-03-02T07:22:05+00:00" }, { "name": "phpunit/php-file-iterator", @@ -3632,16 +3639,16 @@ }, { "name": "sebastian/cli-parser", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/cli-parser.git", - "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae" + "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/efdc130dbbbb8ef0b545a994fd811725c5282cae", - "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/c34583b87e7b7a8055bf6c450c2c77ce32a24084", + "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084", "shasum": "" }, "require": { @@ -3676,7 +3683,8 @@ "homepage": "https://github.com/sebastianbergmann/cli-parser", "support": { "issues": "https://github.com/sebastianbergmann/cli-parser/issues", - "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.0" + "security": "https://github.com/sebastianbergmann/cli-parser/security/policy", + "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.1" }, "funding": [ { @@ -3684,7 +3692,7 @@ "type": "github" } ], - "time": "2023-02-03T06:58:15+00:00" + "time": "2024-03-02T07:12:49+00:00" }, { "name": "sebastian/code-unit", @@ -3934,16 +3942,16 @@ }, { "name": "sebastian/diff", - "version": "5.1.0", + "version": "5.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f" + "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/fbf413a49e54f6b9b17e12d900ac7f6101591b7f", - "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c41e007b4b62af48218231d6c2275e4c9b975b2e", + "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e", "shasum": "" }, "require": { @@ -3951,7 +3959,7 @@ }, "require-dev": { "phpunit/phpunit": "^10.0", - "symfony/process": "^4.2 || ^5" + "symfony/process": "^6.4" }, "type": "library", "extra": { @@ -3989,7 +3997,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", "security": "https://github.com/sebastianbergmann/diff/security/policy", - "source": "https://github.com/sebastianbergmann/diff/tree/5.1.0" + "source": "https://github.com/sebastianbergmann/diff/tree/5.1.1" }, "funding": [ { @@ -3997,7 +4005,7 @@ "type": "github" } ], - "time": "2023-12-22T10:55:06+00:00" + "time": "2024-03-02T07:15:17+00:00" }, { "name": "sebastian/environment", @@ -4065,16 +4073,16 @@ }, { "name": "sebastian/exporter", - "version": "5.1.1", + "version": "5.1.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "64f51654862e0f5e318db7e9dcc2292c63cdbddc" + "reference": "955288482d97c19a372d3f31006ab3f37da47adf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/64f51654862e0f5e318db7e9dcc2292c63cdbddc", - "reference": "64f51654862e0f5e318db7e9dcc2292c63cdbddc", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/955288482d97c19a372d3f31006ab3f37da47adf", + "reference": "955288482d97c19a372d3f31006ab3f37da47adf", "shasum": "" }, "require": { @@ -4131,7 +4139,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", "security": "https://github.com/sebastianbergmann/exporter/security/policy", - "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.1" + "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.2" }, "funding": [ { @@ -4139,20 +4147,20 @@ "type": "github" } ], - "time": "2023-09-24T13:22:09+00:00" + "time": "2024-03-02T07:17:12+00:00" }, { "name": "sebastian/global-state", - "version": "6.0.1", + "version": "6.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "7ea9ead78f6d380d2a667864c132c2f7b83055e4" + "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/7ea9ead78f6d380d2a667864c132c2f7b83055e4", - "reference": "7ea9ead78f6d380d2a667864c132c2f7b83055e4", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/987bafff24ecc4c9ac418cab1145b96dd6e9cbd9", + "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9", "shasum": "" }, "require": { @@ -4186,14 +4194,14 @@ } ], "description": "Snapshotting of global state", - "homepage": "http://www.github.com/sebastianbergmann/global-state", + "homepage": "https://www.github.com/sebastianbergmann/global-state", "keywords": [ "global state" ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", "security": "https://github.com/sebastianbergmann/global-state/security/policy", - "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.1" + "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.2" }, "funding": [ { @@ -4201,7 +4209,7 @@ "type": "github" } ], - "time": "2023-07-19T07:19:23+00:00" + "time": "2024-03-02T07:19:19+00:00" }, { "name": "sebastian/lines-of-code", @@ -4751,16 +4759,16 @@ }, { "name": "symfony/console", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e" + "reference": "0d9e4eb5ad413075624378f474c4167ea202de78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e", - "reference": "2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e", + "url": "https://api.github.com/repos/symfony/console/zipball/0d9e4eb5ad413075624378f474c4167ea202de78", + "reference": "0d9e4eb5ad413075624378f474c4167ea202de78", "shasum": "" }, "require": { @@ -4825,7 +4833,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.3" + "source": "https://github.com/symfony/console/tree/v6.4.4" }, "funding": [ { @@ -4841,7 +4849,7 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-02-22T20:27:10+00:00" }, { "name": "symfony/deprecation-contracts", @@ -5375,16 +5383,16 @@ }, { "name": "symfony/string", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "7a14736fb179876575464e4658fce0c304e8c15b" + "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/7a14736fb179876575464e4658fce0c304e8c15b", - "reference": "7a14736fb179876575464e4658fce0c304e8c15b", + "url": "https://api.github.com/repos/symfony/string/zipball/4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9", + "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9", "shasum": "" }, "require": { @@ -5441,7 +5449,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.3" + "source": "https://github.com/symfony/string/tree/v6.4.4" }, "funding": [ { @@ -5457,20 +5465,20 @@ "type": "tidelift" } ], - "time": "2024-01-25T09:26:29+00:00" + "time": "2024-02-01T13:16:41+00:00" }, { "name": "theseer/tokenizer", - "version": "1.2.2", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", "shasum": "" }, "require": { @@ -5499,7 +5507,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.2" + "source": "https://github.com/theseer/tokenizer/tree/1.2.3" }, "funding": [ { @@ -5507,7 +5515,7 @@ "type": "github" } ], - "time": "2023-11-20T00:12:19+00:00" + "time": "2024-03-03T12:36:25+00:00" }, { "name": "vimeo/psalm", From 60390dd3d955bd7573e3ec81a16070342a6bd4ee Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 01:20:59 +0000 Subject: [PATCH 11/23] Lock file maintenance Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- composer.lock | 93 ++++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 46 deletions(-) diff --git a/composer.lock b/composer.lock index 7996e9e19..00c8a8a18 100644 --- a/composer.lock +++ b/composer.lock @@ -686,16 +686,16 @@ }, { "name": "composer/pcre", - "version": "3.1.1", + "version": "3.1.2", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" + "reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", - "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "url": "https://api.github.com/repos/composer/pcre/zipball/4775f35b2d70865807c89d32c8e7385b86eb0ace", + "reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace", "shasum": "" }, "require": { @@ -737,7 +737,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.1" + "source": "https://github.com/composer/pcre/tree/3.1.2" }, "funding": [ { @@ -753,7 +753,7 @@ "type": "tidelift" } ], - "time": "2023-10-11T07:11:09+00:00" + "time": "2024-03-07T15:38:35+00:00" }, { "name": "composer/semver", @@ -2267,16 +2267,16 @@ }, { "name": "laminas/laminas-router", - "version": "3.12.0", + "version": "3.13.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-router.git", - "reference": "e8f1a9ecd63d123c38de3519fe7ca9013da4f8d2" + "reference": "04e14e757303787c83f79298dbd4483eebacfeb9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-router/zipball/e8f1a9ecd63d123c38de3519fe7ca9013da4f8d2", - "reference": "e8f1a9ecd63d123c38de3519fe7ca9013da4f8d2", + "url": "https://api.github.com/repos/laminas/laminas-router/zipball/04e14e757303787c83f79298dbd4483eebacfeb9", + "reference": "04e14e757303787c83f79298dbd4483eebacfeb9", "shasum": "" }, "require": { @@ -2290,10 +2290,10 @@ }, "require-dev": { "laminas/laminas-coding-standard": "~2.5.0", - "laminas/laminas-i18n": "^2.23.1", - "phpunit/phpunit": "^10.4.2", + "laminas/laminas-i18n": "^2.26.0", + "phpunit/phpunit": "^10.5.11", "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.15.0" + "vimeo/psalm": "^5.22.2" }, "suggest": { "laminas/laminas-i18n": "^2.15.0 if defining translatable HTTP path segments" @@ -2334,20 +2334,20 @@ "type": "community_bridge" } ], - "time": "2023-11-02T17:21:39+00:00" + "time": "2024-03-05T12:54:05+00:00" }, { "name": "laminas/laminas-session", - "version": "2.19.1", + "version": "2.20.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-session.git", - "reference": "cbcd9f719df26d7b7a2c569f12b7f6357853f8bb" + "reference": "16876aa20a6688d06291a972f7e1eb0b74b05d51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-session/zipball/cbcd9f719df26d7b7a2c569f12b7f6357853f8bb", - "reference": "cbcd9f719df26d7b7a2c569f12b7f6357853f8bb", + "url": "https://api.github.com/repos/laminas/laminas-session/zipball/16876aa20a6688d06291a972f7e1eb0b74b05d51", + "reference": "16876aa20a6688d06291a972f7e1eb0b74b05d51", "shasum": "" }, "require": { @@ -2360,16 +2360,17 @@ "zendframework/zend-session": "*" }, "require-dev": { - "laminas/laminas-cache": "^3.12.0", + "ext-xdebug": "*", + "laminas/laminas-cache": "^3.12.1", "laminas/laminas-cache-storage-adapter-memory": "^2.3", "laminas/laminas-coding-standard": "~2.5.0", - "laminas/laminas-db": "^2.18.0", + "laminas/laminas-db": "^2.19.0", "laminas/laminas-http": "^2.19", - "laminas/laminas-validator": "^2.46.0", + "laminas/laminas-validator": "^2.49.0", "mongodb/mongodb": "~1.17.0", - "phpunit/phpunit": "^9.6.15", + "phpunit/phpunit": "^9.6.17", "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.18" + "vimeo/psalm": "^5.22.2" }, "suggest": { "laminas/laminas-cache": "Laminas\\Cache component", @@ -2415,7 +2416,7 @@ "type": "community_bridge" } ], - "time": "2024-02-29T19:40:20+00:00" + "time": "2024-03-08T11:02:36+00:00" }, { "name": "laminas/laminas-uri", @@ -2477,16 +2478,16 @@ }, { "name": "laminas/laminas-validator", - "version": "2.49.0", + "version": "2.50.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-validator.git", - "reference": "d58c2e7d3cd420554400dd8cca694fafa3b8e45f" + "reference": "2b1cb3e5249691f2f8cd411fde064fce473b6d24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/d58c2e7d3cd420554400dd8cca694fafa3b8e45f", - "reference": "d58c2e7d3cd420554400dd8cca694fafa3b8e45f", + "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/2b1cb3e5249691f2f8cd411fde064fce473b6d24", + "reference": "2b1cb3e5249691f2f8cd411fde064fce473b6d24", "shasum": "" }, "require": { @@ -2557,7 +2558,7 @@ "type": "community_bridge" } ], - "time": "2024-02-22T16:46:06+00:00" + "time": "2024-03-11T00:59:46+00:00" }, { "name": "myclabs/deep-copy", @@ -3054,16 +3055,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "10.1.12", + "version": "10.1.13", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "842f72662d6b9edda84c4b6f13885fd9cd53dc63" + "reference": "d51c3aec14896d5e80b354fad58e998d1980f8f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/842f72662d6b9edda84c4b6f13885fd9cd53dc63", - "reference": "842f72662d6b9edda84c4b6f13885fd9cd53dc63", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d51c3aec14896d5e80b354fad58e998d1980f8f8", + "reference": "d51c3aec14896d5e80b354fad58e998d1980f8f8", "shasum": "" }, "require": { @@ -3120,7 +3121,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.12" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.13" }, "funding": [ { @@ -3128,7 +3129,7 @@ "type": "github" } ], - "time": "2024-03-02T07:22:05+00:00" + "time": "2024-03-09T16:54:15+00:00" }, { "name": "phpunit/php-file-iterator", @@ -3375,16 +3376,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.11", + "version": "10.5.12", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4" + "reference": "41a9886b85ac7bf3929853baf96b95361cd69d2b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4", - "reference": "0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/41a9886b85ac7bf3929853baf96b95361cd69d2b", + "reference": "41a9886b85ac7bf3929853baf96b95361cd69d2b", "shasum": "" }, "require": { @@ -3456,7 +3457,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.11" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.12" }, "funding": [ { @@ -3472,7 +3473,7 @@ "type": "tidelift" } ], - "time": "2024-02-25T14:05:00+00:00" + "time": "2024-03-09T12:04:07+00:00" }, { "name": "psalm/plugin-phpunit", @@ -5519,16 +5520,16 @@ }, { "name": "vimeo/psalm", - "version": "5.22.2", + "version": "5.23.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "d768d914152dbbf3486c36398802f74e80cfde48" + "reference": "005e3184fb6de4350a873b9b8c4dc3cede9db762" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/d768d914152dbbf3486c36398802f74e80cfde48", - "reference": "d768d914152dbbf3486c36398802f74e80cfde48", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/005e3184fb6de4350a873b9b8c4dc3cede9db762", + "reference": "005e3184fb6de4350a873b9b8c4dc3cede9db762", "shasum": "" }, "require": { @@ -5625,7 +5626,7 @@ "issues": "https://github.com/vimeo/psalm/issues", "source": "https://github.com/vimeo/psalm" }, - "time": "2024-02-22T23:39:07+00:00" + "time": "2024-03-09T19:39:11+00:00" }, { "name": "webimpress/coding-standard", From fe4648404dca45d35485e7177026c5e3850ee86b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 01:57:31 +0000 Subject: [PATCH 12/23] Lock file maintenance Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- composer.lock | 58 +++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/composer.lock b/composer.lock index 00c8a8a18..4ad480fc7 100644 --- a/composer.lock +++ b/composer.lock @@ -2478,16 +2478,16 @@ }, { "name": "laminas/laminas-validator", - "version": "2.50.0", + "version": "2.51.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-validator.git", - "reference": "2b1cb3e5249691f2f8cd411fde064fce473b6d24" + "reference": "25cc42efd096352f4dcfcf55dfb00665a1b29aaf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/2b1cb3e5249691f2f8cd411fde064fce473b6d24", - "reference": "2b1cb3e5249691f2f8cd411fde064fce473b6d24", + "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/25cc42efd096352f4dcfcf55dfb00665a1b29aaf", + "reference": "25cc42efd096352f4dcfcf55dfb00665a1b29aaf", "shasum": "" }, "require": { @@ -2558,7 +2558,7 @@ "type": "community_bridge" } ], - "time": "2024-03-11T00:59:46+00:00" + "time": "2024-03-16T03:34:49+00:00" }, { "name": "myclabs/deep-copy", @@ -2672,21 +2672,21 @@ }, { "name": "nikic/php-parser", - "version": "v4.18.0", + "version": "v4.19.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" + "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", - "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b", + "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=7.0" + "php": ">=7.1" }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", @@ -2722,9 +2722,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1" }, - "time": "2023-12-10T21:03:43+00:00" + "time": "2024-03-17T08:10:35+00:00" }, { "name": "phar-io/manifest", @@ -3055,16 +3055,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "10.1.13", + "version": "10.1.14", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "d51c3aec14896d5e80b354fad58e998d1980f8f8" + "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d51c3aec14896d5e80b354fad58e998d1980f8f8", - "reference": "d51c3aec14896d5e80b354fad58e998d1980f8f8", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e3f51450ebffe8e0efdf7346ae966a656f7d5e5b", + "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b", "shasum": "" }, "require": { @@ -3121,7 +3121,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.13" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.14" }, "funding": [ { @@ -3129,7 +3129,7 @@ "type": "github" } ], - "time": "2024-03-09T16:54:15+00:00" + "time": "2024-03-12T15:33:41+00:00" }, { "name": "phpunit/php-file-iterator", @@ -3376,16 +3376,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.12", + "version": "10.5.13", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "41a9886b85ac7bf3929853baf96b95361cd69d2b" + "reference": "20a63fc1c6db29b15da3bd02d4b6cf59900088a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/41a9886b85ac7bf3929853baf96b95361cd69d2b", - "reference": "41a9886b85ac7bf3929853baf96b95361cd69d2b", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/20a63fc1c6db29b15da3bd02d4b6cf59900088a7", + "reference": "20a63fc1c6db29b15da3bd02d4b6cf59900088a7", "shasum": "" }, "require": { @@ -3457,7 +3457,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.12" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.13" }, "funding": [ { @@ -3473,7 +3473,7 @@ "type": "tidelift" } ], - "time": "2024-03-09T12:04:07+00:00" + "time": "2024-03-12T15:37:41+00:00" }, { "name": "psalm/plugin-phpunit", @@ -5520,16 +5520,16 @@ }, { "name": "vimeo/psalm", - "version": "5.23.0", + "version": "5.23.1", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "005e3184fb6de4350a873b9b8c4dc3cede9db762" + "reference": "8471a896ccea3526b26d082f4461eeea467f10a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/005e3184fb6de4350a873b9b8c4dc3cede9db762", - "reference": "005e3184fb6de4350a873b9b8c4dc3cede9db762", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/8471a896ccea3526b26d082f4461eeea467f10a4", + "reference": "8471a896ccea3526b26d082f4461eeea467f10a4", "shasum": "" }, "require": { @@ -5626,7 +5626,7 @@ "issues": "https://github.com/vimeo/psalm/issues", "source": "https://github.com/vimeo/psalm" }, - "time": "2024-03-09T19:39:11+00:00" + "time": "2024-03-11T20:33:46+00:00" }, { "name": "webimpress/coding-standard", From e3f38d1d428c384e16032d264ac4ac6fd9041d97 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 04:40:17 +0000 Subject: [PATCH 13/23] Update dependency psalm/plugin-phpunit to ^0.19.0 | datasource | package | from | to | | ---------- | -------------------- | ------ | ------ | | packagist | psalm/plugin-phpunit | 0.18.4 | 0.19.0 | Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- composer.json | 2 +- composer.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index cfd0fb51e..b30b82ed5 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,7 @@ "laminas/laminas-router": "^3.12.0", "laminas/laminas-uri": "^2.11", "phpunit/phpunit": "^10.5.9", - "psalm/plugin-phpunit": "^0.18.4", + "psalm/plugin-phpunit": "^0.19.0", "vimeo/psalm": "^5.20" }, "conflict": { diff --git a/composer.lock b/composer.lock index 4ad480fc7..97b39fcf4 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": "592dafb0d2f33db8a69049bf7183ec67", + "content-hash": "81ebe898c617543f57f6baf6754e3af6", "packages": [ { "name": "laminas/laminas-escaper", @@ -3477,24 +3477,24 @@ }, { "name": "psalm/plugin-phpunit", - "version": "0.18.4", + "version": "0.19.0", "source": { "type": "git", "url": "https://github.com/psalm/psalm-plugin-phpunit.git", - "reference": "e4ab3096653d9eb6f6d0ea5f4461898d59ae4dbc" + "reference": "e344eaaa27871e79c6cb97b9efe52a735f9d1966" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/psalm/psalm-plugin-phpunit/zipball/e4ab3096653d9eb6f6d0ea5f4461898d59ae4dbc", - "reference": "e4ab3096653d9eb6f6d0ea5f4461898d59ae4dbc", + "url": "https://api.github.com/repos/psalm/psalm-plugin-phpunit/zipball/e344eaaa27871e79c6cb97b9efe52a735f9d1966", + "reference": "e344eaaa27871e79c6cb97b9efe52a735f9d1966", "shasum": "" }, "require": { "composer/package-versions-deprecated": "^1.10", "composer/semver": "^1.4 || ^2.0 || ^3.0", "ext-simplexml": "*", - "php": "^7.1 || ^8.0", - "vimeo/psalm": "dev-master || dev-4.x || ^4.7.1 || ^5@beta || ^5.0" + "php": "^7.4 || ^8.0", + "vimeo/psalm": "dev-master || ^5@beta || ^5.0" }, "conflict": { "phpunit/phpunit": "<7.5" @@ -3531,9 +3531,9 @@ "description": "Psalm plugin for PHPUnit", "support": { "issues": "https://github.com/psalm/psalm-plugin-phpunit/issues", - "source": "https://github.com/psalm/psalm-plugin-phpunit/tree/0.18.4" + "source": "https://github.com/psalm/psalm-plugin-phpunit/tree/0.19.0" }, - "time": "2022-12-03T07:47:07+00:00" + "time": "2024-03-15T10:43:15+00:00" }, { "name": "psr/http-message", From 075496aecf1a988300ab034771a1b57fe692b4b6 Mon Sep 17 00:00:00 2001 From: George Steel Date: Mon, 18 Mar 2024 09:17:02 +0000 Subject: [PATCH 14/23] Bump dev deps, refresh lock Signed-off-by: George Steel --- composer.json | 6 +++--- composer.lock | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index b30b82ed5..b23207d39 100644 --- a/composer.json +++ b/composer.json @@ -50,11 +50,11 @@ "laminas/laminas-navigation": "^2.19.1", "laminas/laminas-paginator": "^2.18.1", "laminas/laminas-permissions-acl": "^2.16", - "laminas/laminas-router": "^3.12.0", + "laminas/laminas-router": "^3.13.0", "laminas/laminas-uri": "^2.11", - "phpunit/phpunit": "^10.5.9", + "phpunit/phpunit": "^10.5.13", "psalm/plugin-phpunit": "^0.19.0", - "vimeo/psalm": "^5.20" + "vimeo/psalm": "^5.23.1" }, "conflict": { "container-interop/container-interop": "<1.2", diff --git a/composer.lock b/composer.lock index 97b39fcf4..afb3eaa7a 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": "81ebe898c617543f57f6baf6754e3af6", + "content-hash": "c4cd433fb697af1660745f76e5f9183e", "packages": [ { "name": "laminas/laminas-escaper", From 9413d4c4c4b369714c1b1b147b9bcdecf0ab2b45 Mon Sep 17 00:00:00 2001 From: George Steel Date: Mon, 18 Mar 2024 09:17:28 +0000 Subject: [PATCH 15/23] Minor SA Fixes Signed-off-by: George Steel --- psalm-baseline.xml | 2521 ++++++++--------- test/HelperPluginManagerCompatibilityTest.php | 4 +- 2 files changed, 1262 insertions(+), 1263 deletions(-) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index c1d5abb8d..e442c2a50 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,53 +1,53 @@ - + - $closingBracket - $closingBracket - $closingBracket - $closingBracket - $closingBracket - $closingBracket - $closingBracket - $closingBracket - $closingBracket - $closingBracket - $closingBracket - $closingBracket + + + + + + + + + + + + - $val + - $val + - $attribs + - plugin - plugin + + - (array) $attribs + - plugin - plugin + + - setResourceMap + - Cycle - Cycle + + - Iterator + data[$this->name]]]> @@ -58,8 +58,8 @@ data[$this->name][$this->key()]]]> - array - int + + pointers[$this->name]]]> @@ -70,48 +70,48 @@ pointers[$this->name]]]> - getName + - $view + - $key - $value + + - $name + - $key - $value - $vars + + + $key]]> - $view + - vars - vars + + - vars - vars + + - self + - null === static::$registeredDoctypes + registry['doctypes'][$type]]]> @@ -122,17 +122,17 @@ registry['doctype']]]> registry['doctypes']]]> - array - string + + - $registry + - $v - $value[$k] + + @@ -140,33 +140,33 @@ pluginFlashMessenger]]> - $item + - $escapeHtmlHelper - $pluginFlashMessenger + + - $item - $item + + - $classes - $classes - $messagesToPrint + + + - $classes - $classes - $messagesToPrint[] - $messagesToPrint[] + + + + escapeHtmlHelper]]> - (bool) $autoEscape - (string) $messageCloseString - (string) $messageOpenFormat - (string) $messageSeparatorString + + + + escapeHtmlHelper]]> @@ -174,21 +174,21 @@ - $flag === null + - $attributes - $email - $emailIsHashed + + + - $value + - bool - int - string - string + + + + options['default_img']]]> @@ -200,186 +200,186 @@ ]]> - (bool) $flag - (int) $imgSize + + - (bool) $flag + - $item + - offsetSet + - $args - $args - $args - $args[0] - $attributes[$itemKey] - $href - $index + + + + + + + autoEscape ? $this->escapeAttribute($attributes[$itemKey]) : $attributes[$itemKey]]]> autoEscape ? $this->escapeAttribute($value) : $value]]> - $value + - $media + - $args[0] - $args[0] + + - $conditionalStylesheet - $extras - $extras - $href - $href - $index - $item - $media - $title - $type - $value + + + + + + + + + + + - $index + view]]> - createDataAlternate - createDataNext - createDataPrev - createDataStylesheet + + + + - AbstractContainer - AbstractContainer + + - (string) $conditionalStylesheet + - $item - $value - $value + + + - offsetSet - offsetUnset + + - $args[0] - $args[1] - $args[2] - $index + + + + $type]]> content]]> type]]> - $key + autoEscape ? $this->escapeAttribute($item->$type) : $item->$type]]> autoEscape ? $this->escapeAttribute($item->content) : $item->content]]> autoEscape ? $this->escapeAttribute($value) : $value]]> - $type - $value - $value + + + - $doctype - $index - $key - $type - $value + + + + + - $this + - isHtml5 - isHtml5 - isHtml5 - isHtml5 - isRdfa - isXhtml + + + + + + - parent::__call($method, $args) - parent::__call($method, $args) + + - $index - $index + + view]]> - plugin - plugin - plugin + + + - AbstractContainer - AbstractContainer + + - plugin - plugin - plugin + + + - offsetSet + - $content - $content - $index - $index + + + + autoEscape ? $this->escapeAttribute($value) : $value]]> - $value + - $attrs - $attrs + + - $content - $index - $value + + + - $this + - isHtml5 + - parent::__call($method, $args) - parent::__call($method, $args) + + - AbstractContainer - AbstractContainer + + - (bool) $flag + - is_string($spec) + - plugin + @@ -389,139 +389,139 @@ content) || ! is_string($item->content)]]> - offsetSet + - ObjectShape + - $content - $index + + - $attrs + - $content - $index + + - AbstractContainer - AbstractContainer + + - is_string($content) + - $indent + - HelperInterface + - $htmlObject + - $htmlObject($data, self::TYPE, $attribs, $params, $content) + - string + - $htmlObject($data, self::TYPE, $attribs, $params, $content) + - plugin + - plugin + - $options + - $options + - $content + - $htmlObject + - $htmlObject($data, self::TYPE, $attribs, $params, $content) + - string + - $htmlObject($data, self::TYPE, $attribs, $params, $content) + - plugin + - plugin + - $htmlObject + - $htmlObject($data, self::TYPE, $attribs, $params, $content) + - string + - $htmlObject($data, self::TYPE, $attribs, $params, $content) + - plugin + - plugin + - $value + - $name + - $value + view]]> - (bool) $useNamespaces + - getAuthenticationService - setAuthenticationService + + - $response + - null + response instanceof Response]]> @@ -529,98 +529,98 @@ - plugin + - __construct + - (string) $template + - plugin + - call_user_func_array($helper, $arguments) + - ExceptionInterface + - $container + - (bool) $injectAcl - (bool) $injectContainer - (bool) $injectTranslator - (string) $proxy + + + + - $view + - hasTranslator - setTranslator + + minDepth)]]> - ! is_string($message) - $container instanceof AbstractContainer + + container]]> - AbstractHelper - null|EventManagerInterface + + - Navigation\Exception\ExceptionInterface + - $container - $container - $container - $container - $container - $events - $events - $events - $events - $events - $maxDepth - $maxDepth - $maxDepth - $maxDepth - $maxDepth - $minDepth - $minDepth - $minDepth - $minDepth + + + + + + + + + + + + + + + + + + + getTextDomain()]]> getTextDomain()]]> - $container - $container - $label - $value + + + + - bool + - $label + last()]]> - $events + @@ -629,32 +629,32 @@ getTitle()]]> - $maxDepth - $minDepth + + - attach - getParent - plugin + + + - (bool) $renderInvisible - (bool) $useAcl - (string) $indent + + + acl === null && static::$defaultAcl !== null]]> container]]> - static::$defaultAcl !== null + - return; + - plugin + - setSharedManager + @@ -662,160 +662,160 @@ - null === $partial + renderPartialModel($params, $container, $partial)]]> renderPartialModel([], $container, $partial)]]> - string - string + + - $partial + - $active + getLabel()]]> getTextDomain()]]> - $partial[0] + - $active - $active - $active - $label + + + + - $parent + - getLabel - getParent - getParent - getTextDomain + + + + - $label + - $container + - $partial + - plugin - plugin + + - (bool) $linkLast + - is_array($partial) - is_string($separator) + + - null === $container - null === $container + + - plugin - plugin + + - HelperInterface - HelperInterface - HelperInterface + + + - $relFlag + - $root + - $active - $arguments[0] - $intermediate - $intermediate - $page - $page + + + + + + $meth()]]> - $type + - $relation + - $result[$rel][$type] + - $active - $found - $intermediate - $intermediate - $page - $page - $result - $type - $value + + + + + + + + + - AbstractPage|array|null - array|null + + - $found - $found - count($result) === 1 ? $result[0] : $result - count($result) === 1 ? $result[0] : $result + + + + - null + - searchRelChapter - searchRelNext - searchRelPrev - searchRelSection - searchRelStart - searchRelSubsection - searchRevSection - searchRevSubsection + + + + + + + + - (int) $renderFlag + root]]> - null === $container + - $acl - $page - $privilege - $resource - $role + + + + + - getPrivilege - getResource - hasResource - isAllowed + + + + @@ -823,23 +823,23 @@ - bool + - null === $partial + renderPartialModel($params, $container, $partial)]]> renderPartialModel([], $container, $partial)]]> - string - string + + - $partial + @@ -858,268 +858,268 @@ - $page - $page + + getTextDomain()]]> getTextDomain()]]> - $partial[0] - $subPage + + - $liClasses + - $foundDepth - $foundPage - $isActive - $liClasses[] - $page - $subPage + + + + + + - getClass - getClass - getParent - getParent - getParent - hasPage - hasPage - hasPages - hasPages - hasPages - isActive + + + + + + + + + + + - $escaper($label) - $escaper($ulClass) - $escaper($ulClass) + + + - $foundDepth + - $container + getTitle()]]> - $minDepth - $minDepth + + - $partial + - plugin - plugin - plugin - plugin + + + + - escapeLabels - setAddClassToListItem + + - (bool) $flag - (bool) $flag - (bool) $flag - (bool) $flag + + + + - is_array($partial) - is_string($liActiveClass) - is_string($ulClass) + + + - null === $container - null === $container + + - plugin - plugin - plugin - plugin + + + + - $aliases + - $serverUrl + - $changefreq - $changefreq - $curDoc - $page - $page - $priority - $priority + + + + + + + - $basePathHelper - $changefreq - $curDoc - $escaper - $page - $priority - $serverUrlHelper + + + + + + + serverUrl]]> - $basePathHelper() - $escaper($string) - $serverUrlHelper() + + + - string - string + + - $escaper($string) + serverUrl]]> serverUrl]]> - $container + - $lastmod + - isValid - isValid - isValid - isValid - plugin - plugin - plugin + + + + + + + - (bool) $formatOutput - (bool) $schemaValidation - (bool) $useSitemapValidators - (bool) $useXmlDecl - (string) $href - (string) $href + + + + + + serverUrl)]]> - plugin - plugin - plugin + + + - static::$defaultViewPartial === null + - $partial - $partialHelper - $partialHelper + + + - $partialHelper($partial, $pages) - $partialHelper($partial[0], $pages) + + - string + - $partialHelper($partial, $pages) - $partialHelper($partial[0], $pages) + + view->paginator]]> - plugin - plugin + + - plugin - plugin + + - is_scalar($values) + - $objectKey - $objectKey + + - $values + - $values + - $name + - null + - render - render + + - (string) $key + - parent::setObjectKey($key) + - $item + - $item + objectKey]]> - array + toArray()]]> - $name - $values + + - self + - parent::__invoke($name, $item) + - self + - (string) $key + - (string) $key - (string) $key - (string) $key - (string) $key - (string) $name + + + + + containerClass($value)]]> @@ -1127,53 +1127,53 @@ - Container + - is_scalar($key) + - $this + - $data - $data - $data - $data + + + + nextIndex()]]> nextIndex()]]> - $this[$key] .= $data + - TKey + - max($keys) + 1 + - int + - $items + - $this[$key] - max($keys) + + captureKey]]> - (string) $postfix - (string) $prefix - (string) $separator + + + - $container + containerClass()]]> @@ -1190,16 +1190,16 @@ getContainer()]]> - $return + - __get - __set + + - (bool) $autoEscape - (string) $string - (string) $string + + + containerClass()]]> @@ -1207,7 +1207,7 @@ - null === static::$instance + containerClass($value)]]> @@ -1216,39 +1216,39 @@ items[$key]]]> - AbstractContainer + items[$key]]]> - AbstractContainer + - getRegistry - unsetRegistry + + - (string) $key - (string) $key - (string) $key - (string) $key - (string) $key + + + + + - new static() + - $current - $viewModelHelper + + viewModelHelper]]> - ViewModel + viewModelHelper]]> @@ -1260,9 +1260,9 @@ getCurrent()]]> - getChildren - plugin - render + + + viewModelHelper]]> @@ -1270,32 +1270,32 @@ - $placeholderHelper + - $placeholderHelper($placeholder) - $placeholderHelper($placeholder) + + - captureEnd - captureStart + + - plugin - render + + - plugin + - $port + - string - string + + host]]> @@ -1305,7 +1305,7 @@ - (bool) $useProxy + @@ -1313,7 +1313,7 @@ - $cName + @@ -1325,23 +1325,23 @@ - $config + - FlashMessenger - FlashMessenger - new FlashMessenger() + + + - FlashMessengerFactory + - $flashMessenger + @@ -1351,36 +1351,36 @@ - $config - $configHelper - $controllerPluginManager - $flashMessenger + + + + - get + - $container + - $requestedName + - $this - $this - $this + + + - (bool) $enabled + - is_array($params) - is_bool($options) + + @@ -1389,28 +1389,28 @@ - $params - $reuseMatchedParams + + - $options + - $reuseMatchedParams + - hasRoot + - null|ConfigInterface|ContainerInterface + - ! $events - ! $events + + get('EventManager')]]> @@ -1418,63 +1418,63 @@ get('Translator')]]> - $container - $container + + - ($name is class-string ? T : HelperInterface|callable) + - parent::get($name, $options) + - injectEventManager - injectRenderer - injectTranslator - validatePlugin + + + + initializers]]> initializers]]> - getServiceLocator - getServiceLocator + + - HtmlAttributesSet + - $value + - $storeValue - $value + + - clearChildren - clearOptions - clearVariables + + + - int + options['errorLevel']]]> - $captureTo + - getErrorLevel - getResult - setResult + + + @@ -1483,17 +1483,17 @@ type]]> - false|string + type]]> type]]> - $variables + - $feed + feed instanceof Feed]]> @@ -1501,152 +1501,152 @@ - $captureTo + - ModelInterface - ModelInterface - ModelInterface - ModelInterface - ModelInterface - ModelInterface - ModelInterface - ModelInterface + + + + + + + + - gettype($variables) - is_array($options) + + - array|ArrayAccess|Traversable + - $key + - $value + - $variables[$name] + - (bool) $append - (bool) $terminate - (string) $capture - (string) $name - (string) $name - (string) $name - (string) $name - (string) $template + + + + + + + + - is_object($variables) + - $values + - $value + getFilterChain()->filter($values['result'])]]> - $model + - $values + - __construct - setFilterChain + + - $config + - (array) $nameOrModel + - $resolver + - $type + - $values + - $resolver + - is_string($nameOrModel) + - void + - $jsonpCallback + - $child + - $value + - $nameOrModel - $nameOrModel + + - $childValues - $children - $values + + + - $resolver + - (bool) $mergeUnnamedChildren - (string) $callback + + - $mergeChildren + - ! is_object($nameOrModel) + jsonpCallback]]> - $nameOrModel instanceof Traversable + - gettype($helpers) + __templateResolver->resolve($name, $this)]]> - $values + - string|Resolver + __template]]> @@ -1654,18 +1654,18 @@ __varsCache)]]> - $includeReturn + __template]]> - $value - $value - $variablesAsArray[$key] - $vars[$name] + + + + - string + - new $helpers(new ServiceManager()) + __filterChain->filter($this->__content)]]> @@ -1675,10 +1675,10 @@ __templateResolver]]> - $variables + - $values + resolver($this->__template)]]> @@ -1688,16 +1688,16 @@ __vars]]> - resolve + - $config + - (bool) $renderTrees + - is_object($helpers) + __file]]> @@ -1716,32 +1716,32 @@ - resolve + - (string) $prefix + - is_iterable($map) - is_iterable($map) + + map, $map)]]> - is_string($path) + - static::FAILURE_NOT_FOUND - static::FAILURE_NO_PATHS + + - setUseStreamWrapper + lastLookupFailure]]> @@ -1755,11 +1755,11 @@ useViewStream]]> - is_string($path) + - false - false + + @@ -1768,79 +1768,79 @@ - TemplatePathStack + - (bool) $flag - (bool) $flag - (string) $defaultSuffix + + + - $headers + - addHeaderLine + - setContent + - getHeaders + - $headers + - addHeaderLine - addHeaderLine + + - setContent + - (string) $charset + - getHeaders + - $placeholders - $result + + - containerExists - getContainer + + - $contentPlaceholders + - plugin + - $e + - plugin + - $data - $stat + + - $mode - $offset - $opened_path - $options - $whence + + + + + pos]]> @@ -1848,100 +1848,100 @@ pos]]> - $offset - $offset - $offset + + + - stream_eof - stream_open - stream_read - stream_seek - stream_stat - stream_tell - url_stat + + + + + + + - $mode - $opened_path - $options + + + - break; - break; - break; + + + - $value + - $key - $key - ArrayIterator::class + + + - $return - $return - $spec - $this[$key] - $this[$key] - $value - $value + + + + + + + - (bool) $flag + - View + - $options + - $result + - $events - $request - $response + + + - $oldResult + - $oldResult + - $events + - hasChildren + - ViewEvent - ViewEvent + + - $value - $value - $value - $value + + + + - $name - $name + + - $params[$param] + @@ -1951,15 +1951,15 @@ - addPath + - assertTrue - assertTrue - assertTrue + + + - addPath + varName2]]> @@ -1969,52 +1969,52 @@ - $test - $test - $test - $test + + + + - $test - $test - $test - $test + + + + - $test - $test - $test - $test + + + + - $test - $test - $test - $test + + + + - $test - $test - $test - $test + + + + - $plugin - $plugin + + mvcPluginClass]]> - FlashMessenger + [ 'config' => $config, @@ -2029,61 +2029,61 @@ => new HelperPluginManager($services), ], ])]]> - new FlashMessenger() - new FlashMessenger() - new FlashMessenger() - new FlashMessenger() - new FlashMessenger() - new FlashMessenger() + + + + + + - $displayInfo - $displayInfo - $displayInfo - $displayInfo - $helper - $helper - $helper - $helper - $helperPluginManager - $helperPluginManager - $helperPluginManager - $helperPluginManager + + + + + + + + + + + + - get - get - get - get - render - render - renderCurrent - renderCurrent + + + + + + + + - hasCurrentErrorMessages - hasCurrentInfoMessages - hasCurrentMessages - hasCurrentSuccessMessages - hasErrorMessages - hasInfoMessages - hasMessages - hasSuccessMessages - hasWarningMessages - render - render - renderCurrent - renderCurrent + + + + + + + + + + + + + - $value - $value - $value + + + - gravatar + @@ -2097,34 +2097,34 @@ - $item - $item - $item - $item - $item + + + + + - $order[$key] - $order[$key] - $order[$key] + + + - $item - $item - $item - $item - $item - $key - $key - $key - $link - $link - $order[$key] - $order[$key] - $order[$key] - $value - $value - $value + + + + + + + + + + + + + + + + @@ -2147,16 +2147,16 @@ href]]> - appendNext - appendPrev - bogusMethod - getArrayCopy - getValue - getValue - getValue - getValue - getValue - getValue + + + + + + + + + + @@ -2166,44 +2166,44 @@ - offsetSetHttpEquiv - offsetSetHttpEquiv - offsetSetName - offsetSetName - offsetSetName + + + + + - HtmlFlash + - $key + - $escape($value) - $escape($value) + + - $acl - $acl + + serviceManager->get('Navigation')]]> - $acl - $acl - $role - $role + + + + - $_helper + _helper]]> @@ -2223,148 +2223,148 @@ - $_helper + - $active - $active - $active - $active - $active - $active - $active - $active - $found - $found + + + + + + + + + + - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $active - $actual - $actual - $actual - $actual - $actual - $actual - $actual - $actual[$attrib][$type][$key] - $actual[] - $actual[] - $actual[] - $actual[] - $found - $found - $found - $found - $found - $found - $found - $found - $found - $found - $found - $page - $page - $page - $page - $page - $page - $page + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - addRel - addRel - addRel - addRel - addRel - addRel - addRel - addRel - addRel - addRel - addRev - addRev - getHref - getHref - getHref - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - getLabel - removeRel - removeRev - setActive - setActive + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - $active - $active - $active - $page - $page + + + + + - $_helper + - getHref - getLabel - getLabel + + + - getHref - getLabel - getLabel + + + - $discard - $discard + + @@ -2380,16 +2380,16 @@ - $p - $page + + - getRole - setActive - setActive + + + - $_helper + @@ -2404,17 +2404,17 @@ - $actual - $creationContextValue - $expected + + + - getContainer - getContainer - getContainer + + + - $_helper + errorHandlerMessage]]> @@ -2426,7 +2426,7 @@ ], false)]]> - PsrContainerDecorator + @@ -2444,16 +2444,16 @@ - setBasePath + - $_helper + - plugin + - plugin + nav2;]]> @@ -2474,216 +2474,216 @@ - $all - $paginator + + - null + - $o - $o - $o - $o - $o - $o - $o - $o - $rIterator - $rIterator - $rIterator - $rIterator + + + + + + + + + + + + - new stdClass() - new stdClass() + + - $value - $value + + - $key - $key - $key - $value - $value - $value - $value + + + + + + + message]]> message]]> objectKey]]> objectKey]]> - $value - $value + + - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result + + + + + + + + + + + + + + + - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result - $result + + + + + + + + + + + + + + + - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath + + + + + + + + + + + + + + + + + + + + + + + + + + + + - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath - addPath + + + + + + + + + + + + + + + + + + + + + + + + + + + + message]]> message]]> - $key - $key - $key + + + - $key - $key - $value - $value - $value + + + + + - $key - $key - $value - $value - $value + + + + + getVariables()]]> getVariables()]]> - $return - $return - $return - $return - $return - $return - $return - $return - $return + + + + + + + + + - $return - $return - $return - $return - $return - $return - $return - $return - $return + + + + + + + + + - addPath - addPath - addPath - addPath - addPath - addPath - addPath + + + + + + + - addPath - addPath - addPath - addPath - addPath - addPath - addPath + + + + + + + vars()->message]]> @@ -2691,8 +2691,8 @@ - 1337 - new stdClass() + + @@ -2702,7 +2702,7 @@ - $value + @@ -2710,42 +2710,42 @@ getDependencyConfig())]]> - $serviceConfig - $test + + - $router - $serviceConfig - $test - $test - $urlHelper - $urlHelper - $viewHelpers - $viewHelpers + + + + + + + + true])]]> - bootstrap - bootstrap - get - get - setRequestUri + + + + + - Wildcard::class + - $it - $router - $router + + + - true - true + + @@ -2757,9 +2757,6 @@ 'factories' => $factories, ])]]> - - ]]> - @@ -2799,31 +2796,31 @@ ])]]> - $container - $container + + - $container - $container + + - Iterator + - $vars - new stdClass() - new stdClass() + + + - $options - $vars + + - $variables + @@ -2831,11 +2828,11 @@ - $content + - $foo - $return + + @@ -2844,53 +2841,53 @@ renderer->vars()->foo]]> - $errno - $errstr + + - $model - $model - $model - $model - $model - $model - 0 - false - false + + + + + + + + + - $model + - assertNull + - TemplatePathStack::FAILURE_NOT_FOUND - TemplatePathStack::FAILURE_NO_PATHS + + - $listener - $listener - $priority - $priority + + + + - addHeaderLine - addHeaderLine - addHeaderLine + + + - addHeaderLine - addHeaderLine - addHeaderLine + + + @@ -2903,60 +2900,60 @@ get('content-type')->getFieldValue()]]> - $content - $content - $content - $content - $content - $content - $listener - $listener - $priority - $priority + + + + + + + + + + - addHeaderLine - addHeaderLine - addHeaderLine - getFieldValue - getFieldValue - getFieldValue - getFieldValue - getFieldValue - getFieldValue - getFieldValue + + + + + + + + + + - addHeaderLine - addHeaderLine - addHeaderLine - getFieldValue - getFieldValue - getFieldValue - getFieldValue - getFieldValue - getFieldValue - getFieldValue + + + + + + + + + + - getContent + - $e - $event - $event - $event + + + + - $content - $content - $content - $listener - $listener - $priority - $priority + + + + + + + @@ -2965,7 +2962,7 @@ result->content]]> - null + diff --git a/test/HelperPluginManagerCompatibilityTest.php b/test/HelperPluginManagerCompatibilityTest.php index a5a3dbe8c..979bcab70 100644 --- a/test/HelperPluginManagerCompatibilityTest.php +++ b/test/HelperPluginManagerCompatibilityTest.php @@ -53,7 +53,7 @@ protected function getV2InvalidPluginException(): string } /** - * @psalm-return Generator + * @psalm-return Generator */ public static function aliasProvider(): Generator { @@ -74,6 +74,8 @@ public static function aliasProvider(): Generator continue; } + self::assertIsString($alias); + yield $alias => [$alias, $target]; } } From 29085d61ab712840b7dbfcc2fbca0f2d3e62dc24 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 00:56:43 +0000 Subject: [PATCH 16/23] Lock file maintenance Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- composer.lock | 54 +++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/composer.lock b/composer.lock index afb3eaa7a..c559f16a6 100644 --- a/composer.lock +++ b/composer.lock @@ -398,16 +398,16 @@ "packages-dev": [ { "name": "amphp/amp", - "version": "v2.6.2", + "version": "v2.6.4", "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb" + "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", - "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", + "url": "https://api.github.com/repos/amphp/amp/zipball/ded3d9be08f526089eb7ee8d9f16a9768f9dec2d", + "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d", "shasum": "" }, "require": { @@ -419,8 +419,8 @@ "ext-json": "*", "jetbrains/phpstorm-stubs": "^2019.3", "phpunit/phpunit": "^7 | ^8 | ^9", - "psalm/phar": "^3.11@dev", - "react/promise": "^2" + "react/promise": "^2", + "vimeo/psalm": "^3.12" }, "type": "library", "extra": { @@ -475,7 +475,7 @@ "support": { "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/amp/issues", - "source": "https://github.com/amphp/amp/tree/v2.6.2" + "source": "https://github.com/amphp/amp/tree/v2.6.4" }, "funding": [ { @@ -483,7 +483,7 @@ "type": "github" } ], - "time": "2022-02-20T17:52:18+00:00" + "time": "2024-03-21T18:52:26+00:00" }, { "name": "amphp/byte-stream", @@ -686,16 +686,16 @@ }, { "name": "composer/pcre", - "version": "3.1.2", + "version": "3.1.3", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace" + "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/4775f35b2d70865807c89d32c8e7385b86eb0ace", - "reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace", + "url": "https://api.github.com/repos/composer/pcre/zipball/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8", + "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8", "shasum": "" }, "require": { @@ -737,7 +737,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.2" + "source": "https://github.com/composer/pcre/tree/3.1.3" }, "funding": [ { @@ -753,7 +753,7 @@ "type": "tidelift" } ], - "time": "2024-03-07T15:38:35+00:00" + "time": "2024-03-19T10:26:25+00:00" }, { "name": "composer/semver", @@ -3376,16 +3376,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.13", + "version": "10.5.15", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "20a63fc1c6db29b15da3bd02d4b6cf59900088a7" + "reference": "86376e05e8745ed81d88232ff92fee868247b07b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/20a63fc1c6db29b15da3bd02d4b6cf59900088a7", - "reference": "20a63fc1c6db29b15da3bd02d4b6cf59900088a7", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/86376e05e8745ed81d88232ff92fee868247b07b", + "reference": "86376e05e8745ed81d88232ff92fee868247b07b", "shasum": "" }, "require": { @@ -3457,7 +3457,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.13" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.15" }, "funding": [ { @@ -3473,7 +3473,7 @@ "type": "tidelift" } ], - "time": "2024-03-12T15:37:41+00:00" + "time": "2024-03-22T04:17:47+00:00" }, { "name": "psalm/plugin-phpunit", @@ -4010,16 +4010,16 @@ }, { "name": "sebastian/environment", - "version": "6.0.1", + "version": "6.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951" + "reference": "8074dbcd93529b357029f5cc5058fd3e43666984" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/43c751b41d74f96cbbd4e07b7aec9675651e2951", - "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/8074dbcd93529b357029f5cc5058fd3e43666984", + "reference": "8074dbcd93529b357029f5cc5058fd3e43666984", "shasum": "" }, "require": { @@ -4034,7 +4034,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "6.0-dev" + "dev-main": "6.1-dev" } }, "autoload": { @@ -4062,7 +4062,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", "security": "https://github.com/sebastianbergmann/environment/security/policy", - "source": "https://github.com/sebastianbergmann/environment/tree/6.0.1" + "source": "https://github.com/sebastianbergmann/environment/tree/6.1.0" }, "funding": [ { @@ -4070,7 +4070,7 @@ "type": "github" } ], - "time": "2023-04-11T05:39:26+00:00" + "time": "2024-03-23T08:47:14+00:00" }, { "name": "sebastian/exporter", From 65aa6a02625b5a932f5fc612bb969e4e66b0d110 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 01:18:18 +0000 Subject: [PATCH 17/23] Lock file maintenance Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- composer.lock | 56 +++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/composer.lock b/composer.lock index c559f16a6..afb261da6 100644 --- a/composer.lock +++ b/composer.lock @@ -838,16 +838,16 @@ }, { "name": "composer/xdebug-handler", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "ced299686f41dce890debac69273b47ffe98a40c" + "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", - "reference": "ced299686f41dce890debac69273b47ffe98a40c", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/4f988f8fdf580d53bdb2d1278fe93d1ed5462255", + "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255", "shasum": "" }, "require": { @@ -858,7 +858,7 @@ "require-dev": { "phpstan/phpstan": "^1.0", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^6.0" + "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5" }, "type": "library", "autoload": { @@ -882,9 +882,9 @@ "performance" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" + "source": "https://github.com/composer/xdebug-handler/tree/3.0.4" }, "funding": [ { @@ -900,7 +900,7 @@ "type": "tidelift" } ], - "time": "2022-02-25T21:32:43+00:00" + "time": "2024-03-26T18:29:49+00:00" }, { "name": "dealerdirect/phpcodesniffer-composer-installer", @@ -2478,16 +2478,16 @@ }, { "name": "laminas/laminas-validator", - "version": "2.51.0", + "version": "2.52.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-validator.git", - "reference": "25cc42efd096352f4dcfcf55dfb00665a1b29aaf" + "reference": "29087fbe742de8f7adab03969c1b5abff9d88808" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/25cc42efd096352f4dcfcf55dfb00665a1b29aaf", - "reference": "25cc42efd096352f4dcfcf55dfb00665a1b29aaf", + "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/29087fbe742de8f7adab03969c1b5abff9d88808", + "reference": "29087fbe742de8f7adab03969c1b5abff9d88808", "shasum": "" }, "require": { @@ -2504,13 +2504,13 @@ "laminas/laminas-db": "^2.19", "laminas/laminas-filter": "^2.34", "laminas/laminas-i18n": "^2.26.0", - "laminas/laminas-session": "^2.18", + "laminas/laminas-session": "^2.20", "laminas/laminas-uri": "^2.11.0", - "phpunit/phpunit": "^10.5.10", - "psalm/plugin-phpunit": "^0.18.4", + "phpunit/phpunit": "^10.5.15", + "psalm/plugin-phpunit": "^0.19.0", "psr/http-client": "^1.0.3", "psr/http-factory": "^1.0.2", - "vimeo/psalm": "^5.22.1" + "vimeo/psalm": "^5.23.1" }, "suggest": { "laminas/laminas-db": "Laminas\\Db component, required by the (No)RecordExists validator", @@ -2558,7 +2558,7 @@ "type": "community_bridge" } ], - "time": "2024-03-16T03:34:49+00:00" + "time": "2024-03-26T11:05:42+00:00" }, { "name": "myclabs/deep-copy", @@ -3376,16 +3376,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.15", + "version": "10.5.16", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "86376e05e8745ed81d88232ff92fee868247b07b" + "reference": "18f8d4a5f52b61fdd9370aaae3167daa0eeb69cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/86376e05e8745ed81d88232ff92fee868247b07b", - "reference": "86376e05e8745ed81d88232ff92fee868247b07b", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/18f8d4a5f52b61fdd9370aaae3167daa0eeb69cd", + "reference": "18f8d4a5f52b61fdd9370aaae3167daa0eeb69cd", "shasum": "" }, "require": { @@ -3457,7 +3457,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.15" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.16" }, "funding": [ { @@ -3473,7 +3473,7 @@ "type": "tidelift" } ], - "time": "2024-03-22T04:17:47+00:00" + "time": "2024-03-28T10:08:10+00:00" }, { "name": "psalm/plugin-phpunit", @@ -4680,16 +4680,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.9.0", + "version": "3.9.1", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b" + "reference": "267a4405fff1d9c847134db3a3c92f1ab7f77909" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b", - "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/267a4405fff1d9c847134db3a3c92f1ab7f77909", + "reference": "267a4405fff1d9c847134db3a3c92f1ab7f77909", "shasum": "" }, "require": { @@ -4756,7 +4756,7 @@ "type": "open_collective" } ], - "time": "2024-02-16T15:06:51+00:00" + "time": "2024-03-31T21:03:09+00:00" }, { "name": "symfony/console", From d0ae26988eac86725e26deab413d339d5a1f0234 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 02:37:55 +0000 Subject: [PATCH 18/23] Lock file maintenance Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- composer.lock | 76 +++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/composer.lock b/composer.lock index afb261da6..592c6f5ab 100644 --- a/composer.lock +++ b/composer.lock @@ -1458,16 +1458,16 @@ }, { "name": "laminas/laminas-filter", - "version": "2.34.0", + "version": "2.35.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-filter.git", - "reference": "008923542683d853109af5c71b7e9099de76c3e6" + "reference": "a03ad6a4976df7e6f6026ce8b2d1e9c53f6a99c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/008923542683d853109af5c71b7e9099de76c3e6", - "reference": "008923542683d853109af5c71b7e9099de76c3e6", + "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/a03ad6a4976df7e6f6026ce8b2d1e9c53f6a99c4", + "reference": "a03ad6a4976df7e6f6026ce8b2d1e9c53f6a99c4", "shasum": "" }, "require": { @@ -1483,13 +1483,13 @@ "require-dev": { "laminas/laminas-coding-standard": "~2.5.0", "laminas/laminas-crypt": "^3.11", - "laminas/laminas-i18n": "^2.25.0", + "laminas/laminas-i18n": "^2.26.0", "laminas/laminas-uri": "^2.11", "pear/archive_tar": "^1.4.14", - "phpunit/phpunit": "^10.5.5", - "psalm/plugin-phpunit": "^0.18.4", + "phpunit/phpunit": "^10.5.11", + "psalm/plugin-phpunit": "^0.19.0", "psr/http-factory": "^1.0.2", - "vimeo/psalm": "^5.18.0" + "vimeo/psalm": "^5.22.2" }, "suggest": { "laminas/laminas-crypt": "Laminas\\Crypt component, for encryption filters", @@ -1533,7 +1533,7 @@ "type": "community_bridge" } ], - "time": "2024-01-04T11:47:08+00:00" + "time": "2024-04-04T09:13:02+00:00" }, { "name": "laminas/laminas-http", @@ -2478,16 +2478,16 @@ }, { "name": "laminas/laminas-validator", - "version": "2.52.0", + "version": "2.53.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-validator.git", - "reference": "29087fbe742de8f7adab03969c1b5abff9d88808" + "reference": "dbcfc19cb7f2e3eb3a27ba5d059c200e8404d72c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/29087fbe742de8f7adab03969c1b5abff9d88808", - "reference": "29087fbe742de8f7adab03969c1b5abff9d88808", + "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/dbcfc19cb7f2e3eb3a27ba5d059c200e8404d72c", + "reference": "dbcfc19cb7f2e3eb3a27ba5d059c200e8404d72c", "shasum": "" }, "require": { @@ -2558,7 +2558,7 @@ "type": "community_bridge" } ], - "time": "2024-03-26T11:05:42+00:00" + "time": "2024-04-01T09:26:32+00:00" }, { "name": "myclabs/deep-copy", @@ -3376,16 +3376,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.16", + "version": "10.5.17", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "18f8d4a5f52b61fdd9370aaae3167daa0eeb69cd" + "reference": "c1f736a473d21957ead7e94fcc029f571895abf5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/18f8d4a5f52b61fdd9370aaae3167daa0eeb69cd", - "reference": "18f8d4a5f52b61fdd9370aaae3167daa0eeb69cd", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c1f736a473d21957ead7e94fcc029f571895abf5", + "reference": "c1f736a473d21957ead7e94fcc029f571895abf5", "shasum": "" }, "require": { @@ -3457,7 +3457,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.16" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.17" }, "funding": [ { @@ -3473,7 +3473,7 @@ "type": "tidelift" } ], - "time": "2024-03-28T10:08:10+00:00" + "time": "2024-04-05T04:39:01+00:00" }, { "name": "psalm/plugin-phpunit", @@ -4760,16 +4760,16 @@ }, { "name": "symfony/console", - "version": "v6.4.4", + "version": "v6.4.6", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "0d9e4eb5ad413075624378f474c4167ea202de78" + "reference": "a2708a5da5c87d1d0d52937bdeac625df659e11f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/0d9e4eb5ad413075624378f474c4167ea202de78", - "reference": "0d9e4eb5ad413075624378f474c4167ea202de78", + "url": "https://api.github.com/repos/symfony/console/zipball/a2708a5da5c87d1d0d52937bdeac625df659e11f", + "reference": "a2708a5da5c87d1d0d52937bdeac625df659e11f", "shasum": "" }, "require": { @@ -4834,7 +4834,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.4" + "source": "https://github.com/symfony/console/tree/v6.4.6" }, "funding": [ { @@ -4850,7 +4850,7 @@ "type": "tidelift" } ], - "time": "2024-02-22T20:27:10+00:00" + "time": "2024-03-29T19:07:53+00:00" }, { "name": "symfony/deprecation-contracts", @@ -4921,16 +4921,16 @@ }, { "name": "symfony/filesystem", - "version": "v6.4.3", + "version": "v6.4.6", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb" + "reference": "9919b5509ada52cc7f66f9a35c86a4a29955c9d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb", - "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/9919b5509ada52cc7f66f9a35c86a4a29955c9d3", + "reference": "9919b5509ada52cc7f66f9a35c86a4a29955c9d3", "shasum": "" }, "require": { @@ -4964,7 +4964,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.4.3" + "source": "https://github.com/symfony/filesystem/tree/v6.4.6" }, "funding": [ { @@ -4980,7 +4980,7 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-03-21T19:36:20+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5302,16 +5302,16 @@ }, { "name": "symfony/service-contracts", - "version": "v3.4.1", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0" + "reference": "11bbf19a0fb7b36345861e85c5768844c552906e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0", - "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/11bbf19a0fb7b36345861e85c5768844c552906e", + "reference": "11bbf19a0fb7b36345861e85c5768844c552906e", "shasum": "" }, "require": { @@ -5364,7 +5364,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.4.1" + "source": "https://github.com/symfony/service-contracts/tree/v3.4.2" }, "funding": [ { @@ -5380,7 +5380,7 @@ "type": "tidelift" } ], - "time": "2023-12-26T14:02:43+00:00" + "time": "2023-12-19T21:51:00+00:00" }, { "name": "symfony/string", From 86d4534a5d69530e83ae7b93dcacb469cb392bc4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 00:57:17 +0000 Subject: [PATCH 19/23] Lock file maintenance Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- composer.lock | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/composer.lock b/composer.lock index 592c6f5ab..e9321f97c 100644 --- a/composer.lock +++ b/composer.lock @@ -487,16 +487,16 @@ }, { "name": "amphp/byte-stream", - "version": "v1.8.1", + "version": "v1.8.2", "source": { "type": "git", "url": "https://github.com/amphp/byte-stream.git", - "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd" + "reference": "4f0e968ba3798a423730f567b1b50d3441c16ddc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/byte-stream/zipball/acbd8002b3536485c997c4e019206b3f10ca15bd", - "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd", + "url": "https://api.github.com/repos/amphp/byte-stream/zipball/4f0e968ba3798a423730f567b1b50d3441c16ddc", + "reference": "4f0e968ba3798a423730f567b1b50d3441c16ddc", "shasum": "" }, "require": { @@ -512,11 +512,6 @@ "psalm/phar": "^3.11.4" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, "autoload": { "files": [ "lib/functions.php" @@ -540,7 +535,7 @@ } ], "description": "A stream abstraction to make working with non-blocking I/O simple.", - "homepage": "http://amphp.org/byte-stream", + "homepage": "https://amphp.org/byte-stream", "keywords": [ "amp", "amphp", @@ -550,9 +545,8 @@ "stream" ], "support": { - "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/byte-stream/issues", - "source": "https://github.com/amphp/byte-stream/tree/v1.8.1" + "source": "https://github.com/amphp/byte-stream/tree/v1.8.2" }, "funding": [ { @@ -560,7 +554,7 @@ "type": "github" } ], - "time": "2021-03-30T17:13:30+00:00" + "time": "2024-04-13T18:00:56+00:00" }, { "name": "brick/varexporter", @@ -1458,16 +1452,16 @@ }, { "name": "laminas/laminas-filter", - "version": "2.35.1", + "version": "2.35.2", "source": { "type": "git", "url": "https://github.com/laminas/laminas-filter.git", - "reference": "a03ad6a4976df7e6f6026ce8b2d1e9c53f6a99c4" + "reference": "3e821b33a787253d56046f9258174a22de1bd267" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/a03ad6a4976df7e6f6026ce8b2d1e9c53f6a99c4", - "reference": "a03ad6a4976df7e6f6026ce8b2d1e9c53f6a99c4", + "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/3e821b33a787253d56046f9258174a22de1bd267", + "reference": "3e821b33a787253d56046f9258174a22de1bd267", "shasum": "" }, "require": { @@ -1533,7 +1527,7 @@ "type": "community_bridge" } ], - "time": "2024-04-04T09:13:02+00:00" + "time": "2024-04-11T08:13:56+00:00" }, { "name": "laminas/laminas-http", @@ -3376,16 +3370,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.17", + "version": "10.5.18", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "c1f736a473d21957ead7e94fcc029f571895abf5" + "reference": "835df1709ac6c968ba34bf23f3c30e5d5a266de8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c1f736a473d21957ead7e94fcc029f571895abf5", - "reference": "c1f736a473d21957ead7e94fcc029f571895abf5", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/835df1709ac6c968ba34bf23f3c30e5d5a266de8", + "reference": "835df1709ac6c968ba34bf23f3c30e5d5a266de8", "shasum": "" }, "require": { @@ -3457,7 +3451,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.17" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.18" }, "funding": [ { @@ -3473,7 +3467,7 @@ "type": "tidelift" } ], - "time": "2024-04-05T04:39:01+00:00" + "time": "2024-04-14T07:05:31+00:00" }, { "name": "psalm/plugin-phpunit", From e799efdf1a32c15d9a0f8cc126cf218d7e9e0ff2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 01:20:05 +0000 Subject: [PATCH 20/23] Lock file maintenance Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index e9321f97c..683e0b8ca 100644 --- a/composer.lock +++ b/composer.lock @@ -3370,16 +3370,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.18", + "version": "10.5.19", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "835df1709ac6c968ba34bf23f3c30e5d5a266de8" + "reference": "c726f0de022368f6ed103e452a765d3304a996a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/835df1709ac6c968ba34bf23f3c30e5d5a266de8", - "reference": "835df1709ac6c968ba34bf23f3c30e5d5a266de8", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c726f0de022368f6ed103e452a765d3304a996a4", + "reference": "c726f0de022368f6ed103e452a765d3304a996a4", "shasum": "" }, "require": { @@ -3451,7 +3451,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.18" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.19" }, "funding": [ { @@ -3467,7 +3467,7 @@ "type": "tidelift" } ], - "time": "2024-04-14T07:05:31+00:00" + "time": "2024-04-17T14:06:18+00:00" }, { "name": "psalm/plugin-phpunit", From b3a44ac58829db56e1d6713c277370e260b57c64 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 01:23:00 +0000 Subject: [PATCH 21/23] Lock file maintenance Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- composer.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index 683e0b8ca..42800aabc 100644 --- a/composer.lock +++ b/composer.lock @@ -3370,16 +3370,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.19", + "version": "10.5.20", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "c726f0de022368f6ed103e452a765d3304a996a4" + "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c726f0de022368f6ed103e452a765d3304a996a4", - "reference": "c726f0de022368f6ed103e452a765d3304a996a4", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/547d314dc24ec1e177720d45c6263fb226cc2ae3", + "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3", "shasum": "" }, "require": { @@ -3451,7 +3451,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.19" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.20" }, "funding": [ { @@ -3467,7 +3467,7 @@ "type": "tidelift" } ], - "time": "2024-04-17T14:06:18+00:00" + "time": "2024-04-24T06:32:35+00:00" }, { "name": "psalm/plugin-phpunit", @@ -4674,16 +4674,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.9.1", + "version": "3.9.2", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "267a4405fff1d9c847134db3a3c92f1ab7f77909" + "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/267a4405fff1d9c847134db3a3c92f1ab7f77909", - "reference": "267a4405fff1d9c847134db3a3c92f1ab7f77909", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/aac1f6f347a5c5ac6bc98ad395007df00990f480", + "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480", "shasum": "" }, "require": { @@ -4750,7 +4750,7 @@ "type": "open_collective" } ], - "time": "2024-03-31T21:03:09+00:00" + "time": "2024-04-23T20:25:34+00:00" }, { "name": "symfony/console", From a3393ec3273053c43cd0f174bec607786ce61480 Mon Sep 17 00:00:00 2001 From: Jens Hatlak Date: Tue, 4 Jun 2024 07:09:07 +0200 Subject: [PATCH 22/23] Fix layout() return type Signed-off-by: Jens Hatlak --- src/Helper/Layout.php | 2 +- src/Renderer/PhpRenderer.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Helper/Layout.php b/src/Helper/Layout.php index a1a4335b1..cdcd7c46a 100644 --- a/src/Helper/Layout.php +++ b/src/Helper/Layout.php @@ -35,7 +35,7 @@ public function __construct(?ViewModel $viewModelHelper = null) * Otherwise, attempts to set the template for that view model. * * @param null|string $template - * @return Model|null|self + * @return Model|self */ public function __invoke($template = null) { diff --git a/src/Renderer/PhpRenderer.php b/src/Renderer/PhpRenderer.php index ceab7782b..804031323 100644 --- a/src/Renderer/PhpRenderer.php +++ b/src/Renderer/PhpRenderer.php @@ -45,7 +45,7 @@ * mark them as part of the internal implementation, and thus prevent conflict * with variables injected into the renderer. * - * Convenience methods for build in helpers (@see __call): + * Convenience methods for built-in helpers (@see __call): * * @method string asset($asset) * @method string|null basePath($file = null) @@ -73,7 +73,7 @@ * @method mixed|null identity() * @method \Laminas\View\Helper\InlineScript inlineScript($mode = \Laminas\View\Helper\HeadScript::FILE, $spec = null, $placement = 'APPEND', array $attrs = array(), $type = 'text/javascript') * @method string|void json($data, array $jsonOptions = array()) - * @method \Laminas\View\Helper\Layout layout($template = null) + * @method Model|\Laminas\View\Helper\Layout layout($template = null) * @method \Laminas\View\Helper\Navigation navigation($container = null) * @method string paginationControl(\Laminas\Paginator\Paginator $paginator = null, $scrollingStyle = null, $partial = null, $params = null) * @method string|\Laminas\View\Helper\Partial partial($name = null, $values = null) From 16475158566bd15040cd849663a653812af309e8 Mon Sep 17 00:00:00 2001 From: George Steel Date: Tue, 4 Jun 2024 08:54:08 +0100 Subject: [PATCH 23/23] Refresh baseline post merge-up Signed-off-by: George Steel --- psalm-baseline.xml | 324 +-------------------------------------------- 1 file changed, 3 insertions(+), 321 deletions(-) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index e442c2a50..c9b871c4b 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -12,8 +12,6 @@ - - @@ -36,11 +34,6 @@ - - - - - @@ -135,43 +128,6 @@ - - - pluginFlashMessenger]]> - - - - - - - - - - - - - - - - - - - - - - - escapeHtmlHelper]]> - - - - - - - - - escapeHtmlHelper]]> - - @@ -196,9 +152,6 @@ options['rating']]]> options['secure']]]> - - ]]> - @@ -422,26 +375,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -473,26 +406,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -510,12 +423,6 @@ - - - - - - @@ -1119,7 +1026,6 @@ - containerClass($value)]]> @@ -1206,9 +1112,6 @@ - - - containerClass($value)]]> @@ -1224,10 +1127,9 @@ - - - - + + + @@ -1235,9 +1137,6 @@ - - - @@ -1311,11 +1210,6 @@ - - - - - @@ -1328,50 +1222,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1461,22 +1312,6 @@ - - - - - - options['errorLevel']]]> - - - - - - - - - - type]]> @@ -1547,30 +1382,6 @@ - - - - - - - - - getFilterChain()->filter($values['result'])]]> - - - - - - - - - - - - - - - @@ -1595,9 +1406,6 @@ - - - @@ -1740,19 +1548,11 @@ - - - lastLookupFailure]]> lastLookupFailure]]> lastLookupFailure]]> lastLookupFailure]]> - useStreamWrapper]]> - useStreamWrapper]]> - useViewStream]]> - useViewStream]]> - useViewStream]]> @@ -1765,13 +1565,11 @@ - - @@ -1830,48 +1628,6 @@ - - - - - - - - - - - - - - pos]]> - pos]]> - pos]]> - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2007,75 +1763,6 @@ - - - - - mvcPluginClass]]> - - - - [ - 'config' => $config, - ], - 'factories' => [ - 'ControllerPluginManager' => fn(ContainerInterface $services) => new PluginManager($services, [ - 'invokables' => [ - 'flashmessenger' => $this->mvcPluginClass, - ], - ]), - 'ViewHelperManager' => static fn(ContainerInterface $services) - => new HelperPluginManager($services), - ], - ])]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2173,11 +1860,6 @@ - - - - -