Skip to content

Commit

Permalink
[OptionsResolver] Added OptionsResolverInterface
Browse files Browse the repository at this point in the history
  • Loading branch information
@webmozart
webmozart committed May 25, 2012
1 parent 2cd99e8 commit dc2fa9d
Show file tree
Hide file tree
Showing 2 changed files with 223 additions and 144 deletions.
159 changes: 15 additions & 144 deletions src/Symfony/Component/OptionsResolver/OptionsResolver.php
View file
Expand Up @@ -21,7 +21,7 @@
* @author Bernhard Schussek <bschussek@gmail.com>
* @author Tobias Schultze <http://tobion.de>
*/
class OptionsResolver
class OptionsResolver implements OptionsResolverInterface
{
/**
* The default option values.
Expand Down Expand Up @@ -68,27 +68,7 @@ public function __construct()
}

/**
* Sets default option values.
*
* The options can either be values of any types or closures that
* evaluate the option value lazily. These closures must have one
* of the following signatures:
*
* <code>
* function (Options $options)
* function (Options $options, $value)
* </code>
*
* The second parameter passed to the closure is the previously
* set default value, in case you are overwriting an existing
* default value.
*
* The closures should return the lazily created option value.
*
* @param array $defaultValues A list of option names as keys and default
* values or closures as values.
*
* @return OptionsResolver The resolver instance.
* {@inheritdoc}
*/
public function setDefaults(array $defaultValues)
{
Expand All @@ -102,17 +82,7 @@ public function setDefaults(array $defaultValues)
}

/**
* Replaces default option values.
*
* Old defaults are erased, which means that closures passed here cannot
* access the previous default value. This may be useful to improve
* performance if the previous default value is calculated by an expensive
* closure.
*
* @param array $defaultValues A list of option names as keys and default
* values or closures as values.
*
* @return OptionsResolver The resolver instance.
* {@inheritdoc}
*/
public function replaceDefaults(array $defaultValues)
{
Expand All @@ -126,20 +96,7 @@ public function replaceDefaults(array $defaultValues)
}

/**
* Sets optional options.
*
* This method declares a valid option names without setting default values for
* them. If these options are not passed to {@link resolve()} and no default has
* been set for them, 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
* because otherwise {@link resolve()} would trigger an exception for unknown
* options.
*
* @param array $optionNames A list of option names.
*
* @return OptionsResolver The resolver instance.
*
* @throws OptionDefinitionException When trying to pass default values.
* {@inheritdoc}
*/
public function setOptional(array $optionNames)
{
Expand All @@ -155,16 +112,7 @@ public function setOptional(array $optionNames)
}

/**
* Sets required options.
*
* If these options are not passed to resolve() and no default has been set for
* them, an exception will be thrown.
*
* @param array $optionNames A list of option names.
*
* @return OptionsResolver The resolver instance.
*
* @throws OptionDefinitionException When trying to pass default values.
* {@inheritdoc}
*/
public function setRequired(array $optionNames)
{
Expand All @@ -184,17 +132,7 @@ public function setRequired(array $optionNames)
}

/**
* Sets allowed values for a list of options.
*
* @param array $allowedValues A list of option names as keys and arrays
* with values acceptable for that option as
* values.
*
* @return OptionsResolver The resolver instance.
*
* @throws InvalidOptionsException If an option has not been defined
* (see {@link isKnown()}) for which
* an allowed value is set.
* {@inheritdoc}
*/
public function setAllowedValues(array $allowedValues)
{
Expand All @@ -206,18 +144,7 @@ public function setAllowedValues(array $allowedValues)
}

/**
* Adds allowed values for a list of options.
*
* The values are merged with the allowed values defined previously.
*
* @param array $allowedValues A list of option names as keys and arrays
* with values acceptable for that option as
* values.
*
* @return OptionsResolver The resolver instance.
*
* @throws InvalidOptionsException If an option has not been defined for
* which an allowed value is set.
* {@inheritdoc}
*/
public function addAllowedValues(array $allowedValues)
{
Expand All @@ -229,63 +156,31 @@ public function addAllowedValues(array $allowedValues)
}

/**
* Sets allowed types for a list of options.
*
* @param array $allowedTypes A list of option names as keys and type
* names passed as string or array as values.
*
* @return OptionsResolver The resolver instance.
*
* @throws InvalidOptionsException If an option has not been defined for
* which an allowed type is set.
* {@inheritdoc}
*/
public function setAllowedTypes(array $allowedTypes)
{
$this->validateOptionNames(array_keys($allowedTypes));
$this->validateOptionsExistence($allowedTypes);

$this->allowedTypes = array_replace($this->allowedTypes, $allowedTypes);

return $this;
}

/**
* Adds allowed types for a list of options.
*
* The types are merged with the allowed types defined previously.
*
* @param array $allowedTypes A list of option names as keys and type
* names passed as string or array as values.
*
* @return OptionsResolver The resolver instance.
*
* @throws InvalidOptionsException If an option has not been defined for
* which an allowed type is set.
* {@inheritdoc}
*/
public function addAllowedTypes(array $allowedTypes)
{
$this->validateOptionNames(array_keys($allowedTypes));
$this->validateOptionsExistence($allowedTypes);

$this->allowedTypes = array_merge_recursive($this->allowedTypes, $allowedTypes);

return $this;
}

/**
* Sets filters that are applied on resolved options.
*
* The filters should be closures with the following signature:
*
* <code>
* function (Options $options, $value)
* </code>
*
* The second parameter passed to the closure is the value of
* the option.
*
* The closure should return the filtered value.
*
* @param array $filters
* @return OptionsResolver
* {@inheritdoc}
*/
public function setFilters(array $filters)
{
Expand All @@ -297,47 +192,23 @@ public function setFilters(array $filters)
}

/**
* Returns whether an option is known.
*
* An option is known if it has been passed to either {@link setDefaults()},
* {@link setRequired()} or {@link setOptional()} before.
*
* @param string $option The name of the option.
* @return Boolean Whether the option is known.
* {@inheritdoc}
*/
public function isKnown($option)
{
return isset($this->knownOptions[$option]);
}

/**
* Returns whether an option is required.
*
* An option is required if it has been passed to {@link setRequired()},
* but not to {@link setDefaults()}. That is, the option has been declared
* as required and no default value has been set.
*
* @param string $option The name of the option.
* @return Boolean Whether the option is required.
* {@inheritdoc}
*/
public function isRequired($option)
{
return isset($this->requiredOptions[$option]);
}

/**
* Returns the combination of the default and the passed options.
*
* @param array $options The custom option values.
*
* @return array A list of options and their values.
*
* @throws InvalidOptionsException If any of the passed options has not
* been defined or does not contain an
* allowed value.
* @throws MissingOptionsException If a required option is missing.
* @throws OptionDefinitionException If a cyclic dependency is detected
* between two lazy options.
* {@inheritdoc}
*/
public function resolve(array $options)
{
Expand Down

0 comments on commit dc2fa9d

Please sign in to comment.