From d57103eb2c21d4fb72d0379a2ddc712f5bc6a78e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Metivier <jean-philippe.metivier@unicaen.fr>
Date: Tue, 12 Jul 2022 12:06:34 +0200
Subject: [PATCH] Remplacement Zend => Laminas
---
Module.php | 12 +--
composer.json | 13 ++-
config/merged/formulaire.config.php | 4 +-
config/merged/index.config.php | 2 +-
config/merged/validation.config.php | 4 +-
.../Controller/FormulaireController.php | 87 +++++++++++--------
.../Controller/IndexController.php | 4 +-
.../Controller/ValidationController.php | 6 +-
.../ValidationControllerFactory.php | 2 +-
.../Form/Categorie/CategorieForm.php | 8 +-
.../Form/Categorie/CategorieHydrator.php | 6 +-
src/UnicaenAutoform/Form/Champ/ChampForm.php | 10 +--
.../Form/Champ/ChampHydrator.php | 6 +-
.../Form/Formulaire/FormulaireForm.php | 10 +--
.../Form/Formulaire/FormulaireHydrator.php | 6 +-
.../Service/Categorie/CategorieService.php | 2 +-
.../Service/Champ/ChampService.php | 2 +-
.../Formulaire/FormulaireInstanceService.php | 2 +-
.../Service/Formulaire/FormulaireService.php | 2 +-
.../Validation/ValidationReponseService.php | 2 +-
.../Service/Validation/ValidationService.php | 2 +-
.../View/Helper/ChampAsInputHelper.php | 6 +-
.../View/Helper/ChampAsResultHelper.php | 6 +-
.../View/Helper/ChampAsValidationHelper.php | 2 +-
.../View/Helper/InstanceAsDivHelper.php | 2 +-
.../Helper/InstanceAsFormulaireHelper.php | 6 +-
.../View/Helper/InstanceAsTextHelper.php | 2 +-
.../View/Helper/ValidationAsTextHelper.php | 2 +-
28 files changed, 117 insertions(+), 101 deletions(-)
diff --git a/Module.php b/Module.php
index a6f5d60..7dd1936 100644
--- a/Module.php
+++ b/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__,
),
diff --git a/composer.json b/composer.json
index 473a366..9d30901 100644
--- a/composer.json
+++ b/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": {
diff --git a/config/merged/formulaire.config.php b/config/merged/formulaire.config.php
index 23bf904..1aeada6 100644
--- a/config/merged/formulaire.config.php
+++ b/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' => [
diff --git a/config/merged/index.config.php b/config/merged/index.config.php
index 148fc34..57598b3 100644
--- a/config/merged/index.config.php
+++ b/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' => [
diff --git a/config/merged/validation.config.php b/config/merged/validation.config.php
index 24b9b5d..7fd32f4 100644
--- a/config/merged/validation.config.php
+++ b/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' => [
diff --git a/src/UnicaenAutoform/Controller/FormulaireController.php b/src/UnicaenAutoform/Controller/FormulaireController.php
index 66fd9c7..91929ab 100644
--- a/src/UnicaenAutoform/Controller/FormulaireController.php
+++ b/src/UnicaenAutoform/Controller/FormulaireController.php
@@ -1,4 +1,4 @@
-<?php
+<?php
namespace UnicaenAutoform\Controller;
@@ -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,33 +108,37 @@ 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);
- return $this->redirect()->toRoute('autoform/formulaires', [], [] , true);
+ 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);
- return $this->redirect()->toRoute('autoform/formulaires', [], [] , true);
+ 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);
- return $this->redirect()->toRoute('autoform/formulaires', [], [] , true);
+ return $this->redirect()->toRoute('autoform/formulaires', [], [], true);
}
/** GESTION DES CATEGORIES ****************************************************************************************/
- public function ajouterCategorieAction() {
+ public function ajouterCategorieAction()
+ {
$formulaire = $this->getFormulaireService()->getRequestedFormulaire($this, 'formulaire');
$categorie = new Categorie();
@@ -149,7 +156,7 @@ class FormulaireController extends AbstractActionController {
$this->getFormulaireService()->compacter($formulaire);
$categorie->setFormulaire($formulaire);
$categorie->setOrdre(count($formulaire->getCategories()) + 1);
- $categorie->setCode($formulaire->getId(). "_" . uniqid());
+ $categorie->setCode($formulaire->getId() . "_" . uniqid());
$this->getCategorieService()->create($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();
@@ -248,7 +261,7 @@ class FormulaireController extends AbstractActionController {
$this->getCategorieService()->compacter($categorie);
$champ->setCategorie($categorie);
$champ->setOrdre(count($categorie->getChamps()) + 1);
- $champ->setCode($formulaire->getId(). "_". $categorie->getId() ."_" . uniqid());
+ $champ->setCode($formulaire->getId() . "_" . $categorie->getId() . "_" . uniqid());
$this->getChampService()->create($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');
@@ -366,18 +384,19 @@ class FormulaireController extends AbstractActionController {
$reponses = $this->getFormulaireReponseService()->getFormulaireResponsesByFormulaireInstance($instance);
$url = $this->url()->fromRoute('autoform/formulaire/afficher-formulaire', ['formulaire' => $formulaire->getId(), 'instance' => $instance->getId()], [], true);
- if ($retour) $url = $this->url()->fromRoute('autoform/formulaire/afficher-formulaire', ['formulaire' => $formulaire->getId(), 'instance' => $instance->getId()], ['query' => ['retour'=>$retour]], true);
+ if ($retour) $url = $this->url()->fromRoute('autoform/formulaire/afficher-formulaire', ['formulaire' => $formulaire->getId(), 'instance' => $instance->getId()], ['query' => ['retour' => $retour]], true);
return new ViewModel([
- 'formulaire' => $formulaire,
- 'instance' => $instance,
- 'reponses' => $reponses,
- 'url' => $url,
- 'retour' => $retour,
+ 'formulaire' => $formulaire,
+ 'instance' => $instance,
+ 'reponses' => $reponses,
+ 'url' => $url,
+ 'retour' => $retour,
]);
}
- public function afficherResultatAction() {
+ public function afficherResultatAction()
+ {
$formulaire = $this->getFormulaireService()->getRequestedFormulaire($this, 'formulaire');
$instance = $this->getFormulaireInstanceService()->getRequestedFormulaireInstance($this, 'instance');
$reponses = $this->getFormulaireReponseService()->getFormulaireResponsesByFormulaireInstance($instance);
diff --git a/src/UnicaenAutoform/Controller/IndexController.php b/src/UnicaenAutoform/Controller/IndexController.php
index 624cda5..a5d9b30 100644
--- a/src/UnicaenAutoform/Controller/IndexController.php
+++ b/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 {
diff --git a/src/UnicaenAutoform/Controller/ValidationController.php b/src/UnicaenAutoform/Controller/ValidationController.php
index 720eb79..380f57d 100644
--- a/src/UnicaenAutoform/Controller/ValidationController.php
+++ b/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;
diff --git a/src/UnicaenAutoform/Controller/ValidationControllerFactory.php b/src/UnicaenAutoform/Controller/ValidationControllerFactory.php
index 97c2402..ab9d44e 100644
--- a/src/UnicaenAutoform/Controller/ValidationControllerFactory.php
+++ b/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 {
diff --git a/src/UnicaenAutoform/Form/Categorie/CategorieForm.php b/src/UnicaenAutoform/Form/Categorie/CategorieForm.php
index 1678600..ccd9ff2 100644
--- a/src/UnicaenAutoform/Form/Categorie/CategorieForm.php
+++ b/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 {
diff --git a/src/UnicaenAutoform/Form/Categorie/CategorieHydrator.php b/src/UnicaenAutoform/Form/Categorie/CategorieHydrator.php
index e5dcf4c..a451ae8 100644
--- a/src/UnicaenAutoform/Form/Categorie/CategorieHydrator.php
+++ b/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;
diff --git a/src/UnicaenAutoform/Form/Champ/ChampForm.php b/src/UnicaenAutoform/Form/Champ/ChampForm.php
index 55f11ab..38d3869 100644
--- a/src/UnicaenAutoform/Form/Champ/ChampForm.php
+++ b/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 {
diff --git a/src/UnicaenAutoform/Form/Champ/ChampHydrator.php b/src/UnicaenAutoform/Form/Champ/ChampHydrator.php
index 94cd334..059fea2 100644
--- a/src/UnicaenAutoform/Form/Champ/ChampHydrator.php
+++ b/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']);
diff --git a/src/UnicaenAutoform/Form/Formulaire/FormulaireForm.php b/src/UnicaenAutoform/Form/Formulaire/FormulaireForm.php
index f415a60..cf7eebb 100644
--- a/src/UnicaenAutoform/Form/Formulaire/FormulaireForm.php
+++ b/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 {
diff --git a/src/UnicaenAutoform/Form/Formulaire/FormulaireHydrator.php b/src/UnicaenAutoform/Form/Formulaire/FormulaireHydrator.php
index c4fd975..6d6d684 100644
--- a/src/UnicaenAutoform/Form/Formulaire/FormulaireHydrator.php
+++ b/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);
diff --git a/src/UnicaenAutoform/Service/Categorie/CategorieService.php b/src/UnicaenAutoform/Service/Categorie/CategorieService.php
index be4d6d5..f7d7d33 100644
--- a/src/UnicaenAutoform/Service/Categorie/CategorieService.php
+++ b/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;
diff --git a/src/UnicaenAutoform/Service/Champ/ChampService.php b/src/UnicaenAutoform/Service/Champ/ChampService.php
index 2a20112..b50c550 100644
--- a/src/UnicaenAutoform/Service/Champ/ChampService.php
+++ b/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;
diff --git a/src/UnicaenAutoform/Service/Formulaire/FormulaireInstanceService.php b/src/UnicaenAutoform/Service/Formulaire/FormulaireInstanceService.php
index b6abe96..3e06a4d 100644
--- a/src/UnicaenAutoform/Service/Formulaire/FormulaireInstanceService.php
+++ b/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;
diff --git a/src/UnicaenAutoform/Service/Formulaire/FormulaireService.php b/src/UnicaenAutoform/Service/Formulaire/FormulaireService.php
index 7019754..a74e6fc 100644
--- a/src/UnicaenAutoform/Service/Formulaire/FormulaireService.php
+++ b/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;
diff --git a/src/UnicaenAutoform/Service/Validation/ValidationReponseService.php b/src/UnicaenAutoform/Service/Validation/ValidationReponseService.php
index 2364b98..0956d5e 100644
--- a/src/UnicaenAutoform/Service/Validation/ValidationReponseService.php
+++ b/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;
diff --git a/src/UnicaenAutoform/Service/Validation/ValidationService.php b/src/UnicaenAutoform/Service/Validation/ValidationService.php
index 7409c5c..064f469 100644
--- a/src/UnicaenAutoform/Service/Validation/ValidationService.php
+++ b/src/UnicaenAutoform/Service/Validation/ValidationService.php
@@ -10,7 +10,7 @@ use Doctrine\ORM\ORMException;
use UnicaenApp\Exception\RuntimeException;
use UnicaenApp\Service\EntityManagerAwareTrait;
use UnicaenUtilisateur\Service\User\UserServiceAwareTrait;
-use Zend\Mvc\Controller\AbstractActionController;
+use Laminas\Mvc\Controller\AbstractActionController;
class ValidationService {
use EntityManagerAwareTrait;
diff --git a/src/UnicaenAutoform/View/Helper/ChampAsInputHelper.php b/src/UnicaenAutoform/View/Helper/ChampAsInputHelper.php
index d9f8e84..ced814e 100644
--- a/src/UnicaenAutoform/View/Helper/ChampAsInputHelper.php
+++ b/src/UnicaenAutoform/View/Helper/ChampAsInputHelper.php
@@ -6,9 +6,9 @@ use UnicaenAutoform\Entity\Db\Champ;
use UnicaenAutoform\Entity\Db\FormulaireReponse;
use UnicaenAutoform\Service\Champ\ChampServiceAwareTrait;
use DateTime;
-use Zend\Form\View\Helper\AbstractHelper;
-use Zend\View\Renderer\PhpRenderer;
-use Zend\View\Resolver\TemplatePathStack;
+use Laminas\Form\View\Helper\AbstractHelper;
+use Laminas\View\Renderer\PhpRenderer;
+use Laminas\View\Resolver\TemplatePathStack;
class ChampAsInputHelper extends AbstractHelper
{
diff --git a/src/UnicaenAutoform/View/Helper/ChampAsResultHelper.php b/src/UnicaenAutoform/View/Helper/ChampAsResultHelper.php
index e4ec956..6400e6c 100644
--- a/src/UnicaenAutoform/View/Helper/ChampAsResultHelper.php
+++ b/src/UnicaenAutoform/View/Helper/ChampAsResultHelper.php
@@ -4,9 +4,9 @@ namespace UnicaenAutoform\View\Helper;
use UnicaenAutoform\Entity\Db\Champ;
use UnicaenAutoform\Service\Champ\ChampServiceAwareTrait;
-use Zend\Form\View\Helper\AbstractHelper;
-use Zend\View\Renderer\PhpRenderer;
-use Zend\View\Resolver\TemplatePathStack;
+use Laminas\Form\View\Helper\AbstractHelper;
+use Laminas\View\Renderer\PhpRenderer;
+use Laminas\View\Resolver\TemplatePathStack;
class ChampAsResultHelper extends AbstractHelper
{
diff --git a/src/UnicaenAutoform/View/Helper/ChampAsValidationHelper.php b/src/UnicaenAutoform/View/Helper/ChampAsValidationHelper.php
index 677a086..3df0b8f 100644
--- a/src/UnicaenAutoform/View/Helper/ChampAsValidationHelper.php
+++ b/src/UnicaenAutoform/View/Helper/ChampAsValidationHelper.php
@@ -4,7 +4,7 @@ namespace UnicaenAutoform\View\Helper;
use UnicaenAutoform\Entity\Db\Champ;
use UnicaenAutoform\Service\Champ\ChampServiceAwareTrait;
-use Zend\Form\View\Helper\AbstractHelper;
+use Laminas\Form\View\Helper\AbstractHelper;
class ChampAsValidationHelper extends AbstractHelper
{
diff --git a/src/UnicaenAutoform/View/Helper/InstanceAsDivHelper.php b/src/UnicaenAutoform/View/Helper/InstanceAsDivHelper.php
index ff2c21c..bb1ea4b 100644
--- a/src/UnicaenAutoform/View/Helper/InstanceAsDivHelper.php
+++ b/src/UnicaenAutoform/View/Helper/InstanceAsDivHelper.php
@@ -5,7 +5,7 @@ namespace UnicaenAutoform\View\Helper;
use UnicaenAutoform\Entity\Db\Categorie;
use UnicaenAutoform\Entity\Db\Champ;
use UnicaenAutoform\Entity\Db\FormulaireInstance;
-use Zend\Form\View\Helper\AbstractHelper;
+use Laminas\Form\View\Helper\AbstractHelper;
class InstanceAsDivHelper extends AbstractHelper
{
diff --git a/src/UnicaenAutoform/View/Helper/InstanceAsFormulaireHelper.php b/src/UnicaenAutoform/View/Helper/InstanceAsFormulaireHelper.php
index a15116d..26c5c0a 100644
--- a/src/UnicaenAutoform/View/Helper/InstanceAsFormulaireHelper.php
+++ b/src/UnicaenAutoform/View/Helper/InstanceAsFormulaireHelper.php
@@ -5,9 +5,9 @@ namespace UnicaenAutoform\View\Helper;
use UnicaenAutoform\Entity\Db\FormulaireInstance;
use UnicaenAutoform\Entity\Db\FormulaireReponse;
use UnicaenAutoform\Service\Champ\ChampServiceAwareTrait;
-use Zend\Form\View\Helper\AbstractHelper;
-use Zend\View\Renderer\PhpRenderer;
-use Zend\View\Resolver\TemplatePathStack;
+use Laminas\Form\View\Helper\AbstractHelper;
+use Laminas\View\Renderer\PhpRenderer;
+use Laminas\View\Resolver\TemplatePathStack;
class InstanceAsFormulaireHelper extends AbstractHelper
{
diff --git a/src/UnicaenAutoform/View/Helper/InstanceAsTextHelper.php b/src/UnicaenAutoform/View/Helper/InstanceAsTextHelper.php
index 5d7c91e..c8e1be9 100644
--- a/src/UnicaenAutoform/View/Helper/InstanceAsTextHelper.php
+++ b/src/UnicaenAutoform/View/Helper/InstanceAsTextHelper.php
@@ -5,7 +5,7 @@ namespace UnicaenAutoform\View\Helper;
use UnicaenAutoform\Entity\Db\Categorie;
use UnicaenAutoform\Entity\Db\Champ;
use UnicaenAutoform\Entity\Db\FormulaireInstance;
-use Zend\Form\View\Helper\AbstractHelper;
+use Laminas\Form\View\Helper\AbstractHelper;
class InstanceAsTextHelper extends AbstractHelper
{
diff --git a/src/UnicaenAutoform/View/Helper/ValidationAsTextHelper.php b/src/UnicaenAutoform/View/Helper/ValidationAsTextHelper.php
index b852bda..9cba05e 100644
--- a/src/UnicaenAutoform/View/Helper/ValidationAsTextHelper.php
+++ b/src/UnicaenAutoform/View/Helper/ValidationAsTextHelper.php
@@ -6,7 +6,7 @@ use UnicaenAutoform\Entity\Db\Categorie;
use UnicaenAutoform\Entity\Db\Champ;
use UnicaenAutoform\Entity\Db\FormulaireInstance;
use UnicaenAutoform\Entity\Db\FormulaireReponse;
-use UnicaenAutoform\Entity\Db\Validation;use Zend\Form\View\Helper\AbstractHelper;
+use UnicaenAutoform\Entity\Db\Validation;use Laminas\Form\View\Helper\AbstractHelper;
class ValidationAsTextHelper extends AbstractHelper
{
--
GitLab