Pass ServerParams from FormTypeCsrfExtension to CsrfValidationListener

symfony · jameshalsall · Jul 17, 2016 · Jul 17, 2016 · Jul 17, 2016 · Jul 19, 2016
commit 87150cd3dfc6659f2db90dcdc36f94a1aec91a00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_csrf.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_csrf.xml
@@ -16,6 +16,7 @@
            <argument>%form.type_extension.csrf.field_name%</argument>
            <argument type="service" id="translator.default" />
            <argument>%validator.translation_domain%</argument>
+            <argument type="service" id="form.server_params" />
        </service>
    </services>
 </container>
diff --git a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
@@ -20,6 +20,7 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\Util\ServerParams;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
@@ -55,7 +56,12 @@ class FormTypeCsrfExtension extends AbstractTypeExtension
     */
    private $translationDomain;

-    public function __construct($defaultTokenManager, $defaultEnabled = true, $defaultFieldName = '_token', TranslatorInterface $translator = null, $translationDomain = null)
+    /**
+     * @var ServerParams
+     */
+    private $serverParams;
+
+    public function __construct($defaultTokenManager, $defaultEnabled = true, $defaultFieldName = '_token', TranslatorInterface $translator = null, $translationDomain = null, ServerParams $serverParams = null)
    {
        if ($defaultTokenManager instanceof CsrfProviderInterface) {
            $defaultTokenManager = new CsrfProviderAdapter($defaultTokenManager);
@@ -68,6 +74,7 @@ public function __construct($defaultTokenManager, $defaultEnabled = true, $defau
        $this->defaultFieldName = $defaultFieldName;
        $this->translator = $translator;
        $this->translationDomain = $translationDomain;
+        $this->serverParams = $serverParams;
    }

    /**
@@ -89,7 +96,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                $options['csrf_token_id'] ?: ($builder->getName() ?: get_class($builder->getType()->getInnerType())),
                $options['csrf_message'],
                $this->translator,
-                $this->translationDomain
+                $this->translationDomain,
+                $this->serverParams
            ))
        ;
    }