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

composer.json

@@ -8,8 +8,8 @@
         }
     ],
     "require": {
-        "unicaen/app": "^4.0.3",
-        "laminas/laminas-dependency-plugin": "^1.0"
+        "unicaen/app": "^4.0",
+        "laminas/laminas-dependency-plugin": "^2.1"
     },
     "require-dev": {
         "phpunit/phpunit": ">=3.7"

src/UnicaenPrivilege/Assertion/Perimetre/AbstractPerimetreAssertionFactory.php

@@ -3,7 +3,7 @@
 namespace UnicaenPrivilege\Assertion\Perimetre;
 
 use Doctrine\ORM\EntityManager;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use UnicaenAuthentification\Service\UserContext;
 use UnicaenPrivilege\Assertion\AbstractAssertion;
 use UnicaenPrivilege\Service\AuthorizeService;

src/UnicaenPrivilege/Controller/PerimetreCategorieControllerFactory.php

@@ -2,7 +2,7 @@
 
 namespace UnicaenPrivilege\Controller;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use UnicaenPrivilege\Form\Perimetre\CategorieForm;
 use UnicaenPrivilege\Service\Perimetre\PerimetreCategorieService;
 use UnicaenPrivilege\Service\Perimetre\PerimetreService;

src/UnicaenPrivilege/Controller/PerimetreControllerFactory.php

@@ -2,7 +2,7 @@
 
 namespace UnicaenPrivilege\Controller;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use UnicaenPrivilege\Form\Perimetre\PerimetreForm;
 use UnicaenPrivilege\Service\Perimetre\PerimetreCategorieService;
 use UnicaenPrivilege\Service\Perimetre\PerimetreService;

src/UnicaenPrivilege/Controller/PrivilegeCategorieControllerFactory.php

@@ -2,7 +2,7 @@
 
 namespace UnicaenPrivilege\Controller;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use UnicaenPrivilege\Form\Privilege\CategorieFiltreForm;
 use UnicaenPrivilege\Form\Privilege\CategorieForm;
 use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieService;

src/UnicaenPrivilege/Controller/PrivilegeControllerFactory.php

@@ -2,7 +2,7 @@
 
 namespace UnicaenPrivilege\Controller;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use UnicaenPrivilege\Form\Privilege\CategorieFiltreForm;
 use UnicaenPrivilege\Form\Privilege\PrivilegeForm;
 use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieService;

src/UnicaenPrivilege/Form/Perimetre/CategorieFormFactory.php

@@ -3,8 +3,8 @@
 namespace UnicaenPrivilege\Form\Perimetre;
 
 use Doctrine\ORM\EntityManager;
-use DoctrineModule\Stdlib\Hydrator\DoctrineObject;
-use Interop\Container\ContainerInterface;
+use Doctrine\Laminas\Hydrator\DoctrineObject;
+use Psr\Container\ContainerInterface;
 use UnicaenPrivilege\Service\Perimetre\PerimetreCategorieService;
 
 class CategorieFormFactory

src/UnicaenPrivilege/Form/Perimetre/PerimetreFormFactory.php

@@ -3,8 +3,8 @@
 namespace UnicaenPrivilege\Form\Perimetre;
 
 use Doctrine\ORM\EntityManager;
-use DoctrineModule\Stdlib\Hydrator\DoctrineObject;
-use Interop\Container\ContainerInterface;
+use Doctrine\Laminas\Hydrator\DoctrineObject;
+use Psr\Container\ContainerInterface;
 use UnicaenPrivilege\Service\Perimetre\PerimetreCategorieService;
 use UnicaenPrivilege\Service\Perimetre\PerimetreService;
 use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieService;

src/UnicaenPrivilege/Form/Privilege/CategorieFiltreFormFactory.php

@@ -3,7 +3,7 @@
 namespace  UnicaenPrivilege\Form\Privilege;
 
 use Doctrine\ORM\EntityManager;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieService;
 
 class CategorieFiltreFormFactory

src/UnicaenPrivilege/Form/Privilege/CategorieFormFactory.php

@@ -4,7 +4,7 @@ namespace UnicaenPrivilege\Form\Privilege;
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\Laminas\Hydrator\DoctrineObject;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieService;
 
 class CategorieFormFactory

src/UnicaenPrivilege/Form/Privilege/PrivilegeFormFactory.php

@@ -4,7 +4,7 @@ namespace UnicaenPrivilege\Form\Privilege;
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\Laminas\Hydrator\DoctrineObject;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieService;
 use UnicaenPrivilege\Service\Privilege\PrivilegeService;
 

src/UnicaenPrivilege/Guard/PrivilegeControllerFactory.php

@@ -2,7 +2,7 @@
 
 namespace UnicaenPrivilege\Guard;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use UnicaenPrivilege\Provider\Privilege\PrivilegeProviderInterface;
 use UnicaenPrivilege\Service\Privilege\PrivilegeService;
 

src/UnicaenPrivilege/Guard/PrivilegeRouteFactory.php

@@ -2,7 +2,7 @@
 
 namespace UnicaenPrivilege\Guard;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use UnicaenPrivilege\Provider\Privilege\PrivilegeProviderInterface;
 use UnicaenPrivilege\Service\Privilege\PrivilegeService;
 

src/UnicaenPrivilege/Provider/Rule/PrivilegeRuleProviderFactory.php

@@ -2,7 +2,7 @@
 
 namespace UnicaenPrivilege\Provider\Rule;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use UnicaenPrivilege\Provider\Privilege\PrivilegeProviderInterface;
 use UnicaenPrivilege\Service\Privilege\PrivilegeService;
 

src/UnicaenPrivilege/Service/AuthorizeServiceFactory.php

@@ -3,7 +3,7 @@
 namespace UnicaenPrivilege\Service;
 
 use BjyAuthorize\Provider\Identity\ProviderInterface;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use UnicaenAuthentification\Service\UserContext;
 use Laminas\ServiceManager\FactoryInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;

src/UnicaenPrivilege/Service/Perimetre/PerimetreCategorieServiceFactory.php

@@ -3,7 +3,7 @@
 namespace UnicaenPrivilege\Service\Perimetre;
 
 use Doctrine\ORM\EntityManager;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use UnicaenPrivilege\Entity\Db\Privilege;
 use UnicaenPrivilege\Entity\Db\Perimetre;
 

src/UnicaenPrivilege/Service/Perimetre/PerimetreServiceFactory.php

@@ -3,7 +3,7 @@
 namespace UnicaenPrivilege\Service\Perimetre;
 
 use Doctrine\ORM\EntityManager;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use UnicaenPrivilege\Entity\Db\Perimetre;
 
 class PerimetreServiceFactory

src/UnicaenPrivilege/Service/Privilege/PrivilegeCategorieServiceFactory.php

@@ -3,7 +3,7 @@
 namespace UnicaenPrivilege\Service\Privilege;
 
 use Doctrine\ORM\EntityManager;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use UnicaenPrivilege\Entity\Db\Privilege;
 
 class PrivilegeCategorieServiceFactory

src/UnicaenPrivilege/Service/Privilege/PrivilegeServiceFactory.php

@@ -3,7 +3,7 @@
 namespace UnicaenPrivilege\Service\Privilege;
 
 use Doctrine\ORM\EntityManager;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use UnicaenPrivilege\Entity\Db\Privilege;
 use UnicaenPrivilege\Service\Affectation\AffectationService;