Merge branch '4.1'

* 4.1:
  Fixed more Twig class namespaces
  Fix Twig namespaces and update doc for twig runtime extension
  Popper js is required
  ChoiceValidator : remove 'strict' option
  Proposed a reword abut the "lazy" explanation
  Tell about ServiceLocatorTagPass::register()
  [Cache] Add note about lazy=true option

Author: javiereguiluz

components/cache/adapters/redis_adapter.rst

@@ -96,6 +96,7 @@ array of ``key => value`` pairs representing option names and their respective v
 
         // associative array of configuration options
         array(
+            'lazy' => false,
             'persistent' => 0,
             'persistent_id' => null,
             'timeout' => 30,
@@ -113,6 +114,11 @@ Available Options
     If none is specified, it will return ``\Redis`` if the ``redis`` extension is
     available, and ``\Predis\Client`` otherwise.
 
+``lazy`` (type: ``bool``, default: ``false``)
+    Enables or disables lazy connections to the backend. It's ``false`` by
+    default when using this as a stand-alone component and ``true`` by default
+    when using it inside a Symfony application.
+
 ``persistent`` (type: ``int``, default: ``0``)
     Enables or disables use of persistent connections. A value of ``0`` disables persistent
     connections, and a value of ``1`` enables them.

components/form.rst

@@ -178,6 +178,9 @@ to bootstrap or access Twig and add the :class:`Symfony\\Bridge\\Twig\\Extension
     use Symfony\Bridge\Twig\Extension\FormExtension;
     use Symfony\Component\Form\FormRenderer;
     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
@@ -191,12 +194,12 @@ 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',
     )));
     $formEngine = new TwigRendererEngine(array($defaultFormTheme), $twig);
-    $twig->addRuntimeLoader(new \Twig_FactoryRuntimeLoader(array(
+    $twig->addRuntimeLoader(new FactoryRuntimeLoader(array(
         FormRenderer::class => function () use ($formEngine, $csrfManager) {
             return new FormRenderer($formEngine, $csrfManager);
         },
@@ -213,7 +216,7 @@ to bootstrap or access Twig and add the :class:`Symfony\\Bridge\\Twig\\Extension
         ->getFormFactory();
 
 .. versionadded:: 1.30
-    The ``Twig_FactoryRuntimeLoader`` was introduced in Twig 1.30.
+    The ``Twig\\RuntimeLoader\\FactoryRuntimeLoader`` was introduced in Twig 1.30.
 
 The exact details of your `Twig Configuration`_ will vary, but the goal is
 always to add the :class:`Symfony\\Bridge\\Twig\\Extension\\FormExtension`
@@ -253,7 +256,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;

controller/service.rst

@@ -97,12 +97,13 @@ service and use it directly::
     namespace App\Controller;
 
     use Symfony\Component\HttpFoundation\Response;
+    use Twig\Environment;
 
     class HelloController
     {
         private $twig;
 
-        public function __construct(\Twig_Environment $twig)
+        public function __construct(Environment $twig)
         {
             $this->twig = $twig;
         }

frontend/encore/bootstrap.rst

@@ -37,11 +37,12 @@ file into ``global.scss``. You can even customize the Bootstrap variables first!
 Importing Bootstrap JavaScript
 ------------------------------
 
-Bootstrap JavaScript requires jQuery, so make sure you have this installed:
+Bootstrap JavaScript requires jQuery and Popper.js, so make sure you have this installed:
 
 .. code-block:: terminal
 
     $ yarn add jquery --dev
+    $ yarn add popper.js --dev
 
 Next, make sure to call ``.autoProvidejQuery()`` in your ``webpack.config.js`` file:
 

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

reference/constraints/Choice.rst

@@ -17,7 +17,6 @@ an array of items is one of those valid choices.
 |                | - `multipleMessage`_                                                 |
 |                | - `minMessage`_                                                      |
 |                | - `maxMessage`_                                                      |
-|                | - `strict`_                                                          |
 |                | - `payload`_                                                         |
 +----------------+----------------------------------------------------------------------+
 | Class          | :class:`Symfony\\Component\\Validator\\Constraints\\Choice`          |
@@ -360,13 +359,4 @@ maxMessage
 This is the validation error message that's displayed when the user chooses
 too many options per the `max`_ option.
 
-strict
-~~~~~~
-
-**type**: ``boolean`` **default**: ``true``
-
-The validator will also check the type of the input value. Specifically,
-this value is passed to as the third argument to the PHP :phpfunction:`in_array`
-method when checking to see if a value is in the valid choices array.
-
 .. include:: /reference/constraints/_payload-option.rst.inc

service_container.rst

@@ -766,7 +766,7 @@ But, with ``autoconfigure: true``, you don't need the tag. In fact, if you're us
 the :ref:`default services.yaml config <service-container-services-load-example>`,
 you don't need to do *anything*: the service will be automatically loaded. Then,
 ``autoconfigure`` will add the ``twig.extension`` tag *for* you, because your class
-implements ``Twig_ExtensionInterface``. And thanks to ``autowire``, you can even add
+implements ``Twig\\Extension\\ExtensionInterface``. And thanks to ``autowire``, you can even add
 constructor arguments without any configuration.
 
 .. _container-public:

service_container/service_subscribers_locators.rst

@@ -362,10 +362,25 @@ Now you can use the service locator by injecting it in any other service:
             ->setArguments(array(new Reference('app.command_handler_locator')))
         ;
 
-.. tip::
+In :doc:`compiler passes </service_container/compiler_passes>` it's recommended
+to use the :method:`Symfony\\Component\\DependencyInjection\\Compiler\\ServiceLocatorTagPass::register`
+method to create the service locators. This will save you some boilerplate and
+will share identical locators amongst all the services referencing them::
+
+    use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
+    use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+    public function process(ContainerBuilder $container)
+    {
+        //...
+
+        $locateableServices = array(
+            //...
+            'logger' => new Reference('logger'),
+        );
 
-    If the service locator is not intended to be used by multiple services, it's
-    better to create and inject it as an anonymous service.
+        $myService->addArgument(ServiceLocatorTagPass::register($locateableServices));
+    }
 
 .. _`Command pattern`: https://en.wikipedia.org/wiki/Command_pattern
 

service_container/tags.rst

@@ -60,8 +60,8 @@ Autoconfiguring Tags
 
 If you enable :ref:`autoconfigure <services-autoconfigure>`, then some tags are
 automatically applied for you. That's true for the ``twig.extension`` tag: the
-container sees that your class extends ``Twig_Extension`` (or more accurately,
-that it implements ``Twig_ExtensionInterface``) and adds the tag for you.
+container sees that your class extends ``AbstractExtension`` (or more accurately,
+that it implements ``ExtensionInterface``) and adds the tag for you.
 
 .. tip::
 

templating/twig_extension.rst

@@ -32,8 +32,7 @@ money:
     {# pass in the 3 optional arguments #}
     {{ product.price|price(2, ',', '.') }}
 
-Create a class that extends the ``AbstractExtension`` class defined by Twig and
-fill in the logic::
+Create a class that extends ``AbstractExtension`` and fill in the logic::
 
     // src/Twig/AppExtension.php
     namespace App\Twig;
@@ -98,14 +97,16 @@ callable defined in ``getFilters()``::
     namespace App\Twig;
 
     use App\Twig\AppRuntime;
+    use Twig\Extension\AbstractExtension;
+    use Twig\TwigFilter;
 
-    class AppExtension extends \Twig_Extension
+    class AppExtension extends AbstractExtension
     {
         public function getFilters()
         {
             return array(
                 // the logic of this filter is now implemented in a different class
-                new \Twig_SimpleFilter('price', array(AppRuntime::class, 'priceFilter')),
+                new TwigFilter('price', array(AppRuntime::class, 'priceFilter')),
             );
         }
     }