[Twig] [ConfigBuilder] Use ConfigBuilder for TwigBundle

Author: Nyholm

configuration/front_controllers_and_kernel.rst

@@ -190,10 +190,13 @@ parameter used, for example, to turn Twig's debug mode on:
 
     .. code-block:: php
 
-        $container->loadFromExtension('twig', [
-            'debug' => '%kernel.debug%',
+        // config/packages/twig.php
+        use Symfony\Config\TwigConfig;
+
+        return static function (TwigConfig $twig) {
             // ...
-        ]);
+            $twig->debug('%kernel.debug%');
+        };
 
 The Environments
 ----------------

configuration/override_dir_structure.rst

@@ -140,9 +140,11 @@ for multiple directories):
     .. code-block:: php
 
         // config/packages/twig.php
-        $container->loadFromExtension('twig', [
-            'default_path' => '%kernel.project_dir%/resources/views',
-        ]);
+        use Symfony\Config\TwigConfig;
+
+        return static function (TwigConfig $twig) {
+            $twig->defaultPath('%kernel.project_dir%/resources/views');
+        };
 
 Override the Translations Directory
 -----------------------------------

form/bootstrap4.rst

@@ -55,13 +55,13 @@ configuration:
     .. code-block:: php
 
         // config/packages/twig.php
-        $container->loadFromExtension('twig', [
-            'form_themes' => [
-                'bootstrap_4_layout.html.twig',
-            ],
+        use Symfony\Config\TwigConfig;
+
+        return static function (TwigConfig $twig) {
+            $twig->formThemes(['bootstrap_4_layout.html.twig']);
 
             // ...
-        ]);
+        };
 
 If you prefer to apply the Bootstrap styles on a form to form basis, include the
 ``form_theme`` tag in the templates where those forms are used:

form/create_custom_field_type.rst

@@ -405,12 +405,14 @@ rest of files):
     .. code-block:: php
 
         // config/packages/twig.php
-        $container->loadFromExtension('twig', [
-            'form_themes' => [
+        use Symfony\Config\TwigConfig;
+
+        return static function (TwigConfig $twig) {
+            $twig->formThemes([
                 'form/custom_types.html.twig',
                 '...',
-            ],
-        ]);
+            ]);
+        };
 
 The last step is to create the actual Twig template that will render the type.
 The template contents depend on which HTML, CSS and JavaScript frameworks and

form/form_themes.rst

@@ -88,12 +88,15 @@ want to use another theme for all the forms of your app, configure it in the
     .. code-block:: php
 
         // config/packages/twig.php
-        $container->loadFromExtension('twig', [
-            'form_themes' => [
+        use Symfony\Config\TwigConfig;
+
+        return static function (TwigConfig $twig) {
+            $twig->formThemes([
                 'bootstrap_4_horizontal_layout.html.twig',
-            ],
+            ]);
+
             // ...
-        ]);
+        };
 
 You can pass multiple themes to this option because sometimes form themes only
 redefine a few elements. This way, if some theme doesn't override some element,
@@ -514,12 +517,15 @@ you want to apply the theme globally to all forms, define the
     .. code-block:: php
 
         // config/packages/twig.php
-        $container->loadFromExtension('twig', [
-            'form_themes' => [
+        use Symfony\Config\TwigConfig;
+
+        return static function (TwigConfig $twig) {
+            $twig->formThemes([
                 'form/my_theme.html.twig',
-            ],
+            ]);
+
             // ...
-        ]);
+        };
 
 If you only want to apply it to some specific forms, use the ``form_theme`` tag:
 

mailer.rst

@@ -704,13 +704,14 @@ image files as usual. First, to simplify things, define a Twig namespace called
     .. code-block:: php
 
         // config/packages/twig.php
-        $container->loadFromExtension('twig', [
+        use Symfony\Config\TwigConfig;
+
+        return static function (TwigConfig $twig) {
             // ...
-            'paths' => [
-                // point this wherever your images live
-                '%kernel.project_dir%/assets/images' => 'images',
-            ],
-        ]);
+
+            // point this wherever your images live
+            $twig->path('%kernel.project_dir%/assets/images', 'images');
+        };
 
 Now, use the special ``email.image()`` Twig helper to embed the images inside
 the email contents:
@@ -812,13 +813,14 @@ called ``styles`` that points to the directory where ``email.css`` lives:
     .. code-block:: php
 
         // config/packages/twig.php
-        $container->loadFromExtension('twig', [
+        use Symfony\Config\TwigConfig;
+
+        return static function (TwigConfig $twig) {
             // ...
-            'paths' => [
-                // point this wherever your css files live
-                '%kernel.project_dir%/assets/styles' => 'styles',
-            ],
-        ]);
+
+            // point this wherever your css files live
+            $twig->path('%kernel.project_dir%/assets/styles', 'styles');
+        };
 
 .. _mailer-markdown:
 

reference/configuration/twig.rst

@@ -235,13 +235,16 @@ all the forms of the application:
     .. code-block:: php
 
         // config/packages/twig.php
-        $container->loadFromExtension('twig', [
-            'form_themes' => [
+        use Symfony\Config\TwigConfig;
+
+        return static function (TwigConfig $twig) {
+            $twig->formThemes([
                 'bootstrap_4_layout.html.twig',
                 'form/my_theme.html.twig',
-            ],
+            ]);
+
             // ...
-        ]);
+        };
 
 The order in which themes are defined is important because each theme overrides
 all the previous one. When rendering a form field whose block is not defined in
@@ -348,13 +351,14 @@ the directory defined in the :ref:`default_path option <config-twig-default-path
     .. code-block:: php
 
         // config/packages/twig.php
-        $container->loadFromExtension('twig', [
+        use Symfony\Config\TwigConfig;
+
+        return static function (TwigConfig $twig) {
             // ...
-            'paths' => [
-                'email/default/templates' => null,
-                'backend/templates' => 'admin',
-            ],
-        ]);
+
+            $twig->path('email/default/templates', null);
+            $twig->path('backend/templates', 'admin');
+        };
 
 Read more about :ref:`template directories and namespaces <templates-namespaces>`.
 

templating/global_variables.rst

@@ -39,12 +39,13 @@ main Twig configuration file:
     .. code-block:: php
 
         // config/packages/twig.php
-        $container->loadFromExtension('twig', [
+        use Symfony\Config\TwigConfig;
+
+        return static function (TwigConfig $twig) {
             // ...
-            'globals' => [
-                'ga_tracking' => 'UA-xxxxx-x',
-            ],
-        ]);
+
+            $twig->global('ga_tracking')->value('UA-xxxxx-x');
+        };
 
 Now, the variable ``ga_tracking`` is available in all Twig templates, so you
 can use it without having to pass it explicitly from the controller or service
@@ -98,12 +99,13 @@ the ``@`` character, which is the usual syntax to
     .. code-block:: php
 
         // config/packages/twig.php
-        $container->loadFromExtension('twig', [
+        use Symfony\Config\TwigConfig;
+
+        return static function (TwigConfig $twig) {
             // ...
-            'globals' => [
-                'uuid' => '@App\Generator\UuidGenerator',
-            ],
-        ]);
+
+            $twig->global('uuid')->value('@App\Generator\UuidGenerator');
+        };
 
 Now you can use the ``uuid`` variable in any Twig template to access to the
 ``UuidGenerator`` service:

testing.rst

@@ -184,9 +184,11 @@ code to production:
     .. code-block:: php
 
         // config/packages/test/twig.php
-        $container->loadFromExtension('twig', [
-            'strict_variables' => true,
-        ]);
+        use Symfony\Config\TwigConfig;
+
+        return static function (TwigConfig $twig) {
+            $twig->strictVariables(true);
+        };
 
 You can also use a different environment entirely, or override the default
 debug mode (``true``) by passing each as options to the ``bootKernel()``