Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 48b0bbcb49c1 · 2021-08-17T17:35:52.000+02:00
* 5.4:
  [Serializer] cs fix
  Cleanup more `@return` annotations
  [Form] Fix phpdoc on FormBuilderInterface
diff --git a/DeprecationErrorHandler/Deprecation.php b/DeprecationErrorHandler/Deprecation.php
@@ -310,7 +310,7 @@ private function getPackage($path)
     }
 
     /**
-     * @return string[] an array of paths
+     * @return string[]
      */
     private static function getVendors()
     {

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ private function getPackage($path)`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`/**`
`313`		`- * @return string[] an array of paths`
	`313`	`+ * @return string[]`
`314`	`314`	`*/`
`315`	`315`	`private static function getVendors()`
`316`	`316`	`{`