8000 [OptionsResolver] support array of instance validation by EVODelavega · Pull Request #17032 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[OptionsResolver] support array of instance validation #17032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 22 commits into from
Closed

[OptionsResolver] support array of instance validation #17032

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d4de104
Suggested fix for issue #15524
Sep 2, 2015
82f825c
Fix style issues (apply patch)
Sep 2, 2015
c42c1f4
Remove unused variable from method call
Sep 2, 2015
3609d44
Fix recursive call + add simple testcase
Sep 2, 2015
6b1c230
Fix coding style
Sep 2, 2015
0194c25
Add 2 successful testcases
Sep 2, 2015
ca21329
Fix coding style
Sep 2, 2015
6b639cf
Conform to coding standards (PSR-2 => elseif)
EVODelavega Sep 2, 2015
8ff6aac
Add early returns in response to review
EVODelavega Sep 2, 2015
4ab68e0
Add whitespace before return statement
EVODelavega Sep 2, 2015
2685d2e
Format complex types in exception message, too
EVODelavega Sep 8, 2015
1fc5ddb
Fix coding style
EVODelavega Sep 8, 2015
0368246
Fix typo
EVODelavega Sep 8, 2015
82d463f
Format the exception message clearer: in case complex typed arrays co…
EVODelavega Sep 8, 2015
5616371
Coding style -> new + ()
EVODelavega Sep 8, 2015
7c2613e
Add another test case, mainly to force another build
EVODelavega Sep 8, 2015
33b1e9c
Fix indentation
EVODelavega Sep 8, 2015
4579f17
Add document feature in changelog
EVODelavega Sep 11, 2015
b189757
Use mb_substr instead of substr
EVODelavega Dec 16, 2015
84c8954
Update changelog -> merge master => target is now 3.1
EVODelavega Dec 16, 2015
c79c17b
Fix typo in docblock
EVODelavega Dec 18, 2015
c03ccdf
Fix dataprovider annotation -> rebase conflict
EVODelavega Dec 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add early returns in response to review
  • Loading branch information
@EVODelavega
EVODelavega committed Dec 21, 2015
commit 8ff6aac9cd933c434aea4d4523b2640eb7bb1eeb
35 changes: 17 additions & 18 deletions src/Symfony/Component/OptionsResolver/OptionsResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,29 +895,28 @@ public function offsetGet($option)
*/
private function verifyAllowedType($type, $value)
{
$valid = false;

$type = isset(self::$typeAliases[$type]) ? self::$typeAliases[$type] : $type;

if (substr($type, -2) === '[]') {
if (is_array($value)) {
$subType = substr($type, 0, -2);
foreach ($value as $v) {
$valid = $this->verifyAllowedType($subType, $v);
if (!$valid) {
break;
}
}
//allowed type is typed array
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a space after // (same for the other comments)

if (!is_array($value)) {
return false;
}
} elseif (function_exists($isFunction = 'is_'.$type)) {
if ($isFunction($value)) {
$valid = true;
$subType = substr($type, 0, -2);
foreach ($value as $v) {
//recursive call -> check subtype
if (!$this->verifyAllowedType($subType, $v)) {
return false;
}
}
} elseif ($value instanceof $type) {
$valid = true;
//value was array, subtypes all matched -> allowed type OK
return true;
}

return $valid;
$type = isset(self::$typeAliases[$type]) ? self::$typeAliases[$type] : $type;

if (function_exists($isFunction = 'is_'.$type)) {
return $isFunction($value);
}
return ($value instanceof $type);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The parenthesis can be removed.

}

/**
Expand Down
0