diff --git a/src/UnicaenAuth/Controller/UtilisateurController.php b/src/UnicaenAuth/Controller/UtilisateurController.php index b43de0af33a0b12647d8ee69ad7437d58d52da21..ca94363b6b6fca450099ce6004224cb843258f6a 100644 --- a/src/UnicaenAuth/Controller/UtilisateurController.php +++ b/src/UnicaenAuth/Controller/UtilisateurController.php @@ -9,6 +9,7 @@ use UnicaenAuth\Entity\Ldap\People; use UnicaenAuth\Entity\Shibboleth\ShibUser; use UnicaenAuth\Options\ModuleOptions; use UnicaenAuth\Service\ShibService; +use UnicaenAuth\Service\Traits\ShibServiceAwareTrait; use UnicaenAuth\Service\Traits\UserContextServiceAwareTrait; use UnicaenAuth\Service\UserContext; use Zend\Authentication\AuthenticationService; @@ -23,6 +24,7 @@ use ZfcUser\Mapper\User as UserMapper; class UtilisateurController extends AbstractActionController { use UserContextServiceAwareTrait; + use ShibServiceAwareTrait; /** * @var LdapPeopleMapper @@ -45,17 +47,12 @@ class UtilisateurController extends AbstractActionController /** * @var AuthenticationService */ - private $authenticationService; + protected $authenticationService; /** * @var ModuleOptions */ - private $options; - - /** - * @var ShibService - */ - private $shibService; + protected $options; /** * @param UserMapper $userMapper @@ -81,14 +78,6 @@ class UtilisateurController extends AbstractActionController $this->options = $options; } - /** - * @param ShibService $shibService - */ - public function setShibService(ShibService $shibService) - { - $this->shibService = $shibService; - } - /** * @param UserContext $userContextService * @deprecated Utiliser UserContextServiceAwareTrait::setServiceUserContext() à la place, svp.