bug #29152 [Config] Unset key during normalization (ro0NL)

fabpot · fabpot · commit 26f321cb018b · 2018-11-12T08:03:10.000+01:00
This PR was squashed before being merged into the 2.8 branch (closes #29152). Discussion ---------- [Config] Unset key during normalization | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes-ish | New feature? | yes | BC breaks? | no  | Deprecations? | no | Tests pass? | yes  | Fixed tickets | #29142 | License | MIT | Doc PR | symfony/symfony-docs#...  2.8 vs. 4.x :) let me know. Commits ------- e1402d4 [Config] Unset key during normalization
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(

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public function thenEmptyArray()`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`/**`
`152`		`- * Sets a closure marking the value as invalid at validation time.`
	`152`	`+ * Sets a closure marking the value as invalid at processing time.`
`153`	`153`	`*`
`154`	`154`	`* if you want to add the value of the node in your message just use a %s placeholder.`
`155`	`155`	`*`
`@@ -167,7 +167,7 @@ public function thenInvalid($message)`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`/**`
`170`		`- * Sets a closure unsetting this key of the array at validation time.`
	`170`	`+ * Sets a closure unsetting this key of the array at processing time.`
`171`	`171`	`*`
`172`	`172`	`* @return $this`
`173`	`173`	`*`