Merge remote-tracking branch 'origin/laminas_migration_bs5' (3aa13b43) · Commits · lib / unicaen / utilisateur

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		.idea/
		vendor/

Module.php

+7 −7

Original line number	Diff line number	Diff line
		@@ -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__,
		),

composer.json

+27 −25

Original line number	Diff line number	Diff line
		{
		"name": "unicaen/utilisateur",
		"description": "Module reprenant la gestion des utilisateurs, privileges et roles",
		"description": "Module reprenant la gestion des utilisateurs, privileges et roles - Version laminas",
		"repositories": [
		{
		"type": "composer",
		@@ -8,7 +8,9 @@
		}
		],
		"require": {
		"unicaen/app": ">=3.0"
		"unicaen/app": ">=5.0",
		"unicaen/mail": ">=5.0",
		"laminas/laminas-dependency-plugin": "^2.1"
		},
		"require-dev": {
		"phpunit/phpunit": ">=3.7"

config/merged/role.config.php

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,8 +16,8 @@ use UnicaenUtilisateur\Provider\Role\DbRoleServiceFactory;
		use UnicaenUtilisateur\Provider\Role\Username;
		use UnicaenUtilisateur\Provider\Role\UsernameServiceFactory;
		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/utilisateur.config.php

+28 −2

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@

		use UnicaenUtilisateur\Controller\UtilisateurController;
		use UnicaenUtilisateur\Controller\UtilisateurControllerFactory;
		use UnicaenUtilisateur\Form\User\InitCompteForm;
		use UnicaenUtilisateur\Form\User\UserForm;
		use UnicaenUtilisateur\Form\User\UserFormFactory;
		use UnicaenUtilisateur\Form\User\UserHydrator;
		@@ -13,8 +14,8 @@ use UnicaenUtilisateur\Service\Role\RoleServiceFactory;
		use UnicaenUtilisateur\Service\User\UserService;
		use UnicaenUtilisateur\Service\User\UserServiceFactory;
		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 [

		@@ -31,6 +32,14 @@ return [
		'bjyauthorize' => [
		'guards' => [
		PrivilegeController::class => [
		[
		'controller' => UtilisateurController::class,
		'action' => [
		'changer-mot-de-passe',
		],
		'roles' => [
		],
		],
		[
		'controller' => UtilisateurController::class,
		'action' => [
		@@ -109,6 +118,16 @@ return [
		],
		],
		],
		'changer-mot-de-passe' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/changer-mot-de-passe/:user/:token',
		'defaults' => [
		'controller' => UtilisateurController::class,
		'action' => 'changer-mot-de-passe',
		],
		],
		],
		'exporter' => [
		'type' => Literal::class,
		'options' => [
		@@ -184,12 +203,19 @@ return [
		'form_elements' => [
		'invokables' => [
		UserRechercheForm::class => UserRechercheForm::class,
		InitCompteForm::class => InitCompteForm::class,
		],
		'factories' => [
		UserForm::class => UserFormFactory::class,
		],
		],

		'hydrators' => [
		'factories' => [
		UserHydrator::class => UserHydratorFactory::class,
		]
		],

		'controllers' => [
		'factories' => [
		UtilisateurController::class => UtilisateurControllerFactory::class,