fix validation on crud models
This commit is contained in:
parent
9a568c9ea8
commit
6d2bea0ef5
1 changed files with 5 additions and 3 deletions
|
|
@ -249,7 +249,7 @@ trait IsCrudModel
|
|||
print_r($prop, true) // phpcs:ignore Squiz.PHP.DiscouragedFunctions.Found
|
||||
));
|
||||
}
|
||||
$prop = \array_merge(self::$schemaCrud, $prop);
|
||||
$prop = array_merge_recursive_distinct(self::$schemaCrud, $prop);
|
||||
|
||||
// Auto label
|
||||
$prop['label'] = $prop['label'] ?? ucfirst($name);
|
||||
|
|
@ -259,8 +259,10 @@ trait IsCrudModel
|
|||
// Email auto rule
|
||||
switch ($prop['type']) {
|
||||
case CrudType::email():
|
||||
$prop['validate'] = is_array($prop['validate']) ? $prop['rules'] : [];
|
||||
$prop['validate'][] = 'email:rfc,dns';
|
||||
$prop['validate'] = is_array($prop['validate']) ? $prop['validate'] : [];
|
||||
if (!array_search('email:rfc,dns', $prop['validate'])) {
|
||||
$prop['validate'][] = 'email:rfc,dns';
|
||||
}
|
||||
break;
|
||||
}
|
||||
self::assertNullableIscorrect($prop);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue