From bf9cb6133dac5bbaeafb5d7dfaf94c74bb802dfb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 01:54:25 +0000
Subject: [PATCH 01/12] Lock file maintenance

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 composer.lock | 348 +++++++++++++++++++++++++++-----------------------
 1 file changed, 187 insertions(+), 161 deletions(-)

diff --git a/composer.lock b/composer.lock
index db91cc917..1a3fcca06 100644
--- a/composer.lock
+++ b/composer.lock
@@ -70,16 +70,16 @@
         },
         {
             "name": "laminas/laminas-eventmanager",
-            "version": "3.12.0",
+            "version": "3.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-eventmanager.git",
-                "reference": "4a576922c00cc7838d60d004a7bd6f5a02c23b57"
+                "reference": "ce5ba8bde378fca5cb0cd514f01823637215b2f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/4a576922c00cc7838d60d004a7bd6f5a02c23b57",
-                "reference": "4a576922c00cc7838d60d004a7bd6f5a02c23b57",
+                "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/ce5ba8bde378fca5cb0cd514f01823637215b2f3",
+                "reference": "ce5ba8bde378fca5cb0cd514f01823637215b2f3",
                 "shasum": ""
             },
             "require": {
@@ -91,12 +91,12 @@
             },
             "require-dev": {
                 "laminas/laminas-coding-standard": "~2.5.0",
-                "laminas/laminas-stdlib": "^3.17",
-                "phpbench/phpbench": "^1.2.10",
-                "phpunit/phpunit": "^10.4.1",
+                "laminas/laminas-stdlib": "^3.18",
+                "phpbench/phpbench": "^1.2.15",
+                "phpunit/phpunit": "^10.5.5",
                 "psalm/plugin-phpunit": "^0.18.4",
                 "psr/container": "^1.1.2 || ^2.0.2",
-                "vimeo/psalm": "^5.11"
+                "vimeo/psalm": "^5.18"
             },
             "suggest": {
                 "laminas/laminas-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature",
@@ -134,7 +134,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2023-10-18T16:36:45+00:00"
+            "time": "2024-01-03T17:43:50+00:00"
         },
         {
             "name": "laminas/laminas-json",
@@ -1117,16 +1117,16 @@
         },
         {
             "name": "fidry/cpu-core-counter",
-            "version": "0.5.1",
+            "version": "1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theofidry/cpu-core-counter.git",
-                "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623"
+                "reference": "85193c0b0cb5c47894b5eaec906e946f054e7077"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/b58e5a3933e541dc286cc91fc4f3898bbc6f1623",
-                "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623",
+                "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/85193c0b0cb5c47894b5eaec906e946f054e7077",
+                "reference": "85193c0b0cb5c47894b5eaec906e946f054e7077",
                 "shasum": ""
             },
             "require": {
@@ -1134,13 +1134,13 @@
             },
             "require-dev": {
                 "fidry/makefile": "^0.2.0",
+                "fidry/php-cs-fixer-config": "^1.1.2",
                 "phpstan/extension-installer": "^1.2.0",
                 "phpstan/phpstan": "^1.9.2",
                 "phpstan/phpstan-deprecation-rules": "^1.0.0",
                 "phpstan/phpstan-phpunit": "^1.2.2",
                 "phpstan/phpstan-strict-rules": "^1.4.4",
-                "phpunit/phpunit": "^9.5.26 || ^8.5.31",
-                "theofidry/php-cs-fixer-config": "^1.0",
+                "phpunit/phpunit": "^8.5.31 || ^9.5.26",
                 "webmozarts/strict-phpunit": "^7.5"
             },
             "type": "library",
@@ -1166,7 +1166,7 @@
             ],
             "support": {
                 "issues": "https://github.com/theofidry/cpu-core-counter/issues",
-                "source": "https://github.com/theofidry/cpu-core-counter/tree/0.5.1"
+                "source": "https://github.com/theofidry/cpu-core-counter/tree/1.0.0"
             },
             "funding": [
                 {
@@ -1174,7 +1174,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-12-24T12:35:10+00:00"
+            "time": "2023-09-17T21:38:23+00:00"
         },
         {
             "name": "laminas/laminas-authentication",
@@ -1458,16 +1458,16 @@
         },
         {
             "name": "laminas/laminas-filter",
-            "version": "2.33.0",
+            "version": "2.34.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-filter.git",
-                "reference": "6ad64828d25ec4bdf226ec5096aabb04aa710324"
+                "reference": "008923542683d853109af5c71b7e9099de76c3e6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/6ad64828d25ec4bdf226ec5096aabb04aa710324",
-                "reference": "6ad64828d25ec4bdf226ec5096aabb04aa710324",
+                "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/008923542683d853109af5c71b7e9099de76c3e6",
+                "reference": "008923542683d853109af5c71b7e9099de76c3e6",
                 "shasum": ""
             },
             "require": {
@@ -1482,14 +1482,14 @@
             },
             "require-dev": {
                 "laminas/laminas-coding-standard": "~2.5.0",
-                "laminas/laminas-crypt": "^3.10",
-                "laminas/laminas-i18n": "^2.23.1",
+                "laminas/laminas-crypt": "^3.11",
+                "laminas/laminas-i18n": "^2.25.0",
                 "laminas/laminas-uri": "^2.11",
                 "pear/archive_tar": "^1.4.14",
-                "phpunit/phpunit": "^10.4.2",
+                "phpunit/phpunit": "^10.5.5",
                 "psalm/plugin-phpunit": "^0.18.4",
                 "psr/http-factory": "^1.0.2",
-                "vimeo/psalm": "^5.15.0"
+                "vimeo/psalm": "^5.18.0"
             },
             "suggest": {
                 "laminas/laminas-crypt": "Laminas\\Crypt component, for encryption filters",
@@ -1533,7 +1533,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2023-11-03T13:29:10+00:00"
+            "time": "2024-01-04T11:47:08+00:00"
         },
         {
             "name": "laminas/laminas-http",
@@ -1602,16 +1602,16 @@
         },
         {
             "name": "laminas/laminas-i18n",
-            "version": "2.24.1",
+            "version": "2.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-i18n.git",
-                "reference": "dafb5eddfb43575befd29aeb195c55f92834fd32"
+                "reference": "01738410cb263994d1d192861f642387e7e12ace"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/dafb5eddfb43575befd29aeb195c55f92834fd32",
-                "reference": "dafb5eddfb43575befd29aeb195c55f92834fd32",
+                "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/01738410cb263994d1d192861f642387e7e12ace",
+                "reference": "01738410cb263994d1d192861f642387e7e12ace",
                 "shasum": ""
             },
             "require": {
@@ -1625,18 +1625,18 @@
                 "zendframework/zend-i18n": "*"
             },
             "require-dev": {
-                "laminas/laminas-cache": "^3.11.0",
+                "laminas/laminas-cache": "^3.12.0",
                 "laminas/laminas-cache-storage-adapter-memory": "^2.3.0",
-                "laminas/laminas-cache-storage-deprecated-factory": "^1.1",
+                "laminas/laminas-cache-storage-deprecated-factory": "^1.2",
                 "laminas/laminas-coding-standard": "~2.5.0",
                 "laminas/laminas-config": "^3.9.0",
-                "laminas/laminas-eventmanager": "^3.12",
-                "laminas/laminas-filter": "^2.33",
-                "laminas/laminas-validator": "^2.41",
-                "laminas/laminas-view": "^2.32",
-                "phpunit/phpunit": "^10.4.2",
+                "laminas/laminas-eventmanager": "^3.13",
+                "laminas/laminas-filter": "^2.34",
+                "laminas/laminas-validator": "^2.46",
+                "laminas/laminas-view": "^2.33",
+                "phpunit/phpunit": "^10.5.5",
                 "psalm/plugin-phpunit": "^0.18.4",
-                "vimeo/psalm": "^5.15.0"
+                "vimeo/psalm": "^5.18.0"
             },
             "suggest": {
                 "laminas/laminas-cache": "You should install this package to cache the translations",
@@ -1683,7 +1683,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2023-11-08T08:56:45+00:00"
+            "time": "2024-01-04T13:49:00+00:00"
         },
         {
             "name": "laminas/laminas-loader",
@@ -2477,16 +2477,16 @@
         },
         {
             "name": "laminas/laminas-validator",
-            "version": "2.43.0",
+            "version": "2.46.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-validator.git",
-                "reference": "8f6c2f5753dec64df924a86d18036113f3140f2b"
+                "reference": "98330256f8d8a1357a93f6f7f1a987036aff6329"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/8f6c2f5753dec64df924a86d18036113f3140f2b",
-                "reference": "8f6c2f5753dec64df924a86d18036113f3140f2b",
+                "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/98330256f8d8a1357a93f6f7f1a987036aff6329",
+                "reference": "98330256f8d8a1357a93f6f7f1a987036aff6329",
                 "shasum": ""
             },
             "require": {
@@ -2501,15 +2501,15 @@
             "require-dev": {
                 "laminas/laminas-coding-standard": "^2.5",
                 "laminas/laminas-db": "^2.18",
-                "laminas/laminas-filter": "^2.32",
-                "laminas/laminas-i18n": "^2.23",
-                "laminas/laminas-session": "^2.16",
-                "laminas/laminas-uri": "^2.10.0",
-                "phpunit/phpunit": "^10.3.3",
+                "laminas/laminas-filter": "^2.33",
+                "laminas/laminas-i18n": "^2.24.1",
+                "laminas/laminas-session": "^2.17",
+                "laminas/laminas-uri": "^2.11.0",
+                "phpunit/phpunit": "^10.5.2",
                 "psalm/plugin-phpunit": "^0.18.4",
-                "psr/http-client": "^1.0.2",
+                "psr/http-client": "^1.0.3",
                 "psr/http-factory": "^1.0.2",
-                "vimeo/psalm": "^5.15"
+                "vimeo/psalm": "^5.17"
             },
             "suggest": {
                 "laminas/laminas-db": "Laminas\\Db component, required by the (No)RecordExists validator",
@@ -2557,7 +2557,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2023-11-20T01:23:15+00:00"
+            "time": "2024-01-03T12:43:04+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -2671,16 +2671,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.17.1",
+            "version": "v4.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d"
+                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
-                "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999",
+                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999",
                 "shasum": ""
             },
             "require": {
@@ -2721,9 +2721,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0"
             },
-            "time": "2023-08-13T19:53:39+00:00"
+            "time": "2023-12-10T21:03:43+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -3047,23 +3047,23 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "10.1.9",
+            "version": "10.1.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "a56a9ab2f680246adcf3db43f38ddf1765774735"
+                "reference": "78c3b7625965c2513ee96569a4dbb62601784145"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/a56a9ab2f680246adcf3db43f38ddf1765774735",
-                "reference": "a56a9ab2f680246adcf3db43f38ddf1765774735",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/78c3b7625965c2513ee96569a4dbb62601784145",
+                "reference": "78c3b7625965c2513ee96569a4dbb62601784145",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.15",
+                "nikic/php-parser": "^4.18 || ^5.0",
                 "php": ">=8.1",
                 "phpunit/php-file-iterator": "^4.0",
                 "phpunit/php-text-template": "^3.0",
@@ -3113,7 +3113,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.9"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.11"
             },
             "funding": [
                 {
@@ -3121,7 +3121,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-11-23T12:23:20+00:00"
+            "time": "2023-12-21T15:38:30+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -3368,16 +3368,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.4.2",
+            "version": "10.5.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "cacd8b9dd224efa8eb28beb69004126c7ca1a1a1"
+                "reference": "ed21115d505b4b4f7dc7b5651464e19a2c7f7856"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/cacd8b9dd224efa8eb28beb69004126c7ca1a1a1",
-                "reference": "cacd8b9dd224efa8eb28beb69004126c7ca1a1a1",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ed21115d505b4b4f7dc7b5651464e19a2c7f7856",
+                "reference": "ed21115d505b4b4f7dc7b5651464e19a2c7f7856",
                 "shasum": ""
             },
             "require": {
@@ -3417,7 +3417,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "10.4-dev"
+                    "dev-main": "10.5-dev"
                 }
             },
             "autoload": {
@@ -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.4.2"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.5"
             },
             "funding": [
                 {
@@ -3465,7 +3465,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-26T07:21:45+00:00"
+            "time": "2023-12-27T15:13:52+00:00"
         },
         {
             "name": "psalm/plugin-phpunit",
@@ -3876,20 +3876,20 @@
         },
         {
             "name": "sebastian/complexity",
-            "version": "3.1.0",
+            "version": "3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/complexity.git",
-                "reference": "68cfb347a44871f01e33ab0ef8215966432f6957"
+                "reference": "68ff824baeae169ec9f2137158ee529584553799"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68cfb347a44871f01e33ab0ef8215966432f6957",
-                "reference": "68cfb347a44871f01e33ab0ef8215966432f6957",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799",
+                "reference": "68ff824baeae169ec9f2137158ee529584553799",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.10",
+                "nikic/php-parser": "^4.18 || ^5.0",
                 "php": ">=8.1"
             },
             "require-dev": {
@@ -3898,7 +3898,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.1-dev"
+                    "dev-main": "3.2-dev"
                 }
             },
             "autoload": {
@@ -3922,7 +3922,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/complexity/issues",
                 "security": "https://github.com/sebastianbergmann/complexity/security/policy",
-                "source": "https://github.com/sebastianbergmann/complexity/tree/3.1.0"
+                "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0"
             },
             "funding": [
                 {
@@ -3930,20 +3930,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-09-28T11:50:59+00:00"
+            "time": "2023-12-21T08:37:17+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "5.0.3",
+            "version": "5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b"
+                "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/912dc2fbe3e3c1e7873313cc801b100b6c68c87b",
-                "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/fbf413a49e54f6b9b17e12d900ac7f6101591b7f",
+                "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f",
                 "shasum": ""
             },
             "require": {
@@ -3956,7 +3956,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "5.0-dev"
+                    "dev-main": "5.1-dev"
                 }
             },
             "autoload": {
@@ -3989,7 +3989,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.0.3"
+                "source": "https://github.com/sebastianbergmann/diff/tree/5.1.0"
             },
             "funding": [
                 {
@@ -3997,7 +3997,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-05-01T07:48:21+00:00"
+            "time": "2023-12-22T10:55:06+00:00"
         },
         {
             "name": "sebastian/environment",
@@ -4205,20 +4205,20 @@
         },
         {
             "name": "sebastian/lines-of-code",
-            "version": "2.0.1",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/lines-of-code.git",
-                "reference": "649e40d279e243d985aa8fb6e74dd5bb28dc185d"
+                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/649e40d279e243d985aa8fb6e74dd5bb28dc185d",
-                "reference": "649e40d279e243d985aa8fb6e74dd5bb28dc185d",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0",
+                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.10",
+                "nikic/php-parser": "^4.18 || ^5.0",
                 "php": ">=8.1"
             },
             "require-dev": {
@@ -4251,7 +4251,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
                 "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy",
-                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.1"
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2"
             },
             "funding": [
                 {
@@ -4259,7 +4259,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-31T09:25:50+00:00"
+            "time": "2023-12-21T08:38:20+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
@@ -4671,16 +4671,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.7.2",
+            "version": "3.8.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879"
+                "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
+                "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879",
-                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5805f7a4e4958dbb5e944ef1e6edae0a303765e7",
+                "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7",
                 "shasum": ""
             },
             "require": {
@@ -4690,7 +4690,7 @@
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
             },
             "bin": [
                 "bin/phpcs",
@@ -4709,35 +4709,58 @@
             "authors": [
                 {
                     "name": "Greg Sherwood",
-                    "role": "lead"
+                    "role": "Former lead"
+                },
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "role": "Current lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors"
                 }
             ],
             "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
+            "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
             "keywords": [
                 "phpcs",
                 "standards",
                 "static analysis"
             ],
             "support": {
-                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
-                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
-                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+                "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues",
+                "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy",
+                "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
+                "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki"
             },
-            "time": "2023-02-22T23:07:41+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/PHPCSStandards",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/jrfnl",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/php_codesniffer",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2023-12-08T12:32:31+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v6.3.8",
+            "version": "v6.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92"
+                "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/0d14a9f6d04d4ac38a8cea1171f4554e325dae92",
-                "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92",
+                "url": "https://api.github.com/repos/symfony/console/zipball/0254811a143e6bc6c8deea08b589a7e68a37f625",
+                "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625",
                 "shasum": ""
             },
             "require": {
@@ -4745,7 +4768,7 @@
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/string": "^5.4|^6.0"
+                "symfony/string": "^5.4|^6.0|^7.0"
             },
             "conflict": {
                 "symfony/dependency-injection": "<5.4",
@@ -4759,12 +4782,16 @@
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/event-dispatcher": "^5.4|^6.0",
-                "symfony/lock": "^5.4|^6.0",
-                "symfony/process": "^5.4|^6.0",
-                "symfony/var-dumper": "^5.4|^6.0"
+                "symfony/config": "^5.4|^6.0|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/lock": "^5.4|^6.0|^7.0",
+                "symfony/messenger": "^5.4|^6.0|^7.0",
+                "symfony/process": "^5.4|^6.0|^7.0",
+                "symfony/stopwatch": "^5.4|^6.0|^7.0",
+                "symfony/var-dumper": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -4798,7 +4825,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.3.8"
+                "source": "https://github.com/symfony/console/tree/v6.4.2"
             },
             "funding": [
                 {
@@ -4814,7 +4841,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-31T08:09:35+00:00"
+            "time": "2023-12-10T16:15:48+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -4885,16 +4912,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v6.3.1",
+            "version": "v6.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae"
+                "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/edd36776956f2a6fcf577edb5b05eb0e3bdc52ae",
-                "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/952a8cb588c3bc6ce76f6023000fb932f16a6e59",
+                "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59",
                 "shasum": ""
             },
             "require": {
@@ -4928,7 +4955,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.3.1"
+                "source": "https://github.com/symfony/filesystem/tree/v6.4.0"
             },
             "funding": [
                 {
@@ -4944,7 +4971,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-01T08:30:39+00:00"
+            "time": "2023-07-26T17:27:13+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -5278,33 +5305,29 @@
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.5.2",
+            "version": "v3.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
+                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
-                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0",
+                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "psr/container": "^1.1",
-                "symfony/deprecation-contracts": "^2.1|^3"
+                "php": ">=8.1",
+                "psr/container": "^1.1|^2.0"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
             },
-            "suggest": {
-                "symfony/service-implementation": ""
-            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "3.4-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -5314,7 +5337,10 @@
             "autoload": {
                 "psr-4": {
                     "Symfony\\Contracts\\Service\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Test/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -5341,7 +5367,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v2.5.2"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.4.1"
             },
             "funding": [
                 {
@@ -5357,20 +5383,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-30T19:17:29+00:00"
+            "time": "2023-12-26T14:02:43+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v6.3.8",
+            "version": "v6.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "13880a87790c76ef994c91e87efb96134522577a"
+                "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/13880a87790c76ef994c91e87efb96134522577a",
-                "reference": "13880a87790c76ef994c91e87efb96134522577a",
+                "url": "https://api.github.com/repos/symfony/string/zipball/7cb80bc10bfcdf6b5492741c0b9357dac66940bc",
+                "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc",
                 "shasum": ""
             },
             "require": {
@@ -5384,11 +5410,11 @@
                 "symfony/translation-contracts": "<2.5"
             },
             "require-dev": {
-                "symfony/error-handler": "^5.4|^6.0",
-                "symfony/http-client": "^5.4|^6.0",
-                "symfony/intl": "^6.2",
+                "symfony/error-handler": "^5.4|^6.0|^7.0",
+                "symfony/http-client": "^5.4|^6.0|^7.0",
+                "symfony/intl": "^6.2|^7.0",
                 "symfony/translation-contracts": "^2.5|^3.0",
-                "symfony/var-exporter": "^5.4|^6.0"
+                "symfony/var-exporter": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -5427,7 +5453,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.3.8"
+                "source": "https://github.com/symfony/string/tree/v6.4.2"
             },
             "funding": [
                 {
@@ -5443,7 +5469,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-09T08:28:21+00:00"
+            "time": "2023-12-10T16:15:48+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -5497,16 +5523,16 @@
         },
         {
             "name": "vimeo/psalm",
-            "version": "5.16.0",
+            "version": "5.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vimeo/psalm.git",
-                "reference": "2897ba636551a8cb61601cc26f6ccfbba6c36591"
+                "reference": "b113f3ed0259fd6e212d87c3df80eec95a6abf19"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vimeo/psalm/zipball/2897ba636551a8cb61601cc26f6ccfbba6c36591",
-                "reference": "2897ba636551a8cb61601cc26f6ccfbba6c36591",
+                "url": "https://api.github.com/repos/vimeo/psalm/zipball/b113f3ed0259fd6e212d87c3df80eec95a6abf19",
+                "reference": "b113f3ed0259fd6e212d87c3df80eec95a6abf19",
                 "shasum": ""
             },
             "require": {
@@ -5525,7 +5551,7 @@
                 "ext-tokenizer": "*",
                 "felixfbecker/advanced-json-rpc": "^3.1",
                 "felixfbecker/language-server-protocol": "^1.5.2",
-                "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1",
+                "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1 || ^1.0.0",
                 "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
                 "nikic/php-parser": "^4.16",
                 "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
@@ -5603,20 +5629,20 @@
                 "issues": "https://github.com/vimeo/psalm/issues",
                 "source": "https://github.com/vimeo/psalm"
             },
-            "time": "2023-11-22T20:38:47+00:00"
+            "time": "2023-12-16T09:37:35+00:00"
         },
         {
             "name": "webimpress/coding-standard",
-            "version": "1.3.1",
+            "version": "1.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webimpress/coding-standard.git",
-                "reference": "b26557e2386711ecb74f22718f4b4bde5ddbc899"
+                "reference": "710f71ac95d36d931e76b47132b599c39abfab11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webimpress/coding-standard/zipball/b26557e2386711ecb74f22718f4b4bde5ddbc899",
-                "reference": "b26557e2386711ecb74f22718f4b4bde5ddbc899",
+                "url": "https://api.github.com/repos/webimpress/coding-standard/zipball/710f71ac95d36d931e76b47132b599c39abfab11",
+                "reference": "710f71ac95d36d931e76b47132b599c39abfab11",
                 "shasum": ""
             },
             "require": {
@@ -5624,7 +5650,7 @@
                 "squizlabs/php_codesniffer": "^3.7.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.6.4"
+                "phpunit/phpunit": "^9.6.15"
             },
             "type": "phpcodesniffer-standard",
             "extra": {
@@ -5650,7 +5676,7 @@
             ],
             "support": {
                 "issues": "https://github.com/webimpress/coding-standard/issues",
-                "source": "https://github.com/webimpress/coding-standard/tree/1.3.1"
+                "source": "https://github.com/webimpress/coding-standard/tree/1.3.2"
             },
             "funding": [
                 {
@@ -5658,7 +5684,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-09T15:05:18+00:00"
+            "time": "2023-12-18T07:25:41+00:00"
         },
         {
             "name": "webimpress/safe-writer",

From db521c5204fa020e220a87dd88b4eb18077482ab Mon Sep 17 00:00:00 2001
From: George Steel <george@net-glue.co.uk>
Date: Mon, 8 Jan 2024 09:50:00 +0000
Subject: [PATCH 02/12] Bump dev deps, refresh lock

Signed-off-by: George Steel <george@net-glue.co.uk>
---
 composer.json | 20 ++++++++++----------
 composer.lock |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index 066df0041..41e2e9fc5 100644
--- a/composer.json
+++ b/composer.json
@@ -37,24 +37,24 @@
         "psr/container": "^1 || ^2"
     },
     "require-dev": {
-        "laminas/laminas-authentication": "^2.15",
+        "laminas/laminas-authentication": "^2.16",
         "laminas/laminas-coding-standard": "~2.5.0",
         "laminas/laminas-feed": "^2.22",
-        "laminas/laminas-filter": "^2.32",
+        "laminas/laminas-filter": "^2.34",
         "laminas/laminas-http": "^2.19",
-        "laminas/laminas-i18n": "^2.23.1",
+        "laminas/laminas-i18n": "^2.26.0",
         "laminas/laminas-modulemanager": "^2.15",
-        "laminas/laminas-mvc": "^3.6.1",
-        "laminas/laminas-mvc-i18n": "^1.7",
-        "laminas/laminas-mvc-plugin-flashmessenger": "^1.9",
-        "laminas/laminas-navigation": "^2.18.1",
-        "laminas/laminas-paginator": "^2.17",
+        "laminas/laminas-mvc": "^3.7.0",
+        "laminas/laminas-mvc-i18n": "^1.8",
+        "laminas/laminas-mvc-plugin-flashmessenger": "^1.10",
+        "laminas/laminas-navigation": "^2.19.0",
+        "laminas/laminas-paginator": "^2.18",
         "laminas/laminas-permissions-acl": "^2.16",
         "laminas/laminas-router": "^3.12.0",
         "laminas/laminas-uri": "^2.11",
-        "phpunit/phpunit": "^10.4.2",
+        "phpunit/phpunit": "^10.5.5",
         "psalm/plugin-phpunit": "^0.18.4",
-        "vimeo/psalm": "^5.15"
+        "vimeo/psalm": "^5.18"
     },
     "conflict": {
         "container-interop/container-interop": "<1.2",
diff --git a/composer.lock b/composer.lock
index 1a3fcca06..244953982 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": "a61a572e9d32a9124086e1adf8b50d56",
+    "content-hash": "2d2ce4dd1a4c98f31574846b74249f6f",
     "packages": [
         {
             "name": "laminas/laminas-escaper",

From 15d3ad0cc98a4ece2bfc5e80e9d2fd02c1bce009 Mon Sep 17 00:00:00 2001
From: George Steel <george@net-glue.co.uk>
Date: Mon, 8 Jan 2024 09:50:16 +0000
Subject: [PATCH 03/12] Minor psalm issue fixes

Signed-off-by: George Steel <george@net-glue.co.uk>
---
 psalm-baseline.xml | 15 ++++++---------
 test/ViewTest.php  |  5 +----
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 48231da82..012919109 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.16.0@2897ba636551a8cb61601cc26f6ccfbba6c36591">
+<files psalm-version="5.18.0@b113f3ed0259fd6e212d87c3df80eec95a6abf19">
   <file src="src/Helper/AbstractHtmlElement.php">
     <MissingConstructor>
       <code>$closingBracket</code>
@@ -135,16 +135,13 @@
     </MissingConstructor>
     <MixedArgument>
       <code>$item</code>
-      <code>$messagesToPrint</code>
+      <code>$item</code>
     </MixedArgument>
     <MixedArgumentTypeCoercion>
       <code>$classes</code>
       <code>$classes</code>
+      <code>$messagesToPrint</code>
     </MixedArgumentTypeCoercion>
-    <MixedArrayAssignment>
-      <code>$messagesToPrint[]</code>
-      <code>$messagesToPrint[]</code>
-    </MixedArrayAssignment>
     <MixedAssignment>
       <code>$classes</code>
       <code>$classes</code>
@@ -722,9 +719,6 @@
     <PossiblyNullPropertyAssignmentValue>
       <code>null</code>
     </PossiblyNullPropertyAssignmentValue>
-    <PossiblyUndefinedArrayOffset>
-      <code>$found[0]</code>
-    </PossiblyUndefinedArrayOffset>
     <RedundantCastGivenDocblockType>
       <code>(int) $renderFlag</code>
     </RedundantCastGivenDocblockType>
@@ -1802,6 +1796,9 @@
       <code>$name</code>
       <code>$name</code>
     </MoreSpecificImplementedParamType>
+    <PossiblyUndefinedArrayOffset>
+      <code>$params[$param]</code>
+    </PossiblyUndefinedArrayOffset>
   </file>
   <file src="test/Helper/CycleTest.php">
     <RedundantCastGivenDocblockType>
diff --git a/test/ViewTest.php b/test/ViewTest.php
index 7ac7e96cd..11c0bbc77 100644
--- a/test/ViewTest.php
+++ b/test/ViewTest.php
@@ -18,7 +18,6 @@
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
-use function count;
 use function json_encode;
 use function sprintf;
 use function var_export;
@@ -215,7 +214,6 @@ public function testResponseStrategyIsNotTriggeredForChildModel(): void
 
         $result = [];
         $this->view->addResponseStrategy(function (ViewEvent $e) use (&$result) {
-            self::assertIsArray($result);
             /** @psalm-var mixed */
             $result[] = $e->getResult();
         });
@@ -232,8 +230,7 @@ public function testResponseStrategyIsNotTriggeredForChildModel(): void
 
         $this->view->render($this->model);
 
-        self::assertIsArray($result);
-        self::assertEquals(1, count($result));
+        self::assertCount(1, $result);
     }
 
     public function testUsesTreeRendererInterfaceToDetermineWhetherOrNotToPassOnlyRootViewModelToPhpRenderer(): void

From d414b9c26b6629ff6973a13ef60c0a74f4214253 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Br=C3=BCckner?= <dev@froschdesignstudio.de>
Date: Wed, 10 Jan 2024 15:49:07 +0100
Subject: [PATCH 04/12] Updates wrong link in documentation for view event
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Frank Brückner <dev@froschdesignstudio.de>
---
 docs/book/v2/view-event.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/book/v2/view-event.md b/docs/book/v2/view-event.md
index ae3bb811c..b72d57129 100644
--- a/docs/book/v2/view-event.md
+++ b/docs/book/v2/view-event.md
@@ -1,7 +1,7 @@
 # The ViewEvent
 
 laminas-view incorporates and utilizes a custom [laminas-eventmanager
-Event](https://laminas.github.com/laminas-eventmanager) implementation,
+Event](https://docs.laminas.dev/laminas-eventmanager/) implementation,
 `Laminas\View\ViewEvent`. This event is created during `Laminas\View\View::getEvent()`
 and is passed directly to all the events the `View` class triggers.
 

From e53ec5c976fa6a5d74060f01c1029b1714cbd317 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 00:10:49 +0000
Subject: [PATCH 05/12] 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 244953982..a68b7c52a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2043,16 +2043,16 @@
         },
         {
             "name": "laminas/laminas-navigation",
-            "version": "2.19.0",
+            "version": "2.19.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-navigation.git",
-                "reference": "9d212fb17dbb2da4172a7248a67483ebe38ad3a7"
+                "reference": "2ef88f68066381698b528be7fdd001723458a479"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-navigation/zipball/9d212fb17dbb2da4172a7248a67483ebe38ad3a7",
-                "reference": "9d212fb17dbb2da4172a7248a67483ebe38ad3a7",
+                "url": "https://api.github.com/repos/laminas/laminas-navigation/zipball/2ef88f68066381698b528be7fdd001723458a479",
+                "reference": "2ef88f68066381698b528be7fdd001723458a479",
                 "shasum": ""
             },
             "require": {
@@ -2120,20 +2120,20 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2023-11-14T21:49:15+00:00"
+            "time": "2024-01-10T15:11:10+00:00"
         },
         {
             "name": "laminas/laminas-paginator",
-            "version": "2.18.0",
+            "version": "2.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-paginator.git",
-                "reference": "caacfd2625bf354be32888dd55767c893b89d38f"
+                "reference": "6a03499a899fb8ba650594ddf4b4338d4235252a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-paginator/zipball/caacfd2625bf354be32888dd55767c893b89d38f",
-                "reference": "caacfd2625bf354be32888dd55767c893b89d38f",
+                "url": "https://api.github.com/repos/laminas/laminas-paginator/zipball/6a03499a899fb8ba650594ddf4b4338d4235252a",
+                "reference": "6a03499a899fb8ba650594ddf4b4338d4235252a",
                 "shasum": ""
             },
             "require": {
@@ -2199,7 +2199,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2023-11-08T15:42:20+00:00"
+            "time": "2024-01-11T11:00:36+00:00"
         },
         {
             "name": "laminas/laminas-permissions-acl",
@@ -3368,16 +3368,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.5",
+            "version": "10.5.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "ed21115d505b4b4f7dc7b5651464e19a2c7f7856"
+                "reference": "e5c5b397a95cb0db013270a985726fcae93e61b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ed21115d505b4b4f7dc7b5651464e19a2c7f7856",
-                "reference": "ed21115d505b4b4f7dc7b5651464e19a2c7f7856",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e5c5b397a95cb0db013270a985726fcae93e61b8",
+                "reference": "e5c5b397a95cb0db013270a985726fcae93e61b8",
                 "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.5"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.7"
             },
             "funding": [
                 {
@@ -3465,7 +3465,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-27T15:13:52+00:00"
+            "time": "2024-01-14T16:40:30+00:00"
         },
         {
             "name": "psalm/plugin-phpunit",
@@ -4671,16 +4671,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.8.0",
+            "version": "3.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7"
+                "reference": "14f5fff1e64118595db5408e946f3a22c75807f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5805f7a4e4958dbb5e944ef1e6edae0a303765e7",
-                "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/14f5fff1e64118595db5408e946f3a22c75807f7",
+                "reference": "14f5fff1e64118595db5408e946f3a22c75807f7",
                 "shasum": ""
             },
             "require": {
@@ -4690,11 +4690,11 @@
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
             },
             "bin": [
-                "bin/phpcs",
-                "bin/phpcbf"
+                "bin/phpcbf",
+                "bin/phpcs"
             ],
             "type": "library",
             "extra": {
@@ -4747,7 +4747,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2023-12-08T12:32:31+00:00"
+            "time": "2024-01-11T20:47:48+00:00"
         },
         {
             "name": "symfony/console",
@@ -5523,16 +5523,16 @@
         },
         {
             "name": "vimeo/psalm",
-            "version": "5.18.0",
+            "version": "5.19.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vimeo/psalm.git",
-                "reference": "b113f3ed0259fd6e212d87c3df80eec95a6abf19"
+                "reference": "06b71be009a6bd6d81b9811855d6629b9fe90e1b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vimeo/psalm/zipball/b113f3ed0259fd6e212d87c3df80eec95a6abf19",
-                "reference": "b113f3ed0259fd6e212d87c3df80eec95a6abf19",
+                "url": "https://api.github.com/repos/vimeo/psalm/zipball/06b71be009a6bd6d81b9811855d6629b9fe90e1b",
+                "reference": "06b71be009a6bd6d81b9811855d6629b9fe90e1b",
                 "shasum": ""
             },
             "require": {
@@ -5629,7 +5629,7 @@
                 "issues": "https://github.com/vimeo/psalm/issues",
                 "source": "https://github.com/vimeo/psalm"
             },
-            "time": "2023-12-16T09:37:35+00:00"
+            "time": "2024-01-09T21:02:43+00:00"
         },
         {
             "name": "webimpress/coding-standard",

From 77b2587feebed4ec10bc5962df8248ebdbbcfffa Mon Sep 17 00:00:00 2001
From: George Steel <george@net-glue.co.uk>
Date: Thu, 25 Jan 2024 10:29:17 +0000
Subject: [PATCH 06/12] Fix `RiskyTruthyFalsyComparison` issues

Signed-off-by: George Steel <george@net-glue.co.uk>
---
 composer.json                                 | 10 ++--
 composer.lock                                 | 60 +++++++++----------
 src/Helper/Doctype.php                        |  4 +-
 src/Helper/Gravatar.php                       |  3 +-
 src/Helper/HeadLink.php                       |  2 +-
 src/Helper/HeadScript.php                     |  2 +-
 src/Helper/Navigation/PluginManager.php       |  2 +-
 src/Helper/ServerUrl.php                      |  2 +-
 src/HelperPluginManager.php                   |  6 +-
 src/Model/FeedModel.php                       |  4 +-
 src/Renderer/FeedRenderer.php                 |  2 +-
 src/Renderer/PhpRenderer.php                  |  4 +-
 src/Resolver/AggregateResolver.php            |  3 +-
 src/Resolver/PrefixPathStackResolver.php      |  4 +-
 src/Resolver/RelativeFallbackResolver.php     |  2 +-
 test/Helper/HtmlTagTest.php                   |  2 +-
 test/HelperPluginManagerCompatibilityTest.php |  4 +-
 17 files changed, 60 insertions(+), 56 deletions(-)

diff --git a/composer.json b/composer.json
index 41e2e9fc5..cfd0fb51e 100644
--- a/composer.json
+++ b/composer.json
@@ -46,15 +46,15 @@
         "laminas/laminas-modulemanager": "^2.15",
         "laminas/laminas-mvc": "^3.7.0",
         "laminas/laminas-mvc-i18n": "^1.8",
-        "laminas/laminas-mvc-plugin-flashmessenger": "^1.10",
-        "laminas/laminas-navigation": "^2.19.0",
-        "laminas/laminas-paginator": "^2.18",
+        "laminas/laminas-mvc-plugin-flashmessenger": "^1.10.1",
+        "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-uri": "^2.11",
-        "phpunit/phpunit": "^10.5.5",
+        "phpunit/phpunit": "^10.5.9",
         "psalm/plugin-phpunit": "^0.18.4",
-        "vimeo/psalm": "^5.18"
+        "vimeo/psalm": "^5.20"
     },
     "conflict": {
         "container-interop/container-interop": "<1.2",
diff --git a/composer.lock b/composer.lock
index a68b7c52a..e66b091ac 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": "2d2ce4dd1a4c98f31574846b74249f6f",
+    "content-hash": "592dafb0d2f33db8a69049bf7183ec67",
     "packages": [
         {
             "name": "laminas/laminas-escaper",
@@ -289,16 +289,16 @@
         },
         {
             "name": "laminas/laminas-stdlib",
-            "version": "3.18.0",
+            "version": "3.19.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-stdlib.git",
-                "reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf"
+                "reference": "6a192dd0882b514e45506f533b833b623b78fff3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf",
-                "reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf",
+                "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/6a192dd0882b514e45506f533b833b623b78fff3",
+                "reference": "6a192dd0882b514e45506f533b833b623b78fff3",
                 "shasum": ""
             },
             "require": {
@@ -309,10 +309,10 @@
             },
             "require-dev": {
                 "laminas/laminas-coding-standard": "^2.5",
-                "phpbench/phpbench": "^1.2.14",
-                "phpunit/phpunit": "^10.3.3",
+                "phpbench/phpbench": "^1.2.15",
+                "phpunit/phpunit": "^10.5.8",
                 "psalm/plugin-phpunit": "^0.18.4",
-                "vimeo/psalm": "^5.15.0"
+                "vimeo/psalm": "^5.20.0"
             },
             "type": "library",
             "autoload": {
@@ -344,7 +344,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2023-09-19T10:15:21+00:00"
+            "time": "2024-01-19T12:39:49+00:00"
         },
         {
             "name": "psr/container",
@@ -1974,16 +1974,16 @@
         },
         {
             "name": "laminas/laminas-mvc-plugin-flashmessenger",
-            "version": "1.10.0",
+            "version": "1.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-mvc-plugin-flashmessenger.git",
-                "reference": "e3e763d2a584b6fa5b1d09ec73e2f56fe45675b7"
+                "reference": "852d8c661dfb6492d4ea6d4ab238e72180e82387"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-mvc-plugin-flashmessenger/zipball/e3e763d2a584b6fa5b1d09ec73e2f56fe45675b7",
-                "reference": "e3e763d2a584b6fa5b1d09ec73e2f56fe45675b7",
+                "url": "https://api.github.com/repos/laminas/laminas-mvc-plugin-flashmessenger/zipball/852d8c661dfb6492d4ea6d4ab238e72180e82387",
+                "reference": "852d8c661dfb6492d4ea6d4ab238e72180e82387",
                 "shasum": ""
             },
             "require": {
@@ -2039,7 +2039,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2023-11-14T09:56:52+00:00"
+            "time": "2024-01-18T15:07:28+00:00"
         },
         {
             "name": "laminas/laminas-navigation",
@@ -2477,16 +2477,16 @@
         },
         {
             "name": "laminas/laminas-validator",
-            "version": "2.46.0",
+            "version": "2.47.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-validator.git",
-                "reference": "98330256f8d8a1357a93f6f7f1a987036aff6329"
+                "reference": "5c3fc8c4f1263cda5c5f14aed874fdadd5b90bbd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/98330256f8d8a1357a93f6f7f1a987036aff6329",
-                "reference": "98330256f8d8a1357a93f6f7f1a987036aff6329",
+                "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/5c3fc8c4f1263cda5c5f14aed874fdadd5b90bbd",
+                "reference": "5c3fc8c4f1263cda5c5f14aed874fdadd5b90bbd",
                 "shasum": ""
             },
             "require": {
@@ -2557,7 +2557,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2024-01-03T12:43:04+00:00"
+            "time": "2024-01-17T11:31:50+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -3368,16 +3368,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.7",
+            "version": "10.5.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "e5c5b397a95cb0db013270a985726fcae93e61b8"
+                "reference": "0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e5c5b397a95cb0db013270a985726fcae93e61b8",
-                "reference": "e5c5b397a95cb0db013270a985726fcae93e61b8",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe",
+                "reference": "0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe",
                 "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.7"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.9"
             },
             "funding": [
                 {
@@ -3465,7 +3465,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-14T16:40:30+00:00"
+            "time": "2024-01-22T14:35:40+00:00"
         },
         {
             "name": "psalm/plugin-phpunit",
@@ -5523,16 +5523,16 @@
         },
         {
             "name": "vimeo/psalm",
-            "version": "5.19.0",
+            "version": "5.20.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vimeo/psalm.git",
-                "reference": "06b71be009a6bd6d81b9811855d6629b9fe90e1b"
+                "reference": "3f284e96c9d9be6fe6b15c79416e1d1903dcfef4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vimeo/psalm/zipball/06b71be009a6bd6d81b9811855d6629b9fe90e1b",
-                "reference": "06b71be009a6bd6d81b9811855d6629b9fe90e1b",
+                "url": "https://api.github.com/repos/vimeo/psalm/zipball/3f284e96c9d9be6fe6b15c79416e1d1903dcfef4",
+                "reference": "3f284e96c9d9be6fe6b15c79416e1d1903dcfef4",
                 "shasum": ""
             },
             "require": {
@@ -5629,7 +5629,7 @@
                 "issues": "https://github.com/vimeo/psalm/issues",
                 "source": "https://github.com/vimeo/psalm"
             },
-            "time": "2024-01-09T21:02:43+00:00"
+            "time": "2024-01-18T12:15:06+00:00"
         },
         {
             "name": "webimpress/coding-standard",
diff --git a/src/Helper/Doctype.php b/src/Helper/Doctype.php
index c805cfa5d..a7e3bf049 100644
--- a/src/Helper/Doctype.php
+++ b/src/Helper/Doctype.php
@@ -94,7 +94,7 @@ public function __invoke($doctype = null)
                     if (0 !== strpos($doctype, '<!DOCTYPE')) {
                         throw new Exception\DomainException('The specified doctype is malformed');
                     }
-                    if (stristr($doctype, 'xhtml')) {
+                    if (stristr($doctype, 'xhtml') !== false) {
                         $type = self::CUSTOM_XHTML;
                     } else {
                         $type = self::CUSTOM;
@@ -223,6 +223,6 @@ public function isHtml5()
      */
     public function isRdfa()
     {
-        return $this->isHtml5() || stristr($this->getDoctype(), 'rdfa');
+        return $this->isHtml5() || stristr($this->getDoctype(), 'rdfa') !== false;
     }
 }
diff --git a/src/Helper/Gravatar.php b/src/Helper/Gravatar.php
index f06dedfce..07ab90892 100644
--- a/src/Helper/Gravatar.php
+++ b/src/Helper/Gravatar.php
@@ -6,6 +6,7 @@
 
 use Laminas\View\Exception;
 
+use function is_string;
 use function md5;
 use function method_exists;
 use function preg_match;
@@ -104,7 +105,7 @@ class Gravatar extends AbstractHtmlElement
      */
     public function __invoke($email = "", $options = [], $attributes = [])
     {
-        if (! empty($email)) {
+        if (is_string($email) && $email !== '') {
             $this->setEmail($email);
         }
         if (! empty($options)) {
diff --git a/src/Helper/HeadLink.php b/src/Helper/HeadLink.php
index bdbea923c..f89cc0aa6 100644
--- a/src/Helper/HeadLink.php
+++ b/src/Helper/HeadLink.php
@@ -182,7 +182,7 @@ public function __call($method, $args)
                 $item       = $this->$dataMethod($args);
             }
 
-            if ($item) {
+            if (is_object($item)) {
                 if ('offsetSet' === $action) {
                     $this->offsetSet($index, $item);
                 } else {
diff --git a/src/Helper/HeadScript.php b/src/Helper/HeadScript.php
index bae22fe27..6add0494a 100644
--- a/src/Helper/HeadScript.php
+++ b/src/Helper/HeadScript.php
@@ -463,7 +463,7 @@ public function itemToString($item, $indent, $escapeStart, $escapeEnd)
             $type = $this->autoEscape ? $this->escapeAttribute($item->type) : $item->type;
             $html = '<script type="' . $type . '"' . $attrString . '>';
         }
-        if (! empty($item->source)) {
+        if (is_string($item->source) && $item->source !== '') {
             $html .= PHP_EOL;
 
             if ($addScriptEscape) {
diff --git a/src/Helper/Navigation/PluginManager.php b/src/Helper/Navigation/PluginManager.php
index a4f4a2a6c..b166f4d50 100644
--- a/src/Helper/Navigation/PluginManager.php
+++ b/src/Helper/Navigation/PluginManager.php
@@ -74,7 +74,7 @@ class PluginManager extends HelperPluginManager
      */
     public function __construct($configOrContainerInstance = null, array $v3config = [])
     {
-        /** @psalm-suppress UnusedClosureParam, MissingClosureParamType */
+        /** @psalm-suppress MissingClosureParamType */
         $this->initializers[] = function (ContainerInterface $container, $instance): void {
             if (! $instance instanceof AbstractHelper) {
                 return;
diff --git a/src/Helper/ServerUrl.php b/src/Helper/ServerUrl.php
index 1de22fe8f..5f0c318cd 100644
--- a/src/Helper/ServerUrl.php
+++ b/src/Helper/ServerUrl.php
@@ -67,7 +67,7 @@ public function __invoke($requestUri = null)
             $path = '';
         }
 
-        return $this->getScheme() . '://' . $this->getHost() . $path;
+        return $this->getScheme() . '://' . $this->getHost() . (string) $path;
     }
 
     /**
diff --git a/src/HelperPluginManager.php b/src/HelperPluginManager.php
index 607b2f546..42f910256 100644
--- a/src/HelperPluginManager.php
+++ b/src/HelperPluginManager.php
@@ -431,14 +431,14 @@ public function injectTranslator($first, $second)
             return;
         }
 
-        if (! $container) {
+        if (! $container instanceof ContainerInterface) {
             // Under laminas-navigation v2.5, the navigation PluginManager is
             // always lazy-loaded, which means it never has a parent
             // container.
             return;
         }
 
-        if (method_exists($helper, 'hasTranslator') && $helper->hasTranslator()) {
+        if (method_exists($helper, 'hasTranslator') && $helper->hasTranslator() === true) {
             return;
         }
 
@@ -480,7 +480,7 @@ public function injectEventManager($first, $second)
             $helper    = $first;
         }
 
-        if (! $container) {
+        if (! $container instanceof ContainerInterface) {
             // Under laminas-navigation v2.5, the navigation PluginManager is
             // always lazy-loaded, which means it never has a parent
             // container.
diff --git a/src/Model/FeedModel.php b/src/Model/FeedModel.php
index 34eccc0e3..4a11f0efb 100644
--- a/src/Model/FeedModel.php
+++ b/src/Model/FeedModel.php
@@ -34,7 +34,7 @@ public function getFeed()
             return $this->feed;
         }
 
-        if (! $this->type) {
+        if ($this->type === false) {
             $options = $this->getOptions();
             if (isset($options['feed_type'])) {
                 $this->type = $options['feed_type'];
@@ -66,7 +66,7 @@ public function setFeed(Feed $feed)
      */
     public function getFeedType()
     {
-        if ($this->type) {
+        if ($this->type === false) {
             return $this->type;
         }
 
diff --git a/src/Renderer/FeedRenderer.php b/src/Renderer/FeedRenderer.php
index e722c5bb7..c7ccc4bd5 100644
--- a/src/Renderer/FeedRenderer.php
+++ b/src/Renderer/FeedRenderer.php
@@ -93,7 +93,7 @@ public function render($nameOrModel, $values = null)
         // Get feed and type
         $feed = $nameOrModel->getFeed();
         $type = $nameOrModel->getFeedType();
-        if (! $type) {
+        if (! is_string($type)) {
             $type = $this->getFeedType();
         } else {
             $this->setFeedType($type);
diff --git a/src/Renderer/PhpRenderer.php b/src/Renderer/PhpRenderer.php
index 5929ad736..ceab7782b 100644
--- a/src/Renderer/PhpRenderer.php
+++ b/src/Renderer/PhpRenderer.php
@@ -518,7 +518,7 @@ public function render($nameOrModel, $values = null)
         $this->__content = '';
         while ($this->__template = array_pop($this->__templates)) {
             $this->__file = $this->resolver($this->__template);
-            if (! $this->__file) {
+            if (! is_string($this->__file)) {
                 throw new Exception\RuntimeException(sprintf(
                     '%s: Unable to render template "%s"; resolver could not resolve to a file',
                     __METHOD__,
@@ -534,7 +534,7 @@ public function render($nameOrModel, $values = null)
                 throw $ex;
             }
 
-            if ($includeReturn === false && empty($this->__content)) {
+            if ($includeReturn === false && $this->__content === '') {
                 throw new Exception\UnexpectedValueException(sprintf(
                     '%s: Unable to render template "%s"; file include failed',
                     __METHOD__,
diff --git a/src/Resolver/AggregateResolver.php b/src/Resolver/AggregateResolver.php
index 6146d2f5f..cbcfd76ae 100644
--- a/src/Resolver/AggregateResolver.php
+++ b/src/Resolver/AggregateResolver.php
@@ -13,6 +13,7 @@
 use Traversable;
 
 use function count;
+use function is_string;
 
 /**
  * @final
@@ -110,7 +111,7 @@ public function resolve($name, ?Renderer $renderer = null)
              * @todo This loop should be modified to try { return resolve } catch { continue } in v3.0
              */
             $resource = $resolver->resolve($name, $renderer);
-            if ($resource) {
+            if (is_string($resource)) {
                 // Resource found; return it
                 $this->lastSuccessfulResolver = $resolver;
                 return $resource;
diff --git a/src/Resolver/PrefixPathStackResolver.php b/src/Resolver/PrefixPathStackResolver.php
index 816aaf856..6a76a943e 100644
--- a/src/Resolver/PrefixPathStackResolver.php
+++ b/src/Resolver/PrefixPathStackResolver.php
@@ -6,6 +6,7 @@
 
 use Laminas\View\Renderer\RendererInterface as Renderer;
 
+use function is_string;
 use function strlen;
 use function strpos;
 use function substr;
@@ -53,7 +54,8 @@ public function resolve($name, ?Renderer $renderer = null)
              *       It relies on internal knowledge that some resolvers return false when really
              *       they should always return a string or throw an exception.
              */
-            if ($result = $resolver->resolve(substr($name, strlen($prefix)), $renderer)) {
+            $result = $resolver->resolve(substr($name, strlen($prefix)), $renderer);
+            if (is_string($result)) {
                 return $result;
             }
         }
diff --git a/src/Resolver/RelativeFallbackResolver.php b/src/Resolver/RelativeFallbackResolver.php
index 86aa010b8..8c44c1c69 100644
--- a/src/Resolver/RelativeFallbackResolver.php
+++ b/src/Resolver/RelativeFallbackResolver.php
@@ -60,7 +60,7 @@ public function resolve($name, ?RendererInterface $renderer = null)
         $currentTemplate = $currentModel->getTemplate();
         $position        = strrpos($currentTemplate, self::NS_SEPARATOR);
 
-        if (! $position) {
+        if ($position === false) {
             return false;
         }
 
diff --git a/test/Helper/HtmlTagTest.php b/test/Helper/HtmlTagTest.php
index ccda4ea50..683bb8ff7 100644
--- a/test/Helper/HtmlTagTest.php
+++ b/test/Helper/HtmlTagTest.php
@@ -29,7 +29,7 @@ protected function assertAttribute(string $name, ?string $value = null): void
     {
         $attributes = $this->helper->getAttributes();
         $this->assertArrayHasKey($name, $attributes);
-        if ($value) {
+        if ($value !== null) {
             $this->assertEquals($value, $attributes[$name]);
         }
     }
diff --git a/test/HelperPluginManagerCompatibilityTest.php b/test/HelperPluginManagerCompatibilityTest.php
index c2ae2b425..a5a3dbe8c 100644
--- a/test/HelperPluginManagerCompatibilityTest.php
+++ b/test/HelperPluginManagerCompatibilityTest.php
@@ -65,12 +65,12 @@ public static function aliasProvider(): Generator
         foreach ($aliases as $alias => $target) {
             self::assertIsString($target);
             // Skipping conditionally since it depends on laminas-mvc
-            if (! class_exists(ControllerPluginManager::class) && strpos($target, '\\FlashMessenger')) {
+            if (! class_exists(ControllerPluginManager::class) && strpos($target, '\\FlashMessenger') !== false) {
                 continue;
             }
 
             // Skipping conditionally since it depends on laminas-mvc
-            if (! class_exists(ControllerPluginManager::class) && strpos($target, '\\Url')) {
+            if (! class_exists(ControllerPluginManager::class) && strpos($target, '\\Url') !== false) {
                 continue;
             }
 

From 896a513563775ef1a58a73ba37fcfe19cb9257b5 Mon Sep 17 00:00:00 2001
From: George Steel <george@net-glue.co.uk>
Date: Thu, 25 Jan 2024 10:29:47 +0000
Subject: [PATCH 07/12] Remove unnecessary PHPUnit related issue handlers

Signed-off-by: George Steel <george@net-glue.co.uk>
---
 psalm.xml.dist | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/psalm.xml.dist b/psalm.xml.dist
index 37fad743c..525f2e414 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -17,15 +17,6 @@
 
     <issueHandlers>
         <InternalMethod>
-            <errorLevel type="suppress">
-                <referencedMethod name="PHPUnit\Framework\MockObject\Builder\InvocationMocker::method"/>
-            </errorLevel>
-            <errorLevel type="suppress">
-                <referencedMethod name="PHPUnit\Framework\MockObject\Builder\InvocationMocker::willReturn"/>
-            </errorLevel>
-            <errorLevel type="suppress">
-                <referencedMethod name="PHPUnit\Framework\MockObject\Builder\InvocationMocker::with"/>
-            </errorLevel>
             <errorLevel type="suppress">
                 <directory name="test" />
                 <referencedMethod name="Laminas\View\Helper\Escaper\AbstractHelper::__construct"/>

From 9cb3e32ff703e450dcc60e5926bf02f7344ff9f8 Mon Sep 17 00:00:00 2001
From: George Steel <george@net-glue.co.uk>
Date: Thu, 25 Jan 2024 10:30:38 +0000
Subject: [PATCH 08/12] Suppress `RiskyTruthyFalsyComparison` issues for the
 navigation related view helpers

Signed-off-by: George Steel <george@net-glue.co.uk>
---
 psalm.xml.dist | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/psalm.xml.dist b/psalm.xml.dist
index 525f2e414..0c6f02ed4 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -32,6 +32,14 @@
                 <referencedMethod name="Laminas\View\Helper\Escaper\AbstractHelper::getEscaper" />
             </errorLevel>
         </DeprecatedMethod>
+        <RiskyTruthyFalsyComparison>
+            <!--
+            The navigation view helpers rely heavily on these sorts of comparisons. Fixing them is more risky
+            -->
+            <errorLevel type="suppress">
+                <directory name="src/Helper/Navigation" />
+            </errorLevel>
+        </RiskyTruthyFalsyComparison>
     </issueHandlers>
     <plugins>
         <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>

From 9c77aefd77d7c2b16f77dbfa57666df077bc1af6 Mon Sep 17 00:00:00 2001
From: George Steel <george@net-glue.co.uk>
Date: Thu, 25 Jan 2024 10:32:08 +0000
Subject: [PATCH 09/12] Enable unused baseline entry detection and unused
 suppression detection

Signed-off-by: George Steel <george@net-glue.co.uk>
---
 psalm-baseline.xml                      | 18 ++++--------------
 psalm.xml.dist                          |  2 ++
 src/Helper/Url.php                      |  3 +--
 test/Resolver/TemplatePathStackTest.php |  6 ------
 4 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 012919109..4758ec739 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.18.0@b113f3ed0259fd6e212d87c3df80eec95a6abf19">
+<files psalm-version="5.20.0@3f284e96c9d9be6fe6b15c79416e1d1903dcfef4">
   <file src="src/Helper/AbstractHtmlElement.php">
     <MissingConstructor>
       <code>$closingBracket</code>
@@ -206,7 +206,6 @@
       <code>$attributes[$itemKey]</code>
       <code>$href</code>
       <code>$index</code>
-      <code>$item</code>
       <code><![CDATA[$this->autoEscape ? $this->escapeAttribute($attributes[$itemKey]) : $attributes[$itemKey]]]></code>
       <code><![CDATA[$this->autoEscape ? $this->escapeAttribute($value) : $value]]></code>
       <code>$value</code>
@@ -404,6 +403,9 @@
     <MixedAssignment>
       <code>$options</code>
     </MixedAssignment>
+    <RiskyTruthyFalsyComparison>
+      <code>$content</code>
+    </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Helper/HtmlPage.php">
     <MixedAssignment>
@@ -1319,7 +1321,6 @@
       <code><![CDATA[$container->get('EventManager')]]></code>
       <code><![CDATA[$container->get('MvcTranslator')]]></code>
       <code><![CDATA[$container->get('Translator')]]></code>
-      <code><![CDATA[$container->get(TranslatorInterface::class)]]></code>
     </MixedArgument>
     <MixedAssignment>
       <code>$container</code>
@@ -1328,16 +1329,6 @@
     <MixedInferredReturnType>
       <code>($name is class-string ? T : HelperInterface|callable)</code>
     </MixedInferredReturnType>
-    <MixedMethodCall>
-      <code>get</code>
-      <code>get</code>
-      <code>get</code>
-      <code>get</code>
-      <code>has</code>
-      <code>has</code>
-      <code>has</code>
-      <code>has</code>
-    </MixedMethodCall>
     <MixedReturnStatement>
       <code>parent::get($name, $options)</code>
     </MixedReturnStatement>
@@ -1556,7 +1547,6 @@
       <code>$variables</code>
     </PossibleRawObjectIteration>
     <PossiblyInvalidArgument>
-      <code><![CDATA[$this->__file]]></code>
       <code>$values</code>
     </PossiblyInvalidArgument>
     <PossiblyInvalidPropertyAssignmentValue>
diff --git a/psalm.xml.dist b/psalm.xml.dist
index 0c6f02ed4..432aaaa1f 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -5,6 +5,8 @@
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
     errorBaseline="psalm-baseline.xml"
+    findUnusedBaselineEntry="true"
+    findUnusedPsalmSuppress="true"
 >
     <projectFiles>
         <directory name="bin"/>
diff --git a/src/Helper/Url.php b/src/Helper/Url.php
index ed8014233..5e40aac5c 100644
--- a/src/Helper/Url.php
+++ b/src/Helper/Url.php
@@ -111,7 +111,7 @@ public function __invoke($name = null, $params = [], $options = [], $reuseMatche
      * @param RouteStackInterface $router
      * @return Url
      * @throws Exception\InvalidArgumentException For invalid router types.
-     * @psalm-suppress RedundantConditionGivenDocblockType, DocblockTypeContradiction
+     * @psalm-suppress DocblockTypeContradiction
      */
     public function setRouter($router)
     {
@@ -133,7 +133,6 @@ public function setRouter($router)
      *
      * @param  RouteMatch $routeMatch
      * @return Url
-     * @psalm-suppress RedundantConditionGivenDocblockType, DocblockTypeContradiction
      */
     public function setRouteMatch($routeMatch)
     {
diff --git a/test/Resolver/TemplatePathStackTest.php b/test/Resolver/TemplatePathStackTest.php
index 14b152009..6bf781a93 100644
--- a/test/Resolver/TemplatePathStackTest.php
+++ b/test/Resolver/TemplatePathStackTest.php
@@ -108,7 +108,6 @@ public function testMayDisableLfiProtection(): void
 
     public function testStreamWrapperDisabledByDefault(): void
     {
-        /** @psalm-suppress DeprecatedMethod */
         $this->assertFalse($this->stack->useStreamWrapper());
     }
 
@@ -118,9 +117,7 @@ public function testMayEnableStreamWrapper(): void
         if (! $flag) {
             $this->markTestSkipped('Short tags are disabled; cannot test');
         }
-        /** @psalm-suppress DeprecatedMethod */
         $this->stack->setUseStreamWrapper(true);
-        /** @psalm-suppress DeprecatedMethod */
         $this->assertTrue($this->stack->useStreamWrapper());
     }
 
@@ -169,7 +166,6 @@ public function testReturnsPathWithStreamProtocolWhenStreamWrapperEnabled(): voi
         if (! $flag) {
             $this->markTestSkipped('Short tags are disabled; cannot test');
         }
-        /** @psalm-suppress DeprecatedMethod */
         $this->stack->setUseStreamWrapper(true)
                     ->addPath($this->baseDir . '/_templates');
         $expected = 'laminas.view://' . realpath($this->baseDir . '/_templates/test.phtml');
@@ -226,7 +222,6 @@ public function testAllowsSettingOptions($options): void
         $this->assertFalse($this->stack->isLfiProtectionOn());
 
         $expected = (bool) ini_get('short_open_tag');
-        /** @psalm-suppress DeprecatedMethod */
         $this->assertSame($expected, $this->stack->useStreamWrapper());
 
         $this->assertSame($options['default_suffix'] ?? null, $this->stack->getDefaultSuffix());
@@ -245,7 +240,6 @@ public function testAllowsPassingOptionsToConstructor($options): void
         $this->assertFalse($stack->isLfiProtectionOn());
 
         $expected = (bool) ini_get('short_open_tag');
-        /** @psalm-suppress DeprecatedMethod */
         $this->assertSame($expected, $stack->useStreamWrapper());
 
         $this->assertEquals(array_reverse($this->paths), $stack->getPaths()->toArray());

From 12e4ea964da19cd0eecfaf8d99d26450ce0cde12 Mon Sep 17 00:00:00 2001
From: George Steel <george@net-glue.co.uk>
Date: Thu, 25 Jan 2024 10:59:31 +0000
Subject: [PATCH 10/12] Address some unused code issues and expand baseline

Signed-off-by: George Steel <george@net-glue.co.uk>
---
 psalm-baseline.xml                       | 159 ++++++++++++++++++++++-
 psalm.xml.dist                           |  13 ++
 test/Helper/DoctypeTest.php              |   3 -
 test/Helper/InlineScriptTest.php         |  10 +-
 test/Helper/Navigation/LinksTest.php     |   2 -
 test/Helper/PaginationControlTest.php    |  15 ++-
 test/Helper/Placeholder/RegistryTest.php |   1 +
 test/VariablesTest.php                   |  11 --
 8 files changed, 182 insertions(+), 32 deletions(-)

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 4758ec739..12f91ef14 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -36,6 +36,11 @@
       <code>plugin</code>
     </UndefinedInterfaceMethod>
   </file>
+  <file src="src/Helper/Asset.php">
+    <PossiblyUnusedMethod>
+      <code>setResourceMap</code>
+    </PossiblyUnusedMethod>
+  </file>
   <file src="src/Helper/Cycle.php">
     <ImplementedReturnTypeMismatch>
       <code>Cycle</code>
@@ -64,6 +69,9 @@
       <code><![CDATA[$this->data[$this->name]]]></code>
       <code><![CDATA[$this->pointers[$this->name]]]></code>
     </MixedReturnStatement>
+    <PossiblyUnusedMethod>
+      <code>getName</code>
+    </PossiblyUnusedMethod>
   </file>
   <file src="src/Helper/DeclareVars.php">
     <MissingConstructor>
@@ -183,6 +191,9 @@
       <code><![CDATA[$this->options['rating']]]></code>
       <code><![CDATA[$this->options['secure']]]></code>
     </MixedReturnStatement>
+    <PossiblyUnusedReturnValue>
+      <code><![CDATA[array<string, mixed>]]></code>
+    </PossiblyUnusedReturnValue>
     <RedundantCastGivenDocblockType>
       <code>(bool) $flag</code>
       <code>(int) $imgSize</code>
@@ -235,6 +246,16 @@
       <code>$index</code>
       <code><![CDATA[$this->view]]></code>
     </PossiblyNullArgument>
+    <PossiblyUnusedMethod>
+      <code>createDataAlternate</code>
+      <code>createDataNext</code>
+      <code>createDataPrev</code>
+      <code>createDataStylesheet</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedReturnValue>
+      <code>AbstractContainer</code>
+      <code>AbstractContainer</code>
+    </PossiblyUnusedReturnValue>
     <RedundantCast>
       <code>(string) $conditionalStylesheet</code>
     </RedundantCast>
@@ -299,6 +320,10 @@
       <code>plugin</code>
       <code>plugin</code>
     </PossiblyNullReference>
+    <PossiblyUnusedReturnValue>
+      <code>AbstractContainer</code>
+      <code>AbstractContainer</code>
+    </PossiblyUnusedReturnValue>
     <UndefinedInterfaceMethod>
       <code>plugin</code>
       <code>plugin</code>
@@ -337,6 +362,10 @@
       <code>parent::__call($method, $args)</code>
       <code>parent::__call($method, $args)</code>
     </MixedReturnStatement>
+    <PossiblyUnusedReturnValue>
+      <code>AbstractContainer</code>
+      <code>AbstractContainer</code>
+    </PossiblyUnusedReturnValue>
     <RedundantCastGivenDocblockType>
       <code>(bool) $flag</code>
     </RedundantCastGivenDocblockType>
@@ -371,10 +400,22 @@
       <code>$content</code>
       <code>$index</code>
     </MixedAssignment>
+    <PossiblyUnusedReturnValue>
+      <code>AbstractContainer</code>
+      <code>AbstractContainer</code>
+    </PossiblyUnusedReturnValue>
     <RedundantConditionGivenDocblockType>
       <code><![CDATA[(null !== $content) && is_string($content)]]></code>
       <code>is_string($content)</code>
     </RedundantConditionGivenDocblockType>
+    <UnusedParam>
+      <code>$indent</code>
+    </UnusedParam>
+  </file>
+  <file src="src/Helper/HelperInterface.php">
+    <PossiblyUnusedReturnValue>
+      <code>HelperInterface</code>
+    </PossiblyUnusedReturnValue>
   </file>
   <file src="src/Helper/HtmlFlash.php">
     <MixedAssignment>
@@ -464,6 +505,12 @@
       <code>(bool) $useNamespaces</code>
     </RedundantCastGivenDocblockType>
   </file>
+  <file src="src/Helper/Identity.php">
+    <PossiblyUnusedMethod>
+      <code>getAuthenticationService</code>
+      <code>setAuthenticationService</code>
+    </PossiblyUnusedMethod>
+  </file>
   <file src="src/Helper/Json.php">
     <MissingConstructor>
       <code>$response</code>
@@ -479,6 +526,9 @@
     <PossiblyNullReference>
       <code>plugin</code>
     </PossiblyNullReference>
+    <PossiblyUnusedMethod>
+      <code>__construct</code>
+    </PossiblyUnusedMethod>
     <RedundantCastGivenDocblockType>
       <code>(string) $template</code>
     </RedundantCastGivenDocblockType>
@@ -674,6 +724,13 @@
       <code>plugin</code>
     </UndefinedInterfaceMethod>
   </file>
+  <file src="src/Helper/Navigation/HelperInterface.php">
+    <PossiblyUnusedReturnValue>
+      <code>HelperInterface</code>
+      <code>HelperInterface</code>
+      <code>HelperInterface</code>
+    </PossiblyUnusedReturnValue>
+  </file>
   <file src="src/Helper/Navigation/Links.php">
     <InvalidOperand>
       <code>$relFlag</code>
@@ -721,6 +778,16 @@
     <PossiblyNullPropertyAssignmentValue>
       <code>null</code>
     </PossiblyNullPropertyAssignmentValue>
+    <PossiblyUnusedMethod>
+      <code>searchRelChapter</code>
+      <code>searchRelNext</code>
+      <code>searchRelPrev</code>
+      <code>searchRelSection</code>
+      <code>searchRelStart</code>
+      <code>searchRelSubsection</code>
+      <code>searchRevSection</code>
+      <code>searchRevSubsection</code>
+    </PossiblyUnusedMethod>
     <RedundantCastGivenDocblockType>
       <code>(int) $renderFlag</code>
     </RedundantCastGivenDocblockType>
@@ -750,6 +817,9 @@
       <code><![CDATA[$params['page']]]></code>
       <code><![CDATA[$params['role']]]></code>
     </PossiblyInvalidArrayAccess>
+    <PossiblyUnusedReturnValue>
+      <code>bool</code>
+    </PossiblyUnusedReturnValue>
   </file>
   <file src="src/Helper/Navigation/Menu.php">
     <DocblockTypeContradiction>
@@ -844,6 +914,10 @@
       <code>plugin</code>
       <code>plugin</code>
     </PossiblyNullReference>
+    <PossiblyUnusedMethod>
+      <code>escapeLabels</code>
+      <code>setAddClassToListItem</code>
+    </PossiblyUnusedMethod>
     <RedundantCastGivenDocblockType>
       <code>(bool) $flag</code>
       <code>(bool) $flag</code>
@@ -1027,6 +1101,9 @@
     <PossiblyInvalidOperand>
       <code>parent::__invoke($name, $item)</code>
     </PossiblyInvalidOperand>
+    <PossiblyUnusedReturnValue>
+      <code>self</code>
+    </PossiblyUnusedReturnValue>
     <RedundantCastGivenDocblockType>
       <code>(string) $key</code>
     </RedundantCastGivenDocblockType>
@@ -1110,6 +1187,10 @@
     <MixedAssignment>
       <code>$return</code>
     </MixedAssignment>
+    <PossiblyUnusedMethod>
+      <code>__get</code>
+      <code>__set</code>
+    </PossiblyUnusedMethod>
     <RedundantCastGivenDocblockType>
       <code>(bool) $autoEscape</code>
       <code>(string) $string</code>
@@ -1138,6 +1219,10 @@
     <MoreSpecificReturnType>
       <code>AbstractContainer</code>
     </MoreSpecificReturnType>
+    <PossiblyUnusedMethod>
+      <code>getRegistry</code>
+      <code>unsetRegistry</code>
+    </PossiblyUnusedMethod>
     <RedundantCastGivenDocblockType>
       <code>(string) $key</code>
       <code>(string) $key</code>
@@ -1309,6 +1394,11 @@
       <code>$reuseMatchedParams</code>
     </UnusedVariable>
   </file>
+  <file src="src/Helper/ViewModel.php">
+    <PossiblyUnusedMethod>
+      <code>hasRoot</code>
+    </PossiblyUnusedMethod>
+  </file>
   <file src="src/HelperPluginManager.php">
     <DeprecatedInterface>
       <code>null|ConfigInterface|ContainerInterface</code>
@@ -1332,6 +1422,12 @@
     <MixedReturnStatement>
       <code>parent::get($name, $options)</code>
     </MixedReturnStatement>
+    <PossiblyUnusedMethod>
+      <code>injectEventManager</code>
+      <code>injectRenderer</code>
+      <code>injectTranslator</code>
+      <code>validatePlugin</code>
+    </PossiblyUnusedMethod>
     <PropertyTypeCoercion>
       <code><![CDATA[$this->initializers]]></code>
       <code><![CDATA[$this->initializers]]></code>
@@ -1370,6 +1466,11 @@
     <NonInvariantDocblockPropertyType>
       <code>$captureTo</code>
     </NonInvariantDocblockPropertyType>
+    <PossiblyUnusedMethod>
+      <code>getErrorLevel</code>
+      <code>getResult</code>
+      <code>setResult</code>
+    </PossiblyUnusedMethod>
   </file>
   <file src="src/Model/FeedModel.php">
     <MixedAssignment>
@@ -1398,6 +1499,18 @@
       <code>$captureTo</code>
     </NonInvariantDocblockPropertyType>
   </file>
+  <file src="src/Model/ModelInterface.php">
+    <PossiblyUnusedReturnValue>
+      <code>ModelInterface</code>
+      <code>ModelInterface</code>
+      <code>ModelInterface</code>
+      <code>ModelInterface</code>
+      <code>ModelInterface</code>
+      <code>ModelInterface</code>
+      <code>ModelInterface</code>
+      <code>ModelInterface</code>
+    </PossiblyUnusedReturnValue>
+  </file>
   <file src="src/Model/ViewModel.php">
     <DocblockTypeContradiction>
       <code>gettype($variables)</code>
@@ -1445,6 +1558,13 @@
     <PossiblyInvalidArgument>
       <code>$values</code>
     </PossiblyInvalidArgument>
+    <PossiblyUnusedMethod>
+      <code>__construct</code>
+      <code>setFilterChain</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedParam>
+      <code>$config</code>
+    </PossiblyUnusedParam>
   </file>
   <file src="src/Renderer/FeedRenderer.php">
     <InvalidArgument>
@@ -1462,6 +1582,9 @@
     <MoreSpecificImplementedParamType>
       <code>$values</code>
     </MoreSpecificImplementedParamType>
+    <PossiblyUnusedProperty>
+      <code>$resolver</code>
+    </PossiblyUnusedProperty>
     <RedundantConditionGivenDocblockType>
       <code>is_string($nameOrModel)</code>
     </RedundantConditionGivenDocblockType>
@@ -1488,6 +1611,9 @@
       <code>$children</code>
       <code>$values</code>
     </PossiblyInvalidArgument>
+    <PossiblyUnusedProperty>
+      <code>$resolver</code>
+    </PossiblyUnusedProperty>
     <RedundantCastGivenDocblockType>
       <code>(bool) $mergeUnnamedChildren</code>
       <code>(string) $callback</code>
@@ -1559,6 +1685,9 @@
       <code><![CDATA[$this->__vars]]></code>
       <code>resolve</code>
     </PossiblyNullReference>
+    <PossiblyUnusedParam>
+      <code>$config</code>
+    </PossiblyUnusedParam>
     <RedundantCastGivenDocblockType>
       <code>(bool) $renderTrees</code>
     </RedundantCastGivenDocblockType>
@@ -1633,6 +1762,9 @@
       <code><![CDATA[$options['script_paths']]]></code>
       <code><![CDATA[$options['use_stream_wrapper']]]></code>
     </MixedArgument>
+    <PossiblyUnusedReturnValue>
+      <code>TemplatePathStack</code>
+    </PossiblyUnusedReturnValue>
     <RedundantCastGivenDocblockType>
       <code>(bool) $flag</code>
       <code>(bool) $flag</code>
@@ -1686,6 +1818,9 @@
     <PossiblyNullReference>
       <code>plugin</code>
     </PossiblyNullReference>
+    <PossiblyUnusedParam>
+      <code>$e</code>
+    </PossiblyUnusedParam>
     <UndefinedInterfaceMethod>
       <code>plugin</code>
     </UndefinedInterfaceMethod>
@@ -1712,6 +1847,20 @@
       <code>$offset</code>
       <code>$offset</code>
     </MixedOperand>
+    <PossiblyUnusedMethod>
+      <code>stream_eof</code>
+      <code>stream_open</code>
+      <code>stream_read</code>
+      <code>stream_seek</code>
+      <code>stream_stat</code>
+      <code>stream_tell</code>
+      <code>url_stat</code>
+    </PossiblyUnusedMethod>
+    <PossiblyUnusedParam>
+      <code>$mode</code>
+      <code>$opened_path</code>
+      <code>$options</code>
+    </PossiblyUnusedParam>
     <UnevaluatedCode>
       <code>break;</code>
       <code>break;</code>
@@ -2024,6 +2173,11 @@
       <code>HtmlFlash</code>
     </DeprecatedClass>
   </file>
+  <file src="test/Helper/HtmlListTest.php">
+    <PossiblyUnusedParam>
+      <code>$key</code>
+    </PossiblyUnusedParam>
+  </file>
   <file src="test/Helper/HtmlTagTest.php">
     <MixedArgument>
       <code>$escape($value)</code>
@@ -2530,11 +2684,6 @@
       <code><![CDATA[$view->vars()->message]]></code>
     </UndefinedPropertyAssignment>
   </file>
-  <file src="test/Helper/Placeholder/RegistryTest.php">
-    <UndefinedPropertyFetch>
-      <code><![CDATA[$container->data]]></code>
-    </UndefinedPropertyFetch>
-  </file>
   <file src="test/Helper/ServerUrlTest.php">
     <InvalidArgument>
       <code>1337</code>
diff --git a/psalm.xml.dist b/psalm.xml.dist
index 432aaaa1f..f21b0a73b 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -7,6 +7,7 @@
     errorBaseline="psalm-baseline.xml"
     findUnusedBaselineEntry="true"
     findUnusedPsalmSuppress="true"
+    findUnusedCode="true"
 >
     <projectFiles>
         <directory name="bin"/>
@@ -42,6 +43,18 @@
                 <directory name="src/Helper/Navigation" />
             </errorLevel>
         </RiskyTruthyFalsyComparison>
+        <UnusedMethod>
+            <!-- PHPUnit DataProviders appear as unused when an Attribute is used -->
+            <errorLevel type="suppress">
+                <directory name="test" />
+            </errorLevel>
+        </UnusedMethod>
+        <UnusedClass>
+            <!-- SA Test cases are never referenced -->
+            <errorLevel type="suppress">
+                <directory name="test/StaticAnalysis" />
+            </errorLevel>
+        </UnusedClass>
     </issueHandlers>
     <plugins>
         <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
diff --git a/test/Helper/DoctypeTest.php b/test/Helper/DoctypeTest.php
index cc283f406..3c40c109b 100644
--- a/test/Helper/DoctypeTest.php
+++ b/test/Helper/DoctypeTest.php
@@ -13,9 +13,6 @@ class DoctypeTest extends TestCase
     /** @var Doctype */
     public $helper;
 
-    /** @var string */
-    public $basePath;
-
     /**
      * Sets up the fixture, for example, open a network connection.
      * This method is called before a test is executed.
diff --git a/test/Helper/InlineScriptTest.php b/test/Helper/InlineScriptTest.php
index 552d782ae..da59f769a 100644
--- a/test/Helper/InlineScriptTest.php
+++ b/test/Helper/InlineScriptTest.php
@@ -12,17 +12,9 @@ class InlineScriptTest extends TestCase
     /** @var Helper\InlineScript */
     public $helper;
 
-    /** @var string */
-    public $basePath;
-
-    /**
-     * Sets up the fixture, for example, open a network connection.
-     * This method is called before a test is executed.
-     */
     protected function setUp(): void
     {
-        $this->basePath = __DIR__ . '/_files/modules';
-        $this->helper   = new Helper\InlineScript();
+        $this->helper = new Helper\InlineScript();
     }
 
     public function testInlineScriptReturnsObjectInstance(): void
diff --git a/test/Helper/Navigation/LinksTest.php b/test/Helper/Navigation/LinksTest.php
index 72438e7a6..dad70dd94 100644
--- a/test/Helper/Navigation/LinksTest.php
+++ b/test/Helper/Navigation/LinksTest.php
@@ -36,7 +36,6 @@ class LinksTest extends AbstractTestCase
      */
     protected $_helper; // phpcs:ignore
     private Doctype $doctypeHelper;
-    private string $oldDoctype;
 
     protected function setUp(): void
     {
@@ -48,7 +47,6 @@ protected function setUp(): void
         assert($renderer instanceof PhpRenderer);
         $helper              = $renderer->plugin(Doctype::class);
         $this->doctypeHelper = $helper;
-        $this->oldDoctype    = $helper->getDoctype();
         $this->doctypeHelper->setDoctype(
             Doctype::HTML4_LOOSE
         );
diff --git a/test/Helper/PaginationControlTest.php b/test/Helper/PaginationControlTest.php
index 29a87ff90..4a0f83e0f 100644
--- a/test/Helper/PaginationControlTest.php
+++ b/test/Helper/PaginationControlTest.php
@@ -19,7 +19,7 @@ class PaginationControlTest extends TestCase
 {
     private PaginationControl $viewHelper;
 
-    private \Laminas\Paginator\Paginator $paginator;
+    private Paginator\Paginator $paginator;
     private View $view;
 
     /**
@@ -110,7 +110,7 @@ public function testAcceptsViewPartialInOtherModule(): void
     {
         $this->expectException(Exception\RuntimeException::class);
         $this->expectExceptionMessage(
-            'Unable to render template "partial.phtml"; resolver could not resolve to a file'
+            'Unable to render template "partial.phtml"; resolver could not resolve to a file',
         );
         $this->viewHelper->__invoke($this->paginator, null, ['partial.phtml', 'test']);
     }
@@ -133,4 +133,15 @@ public function testCanUseObjectForScrollingStyle(): void
 
         $this->assertStringContainsString('page count (11) equals pages in range (11)', $output, $output);
     }
+
+    public function testSetAndGetDefaultScrollingStyle(): void
+    {
+        $default = PaginationControl::getDefaultScrollingStyle();
+
+        PaginationControl::setDefaultScrollingStyle('muppets');
+
+        self::assertSame('muppets', PaginationControl::getDefaultScrollingStyle());
+
+        PaginationControl::setDefaultScrollingStyle($default);
+    }
 }
diff --git a/test/Helper/Placeholder/RegistryTest.php b/test/Helper/Placeholder/RegistryTest.php
index 225372d15..a79091bc0 100644
--- a/test/Helper/Placeholder/RegistryTest.php
+++ b/test/Helper/Placeholder/RegistryTest.php
@@ -122,6 +122,7 @@ public function testSetValueCreateContainer(): void
             'Laminas-10793',
         ];
         $container = $this->registry->createContainer('foo', $data);
+        self::assertInstanceOf(TestAsset\MockContainer::class, $container);
         $this->assertEquals(['Laminas-10793'], $container->data);
     }
 }
diff --git a/test/VariablesTest.php b/test/VariablesTest.php
index 795ac95ca..3808e0712 100644
--- a/test/VariablesTest.php
+++ b/test/VariablesTest.php
@@ -109,17 +109,6 @@ public function testRetrievingUndefinedVariableRaisesErrorWhenStrictVarsIsReques
         $this->assertStringContainsString('does not exist', $this->error);
     }
 
-    /**
-     * @psalm-return array<array-key, string[]>
-     */
-    public function values(): array
-    {
-        return [
-            ['foo', 'bar'],
-            ['xss', '<tag id="foo">\'value\'</tag>'],
-        ];
-    }
-
     public function testCallingClearEmptiesObject(): void
     {
         $this->vars->assign([

From 43fa45d198ba7b3d243e359b63f301ed9c5cd4d4 Mon Sep 17 00:00:00 2001
From: George Steel <george@net-glue.co.uk>
Date: Thu, 25 Jan 2024 11:40:52 +0000
Subject: [PATCH 11/12] Minor SA fix

Signed-off-by: George Steel <george@net-glue.co.uk>
---
 test/Resolver/TemplatePathStackTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Resolver/TemplatePathStackTest.php b/test/Resolver/TemplatePathStackTest.php
index 8d45212e2..4046c8ac3 100644
--- a/test/Resolver/TemplatePathStackTest.php
+++ b/test/Resolver/TemplatePathStackTest.php
@@ -191,7 +191,7 @@ public function testAllowsSettingOptions($options): void
         $this->stack->setOptions($options);
         $this->assertFalse($this->stack->isLfiProtectionOn());
 
-        $this->assertSame($options['default_suffix'], $this->stack->getDefaultSuffix());
+        $this->assertSame('php', $this->stack->getDefaultSuffix());
 
         $this->assertEquals(array_reverse($this->paths), $this->stack->getPaths()->toArray());
     }

From 5a29b47403f37002ae4a0c89fc6798dca68f0c6a Mon Sep 17 00:00:00 2001
From: George Steel <george@net-glue.co.uk>
Date: Thu, 25 Jan 2024 11:41:14 +0000
Subject: [PATCH 12/12] Refresh lock and baseline post merge-up

Signed-off-by: George Steel <george@net-glue.co.uk>
---
 composer.lock      | 148 ++++++++++----------
 psalm-baseline.xml | 335 +--------------------------------------------
 2 files changed, 77 insertions(+), 406 deletions(-)

diff --git a/composer.lock b/composer.lock
index 803a4e08c..f5db38f21 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": "b0c418f8e21dfd1b22c09c160f09f84d",
+    "content-hash": "dfd16c568b651d75cbf04e3bbdddcdd1",
     "packages": [
         {
             "name": "laminas/laminas-escaper",
@@ -70,16 +70,16 @@
         },
         {
             "name": "laminas/laminas-eventmanager",
-            "version": "3.12.0",
+            "version": "3.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-eventmanager.git",
-                "reference": "4a576922c00cc7838d60d004a7bd6f5a02c23b57"
+                "reference": "ce5ba8bde378fca5cb0cd514f01823637215b2f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/4a576922c00cc7838d60d004a7bd6f5a02c23b57",
-                "reference": "4a576922c00cc7838d60d004a7bd6f5a02c23b57",
+                "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/ce5ba8bde378fca5cb0cd514f01823637215b2f3",
+                "reference": "ce5ba8bde378fca5cb0cd514f01823637215b2f3",
                 "shasum": ""
             },
             "require": {
@@ -91,12 +91,12 @@
             },
             "require-dev": {
                 "laminas/laminas-coding-standard": "~2.5.0",
-                "laminas/laminas-stdlib": "^3.17",
-                "phpbench/phpbench": "^1.2.10",
-                "phpunit/phpunit": "^10.4.1",
+                "laminas/laminas-stdlib": "^3.18",
+                "phpbench/phpbench": "^1.2.15",
+                "phpunit/phpunit": "^10.5.5",
                 "psalm/plugin-phpunit": "^0.18.4",
                 "psr/container": "^1.1.2 || ^2.0.2",
-                "vimeo/psalm": "^5.11"
+                "vimeo/psalm": "^5.18"
             },
             "suggest": {
                 "laminas/laminas-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature",
@@ -134,7 +134,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2023-10-18T16:36:45+00:00"
+            "time": "2024-01-03T17:43:50+00:00"
         },
         {
             "name": "laminas/laminas-json",
@@ -289,16 +289,16 @@
         },
         {
             "name": "laminas/laminas-stdlib",
-            "version": "3.18.0",
+            "version": "3.19.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-stdlib.git",
-                "reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf"
+                "reference": "6a192dd0882b514e45506f533b833b623b78fff3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf",
-                "reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf",
+                "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/6a192dd0882b514e45506f533b833b623b78fff3",
+                "reference": "6a192dd0882b514e45506f533b833b623b78fff3",
                 "shasum": ""
             },
             "require": {
@@ -309,10 +309,10 @@
             },
             "require-dev": {
                 "laminas/laminas-coding-standard": "^2.5",
-                "phpbench/phpbench": "^1.2.14",
-                "phpunit/phpunit": "^10.3.3",
+                "phpbench/phpbench": "^1.2.15",
+                "phpunit/phpunit": "^10.5.8",
                 "psalm/plugin-phpunit": "^0.18.4",
-                "vimeo/psalm": "^5.15.0"
+                "vimeo/psalm": "^5.20.0"
             },
             "type": "library",
             "autoload": {
@@ -344,7 +344,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2023-09-19T10:15:21+00:00"
+            "time": "2024-01-19T12:39:49+00:00"
         },
         {
             "name": "psr/container",
@@ -1458,16 +1458,16 @@
         },
         {
             "name": "laminas/laminas-filter",
-            "version": "2.33.0",
+            "version": "2.34.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-filter.git",
-                "reference": "6ad64828d25ec4bdf226ec5096aabb04aa710324"
+                "reference": "008923542683d853109af5c71b7e9099de76c3e6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/6ad64828d25ec4bdf226ec5096aabb04aa710324",
-                "reference": "6ad64828d25ec4bdf226ec5096aabb04aa710324",
+                "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/008923542683d853109af5c71b7e9099de76c3e6",
+                "reference": "008923542683d853109af5c71b7e9099de76c3e6",
                 "shasum": ""
             },
             "require": {
@@ -1482,14 +1482,14 @@
             },
             "require-dev": {
                 "laminas/laminas-coding-standard": "~2.5.0",
-                "laminas/laminas-crypt": "^3.10",
-                "laminas/laminas-i18n": "^2.23.1",
+                "laminas/laminas-crypt": "^3.11",
+                "laminas/laminas-i18n": "^2.25.0",
                 "laminas/laminas-uri": "^2.11",
                 "pear/archive_tar": "^1.4.14",
-                "phpunit/phpunit": "^10.4.2",
+                "phpunit/phpunit": "^10.5.5",
                 "psalm/plugin-phpunit": "^0.18.4",
                 "psr/http-factory": "^1.0.2",
-                "vimeo/psalm": "^5.15.0"
+                "vimeo/psalm": "^5.18.0"
             },
             "suggest": {
                 "laminas/laminas-crypt": "Laminas\\Crypt component, for encryption filters",
@@ -1533,7 +1533,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2023-11-03T13:29:10+00:00"
+            "time": "2024-01-04T11:47:08+00:00"
         },
         {
             "name": "laminas/laminas-http",
@@ -1602,16 +1602,16 @@
         },
         {
             "name": "laminas/laminas-i18n",
-            "version": "2.25.0",
+            "version": "2.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-i18n.git",
-                "reference": "4b6df8501bfe96648dadaf8de681cbbaea906e04"
+                "reference": "01738410cb263994d1d192861f642387e7e12ace"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/4b6df8501bfe96648dadaf8de681cbbaea906e04",
-                "reference": "4b6df8501bfe96648dadaf8de681cbbaea906e04",
+                "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/01738410cb263994d1d192861f642387e7e12ace",
+                "reference": "01738410cb263994d1d192861f642387e7e12ace",
                 "shasum": ""
             },
             "require": {
@@ -1625,18 +1625,18 @@
                 "zendframework/zend-i18n": "*"
             },
             "require-dev": {
-                "laminas/laminas-cache": "^3.11.0",
+                "laminas/laminas-cache": "^3.12.0",
                 "laminas/laminas-cache-storage-adapter-memory": "^2.3.0",
-                "laminas/laminas-cache-storage-deprecated-factory": "^1.1",
+                "laminas/laminas-cache-storage-deprecated-factory": "^1.2",
                 "laminas/laminas-coding-standard": "~2.5.0",
                 "laminas/laminas-config": "^3.9.0",
-                "laminas/laminas-eventmanager": "^3.12",
-                "laminas/laminas-filter": "^2.33",
-                "laminas/laminas-validator": "^2.41",
-                "laminas/laminas-view": "^2.32",
-                "phpunit/phpunit": "^10.4.2",
+                "laminas/laminas-eventmanager": "^3.13",
+                "laminas/laminas-filter": "^2.34",
+                "laminas/laminas-validator": "^2.46",
+                "laminas/laminas-view": "^2.33",
+                "phpunit/phpunit": "^10.5.5",
                 "psalm/plugin-phpunit": "^0.18.4",
-                "vimeo/psalm": "^5.15.0"
+                "vimeo/psalm": "^5.18.0"
             },
             "suggest": {
                 "laminas/laminas-cache": "You should install this package to cache the translations",
@@ -1683,7 +1683,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2023-12-22T15:51:21+00:00"
+            "time": "2024-01-04T13:49:00+00:00"
         },
         {
             "name": "laminas/laminas-loader",
@@ -1974,16 +1974,16 @@
         },
         {
             "name": "laminas/laminas-navigation",
-            "version": "2.19.0",
+            "version": "2.19.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-navigation.git",
-                "reference": "9d212fb17dbb2da4172a7248a67483ebe38ad3a7"
+                "reference": "2ef88f68066381698b528be7fdd001723458a479"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-navigation/zipball/9d212fb17dbb2da4172a7248a67483ebe38ad3a7",
-                "reference": "9d212fb17dbb2da4172a7248a67483ebe38ad3a7",
+                "url": "https://api.github.com/repos/laminas/laminas-navigation/zipball/2ef88f68066381698b528be7fdd001723458a479",
+                "reference": "2ef88f68066381698b528be7fdd001723458a479",
                 "shasum": ""
             },
             "require": {
@@ -2051,20 +2051,20 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2023-11-14T21:49:15+00:00"
+            "time": "2024-01-10T15:11:10+00:00"
         },
         {
             "name": "laminas/laminas-paginator",
-            "version": "2.18.0",
+            "version": "2.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-paginator.git",
-                "reference": "caacfd2625bf354be32888dd55767c893b89d38f"
+                "reference": "6a03499a899fb8ba650594ddf4b4338d4235252a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-paginator/zipball/caacfd2625bf354be32888dd55767c893b89d38f",
-                "reference": "caacfd2625bf354be32888dd55767c893b89d38f",
+                "url": "https://api.github.com/repos/laminas/laminas-paginator/zipball/6a03499a899fb8ba650594ddf4b4338d4235252a",
+                "reference": "6a03499a899fb8ba650594ddf4b4338d4235252a",
                 "shasum": ""
             },
             "require": {
@@ -2130,7 +2130,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2023-11-08T15:42:20+00:00"
+            "time": "2024-01-11T11:00:36+00:00"
         },
         {
             "name": "laminas/laminas-permissions-acl",
@@ -2327,16 +2327,16 @@
         },
         {
             "name": "laminas/laminas-validator",
-            "version": "2.46.0",
+            "version": "2.47.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-validator.git",
-                "reference": "98330256f8d8a1357a93f6f7f1a987036aff6329"
+                "reference": "5c3fc8c4f1263cda5c5f14aed874fdadd5b90bbd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/98330256f8d8a1357a93f6f7f1a987036aff6329",
-                "reference": "98330256f8d8a1357a93f6f7f1a987036aff6329",
+                "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/5c3fc8c4f1263cda5c5f14aed874fdadd5b90bbd",
+                "reference": "5c3fc8c4f1263cda5c5f14aed874fdadd5b90bbd",
                 "shasum": ""
             },
             "require": {
@@ -2407,7 +2407,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2024-01-03T12:43:04+00:00"
+            "time": "2024-01-17T11:31:50+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -3218,16 +3218,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.5",
+            "version": "10.5.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "ed21115d505b4b4f7dc7b5651464e19a2c7f7856"
+                "reference": "0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ed21115d505b4b4f7dc7b5651464e19a2c7f7856",
-                "reference": "ed21115d505b4b4f7dc7b5651464e19a2c7f7856",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe",
+                "reference": "0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe",
                 "shasum": ""
             },
             "require": {
@@ -3299,7 +3299,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.5"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.9"
             },
             "funding": [
                 {
@@ -3315,7 +3315,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-27T15:13:52+00:00"
+            "time": "2024-01-22T14:35:40+00:00"
         },
         {
             "name": "psalm/plugin-phpunit",
@@ -4521,16 +4521,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.8.0",
+            "version": "3.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7"
+                "reference": "14f5fff1e64118595db5408e946f3a22c75807f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5805f7a4e4958dbb5e944ef1e6edae0a303765e7",
-                "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/14f5fff1e64118595db5408e946f3a22c75807f7",
+                "reference": "14f5fff1e64118595db5408e946f3a22c75807f7",
                 "shasum": ""
             },
             "require": {
@@ -4540,11 +4540,11 @@
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
             },
             "bin": [
-                "bin/phpcs",
-                "bin/phpcbf"
+                "bin/phpcbf",
+                "bin/phpcs"
             ],
             "type": "library",
             "extra": {
@@ -4597,7 +4597,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2023-12-08T12:32:31+00:00"
+            "time": "2024-01-11T20:47:48+00:00"
         },
         {
             "name": "symfony/console",
@@ -5373,16 +5373,16 @@
         },
         {
             "name": "vimeo/psalm",
-            "version": "5.18.0",
+            "version": "5.20.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vimeo/psalm.git",
-                "reference": "b113f3ed0259fd6e212d87c3df80eec95a6abf19"
+                "reference": "3f284e96c9d9be6fe6b15c79416e1d1903dcfef4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vimeo/psalm/zipball/b113f3ed0259fd6e212d87c3df80eec95a6abf19",
-                "reference": "b113f3ed0259fd6e212d87c3df80eec95a6abf19",
+                "url": "https://api.github.com/repos/vimeo/psalm/zipball/3f284e96c9d9be6fe6b15c79416e1d1903dcfef4",
+                "reference": "3f284e96c9d9be6fe6b15c79416e1d1903dcfef4",
                 "shasum": ""
             },
             "require": {
@@ -5479,7 +5479,7 @@
                 "issues": "https://github.com/vimeo/psalm/issues",
                 "source": "https://github.com/vimeo/psalm"
             },
-            "time": "2023-12-16T09:37:35+00:00"
+            "time": "2024-01-18T12:15:06+00:00"
         },
         {
             "name": "webimpress/coding-standard",
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 12f91ef14..06fbd28f7 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -12,8 +12,6 @@
       <code>$closingBracket</code>
       <code>$closingBracket</code>
       <code>$closingBracket</code>
-      <code>$closingBracket</code>
-      <code>$closingBracket</code>
     </MissingConstructor>
     <MixedArgument>
       <code>$val</code>
@@ -36,11 +34,6 @@
       <code>plugin</code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="src/Helper/Asset.php">
-    <PossiblyUnusedMethod>
-      <code>setResourceMap</code>
-    </PossiblyUnusedMethod>
-  </file>
   <file src="src/Helper/Cycle.php">
     <ImplementedReturnTypeMismatch>
       <code>Cycle</code>
@@ -130,43 +123,6 @@
       <code>$value[$k]</code>
     </MixedAssignment>
   </file>
-  <file src="src/Helper/FlashMessenger.php">
-    <DocblockTypeContradiction>
-      <code><![CDATA[null === $this->pluginFlashMessenger]]></code>
-    </DocblockTypeContradiction>
-    <MissingClosureParamType>
-      <code>$item</code>
-    </MissingClosureParamType>
-    <MissingConstructor>
-      <code>$escapeHtmlHelper</code>
-      <code>$pluginFlashMessenger</code>
-    </MissingConstructor>
-    <MixedArgument>
-      <code>$item</code>
-      <code>$item</code>
-    </MixedArgument>
-    <MixedArgumentTypeCoercion>
-      <code>$classes</code>
-      <code>$classes</code>
-      <code>$messagesToPrint</code>
-    </MixedArgumentTypeCoercion>
-    <MixedAssignment>
-      <code>$classes</code>
-      <code>$classes</code>
-      <code>$messagesToPrint[]</code>
-      <code>$messagesToPrint[]</code>
-      <code><![CDATA[$this->escapeHtmlHelper]]></code>
-    </MixedAssignment>
-    <RedundantCastGivenDocblockType>
-      <code>(bool) $autoEscape</code>
-      <code>(string) $messageCloseString</code>
-      <code>(string) $messageOpenFormat</code>
-      <code>(string) $messageSeparatorString</code>
-    </RedundantCastGivenDocblockType>
-    <RedundantConditionGivenDocblockType>
-      <code><![CDATA[$this->escapeHtmlHelper]]></code>
-    </RedundantConditionGivenDocblockType>
-  </file>
   <file src="src/Helper/Gravatar.php">
     <DocblockTypeContradiction>
       <code>$flag === null</code>
@@ -191,9 +147,6 @@
       <code><![CDATA[$this->options['rating']]]></code>
       <code><![CDATA[$this->options['secure']]]></code>
     </MixedReturnStatement>
-    <PossiblyUnusedReturnValue>
-      <code><![CDATA[array<string, mixed>]]></code>
-    </PossiblyUnusedReturnValue>
     <RedundantCastGivenDocblockType>
       <code>(bool) $flag</code>
       <code>(int) $imgSize</code>
@@ -417,26 +370,6 @@
       <code>HelperInterface</code>
     </PossiblyUnusedReturnValue>
   </file>
-  <file src="src/Helper/HtmlFlash.php">
-    <MixedAssignment>
-      <code>$htmlObject</code>
-    </MixedAssignment>
-    <MixedFunctionCall>
-      <code>$htmlObject($data, self::TYPE, $attribs, $params, $content)</code>
-    </MixedFunctionCall>
-    <MixedInferredReturnType>
-      <code>string</code>
-    </MixedInferredReturnType>
-    <MixedReturnStatement>
-      <code>$htmlObject($data, self::TYPE, $attribs, $params, $content)</code>
-    </MixedReturnStatement>
-    <PossiblyNullReference>
-      <code>plugin</code>
-    </PossiblyNullReference>
-    <UndefinedInterfaceMethod>
-      <code>plugin</code>
-    </UndefinedInterfaceMethod>
-  </file>
   <file src="src/Helper/HtmlObject.php">
     <MixedArgument>
       <code>$options</code>
@@ -468,26 +401,6 @@
       <code>plugin</code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="src/Helper/HtmlQuicktime.php">
-    <MixedAssignment>
-      <code>$htmlObject</code>
-    </MixedAssignment>
-    <MixedFunctionCall>
-      <code>$htmlObject($data, self::TYPE, $attribs, $params, $content)</code>
-    </MixedFunctionCall>
-    <MixedInferredReturnType>
-      <code>string</code>
-    </MixedInferredReturnType>
-    <MixedReturnStatement>
-      <code>$htmlObject($data, self::TYPE, $attribs, $params, $content)</code>
-    </MixedReturnStatement>
-    <PossiblyNullReference>
-      <code>plugin</code>
-    </PossiblyNullReference>
-    <UndefinedInterfaceMethod>
-      <code>plugin</code>
-    </UndefinedInterfaceMethod>
-  </file>
   <file src="src/Helper/HtmlTag.php">
     <MixedArgument>
       <code>$value</code>
@@ -505,23 +418,6 @@
       <code>(bool) $useNamespaces</code>
     </RedundantCastGivenDocblockType>
   </file>
-  <file src="src/Helper/Identity.php">
-    <PossiblyUnusedMethod>
-      <code>getAuthenticationService</code>
-      <code>setAuthenticationService</code>
-    </PossiblyUnusedMethod>
-  </file>
-  <file src="src/Helper/Json.php">
-    <MissingConstructor>
-      <code>$response</code>
-    </MissingConstructor>
-    <NullArgument>
-      <code>null</code>
-    </NullArgument>
-    <RedundantConditionGivenDocblockType>
-      <code><![CDATA[$this->response instanceof Response]]></code>
-    </RedundantConditionGivenDocblockType>
-  </file>
   <file src="src/Helper/Layout.php">
     <PossiblyNullReference>
       <code>plugin</code>
@@ -1114,7 +1010,6 @@
       <code>(string) $key</code>
       <code>(string) $key</code>
       <code>(string) $key</code>
-      <code>(string) $name</code>
     </RedundantCastGivenDocblockType>
     <UnsafeInstantiation>
       <code><![CDATA[new $this->containerClass($value)]]></code>
@@ -1201,9 +1096,6 @@
     </UnsafeInstantiation>
   </file>
   <file src="src/Helper/Placeholder/Registry.php">
-    <DocblockTypeContradiction>
-      <code>null === static::$instance</code>
-    </DocblockTypeContradiction>
     <InvalidStringClass>
       <code><![CDATA[new $this->containerClass($value)]]></code>
     </InvalidStringClass>
@@ -1219,10 +1111,9 @@
     <MoreSpecificReturnType>
       <code>AbstractContainer</code>
     </MoreSpecificReturnType>
-    <PossiblyUnusedMethod>
-      <code>getRegistry</code>
-      <code>unsetRegistry</code>
-    </PossiblyUnusedMethod>
+    <PossiblyUnusedProperty>
+      <code>$instance</code>
+    </PossiblyUnusedProperty>
     <RedundantCastGivenDocblockType>
       <code>(string) $key</code>
       <code>(string) $key</code>
@@ -1230,9 +1121,6 @@
       <code>(string) $key</code>
       <code>(string) $key</code>
     </RedundantCastGivenDocblockType>
-    <UnsafeInstantiation>
-      <code>new static()</code>
-    </UnsafeInstantiation>
   </file>
   <file src="src/Helper/RenderChildModel.php">
     <MissingConstructor>
@@ -1306,11 +1194,6 @@
       <code><![CDATA[$_SERVER['HTTPS'] === true]]></code>
     </TypeDoesNotContainType>
   </file>
-  <file src="src/Helper/Service/AssetFactory.php">
-    <PossiblyNullArgument>
-      <code>$cName</code>
-    </PossiblyNullArgument>
-  </file>
   <file src="src/Helper/Service/DoctypeFactory.php">
     <MixedArgument>
       <code><![CDATA[$config['view_helper_config']['doctype']]]></code>
@@ -1323,50 +1206,7 @@
       <code>$config</code>
     </MixedAssignment>
   </file>
-  <file src="src/Helper/Service/FlashMessengerFactory.php">
-    <DeprecatedClass>
-      <code>FlashMessenger</code>
-      <code>FlashMessenger</code>
-      <code>new FlashMessenger()</code>
-    </DeprecatedClass>
-    <DeprecatedInterface>
-      <code>FlashMessengerFactory</code>
-    </DeprecatedInterface>
-    <MixedArgument>
-      <code><![CDATA[$configHelper['message_close_string']]]></code>
-      <code><![CDATA[$configHelper['message_open_format']]]></code>
-      <code><![CDATA[$configHelper['message_separator_string']]]></code>
-      <code>$flashMessenger</code>
-    </MixedArgument>
-    <MixedArrayAccess>
-      <code><![CDATA[$configHelper['message_close_string']]]></code>
-      <code><![CDATA[$configHelper['message_open_format']]]></code>
-      <code><![CDATA[$configHelper['message_separator_string']]]></code>
-      <code><![CDATA[$config['view_helper_config']]]></code>
-      <code><![CDATA[$config['view_helper_config']['flashmessenger']]]></code>
-    </MixedArrayAccess>
-    <MixedAssignment>
-      <code>$config</code>
-      <code>$configHelper</code>
-      <code>$controllerPluginManager</code>
-      <code>$flashMessenger</code>
-    </MixedAssignment>
-    <MixedMethodCall>
-      <code>get</code>
-    </MixedMethodCall>
-    <ParamNameMismatch>
-      <code>$container</code>
-    </ParamNameMismatch>
-    <PossiblyNullArgument>
-      <code>$requestedName</code>
-    </PossiblyNullArgument>
-  </file>
   <file src="src/Helper/TranslatorAwareTrait.php">
-    <DeprecatedClass>
-      <code>$this</code>
-      <code>$this</code>
-      <code>$this</code>
-    </DeprecatedClass>
     <RedundantCastGivenDocblockType>
       <code>(bool) $enabled</code>
     </RedundantCastGivenDocblockType>
@@ -1456,22 +1296,6 @@
       <code>clearVariables</code>
     </MissingReturnType>
   </file>
-  <file src="src/Model/ConsoleModel.php">
-    <MixedInferredReturnType>
-      <code>int</code>
-    </MixedInferredReturnType>
-    <MixedReturnStatement>
-      <code><![CDATA[$this->options['errorLevel']]]></code>
-    </MixedReturnStatement>
-    <NonInvariantDocblockPropertyType>
-      <code>$captureTo</code>
-    </NonInvariantDocblockPropertyType>
-    <PossiblyUnusedMethod>
-      <code>getErrorLevel</code>
-      <code>getResult</code>
-      <code>setResult</code>
-    </PossiblyUnusedMethod>
-  </file>
   <file src="src/Model/FeedModel.php">
     <MixedAssignment>
       <code><![CDATA[$this->type]]></code>
@@ -1542,30 +1366,6 @@
       <code>is_object($variables)</code>
     </RedundantConditionGivenDocblockType>
   </file>
-  <file src="src/Renderer/ConsoleRenderer.php">
-    <ImplementedParamTypeMismatch>
-      <code>$values</code>
-    </ImplementedParamTypeMismatch>
-    <MixedAssignment>
-      <code>$value</code>
-    </MixedAssignment>
-    <MixedOperand>
-      <code><![CDATA[$this->getFilterChain()->filter($values['result'])]]></code>
-    </MixedOperand>
-    <ParamNameMismatch>
-      <code>$model</code>
-    </ParamNameMismatch>
-    <PossiblyInvalidArgument>
-      <code>$values</code>
-    </PossiblyInvalidArgument>
-    <PossiblyUnusedMethod>
-      <code>__construct</code>
-      <code>setFilterChain</code>
-    </PossiblyUnusedMethod>
-    <PossiblyUnusedParam>
-      <code>$config</code>
-    </PossiblyUnusedParam>
-  </file>
   <file src="src/Renderer/FeedRenderer.php">
     <InvalidArgument>
       <code>(array) $nameOrModel</code>
@@ -1590,9 +1390,6 @@
     </RedundantConditionGivenDocblockType>
   </file>
   <file src="src/Renderer/JsonRenderer.php">
-    <ImplementedReturnTypeMismatch>
-      <code>void</code>
-    </ImplementedReturnTypeMismatch>
     <MissingConstructor>
       <code>$jsonpCallback</code>
     </MissingConstructor>
@@ -1735,19 +1532,11 @@
       <code>static::FAILURE_NOT_FOUND</code>
       <code>static::FAILURE_NO_PATHS</code>
     </DeprecatedConstant>
-    <DeprecatedMethod>
-      <code>setUseStreamWrapper</code>
-    </DeprecatedMethod>
     <DeprecatedProperty>
       <code><![CDATA[$this->lastLookupFailure]]></code>
       <code><![CDATA[$this->lastLookupFailure]]></code>
       <code><![CDATA[$this->lastLookupFailure]]></code>
       <code><![CDATA[$this->lastLookupFailure]]></code>
-      <code><![CDATA[$this->useStreamWrapper]]></code>
-      <code><![CDATA[$this->useStreamWrapper]]></code>
-      <code><![CDATA[$this->useViewStream]]></code>
-      <code><![CDATA[$this->useViewStream]]></code>
-      <code><![CDATA[$this->useViewStream]]></code>
     </DeprecatedProperty>
     <DocblockTypeContradiction>
       <code>is_string($path)</code>
@@ -1760,13 +1549,11 @@
       <code><![CDATA[$options['default_suffix']]]></code>
       <code><![CDATA[$options['lfi_protection']]]></code>
       <code><![CDATA[$options['script_paths']]]></code>
-      <code><![CDATA[$options['use_stream_wrapper']]]></code>
     </MixedArgument>
     <PossiblyUnusedReturnValue>
       <code>TemplatePathStack</code>
     </PossiblyUnusedReturnValue>
     <RedundantCastGivenDocblockType>
-      <code>(bool) $flag</code>
       <code>(bool) $flag</code>
       <code>(string) $defaultSuffix</code>
     </RedundantCastGivenDocblockType>
@@ -1825,48 +1612,6 @@
       <code>plugin</code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="src/Stream.php">
-    <MissingConstructor>
-      <code>$data</code>
-      <code>$stat</code>
-    </MissingConstructor>
-    <MissingParamType>
-      <code>$mode</code>
-      <code>$offset</code>
-      <code>$opened_path</code>
-      <code>$options</code>
-      <code>$whence</code>
-    </MissingParamType>
-    <MixedAssignment>
-      <code><![CDATA[$this->pos]]></code>
-      <code><![CDATA[$this->pos]]></code>
-      <code><![CDATA[$this->pos]]></code>
-    </MixedAssignment>
-    <MixedOperand>
-      <code>$offset</code>
-      <code>$offset</code>
-      <code>$offset</code>
-    </MixedOperand>
-    <PossiblyUnusedMethod>
-      <code>stream_eof</code>
-      <code>stream_open</code>
-      <code>stream_read</code>
-      <code>stream_seek</code>
-      <code>stream_stat</code>
-      <code>stream_tell</code>
-      <code>url_stat</code>
-    </PossiblyUnusedMethod>
-    <PossiblyUnusedParam>
-      <code>$mode</code>
-      <code>$opened_path</code>
-      <code>$options</code>
-    </PossiblyUnusedParam>
-    <UnevaluatedCode>
-      <code>break;</code>
-      <code>break;</code>
-      <code>break;</code>
-    </UnevaluatedCode>
-  </file>
   <file src="src/Variables.php">
     <MixedArgument>
       <code>$value</code>
@@ -2002,75 +1747,6 @@
       <code>$test</code>
     </MixedAssignment>
   </file>
-  <file src="test/Helper/FlashMessengerTest.php">
-    <ArgumentTypeCoercion>
-      <code>$plugin</code>
-      <code>$plugin</code>
-      <code><![CDATA[$this->mvcPluginClass]]></code>
-    </ArgumentTypeCoercion>
-    <DeprecatedClass>
-      <code>FlashMessenger</code>
-      <code><![CDATA[new Config([
-            'services'  => [
-                'config' => $config,
-            ],
-            'factories' => [
-                'ControllerPluginManager' => fn(ContainerInterface $services) => new PluginManager($services, [
-                    'invokables' => [
-                        'flashmessenger' => $this->mvcPluginClass,
-                    ],
-                ]),
-                'ViewHelperManager'       => static fn(ContainerInterface $services)
-                    => new HelperPluginManager($services),
-            ],
-        ])]]></code>
-      <code>new FlashMessenger()</code>
-      <code>new FlashMessenger()</code>
-      <code>new FlashMessenger()</code>
-      <code>new FlashMessenger()</code>
-      <code>new FlashMessenger()</code>
-      <code>new FlashMessenger()</code>
-    </DeprecatedClass>
-    <MixedAssignment>
-      <code>$displayInfo</code>
-      <code>$displayInfo</code>
-      <code>$displayInfo</code>
-      <code>$displayInfo</code>
-      <code>$helper</code>
-      <code>$helper</code>
-      <code>$helper</code>
-      <code>$helper</code>
-      <code>$helperPluginManager</code>
-      <code>$helperPluginManager</code>
-      <code>$helperPluginManager</code>
-      <code>$helperPluginManager</code>
-    </MixedAssignment>
-    <MixedMethodCall>
-      <code>get</code>
-      <code>get</code>
-      <code>get</code>
-      <code>get</code>
-      <code>render</code>
-      <code>render</code>
-      <code>renderCurrent</code>
-      <code>renderCurrent</code>
-    </MixedMethodCall>
-    <PossiblyInvalidMethodCall>
-      <code>hasCurrentErrorMessages</code>
-      <code>hasCurrentInfoMessages</code>
-      <code>hasCurrentMessages</code>
-      <code>hasCurrentSuccessMessages</code>
-      <code>hasErrorMessages</code>
-      <code>hasInfoMessages</code>
-      <code>hasMessages</code>
-      <code>hasSuccessMessages</code>
-      <code>hasWarningMessages</code>
-      <code>render</code>
-      <code>render</code>
-      <code>renderCurrent</code>
-      <code>renderCurrent</code>
-    </PossiblyInvalidMethodCall>
-  </file>
   <file src="test/Helper/GravatarTest.php">
     <PossiblyInvalidArgument>
       <code>$value</code>
@@ -2168,11 +1844,6 @@
       <code>offsetSetName</code>
     </UndefinedMagicMethod>
   </file>
-  <file src="test/Helper/HtmlFlashTest.php">
-    <DeprecatedClass>
-      <code>HtmlFlash</code>
-    </DeprecatedClass>
-  </file>
   <file src="test/Helper/HtmlListTest.php">
     <PossiblyUnusedParam>
       <code>$key</code>