Merge branch '6.0' into 6.1

* 6.0:
  Fix merge
  [Messenger] Document the validation middleware
  Minor changes
  Removing outdated jQuery note
  Remove reference to jQuery from examples code
  Adding redirect to current route
  Removed not needed jQuery mention
  Update http_cache.rst

Author: wouterj

controller.rst

@@ -132,7 +132,7 @@ If you want to redirect the user to another page, use the ``redirectToRoute()``
 and ``redirect()`` methods::
 
     use Symfony\Component\HttpFoundation\RedirectResponse;
-    use Symfony\Component\HttpFoundation\Response
+    use Symfony\Component\HttpFoundation\Response;
 
     // ...
     public function index(): RedirectResponse
@@ -153,6 +153,9 @@ and ``redirect()`` methods::
 
         // redirects to a route and maintains the original query string parameters
         return $this->redirectToRoute('blog_show', $request->query->all());
+        
+        // redirects to the current route (e.g. for Post/Redirect/Get pattern):
+        return $this->redirectToRoute($request->attributes->get('_route'));
 
         // redirects externally
         return $this->redirect('http://symfony.com/doc');

form/form_collections.rst

@@ -239,23 +239,31 @@ it will receive an *unknown* number of tags. Otherwise, you'll see a
 The ``allow_add`` option also makes a ``prototype`` variable available to you.
 This "prototype" is a little "template" that contains all the HTML needed to
 dynamically create any new "tag" forms with JavaScript. To render the prototype, add
-the following ``data-prototype`` attribute to the existing ``<ul>`` in your template:
+the following ``data-prototype`` attribute to the existing ``<ul>`` in your
+template:
 
 .. code-block:: html+twig
 
-    <ul class="tags" data-index="{{ form.tags|length > 0 ? form.tags|last.vars.name + 1 : 0 }}" data-prototype="{{ form_widget(form.tags.vars.prototype)|e('html_attr') }}"></ul>
+    {# the data-index attribute is required for the JavaScript code below #}
+    <ul class="tags"
+        data-index="{{ form.tags|length > 0 ? form.tags|last.vars.name + 1 : 0 }}"
+        data-prototype="{{ form_widget(form.tags.vars.prototype)|e('html_attr') }}"
+    ></ul>
 
-Now add a button just next to the ``<ul>`` to dynamically add a new tag:
+On the rendered page, the result will look something like this:
 
-.. code-block:: html+twig
+.. code-block:: html
 
-    <button type="button" class="add_item_link" data-collection-holder-class="tags">Add a tag</button>
+    <ul class="tags"
+        data-index="0"
+        data-prototype="&lt;div&gt;&lt;label class=&quot; required&quot;&gt;__name__&lt;/label&gt;&lt;div id=&quot;task_tags___name__&quot;&gt;&lt;div&gt;&lt;label for=&quot;task_tags___name___name&quot; class=&quot; required&quot;&gt;Name&lt;/label&gt;&lt;input type=&quot;text&quot; id=&quot;task_tags___name___name&quot; name=&quot;task[tags][__name__][name]&quot; required=&quot;required&quot; maxlength=&quot;255&quot; /&gt;&lt;/div&gt;&lt;/div&gt;&lt;/div&gt;"
+    ></ul>
 
-On the rendered page, the result will look something like this:
+Now add a button to dynamically add a new tag:
 
-.. code-block:: html
+.. code-block:: html+twig
 
-    <ul class="tags" data-index="0" data-prototype="&lt;div&gt;&lt;label class=&quot; required&quot;&gt;__name__&lt;/label&gt;&lt;div id=&quot;task_tags___name__&quot;&gt;&lt;div&gt;&lt;label for=&quot;task_tags___name___name&quot; class=&quot; required&quot;&gt;Name&lt;/label&gt;&lt;input type=&quot;text&quot; id=&quot;task_tags___name___name&quot; name=&quot;task[tags][__name__][name]&quot; required=&quot;required&quot; maxlength=&quot;255&quot; /&gt;&lt;/div&gt;&lt;/div&gt;&lt;/div&gt;">
+    <button type="button" class="add_item_link" data-collection-holder-class="tags">Add a tag</button>
 
 .. seealso::
 
@@ -265,7 +273,7 @@ On the rendered page, the result will look something like this:
 .. tip::
 
     The ``form.tags.vars.prototype`` is a form element that looks and feels just
-    like the individual ``form_widget(tag)`` elements inside your ``for`` loop.
+    like the individual ``form_widget(tag.*)`` elements inside your ``for`` loop.
     This means that you can call ``form_widget()``, ``form_row()`` or ``form_label()``
     on it. You could even choose to render only one of its fields (e.g. the
     ``name`` field):
@@ -281,18 +289,16 @@ On the rendered page, the result will look something like this:
     and you need to adjust the following JavaScript accordingly.
 
 Now add some JavaScript to read this attribute and dynamically add new tag forms
-when the user clicks the "Add a tag" link. This example uses `jQuery`_ and
-assumes you have it included somewhere on your page (e.g. using Symfony's
-:doc:`Webpack Encore </frontend>`).
-
-Add a ``<script>`` tag somewhere on your page to include the required
-functionality with JavaScript:
+when the user clicks the "Add a tag" link. Add a ``<script>`` tag somewhere
+on your page to include the required functionality with JavaScript:
 
 .. code-block:: javascript
 
     document
       .querySelectorAll('.add_item_link')
-      .forEach(btn => btn.addEventListener("click", addFormToCollection));
+      .forEach(btn => {
+          btn.addEventListener("click", addFormToCollection)
+      });
 
 The ``addFormToCollection()`` function's job will be to use the ``data-prototype``
 attribute to dynamically add a new form when this link is clicked. The ``data-prototype``
@@ -531,14 +537,15 @@ First, add a "delete this tag" link to each tag form:
 
 .. code-block:: javascript
 
-    const tags = document.querySelectorAll('ul.tags li')
-    tags.forEach((tag) => {
-        addTagFormDeleteLink(tag)
-    })
+    document
+        .querySelectorAll('ul.tags li')
+        .forEach((tag) => {
+            addTagFormDeleteLink(tag)
+        })
 
     // ... the rest of the block from above
 
-    function addFormToCollection() {
+    const addFormToCollection = (e) => {
         // ...
 
         // add a delete link to the new form
@@ -549,17 +556,16 @@ The ``addTagFormDeleteLink()`` function will look something like this:
 
 .. code-block:: javascript
 
-    const addTagFormDeleteLink = (tagFormLi) => {
-        const removeFormButton = document.createElement('button')
-        removeFormButton.classList
-        removeFormButton.innerText = 'Delete this tag'
+    const addTagFormDeleteLink = (item) => {
+        const removeFormButton = document.createElement('button');
+        removeFormButton.innerText = 'Delete this tag';
 
-        tagFormLi.append(removeFormButton);
+        item.append(removeFormButton);
 
         removeFormButton.addEventListener('click', (e) => {
-            e.preventDefault()
+            e.preventDefault();
             // remove the li for the tag form
-            tagFormLi.remove();
+            item.remove();
         });
     }
 
@@ -651,10 +657,9 @@ the relationship between the removed ``Tag`` and ``Task`` object.
     The Symfony community has created some JavaScript packages that provide the
     functionality needed to add, edit and delete elements of the collection.
     Check out the `@a2lix/symfony-collection`_ package for modern browsers and
-    the `symfony-collection`_ package based on jQuery for the rest of browsers.
+    the `symfony-collection`_ package based on `jQuery`_ for the rest of browsers.
 
 .. _`Owning Side and Inverse Side`: https://www.doctrine-project.org/projects/doctrine-orm/en/current/reference/unitofwork-associations.html
-.. _`jQuery`: http://jquery.com/
 .. _`JSFiddle`: https://jsfiddle.net/ey8ozh6n/
 .. _`@a2lix/symfony-collection`: https://github.com/a2lix/symfony-collection
 .. _`symfony-collection`: https://github.com/ninsuo/symfony-collection

http_cache.rst

@@ -98,15 +98,14 @@ caching kernel:
     + use App\CacheKernel;
       use App\Kernel;
 
-      // ...
-      $kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
+    // ...
+    $kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
     + // Wrap the default Kernel with the CacheKernel one in 'prod' environment
     + if ('prod' === $kernel->getEnvironment()) {
-    +     $kernel = new CacheKernel($kernel);
+    +     return new CacheKernel($kernel);
     + }
+    return $kernel;
 
-      $request = Request::createFromGlobals();
-      // ...
 
 The caching kernel will immediately act as a reverse proxy: caching responses
 from your application and returning them to the client.

messenger.rst

@@ -2130,6 +2130,12 @@ the consumer (e.g. render a template with links). This middleware stores the
 original request context (i.e. the host, the HTTP port, etc.) which is needed
 when building absolute URLs.
 
+Add the ``validation`` middleware if you need to validate the message
+object using the :doc:`Validator component <validator>` before handling it.
+If validation fails, a ``ValidationFailedException`` will be thrown. The
+:class:`Symfony\\Component\\Messenger\\Stamp\\ValidationStamp` can be used
+to configure the validation groups.
+
 .. configuration-block::
 
     .. code-block:: yaml
@@ -2141,6 +2147,7 @@ when building absolute URLs.
                     command_bus:
                         middleware:
                             - router_context
+                            - validation
 
     .. code-block:: xml
 
@@ -2158,6 +2165,7 @@ when building absolute URLs.
                 <framework:messenger>
                     <framework:bus name="command_bus">
                         <framework:middleware id="router_context"/>
+                        <framework:middleware id="validation"/>
                     </framework:bus>
                 </framework:messenger>
             </framework:config>
@@ -2173,9 +2181,9 @@ when building absolute URLs.
 
             $bus = $messenger->bus('command_bus');
             $bus->middleware()->id('router_context');
+            $bus->middleware()->id('validation');
         };
 
-
 Messenger Events
 ~~~~~~~~~~~~~~~~