Merge branch '7.1' into 7.2

javiereguiluz · javiereguiluz · commit 9d6130319397 · 2024-09-27T09:50:39.000+02:00
* 7.1:
  service-container/fix-code-example
diff --git a/service_container.rst b/service_container.rst
@@ -433,12 +433,11 @@ example, suppose you want to make the admin email configurable:
       class SiteUpdateManager
       {
           // ...
-    +    private string $adminEmail;
 
           public function __construct(
               private MessageGenerator $messageGenerator,
               private MailerInterface $mailer,
-    +        private string $adminEmail
+    +         private string $adminEmail
           ) {
           }
 

Original file line number	Diff line number	Diff line change
`@@ -433,12 +433,11 @@ example, suppose you want to make the admin email configurable:`
`433`	`433`	`class SiteUpdateManager`
`434`	`434`	`{`
`435`	`435`	`// ...`
`436`		`- + private string $adminEmail;`
`437`	`436`
`438`	`437`	`public function __construct(`
`439`	`438`	`private MessageGenerator $messageGenerator,`
`440`	`439`	`private MailerInterface $mailer,`
`441`		`- + private string $adminEmail`
	`440`	`+ + private string $adminEmail`
`442`	`441`	`) {`
`443`	`442`	`}`
`444`	`443`