Merge branch '5.3' into 5.4

* 5.3:
  [FrameworkBundle] fix docs for controller as services

Author: javiereguiluz

controller/service.rst

@@ -4,13 +4,29 @@
 How to Define Controllers as Services
 =====================================
 
-In Symfony, a controller does *not* need to be registered as a service. But if you're
-using the :ref:`default services.yaml configuration <service-container-services-load-example>`,
-your controllers *are* already registered as services. This means you can use dependency
-injection like any other normal service.
+In Symfony, a controller does *not* need to be registered as a service. But if
+you're using the :ref:`default services.yaml configuration <service-container-services-load-example>`,
+and your controllers extend the `AbstractController`_ class, they *are* automatically
+registered as services. This means you can use dependency injection like any
+other normal service.
+
+If your controllers don't extend the `AbstractController`_ class, you must
+explicitly mark your controller services as ``public``. Alternatively, you can
+apply the ``controller.service_arguments`` tag to your controller services. This
+will make the tagged services ``public`` and will allow you to inject services
+in method parameters:
 
-Referencing your Service from Routing
--------------------------------------
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # config/services.yaml
+
+        # controllers are imported separately to make sure services can be injected
+        # as action arguments even if you don't extend any base controller class
+        App\Controller\:
+           resource: '../src/Controller/'
+           tags: ['controller.service_arguments']
 
 Registering your controller as a service is the first step, but you also need to
 update your routing config to reference the service properly, so that Symfony
@@ -222,5 +238,4 @@ If you want to know what type-hints to use for each service, see the
 
 .. _`Controller class source code`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
 .. _`AbstractController`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
-.. _`AbstractController`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
 .. _`ADR pattern`: https://en.wikipedia.org/wiki/Action%E2%80%93domain%E2%80%93responder