From 283a1664d5742d320392892cf69eadab47cd7ed9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 13 Jan 2023 01:25:33 +0000 Subject: [PATCH 1/3] Lock file maintenance Signed-off-by: Renovate Bot --- composer.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/composer.lock b/composer.lock index 6c4a4f7..3287eba 100644 --- a/composer.lock +++ b/composer.lock @@ -126,16 +126,16 @@ }, { "name": "laminas/laminas-eventmanager", - "version": "3.9.2", + "version": "3.10.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-eventmanager.git", - "reference": "55f7c337f4e49baf6dca87220619d40d9518e6b6" + "reference": "5a5114ab2d3fa4424faa46a2fb0a4e49a61f6eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/55f7c337f4e49baf6dca87220619d40d9518e6b6", - "reference": "55f7c337f4e49baf6dca87220619d40d9518e6b6", + "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/5a5114ab2d3fa4424faa46a2fb0a4e49a61f6eba", + "reference": "5a5114ab2d3fa4424faa46a2fb0a4e49a61f6eba", "shasum": "" }, "require": { @@ -146,7 +146,7 @@ "zendframework/zend-eventmanager": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.4.0", + "laminas/laminas-coding-standard": "~2.5.0", "laminas/laminas-stdlib": "^3.15", "phpbench/phpbench": "^1.2.7", "phpunit/phpunit": "^9.5.26", @@ -190,7 +190,7 @@ "type": "community_bridge" } ], - "time": "2022-12-20T19:45:38+00:00" + "time": "2023-01-11T19:52:45+00:00" }, { "name": "laminas/laminas-json", @@ -505,16 +505,16 @@ }, { "name": "mezzio/mezzio-helpers", - "version": "5.11.0", + "version": "5.12.0", "source": { "type": "git", "url": "https://github.com/mezzio/mezzio-helpers.git", - "reference": "ac47b19c92e050e53fe9172d3ccf7ab7cf9e9945" + "reference": "e165b3dac9c314ab7f879740ca12455b20716b1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mezzio/mezzio-helpers/zipball/ac47b19c92e050e53fe9172d3ccf7ab7cf9e9945", - "reference": "ac47b19c92e050e53fe9172d3ccf7ab7cf9e9945", + "url": "https://api.github.com/repos/mezzio/mezzio-helpers/zipball/e165b3dac9c314ab7f879740ca12455b20716b1d", + "reference": "e165b3dac9c314ab7f879740ca12455b20716b1d", "shasum": "" }, "require": { @@ -529,11 +529,11 @@ }, "require-dev": { "ext-json": "*", - "laminas/laminas-coding-standard": "~2.4.0", + "laminas/laminas-coding-standard": "~2.5.0", "laminas/laminas-diactoros": "^2.19", "phpunit/phpunit": "^9.5.25", - "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.29" + "psalm/plugin-phpunit": "^0.18.0", + "vimeo/psalm": "^5.0" }, "suggest": { "ext-json": "If you wish to use the JsonStrategy with BodyParamsMiddleware" @@ -577,20 +577,20 @@ "type": "community_bridge" } ], - "time": "2022-10-12T21:00:46+00:00" + "time": "2023-01-11T08:34:19+00:00" }, { "name": "mezzio/mezzio-router", - "version": "3.10.0", + "version": "3.12.0", "source": { "type": "git", "url": "https://github.com/mezzio/mezzio-router.git", - "reference": "f98d3e97b0e949d394703e526bf218402be601bf" + "reference": "a30bb059261e6d1d980bcd35b4f8ed537cf8087f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mezzio/mezzio-router/zipball/f98d3e97b0e949d394703e526bf218402be601bf", - "reference": "f98d3e97b0e949d394703e526bf218402be601bf", + "url": "https://api.github.com/repos/mezzio/mezzio-router/zipball/a30bb059261e6d1d980bcd35b4f8ed537cf8087f", + "reference": "a30bb059261e6d1d980bcd35b4f8ed537cf8087f", "shasum": "" }, "require": { @@ -607,12 +607,12 @@ "zendframework/zend-expressive-router": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.4.0", - "laminas/laminas-diactoros": "^2.20.0", + "laminas/laminas-coding-standard": "~2.5.0", + "laminas/laminas-diactoros": "^2.24", "laminas/laminas-stratigility": "^3.9.0", - "phpunit/phpunit": "^9.5.26", - "psalm/plugin-phpunit": "^0.18.0", - "vimeo/psalm": "^5.0.0" + "phpunit/phpunit": "^9.5.27", + "psalm/plugin-phpunit": "^0.18.4", + "vimeo/psalm": "^5.4" }, "suggest": { "mezzio/mezzio-aurarouter": "^3.0 to use the Aura.Router routing adapter", @@ -658,7 +658,7 @@ "type": "community_bridge" } ], - "time": "2022-12-13T20:50:07+00:00" + "time": "2023-01-12T15:10:48+00:00" }, { "name": "mezzio/mezzio-template", From 125f714261feddaecc18e39642dcb385d66e41f3 Mon Sep 17 00:00:00 2001 From: George Steel Date: Sat, 14 Jan 2023 17:09:57 +0000 Subject: [PATCH 2/3] Fix psalm issues due to improved upstream types Signed-off-by: George Steel --- src/UrlHelper.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/UrlHelper.php b/src/UrlHelper.php index 32273f6..e379250 100644 --- a/src/UrlHelper.php +++ b/src/UrlHelper.php @@ -10,6 +10,7 @@ /** * @final + * @psalm-import-type UrlGeneratorOptions from BaseHelper */ class UrlHelper extends AbstractHelper { @@ -22,10 +23,13 @@ public function __construct(private BaseHelper $helper) /** * Proxies to `Mezzio\Helper\UrlHelper::generate()` * - * @param array $options Can have the following keys: + * @param array $routeParams + * @param array $queryParams + * @param array $options Can have the following keys: * - router (array): contains options to be passed to the router * - reuse_result_params (bool): indicates if the current RouteResult * parameters will be used, defaults to true + * @psalm-param UrlGeneratorOptions $options * @return string */ public function __invoke( From 5f8a3f34131cb41983a359c78da6b9273be1136b Mon Sep 17 00:00:00 2001 From: George Steel Date: Sat, 14 Jan 2023 17:10:49 +0000 Subject: [PATCH 3/3] Bump dev deps and refresh lock Signed-off-by: George Steel --- composer.json | 6 +++--- composer.lock | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 10e0c46..330df9f 100644 --- a/composer.json +++ b/composer.json @@ -45,9 +45,9 @@ }, "require-dev": { "laminas/laminas-coding-standard": "~2.5.0", - "phpunit/phpunit": "^9.5.26", - "psalm/plugin-phpunit": "^0.18.0", - "vimeo/psalm": "^5.0" + "phpunit/phpunit": "^9.5.28", + "psalm/plugin-phpunit": "^0.18.4", + "vimeo/psalm": "^5.4" }, "conflict": { "container-interop/container-interop": "<1.2.0", diff --git a/composer.lock b/composer.lock index 3287eba..96ed88d 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": "bb471c0eb042cca953da0586110e9f7b", + "content-hash": "53f0f247a4b6f58bd09b89aa5463dc02", "packages": [ { "name": "fig/http-message-util", @@ -2717,20 +2717,20 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.27", + "version": "9.5.28", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38" + "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a2bc7ffdca99f92d959b3f2270529334030bba38", - "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/954ca3113a03bf780d22f07bf055d883ee04b65e", + "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1", + "doctrine/instantiator": "^1.3.1 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", @@ -2799,7 +2799,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.28" }, "funding": [ { @@ -2815,7 +2815,7 @@ "type": "tidelift" } ], - "time": "2022-12-09T07:31:23+00:00" + "time": "2023-01-14T12:32:24+00:00" }, { "name": "psalm/plugin-phpunit",