Merge branch '3.4' into 4.4

* 3.4:
  mark the AssertingContextualValidator class as internal
  make return type correct

src/Symfony/Component/Form/FormView.php

@@ -148,7 +148,7 @@ class FormView implements \ArrayAccess, \IteratorAggregate, \Countable
     /**
      * Returns an iterator to iterate over children (implements \IteratorAggregate).
      *
-     * @return \ArrayIterator|FormView[] The iterator
+     * @return \ArrayIterator<string, FormView> The iterator
      */
     public function getIterator()
     {

src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php

@@ -343,6 +343,9 @@ class ConstraintViolationAssertion
     }
 }
 
+/**
+ * @internal
+ */
 class AssertingContextualValidator implements ContextualValidatorInterface
 {
     private $expectNoValidate = false;