more deprecated messages removed

sonata-project · Feb 3, 2017 · 53849fd · 53849fd
1 parent 45f6fff
commit 53849fd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/Controller/AdminResettingController.php b/Controller/AdminResettingController.php
@@ -27,7 +27,11 @@ class AdminResettingController extends ResettingController
      */
     public function requestAction()
     {
-        if ($this->container->get('security.context')->isGranted('IS_AUTHENTICATED_FULLY')) {
+        // NEXT_MAJOR: remove when dropping Symfony <2.8 support
+        $authorizationCheckerService = $this->container->has('security.authorization_checker')
+            ? $this->container->get('security.authorization_checker') : $this->container->get('security.context');
+
+        if ($authorizationCheckerService->isGranted('IS_AUTHENTICATED_FULLY')) {
             return new RedirectResponse($this->container->get('router')->generate('sonata_admin_dashboard'));
         }
 
@@ -102,7 +106,11 @@ public function checkEmailAction()
      */
     public function resetAction($token)
     {
-        if ($this->container->get('security.context')->isGranted('IS_AUTHENTICATED_FULLY')) {
+        // NEXT_MAJOR: remove when dropping Symfony <2.8 support
+        $authorizationCheckerService = $this->container->has('security.authorization_checker')
+            ? $this->container->get('security.authorization_checker') : $this->container->get('security.context');
+
+        if ($authorizationCheckerService->isGranted('IS_AUTHENTICATED_FULLY')) {
             return new RedirectResponse($this->container->get('router')->generate('sonata_admin_dashboard'));
         }
 

diff --git a/Controller/SecurityFOSUser1Controller.php b/Controller/SecurityFOSUser1Controller.php
@@ -28,7 +28,11 @@ class SecurityFOSUser1Controller extends SecurityController
      */
     public function loginAction()
     {
-        $token = $this->container->get('security.context')->getToken();
+        // NEXT_MAJOR: remove when dropping Symfony <2.8 support
+        $tokenStorageService = $this->container->has('security.token_storage')
+            ? $this->container->get('security.token_storage') : $this->container->get('security.context');
+
+        $token = $tokenStorageService->getToken();
 
         if ($token && $token->getUser() instanceof UserInterface) {
             $this->container->get('session')->getFlashBag()->set('sonata_user_error', 'sonata_user_already_authenticated');