Merge branch '2.8' into 3.4

* 2.8:
  [Form] Fixed keeping hash of equal \DateTimeInterface on submit
  [PhpUnitBridge] Fix typo
  [Config] Unset key during normalization
  invalidate forms on transformation failures

Author: nicolas-grekas

Definition/ArrayNode.php

@@ -292,7 +292,10 @@ protected function normalizeValue($value)
         $normalized = array();
         foreach ($value as $name => $val) {
             if (isset($this->children[$name])) {
-                $normalized[$name] = $this->children[$name]->normalize($val);
+                try {
+                    $normalized[$name] = $this->children[$name]->normalize($val);
+                } catch (UnsetKeyException $e) {
+                }
                 unset($value[$name]);
             } elseif (!$this->removeExtraKeys) {
                 $normalized[$name] = $val;

Definition/Builder/ExprBuilder.php

@@ -174,7 +174,7 @@ public function thenEmptyArray()
     }
 
     /**
-     * Sets a closure marking the value as invalid at validation time.
+     * Sets a closure marking the value as invalid at processing time.
      *
      * if you want to add the value of the node in your message just use a %s placeholder.
      *
@@ -192,7 +192,7 @@ public function thenInvalid($message)
     }
 
     /**
-     * Sets a closure unsetting this key of the array at validation time.
+     * Sets a closure unsetting this key of the array at processing time.
      *
      * @return $this
      *

Tests/Definition/Builder/ArrayNodeDefinitionTest.php

@@ -231,6 +231,25 @@ public function testNormalizeKeys()
         $this->assertFalse($this->getField($node, 'normalizeKeys'));
     }
 
+    public function testUnsetChild()
+    {
+        $node = new ArrayNodeDefinition('root');
+        $node
+            ->children()
+                ->scalarNode('value')
+                    ->beforeNormalization()
+                        ->ifTrue(function ($value) {
+                            return empty($value);
+                        })
+                        ->thenUnset()
+                    ->end()
+                ->end()
+            ->end()
+        ;
+
+        $this->assertSame(array(), $node->getNode()->normalize(array('value' => null)));
+    }
+
     public function testPrototypeVariable()
     {
         $node = new ArrayNodeDefinition('root');