Merge remote-tracking branch 'origin/5.x' into release/1.3.0 (60d91038) · Commits · lib / unicaen / utilisateur

.gitignore

+1 −0

+2 −1

Changes for composer.json: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -8,7 +8,8 @@
		}
		],
		"require": {
		"unicaen/app": "^4.0",
		"unicaen/app": ">=5.0",
		"unicaen/mail": ">=5.0",
		"laminas/laminas-dependency-plugin": "^2.1"
		},
		"require-dev": {

+26 −0

Changes for config/merged/utilisateur.config.php: 26 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		use UnicaenPrivilege\Guard\PrivilegeController;
		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;
		@@ -35,6 +36,14 @@ return [
		'bjyauthorize' => [
		'guards' => [
		PrivilegeController::class => [
		[
		'controller' => UtilisateurController::class,
		'action' => [
		'changer-mot-de-passe',
		],
		'roles' => [
		],
		],
		[
		'controller' => UtilisateurController::class,
		'action' => [
		@@ -133,6 +142,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' => [
		@@ -310,6 +329,7 @@ return [
		'form_elements' => [
		'invokables' => [
		UserRechercheForm::class => UserRechercheForm::class,
		InitCompteForm::class => InitCompteForm::class,
		],
		'factories' => [
		UserForm::class => UserFormFactory::class,
		@@ -317,6 +337,12 @@ return [
		],
		],

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

		'view_helpers' => [
		'aliases' => [
		'userRole' => UserRole::class,

+4 −0

Changes for config/module.config.php: 4 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ use UnicaenUtilisateur\ORM\Event\Listeners\HistoriqueListener;
		use UnicaenUtilisateur\ORM\Event\Listeners\HistoriqueListenerFactory;
		use UnicaenUtilisateur\Provider\Identity\IdentityService;
		use UnicaenUtilisateur\Provider\Identity\IdentityServiceFactory;
		//use UnicaenUtilisateur\View\Helper\RoleViewHelper;
		use UnicaenUtilisateur\View\Helper\UserConnection;
		use UnicaenUtilisateur\View\Helper\UserConnectionFactory;
		use UnicaenUtilisateur\View\Helper\UserCurrent;
		@@ -81,6 +82,9 @@ return [
		],

		'view_helpers' => [
		// 'invokables' => [
		// 'role' => RoleViewHelper::class,
		// ],
		'aliases' => [
		'userCurrent' => UserCurrent::class,
		'userStatus' => UserStatus::class,

+5 −0

Changes for config/unicaen-utilisateur.global.php.dist: 5 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -73,6 +73,11 @@ return [
		// 'ldap' => LdapService::class,
		// 'octopus' => IndividuService::class,
		],
		/**
		* Utilisateur par défaut qui valide les créations/modifications si aucun utilisateur de connecté.
		* Commenter si comportement non souhaité.
		*/
		'default-user' => 1,
		],

		'navigation' => [