Remplacement Zend => Laminas

Module.php

@@ -2,11 +2,11 @@
 
 namespace UnicaenAutoform;
 
-use Zend\Mvc\ModuleRouteListener;
-use Zend\Mvc\MvcEvent;
-use Zend\Stdlib\ArrayUtils;
-use Zend\Stdlib\Glob;
-use Zend\Config\Factory as ConfigFactory;
+use Laminas\Mvc\ModuleRouteListener;
+use Laminas\Mvc\MvcEvent;
+use Laminas\Stdlib\ArrayUtils;
+use Laminas\Stdlib\Glob;
+use Laminas\Config\Factory as ConfigFactory;
 
 class Module
 {
@@ -36,7 +36,7 @@ class Module
     public function getAutoloaderConfig()
     {
         return array(
-            'Zend\Loader\StandardAutoloader' => array(
+            'Laminas\Loader\StandardAutoloader' => array(
                 'namespaces' => array(
                     __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
                 ),

composer.json

@@ -8,14 +8,11 @@
         }
     ],
     "require": {
-        "unicaen/app":                                  "^3.0",
-        "unicaen/bjy-authorize":                        "^3.0",
-        "ramsey/uuid":                                  "^3.7",
-        "unicaen/utilisateur":                          "dev-master",
-        "unicaen/privilege":                            "dev-master"
-    },
-    "require-dev": {
-        "phpunit/phpunit":                              "^5.6"
+        "unicaen/app":                                  "^4.0",
+        "unicaen/bjy-authorize":                        "^4.0",
+        "unicaen/utilisateur":                          "^4.0",
+        "unicaen/privilege":                            "^4.0",
+        "ramsey/uuid":                                  "^3.7"
     },
     "autoload": {
         "psr-0": {

config/merged/formulaire.config.php

@@ -22,8 +22,8 @@ use UnicaenAutoform\Service\Formulaire\FormulaireReponseServiceFactory;
 use UnicaenAutoform\Service\Formulaire\FormulaireService;
 use UnicaenAutoform\Service\Formulaire\FormulaireServiceFactory;
 use UnicaenPrivilege\Guard\PrivilegeController;
-use Zend\Router\Http\Literal;
-use Zend\Router\Http\Segment;
+use Laminas\Router\Http\Literal;
+use Laminas\Router\Http\Segment;
 
 return [
     'bjyauthorize' => [

config/merged/index.config.php

@@ -6,7 +6,7 @@ use UnicaenAutoform\Controller\IndexController;
 use UnicaenAutoform\Controller\IndexControllerFactory;
 use UnicaenAutoform\Provider\Privilege\IndexPrivileges;
 use UnicaenPrivilege\Guard\PrivilegeController;
-use Zend\Router\Http\Literal;
+use Laminas\Router\Http\Literal;
 
 return [
     'bjyauthorize' => [

config/merged/validation.config.php

@@ -10,8 +10,8 @@ use UnicaenAutoform\Service\Validation\ValidationReponseServiceFactory;
 use UnicaenAutoform\Service\Validation\ValidationService;
 use UnicaenAutoform\Service\Validation\ValidationServiceFactory;
 use UnicaenPrivilege\Guard\PrivilegeController;
-use Zend\Router\Http\Literal;
-use Zend\Router\Http\Segment;
+use Laminas\Router\Http\Literal;
+use Laminas\Router\Http\Segment;
 
 return [
     'bjyauthorize' => [

src/UnicaenAutoform/Controller/FormulaireController.php

@@ -15,11 +15,12 @@ use UnicaenAutoform\Service\Champ\ChampServiceAwareTrait;
 use UnicaenAutoform\Service\Formulaire\FormulaireInstanceServiceAwareTrait;
 use UnicaenAutoform\Service\Formulaire\FormulaireReponseServiceAwareTrait;
 use UnicaenAutoform\Service\Formulaire\FormulaireServiceAwareTrait;
-use Zend\Http\Request;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Http\Request;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
-class FormulaireController extends AbstractActionController {
+class FormulaireController extends AbstractActionController
+{
     use CategorieServiceAwareTrait;
     use ChampServiceAwareTrait;
     use FormulaireServiceAwareTrait;
@@ -69,7 +70,8 @@ class FormulaireController extends AbstractActionController {
         return $vm;
     }
 
-    public function modifierAction() {
+    public function modifierAction()
+    {
         /** @var Formulaire $formulaire */
         $formulaire = $this->getFormulaireService()->getRequestedFormulaire($this, 'formulaire');
 
@@ -78,7 +80,8 @@ class FormulaireController extends AbstractActionController {
         ]);
     }
 
-    public function modifierDescriptionAction() {
+    public function modifierDescriptionAction()
+    {
         /** @var Formulaire $formulaire */
         $formulaire = $this->getFormulaireService()->getRequestedFormulaire($this, 'formulaire');
 
@@ -105,7 +108,8 @@ class FormulaireController extends AbstractActionController {
         return $vm;
     }
 
-    public function historiserAction() {
+    public function historiserAction()
+    {
         /** @var Formulaire $formulaire */
         $formulaire = $this->getFormulaireService()->getRequestedFormulaire($this, 'formulaire');
         $this->getFormulaireService()->historise($formulaire);
@@ -113,7 +117,8 @@ class FormulaireController extends AbstractActionController {
         return $this->redirect()->toRoute('autoform/formulaires', [], [], true);
     }
 
-    public function restaurerAction() {
+    public function restaurerAction()
+    {
         /** @var Formulaire $formulaire */
         $formulaire = $this->getFormulaireService()->getRequestedFormulaire($this, 'formulaire');
         $this->getFormulaireService()->restaure($formulaire);
@@ -121,7 +126,8 @@ class FormulaireController extends AbstractActionController {
         return $this->redirect()->toRoute('autoform/formulaires', [], [], true);
     }
 
-    public function detruireAction() {
+    public function detruireAction()
+    {
         /** @var Formulaire $formulaire */
         $formulaire = $this->getFormulaireService()->getRequestedFormulaire($this, 'formulaire');
         $this->getFormulaireService()->delete($formulaire);
@@ -131,7 +137,8 @@ class FormulaireController extends AbstractActionController {
 
     /** GESTION DES CATEGORIES ****************************************************************************************/
 
-    public function ajouterCategorieAction() {
+    public function ajouterCategorieAction()
+    {
         $formulaire = $this->getFormulaireService()->getRequestedFormulaire($this, 'formulaire');
         $categorie = new Categorie();
 
@@ -163,7 +170,8 @@ class FormulaireController extends AbstractActionController {
         return $vm;
     }
 
-    public function modifierCategorieAction() {
+    public function modifierCategorieAction()
+    {
         $formulaire = $this->getFormulaireService()->getRequestedFormulaire($this, 'formulaire');
         $categorie = $this->getCategorieService()->getRequestedCategorie($this, 'categorie');
 
@@ -190,7 +198,8 @@ class FormulaireController extends AbstractActionController {
         return $vm;
     }
 
-    public function historiserCategorieAction() {
+    public function historiserCategorieAction()
+    {
         $formulaire = $this->getFormulaireService()->getRequestedFormulaire($this, 'formulaire');
         $categorie = $this->getCategorieService()->getRequestedCategorie($this, 'categorie');
         $this->getCategorieService()->historise($categorie);
@@ -198,7 +207,8 @@ class FormulaireController extends AbstractActionController {
         return $this->redirect()->toRoute('autoform/formulaire/modifier', ['formulaire' => $formulaire->getId()], [], true);
     }
 
-    public function restaurerCategorieAction() {
+    public function restaurerCategorieAction()
+    {
         $formulaire = $this->getFormulaireService()->getRequestedFormulaire($this, 'formulaire');
         $categorie = $this->getCategorieService()->getRequestedCategorie($this, 'categorie');
         $this->getCategorieService()->restaure($categorie);
@@ -206,7 +216,8 @@ class FormulaireController extends AbstractActionController {
         return $this->redirect()->toRoute('autoform/formulaire/modifier', ['formulaire' => $formulaire->getId()], [], true);
     }
 
-    public function detruireCategorieAction() {
+    public function detruireCategorieAction()
+    {
         $formulaire = $this->getFormulaireService()->getRequestedFormulaire($this, 'formulaire');
         $categorie = $this->getCategorieService()->getRequestedCategorie($this, 'categorie');
         $this->getCategorieService()->delete($categorie);
@@ -215,7 +226,8 @@ class FormulaireController extends AbstractActionController {
         return $this->redirect()->toRoute('autoform/formulaire/modifier', ['formulaire' => $formulaire->getId()], [], true);
     }
 
-    public function bougerCategorieAction() {
+    public function bougerCategorieAction()
+    {
         $formulaire = $this->getFormulaireService()->getRequestedFormulaire($this, 'formulaire');
         $categorie = $this->getCategorieService()->getRequestedCategorie($this, 'categorie');
         $direction = $this->params()->fromRoute('direction');
@@ -230,7 +242,8 @@ class FormulaireController extends AbstractActionController {
 
     /** GESTION DES CHAMPS ********************************************************************************************/
 
-    public function ajouterChampAction() {
+    public function ajouterChampAction()
+    {
         $formulaire = $this->getFormulaireService()->getRequestedFormulaire($this, 'formulaire');
         $categorie = $this->getCategorieService()->getRequestedCategorie($this, 'categorie');
         $champ = new Champ();
@@ -291,7 +304,8 @@ class FormulaireController extends AbstractActionController {
         return $vm;
     }
 
-    public function historiserChampAction() {
+    public function historiserChampAction()
+    {
         $formulaire = $this->getFormulaireService()->getRequestedFormulaire($this, 'formulaire');
         $champ = $this->getChampService()->getRequestedChamp($this, 'champ');
         $this->getChampService()->historise($champ);
@@ -299,7 +313,8 @@ class FormulaireController extends AbstractActionController {
         return $this->redirect()->toRoute('autoform/formulaire/modifier', ['formulaire' => $formulaire->getId()], [], true);
     }
 
-    public function restaurerChampAction() {
+    public function restaurerChampAction()
+    {
         $formulaire = $this->getFormulaireService()->getRequestedFormulaire($this, 'formulaire');
         $champ = $this->getChampService()->getRequestedChamp($this, 'champ');
         $this->getChampService()->restaure($champ);
@@ -307,7 +322,8 @@ class FormulaireController extends AbstractActionController {
         return $this->redirect()->toRoute('autoform/formulaire/modifier', ['formulaire' => $formulaire->getId()], [], true);
     }
 
-    public function detruireChampAction() {
+    public function detruireChampAction()
+    {
         $formulaire = $this->getFormulaireService()->getRequestedFormulaire($this, 'formulaire');
         $categorie = $this->getCategorieService()->getRequestedCategorie($this, 'categorie');
         $champ = $this->getChampService()->getRequestedChamp($this, 'champ');
@@ -317,7 +333,8 @@ class FormulaireController extends AbstractActionController {
         return $this->redirect()->toRoute('autoform/formulaire/modifier', ['formulaire' => $formulaire->getId()], [], true);
     }
 
-    public function bougerChampAction() {
+    public function bougerChampAction()
+    {
         $formulaire = $this->getFormulaireService()->getRequestedFormulaire($this, 'formulaire');
         $champ = $this->getChampService()->getRequestedChamp($this, 'champ');
         $direction = $this->params()->fromRoute('direction');
@@ -335,7 +352,8 @@ class FormulaireController extends AbstractActionController {
     /**
      * si dans les paramètres passés en query on a retour alors la redirection "finale" doit être vers cette adresse
      */
-    public function afficherFormulaireAction() {
+    public function afficherFormulaireAction()
+    {
         $formulaire = $this->getFormulaireService()->getRequestedFormulaire($this, 'formulaire');
         $instance = $this->getFormulaireInstanceService()->getRequestedFormulaireInstance($this, 'instance');
         $retour = $this->params()->fromQuery('retour');
@@ -377,7 +395,8 @@ class FormulaireController extends AbstractActionController {
         ]);
     }
 
-    public function afficherResultatAction() {
+    public function afficherResultatAction()
+    {
         $formulaire = $this->getFormulaireService()->getRequestedFormulaire($this, 'formulaire');
         $instance = $this->getFormulaireInstanceService()->getRequestedFormulaireInstance($this, 'instance');
         $reponses = $this->getFormulaireReponseService()->getFormulaireResponsesByFormulaireInstance($instance);

src/UnicaenAutoform/Controller/IndexController.php

@@ -2,8 +2,8 @@
 
 namespace UnicaenAutoform\Controller;
 
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class IndexController extends AbstractActionController {
 

src/UnicaenAutoform/Controller/ValidationController.php

@@ -7,9 +7,9 @@ use UnicaenAutoform\Service\Formulaire\FormulaireInstanceServiceAwareTrait;
 use UnicaenAutoform\Service\Formulaire\FormulaireReponseServiceAwareTrait;
 use UnicaenAutoform\Service\Validation\ValidationReponseServiceAwareTrait;
 use UnicaenAutoform\Service\Validation\ValidationServiceAwareTrait;
-use Zend\Http\Request;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Http\Request;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class ValidationController extends AbstractActionController {
     use FormulaireInstanceServiceAwareTrait;

src/UnicaenAutoform/Controller/ValidationControllerFactory.php

@@ -7,7 +7,7 @@ use UnicaenAutoform\Service\Formulaire\FormulaireReponseService;
 use UnicaenAutoform\Service\Validation\ValidationReponseService;
 use UnicaenAutoform\Service\Validation\ValidationService;
 use Interop\Container\ContainerInterface;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 class ValidationControllerFactory {
 

src/UnicaenAutoform/Form/Categorie/CategorieForm.php

@@ -2,10 +2,10 @@
 
 namespace UnicaenAutoform\Form\Categorie;
 
-use Zend\Form\Element\Button;
-use Zend\Form\Element\Text;
-use Zend\Form\Form;
-use Zend\InputFilter\Factory;
+use Laminas\Form\Element\Button;
+use Laminas\Form\Element\Text;
+use Laminas\Form\Form;
+use Laminas\InputFilter\Factory;
 
 class CategorieForm extends Form {
 

src/UnicaenAutoform/Form/Categorie/CategorieHydrator.php

@@ -3,7 +3,7 @@
 namespace UnicaenAutoform\Form\Categorie;
 
 use UnicaenAutoform\Entity\Db\Categorie;
-use Zend\Hydrator\HydratorInterface;
+use Laminas\Hydrator\HydratorInterface;
 
 class CategorieHydrator implements HydratorInterface {
 
@@ -11,7 +11,7 @@ class CategorieHydrator implements HydratorInterface {
      * @param Categorie $object
      * @return array
      */
-    public function extract($object)
+    public function extract(object $object)
     {
         $data = [
             'libelle' => $object->getLibelle(),
@@ -24,7 +24,7 @@ class CategorieHydrator implements HydratorInterface {
      * @param Categorie $object
      * @return Categorie
      */
-    public function hydrate(array $data, $object)
+    public function hydrate(array $data, object $object)
     {
         $object->setLibelle($data['libelle']);
         return $object;

src/UnicaenAutoform/Form/Champ/ChampForm.php

@@ -3,11 +3,11 @@
 namespace UnicaenAutoform\Form\Champ;
 
 use UnicaenAutoform\Entity\Db\Champ;
-use Zend\Form\Element\Button;
-use Zend\Form\Element\Select;
-use Zend\Form\Element\Text;
-use Zend\Form\Form;
-use Zend\InputFilter\Factory;
+use Laminas\Form\Element\Button;
+use Laminas\Form\Element\Select;
+use Laminas\Form\Element\Text;
+use Laminas\Form\Form;
+use Laminas\InputFilter\Factory;
 
 class ChampForm extends Form {
 

src/UnicaenAutoform/Form/Champ/ChampHydrator.php

@@ -3,7 +3,7 @@
 namespace UnicaenAutoform\Form\Champ;
 
 use UnicaenAutoform\Entity\Db\Champ;
-use Zend\Hydrator\HydratorInterface;
+use Laminas\Hydrator\HydratorInterface;
 
 class ChampHydrator implements HydratorInterface {
 
@@ -11,7 +11,7 @@ class ChampHydrator implements HydratorInterface {
      * @param Champ $object
      * @return array
      */
-    public function extract($object)
+    public function extract(object $object)
     {
         $data = [
             'type'      => $object->getElement(),
@@ -27,7 +27,7 @@ class ChampHydrator implements HydratorInterface {
      * @param Champ $object
      * @return Champ
      */
-    public function hydrate(array $data, $object)
+    public function hydrate(array $data, object $object)
     {
         $object->setElement($data['type']);
         $object->setLibelle($data['libelle']);

src/UnicaenAutoform/Form/Formulaire/FormulaireForm.php

@@ -2,11 +2,11 @@
 
 namespace UnicaenAutoform\Form\Formulaire;
 
-use Zend\Form\Element\Button;
-use Zend\Form\Element\Text;
-use Zend\Form\Element\Textarea;
-use Zend\Form\Form;
-use Zend\InputFilter\Factory;
+use Laminas\Form\Element\Button;
+use Laminas\Form\Element\Text;
+use Laminas\Form\Element\Textarea;
+use Laminas\Form\Form;
+use Laminas\InputFilter\Factory;
 
 class FormulaireForm extends Form {
 

src/UnicaenAutoform/Form/Formulaire/FormulaireHydrator.php

@@ -3,7 +3,7 @@
 namespace UnicaenAutoform\Form\Formulaire;
 
 use UnicaenAutoform\Entity\Db\Formulaire;
-use Zend\Hydrator\HydratorInterface;
+use Laminas\Hydrator\HydratorInterface;
 
 class FormulaireHydrator implements HydratorInterface {
 
@@ -11,7 +11,7 @@ class FormulaireHydrator implements HydratorInterface {
      * @param Formulaire $object
      * @return array
      */
-    public function extract($object)
+    public function extract(object $object)
     {
         $data = [
             'libelle' => $object->getLibelle(),
@@ -26,7 +26,7 @@ class FormulaireHydrator implements HydratorInterface {
      * @param Formulaire $object
      * @return Formulaire
      */
-    public function hydrate(array $data, $object)
+    public function hydrate(array $data, object $object)
     {
         $object->setLibelle($data['libelle']);
         $object->setDescription($data['description']?:null);

src/UnicaenAutoform/Service/Categorie/CategorieService.php

@@ -9,7 +9,7 @@ use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\ORMException;
 use UnicaenApp\Exception\RuntimeException;
 use UnicaenApp\Service\EntityManagerAwareTrait;
-use Zend\Mvc\Controller\AbstractActionController;
+use Laminas\Mvc\Controller\AbstractActionController;
 
 class CategorieService {
     use ChampServiceAwareTrait;

src/UnicaenAutoform/Service/Champ/ChampService.php

@@ -8,7 +8,7 @@ use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\ORMException;
 use UnicaenApp\Exception\RuntimeException;
 use UnicaenApp\Service\EntityManagerAwareTrait;
-use Zend\Mvc\Controller\AbstractActionController;
+use Laminas\Mvc\Controller\AbstractActionController;
 
 class ChampService {
     use EntityManagerAwareTrait;

src/UnicaenAutoform/Service/Formulaire/FormulaireInstanceService.php

@@ -8,7 +8,7 @@ use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\ORMException;
 use UnicaenApp\Exception\RuntimeException;
 use UnicaenApp\Service\EntityManagerAwareTrait;
-use Zend\Mvc\Controller\AbstractActionController;
+use Laminas\Mvc\Controller\AbstractActionController;
 
 class FormulaireInstanceService {
     use FormulaireServiceAwareTrait;

src/UnicaenAutoform/Service/Formulaire/FormulaireService.php

@@ -10,7 +10,7 @@ use Doctrine\ORM\ORMException;
 use Doctrine\ORM\QueryBuilder;
 use UnicaenApp\Exception\RuntimeException;
 use UnicaenApp\Service\EntityManagerAwareTrait;
-use Zend\Mvc\Controller\AbstractActionController;
+use Laminas\Mvc\Controller\AbstractActionController;
 
 class FormulaireService {
     use EntityManagerAwareTrait;

src/UnicaenAutoform/Service/Validation/ValidationReponseService.php

@@ -11,7 +11,7 @@ use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\ORMException;
 use UnicaenApp\Exception\RuntimeException;
 use UnicaenApp\Service\EntityManagerAwareTrait;
-use Zend\Mvc\Controller\AbstractActionController;
+use Laminas\Mvc\Controller\AbstractActionController;
 
 class ValidationReponseService {
     use EntityManagerAwareTrait;