Merge branch '3.4'

* 3.4: (26 commits)
  [Bridge\PhpUnit] Disable broken auto-require mechanism of phpunit
  [Console] Fix disabling lazy commands
  [DI] Remove scalar typehint in class used in test case
  Remove the `server:log` command if monolog is not loaded
  [SecurityBundle] Fix syntax error in test
  [Console] Remove remaining dead code
  Throw on service:method factory notation in PHP-based DI configuration
  Test that named arguments are prioritized over typehinted
  bumped Symfony version to 3.3.14
  bumped Symfony version to 2.8.32
  bumped Symfony version to 2.7.39
  Prove that change is working with tests
  updated VERSION for 3.3.13
  updated CHANGELOG for 3.3.13
  updated VERSION for 2.8.31
  updated CHANGELOG for 2.8.31
  updated VERSION for 2.7.38
  updated CHANGELOG for 2.7.38
  Replace array|\Traversable by iterable
  [DI] Fix by-type args injection
  ...

Author: nicolas-grekas

Constraints/UrlValidator.php

@@ -25,7 +25,7 @@ class UrlValidator extends ConstraintValidator
             (%s)://                                 # protocol
             (([\.\pL\pN-]+:)?([\.\pL\pN-]+)@)?      # basic auth
             (
-                ([\pL\pN\pS-\.])+(\.?([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
+                ([\pL\pN\pS\-\.])+(\.?([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
                     |                                                 # or
                 \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}                    # an IP address
                     |                                                 # or

Constraints/ValidValidator.php

@@ -26,12 +26,9 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Valid');
         }
 
-        $violations = $this->context->getValidator()->validate($value, null, array($this->context->getGroup()));
-
-        foreach ($violations as $violation) {
-            $this->context->buildViolation($violation->getMessage(), $violation->getParameters())
-                ->atPath($violation->getPropertyPath())
-                ->addViolation();
-        }
+        $this->context
+            ->getValidator()
+            ->inContext($this->context)
+            ->validate($value, null, array($this->context->getGroup()));
     }
 }

Tests/Constraints/ValidValidatorTest.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace Symfony\Component\Validator\Tests\Constraints;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\Constraints\ValidValidator;
+use Symfony\Component\Validator\ValidatorBuilder;
+
+class ValidValidatorTest extends TestCase
+{
+    public function testPropertyPathsArePassedToNestedContexts()
+    {
+        $validatorBuilder = new ValidatorBuilder();
+        $validator = $validatorBuilder->enableAnnotationMapping()->getValidator();
+
+        $violations = $validator->validate(new Foo(), null, array('nested'));
+
+        $this->assertCount(1, $violations);
+        $this->assertSame('fooBar.fooBarBaz.foo', $violations->get(0)->getPropertyPath());
+    }
+
+    protected function createValidator()
+    {
+        return new ValidValidator();
+    }
+}
+
+class Foo
+{
+    /**
+     * @Assert\Valid(groups={"nested"})
+     */
+    public $fooBar;
+
+    public function __construct()
+    {
+        $this->fooBar = new FooBar();
+    }
+}
+
+class FooBar
+{
+    /**
+     * @Assert\Valid(groups={"nested"})
+     */
+    public $fooBarBaz;
+
+    public function __construct()
+    {
+        $this->fooBarBaz = new FooBarBaz();
+    }
+}
+
+class FooBarBaz
+{
+    /**
+     * @Assert\NotBlank(groups={"nested"})
+     */
+    public $foo;
+}

Validator/RecursiveContextualValidator.php

@@ -374,7 +374,7 @@ private function validateObject($object, $propertyPath, array $groups, $traversa
      * objects are iterated as well. Nested arrays are always iterated,
      * regardless of the value of $recursive.
      *
-     * @param array|\Traversable        $collection   The collection
+     * @param iterable                  $collection   The collection
      * @param string                    $propertyPath The current property path
      * @param string[]                  $groups       The validated groups
      * @param ExecutionContextInterface $context      The current execution context