Browse Source

Update Email validator

Visman 3 years ago
parent
commit
45660f945f
1 changed files with 3 additions and 9 deletions
  1. 3 9
      app/Models/Validators/Email.php

+ 3 - 9
app/Models/Validators/Email.php

@@ -18,15 +18,8 @@ class Email extends RulesValidator
 {
     /**
      * Проверяет email
-     *
-     * @param Validator $v
-     * @param string $email
-     * @param string $attrs
-     * @param mixed $originalUser
-     *
-     * @return null|string
      */
-    public function email(Validator $v, $email, $attrs, $originalUser): ?string
+    public function email(Validator $v, string $email, string $attrs, /* mixed */ $originalUser): ?string
     {
         // поле отсутствует
         if ($v->noValue($email)) {
@@ -135,7 +128,8 @@ class Email extends RulesValidator
         if (
             $ok
             && $originalUser instanceof User
-            && $originalUser->id < 1
+            && null === $originalUser->id
+            && null === $originalUser->group_id
             && $user instanceof User
             && ! $user->isGuest
         ) {