Merge branch '4.4' into 5.4

javiereguiluz · javiereguiluz · commit 17ea01ced1d8 · 2022-03-21T14:52:56.000+01:00
* 4.4:
  Make the controller extend from AbstractController
  Update service container rst with missing class
diff --git a/form/unit_testing.rst b/form/unit_testing.rst
@@ -134,8 +134,8 @@ variable exists and will be available in your form themes::
     the ``KernelTestCase`` instead and use the ``form.factory`` service to
     create the form.
 
-Testings Types Registered as Services
--------------------------------------
+Testing Types Registered as Services
+------------------------------------
 
 Your form may be used as a service, as it depends on other services (e.g. the
 Doctrine entity manager). In these cases, using the above code won't work, as
diff --git a/service_container.rst b/service_container.rst
@@ -120,21 +120,25 @@ inside your controller::
 
     // src/Controller/ProductController.php
     use App\Service\MessageGenerator;
+    use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
     use Symfony\Component\HttpFoundation\Response;
     use Symfony\Component\Routing\Annotation\Route;
 
-    /**
-     * @Route("/products/new")
-     */
-    public function new(MessageGenerator $messageGenerator): Response
+    class ProductController extends AbstractController
     {
-        // thanks to the type-hint, the container will instantiate a
-        // new MessageGenerator and pass it to you!
-        // ...
+        /**
+         * @Route("/products/new")
+         */
+        public function new(MessageGenerator $messageGenerator): Response
+        {
+            // thanks to the type-hint, the container will instantiate a
+            // new MessageGenerator and pass it to you!
+            // ...
 
-        $message = $messageGenerator->getHappyMessage();
-        $this->addFlash('success', $message);
-        // ...
+            $message = $messageGenerator->getHappyMessage();
+            $this->addFlash('success', $message);
+            // ...
+        }
     }
 
 When you ask for the ``MessageGenerator`` service, the container constructs a new
