Skip to content
Snippets Groups Projects
Commit f59d6949 authored by Thibaut Vallee's avatar Thibaut Vallee
Browse files

Laminas Migration

parent 17c0e9e7
Branches
Tags 2.0.0
No related merge requests found
Pipeline #13460 passed
Showing
with 71 additions and 70 deletions
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
namespace UnicaenPrivilege; namespace UnicaenPrivilege;
use Zend\Mvc\ModuleRouteListener; use Laminas\Mvc\ModuleRouteListener;
use Zend\Mvc\MvcEvent; use Laminas\Mvc\MvcEvent;
use Zend\Stdlib\ArrayUtils; use Laminas\Stdlib\ArrayUtils;
use Zend\Stdlib\Glob; use Laminas\Stdlib\Glob;
use Zend\Config\Factory as ConfigFactory; use Laminas\Config\Factory as ConfigFactory;
class Module class Module
{ {
...@@ -19,7 +19,7 @@ class Module ...@@ -19,7 +19,7 @@ class Module
$moduleRouteListener->attach($eventManager); $moduleRouteListener->attach($eventManager);
/* Active un layout spécial si la requête est de type AJAX. Valable pour TOUS les modules de l'application. */ /* Active un layout spécial si la requête est de type AJAX. Valable pour TOUS les modules de l'application. */
$eventManager->getSharedManager()->attach('Zend\Mvc\Controller\AbstractActionController', 'dispatch', $eventManager->getSharedManager()->attach('Laminas\Mvc\Controller\AbstractActionController', 'dispatch',
function (MvcEvent $e) { function (MvcEvent $e) {
$request = $e->getRequest(); $request = $e->getRequest();
if ($request instanceof HttpRequest && $request->isXmlHttpRequest()) { if ($request instanceof HttpRequest && $request->isXmlHttpRequest()) {
...@@ -47,7 +47,7 @@ class Module ...@@ -47,7 +47,7 @@ class Module
public function getAutoloaderConfig() public function getAutoloaderConfig()
{ {
return array( return array(
'Zend\Loader\StandardAutoloader' => array( 'Laminas\Loader\StandardAutoloader' => array(
'namespaces' => array( 'namespaces' => array(
__NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__, __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
), ),
......
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
} }
], ],
"require": { "require": {
"unicaen/app": "^3.0" "unicaen/app": "^4.0.3",
"laminas/laminas-dependency-plugin": "^2.1"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": ">=3.7" "phpunit/phpunit": ">=3.7"
......
...@@ -18,8 +18,8 @@ use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieServiceFactory; ...@@ -18,8 +18,8 @@ use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieServiceFactory;
use UnicaenPrivilege\Service\Privilege\PrivilegeService; use UnicaenPrivilege\Service\Privilege\PrivilegeService;
use UnicaenPrivilege\Service\Privilege\PrivilegeServiceFactory; use UnicaenPrivilege\Service\Privilege\PrivilegeServiceFactory;
use UnicaenPrivilege\View\Privilege\PrivilegeViewHelper; use UnicaenPrivilege\View\Privilege\PrivilegeViewHelper;
use Zend\Router\Http\Literal; use Laminas\Router\Http\Literal;
use Zend\Router\Http\Segment; use Laminas\Router\Http\Segment;
return [ return [
......
...@@ -5,11 +5,11 @@ namespace UnicaenPrivilege\Assertion; ...@@ -5,11 +5,11 @@ namespace UnicaenPrivilege\Assertion;
use BjyAuthorize\Service\Authorize; use BjyAuthorize\Service\Authorize;
use UnicaenAuthentification\Service\Traits\AuthorizeServiceAwareTrait; use UnicaenAuthentification\Service\Traits\AuthorizeServiceAwareTrait;
use UnicaenAuthentification\Service\Traits\UserContextServiceAwareTrait; use UnicaenAuthentification\Service\Traits\UserContextServiceAwareTrait;
use Zend\Mvc\MvcEvent; use Laminas\Mvc\MvcEvent;
use Zend\Permissions\Acl\Acl; use Laminas\Permissions\Acl\Acl;
use Zend\Permissions\Acl\Assertion\AssertionInterface; use Laminas\Permissions\Acl\Assertion\AssertionInterface;
use Zend\Permissions\Acl\Resource\ResourceInterface; use Laminas\Permissions\Acl\Resource\ResourceInterface;
use Zend\Permissions\Acl\Role\RoleInterface; use Laminas\Permissions\Acl\Role\RoleInterface;
/** /**
* Description of AbstractAssertion * Description of AbstractAssertion
......
...@@ -6,8 +6,8 @@ use UnicaenPrivilege\Form\Privilege\CategorieFiltreFormAwareTrait; ...@@ -6,8 +6,8 @@ use UnicaenPrivilege\Form\Privilege\CategorieFiltreFormAwareTrait;
use UnicaenPrivilege\Form\Privilege\CategorieFormAwareTrait; use UnicaenPrivilege\Form\Privilege\CategorieFormAwareTrait;
use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieServiceAwareTrait; use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieServiceAwareTrait;
use UnicaenPrivilege\Service\Privilege\PrivilegeServiceAwareTrait; use UnicaenPrivilege\Service\Privilege\PrivilegeServiceAwareTrait;
use Zend\Mvc\Controller\AbstractActionController; use Laminas\Mvc\Controller\AbstractActionController;
use Zend\View\Model\ViewModel; use Laminas\View\Model\ViewModel;
class PrivilegeCategorieController extends AbstractActionController class PrivilegeCategorieController extends AbstractActionController
{ {
......
...@@ -7,8 +7,8 @@ use UnicaenPrivilege\Form\Privilege\PrivilegeFormAwareTrait; ...@@ -7,8 +7,8 @@ use UnicaenPrivilege\Form\Privilege\PrivilegeFormAwareTrait;
use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieServiceAwareTrait; use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieServiceAwareTrait;
use UnicaenPrivilege\Service\Privilege\PrivilegeServiceAwareTrait; use UnicaenPrivilege\Service\Privilege\PrivilegeServiceAwareTrait;
use UnicaenUtilisateur\Service\Role\RoleServiceAwareTrait; use UnicaenUtilisateur\Service\Role\RoleServiceAwareTrait;
use Zend\Mvc\Controller\AbstractActionController; use Laminas\Mvc\Controller\AbstractActionController;
use Zend\View\Model\ViewModel; use Laminas\View\Model\ViewModel;
class PrivilegeController extends AbstractActionController class PrivilegeController extends AbstractActionController
{ {
......
...@@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; ...@@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use UnicaenPrivilege\Provider\Privilege\Privileges; use UnicaenPrivilege\Provider\Privilege\Privileges;
use UnicaenUtilisateur\Entity\Db\RoleInterface; use UnicaenUtilisateur\Entity\Db\RoleInterface;
use Zend\Permissions\Acl\Resource\ResourceInterface; use Laminas\Permissions\Acl\Resource\ResourceInterface;
abstract class AbstractPrivilege implements PrivilegeInterface, ResourceInterface abstract class AbstractPrivilege implements PrivilegeInterface, ResourceInterface
{ {
......
...@@ -4,10 +4,10 @@ namespace UnicaenPrivilege\Form\Privilege; ...@@ -4,10 +4,10 @@ namespace UnicaenPrivilege\Form\Privilege;
use UnicaenApp\Service\EntityManagerAwareTrait; use UnicaenApp\Service\EntityManagerAwareTrait;
use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieServiceAwareTrait; use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieServiceAwareTrait;
use Zend\Form\Element\Button; use Laminas\Form\Element\Button;
use Zend\Form\Element\Select; use Laminas\Form\Element\Select;
use Zend\Form\Form; use Laminas\Form\Form;
use Zend\InputFilter\Factory; use Laminas\InputFilter\Factory;
class CategorieFiltreForm extends Form class CategorieFiltreForm extends Form
{ {
......
...@@ -4,14 +4,14 @@ namespace UnicaenPrivilege\Form\Privilege; ...@@ -4,14 +4,14 @@ namespace UnicaenPrivilege\Form\Privilege;
use UnicaenApp\Service\EntityManagerAwareTrait; use UnicaenApp\Service\EntityManagerAwareTrait;
use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieServiceAwareTrait; use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieServiceAwareTrait;
use Zend\Form\Element\Button; use Laminas\Form\Element\Button;
use Zend\Form\Element\Number; use Laminas\Form\Element\Number;
use Zend\Form\Element\Text; use Laminas\Form\Element\Text;
use Zend\Form\Form; use Laminas\Form\Form;
use Zend\InputFilter\Factory; use Laminas\InputFilter\Factory;
use Zend\Validator\Callback; use Laminas\Validator\Callback;
use Zend\Validator\NotEmpty; use Laminas\Validator\NotEmpty;
use Zend\Validator\Regex; use Laminas\Validator\Regex;
class CategorieForm extends Form class CategorieForm extends Form
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
namespace UnicaenPrivilege\Form\Privilege; namespace UnicaenPrivilege\Form\Privilege;
use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManager;
use DoctrineModule\Stdlib\Hydrator\DoctrineObject; use Doctrine\Laminas\Hydrator\DoctrineObject;
use Interop\Container\ContainerInterface; use Interop\Container\ContainerInterface;
use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieService; use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieService;
......
...@@ -7,15 +7,15 @@ use DoctrineModule\Form\Element\ObjectSelect; ...@@ -7,15 +7,15 @@ use DoctrineModule\Form\Element\ObjectSelect;
use UnicaenApp\Service\EntityManagerAwareTrait; use UnicaenApp\Service\EntityManagerAwareTrait;
use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieServiceAwareTrait; use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieServiceAwareTrait;
use UnicaenPrivilege\Service\Privilege\PrivilegeServiceAwareTrait; use UnicaenPrivilege\Service\Privilege\PrivilegeServiceAwareTrait;
use Zend\Form\Element\Button; use Laminas\Form\Element\Button;
use Zend\Form\Element\Hidden; use Laminas\Form\Element\Hidden;
use Zend\Form\Element\Number; use Laminas\Form\Element\Number;
use Zend\Form\Element\Text; use Laminas\Form\Element\Text;
use Zend\Form\Form; use Laminas\Form\Form;
use Zend\InputFilter\Factory; use Laminas\InputFilter\Factory;
use Zend\Validator\Callback; use Laminas\Validator\Callback;
use Zend\Validator\NotEmpty; use Laminas\Validator\NotEmpty;
use Zend\Validator\Regex; use Laminas\Validator\Regex;
class PrivilegeForm extends Form class PrivilegeForm extends Form
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
namespace UnicaenPrivilege\Form\Privilege; namespace UnicaenPrivilege\Form\Privilege;
use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManager;
use DoctrineModule\Stdlib\Hydrator\DoctrineObject; use Doctrine\Laminas\Hydrator\DoctrineObject;
use Interop\Container\ContainerInterface; use Interop\Container\ContainerInterface;
use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieService; use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieService;
use UnicaenPrivilege\Service\Privilege\PrivilegeService; use UnicaenPrivilege\Service\Privilege\PrivilegeService;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
namespace UnicaenPrivilege\Guard; namespace UnicaenPrivilege\Guard;
use BjyAuthorize\Guard\Route; use BjyAuthorize\Guard\Route;
use Zend\ServiceManager\ServiceLocatorInterface; use Laminas\ServiceManager\ServiceLocatorInterface;
use UnicaenPrivilege\Provider\Privilege\PrivilegeProviderAwareTrait; use UnicaenPrivilege\Provider\Privilege\PrivilegeProviderAwareTrait;
use UnicaenApp\Traits\SessionContainerTrait; use UnicaenApp\Traits\SessionContainerTrait;
......
...@@ -5,7 +5,7 @@ namespace UnicaenPrivilege\Provider\Rule; ...@@ -5,7 +5,7 @@ namespace UnicaenPrivilege\Provider\Rule;
use BjyAuthorize\Provider\Rule\ProviderInterface; use BjyAuthorize\Provider\Rule\ProviderInterface;
use UnicaenPrivilege\Provider\Privilege\PrivilegeProviderAwareTrait; use UnicaenPrivilege\Provider\Privilege\PrivilegeProviderAwareTrait;
use UnicaenPrivilege\Provider\Privilege\Privileges; use UnicaenPrivilege\Provider\Privilege\Privileges;
use Zend\ServiceManager\ServiceLocatorInterface; use Laminas\ServiceManager\ServiceLocatorInterface;
/** /**
* Rule provider based on a given array of rules * Rule provider based on a given array of rules
......
...@@ -5,8 +5,8 @@ namespace UnicaenPrivilege\Service; ...@@ -5,8 +5,8 @@ namespace UnicaenPrivilege\Service;
use BjyAuthorize\Provider\Identity\ProviderInterface; use BjyAuthorize\Provider\Identity\ProviderInterface;
use Interop\Container\ContainerInterface; use Interop\Container\ContainerInterface;
use UnicaenAuthentification\Service\UserContext; use UnicaenAuthentification\Service\UserContext;
use Zend\ServiceManager\FactoryInterface; use Laminas\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface; use Laminas\ServiceManager\ServiceLocatorInterface;
/** /**
* Factory responsible of building the {@see \BjyAuthorize\Service\Authorize} service * Factory responsible of building the {@see \BjyAuthorize\Service\Authorize} service
......
...@@ -6,7 +6,7 @@ use Doctrine\ORM\ORMException; ...@@ -6,7 +6,7 @@ use Doctrine\ORM\ORMException;
use UnicaenApp\Exception\RuntimeException; use UnicaenApp\Exception\RuntimeException;
use UnicaenPrivilege\Entity\Db\PrivilegeCategorieInterface; use UnicaenPrivilege\Entity\Db\PrivilegeCategorieInterface;
use UnicaenPrivilege\Service\CommonService; use UnicaenPrivilege\Service\CommonService;
use Zend\Mvc\Controller\AbstractActionController; use Laminas\Mvc\Controller\AbstractActionController;
class PrivilegeCategorieService extends CommonService class PrivilegeCategorieService extends CommonService
{ {
......
...@@ -13,7 +13,7 @@ use UnicaenPrivilege\Provider\Privilege\PrivilegeProviderInterface; ...@@ -13,7 +13,7 @@ use UnicaenPrivilege\Provider\Privilege\PrivilegeProviderInterface;
use UnicaenPrivilege\Provider\Privilege\Privileges; use UnicaenPrivilege\Provider\Privilege\Privileges;
use UnicaenPrivilege\Service\CommonService; use UnicaenPrivilege\Service\CommonService;
use UnicaenUtilisateur\Entity\Db\RoleInterface; use UnicaenUtilisateur\Entity\Db\RoleInterface;
use Zend\Mvc\Controller\AbstractActionController; use Laminas\Mvc\Controller\AbstractActionController;
class PrivilegeService extends CommonService implements PrivilegeProviderInterface, ResourceProviderInterface class PrivilegeService extends CommonService implements PrivilegeProviderInterface, ResourceProviderInterface
{ {
......
...@@ -8,7 +8,7 @@ use Application\Provider\Privilege\ProfilPrivileges; ...@@ -8,7 +8,7 @@ use Application\Provider\Privilege\ProfilPrivileges;
use UnicaenPrivilege\Entity\Db\PrivilegeInterface; use UnicaenPrivilege\Entity\Db\PrivilegeInterface;
use UnicaenPrivilege\Provider\Privilege\PrivilegePrivileges; use UnicaenPrivilege\Provider\Privilege\PrivilegePrivileges;
use UnicaenUtilisateur\Entity\Db\RoleInterface; use UnicaenUtilisateur\Entity\Db\RoleInterface;
use Zend\View\Helper\AbstractHelper; use Laminas\View\Helper\AbstractHelper;
class PrivilegeViewHelper extends AbstractHelper class PrivilegeViewHelper extends AbstractHelper
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment