[FrameworkBundle] adds legacy tests for deprecated configuration keys.

Hugo Hamon · Hugo Hamon · commit 08d6fda187a7 · 2015-01-09T14:18:23.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php
@@ -3,12 +3,15 @@
 $container->loadFromExtension('framework', array(
     'secret' => 's3cr3t',
     'default_locale' => 'fr',
-    'form' => null,
+    'form' => array(
+        'csrf_protection' => array(
+            'field_name' => '_csrf',
+        ),
+    ),
     'http_method_override' => false,
     'trusted_proxies' => array('127.0.0.1', '10.0.0.1'),
     'csrf_protection' => array(
         'enabled' => true,
-        'field_name' => '_csrf',
     ),
     'esi' => array(
         'enabled' => true,
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
@@ -7,8 +7,10 @@
                         http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
     <framework:config secret="s3cr3t" ide="file%%link%%format" default-locale="fr" trusted-proxies="127.0.0.1, 10.0.0.1" http-method-override="false">
-        <framework:csrf-protection enabled="true" field-name="_csrf" />
-        <framework:form />
+        <framework:csrf-protection enabled="true" />
+        <framework:form>
+            <framework:csrf-protection field-name="_csrf"/>
+        </framework:form>
         <framework:esi enabled="true" />
         <framework:profiler only-exceptions="true" enabled="false" />
         <framework:router resource="%kernel.root_dir%/config/routing.xml" type="xml" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml
@@ -1,12 +1,13 @@
 framework:
     secret: s3cr3t
     default_locale: fr
-    form: ~
+    form:
+        csrf_protection:
+            field_name: _csrf
     http_method_override: false
     trusted_proxies: ['127.0.0.1', '10.0.0.1']
     csrf_protection:
         enabled:    true
-        field_name: _csrf
     esi:
         enabled: true
     profiler:
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -486,8 +486,10 @@ public function testFormsCanBeEnabledWithoutCsrfProtection()
         $this->assertFalse($container->getParameter('form.type_extension.csrf.enabled'));
     }
 
-    public function testFormCsrfFieldNameCanBeSetUnderCsrfSettings()
+    public function testLegacyFormCsrfFieldNameCanBeSetUnderCsrfSettings()
     {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
+
         $container = $this->createContainerFromFile('form_csrf_sets_field_name');
 
         $this->assertTrue($container->getParameter('form.type_extension.csrf.enabled'));

Original file line number	Diff line number	Diff line change
`@@ -486,8 +486,10 @@ public function testFormsCanBeEnabledWithoutCsrfProtection()`
`486`	`486`	`$this->assertFalse($container->getParameter('form.type_extension.csrf.enabled'));`
`487`	`487`	`}`
`488`	`488`
`489`		`- public function testFormCsrfFieldNameCanBeSetUnderCsrfSettings()`
	`489`	`+ public function testLegacyFormCsrfFieldNameCanBeSetUnderCsrfSettings()`
`490`	`490`	`{`
	`491`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
	`492`	`+`
`491`	`493`	`$container = $this->createContainerFromFile('form_csrf_sets_field_name');`
`492`	`494`
`493`	`495`	`$this->assertTrue($container->getParameter('form.type_extension.csrf.enabled'));`