[TwigBundle] use the new Twig autoescaping strategy

fabpot · fabpot · commit dbd689d46421 · 2015-01-13T18:46:36.000+01:00
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=5.3.9",
         "symfony/security-csrf": "~2.6|~3.0.0",
-        "twig/twig": "~1.13,>=1.13.1"
+        "twig/twig": "~1.17"
     },
     "require-dev": {
         "symfony/finder": "~2.3|~3.0.0",
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
@@ -166,9 +166,7 @@ private function addTwigOptions(ArrayNodeDefinition $rootNode)
         $rootNode
             ->fixXmlConfig('path')
             ->children()
-                ->variableNode('autoescape')
-                    ->defaultValue(array('Symfony\Bundle\TwigBundle\TwigDefaultEscapingStrategy', 'guess'))
-                ->end()
+                ->variableNode('autoescape')->defaultValue('filename')->end()
                 ->scalarNode('autoescape_service')->defaultNull()->end()
                 ->scalarNode('autoescape_service_method')->defaultNull()->end()
                 ->scalarNode('base_template_class')->example('Twig_Template')->end()
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
@@ -149,7 +149,7 @@ public function testLoadDefaultTemplateEscapingGuesserConfiguration($format)
         $this->compileContainer($container);
 
         $options = $container->getParameter('twig.options');
-        $this->assertEquals(array('Symfony\Bundle\TwigBundle\TwigDefaultEscapingStrategy', 'guess'), $options['autoescape']);
+        $this->assertEquals('filename', $options['autoescape']);
     }
 
     public function testGlobalsWithDifferentTypesAndValues()
diff --git a/src/Symfony/Bundle/TwigBundle/TwigDefaultEscapingStrategy.php b/src/Symfony/Bundle/TwigBundle/TwigDefaultEscapingStrategy.php
diff --git a/src/Symfony/Bundle/TwigBundle/TwigEngine.php b/src/Symfony/Bundle/TwigBundle/TwigEngine.php
@@ -54,13 +54,13 @@ public function setDefaultEscapingStrategy($strategy)
 
     /**
      * @deprecated since version 2.7, to be removed in 3.0.
-     *             Use TwigDefaultEscapingStrategy instead.
+     *             Use the 'filename' strategy instead.
      */
     public function guessDefaultEscapingStrategy($filename)
     {
-        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);
+        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);
 
-        return TwigDefaultEscapingStrategy::guess($filename);
+        return \Twig_FileExtensionEscapingStrategy::guess($filename);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public function testLoadDefaultTemplateEscapingGuesserConfiguration($format)`
`149`	`149`	`$this->compileContainer($container);`
`150`	`150`
`151`	`151`	`$options = $container->getParameter('twig.options');`
`152`		`- $this->assertEquals(array('Symfony\Bundle\TwigBundle\TwigDefaultEscapingStrategy', 'guess'), $options['autoescape']);`
	`152`	`+ $this->assertEquals('filename', $options['autoescape']);`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`public function testGlobalsWithDifferentTypesAndValues()`
Original file line number	Diff line number	Diff line change
`@@ -54,13 +54,13 @@ public function setDefaultEscapingStrategy($strategy)`
`54`	`54`
`55`	`55`	`/**`
`56`	`56`	`* @deprecated since version 2.7, to be removed in 3.0.`
`57`		`- * Use TwigDefaultEscapingStrategy instead.`
	`57`	`+ * Use the 'filename' strategy instead.`
`58`	`58`	`*/`
`59`	`59`	`public function guessDefaultEscapingStrategy($filename)`
`60`	`60`	`{`
`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);`
`62`	`62`
`63`		`- return TwigDefaultEscapingStrategy::guess($filename);`
	`63`	`+ return \Twig_FileExtensionEscapingStrategy::guess($filename);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`/**`