minor #24919 [Config][4.0] Fix cannotBeEmpty() (ro0NL)

fabpot · fabpot · commit 6a404881ae68 · 2017-11-11T07:55:13.000-08:00
This PR was squashed before being merged into the 4.0-dev branch (closes #24919). Discussion ---------- [Config][4.0] Fix cannotBeEmpty() | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #...  | License | MIT | Doc PR | symfony/symfony-docs#...  Commits ------- 28128b6 [Config][4.0] Fix cannotBeEmpty()
diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
@@ -424,11 +424,7 @@ protected function createNode()
                 $node->setKeyAttribute($this->key, $this->removeKeyItem);
             }
 
-            if (false === $this->allowEmptyValue) {
-                @trigger_error(sprintf('Using %s::cannotBeEmpty() at path "%s" has no effect, consider requiresAtLeastOneElement() instead. In 4.0 both methods will behave the same.', __CLASS__, $node->getPath()), E_USER_DEPRECATED);
-            }
-
-            if (true === $this->atLeastOne) {
+            if (true === $this->atLeastOne || false === $this->allowEmptyValue) {
                 $node->setMinNumberOfElements(1);
             }
 
@@ -490,7 +486,7 @@ protected function validateConcreteNode(ArrayNode $node)
         }
 
         if (false === $this->allowEmptyValue) {
-            @trigger_error(sprintf('->cannotBeEmpty() is not applicable to concrete nodes at path "%s". In 4.0 it will throw an exception.', $path), E_USER_DEPRECATED);
+            throw new InvalidDefinitionException(sprintf('->cannotBeEmpty() is not applicable to concrete nodes at path "%s"', $path));
         }
 
         if (true === $this->atLeastOne) {
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')),
         );
     }
@@ -298,8 +299,8 @@ public function testRequiresAtLeastOneElement()
     }
 
     /**
-     * @group legacy
-     * @expectedDeprecation Using Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition::cannotBeEmpty() at path "root" has no effect, consider requiresAtLeastOneElement() instead. In 4.0 both methods will behave the same.
+     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     * @expectedExceptionMessage The path "root" should have at least 1 element(s) defined.
      */
     public function testCannotBeEmpty()
     {
@@ -326,8 +327,8 @@ public function testSetDeprecated()
     }
 
     /**
-     * @group legacy
-     * @expectedDeprecation ->cannotBeEmpty() is not applicable to concrete nodes at path "root". In 4.0 it will throw an exception.
+     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidDefinitionException
+     * @expectedExceptionMessage ->cannotBeEmpty() is not applicable to concrete nodes at path "root"
      */
     public function testCannotBeEmptyOnConcreteNode()
     {

Original file line number	Diff line number	Diff line change
`@@ -424,11 +424,7 @@ protected function createNode()`
`424`	`424`	`$node->setKeyAttribute($this->key, $this->removeKeyItem);`
`425`	`425`	`}`
`426`	`426`
`427`		`- if (false === $this->allowEmptyValue) {`
`428`		`- @trigger_error(sprintf('Using %s::cannotBeEmpty() at path "%s" has no effect, consider requiresAtLeastOneElement() instead. In 4.0 both methods will behave the same.', __CLASS__, $node->getPath()), E_USER_DEPRECATED);`
`429`		`- }`
`430`		`-`
`431`		`- if (true === $this->atLeastOne) {`
	`427`	`+ if (true === $this->atLeastOne \|\| false === $this->allowEmptyValue) {`
`432`	`428`	`$node->setMinNumberOfElements(1);`
`433`	`429`	`}`
`434`	`430`
`@@ -490,7 +486,7 @@ protected function validateConcreteNode(ArrayNode $node)`
`490`	`486`	`}`
`491`	`487`
`492`	`488`	`if (false === $this->allowEmptyValue) {`
`493`		`- @trigger_error(sprintf('->cannotBeEmpty() is not applicable to concrete nodes at path "%s". In 4.0 it will throw an exception.', $path), E_USER_DEPRECATED);`
	`489`	`+ throw new InvalidDefinitionException(sprintf('->cannotBeEmpty() is not applicable to concrete nodes at path "%s"', $path));`
`494`	`490`	`}`
`495`	`491`
`496`	`492`	`if (true === $this->atLeastOne) {`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ public function providePrototypeNodeSpecificCalls()`
`54`	`54`	`array('defaultValue', array(array())),`
`55`	`55`	`array('addDefaultChildrenIfNoneSet', array()),`
`56`	`56`	`array('requiresAtLeastOneElement', array()),`
	`57`	`+ array('cannotBeEmpty', array()),`
`57`	`58`	`array('useAttributeAsKey', array('foo')),`
`58`	`59`	`);`
`59`	`60`	`}`
`@@ -298,8 +299,8 @@ public function testRequiresAtLeastOneElement()`
`298`	`299`	`}`
`299`	`300`
`300`	`301`	`/**`
`301`		`- * @group legacy`
`302`		`- * @expectedDeprecation Using Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition::cannotBeEmpty() at path "root" has no effect, consider requiresAtLeastOneElement() instead. In 4.0 both methods will behave the same.`
	`302`	`+ * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException`
	`303`	`+ * @expectedExceptionMessage The path "root" should have at least 1 element(s) defined.`
`303`	`304`	`*/`
`304`	`305`	`public function testCannotBeEmpty()`
`305`	`306`	`{`
`@@ -326,8 +327,8 @@ public function testSetDeprecated()`
`326`	`327`	`}`
`327`	`328`
`328`	`329`	`/**`
`329`		`- * @group legacy`
`330`		`- * @expectedDeprecation ->cannotBeEmpty() is not applicable to concrete nodes at path "root". In 4.0 it will throw an exception.`
	`330`	`+ * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidDefinitionException`
	`331`	`+ * @expectedExceptionMessage ->cannotBeEmpty() is not applicable to concrete nodes at path "root"`
`331`	`332`	`*/`
`332`	`333`	`public function testCannotBeEmptyOnConcreteNode()`
`333`	`334`	`{`