Merge branch '3.4' into 4.2

* 3.4:
  Document the SecurityUserValueResolver & Psr7ServerRequestResolver

Author: javiereguiluz

controller/argument_value_resolver.rst

@@ -12,10 +12,13 @@ in order to be recognized. This is done via the
 creating and registering custom argument value resolvers, you can extend this
 functionality.
 
-Functionality Shipped with the HttpKernel
------------------------------------------
+.. _functionality-shipped-with-the-httpkernel:
 
-Symfony ships with the following value resolvers in the HttpKernel component:
+Built-In Value Resolvers
+------------------------
+
+Symfony ships with the following value resolvers in the
+:doc:`HttpKernel component </components/http_kernel>`:
 
 :class:`Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\RequestAttributeValueResolver`
     Attempts to find a request attribute that matches the name of the argument.
@@ -42,6 +45,19 @@ Symfony ships with the following value resolvers in the HttpKernel component:
     argument list. When the action is called, the last (variadic) argument will
     contain all the values of this array.
 
+In addition, some official bundles provide other value resolvers:
+
+:class:`Symfony\\Bundle\\SecurityBundle\\SecurityUserValueResolver`
+    Injects the object that represents the current logged in user if type-hinted
+    with ``UserInterface``. Default value can be set to ``null`` in case
+    the controller can be accessed by anonymous users. It requires installing
+    the `SecurityBundle`_.
+
+``Psr7ServerRequestResolver``
+    Injects a `PSR-7`_ compliant version of the current request if type-hinted
+    with ``RequestInterface``, ``MessageInterface`` or ``ServerRequestInterface``.
+    It requires installing the `SensioFrameworkExtraBundle`_.
+
 Adding a Custom Value Resolver
 ------------------------------
 
@@ -233,3 +249,6 @@ subrequests.
 
 .. _`@ParamConverter`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
 .. _`yield`: http://php.net/manual/en/language.generators.syntax.php
+.. _`SecurityBundle`: https://github.com/symfony/security-bundle
+.. _`PSR-7`: https://www.php-fig.org/psr/psr-7/
+.. _`SensioFrameworkExtraBundle`: https://github.com/sensiolabs/SensioFrameworkExtraBundle