Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit fcddf411a7d8 · 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/ClearableErrorsInterface.php b/ClearableErrorsInterface.php
@@ -22,6 +22,8 @@ interface ClearableErrorsInterface
      * Removes all the errors of this form.
      *
      * @param bool $deep Whether to remove errors from child forms as well
+     *
+     * @return $this
      */
     public function clearErrors(bool $deep = false);
 }
diff --git a/Form.php b/Form.php
@@ -773,8 +773,6 @@ public function getErrors(bool $deep = false, bool $flatten = true): FormErrorIt
 
     /**
      * {@inheritdoc}
-     *
-     * @return $this
      */
     public function clearErrors(bool $deep = false): static
     {

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ interface ClearableErrorsInterface`
`22`	`22`	`* Removes all the errors of this form.`
`23`	`23`	`*`
`24`	`24`	`* @param bool $deep Whether to remove errors from child forms as well`
	`25`	`+ *`
	`26`	`+ * @return $this`
`25`	`27`	`*/`
`26`	`28`	`public function clearErrors(bool $deep = false);`
`27`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -773,8 +773,6 @@ public function getErrors(bool $deep = false, bool $flatten = true): FormErrorIt`
`773`	`773`
`774`	`774`	`/**`
`775`	`775`	`* {@inheritdoc}`
`776`		`- *`
`777`		`- * @return $this`
`778`	`776`	`*/`
`779`	`777`	`public function clearErrors(bool $deep = false): static`
`780`	`778`	`{`