8000 feature #13401 [TwigBundle] use the new Twig autoescaping strategy (f… · symfony/symfony@8d12652 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8d12652

Browse files
fabpotfabpot
committed
feature #13401 [TwigBundle] use the new Twig autoescaping strategy (fabpot)
This PR was merged into the 2.7 branch. Discussion ---------- [TwigBundle] use the new Twig autoescaping strategy | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Commits ------- 55c4b41 [TwigBundle] use the new Twig autoescaping strategy
2 parents 52e18c5 + 55c4b41 commit 8d12652

File tree

6 files changed

+11
-9
lines changed

6 files changed

+11
-9
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": ">=5.3.9",
2020
"doctrine/common": "~2.3",
21-
"twig/twig": "~1.12,>=1.12.3",
21+
"twig/twig": "~1.17",
2222
"psr/log": "~1.0"
2323
},
2424
"replace": {

‎src/Symfony/Bridge/Twig/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": ">=5.3.9",
2020
"symfony/security-csrf": "~2.6|~3.0.0",
21-
"twig/twig": "~1.13,>=1.13.1"
21+
"twig/twig": "~1.17"
2222
},
2323
"require-dev": {
2424
"symfony/finder": "~2.3|~3.0.0",

‎src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,7 @@ private function addTwigOptions(ArrayNodeDefinition $rootNode)
166166
$rootNode
167167
->fixXmlConfig('path')
168168
->children()
169-
->variableNode('autoescape')
170-
->defaultValue(array('Symfony\Bundle\TwigBundle\TwigDefaultEscapingStrategy', 'guess'))
171-
->end()
169+
->variableNode('autoescape')->defaultValue('filename')->end()
172170
->scalarNode('autoescape_service')->defaultNull()->end()
173171
->scalarNode('autoescape_service_method')->defaultNull()->end()
174172
->scalarNode('base_template_class')->example('Twig_Template')->end()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public function testLoadDefaultTemplateEscapingGuesserConfiguration($format)
149149
$this->compileContainer($container);
150150

151151
$options = $container->getParameter('twig.options');
152-
$this->assertEquals(array('Symfony\Bundle\TwigBundle\TwigDefaultEscapingStrategy', 'guess'), $options['autoescape']);
152+
$this->assertEquals('filename', $options['autoescape']);
153153
}
154154

155155
public function testGlobalsWithDifferentTypesAndValues()

‎src/Symfony/Bundle/TwigBundle/TwigDefaultEscapingStrategy.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,12 @@
1111

1212
namespace Symfony\Bundle\TwigBundle;
1313

14+
trigger_error('The '.__NAMESPACE__.'\TwigDefaultEscapingStrategy class is deprecated in version 2.7 and will be removed in version 3.0. Use the "filename" auto-escaping strategy instead.', E_USER_DEPRECATED);
15+
1416
/**
1517
* @author Fabien Potencier <fabien@symfony.com>
18+
*
19+
* @deprecated since version 2.7, will be removed in 3.0. Use the "filename" auto-escaping strategy instead.
1620
*/
1721
class TwigDefaultEscapingStrategy
1822
{

‎src/Symfony/Bundle/TwigBundle/TwigEngine.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ public function setDefaultEscapingStrategy($strategy)
5454

5555
/**
5656
* @deprecated since version 2.7, to be removed in 3.0.
57-
* Use TwigDefaultEscapingStrategy instead.
57+
* Use the 'filename' strategy instead.
5858
*/
5959
public function guessDefaultEscapingStrategy($filename)
6060
{
61-
trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Bundle\TwigBundle\TwigDefaultEscapingStrategy::guess method instead.', E_USER_DEPRECATED);
61+
trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0. Use the Twig_FileExtensionEscapingStrategy::guess method instead.', E_USER_DEPRECATED);
6262

63-
return TwigDefaultEscapingStrategy::guess($filename);
63+
return \Twig_FileExtensionEscapingStrategy::guess($filename);
6464
}
6565

6666
/**

0 commit comments

Comments
 (0)
0