symfony
diff --git a/‎src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
Lines changed: 3 additions & 1 deletion b/‎src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
Lines changed: 3 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php
Lines changed: 15 additions & 0 deletions b/‎src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php
Lines changed: 15 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Config/Tests/Definition/Builder/TreeBuilderTest.php
Lines changed: 19 additions & 0 deletions b/‎src/Symfony/Component/Config/Tests/Definition/Builder/TreeBuilderTest.php
Lines changed: 19 additions & 0 deletions
@@ -226,7 +226,9 @@ public function canBeEnabled()
             ->beforeNormalization()
                 ->ifArray()
                 ->then(function ($v) {
-                    $v['enabled'] = isset($v['enabled']) ? $v['enabled'] : true;
+                    if (!isset($v['enabled'])) {
+                        $v['enabled'] = !empty($v);
+                    }
 
                     return $v;
                 })
 
@@ -207,6 +207,20 @@ public function testCanBeDisabled()
         $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 @@ public function getEnableableNodeFixtures()
             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'),
         );
     }
 
 
@@ -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 @@ public function testDefinitionExampleGetsTransferredToNode()
         $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);
+    }
 }