Merge branch '3.4' into 4.1

* 3.4:
  [Validator] Added IBAN format for Vatican City State
  filter out invalid Intl values
  [Validator] Fixed grouped composite constraints
  [Form] Filter arrays out of scalar form types

Author: nicolas-grekas

Constraints/IbanValidator.php

@@ -129,6 +129,7 @@ class IbanValidator extends ConstraintValidator
         'TN' => 'TN59\d{2}\d{3}\d{13}\d{2}', // Tunisia
         'TR' => 'TR\d{2}\d{5}[\dA-Z]{1}[\dA-Z]{16}', // Turkey
         'UA' => 'UA\d{2}\d{6}[\dA-Z]{19}', // Ukraine
+        'VA' => 'VA\d{2}\d{3}\d{15}', // Vatican City State
         'VG' => 'VG\d{2}[A-Z]{4}\d{16}', // Virgin Islands, British
         'WF' => 'FR\d{2}\d{5}\d{5}[\dA-Z]{11}\d{2}', // Wallis and Futuna Islands
         'XK' => 'XK\d{2}\d{4}\d{10}\d{2}', // Republic of Kosovo

Tests/Constraints/IbanValidatorTest.php

@@ -156,6 +156,7 @@ public function getValidIbans()
             array('TR330006100519786457841326'), //Turkey
             array('UA213223130000026007233566001'), //Ukraine
             array('AE260211000000230064016'), //United Arab Emirates
+            array('VA59001123000012345678'), //Vatican City State
         );
     }
 
@@ -274,6 +275,7 @@ public function getIbansWithInvalidFormat()
             array('TR3300061005197864578413261'), //Turkey
             array('UA21AAAA1300000260072335660012'), //Ukraine
             array('AE2602110000002300640161'), //United Arab Emirates
+            array('VA590011230000123456781'), //Vatican City State
         );
     }
 
@@ -385,6 +387,7 @@ public function getIbansWithValidFormatButIncorrectChecksum()
             array('TR330006100519786457841327'), //Turkey
             array('UA213223130000026007233566002'), //Ukraine
             array('AE260211000000230064017'), //United Arab Emirates
+            array('VA59001123000012345671'), //Vatican City State
         );
     }
 

Tests/Validator/RecursiveValidatorTest.php

@@ -12,6 +12,10 @@
 namespace Symfony\Component\Validator\Tests\Validator;
 
 use Symfony\Component\Translation\IdentityTranslator;
+use Symfony\Component\Validator\Constraints\All;
+use Symfony\Component\Validator\Constraints\Collection;
+use Symfony\Component\Validator\Constraints\Length;
+use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\ConstraintValidatorFactory;
 use Symfony\Component\Validator\Context\ExecutionContextFactory;
 use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface;
@@ -95,4 +99,38 @@ public function testRelationBetweenChildAAndChildB()
 
         $validator->validate($entity, null, array());
     }
+
+    public function testCollectionConstraintValidateAllGroupsForNestedConstraints()
+    {
+        $this->metadata->addPropertyConstraint('data', new Collection(array('fields' => array(
+            'one' => array(new NotBlank(array('groups' => 'one')), new Length(array('min' => 2, 'groups' => 'two'))),
+            'two' => array(new NotBlank(array('groups' => 'two'))),
+        ))));
+
+        $entity = new Entity();
+        $entity->data = array('one' => 't', 'two' => '');
+
+        $violations = $this->validator->validate($entity, null, array('one', 'two'));
+
+        $this->assertCount(2, $violations);
+        $this->assertInstanceOf(Length::class, $violations->get(0)->getConstraint());
+        $this->assertInstanceOf(NotBlank::class, $violations->get(1)->getConstraint());
+    }
+
+    public function testAllConstraintValidateAllGroupsForNestedConstraints()
+    {
+        $this->metadata->addPropertyConstraint('data', new All(array('constraints' => array(
+            new NotBlank(array('groups' => 'one')),
+            new Length(array('min' => 2, 'groups' => 'two')),
+        ))));
+
+        $entity = new Entity();
+        $entity->data = array('one' => 't', 'two' => '');
+
+        $violations = $this->validator->validate($entity, null, array('one', 'two'));
+
+        $this->assertCount(2, $violations);
+        $this->assertInstanceOf(NotBlank::class, $violations->get(0)->getConstraint());
+        $this->assertInstanceOf(Length::class, $violations->get(1)->getConstraint());
+    }
 }

Validator/RecursiveContextualValidator.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Validator\Validator;
 
 use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\Constraints\Composite;
 use Symfony\Component\Validator\Constraints\GroupSequence;
 use Symfony\Component\Validator\ConstraintValidatorFactoryInterface;
 use Symfony\Component\Validator\Context\ExecutionContext;
@@ -787,6 +788,10 @@ private function validateInGroup($value, $cacheKey, MetadataInterface $metadata,
             if (null !== $cacheKey) {
                 $constraintHash = spl_object_hash($constraint);
 
+                if ($constraint instanceof Composite) {
+                    $constraintHash .= $group;
+                }
+
                 if ($context->isConstraintValidated($cacheKey, $constraintHash)) {
                     continue;
                 }