Merge branch '3.4' into 4.4

fabpot · fabpot · commit 88bf7211a9b6 · 2020-08-18T13:39:55.000+02:00
* 3.4:
  mark the AssertingContextualValidator class as internal
  make return type correct
diff --git a/src/Symfony/Component/Form/FormView.php b/src/Symfony/Component/Form/FormView.php
@@ -148,7 +148,7 @@ public function offsetUnset($name)
     /**
      * Returns an iterator to iterate over children (implements \IteratorAggregate).
      *
-     * @return \ArrayIterator|FormView[] The iterator
+     * @return \ArrayIterator<string, FormView> The iterator
      */
     public function getIterator()
     {
diff --git a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
@@ -343,6 +343,9 @@ private function getViolation(): ConstraintViolation
     }
 }
 
+/**
+ * @internal
+ */
 class AssertingContextualValidator implements ContextualValidatorInterface
 {
     private $expectNoValidate = false;

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public function offsetUnset($name)`
`148`	`148`	`/**`
`149`	`149`	`* Returns an iterator to iterate over children (implements \IteratorAggregate).`
`150`	`150`	`*`
`151`		`- * @return \ArrayIterator\|FormView[] The iterator`
	`151`	`+ * @return \ArrayIterator<string, FormView> The iterator`
`152`	`152`	`*/`
`153`	`153`	`public function getIterator()`
`154`	`154`	`{`
Original file line number	Diff line number	Diff line change
`@@ -343,6 +343,9 @@ private function getViolation(): ConstraintViolation`
`343`	`343`	`}`
`344`	`344`	`}`
`345`	`345`
	`346`	`+/**`
	`347`	`+ * @internal`
	`348`	`+ */`
`346`	`349`	`class AssertingContextualValidator implements ContextualValidatorInterface`
`347`	`350`	`{`
`348`	`351`	`private $expectNoValidate = false;`