19
19
use Zend \InputFilter \Exception \RuntimeException ;
20
20
use Zend \InputFilter \Input ;
21
21
use Zend \InputFilter \InputFilter ;
22
- use Zend \Validator \EmailAddress ;
22
+ use Zend \Validator \Digits ;
23
23
use Zend \Validator \NotEmpty ;
24
24
25
25
/**
@@ -512,10 +512,10 @@ public function testCollectionValidationDoesNotReuseMessagesBetweenInputs()
512
512
{
513
513
$ inputFilter = new InputFilter ();
514
514
$ inputFilter ->add ([
515
- 'name ' => 'email ' ,
515
+ 'name ' => 'phone ' ,
516
516
'required ' => true ,
517
517
'validators ' => [
518
- ['name ' => EmailAddress ::class],
518
+ ['name ' => Digits ::class],
519
519
['name ' => NotEmpty::class],
520
520
],
521
521
]);
@@ -535,7 +535,7 @@ public function testCollectionValidationDoesNotReuseMessagesBetweenInputs()
535
535
'name ' => 'Tom ' ,
536
536
],
537
537
[
538
- 'email ' => 'tom@tom ' ,
538
+ 'phone ' => 'tom@tom ' ,
539
539
'name ' => 'Tom ' ,
540
540
],
541
541
]);
@@ -547,27 +547,25 @@ public function testCollectionValidationDoesNotReuseMessagesBetweenInputs()
547
547
$ this ->assertFalse ($ isValid );
548
548
$ this ->assertCount (2 , $ messages );
549
549
550
- $ this ->assertArrayHasKey ('email ' , $ messages [0 ]);
551
- $ this ->assertCount (1 , $ messages [0 ]['email ' ]);
552
- $ this ->assertContains ('Value is required and can \'t be empty ' , $ messages [0 ]['email ' ]);
550
+ $ this ->assertArrayHasKey ('phone ' , $ messages [0 ]);
551
+ $ this ->assertCount (1 , $ messages [0 ]['phone ' ]);
552
+ $ this ->assertContains ('Value is required and can \'t be empty ' , $ messages [0 ]['phone ' ]);
553
553
554
- $ this ->assertArrayHasKey ('email ' , $ messages [1 ]);
555
- $ this ->assertCount (3 , $ messages [1 ]['email ' ]);
556
- $ this ->assertNotContains ('Value is required and can \'t be empty ' , $ messages [1 ]['email ' ]);
557
- $ this ->assertContains ('\'tom \' is not a valid hostname for the email address ' , $ messages [1 ]['email ' ]);
558
- $ this ->assertContains ('The input does not match the expected structure for a DNS hostname ' , $ messages [1 ]['email ' ]);
559
- $ this ->assertContains ('The input appears to be a local network name but local network names are not allowed ' , $ messages [1 ]['email ' ]);
554
+ $ this ->assertArrayHasKey ('phone ' , $ messages [1 ]);
555
+ $ this ->assertCount (1 , $ messages [1 ]['phone ' ]);
556
+ $ this ->assertNotContains ('Value is required and can \'t be empty ' , $ messages [1 ]['phone ' ]);
557
+ $ this ->assertContains ('The input must contain only digits ' , $ messages [1 ]['phone ' ]);
560
558
// @codingStandardsIgnoreEnd
561
559
}
562
560
563
561
public function testCollectionValidationUsesCustomInputErrorMessages ()
564
562
{
565
563
$ inputFilter = new InputFilter ();
566
564
$ inputFilter ->add ([
567
- 'name ' => 'email ' ,
565
+ 'name ' => 'phone ' ,
568
566
'required ' => true ,
569
567
'validators ' => [
570
- ['name ' => EmailAddress ::class],
568
+ ['name ' => Digits ::class],
571
569
['name ' => NotEmpty::class],
572
570
],
573
571
'error_message ' => 'CUSTOM ERROR MESSAGE ' ,
@@ -588,7 +586,7 @@ public function testCollectionValidationUsesCustomInputErrorMessages()
588
586
'name ' => 'Tom ' ,
589
587
],
590
588
[
591
- 'email ' => 'tom@tom ' ,
589
+ 'phone ' => 'tom@tom ' ,
592
590
'name ' => 'Tom ' ,
593
591
],
594
592
]);
@@ -600,14 +598,14 @@ public function testCollectionValidationUsesCustomInputErrorMessages()
600
598
$ this ->assertFalse ($ isValid );
601
599
$ this ->assertCount (2 , $ messages );
602
600
603
- $ this ->assertArrayHasKey ('email ' , $ messages [0 ]);
604
- $ this ->assertCount (1 , $ messages [0 ]['email ' ]);
605
- $ this ->assertContains ('CUSTOM ERROR MESSAGE ' , $ messages [0 ]['email ' ]);
606
- $ this ->assertNotContains ('Value is required and can \'t be empty ' , $ messages [0 ]['email ' ]);
601
+ $ this ->assertArrayHasKey ('phone ' , $ messages [0 ]);
602
+ $ this ->assertCount (1 , $ messages [0 ]['phone ' ]);
603
+ $ this ->assertContains ('CUSTOM ERROR MESSAGE ' , $ messages [0 ]['phone ' ]);
604
+ $ this ->assertNotContains ('Value is required and can \'t be empty ' , $ messages [0 ]['phone ' ]);
607
605
608
- $ this ->assertArrayHasKey ('email ' , $ messages [1 ]);
609
- $ this ->assertCount (1 , $ messages [1 ]['email ' ]);
610
- $ this ->assertContains ('CUSTOM ERROR MESSAGE ' , $ messages [1 ]['email ' ]);
606
+ $ this ->assertArrayHasKey ('phone ' , $ messages [1 ]);
607
+ $ this ->assertCount (1 , $ messages [1 ]['phone ' ]);
608
+ $ this ->assertContains ('CUSTOM ERROR MESSAGE ' , $ messages [1 ]['phone ' ]);
611
609
}
612
610
613
611
public function testDuplicatedErrorMessages ()
0 commit comments