Commit 7dfec317 authored by David Surville's avatar David Surville
Browse files

Merge branch 'release-1.2.0' of https://git.unicaen.fr/lib/unicaen/privilege into release-1.2.0

parents 39fca5a0 0efe5ddc

src/UnicaenPrivilege/Assertion/Perimetre/AbstractPerimetreAssertion.php

+3 −3
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ use UnicaenPrivilege\Entity\Db\PerimetreInterface; 
use UnicaenPrivilege\Provider\Perimetre\PerimetreProviderAwareTrait;

use UnicaenUtilisateur\Entity\Db\UserInterface;

use UnicaenUtilisateur\Entity\Db\UserRolePerimetreInterface;

use Zend\Permissions\Acl\Exception\InvalidArgumentException;

use Zend\Permissions\Acl\Resource\ResourceInterface;

use Zend\Router\RouteMatch;

use Laminas\Permissions\Acl\Exception\InvalidArgumentException;

use Laminas\Permissions\Acl\Resource\ResourceInterface;

use Laminas\Router\RouteMatch;



abstract class AbstractPerimetreAssertion extends AbstractAssertion

{

src/UnicaenPrivilege/Assertion/Perimetre/AbstractPerimetreAssertionFactory.php

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ use UnicaenAuthentification\Service\UserContext; 
use UnicaenPrivilege\Assertion\AbstractAssertion;

use UnicaenPrivilege\Service\AuthorizeService;

use UnicaenPrivilege\Service\Perimetre\PerimetreCategorieService;

use Zend\Mvc\MvcEvent;

use Zend\ServiceManager\Factory\AbstractFactoryInterface;

use Laminas\Mvc\MvcEvent;

use Laminas\ServiceManager\Factory\AbstractFactoryInterface;



class AbstractPerimetreAssertionFactory implements AbstractFactoryInterface

{

src/UnicaenPrivilege/Controller/PerimetreCategorieController.php

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ use UnicaenPrivilege\Form\Perimetre\CategorieFormAwareTrait; 
use UnicaenPrivilege\Service\Perimetre\PerimetreCategorieServiceAwareTrait;

use UnicaenPrivilege\Service\Perimetre\PerimetreServiceAwareTrait;

use UnicaenUtilisateur\Service\Role\RoleServiceAwareTrait;

use Zend\Mvc\Controller\AbstractActionController;

use Zend\View\Model\ViewModel;

use Laminas\Mvc\Controller\AbstractActionController;

use Laminas\View\Model\ViewModel;



class PerimetreCategorieController extends AbstractActionController

{

src/UnicaenPrivilege/Controller/PerimetreController.php

+2 −2
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ use UnicaenPrivilege\Service\Perimetre\PerimetreServiceAwareTrait; 
use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieServiceAwareTrait;

use UnicaenPrivilege\Service\Privilege\PrivilegeServiceAwareTrait;

use UnicaenUtilisateur\Service\Role\RoleServiceAwareTrait;

use Zend\Mvc\Controller\AbstractActionController;

use Zend\View\Model\ViewModel;

use Laminas\Mvc\Controller\AbstractActionController;

use Laminas\View\Model\ViewModel;



class PerimetreController extends AbstractActionController

{

src/UnicaenPrivilege/Form/Perimetre/CategorieForm.php

+11 −11
Original line number Diff line number Diff line
@@ -5,17 +5,17 @@ namespace UnicaenPrivilege\Form\Perimetre; 
use UnicaenApp\Service\EntityManagerAwareTrait;

use UnicaenPrivilege\Service\Perimetre\PerimetreCategorieServiceAwareTrait;

use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieServiceAwareTrait;

use Zend\Filter\StringTrim;

use Zend\Filter\StripTags;

use Zend\Form\Element\Button;

use Zend\Form\Element\Number;

use Zend\Form\Element\Text;

use Zend\Form\Element\Textarea;

use Zend\Form\Form;

use Zend\InputFilter\Factory;

use Zend\Validator\Callback;

use Zend\Validator\NotEmpty;

use Zend\Validator\Regex;

use Laminas\Filter\StringTrim;

use Laminas\Filter\StripTags;

use Laminas\Form\Element\Button;

use Laminas\Form\Element\Number;

use Laminas\Form\Element\Text;

use Laminas\Form\Element\Textarea;

use Laminas\Form\Form;

use Laminas\InputFilter\Factory;

use Laminas\Validator\Callback;

use Laminas\Validator\NotEmpty;

use Laminas\Validator\Regex;



class CategorieForm extends Form

{