Merge branch '6.0' into 6.1

nicolas-grekas · nicolas-grekas · commit fb245a48400f · 2022-05-17T11:52:25.000+02:00
* 6.0:
  [VarDumper] fix tests on PHP 8.2
  [Mime] Add null check for EmailHeaderSame
  Add approriate description to CollectionToArrayTransformer::reverseTransform docblock
  [PropertyInfo] CS fixes
  [VarDumper] fix test on PHP 8.2
  [Config] Fix looking for single files in phars with GlobResource
  Revert "bug #46327 [HttpKernel] Allow ErrorHandler ^5.0 to be used in HttpKernel 4.4 (mpdude)"
diff --git a/Form/DataTransformer/CollectionToArrayTransformer.php b/Form/DataTransformer/CollectionToArrayTransformer.php
@@ -46,9 +46,7 @@ public function transform(mixed $collection): mixed
     }
 
     /**
-     * Transforms choice keys into entities.
-     *
-     * @param mixed $array An array of entities
+     * Transforms an array into a collection.
      */
     public function reverseTransform(mixed $array): Collection
     {

Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,7 @@ public function transform(mixed $collection): mixed`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/**`
`49`		`- * Transforms choice keys into entities.`
`50`		`- *`
`51`		`- * @param mixed $array An array of entities`
	`49`	`+ * Transforms an array into a collection.`
`52`	`50`	`*/`
`53`	`51`	`public function reverseTransform(mixed $array): Collection`
`54`	`52`	`{`