72c72
< 	 * @param array $validationOptions Options for the validator
---
> 	 * @param array $options Options for the validator
75,76c75,76
< 	public function __construct($validationOptions = array()) {
< 		$this->options = $validationOptions;
---
> 	public function __construct(array $options = array()) {
> 		$this->setOptions($options);
112c112,139
< 		$this->options = $options;
---
> 		// TODO: move code to constructor when removing this setter
> 		
> 		// check for options given but not supported
> 		if (($unsupportedOptions = array_diff_key($options, $this->supportedOptions)) !== array()) {
> 			throw new \TYPO3\CMS\Extbase\Validation\Exception\InvalidValidationOptionsException('Unsupported validation option(s) found: ' . implode(', ', array_keys($unsupportedOptions)), 1339079804);
> 		}
> 
> 		// check for required options being set
> 		array_walk(
> 			$this->supportedOptions,
> 			function($supportedOptionData, $supportedOptionName, $options) {
> 				if (isset($supportedOptionData[3]) && !array_key_exists($supportedOptionName, $options)) {
> 					throw new \TYPO3\CMS\Extbase\Validation\Exception\InvalidValidationOptionsException('Required validation option not set: ' . $supportedOptionName, 1339163922);
> 				}
> 			},
> 			$options
> 		);
> 
> 		// merge with default values
> 		$this->options = array_merge(
> 			array_map(
> 				function ($value) {
> 					return $value[0];
> 				},
> 				$this->supportedOptions
> 			),
> 			$options
> 		);