Allowed values are not optionals

Author: steevanb

README.md

@@ -1,7 +1,7 @@
-[![version](https://img.shields.io/badge/version-1.0.0-green.svg)](https://github.com/steevanb/symfony-options-resolver/tree/1.0.0)
+[![version](https://img.shields.io/badge/version-1.0.1-green.svg)](https://github.com/steevanb/symfony-options-resolver/tree/1.0.1)
 [![doctrine](https://img.shields.io/badge/symfony/options_resolver-^2.6||^3.0||^4.0-blue.svg)](https://github.com/symfony/options-resolver)
 [![php](https://img.shields.io/badge/php-^7.1-blue.svg)](http://www.php.net)
-![Lines](https://img.shields.io/badge/code%20lines-369-green.svg)
+![Lines](https://img.shields.io/badge/code%20lines-376-green.svg)
 ![Total Downloads](https://poser.pugx.org/steevanb/symfony-options-resolver/downloads)
 [![Scrutinizer](https://scrutinizer-ci.com/g/steevanb/symfony-options-resolver/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/steevanb/symfony-options-resolver/)
 
@@ -14,7 +14,7 @@ Add features to Symfony [OptionsResolver](https://github.com/symfony/options-res
 ### Installation
 
 ```bash
-composer require "steevanb/symfony-options-resolver": "^1.0"
+composer require "steevanb/symfony-options-resolver": "^1.0.1"
 ```
 
 ### Examples

changelog.md

@@ -1,3 +1,8 @@
+### [1.0.1](../../compare/1.0.0...1.0.1) - 2017-09-30
+
+- `$allowedValues` parameter of `OptionsResolver::confogureOptions()` and `OptionsResolver::configureRequiredOptions()` is now optional.
+- [BC BREAK (should not impact a lot of people since library is not downloaded for now)] Inverse `OptionsResolver::configureOptions()` `$default` and `$allowedValues` parameters order.
+
 ### 1.0.0 - 2019-09-27
 
 - Create `steevanb\SymfonyOptionsResolver\OptionsResolver`.

src/OptionsResolver.php

@@ -8,7 +8,7 @@
 
 class OptionsResolver extends SymfonyOptionsResolver
 {
-    public function configureOption(string $name, array $allowedTypes, array $allowedValues, $default): self
+    public function configureOption(string $name, array $allowedTypes, $default, array $allowedValues = null): self
     {
         $this
             ->setAllowedTypesAndValues($name, $allowedTypes, $allowedValues)
@@ -17,7 +17,7 @@ public function configureOption(string $name, array $allowedTypes, array $allowe
         return $this;
     }
 
-    public function configureRequiredOption(string $name, array $allowedTypes, array $allowedValues): self
+    public function configureRequiredOption(string $name, array $allowedTypes, array $allowedValues = null): self
     {
         $this
             ->setAllowedTypesAndValues($name, $allowedTypes, $allowedValues)
@@ -26,12 +26,14 @@ public function configureRequiredOption(string $name, array $allowedTypes, array
         return $this;
     }
 
-    protected function setAllowedTypesAndValues(string $name, array $allowedTypes, array $allowedValues): self
+    protected function setAllowedTypesAndValues(string $name, array $allowedTypes, array $allowedValues = null): self
     {
         $this
             ->setDefined($name)
-            ->setAllowedTypes($name, $allowedTypes)
-            ->setAllowedValues($name, $allowedValues);
+            ->setAllowedTypes($name, $allowedTypes);
+        if (is_array($allowedValues)) {
+            $this->setAllowedValues($name, $allowedValues);
+        }
 
         return $this;
     }

tests/OptionsResolverConfigureOptionTest.php

@@ -46,6 +46,6 @@ public function testDefaultValue(): void
     private function createOptionsResolver(string $defaultValue = null): OptionsResolver
     {
         return (new OptionsResolver())
-            ->configureOption('foo', ['string'], ['bar'], $defaultValue);
+            ->configureOption('foo', ['string'], $defaultValue, ['bar']);
     }
 }