Merge pull request #43 from snapshotpl/php-8.1

Allow php 8.1
laminas-api-tools · Jun 3, 2022 · 318e102 · 318e102
2 parents eff894a + 4d53947
commit 318e102
Show file tree

Hide file tree

Showing 59 changed files with 198 additions and 85 deletions.
diff --git a/composer.json b/composer.json
@@ -17,15 +17,18 @@
         "forum": "https://discourse.laminas.dev"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     },
     "extra": {
         "laminas": {
             "module": "Laminas\\ApiTools\\MvcAuth"
         }
     },
     "require": {
-        "php": "^7.3 || ~8.0.0",
+        "php": "^7.3 || ~8.0.0 || ~8.1.0",
         "laminas-api-tools/api-tools-api-problem": "^1.4.0",
         "laminas-api-tools/api-tools-content-negotiation": "^1.5.0",
         "laminas-api-tools/api-tools-oauth2": "^1.7",
@@ -34,13 +37,13 @@
         "laminas/laminas-http": "^2.5.4",
         "laminas/laminas-mvc": "^2.7.9 || ^3.0.2",
         "laminas/laminas-permissions-acl": "^2.6",
-        "laminas/laminas-permissions-rbac": "^2.5.1 || ^3.0",
+        "laminas/laminas-permissions-rbac": "^2.6.0 || ^3.0",
         "laminas/laminas-servicemanager": "^2.7.6 || ^3.1",
         "laminas/laminas-stdlib": "^2.7.8 || ^3.0.1",
         "laminas/laminas-zendframework-bridge": "^1.1"
     },
     "require-dev": {
-        "laminas/laminas-coding-standard": "~2.2.0",
+        "laminas/laminas-coding-standard": "~2.3.0",
         "laminas/laminas-session": "^2.8.5",
         "phpspec/prophecy-phpunit": "^2.0",
         "phpunit/phpunit": "^9.3",
@@ -64,6 +67,7 @@
         ],
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
+        "static-analysis": "psalm --shepherd --stats",
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/config/module.config.php b/config/module.config.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth;
 
 use Laminas\Authentication\Storage\NonPersistent;

diff --git a/src/Authentication/AbstractAdapter.php b/src/Authentication/AbstractAdapter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Authentication;
 
 use Laminas\Http\Request;

diff --git a/src/Authentication/AdapterInterface.php b/src/Authentication/AdapterInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Authentication;
 
 use Laminas\ApiTools\MvcAuth\Identity\IdentityInterface;

diff --git a/src/Authentication/DefaultAuthenticationListener.php b/src/Authentication/DefaultAuthenticationListener.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Authentication;
 
 use InvalidArgumentException;

diff --git a/src/Authentication/DefaultAuthenticationPostListener.php b/src/Authentication/DefaultAuthenticationPostListener.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Authentication;
 
 use Laminas\ApiTools\MvcAuth\MvcAuthEvent;

diff --git a/src/Authentication/HttpAdapter.php b/src/Authentication/HttpAdapter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Authentication;
 
 use Laminas\ApiTools\MvcAuth\Identity;

diff --git a/src/Authentication/OAuth2Adapter.php b/src/Authentication/OAuth2Adapter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Authentication;
 
 use Laminas\ApiTools\MvcAuth\Identity;

diff --git a/src/Authorization/AclAuthorization.php b/src/Authorization/AclAuthorization.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Authorization;
 
 use Laminas\ApiTools\MvcAuth\Identity\IdentityInterface;

diff --git a/src/Authorization/AclAuthorizationFactory.php b/src/Authorization/AclAuthorizationFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Authorization;
 
 use function array_key_exists;

diff --git a/src/Authorization/AuthorizationInterface.php b/src/Authorization/AuthorizationInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Authorization;
 
 use Laminas\ApiTools\MvcAuth\Identity\IdentityInterface;

diff --git a/src/Authorization/DefaultAuthorizationListener.php b/src/Authorization/DefaultAuthorizationListener.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Authorization;
 
 use Laminas\ApiTools\MvcAuth\Identity\IdentityInterface;

diff --git a/src/Authorization/DefaultAuthorizationPostListener.php b/src/Authorization/DefaultAuthorizationPostListener.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Authorization;
 
 use Laminas\ApiTools\MvcAuth\MvcAuthEvent;

diff --git a/src/Authorization/DefaultResourceResolverListener.php b/src/Authorization/DefaultResourceResolverListener.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Authorization;
 
 use InvalidArgumentException;

diff --git a/src/Factory/AclAuthorizationFactory.php b/src/Factory/AclAuthorizationFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Factory;
 
 use Interop\Container\ContainerInterface;

diff --git a/src/Factory/ApacheResolverFactory.php b/src/Factory/ApacheResolverFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Factory;
 
 use Interop\Container\ContainerInterface;

diff --git a/src/Factory/AuthenticationAdapterDelegatorFactory.php b/src/Factory/AuthenticationAdapterDelegatorFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Factory;
 
 use Interop\Container\ContainerInterface;

diff --git a/src/Factory/AuthenticationHttpAdapterFactory.php b/src/Factory/AuthenticationHttpAdapterFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Factory;
 
 use Interop\Container\ContainerInterface;

diff --git a/src/Factory/AuthenticationOAuth2AdapterFactory.php b/src/Factory/AuthenticationOAuth2AdapterFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Factory;
 
 use Interop\Container\ContainerInterface;

diff --git a/src/Factory/AuthenticationServiceFactory.php b/src/Factory/AuthenticationServiceFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Factory;
 
 use Interop\Container\ContainerInterface;

diff --git a/src/Factory/DefaultAuthHttpAdapterFactory.php b/src/Factory/DefaultAuthHttpAdapterFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Factory;
 
 use Interop\Container\ContainerInterface;

diff --git a/src/Factory/DefaultAuthenticationListenerFactory.php b/src/Factory/DefaultAuthenticationListenerFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Factory;
 
 use Interop\Container\ContainerInterface;

diff --git a/src/Factory/DefaultAuthorizationListenerFactory.php b/src/Factory/DefaultAuthorizationListenerFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Factory;
 
 use Interop\Container\ContainerInterface;

diff --git a/src/Factory/DefaultResourceResolverListenerFactory.php b/src/Factory/DefaultResourceResolverListenerFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Factory;
 
 use Interop\Container\ContainerInterface;

diff --git a/src/Factory/FileResolverFactory.php b/src/Factory/FileResolverFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Factory;
 
 use Interop\Container\ContainerInterface;

diff --git a/src/Factory/HttpAdapterFactory.php b/src/Factory/HttpAdapterFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Factory;
 
 use Interop\Container\ContainerInterface;

diff --git a/src/Factory/NamedOAuth2ServerFactory.php b/src/Factory/NamedOAuth2ServerFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Factory;
 
 use Interop\Container\ContainerInterface;

diff --git a/src/Factory/OAuth2ServerFactory.php b/src/Factory/OAuth2ServerFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Factory;
 
 use Interop\Container\ContainerInterface;

diff --git a/src/Identity/AuthenticatedIdentity.php b/src/Identity/AuthenticatedIdentity.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Identity;
 
 use Laminas\Permissions\Rbac\Role;

diff --git a/src/Identity/GuestIdentity.php b/src/Identity/GuestIdentity.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Identity;
 
 use Laminas\Permissions\Rbac\Role;

diff --git a/src/Identity/IdentityInterface.php b/src/Identity/IdentityInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Identity;
 
 use Laminas\Permissions\Acl\Role\RoleInterface as AclRoleInterface;

diff --git a/src/Identity/IdentityPlugin.php b/src/Identity/IdentityPlugin.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth\Identity;
 
 use Laminas\Mvc\Controller\Plugin\AbstractPlugin;

diff --git a/src/Module.php b/src/Module.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth;
 
 use Laminas\ApiTools\MvcAuth\Authentication\DefaultAuthenticationListener;

diff --git a/src/MvcAuthEvent.php b/src/MvcAuthEvent.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth;
 
 use Laminas\ApiTools\MvcAuth\Identity\IdentityInterface;

diff --git a/src/MvcRouteListener.php b/src/MvcRouteListener.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\MvcAuth;
 
 use Laminas\Authentication\AuthenticationService;

diff --git a/test/Authentication/DefaultAuthenticationPostListenerTest.php b/test/Authentication/DefaultAuthenticationPostListenerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\ApiTools\MvcAuth\Authentication;
 
 use Laminas\ApiTools\MvcAuth\Authentication\DefaultAuthenticationPostListener;

diff --git a/test/Authentication/HttpAdapterTest.php b/test/Authentication/HttpAdapterTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\ApiTools\MvcAuth\Authentication;
 
 use Laminas\ApiTools\MvcAuth\Authentication\HttpAdapter;

diff --git a/test/Authentication/OAuth2AdapterTest.php b/test/Authentication/OAuth2AdapterTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\ApiTools\MvcAuth\Authentication;
 
 use ArrayIterator;

diff --git a/test/Authorization/AclAuthorizationFactoryTest.php b/test/Authorization/AclAuthorizationFactoryTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\ApiTools\MvcAuth\Authorization;
 
 use Laminas\ApiTools\MvcAuth\Authorization\AclAuthorization;

diff --git a/test/Authorization/DefaultAuthorizationListenerTest.php b/test/Authorization/DefaultAuthorizationListenerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\ApiTools\MvcAuth\Authorization;
 
 use Laminas\ApiTools\MvcAuth\Authorization\AclAuthorization;

diff --git a/test/Authorization/DefaultAuthorizationPostListenerTest.php b/test/Authorization/DefaultAuthorizationPostListenerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\ApiTools\MvcAuth\Authorization;
 
 use Laminas\ApiTools\MvcAuth\Authorization\AuthorizationInterface;

diff --git a/test/Authorization/DefaultResourceResolverListenerTest.php b/test/Authorization/DefaultResourceResolverListenerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\ApiTools\MvcAuth\Authorization;
 
 use Laminas\ApiTools\MvcAuth\Authorization\AuthorizationInterface;

diff --git a/test/Factory/AclAuthorizationFactoryTest.php b/test/Factory/AclAuthorizationFactoryTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\ApiTools\MvcAuth\Factory;
 
 use Laminas\ApiTools\MvcAuth\Authorization\AclAuthorization;

diff --git a/test/Factory/AuthenticationAdapterDelegatorFactoryTest.php b/test/Factory/AuthenticationAdapterDelegatorFactoryTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\ApiTools\MvcAuth\Factory;
 
 use Laminas\ApiTools\MvcAuth\Authentication\DefaultAuthenticationListener;

diff --git a/test/Factory/AuthenticationHttpAdapterFactoryTest.php b/test/Factory/AuthenticationHttpAdapterFactoryTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\ApiTools\MvcAuth\Factory;
 
 use Laminas\ApiTools\MvcAuth\Authentication\HttpAdapter;