Merge branch '6.2' into 6.3

javiereguiluz · javiereguiluz · commit 9b6a012b84b5 · 2023-07-06T15:51:39.000+02:00
* 6.2:
  [HttpClient] Remove mentions to RequestFactory
  Fix a diff example in Page Creation article
diff --git a/http_client.rst b/http_client.rst
@@ -1656,26 +1656,24 @@ Let's say you want to instantiate a class with the following constructor,
 that requires HTTPlug dependencies::
 
     use Http\Client\HttpClient;
-    use Http\Message\RequestFactory;
     use Http\Message\StreamFactory;
 
     class SomeSdk
     {
         public function __construct(
             HttpClient $httpClient,
-            RequestFactory $requestFactory,
             StreamFactory $streamFactory
         )
         // [...]
     }
 
-Because :class:`Symfony\\Component\\HttpClient\\HttplugClient` implements the
-three interfaces, you can use it this way::
+Because :class:`Symfony\\Component\\HttpClient\\HttplugClient` implements these
+interfaces,you can use it this way::
 
     use Symfony\Component\HttpClient\HttplugClient;
 
     $httpClient = new HttplugClient();
-    $apiClient = new SomeSdk($httpClient, $httpClient, $httpClient);
+    $apiClient = new SomeSdk($httpClient, $httpClient);
 
 If you'd like to work with promises, :class:`Symfony\\Component\\HttpClient\\HttplugClient`
 also implements the ``HttpAsyncClient`` interface. To use it, you need to install the
diff --git a/page_creation.rst b/page_creation.rst
@@ -62,23 +62,21 @@ so that the ``number()`` method is called when a user browses to it. This associ
 is defined with the ``#[Route]`` attribute (in PHP, `attributes`_ are used to add
 metadata to code):
 
-.. configuration-block::
-
-    .. code-block:: php-attributes
+.. code-block:: diff
 
-        // src/Controller/LuckyController.php
+      // src/Controller/LuckyController.php
 
-        // ...
-        + use Symfony\Component\Routing\Annotation\Route;
+      // ...
+    + use Symfony\Component\Routing\Annotation\Route;
 
-        class LuckyController
-        {
-        +   #[Route('/lucky/number')]
-            public function number(): Response
-            {
-                // this looks exactly the same
-            }
-        }
+      class LuckyController
+      {
+    +     #[Route('/lucky/number')]
+          public function number(): Response
+          {
+              // this looks exactly the same
+          }
+      }
 
 That's it! If you are using Symfony web server, try it out by going to: http://localhost:8000/lucky/number
 
