Merge branch '4.4' into 5.4

nicolas-grekas · nicolas-grekas · commit c4e86f9baf11 · 2022-05-17T11:47:20.000+02:00
* 4.4:
  [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
@@ -24,8 +24,6 @@ class CollectionToArrayTransformer implements DataTransformerInterface
     /**
      * Transforms a collection into an array.
      *
-     * @return mixed
-     *
      * @throws TransformationFailedException
      */
     public function transform($collection)
@@ -48,9 +46,7 @@ public function transform($collection)
     }
 
     /**
-     * Transforms choice keys into entities.
-     *
-     * @param mixed $array An array of entities
+     * Transforms an array into a collection.
      *
      * @return Collection
      */

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,6 @@ class CollectionToArrayTransformer implements DataTransformerInterface`
`24`	`24`	`/**`
`25`	`25`	`* Transforms a collection into an array.`
`26`	`26`	`*`
`27`		`- * @return mixed`
`28`		`- *`
`29`	`27`	`* @throws TransformationFailedException`
`30`	`28`	`*/`
`31`	`29`	`public function transform($collection)`
`@@ -48,9 +46,7 @@ public function transform($collection)`
`48`	`46`	`}`
`49`	`47`
`50`	`48`	`/**`
`51`		`- * Transforms choice keys into entities.`
`52`		`- *`
`53`		`- * @param mixed $array An array of entities`
	`49`	`+ * Transforms an array into a collection.`
`54`	`50`	`*`
`55`	`51`	`* @return Collection`
`56`	`52`	`*/`