Merge branch '4.1'

* 4.1:
  typo fix in speaker mentoring
  Wrap the entity namespace in single quotes
  Improved the article about session flashes
  add example for cache pool configuration
  Added link to bcrypt (Wikipedia)
  Added a caution note about the checkMX option
  clarify the datetime format option
  Update configuration.rst
  Update doctrine.rst
  Added `charset` "query string"
  Resolve T_STRING
  You do not need to re-add the command

Author: javiereguiluz

configuration.rst

@@ -227,7 +227,7 @@ This is referenced inside ``config/packages/doctrine.yaml``:
         dbal:
             url: '%env(DATABASE_URL)%'
 
-            # the resolve: prefix will resolve parameters *inside* the env variable
+            # The `resolve:` prefix replaces container params by their values inside the env variable:
             # url: '%env(resolve:DATABASE_URL)%'
 
 For more details about environment variables, see :ref:`config-env-vars`.

console.rst

@@ -335,11 +335,9 @@ console::
     {
         public function testExecute()
         {
-            $kernel = self::bootKernel();
+            $kernel = static::createKernel();
             $application = new Application($kernel);
 
-            $application->add(new CreateUserCommand());
-
             $command = $application->find('app:create-user');
             $commandTester = new CommandTester($command);
             $commandTester->execute(array(
@@ -371,38 +369,6 @@ console::
     :class:`Symfony\\Component\\Console\\Application <Symfony\\Component\\Console\\Application>`
     and extend the normal ``\PHPUnit\Framework\TestCase``.
 
-To be able to use the fully set up service container for your console tests
-you can extend your test from
-:class:`Symfony\\Bundle\\FrameworkBundle\\Test\\KernelTestCase`::
-
-    // ...
-    use Symfony\Component\Console\Tester\CommandTester;
-    use Symfony\Bundle\FrameworkBundle\Console\Application;
-    use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-
-    class CreateUserCommandTest extends KernelTestCase
-    {
-        public function testExecute()
-        {
-            $kernel = static::createKernel();
-            $kernel->boot();
-
-            $application = new Application($kernel);
-
-            $command = $application->find('app:create-user');
-            $commandTester = new CommandTester($command);
-            $commandTester->execute(array(
-                'command'  => $command->getName(),
-                'username' => 'Wouter',
-            ));
-
-            $output = $commandTester->getDisplay();
-            $this->assertContains('Username: Wouter', $output);
-
-            // ...
-        }
-    }
-
 Learn More
 ----------
 

contributing/community/speaker-mentoring.rst

@@ -33,7 +33,7 @@ public speaker. They can even do practice runs via video chat!
 Furthermore, they can also be an ally when it comes to the day of
 giving the talk at a conference!
 
-A great resource with advice on everything related to`public speaking`_
+A great resource with advice on everything related to `public speaking`_
 is a collection of links maintained by VM (Vicky) Brasseur. It covers
 everything from finding a conference call for proposals, how to
 refine a proposal, to how to put together slide decks to practical

doctrine.rst

@@ -49,10 +49,12 @@ The database connection information is stored as an environment variable called
 
 .. caution::
 
-    If the username, password or database name contain any character considered
-    special in a URI (such as ``!``, ``@``, ``$``, ``#``), you must encode them.
+    If the username, password, host or database name contain any character considered
+    special in a URI (such as ``!``, ``@``, ``$``, ``#``, ``/``), you must encode them.
     See `RFC 3986`_ for the full list of reserved characters or use the
-    :phpfunction:`urlencode` function to encode them.
+    :phpfunction:`urlencode` function to encode them. In this case you need to remove
+    the ``resolve:`` prefix in ``config/packages/doctrine.yaml`` to avoid errors:
+    ``url: '%env(resolve:DATABASE_URL)%'``
 
 Now that your connection parameters are setup, Doctrine can create the ``db_name``
 database for you:

doctrine/registration_form.rst

@@ -324,7 +324,7 @@ encoder in the security configuration:
             ),
         ));
 
-In this case the recommended ``bcrypt`` algorithm is used. If needed, check out
+In this case the recommended `bcrypt`_ algorithm is used. If needed, check out
 the :ref:`user password encoding <security-encoding-user-password>` article.
 
 Next, create the template:
@@ -422,3 +422,4 @@ us to add validation, even though there is no ``termsAccepted`` property on ``Us
 
 .. _`CVE-2013-5750`: https://symfony.com/blog/cve-2013-5750-security-issue-in-fosuserbundle-login-form
 .. _`FOSUserBundle`: https://github.com/FriendsOfSymfony/FOSUserBundle
+.. _`bcrypt`: https://en.wikipedia.org/wiki/Bcrypt

doctrine/reverse_engineering.rst

@@ -56,7 +56,7 @@ table fields.
 
 .. code-block:: terminal
 
-    $ php bin/console doctrine:mapping:import App\\Entity annotation --path=src/Entity
+    $ php bin/console doctrine:mapping:import 'App\Entity' annotation --path=src/Entity
 
 This command line tool asks Doctrine to introspect the database and generate
 new PHP classes with annotation metadata into ``src/Entity``. This generates two
@@ -68,7 +68,7 @@ files: ``BlogPost.php`` and ``BlogComment.php``.
 
     .. code-block:: terminal
 
-        $ php bin/console doctrine:mapping:import App\\Entity xml --path=config/doctrine
+        $ php bin/console doctrine:mapping:import 'App\Entity' xml --path=config/doctrine
 
 Generating the Getters & Setters or PHP Classes
 -----------------------------------------------

reference/configuration/framework.rst

@@ -1955,6 +1955,57 @@ A list of cache pools to be created by the framework extension.
 
     For more information about how pools works, see :ref:`cache pools <component-cache-cache-pools>`.
 
+To configure a Redis cache pool with a default lifetime of 1 hour, do the following:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # config/packages/framework.yaml
+        framework:
+            cache:
+                pools:
+                    cache.mycache:
+                        adapter: cache.adapter.redis
+                        default_lifetime: 3600
+
+    .. code-block:: xml
+
+        <!-- config/packages/framework.xml -->
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:framework="http://symfony.com/schema/dic/symfony"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+            <framework:config>
+                <framework:cache>
+                    <framework:pool
+                        name="cache.mycache"
+                        adapter="cache.adapter.redis"
+                        default-lifetime=3600
+                    />
+                </framework:cache>
+                <!-- ... -->
+            </framework:config>
+        </container>
+
+    .. code-block:: php
+
+        // config/packages/framework.php
+        $container->loadFromExtension('framework', array(
+            'cache' => array(
+                'pools' => array(
+                    'cache.mycache' => array(
+                        'adapter' => 'cache.adapter.redis',
+                        'default_lifetime' => 3600,
+                    ),
+                ),
+            ),
+        ));
+
 .. _reference-cache-pools-name:
 
 name
@@ -1973,7 +2024,10 @@ adapter
 
 **type**: ``string`` **default**: ``cache.app``
 
-The name of the adapter to use. You could also use your own implementation.
+The service name of the adapter to use. You can specify one of the default
+services that follow the pattern ``cache.adapter.[type]``. Alternatively you
+can specify another cache pool as base, which will make this pool inherit the
+settings from the base pool as defaults.
 
 .. note::
 
@@ -2009,7 +2063,10 @@ provider
 
 **type**: ``string``
 
-The service name to use as provider when the specified adapter needs one.
+Overwrite the default service name or DSN respectively, if you do not want to
+use what is configured as ``default_X_provider`` under ``cache``. See the
+description of the default provider setting above for the type of adapter
+you use for information on how to specify the provider.
 
 clearer
 """""""

reference/constraints/Email.rst

@@ -137,6 +137,11 @@ checkMX
 If true, then the :phpfunction:`checkdnsrr` PHP function will be used to
 check the validity of the MX record of the host of the given email.
 
+.. caution::
+
+    This option is not reliable because it depends on the network conditions
+    and some valid servers refuse to respond to those requests.
+
 checkHost
 ~~~~~~~~~
 

reference/forms/types/datetime.rst

@@ -127,10 +127,10 @@ format
 
 If the ``widget`` option is set to ``single_text``, this option specifies
 the format of the input, i.e. how Symfony will interpret the given input
-as a datetime string. It defaults to the `RFC 3339`_ format which is used
-by the HTML5 ``datetime`` field. Keeping the default value will cause the
-field to be rendered as an ``input`` field with ``type="datetime"``. For
-more information on valid formats, see `Date/Time Format Syntax`_.
+as a datetime string. It defaults to the `datetime local`_ format which is
+used by the HTML5 ``datetime-local`` field. Keeping the default value will
+cause the field to be rendered as an ``input`` field with ``type="datetime-local"``.
+For more information on valid formats, see `Date/Time Format Syntax`_.
 
 .. include:: /reference/forms/types/options/hours.rst.inc
 
@@ -254,5 +254,5 @@ Field Variables
 |          |            | contains the input type to use (``datetime``, ``date`` or ``time``). |
 +----------+------------+----------------------------------------------------------------------+
 
-.. _`RFC 3339`: https://tools.ietf.org/html/rfc3339
+.. _`datetime local`: http://w3c.github.io/html-reference/datatypes.html#form.data.datetime-local
 .. _`Date/Time Format Syntax`: http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax

session/avoid_session_start.rst

@@ -29,7 +29,7 @@ access the flash messages:
 
 .. code-block:: html+twig
 
-    {% if app.request.hasPreviousSession %}
+    {% if app.request.method == 'POST' %}
         {% for message in app.flashes('notice') %}
             <div class="flash-notice">
                 {{ message }}