Merge branch 'master' into release-1.1.0

Module.php

@@ -2,10 +2,10 @@
 
 namespace UnicaenAuthentification;
 
-use Zend\EventManager\EventInterface;
-use Zend\ModuleManager\Feature\AutoloaderProviderInterface;
-use Zend\ModuleManager\Feature\ConfigProviderInterface;
-use Zend\ModuleManager\Feature\ServiceProviderInterface;
+use Laminas\EventManager\EventInterface;
+use Laminas\ModuleManager\Feature\AutoloaderProviderInterface;
+use Laminas\ModuleManager\Feature\ConfigProviderInterface;
+use Laminas\ModuleManager\Feature\ServiceProviderInterface;
 
 /**
  * Point d'entrée du module d'authentification Unicaen.
@@ -30,7 +30,7 @@ class Module implements AutoloaderProviderInterface, ConfigProviderInterface, Se
     public function getAutoloaderConfig()
     {
         return [
-            'Zend\Loader\StandardAutoloader' => [
+            'Laminas\Loader\StandardAutoloader' => [
                 'namespaces' => [
                     __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
                 ],

composer.json

@@ -8,10 +8,11 @@
         }
     ],
     "require": {
-        "unicaen/app":                                  "^3.0",
-        "unicaen/bjy-authorize":                        "^3.0",
+        "unicaen/app": "^4.0.3",
+        "unicaen/bjy-authorize": "^4.0",
         "jasig/phpcas": "^1.3",
-        "ramsey/uuid":                                  "^3.7"
+        "ramsey/uuid": "^3.7",
+        "laminas/laminas-dependency-plugin": "^2.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.6"

config/module.config.php

@@ -60,8 +60,8 @@ use UnicaenPrivilege\Guard\PrivilegeControllerFactory;
 use UnicaenPrivilege\Guard\PrivilegeRoute;
 use UnicaenPrivilege\Guard\PrivilegeRouteFactory;
 use UnicaenPrivilege\Provider\Rule\PrivilegeRuleProviderFactory;
-use Zend\Authentication\AuthenticationService;
-use Zend\ServiceManager\Proxy\LazyServiceFactory;
+use Laminas\Authentication\AuthenticationService;
+use Laminas\ServiceManager\Proxy\LazyServiceFactory;
 
 $settings = [
     /**
@@ -570,7 +570,7 @@ return [
             'unicaen-auth_module_options' => ModuleOptions::class,
             'zfcuser_login_form' => LoginForm::class,
             AuthenticationService::class => 'zfcuser_auth_service',
-            'Zend\Authentication\AuthenticationService' => 'zfcuser_auth_service',
+            'Laminas\Authentication\AuthenticationService' => 'zfcuser_auth_service',
             'unicaen-auth_user_service' => User::class, // pour la compatibilité
             'authUserContext' => UserContext::class, // pour la compatibilité
             'AuthUserContext' => UserContext::class, // pour la compatibilité

src/UnicaenAuthentification/Authentication/Adapter/AbstractAdapter.php

@@ -3,11 +3,11 @@
 namespace UnicaenAuthentification\Authentication\Adapter;
 
 use UnicaenAuthentification\Authentication\SessionIdentity;
-use Zend\Authentication\Storage\StorageInterface;
-use Zend\EventManager\EventInterface;
-use Zend\EventManager\EventManagerInterface;
-use Zend\EventManager\ListenerAggregateInterface;
-use Zend\EventManager\ListenerAggregateTrait;
+use Laminas\Authentication\Storage\StorageInterface;
+use Laminas\EventManager\EventInterface;
+use Laminas\EventManager\EventManagerInterface;
+use Laminas\EventManager\ListenerAggregateInterface;
+use Laminas\EventManager\ListenerAggregateTrait;
 use ZfcUser\Authentication\Adapter\ChainableAdapter;
 
 abstract class AbstractAdapter implements ChainableAdapter, ListenerAggregateInterface

src/UnicaenAuthentification/Authentication/Adapter/AbstractDb.php

@@ -3,9 +3,9 @@
 namespace UnicaenAuthentification\Authentication\Adapter;
 
 use UnicaenAuthentification\Options\Traits\ModuleOptionsAwareTrait;
-use Zend\Authentication\Result as AuthenticationResult;
-use Zend\EventManager\EventInterface;
-use Zend\Session\Container as SessionContainer;
+use Laminas\Authentication\Result as AuthenticationResult;
+use Laminas\EventManager\EventInterface;
+use Laminas\Session\Container as SessionContainer;
 use ZfcUser\Authentication\Adapter\AdapterChainEvent;
 use ZfcUser\Entity\UserInterface;
 use ZfcUser\Mapper\UserInterface as UserMapperInterface;

src/UnicaenAuthentification/Authentication/Adapter/AbstractFactory.php

@@ -6,11 +6,11 @@ use Interop\Container\ContainerInterface;
 use UnicaenApp\Exception\LogicException;
 use UnicaenAuthentification\Options\ModuleOptions;
 use UnicaenAuthentification\Service\User;
-use Zend\EventManager\EventManager;
-use Zend\EventManager\EventManagerAwareInterface;
-use Zend\Router\Http\TreeRouteStack;
-use Zend\ServiceManager\AbstractFactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\EventManager\EventManager;
+use Laminas\EventManager\EventManagerAwareInterface;
+use Laminas\Router\Http\TreeRouteStack;
+use Laminas\ServiceManager\AbstractFactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 use UnicaenApp\Mapper\Ldap\People as LdapPeopleMapper;
 
 /**

src/UnicaenAuthentification/Authentication/Adapter/AdapterChain.php

@@ -2,8 +2,8 @@
 
 namespace UnicaenAuthentification\Authentication\Adapter;
 
-use Zend\Stdlib\RequestInterface as Request;
-use Zend\Stdlib\ResponseInterface as Response;
+use Laminas\Stdlib\RequestInterface as Request;
+use Laminas\Stdlib\ResponseInterface as Response;
 use ZfcUser\Exception;
 
 class AdapterChain extends \ZfcUser\Authentication\Adapter\AdapterChain

src/UnicaenAuthentification/Authentication/Adapter/Cas.php

@@ -7,10 +7,10 @@ use phpCAS;
 use UnicaenApp\Mapper\Ldap\People as LdapPeopleMapper;
 use UnicaenAuthentification\Options\Traits\ModuleOptionsAwareTrait;
 use UnicaenAuthentification\Service\User;
-use Zend\Authentication\Result as AuthenticationResult;
-use Zend\EventManager\EventInterface;
-use Zend\Router\RouteInterface;
-use Zend\Router\RouteStackInterface;
+use Laminas\Authentication\Result as AuthenticationResult;
+use Laminas\EventManager\EventInterface;
+use Laminas\Router\RouteInterface;
+use Laminas\Router\RouteStackInterface;
 use ZfcUser\Authentication\Adapter\AdapterChainEvent;
 
 /**

src/UnicaenAuthentification/Authentication/Adapter/CasAdapterFactory.php

@@ -6,7 +6,7 @@ use Interop\Container\ContainerInterface;
 use UnicaenApp\Mapper\Ldap\People as LdapPeopleMapper;
 use UnicaenAuthentification\Options\ModuleOptions;
 use UnicaenAuthentification\Service\User;
-use Zend\Authentication\Storage\Session;
+use Laminas\Authentication\Storage\Session;
 
 class CasAdapterFactory
 {

src/UnicaenAuthentification/Authentication/Adapter/Db.php

@@ -2,8 +2,8 @@
 
 namespace UnicaenAuthentification\Authentication\Adapter;
 
-use Zend\Authentication\Result as AuthenticationResult;
-use Zend\Crypt\Password\Bcrypt;
+use Laminas\Authentication\Result as AuthenticationResult;
+use Laminas\Crypt\Password\Bcrypt;
 use ZfcUser\Entity\UserInterface;
 
 /**

src/UnicaenAuthentification/Authentication/Adapter/DbAdapterFactory.php

@@ -4,7 +4,7 @@ namespace UnicaenAuthentification\Authentication\Adapter;
 
 use Interop\Container\ContainerInterface;
 use UnicaenAuthentification\Options\ModuleOptions;
-use Zend\Authentication\Storage\Session;
+use Laminas\Authentication\Storage\Session;
 use ZfcUser\Mapper\UserInterface as UserMapperInterface;
 
 class DbAdapterFactory

src/UnicaenAuthentification/Authentication/Adapter/Ldap.php

@@ -7,14 +7,14 @@ use UnicaenApp\Mapper\Ldap\People as LdapPeopleMapper;
 use UnicaenApp\Options\ModuleOptions;
 use UnicaenAuthentification\Options\Traits\ModuleOptionsAwareTrait;
 use UnicaenAuthentification\Service\User;
-use Zend\Authentication\Adapter\Ldap as LdapAuthAdapter;
-use Zend\Authentication\Exception\ExceptionInterface;
-use Zend\Authentication\Result as AuthenticationResult;
-use Zend\EventManager\Event;
-use Zend\EventManager\EventInterface;
-use Zend\EventManager\EventManager;
-use Zend\EventManager\EventManagerAwareInterface;
-use Zend\EventManager\EventManagerInterface;
+use Laminas\Authentication\Adapter\Ldap as LdapAuthAdapter;
+use Laminas\Authentication\Exception\ExceptionInterface;
+use Laminas\Authentication\Result as AuthenticationResult;
+use Laminas\EventManager\Event;
+use Laminas\EventManager\EventInterface;
+use Laminas\EventManager\EventManager;
+use Laminas\EventManager\EventManagerAwareInterface;
+use Laminas\EventManager\EventManagerInterface;
 use ZfcUser\Authentication\Adapter\AdapterChainEvent;
 
 /**
@@ -188,8 +188,8 @@ class Ldap extends AbstractAdapter implements EventManagerAwareInterface
      * @param string $username Identifiant de connexion
      * @param string $credential Mot de passe
      * @return boolean
-     * @throws \Zend\Authentication\Adapter\Exception\ExceptionInterface
-     * @throws \Zend\Ldap\Exception\LdapException
+     * @throws \Laminas\Authentication\Adapter\Exception\ExceptionInterface
+     * @throws \Laminas\Ldap\Exception\LdapException
      */
     public function authenticateUsername(string $username, string $credential): bool
     {

src/UnicaenAuthentification/Authentication/Adapter/LdapAdapterFactory.php

@@ -6,7 +6,7 @@ use Interop\Container\ContainerInterface;
 use UnicaenApp\Mapper\Ldap\People as LdapPeopleMapper;
 use UnicaenAuthentification\Options\ModuleOptions;
 use UnicaenAuthentification\Service\User;
-use Zend\Authentication\Storage\Session;
+use Laminas\Authentication\Storage\Session;
 
 class LdapAdapterFactory
 {

src/UnicaenAuthentification/Authentication/Adapter/LocalAdapter.php

@@ -3,9 +3,9 @@
 namespace UnicaenAuthentification\Authentication\Adapter;
 
 use UnicaenAuthentification\Options\Traits\ModuleOptionsAwareTrait;
-use Zend\EventManager\EventInterface;
-use Zend\EventManager\EventManagerAwareTrait;
-use Zend\Stdlib\ResponseInterface as Response;
+use Laminas\EventManager\EventInterface;
+use Laminas\EventManager\EventManagerAwareTrait;
+use Laminas\Stdlib\ResponseInterface as Response;
 use ZfcUser\Authentication\Adapter\AdapterChainEvent;
 
 /**

src/UnicaenAuthentification/Authentication/Adapter/LocalAdapterFactory.php

@@ -4,8 +4,8 @@ namespace UnicaenAuthentification\Authentication\Adapter;
 
 use Interop\Container\ContainerInterface;
 use UnicaenAuthentification\Options\ModuleOptions;
-use Zend\Authentication\Storage\Session;
-use Zend\EventManager\EventManager;
+use Laminas\Authentication\Storage\Session;
+use Laminas\EventManager\EventManager;
 
 class LocalAdapterFactory
 {

src/UnicaenAuthentification/Authentication/Adapter/Shib.php

@@ -6,11 +6,11 @@ use UnicaenAuthentification\Controller\AuthController;
 use UnicaenAuthentification\Options\Traits\ModuleOptionsAwareTrait;
 use UnicaenAuthentification\Service\Traits\ShibServiceAwareTrait;
 use UnicaenAuthentification\Service\User;
-use Zend\Authentication\AuthenticationService;
-use Zend\Authentication\Result as AuthenticationResult;
-use Zend\EventManager\EventInterface;
-use Zend\Http\Response;
-use Zend\Router\RouteInterface;
+use Laminas\Authentication\AuthenticationService;
+use Laminas\Authentication\Result as AuthenticationResult;
+use Laminas\EventManager\EventInterface;
+use Laminas\Http\Response;
+use Laminas\Router\RouteInterface;
 use ZfcUser\Authentication\Adapter\AdapterChainEvent;
 
 /**

src/UnicaenAuthentification/Authentication/Adapter/ShibAdapterFactory.php

@@ -6,9 +6,9 @@ use Interop\Container\ContainerInterface;
 use UnicaenAuthentification\Options\ModuleOptions;
 use UnicaenAuthentification\Service\ShibService;
 use UnicaenAuthentification\Service\User;
-use Zend\Authentication\AuthenticationService;
-use Zend\Authentication\Storage\Session;
-use Zend\Router\RouteInterface;
+use Laminas\Authentication\AuthenticationService;
+use Laminas\Authentication\Storage\Session;
+use Laminas\Router\RouteInterface;
 
 class ShibAdapterFactory
 {

src/UnicaenAuthentification/Authentication/AuthenticationServiceFactory.php

@@ -4,7 +4,7 @@ namespace UnicaenAuthentification\Authentication;
 
 use Interop\Container\ContainerInterface;
 use UnicaenAuthentification\Authentication\Storage\Chain;
-use Zend\Authentication\AuthenticationService;
+use Laminas\Authentication\AuthenticationService;
 
 /**
  * Description of AuthenticationServiceFactory

src/UnicaenAuthentification/Authentication/RedirectCallback.php

@@ -2,11 +2,11 @@
 
 namespace UnicaenAuthentification\Authentication;
 
-use Zend\Http\PhpEnvironment\Request;
-use Zend\Http\PhpEnvironment\Response;
-use Zend\Mvc\Application;
-use Zend\Router\Exception;
-use Zend\Router\RouteInterface;
+use Laminas\Http\PhpEnvironment\Request;
+use Laminas\Http\PhpEnvironment\Response;
+use Laminas\Mvc\Application;
+use Laminas\Router\Exception;
+use Laminas\Router\RouteInterface;
 use ZfcUser\Options\ModuleOptions;
 
 /**