Merge branch '8.x'

driesvints · driesvints · commit b2b50d210fe9 · 2021-07-06T14:35:16.000+02:00
# Conflicts:
#	CHANGELOG-8.x.md
#	src/Illuminate/Foundation/Application.php
diff --git a/Traits/EnumeratesValues.php b/Traits/EnumeratesValues.php
@@ -12,6 +12,7 @@
 use Illuminate\Support\Enumerable;
 use Illuminate\Support\HigherOrderCollectionProxy;
 use JsonSerializable;
+use ReturnTypeWillChange;
 use Symfony\Component\VarDumper\VarDumper;
 use Traversable;
 
@@ -802,6 +803,7 @@ public function toArray()
      *
      * @return array
      */
+    #[ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return array_map(function ($value) {

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`use Illuminate\Support\Enumerable;`
`13`	`13`	`use Illuminate\Support\HigherOrderCollectionProxy;`
`14`	`14`	`use JsonSerializable;`
	`15`	`+use ReturnTypeWillChange;`
`15`	`16`	`use Symfony\Component\VarDumper\VarDumper;`
`16`	`17`	`use Traversable;`
`17`	`18`
`@@ -802,6 +803,7 @@ public function toArray()`
`802`	`803`	`*`
`803`	`804`	`* @return array`
`804`	`805`	`*/`
	`806`	`+ #[ReturnTypeWillChange]`
`805`	`807`	`public function jsonSerialize()`
`806`	`808`	`{`
`807`	`809`	`return array_map(function ($value) {`