Merge branch '6.1' into 6.2

* 6.1:
  Workflow - Add a note about guards events and ability to save some CPU
  Update firewall_restriction.rst

Author: javiereguiluz

security/firewall_restriction.rst

@@ -215,7 +215,7 @@ If the above options don't fit your needs you can configure any service implemen
         security:
             firewalls:
                 secured_area:
-                    request_matcher: app.firewall.secured_area.request_matcher
+                    request_matcher: App\Security\CustomRequestMatcher
                     # ...
 
     .. code-block:: xml
@@ -232,7 +232,7 @@ If the above options don't fit your needs you can configure any service implemen
 
             <config>
                 <!-- ... -->
-                <firewall name="secured_area" request-matcher="app.firewall.secured_area.request_matcher">
+                <firewall name="secured_area" request-matcher="App\Security\CustomRequestMatcher">
                     <!-- ... -->
                 </firewall>
             </config>
@@ -241,13 +241,14 @@ If the above options don't fit your needs you can configure any service implemen
     .. code-block:: php
 
         // config/packages/security.php
+        use App\Security\CustomRequestMatcher;
         use Symfony\Config\SecurityConfig;
 
         return static function (SecurityConfig $security) {
             // ....
 
             $security->firewall('secured_area')
-                ->requestMatcher('app.firewall.secured_area.request_matcher')
+                ->requestMatcher(CustomRequestMatcher::class)
                 // ...
             ;
         };

workflow.rst

@@ -368,7 +368,6 @@ order:
     * ``workflow.[workflow name].completed``
     * ``workflow.[workflow name].completed.[transition name]``
 
-
 ``workflow.announce``
     Triggered for each transition that now is accessible for the subject.
 
@@ -378,7 +377,12 @@ order:
     * ``workflow.[workflow name].announce``
     * ``workflow.[workflow name].announce.[transition name]``
 
-    You can avoid triggering those events by using the context::
+    After a transition is applied, the announce event tests for all available
+    transitions. That will trigger all :ref:`guard events <workflow-usage-guard-events>`
+    once more, which could impact performance if they include intensive CPU or
+    database workloads.
+
+    If you don't need the announce event, disable it using the context::
 
         $workflow->apply($subject, $transitionName, [Workflow::DISABLE_ANNOUNCE_EVENT => true]);
 
@@ -494,6 +498,8 @@ missing a title::
         }
     }
 
+.. _workflow-chosing-events-to-dispatch:
+
 Choosing which Events to Dispatch
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~