From a6a330dcd9603ed3431e8608ae74f5693b85e3c1 Mon Sep 17 00:00:00 2001
From: Mateusz Sip <mateusz.sip@gmail.com>
Date: Sat, 13 Jan 2018 04:34:06 +0100
Subject: [PATCH]  Enableable ArrayNodeDefinition is disabled for empty
 configuration

---
 .../Builder/ArrayNodeDefinition.php           |  4 +++-
 .../Builder/ArrayNodeDefinitionTest.php       | 15 +++++++++++++++
 .../Definition/Builder/TreeBuilderTest.php    | 19 +++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
index a0ad77edd0..607f1d1fe7 100644
--- a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
+++ b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
@@ -226,7 +226,9 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
             ->beforeNormalization()
                 ->ifArray()
                 ->then(function ($v) {
-                    $v['enabled'] = isset($v['enabled']) ? $v['enabled'] : true;
+                    if (!isset($v['enabled'])) {
+                        $v['enabled'] = !empty($v);
+                    }
 
                     return $v;
                 })
diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php
index 16a38c30b0..4b6f4d7fd1 100644
--- a/src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php
@@ -207,6 +207,20 @@ class ArrayNodeDefinitionTest extends TestCase
         $this->assertTrue($this->getField($enabledNode, 'defaultValue'));
     }
 
+    public function testEnableableNodeIsDisabledForEmptyConfigurationWhenNormalized()
+    {
+        $config = array();
+
+        $node = new ArrayNodeDefinition('root');
+        $node->canBeEnabled();
+
+        $this->assertEquals(
+            array('enabled' => false),
+            $node->getNode()->normalize($config),
+            'An enableable node is disabled by default'
+        );
+    }
+
     public function testIgnoreExtraKeys()
     {
         $node = new ArrayNodeDefinition('root');
@@ -240,6 +254,7 @@ class ArrayNodeDefinitionTest extends TestCase
             array(array('enabled' => true, 'foo' => 'baz'), array(array('foo' => 'baz')), 'any configuration enables an enableable node'),
             array(array('enabled' => false, 'foo' => 'baz'), array(array('foo' => 'baz', 'enabled' => false)), 'An enableable node can be disabled'),
             array(array('enabled' => false, 'foo' => 'bar'), array(false), 'false disables an enableable node'),
+            array(array('enabled' => false, 'foo' => 'bar'), array(), 'enableable node is disabled by default'),
         );
     }
 
diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/TreeBuilderTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/TreeBuilderTest.php
index 0a9312346e..6e99469a4e 100644
--- a/src/Symfony/Component/Config/Tests/Definition/Builder/TreeBuilderTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/Builder/TreeBuilderTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Config\Tests\Definition\Builder;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\Config\Tests\Fixtures\Builder\NodeBuilder as CustomNodeBuilder;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 
@@ -131,4 +132,22 @@ class TreeBuilderTest extends TestCase
         $this->assertInternalType('array', $tree->getExample());
         $this->assertEquals('example', $children['child']->getExample());
     }
+
+    public function testRootNodeThatCanBeEnabledIsDisabledByDefault()
+    {
+        $builder = new TreeBuilder();
+
+        $builder->root('test')
+            ->canBeEnabled();
+
+        $tree = $builder->buildTree();
+        $children = $tree->getChildren();
+
+        $this->assertFalse($children['enabled']->getDefaultValue());
+
+        $processor = new Processor();
+        $result = $processor->process($tree, array());
+
+        $this->assertEquals(array('enabled' => false), $result);
+    }
 }