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 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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([