Fix Twig namespaces and update doc for twig runtime extension

Phenix789 · javiereguiluz · commit de8b1e759f4f · 2018-07-03T09:50:01.000+02:00
diff --git a/components/form.rst b/components/form.rst
@@ -181,6 +181,9 @@ to bootstrap or access Twig and add the :class:`Symfony\\Bridge\\Twig\\Extension
     use Symfony\Bridge\Twig\Extension\FormExtension;
     use Symfony\Bridge\Twig\Form\TwigRenderer;
     use Symfony\Bridge\Twig\Form\TwigRendererEngine;
+    use Twig\Environment;
+    use Twig\Loader\FilesystemLoader;
+    use Twig\RuntimeLoader\FactoryRuntimeLoader;
 
     // the Twig file that holds all the default markup for rendering forms
     // this file comes with TwigBridge
@@ -194,7 +197,7 @@ to bootstrap or access Twig and add the :class:`Symfony\\Bridge\\Twig\\Extension
     // the path to your other templates
     $viewsDirectory = realpath(__DIR__.'/../views');
 
-    $twig = new Twig_Environment(new Twig_Loader_Filesystem(array(
+    $twig = new Environment(new FilesystemLoader(array(
         $viewsDirectory,
         $vendorTwigBridgeDirectory.'/Resources/views/Form',
     )));
@@ -251,7 +254,7 @@ installed:
     $ composer require symfony/translation symfony/config
 
 Next, add the :class:`Symfony\\Bridge\\Twig\\Extension\\TranslationExtension`
-to your ``Twig_Environment`` instance::
+to your ``Twig\\Environment`` instance::
 
     use Symfony\Component\Form\Forms;
     use Symfony\Component\Translation\Translator;
diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst
@@ -84,7 +84,7 @@ called to determine the default escaping applied to the template.
 base_template_class
 ~~~~~~~~~~~~~~~~~~~
 
-**type**: ``string`` **default**: ``'Twig_Template'``
+**type**: ``string`` **default**: ``'Twig\\Template'``
 
 Twig templates are compiled into PHP classes before using them to render
 contents. This option defines the base class from which all the template classes
diff --git a/templating/twig_extension.rst b/templating/twig_extension.rst
@@ -33,12 +33,15 @@ As an example you'll create a price filter to format a given number into price::
     // src/AppBundle/Twig/AppExtension.php
     namespace AppBundle\Twig;
 
-    class AppExtension extends \Twig_Extension
+    use Twig\Extension\AbstractExtension;
+    use Twig\TwigFilter;
+
+    class AppExtension extends AbstractExtension
     {
         public function getFilters()
         {
             return array(
-                new \Twig_SimpleFilter('price', array($this, 'priceFilter')),
+                new TwigFilter('price', array($this, 'priceFilter')),
             );
         }
 

Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,15 @@ As an example you'll create a price filter to format a given number into price::`
`33`	`33`	`// src/AppBundle/Twig/AppExtension.php`
`34`	`34`	`namespace AppBundle\Twig;`
`35`	`35`
`36`		`- class AppExtension extends \Twig_Extension`
	`36`	`+ use Twig\Extension\AbstractExtension;`
	`37`	`+ use Twig\TwigFilter;`
	`38`	`+`
	`39`	`+ class AppExtension extends AbstractExtension`
`37`	`40`	`{`
`38`	`41`	`public function getFilters()`
`39`	`42`	`{`
`40`	`43`	`return array(`
`41`		`- new \Twig_SimpleFilter('price', array($this, 'priceFilter')),`
	`44`	`+ new TwigFilter('price', array($this, 'priceFilter')),`
`42`	`45`	`);`
`43`	`46`	`}`
`44`	`47`