From ebbd97f849e9457152f8aa1bb1446f25f693e63a Mon Sep 17 00:00:00 2001
From: "Eric Richer eric.richer@vistoconsulting.com"
 <eric.richer@vistoconsulting.com>
Date: Fri, 16 Aug 2024 17:18:54 -0400
Subject: [PATCH] Beautify code

---
 src/Collector/RbacCollector.php               |  17 +-
 src/ConfigProvider.php                        |  19 +-
 src/Module.php                                |   7 +-
 test/Asset/MockRoleWithPermissionMethod.php   |  10 +-
 test/Asset/MockRoleWithPermissionProperty.php |  20 ++-
 .../MockRoleWithPermissionTraversable.php     |  24 +--
 test/Bootstrap.php                            |   7 +-
 test/Collector/RbacCollectorTest.php          | 170 +++++++++---------
 test/ConfigProviderTest.php                   |  24 ++-
 test/ModuleTest.php                           |   8 +-
 test/TestConfiguration.php                    |  10 +-
 test/Util/ServiceManagerFactory.php           |  49 +++--
 12 files changed, 199 insertions(+), 166 deletions(-)

diff --git a/src/Collector/RbacCollector.php b/src/Collector/RbacCollector.php
index bdee314..6a08d2e 100644
--- a/src/Collector/RbacCollector.php
+++ b/src/Collector/RbacCollector.php
@@ -97,7 +97,10 @@ public function collect(MvcEvent $mvcEvent): void
      */
     private function collectOptions(ModuleOptions $moduleOptions): void
     {
-        $this->collectedOptions = ['guest_role' => $moduleOptions->getGuestRole(), 'protection_policy' => $moduleOptions->getProtectionPolicy()];
+        $this->collectedOptions = [
+            'guest_role'        => $moduleOptions->getGuestRole(),
+            'protection_policy' => $moduleOptions->getProtectionPolicy(),
+        ];
     }
 
     /**
@@ -126,7 +129,10 @@ private function collectIdentityRolesAndPermissions(RoleService $roleService): v
             if (empty($role->getChildren())) {
                 $this->collectedRoles[] = $roleName;
             } else {
-                $iteratorIterator = new RecursiveIteratorIterator(new RecursiveRoleIterator($role->getChildren()), RecursiveIteratorIterator::SELF_FIRST);
+                $iteratorIterator = new RecursiveIteratorIterator(
+                    new RecursiveRoleIterator($role->getChildren()),
+                    RecursiveIteratorIterator::SELF_FIRST
+                );
                 foreach ($iteratorIterator as $childRole) {
                     $this->collectedRoles[$roleName][] = $childRole->getName();
                     $this->collectPermissions($childRole);
@@ -147,8 +153,8 @@ private function collectPermissions(RoleInterface $role): void
         if (method_exists($role, 'getPermissions')) {
             $permissions = $role->getPermissions();
         } else {
-                          $reflectionProperty = new ReflectionProperty($role, 'permissions');
-            $permissions                      = $reflectionProperty->getValue($role);
+            $reflectionProperty = new ReflectionProperty($role, 'permissions');
+            $permissions        = $reflectionProperty->getValue($role);
         }
 
         if ($permissions instanceof Traversable) {
@@ -166,13 +172,14 @@ private function collectPermissions(RoleInterface $role): void
      */
     public function getCollection(): array
     {
+        // Start collect all the data we need!
         return [
             'guards'      => $this->collectedGuards,
             'roles'       => $this->collectedRoles,
             'permissions' => $this->collectedPermissions,
             'options'     => $this->collectedOptions,
         ];
-    } // Start collect all the data we need!
+    }
 
  // Gather the permissions for the given role. We have to use reflection as
  // the RoleInterface does not have "getPermissions" method
diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
index aef7c12..0618332 100644
--- a/src/ConfigProvider.php
+++ b/src/ConfigProvider.php
@@ -1,14 +1,19 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LmcRbac\Mvc\DevTools;
 
+use Laminas\ServiceManager\Factory\InvokableFactory;
+use LmcRbac\Mvc\DevTools\Collector\RbacCollector;
+
 class ConfigProvider
 {
     public function __invoke(): array
     {
         return [
-            'dependencies' => $this->getDependencies(),
-            'view_manager' => $this->getViewManagerConfig(),
+            'dependencies'            => $this->getDependencies(),
+            'view_manager'            => $this->getViewManagerConfig(),
             'laminas-developer-tools' => $this->getLaminasDeveloperToolsConfig(),
         ];
     }
@@ -17,7 +22,7 @@ public function getDependencies(): array
     {
         return [
             'factories' => [
-                \LmcRbac\Mvc\DevTools\Collector\RbacCollector::class => \Laminas\ServiceManager\Factory\InvokableFactory::class,
+                RbacCollector::class => InvokableFactory::class,
             ],
         ];
     }
@@ -26,8 +31,8 @@ public function getViewManagerConfig(): array
     {
         return [
             'template_map' => [
-                'laminas-developer-tools/toolbar/lmc-rbac' => __DIR__ . '/../view/laminas-developer-tools/toolbar/lmc-rbac.phtml'
-            ]
+                'laminas-developer-tools/toolbar/lmc-rbac' => __DIR__ . '/../view/laminas-developer-tools/toolbar/lmc-rbac.phtml',
+            ],
         ];
     }
 
@@ -36,10 +41,10 @@ public function getLaminasDeveloperToolsConfig(): array
         return [
             'profiler' => [
                 'collectors' => [
-                    'lmc_rbac' => \LmcRbac\Mvc\DevTools\Collector\RbacCollector::class,
+                    'lmc_rbac' => RbacCollector::class,
                 ],
             ],
-            'toolbar' => [
+            'toolbar'  => [
                 'entries' => [
                     'lmc_rbac' => 'laminas-developer-tools/toolbar/lmc-rbac',
                 ],
diff --git a/src/Module.php b/src/Module.php
index 5fc76a5..7bf4743 100644
--- a/src/Module.php
+++ b/src/Module.php
@@ -1,16 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LmcRbac\Mvc\DevTools;
 
 class Module
 {
-
     public function getConfig(): array
     {
         $configProvider = new ConfigProvider();
         return [
-            'service_manager' => $configProvider->getDependencies(),
-            'view_manager' => $configProvider->getViewManagerConfig(),
+            'service_manager'         => $configProvider->getDependencies(),
+            'view_manager'            => $configProvider->getViewManagerConfig(),
             'laminas-developer-tools' => $configProvider->getLaminasDeveloperToolsConfig(),
         ];
     }
diff --git a/test/Asset/MockRoleWithPermissionMethod.php b/test/Asset/MockRoleWithPermissionMethod.php
index cc2abc8..b0426b6 100644
--- a/test/Asset/MockRoleWithPermissionMethod.php
+++ b/test/Asset/MockRoleWithPermissionMethod.php
@@ -1,7 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LmcRbac\Mvc\DevToolsTest\Asset;
 
+use Lmc\Rbac\Permission\PermissionInterface;
 use Lmc\Rbac\Role\RoleInterface;
 
 class MockRoleWithPermissionMethod implements RoleInterface
@@ -15,6 +18,7 @@ public function getName(): string
     {
         return 'role-with-permission-method';
     }
+
     public function hasPermission($permission): bool
     {
         return false;
@@ -23,9 +27,8 @@ public function hasPermission($permission): bool
     /**
      * Add permission to the role.
      */
-    public function addPermission(string|\Lmc\Rbac\Permission\PermissionInterface $permission): void
+    public function addPermission(string|PermissionInterface $permission): void
     {
-
     }
 
     /**
@@ -33,7 +36,6 @@ public function addPermission(string|\Lmc\Rbac\Permission\PermissionInterface $p
      */
     public function addChild(RoleInterface $role): void
     {
-
     }
 
     /**
@@ -46,7 +48,7 @@ public function getChildren(): iterable
         return [];
     }
 
-    public function hasChildren() : bool
+    public function hasChildren(): bool
     {
         return false;
     }
diff --git a/test/Asset/MockRoleWithPermissionProperty.php b/test/Asset/MockRoleWithPermissionProperty.php
index f4d7284..3bc5612 100644
--- a/test/Asset/MockRoleWithPermissionProperty.php
+++ b/test/Asset/MockRoleWithPermissionProperty.php
@@ -1,7 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LmcRbac\Mvc\DevToolsTest\Asset;
 
+use Lmc\Rbac\Permission\PermissionInterface;
 use Lmc\Rbac\Role\RoleInterface;
 
 class MockRoleWithPermissionProperty implements RoleInterface
@@ -13,20 +16,20 @@ public function getName(): string
         return 'role-with-permission-property';
     }
 
-    public function hasPermission($permission): bool
+    public function hasPermission(string|PermissionInterface $permission): bool
     {
         return false;
     }
 
-    public function addPermission(string|\Lmc\Rbac\Permission\PermissionInterface $permission): void{
-        return;
+    public function addPermission(string|PermissionInterface $permission): void
+    {
     }
 
     /**
      * Add a child.
      */
-    public function addChild(RoleInterface $role): void{
-        return;
+    public function addChild(RoleInterface $role): void
+    {
     }
 
     /**
@@ -34,15 +37,16 @@ public function addChild(RoleInterface $role): void{
      *
      * @return RoleInterface[]
      */
-    public function getChildren(): iterable{
+    public function getChildren(): iterable
+    {
         return [];
     }
 
     /**
      * Get the children roles.
-     *
      */
     public function hasChildren(): bool
     {
         return false;
-    }}
+    }
+}
diff --git a/test/Asset/MockRoleWithPermissionTraversable.php b/test/Asset/MockRoleWithPermissionTraversable.php
index 8e50a8b..c7c7890 100644
--- a/test/Asset/MockRoleWithPermissionTraversable.php
+++ b/test/Asset/MockRoleWithPermissionTraversable.php
@@ -1,36 +1,39 @@
 <?php
 
+declare(strict_types=1);
 
 namespace LmcRbac\Mvc\DevToolsTest\Asset;
 
+use ArrayObject;
+use Lmc\Rbac\Permission\PermissionInterface;
 use Lmc\Rbac\Role\RoleInterface;
 
-
 class MockRoleWithPermissionTraversable implements RoleInterface
 {
-    public function getPermissions(): \ArrayObject
+    public function getPermissions(): ArrayObject
     {
-        return new \ArrayObject(['permission-method-a', 'permission-method-b']);
+        return new ArrayObject(['permission-method-a', 'permission-method-b']);
     }
 
     public function getName(): string
     {
         return 'role-with-permission-traversable';
     }
-    public function hasPermission($permission): bool
+
+    public function hasPermission(string|PermissionInterface $permission): bool
     {
         return false;
     }
 
-    public function addPermission(string|\Lmc\Rbac\Permission\PermissionInterface $permission): void{
-        return;
+    public function addPermission(string|PermissionInterface $permission): void
+    {
     }
 
     /**
      * Add a child.
      */
-    public function addChild(RoleInterface $role): void{
-        return;
+    public function addChild(RoleInterface $role): void
+    {
     }
 
     /**
@@ -38,14 +41,13 @@ public function addChild(RoleInterface $role): void{
      *
      * @return RoleInterface[]
      */
-    public function getChildren(): iterable{
+    public function getChildren(): iterable
+    {
         return [];
     }
 
     /**
      * Get the children roles.
-     *
-     * @return bool
      */
     public function hasChildren(): bool
     {
diff --git a/test/Bootstrap.php b/test/Bootstrap.php
index 05b8443..bdf0e97 100644
--- a/test/Bootstrap.php
+++ b/test/Bootstrap.php
@@ -16,14 +16,13 @@
  * and is licensed under the MIT license.
  */
 
-use Laminas\Mvc\Application;
 use LmcRbac\Mvc\DevToolsTest\Util\ServiceManagerFactory;
 
 ini_set('error_reporting', E_ALL);
 
 $files = [
     __DIR__ . '/../vendor/autoload.php',
-    __DIR__ . '/../../../autoload.php'
+    __DIR__ . '/../../../autoload.php',
 ];
 
 foreach ($files as $file) {
@@ -37,8 +36,6 @@
     throw new RuntimeException('vendor/autoload.php could not be found. Did you install via composer?');
 }
 
-//$loader->add('LmcRbac\\Mvc\\DevToolsTest\\', __DIR__);
-
 $config = require __DIR__ . '/TestConfiguration.php';
 ServiceManagerFactory::setApplicationConfig($config);
-unset($files, $file, $loader, $configFiles, $configFile, $config);
+unset($files, $file, $loader, $config);
diff --git a/test/Collector/RbacCollectorTest.php b/test/Collector/RbacCollectorTest.php
index d751a8f..a0629fc 100644
--- a/test/Collector/RbacCollectorTest.php
+++ b/test/Collector/RbacCollectorTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -16,65 +17,77 @@
  * and is licensed under the MIT license.
  */
 
+declare(strict_types=1);
+
 namespace LmcRbac\Mvc\DevToolsTest\Collector;
 
+use Laminas\Mvc\Application;
+use Laminas\Mvc\MvcEvent;
 use Laminas\ServiceManager\ServiceManager;
 use Lmc\Rbac\Identity\IdentityInterface;
-use LmcRbac\Mvc\DevToolsTest\Asset\MockRoleWithPermissionTraversable;
-use Lmc\Rbac\Role\RoleInterface;
-use Laminas\Mvc\MvcEvent;
-use LmcRbac\Mvc\DevTools\Collector\RbacCollector;
+use Lmc\Rbac\Mvc\Guard\ControllerGuard;
 use Lmc\Rbac\Mvc\Guard\GuardInterface;
+use Lmc\Rbac\Mvc\Guard\RouteGuard;
+use Lmc\Rbac\Mvc\Identity\IdentityProviderInterface;
 use Lmc\Rbac\Mvc\Options\ModuleOptions;
-use Lmc\Rbac\Role\InMemoryRoleProvider;
-use Lmc\Rbac\Mvc\Service\RoleService;
 use Lmc\Rbac\Mvc\Role\RecursiveRoleIteratorStrategy;
+use Lmc\Rbac\Mvc\Service\RoleService;
+use Lmc\Rbac\Role\InMemoryRoleProvider;
+use Lmc\Rbac\Role\RoleInterface;
+use Lmc\Rbac\Role\RoleProviderInterface;
+use Lmc\Rbac\Service\RoleService as BaseRoleService;
+use LmcRbac\Mvc\DevTools\Collector\RbacCollector;
 use LmcRbac\Mvc\DevToolsTest\Asset\MockRoleWithPermissionMethod;
 use LmcRbac\Mvc\DevToolsTest\Asset\MockRoleWithPermissionProperty;
-use Lmc\Rbac\Service\RoleService as BaseRoleService;
+use LmcRbac\Mvc\DevToolsTest\Asset\MockRoleWithPermissionTraversable;
+use PHPUnit\Framework\TestCase;
+
+use function serialize;
+use function unserialize;
 
 /**
  * @covers \LmcRbac\Mvc\DevTools\Collector\RbacCollector
  */
-class RbacCollectorTest extends \PHPUnit\Framework\TestCase
+class RbacCollectorTest extends TestCase
 {
     public function testDefaultGetterReturnValues(): void
     {
         $collector = new RbacCollector();
-
         $this->assertSame(-100, $collector->getPriority());
         $this->assertSame('lmc_rbac', $collector->getName());
     }
 
-    public function testSerialize()
+    public function testSerialize(): void
     {
         $collector  = new RbacCollector();
         $serialized = $collector->serialize();
-
         $this->assertIsString($serialized);
-
         $unserialized = unserialize($serialized);
-
         $this->assertSame([], $unserialized['guards']);
         $this->assertSame([], $unserialized['roles']);
         $this->assertSame([], $unserialized['options']);
     }
 
-    public function testUnserialize()
+    public function testUnserialize(): vois
     {
         $collector    = new RbacCollector();
         $unserialized = [
-            'guards'      => ['foo' => 'bar'],
-            'roles'       => ['foo' => 'bar'],
-            'permissions' => ['foo' => 'bar'],
-            'options'     => ['foo' => 'bar']
+            'guards'      => [
+                'foo' => 'bar',
+            ],
+            'roles'       => [
+                'foo' => 'bar',
+            ],
+            'permissions' => [
+                'foo' => 'bar',
+            ],
+            'options'     => [
+                'foo' => 'bar',
+            ],
         ];
         $serialized   = serialize($unserialized);
-
         $collector->unserialize($serialized);
-
         $collection = $collector->getCollection();
-
         $this->assertIsArray($collection);
         $this->assertSame(['foo' => 'bar'], $collection['guards']);
         $this->assertSame(['foo' => 'bar'], $collection['roles']);
@@ -82,58 +95,54 @@ public function testUnserialize()
         $this->assertSame(['foo' => 'bar'], $collection['permissions']);
     }
 
-    public function testUnserializeThrowsInvalidArgumentException()
+    public function testUnserializeThrowsInvalidArgumentException(): void
     {
         $this->expectException('InvalidArgumentException');
         $collector    = new RbacCollector();
         $unserialized = 'not_an_array';
         $serialized   = serialize($unserialized);
-
         $collector->unserialize($serialized);
     }
 
-
-    public function testCollectNothingIfNoApplicationIsSet()
+    public function testCollectNothingIfNoApplicationIsSet(): void
     {
         $mvcEvent  = new MvcEvent();
         $collector = new RbacCollector();
-
         $this->assertNull($collector->collect($mvcEvent));
     }
 
-    public function testCanCollect()
+    public function testCanCollect(): void
     {
         $dataToCollect = [
             'module_options' => [
                 'guest_role'        => 'guest',
                 'protection_policy' => GuardInterface::POLICY_ALLOW,
                 'guards'            => [
-                    'Lmc\Rbac\Mvc\Guard\RouteGuard' => [
-                        'admin*' => ['*']
+                    RouteGuard::class      => [
+                        'admin*' => ['*'],
                     ],
-                    'Lmc\Rbac\Mvc\Guard\ControllerGuard' => [
+                    ControllerGuard::class => [
                         [
                             'controller' => 'Foo',
-                            'roles'      => ['*']
-                        ]
-                    ]
-                ]
+                            'roles'      => ['*'],
+                        ],
+                    ],
+                ],
             ],
-            'role_config' => [
+            'role_config'    => [
                 'member' => [
                     'children'    => ['guest'],
-                    'permissions' => ['write', 'delete']
+                    'permissions' => ['write', 'delete'],
+                ],
+                'guest'  => [
+                    'permissions' => ['read'],
                 ],
-                'guest' => [
-                    'permissions' => ['read']
-                ]
             ],
-            'identity_role' => ['member']
+            'identity_role'  => ['member'],
         ];
 
-        //$serviceManager = $this->getMockBuilder('Laminas\ServiceManager\ServiceLocatorInterface')->getMock();
         $serviceManager = new ServiceManager();
-        $application = $this->getMockBuilder('Laminas\Mvc\Application')
+        $application    = $this->getMockBuilder(Application::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -145,14 +154,14 @@ public function testCanCollect()
         $identity = $this->createMock(IdentityInterface::class);
         $identity->expects($this->once())->method('getRoles')->willReturn($dataToCollect['identity_role']);
 
-        $identityProvider = $this->createMock(\Lmc\Rbac\Mvc\Identity\IdentityProviderInterface::class);
+        $identityProvider = $this->createMock(IdentityProviderInterface::class);
         $identityProvider->expects($this->once())->method('getIdentity')->willReturn($identity);
 
         $baseRoleService = new BaseRoleService(new InMemoryRoleProvider($dataToCollect['role_config']), 'guest');
-        $roleService = new RoleService($identityProvider, $baseRoleService, new RecursiveRoleIteratorStrategy());
+        $roleService     = new RoleService($identityProvider, $baseRoleService, new RecursiveRoleIteratorStrategy());
 
-        $serviceManager->setService('Lmc\Rbac\Mvc\Service\RoleService', $roleService);
-        $serviceManager->setService('Lmc\Rbac\Mvc\Options\ModuleOptions', new ModuleOptions($dataToCollect['module_options']));
+        $serviceManager->setService(RoleService::class, $roleService);
+        $serviceManager->setService(ModuleOptions::class, new ModuleOptions($dataToCollect['module_options']));
         $collector = new RbacCollector();
         $collector->collect($mvcEvent);
 
@@ -160,27 +169,27 @@ public function testCanCollect()
         $collection = $collector->getCollection();
 
         $expectedCollection = [
-            'guards' => [
-                'Lmc\Rbac\Mvc\Guard\RouteGuard' => [
-                    'admin*' => ['*']
+            'guards'      => [
+                RouteGuard::class      => [
+                    'admin*' => ['*'],
                 ],
-                'Lmc\Rbac\Mvc\Guard\ControllerGuard' => [
+                ControllerGuard::class => [
                     [
                         'controller' => 'Foo',
-                        'roles'      => ['*']
-                    ]
-                ]
+                        'roles'      => ['*'],
+                    ],
+                ],
             ],
-            'roles'  => [
-                'member' => ['guest']
+            'roles'       => [
+                'member' => ['guest'],
             ],
             'permissions' => [
                 'member' => ['write', 'delete'],
-                'guest'  => ['read']
+                'guest'  => ['read'],
             ],
-            'options' => [
+            'options'     => [
                 'guest_role'        => 'guest',
-                'protection_policy' => 'allow'
+                'protection_policy' => 'allow',
             ],
         ];
 
@@ -190,16 +199,16 @@ public function testCanCollect()
     /**
      * Tests the collectPermissions method when the role has a $permissions Property
      */
-    public function testCollectPermissionsProperty()
+    public function testCollectPermissionsProperty(): void
     {
         $expectedCollection = [
-            'guards' => [],
-            'roles'  => ['role-with-permission-property'],
+            'guards'      => [],
+            'roles'       => ['role-with-permission-property'],
             'permissions' => [
                 'role-with-permission-property' => ['permission-property-a', 'permission-property-b'],
             ],
-            'options' => [
-                'guest_role' => 'guest',
+            'options'     => [
+                'guest_role'        => 'guest',
                 'protection_policy' => GuardInterface::POLICY_ALLOW,
             ],
         ];
@@ -211,16 +220,16 @@ public function testCollectPermissionsProperty()
     /**
      * Tests the collectPermissions method when the role has a getPermissions() method
      */
-    public function testCollectPermissionsMethod()
+    public function testCollectPermissionsMethod(): void
     {
         $expectedCollection = [
-            'guards' => [],
-            'roles'  => ['role-with-permission-method'],
+            'guards'      => [],
+            'roles'       => ['role-with-permission-method'],
             'permissions' => [
                 'role-with-permission-method' => ['permission-method-a', 'permission-method-b'],
             ],
-            'options' => [
-                'guest_role' => 'guest',
+            'options'     => [
+                'guest_role'        => 'guest',
                 'protection_policy' => GuardInterface::POLICY_ALLOW,
             ],
         ];
@@ -232,16 +241,16 @@ public function testCollectPermissionsMethod()
     /**
      * Tests the collectPermissions method when the role implements Traversable
      */
-    public function testCollectPermissionsTraversable()
+    public function testCollectPermissionsTraversable(): void
     {
         $expectedCollection = [
-            'guards' => [],
-            'roles'  => ['role-with-permission-traversable'],
+            'guards'      => [],
+            'roles'       => ['role-with-permission-traversable'],
             'permissions' => [
                 'role-with-permission-traversable' => ['permission-method-a', 'permission-method-b'],
             ],
-            'options' => [
-                'guest_role' => 'guest',
+            'options'     => [
+                'guest_role'        => 'guest',
                 'protection_policy' => GuardInterface::POLICY_ALLOW,
             ],
         ];
@@ -250,17 +259,16 @@ public function testCollectPermissionsTraversable()
         $this->assertEquals($expectedCollection, $collection);
     }
 
-
     /**
      * Base method for the *collectPermissionProperty tests
-     * @param RoleInterface $role
+     *
      * @return array|string[]
      */
     private function collectPermissionsPropertyTestBase(RoleInterface $role): array
     {
         $serviceManager = new ServiceManager();
 
-        $application = $this->getMockBuilder(\Laminas\Mvc\Application::class)
+        $application = $this->getMockBuilder(Application::class)
             ->disableOriginalConstructor()
             ->getMock();
         $application->expects($this->once())->method('getServiceManager')->willReturn($serviceManager);
@@ -268,17 +276,17 @@ private function collectPermissionsPropertyTestBase(RoleInterface $role): array
         $mvcEvent = new MvcEvent();
         $mvcEvent->setApplication($application);
 
-        $identity = $this->createMock(\Lmc\Rbac\Identity\IdentityInterface::class);
+        $identity = $this->createMock(IdentityInterface::class);
         $identity->expects($this->once())
             ->method('getRoles')
             ->willReturn([$role]);
 
-        $identityProvider = $this->createMock(\Lmc\Rbac\Mvc\Identity\IdentityProviderInterface::class);
+        $identityProvider = $this->createMock(IdentityProviderInterface::class);
         $identityProvider->expects($this->once())
             ->method('getIdentity')
             ->will($this->returnValue($identity));
 
-        $roleProvider = $this->createMock(\Lmc\Rbac\Role\RoleProviderInterface::class);
+        $roleProvider = $this->createMock(RoleProviderInterface::class);
 
         $baseRoleService = new BaseRoleService($roleProvider, '');
 
@@ -287,8 +295,8 @@ private function collectPermissionsPropertyTestBase(RoleInterface $role): array
             $baseRoleService,
             new RecursiveRoleIteratorStrategy()
         );
-        $serviceManager->setService('Lmc\Rbac\Mvc\Service\RoleService', $roleService);
-        $serviceManager->setService('Lmc\Rbac\Mvc\Options\ModuleOptions', new ModuleOptions());
+        $serviceManager->setService(RoleService::class, $roleService);
+        $serviceManager->setService(ModuleOptions::class, new ModuleOptions());
         $collector = new RbacCollector();
         $collector->collect($mvcEvent);
 
diff --git a/test/ConfigProviderTest.php b/test/ConfigProviderTest.php
index fbc17b5..040616c 100644
--- a/test/ConfigProviderTest.php
+++ b/test/ConfigProviderTest.php
@@ -1,10 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LmcRbac\Mvc\DevToolsTest;
 
+use Laminas\ServiceManager\Factory\InvokableFactory;
+use LmcRbac\Mvc\DevTools\Collector\RbacCollector;
 use LmcRbac\Mvc\DevTools\ConfigProvider;
 use PHPUnit\Framework\TestCase;
 
+use function realpath;
+
 /**
  * @covers \LmcRbac\Mvc\DevTools\ConfigProvider
  */
@@ -12,25 +18,25 @@ class ConfigProviderTest extends TestCase
 {
     public function testProvidesExpectedConfig()
     {
-        $provider = new ConfigProvider();
-        $expectedDependencyConfig = [
+        $provider                      = new ConfigProvider();
+        $expectedDependencyConfig      = [
             'factories' => [
-                \LmcRbac\Mvc\DevTools\Collector\RbacCollector::class => \Laminas\ServiceManager\Factory\InvokableFactory::class,
+                RbacCollector::class => InvokableFactory::class,
             ],
         ];
         $expectedLaminasDevtoolsConfig = [
             'profiler' => [
                 'collectors' => [
-                    'lmc_rbac' => \LmcRbac\Mvc\DevTools\Collector\RbacCollector::class,
+                    'lmc_rbac' => RbacCollector::class,
                 ],
             ],
-            'toolbar' => [
+            'toolbar'  => [
                 'entries' => [
                     'lmc_rbac' => 'laminas-developer-tools/toolbar/lmc-rbac',
                 ],
             ],
         ];
-        $expectedViewManagerConfig = [
+        $expectedViewManagerConfig     = [
             'template_map' => [
                 'laminas-developer-tools/toolbar/lmc-rbac' => realpath(__DIR__ . '/../view/laminas-developer-tools/toolbar/lmc-rbac.phtml'),
             ],
@@ -43,14 +49,14 @@ public function testProvidesExpectedConfig()
                 'laminas-developer-tools/toolbar/lmc-rbac' => realpath(__DIR__ . '/../view/laminas-developer-tools/toolbar/lmc-rbac.phtml'),
             ],
         ];
-        $result = $provider->getViewManagerConfig();
+        $result                    = $provider->getViewManagerConfig();
         // substitute path
         $result['template_map']['laminas-developer-tools/toolbar/lmc-rbac'] = realpath($result['template_map']['laminas-developer-tools/toolbar/lmc-rbac']);
         $this->assertEquals($expectedViewManagerConfig, $result);
 
         $expectedConfig = [
-            'dependencies' => $expectedDependencyConfig,
-            'view_manager' => $expectedViewManagerConfig,
+            'dependencies'            => $expectedDependencyConfig,
+            'view_manager'            => $expectedViewManagerConfig,
             'laminas-developer-tools' => $expectedLaminasDevtoolsConfig,
         ];
 
diff --git a/test/ModuleTest.php b/test/ModuleTest.php
index 0b13c1e..67cfd19 100644
--- a/test/ModuleTest.php
+++ b/test/ModuleTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LmcRbac\Mvc\DevToolsTest;
 
 use LmcRbac\Mvc\DevTools\ConfigProvider;
@@ -14,10 +16,10 @@ class ModuleTest extends TestCase
     public function testModule(): void
     {
         $provider = new ConfigProvider();
-        $module = new Module();
+        $module   = new Module();
         $expected = [
-            'service_manager' => $provider->getDependencies(),
-            'view_manager' => $provider->getViewManagerConfig(),
+            'service_manager'         => $provider->getDependencies(),
+            'view_manager'            => $provider->getViewManagerConfig(),
             'laminas-developer-tools' => $provider->getLaminasDeveloperToolsConfig(),
         ];
         $this->assertEquals($expected, $module->getConfig());
diff --git a/test/TestConfiguration.php b/test/TestConfiguration.php
index 6cb5e6a..7d336fd 100644
--- a/test/TestConfiguration.php
+++ b/test/TestConfiguration.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -17,14 +20,13 @@
  */
 
 return [
-    'modules' => [
-        'LmcRbacMvc',
+    'modules'                 => [
+        'Lmc\Rbac\Mvc',
     ],
     'module_listener_options' => [
         'config_glob_paths' => [
             __DIR__ . '/testing.config.php',
         ],
-        'module_paths' => [
-        ],
+        'module_paths'      => [],
     ],
 ];
diff --git a/test/Util/ServiceManagerFactory.php b/test/Util/ServiceManagerFactory.php
index 17823f7..4a9b8df 100644
--- a/test/Util/ServiceManagerFactory.php
+++ b/test/Util/ServiceManagerFactory.php
@@ -1,20 +1,23 @@
 <?php
+
 /*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license.
- */
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* This software consists of voluntary contributions made by many individuals
+* and is licensed under the MIT license.
+*/
+
+declare(strict_types=1);
 
 namespace LmcRbac\Mvc\DevToolsTest\Util;
 
@@ -24,15 +27,10 @@
 
 /**
  * Base test case to be used when a new service manager instance is required
- *
- * @license MIT
- * @author  Marco Pivetta <ocramius@gmail.com>
  */
 abstract class ServiceManagerFactory
 {
-    /**
-     * @var array
-     */
+    /** @var array */
     private static array $config = [];
 
     /**
@@ -55,20 +53,19 @@ public static function getApplicationConfig(): array
 
     /**
      * @param array|null $config
-     * @return ServiceManager
      */
-    public static function getServiceManager(array $config = null): ServiceManager
+    public static function getServiceManager(?array $config = null): ServiceManager
     {
-        $config = $config ?: static::getApplicationConfig();
+        $config               = $config ?: static::getApplicationConfig();
         $serviceManagerConfig = new ServiceManagerConfig(
             $config['service_manager'] ?? []
         );
-        $serviceManager = new ServiceManager();
+        $serviceManager       = new ServiceManager();
         $serviceManagerConfig->configureServiceManager($serviceManager);
         $serviceManager->setService('ApplicationConfig', $config);
         $serviceManager->setAllowOverride(true);
 
-        /* @var $moduleManager ModuleManagerInterface */
+        /** @var ModuleManagerInterface $moduleManager */
         $moduleManager = $serviceManager->get('ModuleManager');
 
         $moduleManager->loadModules();