[Config] Enable cannotBeEmpty along with requiresAtLeastOneElement

symfony · Aug 5, 2017 · d40e7e4 · d40e7e4
1 parent 954e9f1
commit d40e7e4
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
@@ -428,7 +428,7 @@ protected function createNode()
                 $node->setKeyAttribute($this->key, $this->removeKeyItem);
             }
 
-            if (true === $this->atLeastOne) {
+            if (true === $this->atLeastOne || false === $this->allowEmptyValue) {
                 $node->setMinNumberOfElements(1);
             }
 
@@ -490,6 +490,12 @@ protected function validateConcreteNode(ArrayNode $node)
             );
         }
 
+        if (false === $this->allowEmptyValue) {
+            throw new InvalidDefinitionException(
+                sprintf('->cannotBeEmpty() is not applicable to concrete nodes at path "%s"', $path)
+            );
+        }
+
         if (true === $this->atLeastOne) {
             throw new InvalidDefinitionException(
                 sprintf('->requiresAtLeastOneElement() is not applicable to concrete nodes at path "%s"', $path)

diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php
@@ -54,6 +54,7 @@ public function providePrototypeNodeSpecificCalls()
             array('defaultValue', array(array())),
             array('addDefaultChildrenIfNoneSet', array()),
             array('requiresAtLeastOneElement', array()),
+            array('cannotBeEmpty', array()),
             array('useAttributeAsKey', array('foo')),
         );
     }
@@ -285,6 +286,32 @@ public function getEnableableNodeFixtures()
         );
     }
 
+    public function testRequiresAtLeastOneElement()
+    {
+        $node = new ArrayNodeDefinition('root');
+        $node
+            ->requiresAtLeastOneElement()
+            ->integerPrototype();
+
+        $node->getNode()->finalize(array(1));
+
+        $this->addToAssertionCount(1);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     * @expectedExceptionMessage The path "root" should have at least 1 element(s) defined.
+     */
+    public function testCannotBeEmpty()
+    {
+        $node = new ArrayNodeDefinition('root');
+        $node
+            ->cannotBeEmpty()
+            ->integerPrototype();
+
+        $node->getNode()->finalize(array());
+    }
+
     protected function getField($object, $field)
     {
         $reflection = new \ReflectionProperty($object, $field);