Merge pull request sonata-project#2959 from Soullivaneuh/deprecated-c…

…srf-token Fix deprecated CsrfTokenManagerAdapter::generateCsrfToken method usage
ksom · May 5, 2015 · e9e161d · e9e161d
2 parents 38d234e + 4e56d32
commit e9e161d
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/Controller/CRUDController.php b/Controller/CRUDController.php
@@ -1285,11 +1285,16 @@ protected function escapeHtml($s)
      */
     protected function getCsrfToken($intention)
     {
-        if (!$this->container->has('form.csrf_provider')) {
-            return false;
+        if ($this->container->has('security.csrf.token_manager')) {
+            return $this->container->get('security.csrf.token_manager')->getToken($intention)->getValue();
+        }
+
+        // TODO: Remove it when bumping requirements to SF 2.4+
+        if ($this->container->has('form.csrf_provider')) {
+            return $this->container->get('form.csrf_provider')->generateCsrfToken($intention);
         }
 
-        return $this->container->get('form.csrf_provider')->generateCsrfToken($intention);
+        return false;
     }
 
     /**