Merge branch '4.4' into 5.3

derrabus · derrabus · commit 431429acf2e2 · 2021-08-04T23:20:46.000+02:00
* 4.4:
  Fix return types for PHP 8.1
diff --git a/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -865,6 +865,10 @@ public function resultWithEmptyIterator(): array
 
         return [
             [$entity, new class() implements \Iterator {
+                /**
+                 * @return mixed
+                 */
+                #[\ReturnTypeWillChange]
                 public function current()
                 {
                     return null;
@@ -875,19 +879,28 @@ public function valid(): bool
                     return false;
                 }
 
-                public function next()
+                public function next(): void
                 {
                 }
 
+                /**
+                 * @return mixed
+                 */
+                #[\ReturnTypeWillChange]
                 public function key()
                 {
+                    return false;
                 }
 
-                public function rewind()
+                public function rewind(): void
                 {
                 }
             }],
             [$entity, new class() implements \Iterator {
+                /**
+                 * @return mixed
+                 */
+                #[\ReturnTypeWillChange]
                 public function current()
                 {
                     return false;
@@ -898,15 +911,20 @@ public function valid(): bool
                     return false;
                 }
 
-                public function next()
+                public function next(): void
                 {
                 }
 
+                /**
+                 * @return mixed
+                 */
+                #[\ReturnTypeWillChange]
                 public function key()
                 {
+                    return false;
                 }
 
-                public function rewind()
+                public function rewind(): void
                 {
                 }
             }],

Original file line number	Diff line number	Diff line change
`@@ -865,6 +865,10 @@ public function resultWithEmptyIterator(): array`
`865`	`865`
`866`	`866`	`return [`
`867`	`867`	`[$entity, new class() implements \Iterator {`
	`868`	`+ /**`
	`869`	`+ * @return mixed`
	`870`	`+ */`
	`871`	`+ #[\ReturnTypeWillChange]`
`868`	`872`	`public function current()`
`869`	`873`	`{`
`870`	`874`	`return null;`
`@@ -875,19 +879,28 @@ public function valid(): bool`
`875`	`879`	`return false;`
`876`	`880`	`}`
`877`	`881`
`878`		`- public function next()`
	`882`	`+ public function next(): void`
`879`	`883`	`{`
`880`	`884`	`}`
`881`	`885`
	`886`	`+ /**`
	`887`	`+ * @return mixed`
	`888`	`+ */`
	`889`	`+ #[\ReturnTypeWillChange]`
`882`	`890`	`public function key()`
`883`	`891`	`{`
	`892`	`+ return false;`
`884`	`893`	`}`
`885`	`894`
`886`		`- public function rewind()`
	`895`	`+ public function rewind(): void`
`887`	`896`	`{`
`888`	`897`	`}`
`889`	`898`	`}],`
`890`	`899`	`[$entity, new class() implements \Iterator {`
	`900`	`+ /**`
	`901`	`+ * @return mixed`
	`902`	`+ */`
	`903`	`+ #[\ReturnTypeWillChange]`
`891`	`904`	`public function current()`
`892`	`905`	`{`
`893`	`906`	`return false;`
`@@ -898,15 +911,20 @@ public function valid(): bool`
`898`	`911`	`return false;`
`899`	`912`	`}`
`900`	`913`
`901`		`- public function next()`
	`914`	`+ public function next(): void`
`902`	`915`	`{`
`903`	`916`	`}`
`904`	`917`
	`918`	`+ /**`
	`919`	`+ * @return mixed`
	`920`	`+ */`
	`921`	`+ #[\ReturnTypeWillChange]`
`905`	`922`	`public function key()`
`906`	`923`	`{`
	`924`	`+ return false;`
`907`	`925`	`}`
`908`	`926`
`909`		`- public function rewind()`
	`927`	`+ public function rewind(): void`
`910`	`928`	`{`
`911`	`929`	`}`
`912`	`930`	`}],`