Fix newly surfaced psalm issues, improve type inference, reset baseline

Signed-off-by: George Steel <[email protected]>
mezzio · Dec 1, 2022 · 11f46a1 · 11f46a1
1 parent c767c55
commit 11f46a1
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 47 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,57 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.29.0@7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3">
-  <file src="src/ConfigProvider.php">
-    <MixedArrayOffset occurrences="1"/>
-    <UndefinedClass occurrences="1">
-      <code>ZendAcl</code>
-    </UndefinedClass>
-  </file>
+<files psalm-version="5.0.0@4e177bf0c9f03c17d2fbfd83b7cc9c47605274d8">
   <file src="src/LaminasAcl.php">
-    <MixedArgument occurrences="1">
-      <code>$routeName</code>
-    </MixedArgument>
-    <MixedAssignment occurrences="2">
+    <PossiblyFalseArgument occurrences="1">
       <code>$routeName</code>
-      <code>$routeResult</code>
-    </MixedAssignment>
-    <MixedMethodCall occurrences="2">
-      <code>getMatchedRouteName</code>
-      <code>isFailure</code>
-    </MixedMethodCall>
+    </PossiblyFalseArgument>
   </file>
   <file src="src/LaminasAclFactory.php">
     <InvalidCatch occurrences="4"/>
-    <InvalidScalarArgument occurrences="4">
-      <code>$e-&gt;getCode()</code>
-      <code>$e-&gt;getCode()</code>
-      <code>$e-&gt;getCode()</code>
-      <code>$e-&gt;getCode()</code>
-    </InvalidScalarArgument>
-    <MixedArgument occurrences="8">
+    <MixedArgument occurrences="4">
       <code>$config['allow'] ?? []</code>
       <code>$config['deny'] ?? []</code>
       <code>$config['resources']</code>
       <code>$config['roles']</code>
-      <code>$parent</code>
-      <code>$parent</code>
-      <code>$parents</code>
-      <code>$resource</code>
     </MixedArgument>
-    <MixedArgumentTypeCoercion occurrences="1">
-      <code>$role</code>
-    </MixedArgumentTypeCoercion>
     <MixedArrayAccess occurrences="4">
       <code>$config['allow']</code>
       <code>$config['deny']</code>
       <code>$config['resources']</code>
       <code>$config['roles']</code>
     </MixedArrayAccess>
-    <MixedAssignment occurrences="5">
+    <MixedAssignment occurrences="1">
       <code>$config</code>
-      <code>$parent</code>
-      <code>$parents</code>
-      <code>$resource</code>
-      <code>$resources</code>
     </MixedAssignment>
   </file>
   <file src="test/ConfigProviderTest.php">
@@ -65,12 +34,15 @@
     <MixedArgumentTypeCoercion occurrences="1">
       <code>$dependencies</code>
     </MixedArgumentTypeCoercion>
-    <MixedArrayAccess occurrences="2">
+    <MixedArrayAccess occurrences="4">
       <code>$json['packages']</code>
       <code>$package['extra']</code>
+      <code>$package['extra']['laminas']</code>
+      <code>$package['extra']['laminas']['config-provider']</code>
     </MixedArrayAccess>
-    <MixedArrayAssignment occurrences="1">
+    <MixedArrayAssignment occurrences="2">
       <code>$config['dependencies']['services']</code>
+      <code>$config['dependencies']['services']['config']</code>
     </MixedArrayAssignment>
     <MixedAssignment occurrences="2">
       <code>$json</code>

diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
@@ -4,8 +4,6 @@
 
 namespace Mezzio\Authorization\Acl;
 
-use Zend\Expressive\Authorization\Acl\ZendAcl;
-
 class ConfigProvider
 {
     public function __invoke(): array
@@ -20,7 +18,7 @@ public function getDependencies(): array
         return [
             // Legacy Zend Framework aliases
             'aliases'   => [
-                ZendAcl::class => LaminasAcl::class,
+                'Zend\Expressive\Authorization\Acl\ZendAcl' => LaminasAcl::class,
             ],
             'factories' => [
                 LaminasAcl::class => LaminasAclFactory::class,

diff --git a/src/LaminasAcl.php b/src/LaminasAcl.php
@@ -29,7 +29,7 @@ public function __construct(Acl $acl)
     public function isGranted(string $role, ServerRequestInterface $request): bool
     {
         $routeResult = $request->getAttribute(RouteResult::class, false);
-        if (false === $routeResult) {
+        if (! $routeResult instanceof RouteResult) {
             throw new Exception\RuntimeException(sprintf(
                 'The %s attribute is missing in the request; cannot perform ACL authorization checks',
                 RouteResult::class

diff --git a/src/LaminasAclFactory.php b/src/LaminasAclFactory.php
@@ -6,6 +6,8 @@
 
 use Laminas\Permissions\Acl\Acl;
 use Laminas\Permissions\Acl\Exception\ExceptionInterface as AclExceptionInterface;
+use Laminas\Permissions\Acl\Resource\ResourceInterface;
+use Laminas\Permissions\Acl\Role\RoleInterface;
 use Mezzio\Authorization\AuthorizationInterface;
 use Mezzio\Authorization\Exception;
 use Psr\Container\ContainerInterface;
@@ -49,6 +51,7 @@ public function __invoke(ContainerInterface $container): AuthorizationInterface
 
     /**
      * @throws Exception\InvalidConfigException
+     * @param array<string, list<RoleInterface|string>> $roles
      */
     private function injectRoles(Acl $acl, array $roles): void
     {
@@ -58,34 +61,36 @@ private function injectRoles(Acl $acl, array $roles): void
                     try {
                         $acl->addRole($parent);
                     } catch (AclExceptionInterface $e) {
-                        throw new Exception\InvalidConfigException($e->getMessage(), $e->getCode(), $e);
+                        throw new Exception\InvalidConfigException($e->getMessage(), (int) $e->getCode(), $e);
                     }
                 }
             }
             try {
                 $acl->addRole($role, $parents);
             } catch (AclExceptionInterface $e) {
-                throw new Exception\InvalidConfigException($e->getMessage(), $e->getCode(), $e);
+                throw new Exception\InvalidConfigException($e->getMessage(), (int) $e->getCode(), $e);
             }
         }
     }
 
     /**
      * @throws Exception\InvalidConfigException
+     * @param list<ResourceInterface|string> $resources
      */
     private function injectResources(Acl $acl, array $resources): void
     {
         foreach ($resources as $resource) {
             try {
                 $acl->addResource($resource);
             } catch (AclExceptionInterface $e) {
-                throw new Exception\InvalidConfigException($e->getMessage(), $e->getCode(), $e);
+                throw new Exception\InvalidConfigException($e->getMessage(), (int) $e->getCode(), $e);
             }
         }
     }
 
     /**
      * @throws Exception\InvalidConfigException
+     * @param array<string, ResourceInterface|string|list<ResourceInterface|string>> $permissions
      */
     private function injectPermissions(Acl $acl, array $permissions, string $type): void
     {
@@ -98,9 +103,11 @@ private function injectPermissions(Acl $acl, array $permissions, string $type):
 
         foreach ($permissions as $role => $resources) {
             try {
-                $acl->$type($role, $resources);
+                $type === 'allow'
+                    ? $acl->allow($role, $resources)
+                    : $acl->deny($role, $resources);
             } catch (AclExceptionInterface $e) {
-                throw new Exception\InvalidConfigException($e->getMessage(), $e->getCode(), $e);
+                throw new Exception\InvalidConfigException($e->getMessage(), (int) $e->getCode(), $e);
             }
         }
     }