Merge branch '4.2'

* 4.2:
  regroup some constraints
  typo in comment (php example)
  promote AbstractController in 4.2 branch
  Fix stateless mention
  [Mercure] Fix link to high-level implementations

Author: wouterj

http_cache/validation.rst

@@ -62,7 +62,7 @@ To see a simple implementation, generate the ETag as the md5 of the content::
     // src/Controller/DefaultController.php
     namespace App\Controller;
 
-    use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+    use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
     use Symfony\Component\HttpFoundation\Request;
 
     class DefaultController extends AbstractController

mercure.rst

@@ -532,7 +532,7 @@ its Mercure support.
 .. _`the Mercure protocol`: https://github.com/dunglas/mercure#protocol-specification
 .. _`Server-Sent Events (SSE)`: https://developer.mozilla.org/docs/Server-sent_events
 .. _`a polyfill`: https://github.com/Yaffle/EventSource
-.. _`high-level implementations`: https://github.com/dunglas/mercure#resources
+.. _`high-level implementations`: https://github.com/dunglas/mercure#tools
 .. _`In this recording`: https://www.youtube.com/watch?v=UI1l0JOjLeI
 .. _`API Platform`: https://api-platform.com
 .. _`Mercure.rocks`: https://mercure.rocks

reference/constraints/map.rst.inc

@@ -20,8 +20,9 @@ String Constraints
 * :doc:`Url </reference/constraints/Url>`
 * :doc:`Regex </reference/constraints/Regex>`
 * :doc:`Ip </reference/constraints/Ip>`
-* :doc:`Uuid</reference/constraints/Uuid>`
 * :doc:`Json</reference/constraints/Json>`
+* :doc:`Uuid</reference/constraints/Uuid>`
+* :doc:`UserPassword </reference/constraints/UserPassword>`
 
 Comparison Constraints
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -44,13 +45,10 @@ Date Constraints
 * :doc:`DateTime </reference/constraints/DateTime>`
 * :doc:`Time </reference/constraints/Time>`
 
-Collection Constraints
-~~~~~~~~~~~~~~~~~~~~~~
+Choice Constraints
+~~~~~~~~~~~~~~~~~~
 
 * :doc:`Choice </reference/constraints/Choice>`
-* :doc:`Collection </reference/constraints/Collection>`
-* :doc:`Count </reference/constraints/Count>`
-* :doc:`UniqueEntity </reference/constraints/UniqueEntity>`
 * :doc:`Language </reference/constraints/Language>`
 * :doc:`Locale </reference/constraints/Locale>`
 * :doc:`Country </reference/constraints/Country>`
@@ -78,5 +76,7 @@ Other Constraints
 * :doc:`Callback </reference/constraints/Callback>`
 * :doc:`Expression </reference/constraints/Expression>`
 * :doc:`All </reference/constraints/All>`
-* :doc:`UserPassword </reference/constraints/UserPassword>`
 * :doc:`Valid </reference/constraints/Valid>`
+* :doc:`Collection </reference/constraints/Collection>`
+* :doc:`Count </reference/constraints/Count>`
+* :doc:`UniqueEntity </reference/constraints/UniqueEntity>`

routing/conditions.rst

@@ -15,10 +15,10 @@ define arbitrary matching logic, use the ``conditions`` routing option:
         // src/Controller/DefaultController.php
         namespace App\Controller;
 
-        use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+        use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
         use Symfony\Component\Routing\Annotation\Route;
 
-        class DefaultController extends Controller
+        class DefaultController extends AbstractController
         {
             /**
              * @Route(

security/user_provider.rst

@@ -379,7 +379,7 @@ command will generate a nice skeleton to get you started::
          * called. Your job is to make sure the user's data is still fresh by,
          * for example, re-querying for fresh User data.
          *
-         * If your firewall is "stateless: false" (for a pure API), this
+         * If your firewall is "stateless: true" (for a pure API), this
          * method is not called.
          *
          * @return UserInterface

web_link.rst

@@ -153,10 +153,10 @@ You can also add links to the HTTP response directly from controllers and servic
 
     use Fig\Link\GenericLinkProvider;
     use Fig\Link\Link;
-    use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+    use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
     use Symfony\Component\HttpFoundation\Request;
 
-    class BlogController extends Controller
+    class BlogController extends AbstractController
     {
         public function index(Request $request)
         {