Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit f45efdbd6e8f · 2021-09-09T14:52:47.000+02:00
* 5.4:
  [DoctrineBridge] Remove dead code
  [Lock] Remove unused variable
  [DoctrineBridge] Replace string with FQCN resolution in EntityType
  Add missing `@return $this` annotations
  [Notifier] Add missing types to SmscTransport
diff --git a/Mime/NotificationEmail.php b/Mime/NotificationEmail.php
@@ -69,6 +69,9 @@ public static function asPublicEmail(Headers $headers = null, AbstractPart $body
         return $email;
     }
 
+    /**
+     * @return $this
+     */
     public function markAsPublic(): self
     {
         $this->context['importance'] = null;

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,9 @@ public static function asPublicEmail(Headers $headers = null, AbstractPart $body`
`69`	`69`	`return $email;`
`70`	`70`	`}`
`71`	`71`
	`72`	`+ /**`
	`73`	`+ * @return $this`
	`74`	`+ */`
`72`	`75`	`public function markAsPublic(): self`
`73`	`76`	`{`
`74`	`77`	`$this->context['importance'] = null;`