feature #15433 Allow to define Enum nodes with 1 single element (javiereguiluz)

fabpot · fabpot · commit 64d050769b86 · 2015-08-03T10:27:56.000+02:00
This PR was squashed before being merged into the 2.8 branch (closes #15433). Discussion ---------- Allow to define Enum nodes with 1 single element | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | BC breaks? | yes | Deprecations? | no | Tests pass? | yes | Fixed tickets | #15402 | License | MIT | Doc PR | - Commits ------- 68f0818 Allow to define Enum nodes with 1 single element
diff --git a/UPGRADE-2.8.md b/UPGRADE-2.8.md
@@ -399,3 +399,23 @@ FrameworkBundle
        session:
            cookie_httponly: false
    ```
+
+Config
+------
+
+The edge case of defining just one value for nodes of type Enum is now allowed:
+
+```php
+$rootNode
+    ->children()
+        ->enumNode('variable')
+            ->values(array('value'))
+        ->end()
+    ->end()
+;
+```
+
+Before: `InvalidArgumentException` (variable must contain at least two
+distinct elements).
+After: the code will work as expected and it will restrict the values of the
+`variable` option to just `value`.
diff --git a/src/Symfony/Component/Config/Definition/EnumNode.php b/src/Symfony/Component/Config/Definition/EnumNode.php
@@ -25,8 +25,8 @@ class EnumNode extends ScalarNode
     public function __construct($name, NodeInterface $parent = null, array $values = array())
     {
         $values = array_unique($values);
-        if (count($values) <= 1) {
-            throw new \InvalidArgumentException('$values must contain at least two distinct elements.');
+        if (empty($values)) {
+            throw new \InvalidArgumentException('$values must contain at least one element.');
         }
 
         parent::__construct($name, $parent);
diff --git a/src/Symfony/Component/Config/Tests/Definition/EnumNodeTest.php b/src/Symfony/Component/Config/Tests/Definition/EnumNodeTest.php
@@ -23,10 +23,23 @@ public function testFinalizeValue()
 
     /**
      * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage $values must contain at least one element.
      */
+    public function testConstructionWithNoValues()
+    {
+        new EnumNode('foo', null, array());
+    }
+
     public function testConstructionWithOneValue()
     {
-        new EnumNode('foo', null, array('foo', 'foo'));
+        $node = new EnumNode('foo', null, array('foo'));
+        $this->assertSame('foo', $node->finalize('foo'));
+    }
+
+    public function testConstructionWithOneDistinctValue()
+    {
+        $node = new EnumNode('foo', null, array('foo', 'foo'));
+        $this->assertSame('foo', $node->finalize('foo'));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ class EnumNode extends ScalarNode`
`25`	`25`	`public function __construct($name, NodeInterface $parent = null, array $values = array())`
`26`	`26`	`{`
`27`	`27`	`$values = array_unique($values);`
`28`		`- if (count($values) <= 1) {`
`29`		`- throw new \InvalidArgumentException('$values must contain at least two distinct elements.');`
	`28`	`+ if (empty($values)) {`
	`29`	`+ throw new \InvalidArgumentException('$values must contain at least one element.');`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`parent::__construct($name, $parent);`