Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 7f8ff50

Browse files
fabpotfabpot
committed
minor #13344 [2.7] adds legacy tests for deprecated configuration keys. (hhamon)
This PR was merged into the 2.7 branch. Discussion ---------- [2.7] adds legacy tests for deprecated configuration keys. | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | yes | Tests pass? | yes | Fixed tickets | ~ | License | MIT | Doc PR | ~ Commits ------- 814527f [FrameworkBundle] adds legacy tests for deprecated configuration keys. a290286 [TwigBundle] adds legacy tests for deprecated configuration keys.
2 parents 43c0565 + 814527f commit 7f8ff50

14 files changed

+141
-42
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@
33
$container->loadFromExtension('framework', array(
44
'secret' => 's3cr3t',
55
'default_locale' => 'fr',
6-
'form' => null,
6+
'form' => array(
7+
'csrf_protection' => array(
8+
'field_name' => '_csrf',
9+
),
10+
),
711
'http_method_override' => false,
812
'trusted_proxies' => array('127.0.0.1', '10.0.0.1'),
913
'csrf_protection' => array(
1014
'enabled' => true,
11-
'field_name' => '_csrf',
1215
),
1316
'esi' => array(
1417
'enabled' => true,

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
88

99
<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">
10-
<framework:csrf-protection enabled="true" field-name="_csrf" />
11-
<framework:form />
10+
<framework:csrf-protection enabled="true" />
11+
<framework:form>
12+
<framework:csrf-protection field-name="_csrf"/>
13+
</framework:form>
1214
<framework:esi enabled="true" />
1315
<framework:profiler only-exceptions="true" enabled="false" />
1416
<framework:router resource="%kernel.root_dir%/config/routing.xml" type="xml" />

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
framework:
22
secret: s3cr3t
33
default_locale: fr
4-
form: ~
4+
form:
5+
csrf_protection:
6+
field_name: _csrf
57
http_method_override: false
68
trusted_proxies: ['127.0.0.1', '10.0.0.1']
79
csrf_protection:
810
enabled: true
9-
field_name: _csrf
1011
esi:
1112
enabled: true
1213
profiler:

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,8 +457,10 @@ public function testFormsCanBeEnabledWithoutCsrfProtection()
457457
$this->assertFalse($container->getParameter('form.type_extension.csrf.enabled'));
458458
}
459459

460-
public function testFormCsrfFieldNameCanBeSetUnderCsrfSettings()
460+
public function testLegacyFormCsrfFieldNameCanBeSetUnderCsrfSettings()
461461
{
462+
$this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
463+
462464
$container = $this->createContainerFromFile('form_csrf_sets_field_name');
463465

464466
$this->assertTrue($container->getParameter('form.type_extension.csrf.enabled'));

‎src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,26 @@
11
<?php
22

33
$container->loadFromExtension('twig', array(
4-
'form' => array(
5-
'resources' => array(
6-
'MyBundle::formDeprecated.html.twig',
7-
),
8-
),
9-
'form_themes' => array(
10-
'MyBundle::form.html.twig',
11-
),
12-
'globals' => array(
13-
'foo' => '@bar',
14-
'baz' => '@@qux',
15-
'pi' => 3.14,
16-
'bad' => array('key' => 'foo'),
17-
),
18-
'auto_reload' => true,
19-
'autoescape' => true,
20-
'base_template_class' => 'stdClass',
21-
'cache' => '/tmp',
22-
'charset' => 'ISO-8859-1',
23-
'debug' => true,
24-
'strict_variables' => true,
25-
'paths' => array(
26-
'path1',
27-
'path2',
28-
'namespaced_path1' => 'namespace1',
29-
'namespaced_path2' => 'namespace2',
30-
),
4+
'form_themes' => array(
5+
'MyBundle::form.html.twig',
6+
),
7+
'globals' => array(
8+
'foo' => '@bar',
9+
'baz' => '@@qux',
10+
'pi' => 3.14,
11+
'bad' => array('key' => 'foo'),
12+
),
13+
'auto_reload' => true,
14+
'autoescape' => true,
15+
'base_template_class' => 'stdClass',
16+
'cache' => '/tmp',
17+
'charset' => 'ISO-8859-1',
18+
'debug' => true,
19+
'strict_variables' => true,
20+
'paths' => array(
21+
'path1',
22+
'path2',
23+
'namespaced_path1' => 'namespace1',
24+
'namespaced_path2' => 'namespace2',
25+
),
3126
));

‎src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/legacy-form-resources-only.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
$container->loadFromExtension('twig', array(
4+
'form' => array(
5+
'resources' => array(
6+
'form_table_layout.html.twig',
7+
'MyBundle:Form:my_theme.html.twig',
8+
),
9+
),
10+
));

‎src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/legacy-merge-form-resources-with-form-themes.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
3+
$container->loadFromExtension('twig', array(
4+
'form' => array(
5+
'resources' => array(
6+
'form_table_layout.html.twig',
7+
'MyBundle:Form:my_theme.html.twig',
8+
),
9+
),
10+
'form_themes' => array(
11+
'FooBundle:Form:bar.html.twig',
12+
),
13+
));

‎src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/full.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/twig/twig-1.0.xsd">
88

99
<twig:config auto-reload="true" autoescape="true" base-template-class="stdClass" cache="/tmp" charset="ISO-8859-1" debug="true" strict-variables="true">
10-
<twig:form>
11-
<twig:resource>MyBundle::formDeprecated.html.twig</twig:resource>
12-
</twig:form>
1310
<twig:form-theme>MyBundle::form.html.twig</twig:form-theme>
1411
<twig:global key="foo" id="bar" type="service" />
1512
<twig:global key="baz">@@qux</twig:global>

‎src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/legacy-form-resources-only.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" ?>
2+
3+
<container xmlns="http://symfony.com/schema/dic/services"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xmlns:twig="http://symfony.com/schema/dic/twig"
6+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
7+
http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/twig/twig-1.0.xsd">
8+
9+
<twig:config auto-reload="true" autoescape="true" base-template-class="stdClass" cache="/tmp" charset="ISO-8859-1" debug="true" strict-variables="true">
10+
<twig:form>
11+
<twig:resource>form_table_layout.html.twig</twig:resource>
12+
<twig:resource>MyBundle:Form:my_theme.html.twig</twig:resource>
13+
</twig:form>
14+
</twig:config>
15+
</container>

‎src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/legacy-merge-form-resources-with-form-themes.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" ?>
2+
3+
<container xmlns="http://symfony.com/schema/dic/services"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xmlns:twig="http://symfony.com/schema/dic/twig"
6+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
7+
http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/twig/twig-1.0.xsd">
8+
9+
<twig:config auto-reload="true" autoescape="true" base-template-class="stdClass" cache="/tmp" charset="ISO-8859-1" debug="true" strict-variables="true">
10+
<twig:form>
11+
<twig:resource>form_table_layout.html.twig</twig:resource>
12+
<twig:resource>MyBundle:Form:my_theme.html.twig</twig:resource>
13+
</twig:form>
14+
<twig:form-theme>FooBundle:Form:bar.html.twig</twig:form-theme>
15+
</twig:config>
16+
</container>

‎src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/full.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
twig:
22
form_themes:
33
- MyBundle::form.html.twig
4-
form:
5-
resources:
6-
- MyBundle::formDeprecated.html.twig
74
globals:
85
foo: "@bar"
96
baz: "@@qux"

‎src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/legacy-form-resources-only.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
twig:
2+
form:
3+
resources:
4+
- "form_table_layout.html.twig"
5+
- "MyBundle:Form:my_theme.html.twig"

‎src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/legacy-merge-form-resources-with-form-themes.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
twig:
2+
form_themes:
3+
- "FooBundle:Form:bar.html.twig"
4+
form:
5+
resources:
6+
- "form_table_layout.html.twig"
7+
- "MyBundle:Form:my_theme.html.twig"

‎src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,44 @@
2323

2424
class TwigExtensionTest extends TestCase
2525
{
26+
/**
27+
* @dataProvider getFormats
28+
*/
29+
public function testLegacyFormResourcesConfigurationKey($format)
30+
{
31+
$this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
32+
33+
$container = $this->createContainer();
34+
$container->registerExtension(new TwigExtension());
35+
$this->loadFromFile($container, 'legacy-form-resources-only', $format);
36+
$this->compileContainer($container);
37+
38+
// Form resources
39+
$this->assertCount(3, $container->getParameter('twig.form.resources'));
40+
$this->assertContains('form_div_layout.html.twig', $container->getParameter('twig.form.resources'));
41+
$this->assertContains('form_table_layout.html.twig', $container->getParameter('twig.form.resources'));
42+
$this->assertContains('MyBundle:Form:my_theme.html.twig', $container->getParameter('twig.form.resources'));
43+
}
44+
45+
/**
46+
* @dataProvider getFormats
47+
*/
48+
public function testLegacyMergeFormResourcesConfigurationKeyWithFormThemesConfigurationKey($format)
49+
{
50+
$this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
51+
52+
$container = $this->createContainer();
53+
$container->registerExtension(new TwigExtension());
54+
$this->loadFromFile($container, 'legacy-merge-form-resources-with-form-themes', $format);
55+
$this->compileContainer($container);
56+
57+
$this->assertCount(4, $container->getParameter('twig.form.resources'));
58+
$this->assertContains('form_div_layout.html.twig', $container->getParameter('twig.form.resources'));
59+
$this->assertContains('form_table_layout.html.twig', $container->getParameter('twig.form.resources'));
60+
$this->assertContains('MyBundle:Form:my_theme.html.twig', $container->getParameter('twig.form.resources'));
61+
$this->assertContains('FooBundle:Form:bar.html.twig', $container->getParameter('twig.form.resources'));
62+
}
63+
2664
public function testLoadEmptyConfiguration()
2765
{
2866
$container = $this->createContainer();
@@ -57,8 +95,6 @@ public function testLoadFullConfiguration($format)
5795
$resources = $container->getParameter('twig.form.resources');
5896
$this->assertContains('form_div_layout.html.twig', $resources, '->load() includes default template for form resources');
5997
$this->assertContains('MyBundle::form.html.twig', $resources, '->load() merges new templates into form resources');
60-
// @deprecated since version 2.6, to be removed in 3.0
61-
$this->assertContains('MyBundle::formDeprecated.html.twig', $resources, '->load() merges new templates into form resources');
6298

6399
// Globals
64100
$calls = $container->getDefinition('twig')->getMethodCalls();

0 commit comments

Comments
 (0)