Merge branch '5.4' into 6.0

* 5.4:
  Fix build by correcting a typo

Author: xabbuh

service_container/service_subscribers_locators.rst

@@ -269,7 +269,7 @@ or directly via PHP attributes:
 
 .. configuration-block::
 
-    .. conde-block:: php-attributes
+    .. code-block:: php-attributes
 
         // src/CommandBus.php
         namespace App;