Changed order of validation

wouterj · wouterj · commit a4f208b95b60 · 2014-07-28T23:12:49.000+02:00
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -230,8 +230,8 @@ public function resolve(array $options = array())
         // Resolve options
         $resolvedOptions = $combinedOptions->all();
 
-        $this->validateOptionValues($resolvedOptions);
         $this->validateOptionTypes($resolvedOptions);
+        $this->validateOptionValues($resolvedOptions);
 
         return $resolvedOptions;
     }

Original file line number	Diff line number	Diff line change
`@@ -230,8 +230,8 @@ public function resolve(array $options = array())`
`230`	`230`	`// Resolve options`
`231`	`231`	`$resolvedOptions = $combinedOptions->all();`
`232`	`232`
`233`		`- $this->validateOptionValues($resolvedOptions);`
`234`	`233`	`$this->validateOptionTypes($resolvedOptions);`
	`234`	`+ $this->validateOptionValues($resolvedOptions);`
`235`	`235`
`236`	`236`	`return $resolvedOptions;`
`237`	`237`	`}`