Merge branch '5.4' into 6.3

nicolas-grekas · nicolas-grekas · commit cdaa2d95277b · 2024-01-29T15:59:55.000+01:00
* 5.4:
  Add missing return type
diff --git a/Mime/NotificationEmail.php b/Mime/NotificationEmail.php
@@ -174,7 +174,10 @@ public function getHtmlTemplate(): ?string
         return '@email/'.$this->theme.'/notification/body.html.twig';
     }
 
-    public function context(array $context)
+    /**
+     * @return $this
+     */
+    public function context(array $context): static
     {
         $parentContext = [];
 

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,10 @@ public function getHtmlTemplate(): ?string`
`174`	`174`	`return '@email/'.$this->theme.'/notification/body.html.twig';`
`175`	`175`	`}`
`176`	`176`
`177`		`- public function context(array $context)`
	`177`	`+ /**`
	`178`	`+ * @return $this`
	`179`	`+ */`
	`180`	`+ public function context(array $context): static`
`178`	`181`	`{`
`179`	`182`	`$parentContext = [];`
`180`	`183`