Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit c615aa824a6d · 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/Exception/FlattenException.php b/Exception/FlattenException.php
@@ -176,6 +176,9 @@ public function getStatusText(): string
         return $this->statusText;
     }
 
+    /**
+     * @return $this
+     */
     public function setStatusText(string $statusText): self
     {
         $this->statusText = $statusText;

Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,9 @@ public function getStatusText(): string`
`176`	`176`	`return $this->statusText;`
`177`	`177`	`}`
`178`	`178`
	`179`	`+ /**`
	`180`	`+ * @return $this`
	`181`	`+ */`
`179`	`182`	`public function setStatusText(string $statusText): self`
`180`	`183`	`{`
`181`	`184`	`$this->statusText = $statusText;`