Migration vers laminas

Module.php

@@ -2,10 +2,10 @@
 
 namespace UnicaenAuth;
 
-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;
 use ZfcUser\Form\Login;
 use ZfcUser\Form\LoginFilter;
 
@@ -32,7 +32,7 @@ class Module implements AutoloaderProviderInterface, ConfigProviderInterface, Se
     public function getAutoloaderConfig()
     {
         return [
-            'Zend\Loader\StandardAutoloader' => [
+            'Laminas\Loader\StandardAutoloader' => [
                 'namespaces' => [
                     __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
                 ],

composer.json

@@ -9,9 +9,10 @@
     ],
     "require": {
         "unicaen/app": "dev-release_4.0.0",
-    "unicaen/bjy-authorize": "^3.0",
+        "unicaen/bjy-authorize": "dev-release_4.0.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

@@ -71,8 +71,8 @@ use UnicaenAuth\View\Helper\UserStatus;
 use UnicaenAuth\View\Helper\UserStatusFactory;
 use UnicaenAuth\View\Helper\UserUsurpationHelper;
 use UnicaenAuth\View\Helper\UserUsurpationHelperFactory;
-use Zend\Authentication\AuthenticationService;
-use Zend\ServiceManager\Proxy\LazyServiceFactory;
+use Laminas\Authentication\AuthenticationService;
+use Laminas\ServiceManager\Proxy\LazyServiceFactory;
 
 $settings = [
     /**
@@ -322,7 +322,7 @@ return [
         /* role providers simply provide a list of roles that should be inserted
          * into the Zend\Acl instance. the module comes with two providers, one
          * to specify roles in a config file and one to load roles using a
-         * Zend\Db adapter.
+         * Laminas\Db adapter.
          */
         'role_providers'    => [
             /**
@@ -645,7 +645,7 @@ return [
         'aliases'            => [
             'unicaen-auth_module_options' => ModuleOptions::class,
             'zfcuser_login_form' => LoginForm::class,
-            'Zend\Authentication\AuthenticationService' => 'zfcuser_auth_service',
+            'Laminas\Authentication\AuthenticationService' => 'zfcuser_auth_service',
             'UnicaenAuth\Privilege\PrivilegeProvider'   => 'UnicaenAuth\Service\Privilege',
             '\UnicaenAuth\Guard\PrivilegeController'    => 'UnicaenAuth\Guard\PrivilegeController',
 

config/unicaen-auth.global.php.dist

@@ -35,7 +35,7 @@ $config = [
         /* role providers simply provide a list of roles that should be inserted
          * into the Zend\Acl instance. the module comes with two providers, one
          * to specify roles in a config file and one to load roles using a
-         * Zend\Db adapter.
+         * Laminas\Db adapter.
          */
         'role_providers'    => [
             /**

doc/authentification.md

@@ -22,7 +22,7 @@ Quatre types d'authentification sont activables dans la configuration du module.
 - Pour donner accès à l'application à un nouvel utilisateur, 2 solutions :
   - Un informaticien crée à la main l'utilisateur dans la table des utilisateurs ; le mot de passe doit être chiffré 
     avec “Bcrypt” (exemple en ligne de commande à la racine de votre projet : 
-    `php --run 'require "vendor/autoload.php"; $bcrypt = new Zend\Crypt\Password\Bcrypt(); var_dump($bcrypt->create("azerty"));'`).
+    `php --run 'require "vendor/autoload.php"; $bcrypt = new Laminas\Crypt\Password\Bcrypt(); var_dump($bcrypt->create("azerty"));'`).
   - Si la fonctionnalité est activée (fournie par le module "zf-commons/zfc-user" dont dépend le module unicaen/auth), 
     l'utilisateur s'enregistre lui-même dans la table des utilisateurs via un formulaire de l'application (le lien figure 
     sous le formulaire de connexion à l'appli).
@@ -142,7 +142,7 @@ UserAuthenticatedEventListenerFactory.php
     use Application\Entity\Db\Role;
     use Doctrine\ORM\EntityManager;
     use UnicaenAuth\Service\UserContext as UserContextService;
-    use Zend\ServiceManager\ServiceLocatorInterface;
+    use Laminas\ServiceManager\ServiceLocatorInterface;
      
     class UserAuthenticatedEventListenerFactory
     {
@@ -170,7 +170,7 @@ Module.php
     namespace Application;
      
     use Application\Auth\UserAuthenticatedEventListener;
-    use Zend\Mvc\MvcEvent;
+    use Laminas\Mvc\MvcEvent;
      
     class Module
     {

doc/droits.md

@@ -202,7 +202,7 @@ Si vous voulez qu'une entité devienne une ressource, il faut qu'elle implément
 
     namespace Application\Entity\Db;
      
-    use Zend\Permissions\Acl\Resource\ResourceInterface;
+    use Laminas\Permissions\Acl\Resource\ResourceInterface;
      
     class ElementPedagogique implements ResourceInterface
     {
@@ -273,7 +273,7 @@ Son rôle est de répondre true ou false à une demande en fonction d'un certain
 
 AbstractAssertion vous fournit l'accès
 - au ServiceLocator,
-- au gestionnaire d'événements MVC (Zend\Mvc\MvcEvent) pour éventuellement récupérer des infos sur les paramètres d'URL ou de routeur, etc (utile pour les assertions lancées par les guards),
+- au gestionnaire d'événements MVC (Laminas\Mvc\MvcEvent) pour éventuellement récupérer des infos sur les paramètres d'URL ou de routeur, etc (utile pour les assertions lancées par les guards),
 - à l'ACL courante (getAcl()),
 - au rôle courant (getRole()).
 
@@ -332,7 +332,7 @@ Voici maintenant un exemple concret d'assertion :
     use Application\Entity\Db\Structure;
     use UnicaenAuth\Assertion\AbstractAssertion;
     use Application\Acl\Role;
-    use Zend\Permissions\Acl\Resource\ResourceInterface;
+    use Laminas\Permissions\Acl\Resource\ResourceInterface;
      
      
     /**

src/UnicaenAuth/Acl/NamedRole.php

 <?php
 namespace UnicaenAuth\Acl;
 
-use Zend\Permissions\Acl\Role\RoleInterface;
+use Laminas\Permissions\Acl\Role\RoleInterface;
 
 /**
  * Rôle avec nom explicite (humainement intelligible).

src/UnicaenAuth/Assertion/AbstractAssertion.php

@@ -7,11 +7,11 @@ use UnicaenAuth\Service\AuthorizeService;
 use UnicaenAuth\Service\Traits\AuthorizeServiceAwareTrait;
 use UnicaenAuth\Service\Traits\UserContextServiceAwareTrait;
 use UnicaenAuth\Service\UserContext;
-use Zend\Mvc\MvcEvent;
-use Zend\Permissions\Acl\Acl;
-use Zend\Permissions\Acl\Assertion\AssertionInterface;
-use Zend\Permissions\Acl\Resource\ResourceInterface;
-use Zend\Permissions\Acl\Role\RoleInterface;
+use Laminas\Mvc\MvcEvent;
+use Laminas\Permissions\Acl\Acl;
+use Laminas\Permissions\Acl\Assertion\AssertionInterface;
+use Laminas\Permissions\Acl\Resource\ResourceInterface;
+use Laminas\Permissions\Acl\Role\RoleInterface;
 
 /**
  * Description of AbstractAssertion

src/UnicaenAuth/Assertion/AssertionFactory.php

@@ -4,9 +4,9 @@ namespace UnicaenAuth\Assertion;
 
 use BjyAuthorize\Service\Authorize;
 use Interop\Container\ContainerInterface;
-use Zend\Authentication\AuthenticationService;
-use Zend\Mvc\Application;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\Authentication\AuthenticationService;
+use Laminas\Mvc\Application;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 /**
  * Class AssertionFactory

src/UnicaenAuth/Authentication/Adapter/AbstractAdapter.php

@@ -3,11 +3,11 @@
 namespace UnicaenAuth\Authentication\Adapter;
 
 use UnicaenAuth\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/UnicaenAuth/Authentication/Adapter/AbstractDb.php

@@ -3,9 +3,9 @@
 namespace UnicaenAuth\Authentication\Adapter;
 
 use UnicaenAuth\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/UnicaenAuth/Authentication/Adapter/AdapterChain.php

@@ -2,8 +2,8 @@
 
 namespace UnicaenAuth\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/UnicaenAuth/Authentication/Adapter/Cas.php

@@ -7,10 +7,10 @@ use phpCAS;
 use UnicaenApp\Mapper\Ldap\People as LdapPeopleMapper;
 use UnicaenAuth\Options\Traits\ModuleOptionsAwareTrait;
 use UnicaenAuth\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/UnicaenAuth/Authentication/Adapter/CasAdapterFactory.php

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

src/UnicaenAuth/Authentication/Adapter/Db.php

@@ -2,8 +2,8 @@
 
 namespace UnicaenAuth\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/UnicaenAuth/Authentication/Adapter/DbAdapterFactory.php

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

src/UnicaenAuth/Authentication/Adapter/Ldap.php

@@ -7,14 +7,14 @@ use UnicaenApp\Mapper\Ldap\People as LdapPeopleMapper;
 use UnicaenApp\Options\ModuleOptions;
 use UnicaenAuth\Options\Traits\ModuleOptionsAwareTrait;
 use UnicaenAuth\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;
 
 /**
@@ -187,8 +187,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/UnicaenAuth/Authentication/Adapter/LdapAdapterFactory.php

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

src/UnicaenAuth/Authentication/Adapter/LocalAdapter.php

@@ -3,9 +3,9 @@
 namespace UnicaenAuth\Authentication\Adapter;
 
 use UnicaenAuth\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;
 
 /**