Skip to content

Improvements to callback rule #162

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improvements to callback rule #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8535eaa
update(callback): Use rule key as rule name (#1)
marcusorjames Aug 26, 2024
bc41eb9
feature(rule): Allow public access to validation array (#2)
marcusorjames Aug 26, 2024
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
5 changes: 5 additions & 0 deletions src/Rule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ public function setValidation(Validation $validation)
$this->validation = $validation;
}

public function getValidation()
{
return $this->validation;
}

/**
* Set key
*
Expand Down
5 changes: 4 additions & 1 deletion src/Validation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,13 +489,16 @@ protected function resolveRules($rules): array
}
$params = [];


if (is_string($rule)) {
list($rulename, $params) = $this->parseRule($rule);
$validator = call_user_func_array($validatorFactory, array_merge([$rulename], $params));
} elseif ($rule instanceof Rule) {
$validator = $rule;
} elseif ($rule instanceof Closure) {
$validator = call_user_func_array($validatorFactory, ['callback', $rule]);
$ruleName = is_string($i) ? $i : 'callback';
$validator = call_user_func_array($validatorFactory, ['callback', $rule ]);
$validator->setKey($ruleName);
} else {
$ruleName = is_object($rule) ? get_class($rule) : gettype($rule);
$message = "Rule must be a string, Closure or '".Rule::class."' instance. ".$ruleName." given";
Expand Down