Update optional rule to check if the field is present

Author: natanfelles

src/Languages/en/validation.php

@@ -49,5 +49,5 @@
     'minDim' => 'The {field} field requires an image having the minimum dimensions of {0} in width and {1} in height.',
     'dim' => 'The {field} field requires an image with the exact dimensions of {0} in width and {1} in height.',
     'specialChar' => 'The {field} field requires special characters.',
-    'optional' => 'The {field} field is optional. If empty, validation passes.',
+    'optional' => 'The {field} field is optional. If not present, validation passes.',
 ];

src/Languages/es/validation.php

@@ -49,5 +49,5 @@
     'minDim' => 'El campo {field} requiere una imagen que tenga las dimensiones mínimas de {0} de ancho y {1} de alto.',
     'dim' => 'El campo {field} requiere una imagen con las dimensiones exactas de {0} de ancho y {1} de alto.',
     'specialChar' => 'El campo {field} requiere caracteres especiales.',
-    'optional' => 'El campo {field} es opcional. Si está vacío, la validación pasa.',
+    'optional' => 'El campo {field} es opcional. Si no está presente, pasa la validación.',
 ];

src/Languages/pt-br/validation.php

@@ -49,5 +49,5 @@
     'minDim' => 'O campo {field} requer uma imagem que possua as dimensões mínimas de {0} de largura e {1} de altura.',
     'dim' => 'O campo {field} requer uma imagem com as dimensões exatas de {0} de largura e {1} de altura.',
     'specialChar' => 'O campo {field} requer caracteres especiais.',
-    'optional' => 'O campo {field} é opcional. Se estiver vazio, a validação passa.',
+    'optional' => 'O campo {field} é opcional. Se não estiver presente, a validação passa.',
 ];

src/Validation.php

@@ -467,7 +467,7 @@ protected function validateField(string $field, array $rules, array $data) : boo
         foreach ($rules as $key => $rule) {
             if ($rule['rule'] === 'optional') {
                 $ruleKey = $key;
-                if (empty($data[$field])) {
+                if ( ! \array_key_exists($field, $data)) {
                     return true;
                 }
             }

tests/ValidationTest.php

@@ -477,6 +477,7 @@ public function testError() : void
     public function testOptional() : void
     {
         $this->validation->setRule('email', 'email');
+        $this->validation->setRule('email2', 'optional|email');
         $this->validation->setRule('other', 'email');
         $this->validation->setRule('name', 'optional|minLength:5');
         $status = $this->validation->validate([
@@ -485,19 +486,26 @@ public function testOptional() : void
         ]);
         self::assertTrue($status);
         self::assertNull($this->validation->getError('email'));
+        self::assertNull($this->validation->getError('email2'));
         self::assertNull($this->validation->getError('other'));
         self::assertNull($this->validation->getError('name'));
     }
 
     public function testOptionalAsLastRule() : void
     {
         $this->validation->setRule('email', 'email|optional');
+        $this->validation->setRule('email2', 'email|minLength:5|optional');
         $this->validation->setRule('name', 'minLength:5|optional');
         $status = $this->validation->validate([
+            'email' => '',
             'name' => 'Jon',
         ]);
         self::assertFalse($status);
-        self::assertNull($this->validation->getError('email'));
+        self::assertStringContainsString(
+            'The email field requires a valid email address.',
+            $this->validation->getError('email')
+        );
+        self::assertNull($this->validation->getError('email2'));
         self::assertStringContainsString(
             'The name field requires 5 or more characters in length.',
             $this->validation->getError('name')