Merge branch '5.4' into 6.0

* 5.4:
  Fix dependency injection PHP sample code

Author: wouterj

components/dependency_injection.rst

@@ -297,9 +297,9 @@ config files:
                 ->set('mailer.transport', 'sendmail')
             ;
 
-            $container->services()
-                ->set('mailer', 'Mailer')
-                    ->args(['%mailer.transport%'])
+            $services = $container->services();
+            $services->set('mailer', 'Mailer')
+                ->args(['%mailer.transport%'])
 
             $services->set('mailer', 'Mailer')
                 ->args([param('mailer.transport')])