瀏覽代碼

Merge pull request #2959 from Soullivaneuh/deprecated-csrf-token

Fix deprecated CsrfTokenManagerAdapter::generateCsrfToken method usage
Thomas 10 年之前
父節點
當前提交
e9e161d2f8
共有 1 個文件被更改,包括 8 次插入3 次删除
  1. 8 3
      Controller/CRUDController.php

+ 8 - 3
Controller/CRUDController.php

@@ -1285,11 +1285,16 @@ class CRUDController extends Controller
      */
     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;
     }
 
     /**