[Config] Unset key during normalization

symfony · fabpot · Nov 12, 2018 · Nov 9, 2018 · Nov 12, 2018 · e1402d495e70c0e03f28bce186fe946a31d81e31
commit e1402d495e70c0e03f28bce186fe946a31d81e31
diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/Definition/ArrayNode.php
@@ -288,7 +288,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;

diff --git a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php
@@ -149,7 +149,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.
     *
@@ -167,7 +167,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
     *

diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php b/src/Symfony/Component/Config/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 getEnableableNodeFixtures()
    {
        return array(