Merge pull request #1166 from Soullivaneuh/type-extension-tag

lsmith77 · lsmith77 · commit 9d4c843cc9de · 2015-10-12T10:37:34.000+02:00
Fix deprecated form.type_extension tag alias option usage
diff --git a/Form/Extension/DisableCSRFExtension.php b/Form/Extension/DisableCSRFExtension.php
@@ -76,6 +76,9 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
 
     public function getExtendedType()
     {
-        return 'form';
+        return method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')
+            ? 'Symfony\Component\Form\Extension\Core\Type\FormType'
+            : 'form' // SF <2.8 BC
+        ;
     }
 }
diff --git a/Resources/config/forms.xml b/Resources/config/forms.xml
@@ -12,7 +12,8 @@
 
     <services>
         <service id="fos_rest.form.extension.csrf_disable" class="%fos_rest.form.extension.csrf_disable.class%">
-            <tag name="form.type_extension" alias="form" />
+            <!-- "alias" option for SF <2.8 -->
+            <tag name="form.type_extension" alias="form" extended-type="Symfony\Component\Form\Extension\Core\Type\FormType" />
             <argument /> <!-- security.token_storage or security.context for Symfony < 2.6 -->
             <argument>%fos_rest.disable_csrf_role%</argument>
         </service>

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,9 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)`
`76`	`76`
`77`	`77`	`public function getExtendedType()`
`78`	`78`	`{`
`79`		`- return 'form';`
	`79`	`+ return method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix')`
	`80`	`+ ? 'Symfony\Component\Form\Extension\Core\Type\FormType'`
	`81`	`+ : 'form' // SF <2.8 BC`
	`82`	`+ ;`
`80`	`83`	`}`
`81`	`84`	`}`