Merge branch '5.4' into 6.0

* 5.4:
  Update page_creation.rst
  Corrected typo in notifier.rst
  [ExpressionLanguage] Remove array element
  Document PHP attribute naming convention
  Rewording when an exception is thrown

Author: javiereguiluz

components/expression_language/syntax.rst

@@ -200,7 +200,6 @@ Examples::
         'life == everything',
         [
             'life' => 10,
-            'universe' => 10,
             'everything' => 22,
         ]
     );
@@ -209,7 +208,6 @@ Examples::
         'life > everything',
         [
             'life' => 10,
-            'universe' => 10,
             'everything' => 22,
         ]
     );

contributing/code/standards.rst

@@ -220,6 +220,9 @@ Naming Conventions
 
 * Suffix exceptions with ``Exception``;
 
+* Prefix PHP attributes with ``As`` where applicable (e.g. ``#[AsCommand]``
+  instead of ``#[Command]``, but ``#[When]`` is kept as-is);
+
 * Use UpperCamelCase for naming PHP files (e.g. ``EnvVarProcessor.php``) and
   snake case for naming Twig templates and web assets (``section_layout.html.twig``,
   ``index.scss``);

http_client.rst

@@ -1037,20 +1037,19 @@ There are three types of exceptions, all of which implement the
   are thrown when a content-type cannot be decoded to the expected representation.
 
 When the HTTP status code of the response is in the 300-599 range (i.e. 3xx,
-4xx or 5xx) your code is expected to handle it. If you don't do that, the
-``getHeaders()``, ``getContent()`` and ``toArray()`` methods throw an appropriate exception, which will
-implement the :class:`Symfony\\Contracts\\HttpClient\\Exception\\HttpExceptionInterface`::
+4xx or 5xx), the ``getHeaders()``, ``getContent()`` and ``toArray()`` methods
+throw an appropriate exception, all of which implement the
+:class:`Symfony\\Contracts\\HttpClient\\Exception\\HttpExceptionInterface`.
 
-    // the response of this request will be a 403 HTTP error
-    $response = $client->request('GET', 'https://httpbin.org/status/403');
+To opt-out from this exception and deal with 300-599 status codes on your own,
+pass ``false`` as the optional argument to every call of those methods,
+e.g. ``$response->getHeaders(false);``.
 
-    // this code results in a Symfony\Component\HttpClient\Exception\ClientException
-    // because it doesn't check the status code of the response
-    $content = $response->getContent();
+If you do not call any of these 3 methods at all, the exception will still be thrown
+when the ``$response`` object is destructed.
 
-    // pass FALSE as the optional argument to not throw an exception and return
-    // instead the original response content (even if it's an error message)
-    $content = $response->getContent(false);
+Calling ``$response->getStatusCode()`` is enough to disable this behavior
+(but then don't miss checking the status code yourself).
 
 While responses are lazy, their destructor will always wait for headers to come
 back. This means that the following request *will* complete; and if e.g. a 404

notifier.rst

@@ -655,7 +655,7 @@ The
 :class:`Symfony\\Component\\Notifier\\Notification\\SmsNotificationInterface`
 and
 :class:`Symfony\\Component\\Notifier\\Notification\\EmailNotificationInterface`
-also exists to modify messages send to those channels.
+also exists to modify messages sent to those channels.
 
 Disabling Delivery
 ------------------

page_creation.rst

@@ -81,13 +81,13 @@ If you see a lucky number being printed back to you, congratulations! But before
 you run off to play the lottery, check out how this works. Remember the two steps
 to creating a page?
 
+#. *Create a controller and a method*: This is a function where *you* build the page and ultimately
+   return a ``Response`` object. You'll learn more about :doc:`controllers </controller>`
+   in their own section, including how to return JSON responses;
+   
 #. *Create a route*: In ``config/routes.yaml``, the route defines the URL to your
    page (``path``) and what ``controller`` to call. You'll learn more about :doc:`routing </routing>`
-   in its own section, including how to make *variable* URLs;
-
-#. *Create a controller*: This is a function where *you* build the page and ultimately
-   return a ``Response`` object. You'll learn more about :doc:`controllers </controller>`
-   in their own section, including how to return JSON responses.
+   in its own section, including how to make *variable* URLs.
 
 .. _annotation-routes: