Merge branch '6.0' into 6.1

xabbuh · xabbuh · commit 7ef9bb56f339 · 2022-04-17T13:53:05.000+02:00
* 6.0:
  fix merge
diff --git a/Tests/Fixtures/Map.php b/Tests/Fixtures/Map.php
@@ -20,11 +20,7 @@ public function offsetExists($offset): bool
         return isset($this->data[$offset]);
     }
 
-    /**
-     * @return mixed
-     */
-    #[\ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         return $this->data[$offset];
     }

Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,7 @@ public function offsetExists($offset): bool`
`20`	`20`	`return isset($this->data[$offset]);`
`21`	`21`	`}`
`22`	`22`
`23`		`- /**`
`24`		`- * @return mixed`
`25`		`- */`
`26`		`- #[\ReturnTypeWillChange]`
`27`		`- public function offsetGet($offset)`
	`23`	`+ public function offsetGet($offset): mixed`
`28`	`24`	`{`
`29`	`25`	`return $this->data[$offset];`
`30`	`26`	`}`