Merge pull request #81 from visto9259/2.0.x

Added Psalm and Laminas coding standard
LM-Commons · Aug 16, 2024 · 79bdf0e · 79bdf0e
2 parents 9ca20d6 + e32a75a
commit 79bdf0e
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 78 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -3,20 +3,16 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         bootstrap="./vendor/autoload.php"
         colors="true"
-        stopOnFailure="false"
-        processIsolation="false"
-        backupGlobals="false"
         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
         cacheDirectory=".phpunit.cache"
-        displayDetailsOnTestsThatTriggerDeprecations="false"
 >
   <testsuite name="LmcRbac tests">
     <directory>./test</directory>
   </testsuite>
   <logging/>
   <source>
     <include>
-      <directory suffix=".php">./src</directory>
+      <directory>./src</directory>
     </include>
   </source>
 </phpunit>
diff --git a/src/Exception/UnauthorizedException.php b/src/Exception/UnauthorizedException.php
diff --git a/src/Exception/UnauthorizedExceptionInterface.php b/src/Exception/UnauthorizedExceptionInterface.php
diff --git a/src/Service/RoleServiceFactory.php b/src/Service/RoleServiceFactory.php
@@ -23,6 +23,7 @@
 
 use Laminas\ServiceManager\Exception\ServiceNotCreatedException;
 use Lmc\Rbac\Options\ModuleOptions;
+use Lmc\Rbac\Role\RoleProviderInterface;
 use Psr\Container\ContainerInterface;
 
 /**
@@ -44,9 +45,13 @@ public function __invoke(ContainerInterface $container): RoleService
         }
 
         $roleProviderName = key($roleProvider);
+        $roleProvider = $container->get($roleProviderName);
+        if (! $roleProvider instanceof RoleProviderInterface) {
+            throw new ServiceNotCreatedException(sprintf('Class %s does not implement LmcRbac\Role\RoleProviderInterface', $roleProviderName));
+        }
 
         return new RoleService(
-            $container->get($roleProviderName),
+            $roleProvider,
             $moduleOptions->getGuestRole()
         );
     }

diff --git a/test/ConfigProviderTest.php b/test/ConfigProviderTest.php
@@ -19,7 +19,7 @@
 
 declare(strict_types=1);
 
-namespace LmcRbacTest;
+namespace LmcTest;
 
 use Lmc\Rbac\ConfigProvider;
 use PHPUnit\Framework\Attributes\CoversClass;

diff --git a/test/ModuleTest.php b/test/ModuleTest.php
@@ -19,7 +19,7 @@
 
 declare(strict_types=1);
 
-namespace LmcRbacTest;
+namespace LmcTest;
 
 use Lmc\Rbac\ConfigProvider;
 use Lmc\Rbac\Module;

diff --git a/test/Service/RoleServiceFactoryTest.php b/test/Service/RoleServiceFactoryTest.php
@@ -72,4 +72,26 @@ public function testThrowExceptionIfNoRoleProvider(): void
         $factory = new RoleServiceFactory();
         $factory($container);
     }
+
+    public function testThrowExceptionIfInvalidRoleProvider(): void
+    {
+        $this->expectException(\Laminas\ServiceManager\Exception\ServiceNotCreatedException::class);
+
+        $options = new ModuleOptions([
+            'guest_role' => 'guest',
+            'role_provider' => [
+                'InvalidRoleProvider' => [],
+            ],
+        ]);
+
+        $container = new ServiceManager(['services' => [
+            ModuleOptions::class => $options,
+            'InvalidRoleProvider' => function () {
+                return new \stdClass();
+            }
+        ]]);
+
+        $factory = new RoleServiceFactory();
+        $factory($container);
+    }
 }