Merge branch '4.1' into 4.2

* 4.1:
  Teach the user to write the command lazy loading
  [#10480] reuse wording from multi kernel article
  Update Multiple_kernels.rst
  Update usage.rst
  add annotation block to routing conditions
  fix the markup
  Clarifying what happens with --env=prod + APP_ENV=prod
  Fix example for collection form type
  Update micro_kernel_trait.rst
  Update configuration/micro_kernel_trait.rst
  Update to micro_kernel_trait.rst

Author: xabbuh

configuration/dot-env-changes.rst

@@ -30,6 +30,10 @@ important changes:
   other environments. You can also create a ``.env.test`` file for test-environment
   overrides.
 
+* E) If you pass the ``--env=`` flag when running ``bin/console``, this value will
+  override your ``APP_ENV`` environment variable (if set). And so, if you pass
+  ``--env=prod``, the DotEnv component *will* try to load your ``.env*`` files.
+
 There are a few other improvements, but these are the most important. To take advantage
 of these, you *will* need to modify a few files in your existing app.
 
@@ -52,29 +56,29 @@ changes can be made to any Symfony 3.4 or higher app:
 
 #. Update ``.gitignore``:
 
-    .. code-block:: diff
+   .. code-block:: diff
 
-        # .gitignore
-        # ...
+       # .gitignore
+       # ...
 
-        ###> symfony/framework-bundle ###
-        - /.env
-        + /.env.local
-        + /.env.*.local
+       ###> symfony/framework-bundle ###
+       - /.env
+       + /.env.local
+       + /.env.*.local
     
-        # ...
+       # ...
 
 #. Rename ``.env`` to ``.env.local`` and ``.env.dist`` to ``.env``:
 
-    .. code-block:: terminal
+   .. code-block:: terminal
 
-        # Unix
-        $ mv .env .env.local
-        $ git mv .env.dist .env
+       # Unix
+       $ mv .env .env.local
+       $ git mv .env.dist .env
 
-        # Windows
-        $ mv .env .env.local
-        $ git mv .env.dist .env
+       # Windows
+       $ mv .env .env.local
+       $ git mv .env.dist .env
 
     You can also update the `comment on the top of .env`_ to reflect the new changes.
 

configuration/micro_kernel_trait.rst

@@ -124,6 +124,8 @@ your ``composer.json`` file to load from there:
         }
     }
 
+Then, run ``composer dump-autoload`` to dump your new autoload config.
+    
 Now, suppose you want to use Twig and load routes via annotations. Instead of
 putting *everything* in ``index.php``, create a new ``src/Kernel.php`` to
 hold the kernel. Now it looks like this::

console.rst

@@ -35,6 +35,9 @@ want a command to create a user::
 
     class CreateUserCommand extends Command
     {
+        // the name of the command (the part after "bin/console")
+        protected static $defaultName = 'app:create-user';
+        
         protected function configure()
         {
             // ...
@@ -57,9 +60,6 @@ method. Then you can optionally define a help message and the
     protected function configure()
     {
         $this
-            // the name of the command (the part after "bin/console")
-            ->setName('app:create-user')
-
             // the short description shown while running "php bin/console list"
             ->setDescription('Creates a new user.')
 

reference/forms/types/collection.rst

@@ -148,10 +148,8 @@ you need is this JavaScript code:
     jQuery(document).ready(function () {
         jQuery('.add-another-collection-widget').click(function (e) {
             var list = jQuery(jQuery(this).attr('data-list'));
-            // Try to find the counter of the list
+            // Try to find the counter of the list or use the length of the list
             var counter = list.data('widget-counter') | list.children().length;
-            // If the counter does not exist, use the length of the list
-            if (!counter) { counter = list.children().length; }
 
             // grab the prototype template
             var newWidget = list.attr('data-prototype');
@@ -162,7 +160,7 @@ you need is this JavaScript code:
             // Increase the counter
             counter++;
             // And store it, the length cannot be used if deleting widgets is allowed
-            list.data(' widget-counter', counter);
+            list.data('widget-counter', counter);
 
             // create a new list element and add it to the list
             var newElem = jQuery(list.attr('data-widget-tags')).html(newWidget);

routing/conditions.rst

@@ -10,6 +10,32 @@ define arbitrary matching logic, use the ``conditions`` routing option:
 
 .. configuration-block::
 
+    .. code-block:: php-annotations
+
+        // src/Controller/DefaultController.php
+        namespace App\Controller;
+
+        use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+        use Symfony\Component\Routing\Annotation\Route;
+
+        class DefaultController extends AbstractController
+        {
+            /**
+             * @Route(
+             *     "/contact",
+             *     name="contact",
+             *     condition="context.getMethod() in ['GET', 'HEAD'] and request.headers.get('User-Agent') matches '/firefox/i'"
+             * )
+             *
+             * expressions can also include config parameters 
+             * condition: "request.headers.get('User-Agent') matches '%app.allowed_browsers%'"
+             */
+            public function contact()
+            {
+                // ...
+            }
+        }
+
     .. code-block:: yaml
 
         # config/routes.yaml

workflow/usage.rst

@@ -467,7 +467,7 @@ The following example shows these functions in action:
     {% endfor %}
 
     {# Check if the object is in some specific place #}
-    {% if workflow_has_marked_place(post, 'to_review') %}
+    {% if workflow_has_marked_place(post, 'review') %}
         <p>This post is ready for review.</p>
     {% endif %}