Fixed Validation example, more tests, fix code style

acelot · Oct 4, 2023 · e4599eb · e4599eb
1 parent 51e9fa5
commit e4599eb
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 12 deletions.
diff --git a/integrations/respect-validation/README.md b/integrations/respect-validation/README.md
@@ -61,6 +61,11 @@ $result = marshalArray(
         a::get('[email]'),
         a::validate(v::email()),
         a::ifValidationFailed(a::ignore())
+    )),
+    a::toKey('phone', a::pipe(
+        a::get('[phone]'),
+        a::validate(v::phone()),
+        a::ifValidationFailed(a::ignore())
     ))
 );
 

diff --git a/integrations/respect-validation/tests/Functional/validateTest.php b/integrations/respect-validation/tests/Functional/validateTest.php
@@ -14,8 +14,8 @@ public function testFunction(): void
     {
         $source = [
             'id' => 10,
-            'email' => '[email protected]',
-            'phone' => '+1-111-111-1111',
+            'email' => 'some@@email.com',
+            'phone' => '000+1-111-111-1111',
             'ip' => '127.0.0.256'
         ];
 
@@ -26,11 +26,13 @@ public function testFunction(): void
             $source,
             a::toKey('email', a::pipe(
                 a::get('[email]'),
-                a::validate(v::email()),
+                a::validate(v::email()->setName('E-mail')),
+                a::ifValidationFailed(a::value('[email protected]')),
             )),
             a::toKey('phone', a::pipe(
                 a::get('[phone]'),
-                a::validate(v::phone()),
+                a::validate(v::phone()->setName('Phone')),
+                a::ifValidationFailed(a::ignore())
             )),
             a::toKey('ip', a::pipe(
                 a::get('[ip]'),
@@ -41,19 +43,28 @@ public function testFunction(): void
 
         self::assertSame(
             [
-                'email' => '[email protected]',
-                'phone' => '+1-111-111-1111',
+                'email' => '[email protected]',
                 'ip' => '127.0.0.1',
             ],
             $result
         );
 
+        $validationContext = $context->get(ValidationContextInterface::class);
+
         self::assertTrue($context->has(ValidationContextInterface::class));
-        self::assertTrue($context->get(ValidationContextInterface::class)->hasErrors());
-        self::assertCount(1, $context->get(ValidationContextInterface::class)->getErrors());
+        self::assertTrue($validationContext->hasErrors());
+        self::assertCount(3, $validationContext->getErrors());
         self::assertSame(
-            ['IP Address' => 'IP Address must be an IP address'],
-            $context->get(ValidationContextInterface::class)->getErrors()[0]->getMessages()
+            [
+                'E-mail' => 'E-mail must be valid email',
+                'Phone' => 'Phone must be a valid telephone number',
+                'IP Address' => 'IP Address must be an IP address',
+            ],
+            [
+                ...$validationContext->getErrors()[0]->getMessages(),
+                ...$validationContext->getErrors()[1]->getMessages(),
+                ...$validationContext->getErrors()[2]->getMessages(),
+            ]
         );
     }
 }
diff --git a/src/Api/Helpers.php b/src/Api/Helpers.php
@@ -92,7 +92,7 @@ public function trimString(string $characters = " \t\n\r\0\x0B"): Pipeline
 
     public function toBool(): Call
     {
-        return  new Call('boolval');
+        return new Call('boolval');
     }
 
     public function toFloat(): Pipeline
@@ -121,7 +121,7 @@ public function toString(): Pipeline
 
     public function toArray(): Call
     {
-        return  new Call(function ($value) {
+        return new Call(function ($value) {
             if ($value instanceof Traversable) {
                 return iterator_to_array($value);
             }