Skip to content

Commit

Permalink
feature #11501 [OptionsResolver] Changed order of validation (WouterJ)
Browse files Browse the repository at this point in the history
This PR was merged into the 2.6-dev branch.

Discussion
----------

[OptionsResolver] Changed order of validation

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | yes
| BC breaks?    | no (I don't think it causes breaks)
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        | -

It's both a new feature and bug fix actually... I let @fabpot decide on this one.

<s>@sstok can you please confirm if this fixes #4500 ? I couldn't fully follow
that ticket and then I discovered this error. If not, can you please add more
information to your ticket about the problems?</s>

Commits
-------

a4f208b Changed order of validation
  • Loading branch information
fabpot committed Aug 31, 2014
2 parents 77aa12f + a4f208b commit 0f59bca
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/Symfony/Component/OptionsResolver/OptionsResolver.php
Expand Up @@ -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;
}
Expand Down

0 comments on commit 0f59bca

Please sign in to comment.