From 318a5767d9088f22a732830a95f100b6653f912b Mon Sep 17 00:00:00 2001
From: Bertrand Gauthier <bertrand.gauthier@unicaen.fr>
Date: Tue, 26 Mar 2019 14:25:31 +0100
Subject: [PATCH] =?UTF-8?q?UserContextServiceAwareTrait:=20Suppression=20d?=
 =?UTF-8?q?e=20la=20m=C3=A9thode=20inutile=20getServiceUserContext().?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Assertion/AbstractAssertion.php           |  2 +-
 .../Controller/UtilisateurController.php      |  9 --------
 .../Mouchard/MouchardCompleterAuth.php        |  5 +++--
 src/UnicaenAuth/Service/AuthorizeService.php  |  2 +-
 .../Traits/UserContextServiceAwareTrait.php   | 21 ++-----------------
 5 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/src/UnicaenAuth/Assertion/AbstractAssertion.php b/src/UnicaenAuth/Assertion/AbstractAssertion.php
index 1236c6a..6c0e9aa 100644
--- a/src/UnicaenAuth/Assertion/AbstractAssertion.php
+++ b/src/UnicaenAuth/Assertion/AbstractAssertion.php
@@ -145,7 +145,7 @@ abstract class AbstractAssertion implements AssertionInterface, ServiceLocatorAw
     public function getRole()
     {
         if (false === $this->role){
-            $sUserContext = $this->getServiceUserContext();
+            $sUserContext = $this->serviceUserContext;
             if ($sUserContext->getIdentity()) {
                 $this->role = $sUserContext->getSelectedIdentityRole();
             }
diff --git a/src/UnicaenAuth/Controller/UtilisateurController.php b/src/UnicaenAuth/Controller/UtilisateurController.php
index ababa1d..7726d34 100644
--- a/src/UnicaenAuth/Controller/UtilisateurController.php
+++ b/src/UnicaenAuth/Controller/UtilisateurController.php
@@ -78,15 +78,6 @@ class UtilisateurController extends AbstractActionController
         $this->options = $options;
     }
 
-    /**
-     * @param UserContext $userContextService
-     * @deprecated Utiliser UserContextServiceAwareTrait::setServiceUserContext() à la place, svp.
-     */
-    public function setUserContextService(UserContext $userContextService)
-    {
-        $this->serviceUserContext = $userContextService;
-    }
-
     /**
      * Traite les requêtes AJAX POST de sélection d'un profil utilisateur.
      * La sélection est mémorisé en session par le service AuthUserContext.
diff --git a/src/UnicaenAuth/Mouchard/MouchardCompleterAuth.php b/src/UnicaenAuth/Mouchard/MouchardCompleterAuth.php
index 526079b..683d2a2 100644
--- a/src/UnicaenAuth/Mouchard/MouchardCompleterAuth.php
+++ b/src/UnicaenAuth/Mouchard/MouchardCompleterAuth.php
@@ -17,17 +17,18 @@ class MouchardCompleterAuth implements MouchardCompleterInterface
     use UserContextServiceAwareTrait;
 
     /**
+     * @param MouchardMessage $message
      * @return $this
      */
     public function complete(MouchardMessage $message)
     {
-        $user = $this->getServiceUserContext()->getDbUser();
+        $user = $this->serviceUserContext->getDbUser();
         if ($user){
             $message->setUser($user->getDisplayName());
             $message->setLogin($user->getUsername());
         }
 
-        $message->setRole((string)$this->getServiceUserContext()->getSelectedIdentityRole());
+        $message->setRole((string)$this->serviceUserContext->getSelectedIdentityRole());
 
         return $this;
     }
diff --git a/src/UnicaenAuth/Service/AuthorizeService.php b/src/UnicaenAuth/Service/AuthorizeService.php
index eea0e75..175110b 100644
--- a/src/UnicaenAuth/Service/AuthorizeService.php
+++ b/src/UnicaenAuth/Service/AuthorizeService.php
@@ -34,7 +34,7 @@ class AuthorizeService extends \BjyAuthorize\Service\Authorize
         if ($this->loading) return 'bjyauthorize-identity';
 
         // on retourne par défaut le rôle sélectionné
-        $role = $this->getServiceUserContext()->getSelectedIdentityRole();
+        $role = $this->serviceUserContext->getSelectedIdentityRole();
         if ($role) return $role;
 
         $roles = $this->getIdentityProvider()->getIdentityRoles();
diff --git a/src/UnicaenAuth/Service/Traits/UserContextServiceAwareTrait.php b/src/UnicaenAuth/Service/Traits/UserContextServiceAwareTrait.php
index caf5857..3ebb978 100644
--- a/src/UnicaenAuth/Service/Traits/UserContextServiceAwareTrait.php
+++ b/src/UnicaenAuth/Service/Traits/UserContextServiceAwareTrait.php
@@ -3,25 +3,19 @@
 namespace UnicaenAuth\Service\Traits;
 
 use UnicaenAuth\Service\UserContext;
-use RuntimeException;
 
 /**
- * Description of UserContextServiceAwareTrait
- *
- * @author Laurent LÉCLUSE <laurent.lecluse at unicaen.fr>
+ * @author Unicaen
  */
 trait UserContextServiceAwareTrait
 {
     /**
      * @var UserContext
      */
-    private $serviceUserContext;
-
-
+    protected $serviceUserContext;
 
     /**
      * @param UserContext $serviceUserContext
-     *
      * @return self
      */
     public function setServiceUserContext(UserContext $serviceUserContext)
@@ -30,15 +24,4 @@ trait UserContextServiceAwareTrait
 
         return $this;
     }
-
-
-
-    /**
-     * @return UserContext
-     * @throws RuntimeException
-     */
-    public function getServiceUserContext()
-    {
-        return $this->serviceUserContext;
-    }
 }
\ No newline at end of file
-- 
GitLab