eee
This commit is contained in:
+7
-18
@@ -49,30 +49,17 @@ class Validator extends BaseValidator
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @param ModelInterface $model
|
* @param ModelInterface $model
|
||||||
* @param $field
|
* @param array $fields
|
||||||
* @param $rules
|
* @param array $rules
|
||||||
* @return $this
|
* @return $this
|
||||||
*/
|
*/
|
||||||
public function make(ModelInterface $model, array $fields, array $rules): static
|
public function make(ModelInterface $model, array $fields, array $rules): static
|
||||||
{
|
{
|
||||||
foreach ($fields as $field) {
|
foreach ($fields as $field) {
|
||||||
$this->createRule($field, $rules, $model);
|
|
||||||
}
|
|
||||||
return $this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param string $field
|
|
||||||
* @param array $rule
|
|
||||||
* @param ModelInterface $model
|
|
||||||
* @throws \Exception
|
|
||||||
*/
|
|
||||||
public function createRule(string $field, array $rule, ModelInterface $model): void
|
|
||||||
{
|
|
||||||
if (!isset($this->validators[$field])) {
|
if (!isset($this->validators[$field])) {
|
||||||
$this->validators[$field] = [];
|
$this->validators[$field] = [];
|
||||||
}
|
}
|
||||||
foreach ($rule as $key => $val) {
|
foreach ($rules as $key => $val) {
|
||||||
if (is_numeric($key) && method_exists($model, $val)) {
|
if (is_numeric($key) && method_exists($model, $val)) {
|
||||||
$this->validators[$field][] = [$model, $val];
|
$this->validators[$field][] = [$model, $val];
|
||||||
} else {
|
} else {
|
||||||
@@ -80,14 +67,16 @@ class Validator extends BaseValidator
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param array $defined
|
* @param ModelInterface $model
|
||||||
* @param $key
|
* @param $key
|
||||||
* @param $val
|
* @param $val
|
||||||
* @return array
|
* @return array
|
||||||
* @throws \Exception
|
* @throws
|
||||||
*/
|
*/
|
||||||
protected function mapGen(ModelInterface $model, $key, $val): array
|
protected function mapGen(ModelInterface $model, $key, $val): array
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user