Skip to content
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

Jump to bottom

[5.4] Allow Validator extension to use array-style callable #18399

Merged
merged 2 commits into from
Mar 19, 2017
Merged

[5.4] Allow Validator extension to use array-style callable #18399

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd55e21
Allow Validator extension to use array-style callable
adamthehutt Mar 17, 2017
bb352f6
Update Validator.php
adamthehutt Mar 18, 2017
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
2 changes: 1 addition & 1 deletion src/Illuminate/Validation/Validator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,7 @@ protected function callExtension($rule, $parameters)
{
$callback = $this->extensions[$rule];

if ($callback instanceof Closure) {
if ($callback instanceof Closure || is_array($callback)) {
Copy link

Choose a reason for hiding this comment

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

I believe you can change this line into something like this: if (is_callable($callback)) {. And it will achieve the same result.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point. I'll update the pull request.

return call_user_func_array($callback, $parameters);
} elseif (is_string($callback)) {
return $this->callClassBasedExtension($callback, $parameters);
Expand Down