From 6d2bea0ef5160b95ebd695c796fb59ba67e7fa6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Tue, 8 Jun 2021 10:30:56 +0200 Subject: [PATCH] fix validation on crud models --- app/Traits/IsCrudModel.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Traits/IsCrudModel.php b/app/Traits/IsCrudModel.php index 3adfc96..af8dff3 100644 --- a/app/Traits/IsCrudModel.php +++ b/app/Traits/IsCrudModel.php @@ -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);