From baa3ae3a925e351c49fba802d0bd7a4d4a615911 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 4 Dec 2022 00:30:27 +0000 Subject: [PATCH 1/3] Lock file maintenance Signed-off-by: Renovate Bot --- composer.lock | 90 +++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/composer.lock b/composer.lock index 96bac48..67d0a28 100644 --- a/composer.lock +++ b/composer.lock @@ -135,16 +135,16 @@ }, { "name": "laminas/laminas-i18n", - "version": "2.19.0", + "version": "2.21.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-i18n.git", - "reference": "ebabca3a6398fc872127bc69a51bda5afc720d67" + "reference": "fbd2d0373aaced4769cba2bf3d1425d55f68abb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/ebabca3a6398fc872127bc69a51bda5afc720d67", - "reference": "ebabca3a6398fc872127bc69a51bda5afc720d67", + "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/fbd2d0373aaced4769cba2bf3d1425d55f68abb1", + "reference": "fbd2d0373aaced4769cba2bf3d1425d55f68abb1", "shasum": "" }, "require": { @@ -159,18 +159,18 @@ "zendframework/zend-i18n": "*" }, "require-dev": { - "laminas/laminas-cache": "^3.6", - "laminas/laminas-cache-storage-adapter-memory": "^2.1", + "laminas/laminas-cache": "^3.8", + "laminas/laminas-cache-storage-adapter-memory": "^2.2.0", "laminas/laminas-cache-storage-deprecated-factory": "^1.0.1", "laminas/laminas-coding-standard": "~2.4.0", - "laminas/laminas-config": "^3.7", - "laminas/laminas-eventmanager": "^3.5.0", - "laminas/laminas-filter": "^2.21", - "laminas/laminas-validator": "^2.25", - "laminas/laminas-view": "^2.23", - "phpunit/phpunit": "^9.5.25", - "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.28" + "laminas/laminas-config": "^3.8.0", + "laminas/laminas-eventmanager": "^3.7", + "laminas/laminas-filter": "^2.28.1", + "laminas/laminas-validator": "^2.28", + "laminas/laminas-view": "^2.25", + "phpunit/phpunit": "^9.5.26", + "psalm/plugin-phpunit": "^0.18.3", + "vimeo/psalm": "^5.0.0" }, "suggest": { "laminas/laminas-cache": "You should install this package to cache the translations", @@ -217,7 +217,7 @@ "type": "community_bridge" } ], - "time": "2022-10-10T15:48:56+00:00" + "time": "2022-12-02T17:15:52+00:00" }, { "name": "laminas/laminas-loader", @@ -277,16 +277,16 @@ }, { "name": "laminas/laminas-router", - "version": "3.10.0", + "version": "3.11.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-router.git", - "reference": "84aa1047389270cc2b05e2fe85667efb592fbf5e" + "reference": "48b6fccd63b9e04e67781c212bf3bedd75c9ca17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-router/zipball/84aa1047389270cc2b05e2fe85667efb592fbf5e", - "reference": "84aa1047389270cc2b05e2fe85667efb592fbf5e", + "url": "https://api.github.com/repos/laminas/laminas-router/zipball/48b6fccd63b9e04e67781c212bf3bedd75c9ca17", + "reference": "48b6fccd63b9e04e67781c212bf3bedd75c9ca17", "shasum": "" }, "require": { @@ -300,10 +300,10 @@ }, "require-dev": { "laminas/laminas-coding-standard": "~2.4.0", - "laminas/laminas-i18n": "^2.17", - "phpunit/phpunit": "^9.5.25", - "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.28" + "laminas/laminas-i18n": "^2.19.0", + "phpunit/phpunit": "^9.5.26", + "psalm/plugin-phpunit": "^0.18.0", + "vimeo/psalm": "^5.0.0" }, "suggest": { "laminas/laminas-i18n": "^2.15.0 if defining translatable HTTP path segments" @@ -344,20 +344,20 @@ "type": "community_bridge" } ], - "time": "2022-10-10T15:38:09+00:00" + "time": "2022-12-02T17:45:59+00:00" }, { "name": "laminas/laminas-servicemanager", - "version": "3.19.0", + "version": "3.20.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-servicemanager.git", - "reference": "ed160729bb8721127efdaac799f9a298963345b1" + "reference": "bc2c2cbe2dd90db8b9d16b0618f542692b76ab59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/ed160729bb8721127efdaac799f9a298963345b1", - "reference": "ed160729bb8721127efdaac799f9a298963345b1", + "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/bc2c2cbe2dd90db8b9d16b0618f542692b76ab59", + "reference": "bc2c2cbe2dd90db8b9d16b0618f542692b76ab59", "shasum": "" }, "require": { @@ -380,14 +380,14 @@ "require-dev": { "composer/package-versions-deprecated": "^1.11.99.5", "laminas/laminas-coding-standard": "~2.4.0", - "laminas/laminas-container-config-test": "^0.7", + "laminas/laminas-container-config-test": "^0.8", "laminas/laminas-dependency-plugin": "^2.2", "mikey179/vfsstream": "^1.6.11@alpha", "ocramius/proxy-manager": "^2.14.1", - "phpbench/phpbench": "^1.2.6", - "phpunit/phpunit": "^9.5.25", - "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.28" + "phpbench/phpbench": "^1.2.7", + "phpunit/phpunit": "^9.5.26", + "psalm/plugin-phpunit": "^0.18.0", + "vimeo/psalm": "^5.0.0" }, "suggest": { "ocramius/proxy-manager": "ProxyManager ^2.1.1 to handle lazy initialization of services" @@ -434,20 +434,20 @@ "type": "community_bridge" } ], - "time": "2022-10-10T20:59:22+00:00" + "time": "2022-12-01T17:03:38+00:00" }, { "name": "laminas/laminas-stdlib", - "version": "3.16.0", + "version": "3.16.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-stdlib.git", - "reference": "0880e3dd88eca01eeda9dfdb5a05c38e56902c2c" + "reference": "f4f773641807c7ccee59b758bfe4ac4ba33ecb17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/0880e3dd88eca01eeda9dfdb5a05c38e56902c2c", - "reference": "0880e3dd88eca01eeda9dfdb5a05c38e56902c2c", + "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/f4f773641807c7ccee59b758bfe4ac4ba33ecb17", + "reference": "f4f773641807c7ccee59b758bfe4ac4ba33ecb17", "shasum": "" }, "require": { @@ -493,7 +493,7 @@ "type": "community_bridge" } ], - "time": "2022-11-30T23:45:45+00:00" + "time": "2022-12-03T18:48:01+00:00" }, { "name": "laminas/laminas-uri", @@ -4664,16 +4664,16 @@ }, { "name": "vimeo/psalm", - "version": "5.0.0", + "version": "5.1.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "4e177bf0c9f03c17d2fbfd83b7cc9c47605274d8" + "reference": "4defa177c89397c5e14737a80fe4896584130674" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/4e177bf0c9f03c17d2fbfd83b7cc9c47605274d8", - "reference": "4e177bf0c9f03c17d2fbfd83b7cc9c47605274d8", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/4defa177c89397c5e14737a80fe4896584130674", + "reference": "4defa177c89397c5e14737a80fe4896584130674", "shasum": "" }, "require": { @@ -4762,9 +4762,9 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/5.0.0" + "source": "https://github.com/vimeo/psalm/tree/5.1.0" }, - "time": "2022-11-30T06:06:01+00:00" + "time": "2022-12-02T01:23:35+00:00" }, { "name": "webimpress/coding-standard", From 3d349cc6c3418e0a722c245183a0004ed710d147 Mon Sep 17 00:00:00 2001 From: George Steel Date: Mon, 5 Dec 2022 21:13:41 +0000 Subject: [PATCH 2/3] Implement missing generic types Signed-off-by: George Steel --- src/Router/TranslatorAwareTreeRouteStack.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Router/TranslatorAwareTreeRouteStack.php b/src/Router/TranslatorAwareTreeRouteStack.php index 961b11e..9738324 100644 --- a/src/Router/TranslatorAwareTreeRouteStack.php +++ b/src/Router/TranslatorAwareTreeRouteStack.php @@ -7,8 +7,8 @@ use Laminas\I18n\Translator\TranslatorAwareInterface; use Laminas\I18n\Translator\TranslatorInterface as Translator; use Laminas\Router\Exception; +use Laminas\Router\Http\RouteInterface; use Laminas\Router\Http\TreeRouteStack; -use Laminas\Router\RouteInterface; use Laminas\Router\RouteMatch; use Laminas\Stdlib\RequestInterface as Request; use Traversable; @@ -17,6 +17,9 @@ /** * Translator aware tree route stack. + * + * @template TRoute of RouteInterface + * @extends TreeRouteStack */ class TranslatorAwareTreeRouteStack extends TreeRouteStack implements TranslatorAwareInterface { From a5c306e38d1e8024268482f555aa3dda75e71efb Mon Sep 17 00:00:00 2001 From: George Steel Date: Mon, 5 Dec 2022 21:13:55 +0000 Subject: [PATCH 3/3] Bump dev deps, refresh lock. Signed-off-by: George Steel --- composer.json | 4 ++-- composer.lock | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index d706b90..e755bc8 100644 --- a/composer.json +++ b/composer.json @@ -45,8 +45,8 @@ "laminas/laminas-coding-standard": "~2.4.0", "phpspec/prophecy-phpunit": "^2.0.1", "phpunit/phpunit": "^9.5.26", - "psalm/plugin-phpunit": "^0.18.0", - "vimeo/psalm": "^5.0.0" + "psalm/plugin-phpunit": "^0.18.4", + "vimeo/psalm": "^5.1" }, "conflict": { "laminas/laminas-mvc": "<3.0.0", diff --git a/composer.lock b/composer.lock index 67d0a28..77bf469 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": "825454ee334f258eb19915c57aba1eaa", + "content-hash": "399a443d493036bfcd1d9768b2dfd2e0", "packages": [ { "name": "laminas/laminas-escaper", @@ -2617,16 +2617,16 @@ }, { "name": "psalm/plugin-phpunit", - "version": "0.18.3", + "version": "0.18.4", "source": { "type": "git", "url": "https://github.com/psalm/psalm-plugin-phpunit.git", - "reference": "057c1cdf7546c1e427f6fd83b635d0cc18c252bf" + "reference": "e4ab3096653d9eb6f6d0ea5f4461898d59ae4dbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/psalm/psalm-plugin-phpunit/zipball/057c1cdf7546c1e427f6fd83b635d0cc18c252bf", - "reference": "057c1cdf7546c1e427f6fd83b635d0cc18c252bf", + "url": "https://api.github.com/repos/psalm/psalm-plugin-phpunit/zipball/e4ab3096653d9eb6f6d0ea5f4461898d59ae4dbc", + "reference": "e4ab3096653d9eb6f6d0ea5f4461898d59ae4dbc", "shasum": "" }, "require": { @@ -2634,7 +2634,7 @@ "composer/semver": "^1.4 || ^2.0 || ^3.0", "ext-simplexml": "*", "php": "^7.1 || ^8.0", - "vimeo/psalm": "dev-master || dev-4.x || ^4.5 || ^5@beta" + "vimeo/psalm": "dev-master || dev-4.x || ^4.7.1 || ^5@beta || ^5.0" }, "conflict": { "phpunit/phpunit": "<7.5" @@ -2671,9 +2671,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.3" + "source": "https://github.com/psalm/psalm-plugin-phpunit/tree/0.18.4" }, - "time": "2022-11-03T18:17:28+00:00" + "time": "2022-12-03T07:47:07+00:00" }, { "name": "psr/log",