Commit 806db90d authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Migration vers laminas

parent d507f84b
Pipeline #11084 passed with stage
in 30 seconds
...@@ -4,8 +4,8 @@ namespace UnicaenAuth\Authentication\Adapter; ...@@ -4,8 +4,8 @@ namespace UnicaenAuth\Authentication\Adapter;
use Interop\Container\ContainerInterface; use Interop\Container\ContainerInterface;
use UnicaenAuth\Options\ModuleOptions; use UnicaenAuth\Options\ModuleOptions;
use Zend\Authentication\Storage\Session; use Laminas\Authentication\Storage\Session;
use Zend\EventManager\EventManager; use Laminas\EventManager\EventManager;
class LocalAdapterFactory class LocalAdapterFactory
{ {
......
...@@ -6,11 +6,11 @@ use UnicaenAuth\Controller\AuthController; ...@@ -6,11 +6,11 @@ use UnicaenAuth\Controller\AuthController;
use UnicaenAuth\Options\Traits\ModuleOptionsAwareTrait; use UnicaenAuth\Options\Traits\ModuleOptionsAwareTrait;
use UnicaenAuth\Service\Traits\ShibServiceAwareTrait; use UnicaenAuth\Service\Traits\ShibServiceAwareTrait;
use UnicaenAuth\Service\User; use UnicaenAuth\Service\User;
use Zend\Authentication\AuthenticationService; use Laminas\Authentication\AuthenticationService;
use Zend\Authentication\Result as AuthenticationResult; use Laminas\Authentication\Result as AuthenticationResult;
use Zend\EventManager\EventInterface; use Laminas\EventManager\EventInterface;
use Zend\Http\Response; use Laminas\Http\Response;
use Zend\Router\RouteInterface; use Laminas\Router\RouteInterface;
use ZfcUser\Authentication\Adapter\AdapterChainEvent; use ZfcUser\Authentication\Adapter\AdapterChainEvent;
/** /**
......
...@@ -6,9 +6,9 @@ use Interop\Container\ContainerInterface; ...@@ -6,9 +6,9 @@ use Interop\Container\ContainerInterface;
use UnicaenAuth\Options\ModuleOptions; use UnicaenAuth\Options\ModuleOptions;
use UnicaenAuth\Service\ShibService; use UnicaenAuth\Service\ShibService;
use UnicaenAuth\Service\User; use UnicaenAuth\Service\User;
use Zend\Authentication\AuthenticationService; use Laminas\Authentication\AuthenticationService;
use Zend\Authentication\Storage\Session; use Laminas\Authentication\Storage\Session;
use Zend\Router\RouteInterface; use Laminas\Router\RouteInterface;
class ShibAdapterFactory class ShibAdapterFactory
{ {
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
namespace UnicaenAuth\Authentication; namespace UnicaenAuth\Authentication;
use Interop\Container\ContainerInterface; use Interop\Container\ContainerInterface;
use Zend\Authentication\AuthenticationService; use Laminas\Authentication\AuthenticationService;
use Zend\ServiceManager\FactoryInterface; use Laminas\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface; use Laminas\ServiceManager\ServiceLocatorInterface;
/** /**
* Description of AuthenticationServiceFactory * Description of AuthenticationServiceFactory
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
namespace UnicaenAuth\Authentication; namespace UnicaenAuth\Authentication;
use Zend\Http\PhpEnvironment\Request; use Laminas\Http\PhpEnvironment\Request;
use Zend\Http\PhpEnvironment\Response; use Laminas\Http\PhpEnvironment\Response;
use Zend\Mvc\Application; use Laminas\Mvc\Application;
use Zend\Router\Exception; use Laminas\Router\Exception;
use Zend\Router\RouteInterface; use Laminas\Router\RouteInterface;
use ZfcUser\Options\ModuleOptions; use ZfcUser\Options\ModuleOptions;
/** /**
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
namespace UnicaenAuth\Authentication; namespace UnicaenAuth\Authentication;
use Interop\Container\ContainerInterface; use Interop\Container\ContainerInterface;
use Zend\Mvc\Application; use Laminas\Mvc\Application;
use Zend\Router\RouteInterface; use Laminas\Router\RouteInterface;
use Zend\ServiceManager\FactoryInterface; use Laminas\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface; use Laminas\ServiceManager\ServiceLocatorInterface;
use ZfcUser\Options\ModuleOptions; use ZfcUser\Options\ModuleOptions;
class RedirectCallbackFactory implements FactoryInterface class RedirectCallbackFactory implements FactoryInterface
......
...@@ -4,7 +4,7 @@ namespace UnicaenAuth\Authentication\Storage; ...@@ -4,7 +4,7 @@ namespace UnicaenAuth\Authentication\Storage;
use UnicaenAuth\Authentication\SessionIdentity; use UnicaenAuth\Authentication\SessionIdentity;
use UnicaenAuth\Options\Traits\ModuleOptionsAwareTrait; use UnicaenAuth\Options\Traits\ModuleOptionsAwareTrait;
use Zend\Authentication\Storage\StorageInterface; use Laminas\Authentication\Storage\StorageInterface;
abstract class AbstractStorage implements ChainableStorage abstract class AbstractStorage implements ChainableStorage
{ {
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
namespace UnicaenAuth\Authentication\Storage; namespace UnicaenAuth\Authentication\Storage;
use Interop\Container\ContainerInterface; use Interop\Container\ContainerInterface;
use Zend\Authentication\Storage\Session; use Laminas\Authentication\Storage\Session;
use Zend\Session\SessionManager; use Laminas\Session\SessionManager;
class AuthFactory class AuthFactory
{ {
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
namespace UnicaenAuth\Authentication\Storage; namespace UnicaenAuth\Authentication\Storage;
use Zend\Authentication\Exception\ExceptionInterface; use Laminas\Authentication\Exception\ExceptionInterface;
use Zend\Authentication\Storage\Session; use Laminas\Authentication\Storage\Session;
use Zend\Authentication\Storage\StorageInterface; use Laminas\Authentication\Storage\StorageInterface;
use Zend\EventManager\EventManagerAwareInterface; use Laminas\EventManager\EventManagerAwareInterface;
use Zend\EventManager\EventManagerInterface; use Laminas\EventManager\EventManagerInterface;
/** /**
* Implémentation d'une chaîne de responsabilité permettant à plusieurs sources * Implémentation d'une chaîne de responsabilité permettant à plusieurs sources
......
<?php <?php
namespace UnicaenAuth\Authentication\Storage; namespace UnicaenAuth\Authentication\Storage;
use Zend\EventManager\Event; use Laminas\EventManager\Event;
/** /**
* Événement propagé dans la chaîne de responsabilité {@see Chain}, * Événement propagé dans la chaîne de responsabilité {@see Chain},
...@@ -28,7 +28,7 @@ class ChainEvent extends Event ...@@ -28,7 +28,7 @@ class ChainEvent extends Event
* *
* Behavior is undefined when storage is empty. * Behavior is undefined when storage is empty.
* *
* @throws \Zend\Authentication\Exception\ExceptionInterface If reading contents from storage is impossible * @throws \Laminas\Authentication\Exception\ExceptionInterface If reading contents from storage is impossible
* @return mixed * @return mixed
*/ */
public function getContents() public function getContents()
...@@ -40,7 +40,7 @@ class ChainEvent extends Event ...@@ -40,7 +40,7 @@ class ChainEvent extends Event
* Writes $contents to storage * Writes $contents to storage
* *
* @param mixed $contents * @param mixed $contents
* @throws \Zend\Authentication\Exception\ExceptionInterface If writing $contents to storage is impossible * @throws \Laminas\Authentication\Exception\ExceptionInterface If writing $contents to storage is impossible
* @return void * @return void
*/ */
public function addContents($key, $contents) public function addContents($key, $contents)
...@@ -51,7 +51,7 @@ class ChainEvent extends Event ...@@ -51,7 +51,7 @@ class ChainEvent extends Event
/** /**
* Clears contents from storage * Clears contents from storage
* *
* @throws \Zend\Authentication\Exception\ExceptionInterface If clearing contents from storage is impossible * @throws \Laminas\Authentication\Exception\ExceptionInterface If clearing contents from storage is impossible
* @return void * @return void
*/ */
public function clearContents() public function clearContents()
......
...@@ -5,8 +5,8 @@ namespace UnicaenAuth\Authentication\Storage; ...@@ -5,8 +5,8 @@ namespace UnicaenAuth\Authentication\Storage;
use Interop\Container\ContainerInterface; use Interop\Container\ContainerInterface;
use UnicaenAuth\Authentication\Adapter\Db as DbAdapter; use UnicaenAuth\Authentication\Adapter\Db as DbAdapter;
use UnicaenAuth\Options\ModuleOptions; use UnicaenAuth\Options\ModuleOptions;
use Zend\Authentication\Storage\Session; use Laminas\Authentication\Storage\Session;
use Zend\Session\SessionManager; use Laminas\Session\SessionManager;
use ZfcUser\Mapper\UserInterface as UserMapper; use ZfcUser\Mapper\UserInterface as UserMapper;
class DbFactory class DbFactory
......
...@@ -6,8 +6,8 @@ use Interop\Container\ContainerInterface; ...@@ -6,8 +6,8 @@ use Interop\Container\ContainerInterface;
use UnicaenApp\Mapper\Ldap\People as LdapPeopleMapper; use UnicaenApp\Mapper\Ldap\People as LdapPeopleMapper;
use UnicaenAuth\Authentication\Adapter\Ldap as LdapAdapter; use UnicaenAuth\Authentication\Adapter\Ldap as LdapAdapter;
use UnicaenAuth\Options\ModuleOptions; use UnicaenAuth\Options\ModuleOptions;
use Zend\Authentication\Storage\Session; use Laminas\Authentication\Storage\Session;
use Zend\Session\SessionManager; use Laminas\Session\SessionManager;
class LdapFactory class LdapFactory
{ {
......
...@@ -5,8 +5,8 @@ namespace UnicaenAuth\Authentication\Storage; ...@@ -5,8 +5,8 @@ namespace UnicaenAuth\Authentication\Storage;
use Interop\Container\ContainerInterface; use Interop\Container\ContainerInterface;
use UnicaenAuth\Options\ModuleOptions; use UnicaenAuth\Options\ModuleOptions;
use UnicaenAuth\Service\ShibService; use UnicaenAuth\Service\ShibService;
use Zend\Authentication\Storage\Session; use Laminas\Authentication\Storage\Session;
use Zend\Session\SessionManager; use Laminas\Session\SessionManager;
class ShibFactory class ShibFactory
{ {
......
...@@ -4,8 +4,8 @@ namespace UnicaenAuth\Authentication\Storage; ...@@ -4,8 +4,8 @@ namespace UnicaenAuth\Authentication\Storage;
use Interop\Container\ContainerInterface; use Interop\Container\ContainerInterface;
use UnicaenAuth\Options\ModuleOptions; use UnicaenAuth\Options\ModuleOptions;
use Zend\Authentication\Storage\Session; use Laminas\Authentication\Storage\Session;
use Zend\Session\SessionManager; use Laminas\Session\SessionManager;
use ZfcUser\Mapper\UserInterface as UserMapper; use ZfcUser\Mapper\UserInterface as UserMapper;
class UsurpationFactory class UsurpationFactory
......
...@@ -16,12 +16,12 @@ use UnicaenAuth\Service\ShibService; ...@@ -16,12 +16,12 @@ use UnicaenAuth\Service\ShibService;
use UnicaenAuth\Service\Traits\ShibServiceAwareTrait; use UnicaenAuth\Service\Traits\ShibServiceAwareTrait;
use UnicaenAuth\Service\Traits\UserContextServiceAwareTrait; use UnicaenAuth\Service\Traits\UserContextServiceAwareTrait;
use UnicaenAuth\Service\Traits\UserServiceAwareTrait; use UnicaenAuth\Service\Traits\UserServiceAwareTrait;
use Zend\Http\Request; use Laminas\Http\Request;
use Zend\Http\Response; use Laminas\Http\Response;
use Zend\Mvc\Controller\AbstractActionController; use Laminas\Mvc\Controller\AbstractActionController;
use Zend\Mvc\Plugin\FlashMessenger\FlashMessenger; use Laminas\Mvc\Plugin\FlashMessenger\FlashMessenger;
use Zend\Stdlib\ResponseInterface; use Laminas\Stdlib\ResponseInterface;
use Zend\View\Model\ViewModel; use Laminas\View\Model\ViewModel;
use ZfcUser\Controller\Plugin\ZfcUserAuthentication; use ZfcUser\Controller\Plugin\ZfcUserAuthentication;
/** /**
......
...@@ -5,9 +5,9 @@ namespace UnicaenAuth\Controller; ...@@ -5,9 +5,9 @@ namespace UnicaenAuth\Controller;
use UnicaenAuth\Form\Droits\Traits\RoleFormAwareTrait; use UnicaenAuth\Form\Droits\Traits\RoleFormAwareTrait;
use UnicaenAuth\Service\Traits\PrivilegeServiceAwareTrait; use UnicaenAuth\Service\Traits\PrivilegeServiceAwareTrait;
use UnicaenAuth\Service\Traits\RoleServiceAwareTrait; use UnicaenAuth\Service\Traits\RoleServiceAwareTrait;
use Zend\Form\Form; use Laminas\Form\Form;
use Zend\Mvc\Controller\AbstractActionController; use Laminas\Mvc\Controller\AbstractActionController;
use Zend\View\Model\ViewModel; use Laminas\View\Model\ViewModel;
/** /**
* Description of DroitsController * Description of DroitsController
......
...@@ -12,11 +12,11 @@ use UnicaenAuth\Options\ModuleOptions; ...@@ -12,11 +12,11 @@ use UnicaenAuth\Options\ModuleOptions;
use UnicaenAuth\Service\Traits\ShibServiceAwareTrait; use UnicaenAuth\Service\Traits\ShibServiceAwareTrait;
use UnicaenAuth\Service\Traits\UserContextServiceAwareTrait; use UnicaenAuth\Service\Traits\UserContextServiceAwareTrait;
use UnicaenAuth\Service\UserContext; use UnicaenAuth\Service\UserContext;
use Zend\Authentication\AuthenticationService; use Laminas\Authentication\AuthenticationService;
use Zend\Http\Request; use Laminas\Http\Request;
use Zend\Http\Response; use Laminas\Http\Response;
use Zend\Mvc\Controller\AbstractActionController; use Laminas\Mvc\Controller\AbstractActionController;
use Zend\Mvc\Plugin\FlashMessenger\FlashMessenger; use Laminas\Mvc\Plugin\FlashMessenger\FlashMessenger;
use ZfcUser\Mapper\UserInterface; use ZfcUser\Mapper\UserInterface;
/** /**
......
...@@ -7,7 +7,7 @@ use UnicaenApp\Mapper\Ldap\People as LdapPeopleMapper; ...@@ -7,7 +7,7 @@ use UnicaenApp\Mapper\Ldap\People as LdapPeopleMapper;
use UnicaenAuth\Options\ModuleOptions; use UnicaenAuth\Options\ModuleOptions;
use UnicaenAuth\Service\ShibService; use UnicaenAuth\Service\ShibService;
use UnicaenAuth\Service\UserContext; use UnicaenAuth\Service\UserContext;
use Zend\Authentication\AuthenticationService; use Laminas\Authentication\AuthenticationService;
use ZfcUser\Mapper\UserInterface; use ZfcUser\Mapper\UserInterface;
class UtilisateurControllerFactory class UtilisateurControllerFactory
......
...@@ -4,7 +4,7 @@ namespace UnicaenAuth\Entity\Db; ...@@ -4,7 +4,7 @@ namespace UnicaenAuth\Entity\Db;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use UnicaenAuth\Provider\Privilege\Privileges; use UnicaenAuth\Provider\Privilege\Privileges;
use Zend\Permissions\Acl\Resource\ResourceInterface; use Laminas\Permissions\Acl\Resource\ResourceInterface;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
/** /**
......
...@@ -132,7 +132,7 @@ class People extends BasePeople implements UserInterface, ProviderInterface ...@@ -132,7 +132,7 @@ class People extends BasePeople implements UserInterface, ProviderInterface
} }
/** /**
* @return \Zend\Permissions\Acl\Role\RoleInterface[] * @return \Laminas\Permissions\Acl\Role\RoleInterface[]
*/ */
public function getRoles() public function getRoles()
{ {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment