Merge branch '3.4' into 4.4

fabpot · fabpot · commit 6407cd34ff3f · 2020-08-18T13:39:55.000+02:00
* 3.4:
  mark the AssertingContextualValidator class as internal
  make return type correct
diff --git a/FormView.php b/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()
     {

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`	`{`