Typed private properties and numerous static analysis fixes

Signed-off-by: George Steel <[email protected]>

Author: gsteel

src/HelperPluginManagerFactory.php

@@ -4,21 +4,29 @@
 
 namespace Mezzio\LaminasView;
 
+use ArrayAccess;
 use Laminas\ServiceManager\Config;
+use Laminas\ServiceManager\ConfigInterface;
 use Laminas\View\HelperPluginManager;
 use Psr\Container\ContainerInterface;
 
+use function assert;
+use function is_array;
+
+/** @psalm-import-type ServiceManagerConfigurationType from ConfigInterface */
 class HelperPluginManagerFactory
 {
     public function __invoke(ContainerInterface $container): HelperPluginManager
     {
         $manager = new HelperPluginManager($container);
 
         $config = $container->has('config') ? $container->get('config') : [];
-        $config = $config['view_helpers'] ?? [];
+        assert(is_array($config) || $config instanceof ArrayAccess);
+        /** @psalm-var ServiceManagerConfigurationType $helperConfig */
+        $helperConfig = $config['view_helpers'] ?? [];
 
-        if (! empty($config)) {
-            (new Config($config))->configureServiceManager($manager);
+        if (! empty($helperConfig)) {
+            (new Config($helperConfig))->configureServiceManager($manager);
         }
 
         return $manager;

src/LaminasViewRenderer.php

@@ -39,14 +39,9 @@ class LaminasViewRenderer implements TemplateRendererInterface
     use ArrayParametersTrait;
     use DefaultParamsTrait;
 
-    /** @var ViewModel|null */
-    private $layout;
-
-    /** @var RendererInterface */
-    private $renderer;
-
-    /** @var NamespacedPathStackResolver */
-    private $resolver;
+    private ?ViewModel $layout = null;
+    private RendererInterface $renderer;
+    private NamespacedPathStackResolver $resolver;
 
     /**
      * Constructor
@@ -264,13 +259,7 @@ private function injectNamespacedResolver(AggregateResolver $aggregate): void
 
     private function hasNamespacedResolver(AggregateResolver $aggregate): bool
     {
-        foreach ($aggregate as $resolver) {
-            if ($resolver instanceof NamespacedPathStackResolver) {
-                return true;
-            }
-        }
-
-        return false;
+        return $this->getNamespacedResolver($aggregate) !== null;
     }
 
     private function getNamespacedResolver(AggregateResolver $aggregate): ?NamespacedPathStackResolver

src/ServerUrlHelper.php

@@ -18,8 +18,7 @@ class ServerUrlHelper extends AbstractHelper
 {
     use DeprecatedAbstractHelperHierarchyTrait;
 
-    /** @var BaseHelper */
-    private $helper;
+    private BaseHelper $helper;
 
     public function __construct(BaseHelper $helper)
     {

src/UrlHelper.php

@@ -15,8 +15,7 @@ class UrlHelper extends AbstractHelper
 {
     use DeprecatedAbstractHelperHierarchyTrait;
 
-    /** @var BaseHelper */
-    private $helper;
+    private BaseHelper $helper;
 
     public function __construct(BaseHelper $helper)
     {

test/HelperPluginManagerFactoryTest.php

@@ -4,21 +4,21 @@
 
 namespace MezzioTest\LaminasView;
 
-use Laminas\ServiceManager\ServiceManager;
 use Laminas\View\HelperPluginManager;
 use Mezzio\LaminasView\HelperPluginManagerFactory;
 use MezzioTest\LaminasView\TestAsset\TestHelper;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
 
 class HelperPluginManagerFactoryTest extends TestCase
 {
-    /** @var ServiceManager&MockObject */
-    private $container;
+    /** @var ContainerInterface&MockObject */
+    private ContainerInterface $container;
 
     protected function setUp(): void
     {
-        $this->container = $this->createMock(ServiceManager::class);
+        $this->container = $this->createMock(ContainerInterface::class);
     }
 
     public function testCallingFactoryWithNoConfigReturnsHelperPluginManagerInstance(): HelperPluginManager

test/LaminasViewRendererFactoryTest.php

@@ -102,7 +102,7 @@ private function assertPathNamespaceContains(
         array $paths,
         ?string $message = null
     ): void {
-        $message = $message ?: sprintf('Did not find path %s in namespace %s', $expected, $namespace ?: null);
+        $message = $message ?: sprintf('Did not find path %s in namespace %s', (string) $expected, $namespace ?: '');
 
         $found = [];
         foreach ($paths as $path) {

test/LaminasViewRendererTest.php

@@ -28,17 +28,13 @@
 
 class LaminasViewRendererTest extends TestCase
 {
-    /** @var TemplatePathStack */
-    private $resolver;
-
-    /** @var PhpRenderer */
-    private $render;
+    private PhpRenderer $render;
 
     protected function setUp(): void
     {
-        $this->resolver = new TemplatePathStack();
-        $this->render   = new PhpRenderer();
-        $this->render->setResolver($this->resolver);
+        $resolver     = new TemplatePathStack();
+        $this->render = new PhpRenderer();
+        $this->render->setResolver($resolver);
     }
 
     public function assertTemplatePath(string $path, TemplatePath $templatePath, ?string $message = null): void
@@ -113,6 +109,7 @@ public function testInstantiatingWithInvalidLayout(): void
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Layout must be a string layout template name');
 
+        /** @psalm-suppress InvalidArgument */
         new LaminasViewRenderer(null, []);
     }
 
@@ -121,7 +118,6 @@ public function testCanAddPathWithEmptyNamespace(): void
         $renderer = new LaminasViewRenderer();
         $renderer->addPath(__DIR__ . '/TestAsset');
         $paths = $renderer->getPaths();
-        $this->assertIsArray($paths);
         $this->assertCount(1, $paths);
         $this->assertTemplatePath(__DIR__ . '/TestAsset' . DIRECTORY_SEPARATOR, $paths[0]);
         $this->assertTemplatePathString(__DIR__ . '/TestAsset' . DIRECTORY_SEPARATOR, $paths[0]);
@@ -133,7 +129,6 @@ public function testCanAddPathWithNamespace(): void
         $renderer = new LaminasViewRenderer();
         $renderer->addPath(__DIR__ . '/TestAsset', 'test');
         $paths = $renderer->getPaths();
-        $this->assertIsArray($paths);
         $this->assertCount(1, $paths);
         $this->assertTemplatePath(__DIR__ . '/TestAsset' . DIRECTORY_SEPARATOR, $paths[0]);
         $this->assertTemplatePathString(__DIR__ . '/TestAsset' . DIRECTORY_SEPARATOR, $paths[0]);

test/ServerUrlHelperTest.php

@@ -14,10 +14,9 @@
 
 class ServerUrlHelperTest extends TestCase
 {
-    /** @var ServerUrlHelper */
-    private $helper;
+    private ServerUrlHelper $helper;
     /** @var BaseHelper&MockObject */
-    private $baseHelper;
+    private BaseHelper $baseHelper;
 
     protected function setUp(): void
     {

test/UrlHelperTest.php

@@ -12,9 +12,8 @@
 class UrlHelperTest extends TestCase
 {
     /** @var BaseHelper&MockObject */
-    private $baseHelper;
-    /** @var UrlHelper */
-    private $helper;
+    private BaseHelper $baseHelper;
+    private UrlHelper $helper;
 
     protected function setUp(): void
     {