Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
Pipeline #18743 passed
......@@ -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
{
......
......@@ -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
{
......
......@@ -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
{
......
......@@ -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
{
......
......@@ -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
{
......
......@@ -6,18 +6,18 @@ use DoctrineModule\Form\Element\ObjectSelect;
use UnicaenApp\Service\EntityManagerAwareTrait;
use UnicaenPrivilege\Service\Perimetre\PerimetreCategorieServiceAwareTrait;
use UnicaenPrivilege\Service\Perimetre\PerimetreServiceAwareTrait;
use Zend\Filter\StringTrim;
use Zend\Filter\StripTags;
use Zend\Form\Element\Button;
use Zend\Form\Element\Hidden;
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\Hidden;
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 PerimetreForm extends Form
{
......
......@@ -8,7 +8,7 @@ use UnicaenPrivilege\Entity\Db\PerimetreCategorieInterface;
use UnicaenPrivilege\Provider\Perimetre\PerimetreProviderInterface;
use UnicaenPrivilege\Service\CommonService;
use UnicaenUtilisateur\Entity\Db\RoleInterface;
use Zend\Mvc\Controller\AbstractActionController;
use Laminas\Mvc\Controller\AbstractActionController;
class PerimetreCategorieService extends CommonService implements PerimetreProviderInterface
{
......
......@@ -9,7 +9,7 @@ use UnicaenPrivilege\Entity\Db\PerimetreCategorieInterface;
use UnicaenPrivilege\Entity\Db\PerimetreInterface;
use UnicaenPrivilege\Exception\RuntimeException;
use UnicaenPrivilege\Service\CommonService;
use Zend\Mvc\Controller\AbstractActionController;
use Laminas\Mvc\Controller\AbstractActionController;
class PerimetreService extends CommonService
{
......
......@@ -7,7 +7,7 @@ use UnicaenPrivilege\Entity\Db\PerimetreInterface;
use UnicaenPrivilege\Provider\Privilege\PerimetrePrivileges;
use UnicaenPrivilege\Provider\Privilege\PrivilegePrivileges;
use UnicaenUtilisateur\Entity\Db\RoleInterface;
use Zend\View\Helper\AbstractHelper;
use Laminas\View\Helper\AbstractHelper;
class PerimetreCategorieViewHelper extends AbstractHelper
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment