Commit fc06f5fd authored Mar 19, 2018 by Bertrand Gauthier

Reprise manuelle d'éléments intéressants de la branche master en prévision...

Reprise manuelle d'éléments intéressants de la branche master en prévision d'une git merge 1.2.0.x-dev vers master.

parent fb477fb9

.gitignore

+1 −0

Changes for .gitignore: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		vendor/
		.idea/

Module.php

+0 −1

Changes for Module.php: 0 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -9,7 +9,6 @@ use Zend\EventManager\EventInterface;
		use Zend\ModuleManager\Feature\AutoloaderProviderInterface;
		use Zend\ModuleManager\Feature\ConfigProviderInterface;
		use Zend\ModuleManager\Feature\ServiceProviderInterface;
		use Zend\Mvc\Router\Http\TreeRouteStack;
		use Zend\ServiceManager\Exception\ServiceNotFoundException;
		use Zend\ServiceManager\ServiceLocatorInterface;
		use Zend\View\Helper\Navigation;

composer.json

+1 −1

Changes for composer.json: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		{
		"name": "unicaen/auth",
		"description": "Module d'authentification pour les applis ZF2 de l'UCBN",
		"description": "Module d'authentification pour les applications Unicaen",
		"repositories": [
		{
		"type": "composer",

src/UnicaenAuth/Entity/Db/Privilege.php

+1 −0

Changes for src/UnicaenAuth/Entity/Db/Privilege.php: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ namespace UnicaenAuth\Entity\Db;
		use Doctrine\ORM\Mapping as ORM;

		/**
		* Privilege entity class.
		*
		* @ORM\Entity
		* @ORM\Table(name="privilege")

src/UnicaenAuth/Entity/Db/Role.php

+1 −1

Changes for src/UnicaenAuth/Entity/Db/Role.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ namespace UnicaenAuth\Entity\Db;
		use Doctrine\ORM\Mapping as ORM;

		/**
		* User entity class.
		* Role entity class.
		*
		* @ORM\Entity
		* @ORM\Table(name="user_role")