Merge branch 'zf-3.x' of https://git.unicaen.fr/lib/unicaen/auth into zf-3.x (bcd2532e) · Commits · Christophe Turbout / auth

src/UnicaenAuth/Authentication/Adapter/Cas.php

+6 −3

Original line number	Diff line number	Diff line
		@@ -9,12 +9,12 @@ use UnicaenAuth\Service\User;
		use Zend\Authentication\Exception\UnexpectedValueException;
		use Zend\Authentication\Result as AuthenticationResult;
		use Zend\EventManager\Event;
		use Zend\EventManager\EventInterface;
		use Zend\EventManager\EventManager;
		use Zend\EventManager\EventManagerAwareInterface;
		use Zend\EventManager\EventManagerInterface;
		use Zend\Router\Http\TreeRouteStack;
		use ZfcUser\Authentication\Adapter\AbstractAdapter;
		use ZfcUser\Authentication\Adapter\AdapterChainEvent as AuthEvent;
		use ZfcUser\Authentication\Adapter\ChainableAdapter;

		/**
		@@ -78,12 +78,15 @@ class Cas extends AbstractAdapter implements EventManagerAwareInterface
		/**
		* Réalise l'authentification.
		*
		* @param Event $e
		* @param EventInterface $e
		* @throws UnexpectedValueException
		* @see ChainableAdapter
		*/
		public function authenticate(Event $e)
		public function authenticate(EventInterface $e)
		{
		// NB: Dans la version 3.0.0 de zf-commons/zfc-user, cette méthode prend un EventInterface.
		// Mais dans la branche 3.x, c'est un AdapterChainEvent !
		// Si un jour c'est un AdapterChainEvent qui est attendu, plus besoin de faire $e->getTarget().
		$e = $e->getTarget();

		// if ($e->getIdentity()) {

src/UnicaenAuth/Authentication/Adapter/Db.php

+9 −7

Original line number	Diff line number	Diff line
		@@ -6,9 +6,8 @@ use Interop\Container\ContainerInterface;
		use UnicaenApp\ServiceManager\ServiceLocatorAwareInterface;
		use UnicaenApp\ServiceManager\ServiceLocatorAwareTrait;
		use UnicaenAuth\Options\ModuleOptions;
		use Zend\EventManager\EventInterface;
		use Zend\ServiceManager\Exception\ServiceNotFoundException;
		use ZfcUser\Authentication\Adapter\AdapterChainEvent as AuthEvent;
		use ZfcUser\Options\AuthenticationOptionsInterface;

		/**
		* Adpater d'authentification à partir de la base de données.
		@@ -40,13 +39,16 @@ class Db extends \ZfcUser\Authentication\Adapter\Db implements ServiceLocatorAwa
		/**
		* Authentification.
		*
		* @param AuthEvent\|\Zend\EventManager\Event $e
		* @param EventInterface $e
		* @return boolean
		*/
		public function authenticate(\Zend\EventManager\Event $e)
		public function authenticate(EventInterface $e)
		{
		// NB: Dans la version 3.0.0 de zf-commons/zfc-user, cette méthode prend un EventInterface.
		// Mais dans la branche 3.x, c'est un AdapterChainEvent !
		// Si un jour c'est un AdapterChainEvent qui est attendu, plus besoin de faire $e->getTarget().
		if ($e->getTarget()->getIdentity()) {
		return;
		return true;
		}

		try {
		@@ -60,10 +62,10 @@ class Db extends \ZfcUser\Authentication\Adapter\Db implements ServiceLocatorAwa
		}

		/**
		* @param AuthenticationOptionsInterface $options
		* @param \ZfcUser\Options\ModuleOptions $options
		* @return self
		*/
		public function setOptions(AuthenticationOptionsInterface $options)
		public function setOptions(\ZfcUser\Options\ModuleOptions $options)
		{
		$this->options = $options;
		return $this;

src/UnicaenAuth/Authentication/Adapter/Ldap.php

+6 −2

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ use Zend\Authentication\Adapter\Ldap as LdapAuthAdapter;
		use Zend\Authentication\Exception\ExceptionInterface;
		use Zend\Authentication\Result as AuthenticationResult;
		use Zend\EventManager\Event;
		use Zend\EventManager\EventInterface;
		use Zend\EventManager\EventManager;
		use Zend\EventManager\EventManagerAwareInterface;
		use Zend\EventManager\EventManagerInterface;
		@@ -78,14 +79,17 @@ class Ldap extends AbstractAdapter implements EventManagerAwareInterface

		/**
		*
		* @param Event $e
		* @param EventInterface $e
		* @return boolean
		* @throws \Zend\Authentication\Adapter\Exception\ExceptionInterface
		* @throws \Zend\Ldap\Exception\LdapException
		* @see ChainableAdapter
		*/
		public function authenticate(Event $e)
		public function authenticate(EventInterface $e)
		{
		// NB: Dans la version 3.0.0 de zf-commons/zfc-user, cette méthode prend un EventInterface.
		// Mais dans la branche 3.x, c'est un AdapterChainEvent !
		// Si un jour c'est un AdapterChainEvent qui est attendu, plus besoin de faire $e->getTarget().
		$e = $e->getTarget();

		if ($this->isSatisfied()) {

src/UnicaenAuth/Controller/AuthControllerFactory.php

+6 −6

Original line number	Diff line number	Diff line
		@@ -2,27 +2,27 @@

		namespace UnicaenAuth\Controller;

		use Interop\Container\ContainerInterface;
		use UnicaenAuth\Service\ShibService;
		use UnicaenAuth\Service\User as UserService;
		use Zend\Authentication\AuthenticationService;
		use Zend\Mvc\Controller\ControllerManager;

		class AuthControllerFactory
		{
		/**
		* @param ControllerManager $cm
		* @param ContainerInterface $container
		* @return AuthController
		*/
		public function __invoke(ControllerManager $cm)
		public function __invoke(ContainerInterface $container)
		{
		/** @var ShibService $shibService */
		$shibService = $cm->get(ShibService::class);
		$shibService = $container->get(ShibService::class);

		/* @var $userService UserService */
		$userService = $cm->get('unicaen-auth_user_service');
		$userService = $container->get('unicaen-auth_user_service');

		/** @var AuthenticationService $authService */
		$authService = $cm->get('zfcuser_auth_service');
		$authService = $container->get('zfcuser_auth_service');

		$controller = new AuthController();
		$controller->setShibService($shibService);

src/UnicaenAuth/Controller/DroitsControllerFactory.php

+6 −6

Original line number	Diff line number	Diff line
		@@ -2,25 +2,25 @@

		namespace UnicaenAuth\Controller;

		use Interop\Container\ContainerInterface;
		use UnicaenAuth\Form\Droits\RoleForm;
		use UnicaenAuth\Service\PrivilegeService;
		use UnicaenAuth\Service\RoleService;
		use Zend\Mvc\Controller\ControllerManager;

		class DroitsControllerFactory
		{
		/**
		* @param ControllerManager $cm
		* @param ContainerInterface $container
		* @return DroitsController
		*/
		public function __invoke(ControllerManager $cm)
		public function __invoke(ContainerInterface $container)
		{
		/** @var RoleService $serviceRole */
		$serviceRole = $cm->get('UnicaenAuth\Service\Role');
		$serviceRole = $container->get('UnicaenAuth\Service\Role');
		/** @var RoleForm $formDroitsRole */
		$formDroitsRole = $cm->get('FormElementManager')->get('UnicaenAuth\Form\Droits\Role');
		$formDroitsRole = $container->get('FormElementManager')->get('UnicaenAuth\Form\Droits\Role');
		/** @var PrivilegeService $servicePrivilege */
		$servicePrivilege = $cm->get('UnicaenAuth\Service\Privilege');
		$servicePrivilege = $container->get('UnicaenAuth\Service\Privilege');

		$controller = new DroitsController();
		$controller->setServiceRole($serviceRole);