diff --git a/Module.php b/Module.php
index 381441156ff03f644f539aa0b75bce6f1572b611..1aacb33f5cc6b7bab2d84a270aebee6188315419 100644
--- a/Module.php
+++ b/Module.php
@@ -3,11 +3,11 @@
namespace UnicaenUtilisateur;
-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
{
@@ -19,7 +19,7 @@ class Module
$moduleRouteListener->attach($eventManager);
/* Active un layout spécial si la requête est de type AJAX. Valable pour TOUS les modules de l'application. */
- $eventManager->getSharedManager()->attach('Zend\Mvc\Controller\AbstractActionController', 'dispatch',
+ $eventManager->getSharedManager()->attach('Laminas\Mvc\Controller\AbstractActionController', 'dispatch',
function (MvcEvent $e) {
$request = $e->getRequest();
if ($request instanceof HttpRequest && $request->isXmlHttpRequest()) {
@@ -47,7 +47,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 72e741f4578b553c64835647455265ca6f9b426f..9960d025e97688dc3ebac57db147917406d0ad54 100644
--- a/composer.json
+++ b/composer.json
@@ -1,28 +1,29 @@
{
- "name": "unicaen/utilisateur",
- "description": "Module reprenant la gestion des utilisateurs, privileges et roles",
- "repositories": [
- {
- "type": "composer",
- "url": "https://gest.unicaen.fr/packagist"
- }
- ],
- "require": {
- "unicaen/app": ">=3.0"
- },
- "require-dev": {
- "phpunit/phpunit": ">=3.7"
- },
- "autoload": {
- "psr-0": {
- "UnicaenUtilisateur": "src/"
+ "name": "unicaen/utilisateur",
+ "description": "Module reprenant la gestion des utilisateurs, privileges et roles",
+ "repositories": [
+ {
+ "type": "composer",
+ "url": "https://gest.unicaen.fr/packagist"
+ }
+ ],
+ "require": {
+ "unicaen/app": ">=4.0.3",
+ "laminas/laminas-dependency-plugin": "^2.1"
+ },
+ "require-dev": {
+ "phpunit/phpunit": ">=3.7"
},
- "suggested": {
- "UnicaenUtilisateurLdapAdaptater" : "unicaen/utilisateur-ldap-adapter",
- "UnicaenUtilisateurOctopusAdaptater" : "unicaen/utilisateur-octopus-adapter"
- },
- "classmap": [
- "./Module.php"
- ]
- }
+ "autoload": {
+ "psr-0": {
+ "UnicaenUtilisateur": "src/"
+ },
+ "suggested": {
+ "UnicaenUtilisateurLdapAdaptater": "unicaen/utilisateur-ldap-adapter",
+ "UnicaenUtilisateurOctopusAdaptater": "unicaen/utilisateur-octopus-adapter"
+ },
+ "classmap": [
+ "./Module.php"
+ ]
+ }
}
diff --git a/config/merged/role.config.php b/config/merged/role.config.php
index 06ee4fde61358583ec851bf5adb00f99722e928a..1c9bd50018f7ab8f8d7cfbaa43097e2941939e22 100644
--- a/config/merged/role.config.php
+++ b/config/merged/role.config.php
@@ -16,8 +16,8 @@ use UnicaenUtilisateur\Provider\Role\Username;
use UnicaenUtilisateur\Provider\Role\UsernameServiceFactory;
use UnicaenUtilisateur\Service\Role\RoleService;
use UnicaenUtilisateur\Service\Role\RoleServiceFactory;
-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/utilisateur.config.php b/config/merged/utilisateur.config.php
index e020f1fd23c35a1cbb2491582ed04830d968a3c3..4b244590bdc2b07295339f13689a3da5cf90db84 100644
--- a/config/merged/utilisateur.config.php
+++ b/config/merged/utilisateur.config.php
@@ -17,8 +17,8 @@ use UnicaenUtilisateur\Service\User\UserService;
use UnicaenUtilisateur\Service\User\UserServiceFactory;
use UnicaenUtilisateur\View\Helper\UserRole;
use UnicaenUtilisateur\View\Helper\UserRoleFactory;
-use Zend\Router\Http\Literal;
-use Zend\Router\Http\Segment;
+use Laminas\Router\Http\Literal;
+use Laminas\Router\Http\Segment;
return [
diff --git a/config/module.config.php b/config/module.config.php
index 125d8787c2ca0aebc920d778d3a745b2d9b1136a..e9ef17950ad3595c008ba5fcbebc285821f8c8ae 100644
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -50,7 +50,7 @@ return [
/* role providers simply provide a list of roles that should be inserted
* into the Zend\Acl instance. the module comes with two providers, one
* to specify roles in a config file and one to load roles using a
- * Zend\Db adapter.
+ * Laminas\Db adapter.
*/
'role_providers' => [
/**
diff --git a/config/unicaen-utilisateur.global.php.dist b/config/unicaen-utilisateur.global.php.dist
index d69b689dee049c796aaba140435c600ad9c31f82..68e2b7b5a8323f45f551f2e46efaaec6231b9ecf 100644
--- a/config/unicaen-utilisateur.global.php.dist
+++ b/config/unicaen-utilisateur.global.php.dist
@@ -39,7 +39,7 @@ return [
/* role providers simply provide a list of roles that should be inserted
* into the Zend\Acl instance. the module comes with two providers, one
* to specify roles in a config file and one to load roles using a
- * Zend\Db adapter.
+ * Laminas\Db adapter.
*/
'role_providers' => [
/**
diff --git a/src/UnicaenUtilisateur/Acl/NamedRole.php b/src/UnicaenUtilisateur/Acl/NamedRole.php
index 63525be9a1e4abefc7831278fd2c9fb9ad21501e..ed45c999fba2a6f8b242f020b5f9565a59436f83 100644
--- a/src/UnicaenUtilisateur/Acl/NamedRole.php
+++ b/src/UnicaenUtilisateur/Acl/NamedRole.php
@@ -1,7 +1,7 @@
<?php
namespace UnicaenUtilisateur\Acl;
-use Zend\Permissions\Acl\Role\RoleInterface;
+use Laminas\Permissions\Acl\Role\RoleInterface;
/**
* Rôle avec nom explicite (humainement intelligible).
diff --git a/src/UnicaenUtilisateur/Controller/RoleController.php b/src/UnicaenUtilisateur/Controller/RoleController.php
index 2c2d356e9efc83b1067749b63136992ebc0fbba3..a419ea5904522f8e2bd6b5f835b74f6e00273c8b 100644
--- a/src/UnicaenUtilisateur/Controller/RoleController.php
+++ b/src/UnicaenUtilisateur/Controller/RoleController.php
@@ -12,10 +12,10 @@ use UnicaenUtilisateur\Exception\RuntimeException;
use UnicaenUtilisateur\Form\Role\RoleFormAwareTrait;
use UnicaenUtilisateur\Provider\Identity\IdentityServiceAwareTrait;
use UnicaenUtilisateur\Service\Role\RoleServiceAwareTrait;
-use Zend\Http\Request;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\Mvc\Plugin\FlashMessenger\FlashMessenger;
-use Zend\View\Model\ViewModel;
+use Laminas\Http\Request;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\Mvc\Plugin\FlashMessenger\FlashMessenger;
+use Laminas\View\Model\ViewModel;
/** @method FlashMessenger flashMessenger() */
diff --git a/src/UnicaenUtilisateur/Controller/UtilisateurController.php b/src/UnicaenUtilisateur/Controller/UtilisateurController.php
index 3a624ffec2fb58d90a22117ddecd90cf9c01a804..ed613c685891890da8fa3b6009eabe67bd80fbdc 100644
--- a/src/UnicaenUtilisateur/Controller/UtilisateurController.php
+++ b/src/UnicaenUtilisateur/Controller/UtilisateurController.php
@@ -18,10 +18,10 @@ use UnicaenUtilisateur\Service\RechercheIndividu\RechercheIndividuResultatInterf
use UnicaenUtilisateur\Service\RechercheIndividu\RechercheIndividuServiceInterface;
use UnicaenUtilisateur\Service\Role\RoleServiceAwareTrait;
use UnicaenUtilisateur\Service\User\UserServiceAwareTrait;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\Mvc\Plugin\FlashMessenger\FlashMessenger;
-use Zend\View\Model\JsonModel;
-use Zend\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\Mvc\Plugin\FlashMessenger\FlashMessenger;
+use Laminas\View\Model\JsonModel;
+use Laminas\View\Model\ViewModel;
/**
* @method FlashMessenger flashMessenger()
@@ -70,7 +70,6 @@ class UtilisateurController extends AbstractActionController
switch ($source) {
case 'app' :
return $this->redirect()->toRoute('unicaen-utilisateur', [], ["query" => ["id" => $id]], true);
-
default :
if (isset($this->searchServices[$source])) {
$sourceUser = $this->searchServices[$source]->findById($id);
diff --git a/src/UnicaenUtilisateur/Entity/HistoriqueAwareInterface.php b/src/UnicaenUtilisateur/Entity/HistoriqueAwareInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..bdfccb250a91445925f6ce5ddb7b1ab107bc8c78
--- /dev/null
+++ b/src/UnicaenUtilisateur/Entity/HistoriqueAwareInterface.php
@@ -0,0 +1,119 @@
+<?php
+
+namespace UnicaenUtilisateur\Entity;
+
+use DateTime;
+use UnicaenUtilisateur\Entity\Db\UserInterface;
+
+interface HistoriqueAwareInterface
+{
+ /**
+ * Set histoCreation
+ *
+ * @param DateTime $histoCreation
+ * @return self
+ */
+ public function setHistoCreation(?DateTime $histoCreation);
+
+ /**
+ * Get histoCreation
+ *
+ * @return DateTime
+ */
+ public function getHistoCreation();
+
+ /**
+ * Set histoDestruction
+ *
+ * @param DateTime $histoDestruction
+ * @return self
+ */
+ public function setHistoDestruction(?DateTime $histoDestruction);
+
+ /**
+ * Get histoDestruction
+ *
+ * @return DateTime
+ */
+ public function getHistoDestruction();
+
+ /**
+ * Set histoModification
+ *
+ * @param DateTime $histoModification
+ * @return self
+ */
+ public function setHistoModification(?DateTime $histoModification);
+
+ /**
+ * Get histoModification
+ *
+ * @return DateTime
+ */
+ public function getHistoModification();
+
+ /**
+ * Set histoModificateur
+ *
+ * @param UserInterface $histoModificateur
+ * @return self
+ */
+ public function setHistoModificateur(?UserInterface $histoModificateur = null);
+
+ /**
+ * Get histoModificateur
+ *
+ * @return UserInterface
+ */
+ public function getHistoModificateur();
+
+ /**
+ * Set histoDestructeur
+ *
+ * @param UserInterface $histoDestructeur
+ * @return self
+ */
+ public function setHistoDestructeur(?UserInterface $histoDestructeur = null);
+
+ /**
+ * Get histoDestructeur
+ *
+ * @return UserInterface
+ */
+ public function getHistoDestructeur();
+
+ /**
+ * Set histoCreateur
+ *
+ * @param UserInterface $histoCreateur
+ * @return self
+ */
+ public function setHistoCreateur(?UserInterface $histoCreateur = null);
+
+ /**
+ * Get histoCreateur
+ *
+ * @return UserInterface
+ */
+ public function getHistoCreateur();
+
+
+ /**
+ * @param DateTime|null $dateObs
+ *
+ * @return boolean
+ */
+ public function estNonHistorise(?DateTime $dateObs = null);
+
+ /**
+ * @param UserInterface $histoDestructeur
+ * @param DateTime|null $histoDestruction
+ * @return $this
+ */
+ public function historiser(?UserInterface $histoDestructeur, ?DateTime $histoDestruction = null);
+
+ /**
+ * @return $this
+ */
+ public function dehistoriser();
+}
\ No newline at end of file
diff --git a/src/UnicaenUtilisateur/Entity/HistoriqueAwareTrait.php b/src/UnicaenUtilisateur/Entity/HistoriqueAwareTrait.php
new file mode 100644
index 0000000000000000000000000000000000000000..aef72bb6a77066ebadf02cfc77c68a3ba8ff192c
--- /dev/null
+++ b/src/UnicaenUtilisateur/Entity/HistoriqueAwareTrait.php
@@ -0,0 +1,265 @@
+<?php
+
+namespace UnicaenUtilisateur\Entity;
+
+use DateTime;
+use UnicaenApp\Exception\RuntimeException;
+use UnicaenUtilisateur\Entity\Db\UserInterface;
+
+trait HistoriqueAwareTrait
+{
+ /**
+ * @var DateTime
+ */
+ protected $histoCreation;
+
+ /**
+ * @var DateTime
+ */
+ protected $histoModification;
+
+ /**
+ * @var DateTime
+ */
+ protected $histoDestruction;
+
+ /**
+ * @var UserInterface
+ */
+ protected $histoCreateur;
+
+ /**
+ * @var UserInterface
+ */
+ protected $histoModificateur;
+
+ /**
+ * @var UserInterface
+ */
+ protected $histoDestructeur;
+
+ /**
+ * Set histoCreation
+ *
+ * @param DateTime $histoCreation
+ *
+ * @return self
+ */
+ public function setHistoCreation(?DateTime $histoCreation)
+ {
+ $this->histoCreation = $histoCreation;
+
+ return $this;
+ }
+
+ /**
+ * Get histoCreation
+ *
+ * @return DateTime
+ */
+ public function getHistoCreation()
+ {
+ return $this->histoCreation;
+ }
+
+ /**
+ * Set histoDestruction
+ *
+ * @param DateTime $histoDestruction
+ *
+ * @return self
+ */
+ public function setHistoDestruction(?DateTime $histoDestruction)
+ {
+ $this->histoDestruction = $histoDestruction;
+
+ return $this;
+ }
+
+ /**
+ * Get histoDestruction
+ *
+ * @return DateTime
+ */
+ public function getHistoDestruction()
+ {
+ return $this->histoDestruction;
+ }
+
+ /**
+ * Set histoModification
+ *
+ * @param DateTime $histoModification
+ *
+ * @return self
+ */
+ public function setHistoModification(?DateTime $histoModification)
+ {
+ $this->histoModification = $histoModification;
+
+ return $this;
+ }
+
+ /**
+ * Get histoModification
+ *
+ * @return DateTime
+ */
+ public function getHistoModification()
+ {
+ return $this->histoModification;
+ }
+
+ /**
+ * Set histoModificateur
+ *
+ * @param UserInterface $histoModificateur
+ *
+ * @return self
+ */
+ public function setHistoModificateur(?UserInterface $histoModificateur = null)
+ {
+ $this->histoModificateur = $histoModificateur;
+
+ return $this;
+ }
+
+ /**
+ * Get histoModificateur
+ *
+ * @return UserInterface
+ */
+ public function getHistoModificateur()
+ {
+ return $this->histoModificateur;
+ }
+
+ /**
+ * Set histoDestructeur
+ *
+ * @param UserInterface $histoDestructeur
+ *
+ * @return self
+ */
+ public function setHistoDestructeur(?UserInterface $histoDestructeur = null)
+ {
+ $this->histoDestructeur = $histoDestructeur;
+
+ return $this;
+ }
+
+ /**
+ * Get histoDestructeur
+ *
+ * @return UserInterface
+ */
+ public function getHistoDestructeur()
+ {
+ return $this->histoDestructeur;
+ }
+
+ /**
+ * Set histoCreateur
+ *
+ * @param UserInterface $histoCreateur
+ *
+ * @return self
+ */
+ public function setHistoCreateur(?UserInterface $histoCreateur = null)
+ {
+ $this->histoCreateur = $histoCreateur;
+
+ return $this;
+ }
+
+ /**
+ * Get histoCreateur
+ *
+ * @return UserInterface
+ */
+ public function getHistoCreateur()
+ {
+ return $this->histoCreateur;
+ }
+
+ /**
+ * Marque cet enregistrement comme historisé.
+ *
+ * @see HistoriqueAwareInterface
+ *
+ * @param UserInterface|null $destructeur Auteur de la suppression ; si null, peut être renseigné
+ * automatiquement (cf. HistoriqueListener) si la classe implémente
+ * HistoriqueAwareInterface
+ * @param DateTime|null $dateDestruction Date éventuelle de la suppression
+ * @return $this
+ */
+ public function historiser(?UserInterface $destructeur = null, ?DateTime $dateDestruction = null)
+ {
+ if ($destructeur) {
+ $this->setHistoDestructeur($destructeur);
+ }
+
+ if (empty($dateDestruction)) {
+ try {
+ $dateDestruction = new DateTime();
+ } catch (\Exception $e) {
+ throw new RuntimeException("Impossible d'instancier un DateTime!", null, $e);
+ }
+ }
+
+ $this->setHistoDestruction($dateDestruction);
+
+ return $this;
+ }
+
+ /**
+ * Annule l'historisation de cet enregistrement.
+ *
+ * @see HistoriqueAwareInterface
+ * @return $this
+ */
+ public function dehistoriser()
+ {
+ $this->setHistoDestructeur(null);
+ $this->setHistoDestruction(null);
+
+ return $this;
+ }
+
+ /**
+ * Retourne true si l'entité est historisée.
+ *
+ * @param DateTime|null $dateObs Date d'observation éventuelle
+ * @return bool
+ */
+ public function estHistorise(?DateTime $dateObs = null)
+ {
+ return ! $this->estNonHistorise($dateObs);
+ }
+
+ /**
+ * Retourne true si l'entité n'est *pas* historisée.
+ *
+ * @param DateTime|null $dateObs Date d'observation éventuelle
+ * @return bool
+ */
+ public function estNonHistorise(?DateTime $dateObs = null)
+ {
+ if (empty($dateObs)) {
+ try {
+ $dateObs = new DateTime();
+ } catch (\Exception $e) {
+ throw new RuntimeException("Impossible d'instancier un DateTime!", null, $e);
+ }
+ }
+
+ $dObs = $dateObs->format('Y-m-d');
+ $dDeb = $this->getHistoCreation() ? $this->getHistoCreation()->format('Y-m-d') : null;
+ $dFin = $this->getHistoDestruction() ? $this->getHistoDestruction()->format('Y-m-d') : null;
+
+ if ($dDeb && !($dDeb <= $dObs)) return false;
+ if ($dFin && !($dObs < $dFin)) return false;
+
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/src/UnicaenUtilisateur/Form/Role/RoleForm.php b/src/UnicaenUtilisateur/Form/Role/RoleForm.php
index de4cdc6e6444e1de8de623de347dd3b6676ce6f6..d1239162676ebf6f5daa11d3d686712ae87cca9b 100644
--- a/src/UnicaenUtilisateur/Form/Role/RoleForm.php
+++ b/src/UnicaenUtilisateur/Form/Role/RoleForm.php
@@ -10,16 +10,16 @@ use UnicaenApp\Service\EntityManagerAwareTrait;
use UnicaenUtilisateur\Entity\Db\UserInterface;
use UnicaenUtilisateur\Form\Strategy\RoleParentStrategy;
use UnicaenUtilisateur\Service\Role\RoleServiceAwareTrait;
-use Zend\Form\Element\Button;
-use Zend\Form\Element\Checkbox;
-use Zend\Form\Element\Hidden;
-use Zend\Form\Element\Select;
-use Zend\Form\Element\Text;
-use Zend\Form\Form;
-use Zend\InputFilter\Factory;
-use Zend\Validator\Callback;
-use Zend\Validator\NotEmpty;
-use Zend\Validator\Regex;
+use Laminas\Form\Element\Button;
+use Laminas\Form\Element\Checkbox;
+use Laminas\Form\Element\Hidden;
+use Laminas\Form\Element\Select;
+use Laminas\Form\Element\Text;
+use Laminas\Form\Form;
+use Laminas\InputFilter\Factory;
+use Laminas\Validator\Callback;
+use Laminas\Validator\NotEmpty;
+use Laminas\Validator\Regex;
class RoleForm extends Form
{
diff --git a/src/UnicaenUtilisateur/Form/Role/RoleFormFactory.php b/src/UnicaenUtilisateur/Form/Role/RoleFormFactory.php
index 0839bdf8988d85d39d3051383afc69fc0c84f217..35f49c2cd8744b553c4771f8a61d27d49ee32326 100644
--- a/src/UnicaenUtilisateur/Form/Role/RoleFormFactory.php
+++ b/src/UnicaenUtilisateur/Form/Role/RoleFormFactory.php
@@ -3,7 +3,7 @@
namespace UnicaenUtilisateur\Form\Role;
use Doctrine\ORM\EntityManager;
-use DoctrineModule\Stdlib\Hydrator\DoctrineObject;
+use Doctrine\Laminas\Hydrator\DoctrineObject;
use Interop\Container\ContainerInterface;
use UnicaenUtilisateur\Service\Role\RoleService;
diff --git a/src/UnicaenUtilisateur/Form/Strategy/RoleParentStrategy.php b/src/UnicaenUtilisateur/Form/Strategy/RoleParentStrategy.php
index cb4d50b862a888a14d5af7d7f6cfe52e978d3d21..f818949e6b4a8cbb5973a1411d81cba766ae3be3 100644
--- a/src/UnicaenUtilisateur/Form/Strategy/RoleParentStrategy.php
+++ b/src/UnicaenUtilisateur/Form/Strategy/RoleParentStrategy.php
@@ -3,7 +3,7 @@
namespace UnicaenUtilisateur\Form\Strategy;
use UnicaenUtilisateur\Service\Role\RoleServiceAwareTrait;
-use Zend\Hydrator\Strategy\StrategyInterface;
+use Laminas\Hydrator\Strategy\StrategyInterface;
class RoleParentStrategy implements StrategyInterface
{
@@ -12,7 +12,7 @@ class RoleParentStrategy implements StrategyInterface
/**
* {@inheritDoc}
*/
- public function extract($value)
+ public function extract($value, ?object $object = null)
{
if (null != $value) {
return $value->getId();
@@ -24,7 +24,7 @@ class RoleParentStrategy implements StrategyInterface
/**
* {@inheritDoc}
*/
- public function hydrate($value)
+ public function hydrate($value, ?array $data)
{
if (null != $value) {
$parent = $this->roleService->find($value);
diff --git a/src/UnicaenUtilisateur/Form/User/UserForm.php b/src/UnicaenUtilisateur/Form/User/UserForm.php
index 46742f418d356aee1524b86be5d17495262b5719..742adbe1372844a940f5d6cdbc9adf387308582c 100644
--- a/src/UnicaenUtilisateur/Form/User/UserForm.php
+++ b/src/UnicaenUtilisateur/Form/User/UserForm.php
@@ -5,16 +5,16 @@ namespace UnicaenUtilisateur\Form\User;
use DoctrineModule\Validator\NoObjectExists;
use UnicaenApp\Service\EntityManagerAwareTrait;
use UnicaenUtilisateur\Service\User\UserServiceAwareTrait;
-use Zend\Form\Element\Button;
-use Zend\Form\Element\Email;
-use Zend\Form\Element\Password;
-use Zend\Form\Element\Text;
-use Zend\Form\Form;
-use Zend\InputFilter\Factory;
-use Zend\Validator\Callback;
-use Zend\Validator\Identical;
-use Zend\Validator\NotEmpty;
-use Zend\Validator\Regex;
+use Laminas\Form\Element\Button;
+use Laminas\Form\Element\Email;
+use Laminas\Form\Element\Password;
+use Laminas\Form\Element\Text;
+use Laminas\Form\Form;
+use Laminas\InputFilter\Factory;
+use Laminas\Validator\Callback;
+use Laminas\Validator\Identical;
+use Laminas\Validator\NotEmpty;
+use Laminas\Validator\Regex;
class UserForm extends Form
{
diff --git a/src/UnicaenUtilisateur/Form/User/UserFormFactory.php b/src/UnicaenUtilisateur/Form/User/UserFormFactory.php
index 157512964783dc3b09ca2e89e8ec96cf732f9acb..9842e1d96b721a6be858716596ef68dab7a975fc 100644
--- a/src/UnicaenUtilisateur/Form/User/UserFormFactory.php
+++ b/src/UnicaenUtilisateur/Form/User/UserFormFactory.php
@@ -3,7 +3,7 @@
namespace UnicaenUtilisateur\Form\User;
use Doctrine\ORM\EntityManager;
-use DoctrineModule\Stdlib\Hydrator\DoctrineObject;
+use Doctrine\Laminas\Hydrator\DoctrineObject;
use Interop\Container\ContainerInterface;
use UnicaenUtilisateur\Service\User\UserService;
diff --git a/src/UnicaenUtilisateur/Form/User/UserRechercheForm.php b/src/UnicaenUtilisateur/Form/User/UserRechercheForm.php
index 8c933e335887b5d71f06a31d10787d8e1aefb96c..8720f1a7ce6e67bffef1c170f28fb354e88c47c4 100644
--- a/src/UnicaenUtilisateur/Form/User/UserRechercheForm.php
+++ b/src/UnicaenUtilisateur/Form/User/UserRechercheForm.php
@@ -5,11 +5,11 @@ namespace UnicaenUtilisateur\Form\User;
use Application\Entity\Db\GroupeType;
use DoctrineModule\Form\Element\ObjectSelect as DoctrineObjectSelect;
use UnicaenApp\Form\Element\SearchAndSelect;
-use Zend\Form\Element;
-use Zend\Filter;
-use Zend\Form\Form;
-use Zend\InputFilter\Factory;
-use Zend\Validator;
+use Laminas\Form\Element;
+use Laminas\Filter;
+use Laminas\Form\Form;
+use Laminas\InputFilter\Factory;
+use Laminas\Validator;
class UserRechercheForm extends Form
{
diff --git a/src/UnicaenUtilisateur/Formatter/RoleFormatter.php b/src/UnicaenUtilisateur/Formatter/RoleFormatter.php
index 8c880851a6a499b2688ecf470dceba2c28b20fee..70ffb2e399a6fd6287c099875d10042aa1c8ad71 100644
--- a/src/UnicaenUtilisateur/Formatter/RoleFormatter.php
+++ b/src/UnicaenUtilisateur/Formatter/RoleFormatter.php
@@ -33,7 +33,7 @@ class RoleFormatter
if ($role instanceof RoleInterface) {
$formattedRole = $role->getLibelle();
}
- elseif ($role instanceof \Zend\Permissions\Acl\Role\RoleInterface) {
+ elseif ($role instanceof \Laminas\Permissions\Acl\Role\RoleInterface) {
$formattedRole = $role->getRoleId();
}
elseif (is_string($role)) {
diff --git a/src/UnicaenUtilisateur/ORM/Event/Listeners/HistoriqueListener.php b/src/UnicaenUtilisateur/ORM/Event/Listeners/HistoriqueListener.php
index c5b4d9b17f928f59d2c1828a0bb9103eb237709f..3917ffda94c48a92782e547389e7c535efb42293 100644
--- a/src/UnicaenUtilisateur/ORM/Event/Listeners/HistoriqueListener.php
+++ b/src/UnicaenUtilisateur/ORM/Event/Listeners/HistoriqueListener.php
@@ -8,11 +8,11 @@ use Doctrine\ORM\Event\LifecycleEventArgs;
use Doctrine\ORM\Event\PreUpdateEventArgs;
use Doctrine\ORM\Events;
use Exception;
+use Laminas\Authentication\AuthenticationService;
use RuntimeException;
-use UnicaenApp\Entity\HistoriqueAwareInterface;
+use UnicaenApp\Service\EntityManagerAwareTrait;
use UnicaenUtilisateur\Entity\Db\AbstractUser;
-use UnicaenUtilisateur\Service\User\UserServiceAwareTrait;
-use Zend\Authentication\AuthenticationService;
+use UnicaenUtilisateur\Entity\HistoriqueAwareInterface;
/**
* Listener Doctrine.
@@ -29,8 +29,6 @@ use Zend\Authentication\AuthenticationService;
*/
class HistoriqueListener implements EventSubscriber
{
- use UserServiceAwareTrait;
-
/**
* @var AuthenticationService
*/
diff --git a/src/UnicaenUtilisateur/ORM/Event/Listeners/HistoriqueListenerFactory.php b/src/UnicaenUtilisateur/ORM/Event/Listeners/HistoriqueListenerFactory.php
index 22cf2194acaa0ac28b451a75ff1306bf8d0ac982..80fb786c500dc90651e5bba29d5f1d57f87784e0 100644
--- a/src/UnicaenUtilisateur/ORM/Event/Listeners/HistoriqueListenerFactory.php
+++ b/src/UnicaenUtilisateur/ORM/Event/Listeners/HistoriqueListenerFactory.php
@@ -3,10 +3,9 @@
namespace UnicaenUtilisateur\ORM\Event\Listeners;
use Interop\Container\ContainerInterface;
-
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
-use Zend\Authentication\AuthenticationService;
+use Laminas\Authentication\AuthenticationService;
+use Laminas\ServiceManager\FactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
/**
* Description of MouchardServiceFactory
@@ -25,7 +24,7 @@ class HistoriqueListenerFactory implements FactoryInterface
/**
* @var AuthenticationService $authenticationService
*/
- $authenticationService = $container->get('Zend\Authentication\AuthenticationService');
+ $authenticationService = $container->get('Laminas\Authentication\AuthenticationService');
$listener = new HistoriqueListener();
$listener->setAuthenticationService($authenticationService);
diff --git a/src/UnicaenUtilisateur/Provider/Role/ConfigServiceFactory.php b/src/UnicaenUtilisateur/Provider/Role/ConfigServiceFactory.php
index c5ca1bcda0df8883da1d133a71383421ade35648..93c8a4e1a645cfb62e50d625ebb7ba207b5fe7a0 100644
--- a/src/UnicaenUtilisateur/Provider/Role/ConfigServiceFactory.php
+++ b/src/UnicaenUtilisateur/Provider/Role/ConfigServiceFactory.php
@@ -4,8 +4,8 @@ namespace UnicaenUtilisateur\Provider\Role;
use BjyAuthorize\Exception\InvalidArgumentException;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\FactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
/**
* Factory responsible of instantiating {@see \UnicaenUtilisateur\Provider\Role\Config}
diff --git a/src/UnicaenUtilisateur/Provider/Role/DbRoleServiceFactory.php b/src/UnicaenUtilisateur/Provider/Role/DbRoleServiceFactory.php
index 00bbfb06e3e0f4c3ef2073d4ea93dc9777185f63..494690f47e57b97fa9038b2c1178aba7b6a0185f 100644
--- a/src/UnicaenUtilisateur/Provider/Role/DbRoleServiceFactory.php
+++ b/src/UnicaenUtilisateur/Provider/Role/DbRoleServiceFactory.php
@@ -4,8 +4,8 @@ namespace UnicaenUtilisateur\Provider\Role;
use Interop\Container\ContainerInterface;
use UnicaenUtilisateur\Service\Role\RoleService;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\FactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
/**
* Factory responsible of instantiating {@see \UnicaenUtilisateur\Provider\Role\DbRole}
diff --git a/src/UnicaenUtilisateur/Provider/Role/Username.php b/src/UnicaenUtilisateur/Provider/Role/Username.php
index 677f623a9d8cef7e3fb98a61b7eed987fdd6aa11..66bf13ab78dfc0546fa69a6149489a86ac0dcf1f 100644
--- a/src/UnicaenUtilisateur/Provider/Role/Username.php
+++ b/src/UnicaenUtilisateur/Provider/Role/Username.php
@@ -3,7 +3,7 @@
namespace UnicaenUtilisateur\Provider\Role;
use BjyAuthorize\Provider\Role\ProviderInterface;
-use Zend\Authentication\AuthenticationService;
+use Laminas\Authentication\AuthenticationService;
use ZfcUser\Entity\UserInterface;
use UnicaenUtilisateur\Acl\NamedRole;
@@ -45,7 +45,7 @@ class Username implements ProviderInterface
}
/**
- * @return \Zend\Permissions\Acl\Role\RoleInterface[]
+ * @return \Laminas\Permissions\Acl\Role\RoleInterface[]
*/
public function getRoles()
{
diff --git a/src/UnicaenUtilisateur/Provider/Role/UsernameServiceFactory.php b/src/UnicaenUtilisateur/Provider/Role/UsernameServiceFactory.php
index 9b52e65aed98e65b50735b1258cf09a823ef56df..421dfee71fab57eec7c5ed54289909d302f7d342 100644
--- a/src/UnicaenUtilisateur/Provider/Role/UsernameServiceFactory.php
+++ b/src/UnicaenUtilisateur/Provider/Role/UsernameServiceFactory.php
@@ -3,8 +3,8 @@
namespace UnicaenUtilisateur\Provider\Role;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\FactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
/**
* Description of UsernameServiceFactory
@@ -30,8 +30,8 @@ class UsernameServiceFactory implements FactoryInterface
$providerConfig = $config['role_providers']['UnicaenUtilisateur\Provider\Role\Username'];
- $authService = $container->get('zfcuser_auth_service'); /* @var $authService \Zend\Authentication\AuthenticationService */
-// $authService = $container->get('Zend\Authentication\AuthenticationService'); /* @var $authService \Zend\Authentication\AuthenticationService */
+ $authService = $container->get('zfcuser_auth_service'); /* @var $authService \Laminas\Authentication\AuthenticationService */
+// $authService = $container->get('Laminas\Authentication\AuthenticationService'); /* @var $authService \Laminas\Authentication\AuthenticationService */
return new Username($authService, $providerConfig);
}
diff --git a/src/UnicaenUtilisateur/Service/Role/RoleService.php b/src/UnicaenUtilisateur/Service/Role/RoleService.php
index c340541087e3de52fc1dcb3764064c1d0d683357..c7f9a21880a2a2f4058337a4cbcbfad6cfae7d2c 100644
--- a/src/UnicaenUtilisateur/Service/Role/RoleService.php
+++ b/src/UnicaenUtilisateur/Service/Role/RoleService.php
@@ -6,7 +6,7 @@ use UnicaenUtilisateur\Entity\Db\RoleInterface;
use UnicaenUtilisateur\Entity\Db\UserInterface;
use UnicaenUtilisateur\Exception\RuntimeException;
use UnicaenUtilisateur\Service\CommonService;
-use Zend\Mvc\Controller\AbstractActionController;
+use Laminas\Mvc\Controller\AbstractActionController;
class RoleService extends CommonService
{
diff --git a/src/UnicaenUtilisateur/Service/User/UserService.php b/src/UnicaenUtilisateur/Service/User/UserService.php
index 343fc6d6dfed2bc7c2fb809ba984633e86132a36..7f27131fbc74aaab54d3cc42003be71447b22429 100644
--- a/src/UnicaenUtilisateur/Service/User/UserService.php
+++ b/src/UnicaenUtilisateur/Service/User/UserService.php
@@ -12,9 +12,9 @@ use UnicaenUtilisateur\Exception\RuntimeException;
use UnicaenUtilisateur\Service\CommonService;
use UnicaenUtilisateur\Service\RechercheIndividu\RechercheIndividuResultatInterface;
use UnicaenUtilisateur\Service\RechercheIndividu\RechercheIndividuServiceInterface;
-use Zend\Authentication\AuthenticationService;
-use Zend\Crypt\Password\Bcrypt;
-use Zend\Mvc\Controller\AbstractActionController;
+use Laminas\Authentication\AuthenticationService;
+use Laminas\Crypt\Password\Bcrypt;
+use Laminas\Mvc\Controller\AbstractActionController;
class UserService extends CommonService implements RechercheIndividuServiceInterface
{
@@ -140,16 +140,16 @@ class UserService extends CommonService implements RechercheIndividuServiceInter
/**
* @param RechercheIndividuResultatInterface $individu
- * @param string $source
+ * @param string $typePassword
* @return UserInterface
*/
- public function importFromRechercheIndividuResultatInterface(RechercheIndividuResultatInterface $individu, $source)
+ public function importFromRechercheIndividuResultatInterface(RechercheIndividuResultatInterface $individu, string $typePassword = 'ldap')
{
$utilisateur = $this->getEntityInstance();
$utilisateur->setDisplayName($individu->getDisplayname());
$utilisateur->setUsername($individu->getUsername());
$utilisateur->setEmail($individu->getEmail());
- $utilisateur->setPassword($source);
+ $utilisateur->setPassword($typePassword);
$utilisateur->setState(1);
return $utilisateur;
@@ -202,7 +202,7 @@ class UserService extends CommonService implements RechercheIndividuServiceInter
}
/**
- * @return \Zend\Permissions\Acl\Role\RoleInterface|null
+ * @return \Laminas\Permissions\Acl\Role\RoleInterface|null
*/
public function getConnectedRole()
{
diff --git a/src/UnicaenUtilisateur/Service/User/UserServiceFactory.php b/src/UnicaenUtilisateur/Service/User/UserServiceFactory.php
index 27aae52c7be264a3d5d8d53d5ddf51325cb4af09..c1bf7b00e3e680d571e304fe276d462f23d9d116 100644
--- a/src/UnicaenUtilisateur/Service/User/UserServiceFactory.php
+++ b/src/UnicaenUtilisateur/Service/User/UserServiceFactory.php
@@ -6,7 +6,7 @@ use Doctrine\ORM\EntityManager;
use Interop\Container\ContainerInterface;
use UnicaenAuthentification\Service\UserContext;
use UnicaenUtilisateur\Entity\Db\User;
-use Zend\Authentication\AuthenticationService;
+use Laminas\Authentication\AuthenticationService;
class UserServiceFactory
diff --git a/src/UnicaenUtilisateur/View/Helper/UserAbstract.php b/src/UnicaenUtilisateur/View/Helper/UserAbstract.php
index baa9d5fdc2c7fb4a5a46705d6ac13111982cab20..b7a3c020427914a7818a38352a3541bce5922d85 100644
--- a/src/UnicaenUtilisateur/View/Helper/UserAbstract.php
+++ b/src/UnicaenUtilisateur/View/Helper/UserAbstract.php
@@ -3,7 +3,7 @@
namespace UnicaenUtilisateur\View\Helper;
use UnicaenAuthentification\Service\UserContext;
-use Zend\I18n\View\Helper\AbstractTranslatorHelper;
+use Laminas\I18n\View\Helper\AbstractTranslatorHelper;
/**
* Classe mère des aides de vue concernant l'utilisateur connecté.
diff --git a/src/UnicaenUtilisateur/View/Helper/UserConnectionFactory.php b/src/UnicaenUtilisateur/View/Helper/UserConnectionFactory.php
index 0b78a8544f959ffee38cd04a1fe1f043a8c6b043..604e841ba1ff6e39ce8c3f2bc0e5d49ae3fd4c5e 100644
--- a/src/UnicaenUtilisateur/View/Helper/UserConnectionFactory.php
+++ b/src/UnicaenUtilisateur/View/Helper/UserConnectionFactory.php
@@ -3,8 +3,8 @@
namespace UnicaenUtilisateur\View\Helper;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\FactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
/**
* Description of UserConnectionFactory
diff --git a/src/UnicaenUtilisateur/View/Helper/UserCurrentFactory.php b/src/UnicaenUtilisateur/View/Helper/UserCurrentFactory.php
index 7ffb37f8f7a4a85c44076b6b29a82d9857c64588..65b7a13c77f040a75d9e77413884f35cd6d593a6 100644
--- a/src/UnicaenUtilisateur/View/Helper/UserCurrentFactory.php
+++ b/src/UnicaenUtilisateur/View/Helper/UserCurrentFactory.php
@@ -3,8 +3,8 @@
namespace UnicaenUtilisateur\View\Helper;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\FactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
/**
* Description of UserCurrentFactory
diff --git a/src/UnicaenUtilisateur/View/Helper/UserInfo.php b/src/UnicaenUtilisateur/View/Helper/UserInfo.php
index 56c877765eb167821c23ecb9cc27523ac22c6807..c451eea3a493e446371a86862c1b677338378a4c 100644
--- a/src/UnicaenUtilisateur/View/Helper/UserInfo.php
+++ b/src/UnicaenUtilisateur/View/Helper/UserInfo.php
@@ -3,7 +3,7 @@ namespace UnicaenUtilisateur\View\Helper;
use UnicaenApp\Entity\Ldap\People;
use UnicaenApp\Mapper\Ldap\Structure as MapperStructure;
-use Zend\View\Helper\HtmlList;
+use Laminas\View\Helper\HtmlList;
/**
* Aide de vue affichant des info sur l'utilisateur connecté :
diff --git a/src/UnicaenUtilisateur/View/Helper/UserInfoFactory.php b/src/UnicaenUtilisateur/View/Helper/UserInfoFactory.php
index afdfa66e0f5ce5b133bafcba54fba920a16a2e9e..df7414000b85ae86346652ef1984933a9505c3b3 100644
--- a/src/UnicaenUtilisateur/View/Helper/UserInfoFactory.php
+++ b/src/UnicaenUtilisateur/View/Helper/UserInfoFactory.php
@@ -3,8 +3,8 @@
namespace UnicaenUtilisateur\View\Helper;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\FactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
/**
* Description of UserInfoFactory
diff --git a/src/UnicaenUtilisateur/View/Helper/UserProfileFactory.php b/src/UnicaenUtilisateur/View/Helper/UserProfileFactory.php
index 0befbb48c521f02766f107c0a41e4926d93aa41c..e414c0b943bc59eb45220098a2b38536f93fd889 100644
--- a/src/UnicaenUtilisateur/View/Helper/UserProfileFactory.php
+++ b/src/UnicaenUtilisateur/View/Helper/UserProfileFactory.php
@@ -3,8 +3,8 @@
namespace UnicaenUtilisateur\View\Helper;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\FactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
/**
* Description of UserProfileFactory
diff --git a/src/UnicaenUtilisateur/View/Helper/UserProfileSelect.php b/src/UnicaenUtilisateur/View/Helper/UserProfileSelect.php
index b548c22ba139cacbf9924b65e57760ad44266fc2..b0da93a6e43cf391ad3cb8fa313abef22485b200 100644
--- a/src/UnicaenUtilisateur/View/Helper/UserProfileSelect.php
+++ b/src/UnicaenUtilisateur/View/Helper/UserProfileSelect.php
@@ -2,7 +2,7 @@
namespace UnicaenUtilisateur\View\Helper;
use UnicaenUtilisateur\Acl\NamedRole;
-use Zend\Permissions\Acl\Role\RoleInterface;
+use Laminas\Permissions\Acl\Role\RoleInterface;
/**
* Aide de vue permettant à l'utilisateur de sélectionner son profil courant parmi
@@ -42,7 +42,7 @@ class UserProfileSelect extends UserAbstract
$formClass = 'user-profile-select-form';
$inputClass = 'user-profile-select-input';
- $form = new \Zend\Form\Form();
+ $form = new \Laminas\Form\Form();
$form->setAttribute('class', "$formClass " . $this->formClass);
$html = $this->getView()->form()->openTag($form);
@@ -55,7 +55,7 @@ class UserProfileSelect extends UserAbstract
return '';
}
- $select = new \Zend\Form\Element\Select('role');
+ $select = new \Laminas\Form\Element\Select('role');
$select
->setValueOptions($rolesAsOptions)
->setAttributes([
diff --git a/src/UnicaenUtilisateur/View/Helper/UserProfileSelectRadioItem.php b/src/UnicaenUtilisateur/View/Helper/UserProfileSelectRadioItem.php
index fbcd7772e90fbff4b2eed87db8aa68f3ae8ea1f7..4f6836bd9c62a84349bc7936ab33855bb99ddb6b 100644
--- a/src/UnicaenUtilisateur/View/Helper/UserProfileSelectRadioItem.php
+++ b/src/UnicaenUtilisateur/View/Helper/UserProfileSelectRadioItem.php
@@ -1,8 +1,8 @@
<?php
namespace UnicaenUtilisateur\View\Helper;
-use Zend\Permissions\Acl\Role\RoleInterface;
-use Zend\Form\Element\Radio;
+use Laminas\Permissions\Acl\Role\RoleInterface;
+use Laminas\Form\Element\Radio;
/**
* Aide de vue dessinant un item de sélection d'un profil utilisateur.
diff --git a/src/UnicaenUtilisateur/View/Helper/UserStatusFactory.php b/src/UnicaenUtilisateur/View/Helper/UserStatusFactory.php
index 07af864ec061f3380a2d2600b503b3849003561d..680e3d751082406f74009a5893c2fad5f766afce 100644
--- a/src/UnicaenUtilisateur/View/Helper/UserStatusFactory.php
+++ b/src/UnicaenUtilisateur/View/Helper/UserStatusFactory.php
@@ -3,8 +3,8 @@
namespace UnicaenUtilisateur\View\Helper;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\FactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
/**
* Description of UserStatusFactory
diff --git a/view/unicaen-utilisateur/utilisateur/lister.phtml b/view/unicaen-utilisateur/utilisateur/lister.phtml
index 51c3519c4d1781d0bbdcb0ba9f716e2a7e466dc0..256df1a504ee07100aa515cf76a80bcb890ce171 100644
--- a/view/unicaen-utilisateur/utilisateur/lister.phtml
+++ b/view/unicaen-utilisateur/utilisateur/lister.phtml
@@ -76,7 +76,6 @@ use UnicaenUtilisateur\Entity\Db\UserInterface;
<script>
$(function () {
-
if(jQuery().dataTable) {
$('#utilisateur-liste').DataTable({
"lengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "Tous"]],