[OptionsParser] Renamed OptionsParser to OptionsResolver

webmozart · webmozart · commit 256b7081a423 · 2012-05-14T19:35:07.000+02:00
diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
         "symfony/http-foundation": "self.version",
         "symfony/http-kernel": "self.version",
         "symfony/locale": "self.version",
-        "symfony/options-parser": "self.version",
+        "symfony/options-resolver": "self.version",
         "symfony/process": "self.version",
         "symfony/routing": "self.version",
         "symfony/security": "self.version",
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -19,7 +19,7 @@
 use Symfony\Bridge\Doctrine\Form\EventListener\MergeDoctrineCollectionListener;
 use Symfony\Bridge\Doctrine\Form\DataTransformer\CollectionToArrayTransformer;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsParser\Options;
+use Symfony\Component\OptionsResolver\Options;
 
 abstract class DoctrineType extends AbstractType
 {
diff --git a/src/Symfony/Bridge/Propel1/Form/Type/ModelType.php b/src/Symfony/Bridge/Propel1/Form/Type/ModelType.php
@@ -15,7 +15,7 @@
 use Symfony\Bridge\Propel1\Form\DataTransformer\CollectionToArrayTransformer;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilder;
-use Symfony\Component\OptionsParser\Options;
+use Symfony\Component\OptionsResolver\Options;
 
 /**
  * ModelType class.
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -26,7 +26,7 @@
 use Symfony\Component\Form\Extension\Core\DataTransformer\ChoiceToBooleanArrayTransformer;
 use Symfony\Component\Form\Extension\Core\DataTransformer\ChoicesToValuesTransformer;
 use Symfony\Component\Form\Extension\Core\DataTransformer\ChoicesToBooleanArrayTransformer;
-use Symfony\Component\OptionsParser\Options;
+use Symfony\Component\OptionsResolver\Options;
 
 class ChoiceType extends AbstractType
 {
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
@@ -21,7 +21,7 @@
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToStringTransformer;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
 use Symfony\Component\Form\Extension\Core\DataTransformer\ArrayToPartsTransformer;
-use Symfony\Component\OptionsParser\Options;
+use Symfony\Component\OptionsResolver\Options;
 
 class DateTimeType extends AbstractType
 {
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -22,7 +22,7 @@
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToStringTransformer;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
 use Symfony\Component\Form\ReversedTransformer;
-use Symfony\Component\OptionsParser\Options;
+use Symfony\Component\OptionsResolver\Options;
 
 class DateType extends AbstractType
 {
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
@@ -22,7 +22,7 @@
 use Symfony\Component\Form\Extension\Core\DataMapper\PropertyPathMapper;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\Form\Exception\FormException;
-use Symfony\Component\OptionsParser\Options;
+use Symfony\Component\OptionsResolver\Options;
 
 class FormType extends AbstractType
 {
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -20,7 +20,7 @@
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToArrayTransformer;
 use Symfony\Component\Form\FormView;
-use Symfony\Component\OptionsParser\Options;
+use Symfony\Component\OptionsResolver\Options;
 
 class TimeType extends AbstractType
 {
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;
-use Symfony\Component\OptionsParser\Options;
+use Symfony\Component\OptionsResolver\Options;
 
 class TimezoneType extends AbstractType
 {
diff --git a/src/Symfony/Component/Form/FormFactory.php b/src/Symfony/Component/Form/FormFactory.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Exception\FormException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 use Symfony\Component\Form\Exception\TypeDefinitionException;
-use Symfony\Component\OptionsParser\OptionsParser;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class FormFactory implements FormFactoryInterface
 {
@@ -221,7 +221,7 @@ public function createNamedBuilder($type, $name, $data = null, array $options =
         $types = array();
         $optionValues = array();
         $knownOptions = array();
-        $optionsParser = new OptionsParser();
+        $optionsResolver = new OptionsResolver();
 
         // Bottom-up determination of the type hierarchy
         // Start with the actual type and look for the parent type
@@ -255,14 +255,14 @@ public function createNamedBuilder($type, $name, $data = null, array $options =
             // options. Default options of children override default options
             // of parents.
             $typeOptions = $type->getDefaultOptions();
-            $optionsParser->setDefaults($typeOptions);
-            $optionsParser->addAllowedValues($type->getAllowedOptionValues());
+            $optionsResolver->setDefaults($typeOptions);
+            $optionsResolver->addAllowedValues($type->getAllowedOptionValues());
             $knownOptions = array_merge($knownOptions, array_keys($typeOptions));
 
             foreach ($type->getExtensions() as $typeExtension) {
                 $extensionOptions = $typeExtension->getDefaultOptions();
-                $optionsParser->setDefaults($extensionOptions);
-                $optionsParser->addAllowedValues($typeExtension->getAllowedOptionValues());
+                $optionsResolver->setDefaults($extensionOptions);
+                $optionsResolver->addAllowedValues($typeExtension->getAllowedOptionValues());
                 $knownOptions = array_merge($knownOptions, array_keys($extensionOptions));
             }
         }
@@ -278,7 +278,7 @@ public function createNamedBuilder($type, $name, $data = null, array $options =
         }
 
         // Resolve options
-        $options = $optionsParser->parse($options);
+        $options = $optionsResolver->resolve($options);
 
         for ($i = 0, $l = count($types); $i < $l && !$builder; ++$i) {
             $builder = $types[$i]->createBuilder($name, $this, $options);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
@@ -23,7 +23,7 @@ protected function setUp()
     }
 
     /**
-     * @expectedException Symfony\Component\OptionsParser\Exception\InvalidOptionsException
+     * @expectedException Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
      */
     public function testInvalidWidgetOption()
     {
@@ -33,7 +33,7 @@ public function testInvalidWidgetOption()
     }
 
     /**
-     * @expectedException Symfony\Component\OptionsParser\Exception\InvalidOptionsException
+     * @expectedException Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
      */
     public function testInvalidInputOption()
     {
diff --git a/src/Symfony/Component/Form/Tests/FormFactoryTest.php b/src/Symfony/Component/Form/Tests/FormFactoryTest.php
@@ -279,7 +279,7 @@ public function testCreateNamedBuilderExpectsBuilderToBeReturned()
     }
 
     /**
-     * @expectedException Symfony\Component\OptionsParser\Exception\InvalidOptionsException
+     * @expectedException Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
      */
     public function testCreateNamedBuilderExpectsOptionsToExist()
     {
@@ -292,7 +292,7 @@ public function testCreateNamedBuilderExpectsOptionsToExist()
     }
 
     /**
-     * @expectedException Symfony\Component\OptionsParser\Exception\InvalidOptionsException
+     * @expectedException Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
      */
     public function testCreateNamedBuilderExpectsOptionsToBeInValidRange()
     {
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
@@ -19,7 +19,7 @@
         "php": ">=5.3.3",
         "symfony/event-dispatcher": "2.1.*",
         "symfony/locale": "2.1.*",
-        "symfony/options-parser": "2.1.*"
+        "symfony/options-resolver": "2.1.*"
     },
     "require-dev": {
         "symfony/validator": "2.1.*",
diff --git a/src/Symfony/Component/OptionsResolver/Exception/ExceptionInterface.php b/src/Symfony/Component/OptionsResolver/Exception/ExceptionInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\OptionsParser\Exception;
+namespace Symfony\Component\OptionsResolver\Exception;
 
 /**
  * Marker interface for the Options component.
diff --git a/src/Symfony/Component/OptionsResolver/Exception/InvalidOptionsException.php b/src/Symfony/Component/OptionsResolver/Exception/InvalidOptionsException.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\OptionsParser\Exception;
+namespace Symfony\Component\OptionsResolver\Exception;
 
 /**
  * Exception thrown when an invalid option is passed.
diff --git a/src/Symfony/Component/OptionsResolver/Exception/MissingOptionsException.php b/src/Symfony/Component/OptionsResolver/Exception/MissingOptionsException.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\OptionsParser\Exception;
+namespace Symfony\Component\OptionsResolver\Exception;
 
 /**
  * Exception thrown when a required option is missing.
diff --git a/src/Symfony/Component/OptionsResolver/Exception/OptionDefinitionException.php b/src/Symfony/Component/OptionsResolver/Exception/OptionDefinitionException.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\OptionsParser\Exception;
+namespace Symfony\Component\OptionsResolver\Exception;
 
 /**
  * Thrown when an option definition is invalid.
diff --git a/src/Symfony/Component/OptionsResolver/LICENSE b/src/Symfony/Component/OptionsResolver/LICENSE
diff --git a/src/Symfony/Component/OptionsResolver/LazyOption.php b/src/Symfony/Component/OptionsResolver/LazyOption.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\OptionsParser;
+namespace Symfony\Component\OptionsResolver;
 
 use Closure;
 
diff --git a/src/Symfony/Component/OptionsResolver/Options.php b/src/Symfony/Component/OptionsResolver/Options.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\OptionsParser;
+namespace Symfony\Component\OptionsResolver;
 
 use ArrayAccess;
 use Iterator;
 use OutOfBoundsException;
-use Symfony\Component\OptionsParser\Exception\OptionDefinitionException;
+use Symfony\Component\OptionsResolver\Exception\OptionDefinitionException;
 
 /**
  * Container for resolving inter-dependent options.
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -9,18 +9,18 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\OptionsParser;
+namespace Symfony\Component\OptionsResolver;
 
-use Symfony\Component\OptionsParser\Exception\OptionDefinitionException;
-use Symfony\Component\OptionsParser\Exception\InvalidOptionsException;
-use Symfony\Component\OptionsParser\Exception\MissingOptionsException;
+use Symfony\Component\OptionsResolver\Exception\OptionDefinitionException;
+use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
+use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
 
 /**
  * Helper for merging default and concrete option values.
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class OptionsParser
+class OptionsResolver
 {
     /**
      * The default option values.
@@ -29,13 +29,13 @@ class OptionsParser
     private $defaultOptions;
 
     /**
-     * The options known by the parser.
+     * The options known by the resolver.
      * @var array
      */
     private $knownOptions = array();
 
     /**
-     * The options required to be passed to parse().
+     * The options required to be passed to resolve().
      * @var array
      */
     private $requiredOptions = array();
@@ -100,7 +100,7 @@ public function replaceDefaults(array $defaultValues)
      *
      * This method is identical to `setDefaults`, only that no default values
      * are configured for the options. If these options are not passed to
-     * parse(), they will be missing in the final options array. This can be
+     * resolve(), they will be missing in the final options array. This can be
      * helpful if you want to determine whether an option has been set or not.
      *
      * @param  array $optionNames  A list of option names.
@@ -121,7 +121,7 @@ public function setOptional(array $optionNames)
     /**
      * Sets required options.
      *
-     * If these options are not passed to parse(), an exception will be thrown.
+     * If these options are not passed to resolve(), an exception will be thrown.
      *
      * @param  array $optionNames  A list of option names.
      *
@@ -189,7 +189,7 @@ public function addAllowedValues(array $allowedValues)
      * @throws OptionDefinitionException If a cyclic dependency is detected
      *                                   between two lazy options.
      */
-    public function parse(array $options)
+    public function resolve(array $options)
     {
         $this->validateOptionNames(array_keys($options));
 
diff --git a/src/Symfony/Component/OptionsResolver/README.md b/src/Symfony/Component/OptionsResolver/README.md
diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionResolverTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionResolverTest.php
diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionsTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionsTest.php
diff --git a/src/Symfony/Component/OptionsResolver/Tests/bootstrap.php b/src/Symfony/Component/OptionsResolver/Tests/bootstrap.php
diff --git a/src/Symfony/Component/OptionsResolver/composer.json b/src/Symfony/Component/OptionsResolver/composer.json
diff --git a/src/Symfony/Component/OptionsResolver/phpunit.xml.dist b/src/Symfony/Component/OptionsResolver/phpunit.xml.dist

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`use Symfony\Bridge\Doctrine\Form\EventListener\MergeDoctrineCollectionListener;`
`20`	`20`	`use Symfony\Bridge\Doctrine\Form\DataTransformer\CollectionToArrayTransformer;`
`21`	`21`	`use Symfony\Component\Form\AbstractType;`
`22`		`-use Symfony\Component\OptionsParser\Options;`
	`22`	`+use Symfony\Component\OptionsResolver\Options;`
`23`	`23`
`24`	`24`	`abstract class DoctrineType extends AbstractType`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`use Symfony\Component\Form\Extension\Core\DataTransformer\ChoiceToBooleanArrayTransformer;`
`27`	`27`	`use Symfony\Component\Form\Extension\Core\DataTransformer\ChoicesToValuesTransformer;`
`28`	`28`	`use Symfony\Component\Form\Extension\Core\DataTransformer\ChoicesToBooleanArrayTransformer;`
`29`		`-use Symfony\Component\OptionsParser\Options;`
	`29`	`+use Symfony\Component\OptionsResolver\Options;`
`30`	`30`
`31`	`31`	`class ChoiceType extends AbstractType`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToStringTransformer;`
`22`	`22`	`use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;`
`23`	`23`	`use Symfony\Component\Form\Extension\Core\DataTransformer\ArrayToPartsTransformer;`
`24`		`-use Symfony\Component\OptionsParser\Options;`
	`24`	`+use Symfony\Component\OptionsResolver\Options;`
`25`	`25`
`26`	`26`	`class DateTimeType extends AbstractType`
`27`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToStringTransformer;`
`23`	`23`	`use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;`
`24`	`24`	`use Symfony\Component\Form\ReversedTransformer;`
`25`		`-use Symfony\Component\OptionsParser\Options;`
	`25`	`+use Symfony\Component\OptionsResolver\Options;`
`26`	`26`
`27`	`27`	`class DateType extends AbstractType`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;`
`21`	`21`	`use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToArrayTransformer;`
`22`	`22`	`use Symfony\Component\Form\FormView;`
`23`		`-use Symfony\Component\OptionsParser\Options;`
	`23`	`+use Symfony\Component\OptionsResolver\Options;`
`24`	`24`
`25`	`25`	`class TimeType extends AbstractType`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\Form\AbstractType;`
`15`	`15`	`use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList;`
`16`		`-use Symfony\Component\OptionsParser\Options;`
	`16`	`+use Symfony\Component\OptionsResolver\Options;`
`17`	`17`
`18`	`18`	`class TimezoneType extends AbstractType`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ protected function setUp()`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`/**`
`26`		`- * @expectedException Symfony\Component\OptionsParser\Exception\InvalidOptionsException`
	`26`	`+ * @expectedException Symfony\Component\OptionsResolver\Exception\InvalidOptionsException`
`27`	`27`	`*/`
`28`	`28`	`public function testInvalidWidgetOption()`
`29`	`29`	`{`
`@@ -33,7 +33,7 @@ public function testInvalidWidgetOption()`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`/**`
`36`		`- * @expectedException Symfony\Component\OptionsParser\Exception\InvalidOptionsException`
	`36`	`+ * @expectedException Symfony\Component\OptionsResolver\Exception\InvalidOptionsException`
`37`	`37`	`*/`
`38`	`38`	`public function testInvalidInputOption()`
`39`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ public function testCreateNamedBuilderExpectsBuilderToBeReturned()`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`/**`
`282`		`- * @expectedException Symfony\Component\OptionsParser\Exception\InvalidOptionsException`
	`282`	`+ * @expectedException Symfony\Component\OptionsResolver\Exception\InvalidOptionsException`
`283`	`283`	`*/`
`284`	`284`	`public function testCreateNamedBuilderExpectsOptionsToExist()`
`285`	`285`	`{`
`@@ -292,7 +292,7 @@ public function testCreateNamedBuilderExpectsOptionsToExist()`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`/**`
`295`		`- * @expectedException Symfony\Component\OptionsParser\Exception\InvalidOptionsException`
	`295`	`+ * @expectedException Symfony\Component\OptionsResolver\Exception\InvalidOptionsException`
`296`	`296`	`*/`
`297`	`297`	`public function testCreateNamedBuilderExpectsOptionsToBeInValidRange()`
`298`	`298`	`{`