Merge branch '2.5' into 2.6

* 2.5:
  [Form] fixed the CSRF extension to allow using only the new interfaces

Author: fabpot

Extension/Csrf/Type/FormTypeCsrfExtension.php

@@ -128,6 +128,10 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
 
         // BC clause for the "csrf_provider" option
         $csrfTokenManager = function (Options $options) {
+            if ($options['csrf_provider'] instanceof CsrfTokenManagerInterface) {
+                return $options['csrf_provider'];
+            }
+
             return $options['csrf_provider'] instanceof CsrfTokenManagerAdapter
                 ? $options['csrf_provider']->getTokenManager()
                 : new CsrfProviderAdapter($options['csrf_provider']);
@@ -139,7 +143,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             'csrf_message' => 'The CSRF token is invalid. Please try to resubmit the form.',
             'csrf_token_manager' => $csrfTokenManager,
             'csrf_token_id' => $csrfTokenId,
-            'csrf_provider' => new CsrfTokenManagerAdapter($this->defaultTokenManager),
+            'csrf_provider' => $this->defaultTokenManager,
             'intention' => null,
         ));
     }