[Security] removed usage of the deprecated SecurityContextInterface

Author: fabpot

Extension/Csrf/CsrfProvider/CsrfTokenManagerAdapter.php

@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\Form\Extension\Csrf\CsrfProvider;
 
-trigger_error('The '.__NAMESPACE__.'\CsrfTokenManagerAdapter is deprecated since version 2.4 and will be removed in version 3.0. Use the Symfony\Component\Security\Csrf\CsrfTokenManager class instead.', E_USER_DEPRECATED);
-
 use Symfony\Component\Security\Csrf\CsrfToken;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 
@@ -36,8 +34,12 @@ public function __construct(CsrfTokenManagerInterface $tokenManager)
         $this->tokenManager = $tokenManager;
     }
 
-    public function getTokenManager()
+    public function getTokenManager($triggerDeprecationError = true)
     {
+        if ($triggerDeprecationError) {
+            trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in version 3.0. Use the Symfony\Component\Security\Csrf\CsrfTokenManager class instead.', E_USER_DEPRECATED);
+        }
+
         return $this->tokenManager;
     }
 
@@ -46,6 +48,8 @@ public function getTokenManager()
      */
     public function generateCsrfToken($intention)
     {
+        trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in version 3.0. Use the Symfony\Component\Security\Csrf\CsrfTokenManager class instead.', E_USER_DEPRECATED);
+
         return $this->tokenManager->getToken($intention)->getValue();
     }
 
@@ -54,6 +58,8 @@ public function generateCsrfToken($intention)
      */
     public function isCsrfTokenValid($intention, $token)
     {
+        trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in version 3.0. Use the Symfony\Component\Security\Csrf\CsrfTokenManager class instead.', E_USER_DEPRECATED);
+
         return $this->tokenManager->isTokenValid(new CsrfToken($intention, $token));
     }
 }

Extension/Csrf/Type/FormTypeCsrfExtension.php

@@ -133,7 +133,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             }
 
             return $options['csrf_provider'] instanceof CsrfTokenManagerAdapter
-                ? $options['csrf_provider']->getTokenManager()
+                ? $options['csrf_provider']->getTokenManager(false)
                 : new CsrfProviderAdapter($options['csrf_provider']);
         };