Merge branch '2.6' into 2.7

* 2.6:
  [PropertyAccessor] Added test to allow null value for a array
  [Yaml] Fixed #10597: Improved Yaml directive parsing
  [Form] Fixed check of violation constraint #12792
  [Form] Set a child type to text if added to the form without a type.

Author: fabpot

Extension/Validator/EventListener/ValidationListener.php

@@ -66,7 +66,8 @@ public function validateForm(FormEvent $event)
             foreach ($violations as $violation) {
                 // Allow the "invalid" constraint to be put onto
                 // non-synchronized forms
-                $allowNonSynchronized = $violation->getConstraint() instanceof Form && Form::NOT_SYNCHRONIZED_ERROR === $violation->getCode();
+                // ConstraintViolation::getConstraint() must not expect to provide a constraint as long as Symfony\Component\Validator\ExecutionContext exists (before 3.0)
+                $allowNonSynchronized = (null === $violation->getConstraint() || $violation->getConstraint() instanceof Form) && Form::NOT_SYNCHRONIZED_ERROR === $violation->getCode();
 
                 $this->violationMapper->mapViolation($violation, $form, $allowNonSynchronized);
             }

Form.php

@@ -909,6 +909,10 @@ public function add($child, $type = null, array $options = array())
             // Never initialize child forms automatically
             $options['auto_initialize'] = false;
 
+            if (null === $type && null === $this->config->getDataClass()) {
+                $type = 'text';
+            }
+
             if (null === $type) {
                 $child = $this->config->getFormFactory()->createForProperty($this->config->getDataClass(), $child, null, $options);
             } else {

Tests/CompoundFormTest.php

@@ -205,6 +205,22 @@ public function testAddUsingIntegerNameAndType()
         $this->assertSame(array(0 => $child), $this->form->all());
     }
 
+    public function testAddWithoutType()
+    {
+        $child = $this->getBuilder('foo')->getForm();
+
+        $this->factory->expects($this->once())
+            ->method('createNamed')
+            ->with('foo', 'text')
+            ->will($this->returnValue($child));
+
+        $this->form->add('foo');
+
+        $this->assertTrue($this->form->has('foo'));
+        $this->assertSame($this->form, $child->getParent());
+        $this->assertSame(array('foo' => $child), $this->form->all());
+    }
+
     public function testAddUsingNameButNoType()
     {
         $this->form = $this->getBuilder('name', null, '\stdClass')

Tests/Extension/Validator/EventListener/ValidationListenerTest.php

@@ -64,9 +64,9 @@ protected function setUp()
         $this->params = array('foo' => 'bar');
     }
 
-    private function getConstraintViolation($code = null)
+    private function getConstraintViolation($code = null, $constraint = null)
     {
-        return new ConstraintViolation($this->message, $this->messageTemplate, $this->params, null, 'prop.path', null, null, $code, new Form());
+        return new ConstraintViolation($this->message, $this->messageTemplate, $this->params, null, 'prop.path', null, null, $code, $constraint);
     }
 
     private function getBuilder($name = 'name', $propertyPath = null, $dataClass = null)
@@ -93,7 +93,7 @@ private function getMockForm()
     // More specific mapping tests can be found in ViolationMapperTest
     public function testMapViolation()
     {
-        $violation = $this->getConstraintViolation();
+        $violation = $this->getConstraintViolation(null, new Form());
         $form = $this->getForm('street');
 
         $this->validator->expects($this->once())
@@ -109,7 +109,28 @@ public function testMapViolation()
 
     public function testMapViolationAllowsNonSyncIfInvalid()
     {
-        $violation = $this->getConstraintViolation(Form::NOT_SYNCHRONIZED_ERROR);
+        $violation = $this->getConstraintViolation(Form::NOT_SYNCHRONIZED_ERROR, new Form());
+        $form = $this->getForm('street');
+
+        $this->validator->expects($this->once())
+            ->method('validate')
+            ->will($this->returnValue(array($violation)));
+
+        $this->violationMapper->expects($this->once())
+            ->method('mapViolation')
+            // pass true now
+            ->with($violation, $form, true);
+
+        $this->listener->validateForm(new FormEvent($form, null));
+    }
+
+    public function testMapViolationAllowsNonSyncIfInvalidWithoutConstraintReference()
+    {
+        // constraint violations have no reference to the constraint if they are created by
+        //   Symfony\Component\Validator\ExecutionContext
+        // which is deprecated in favor of
+        //   Symfony\Component\Validator\Context\ExecutionContext
+        $violation = $this->getConstraintViolation(Form::NOT_SYNCHRONIZED_ERROR, null);
         $form = $this->getForm('street');
 
         $this->validator->expects($this->once())