@@ -411,34 +411,6 @@ public function testMergeRetainsAllowEmptyFlag()
411
411
$ this ->assertTrue ($ input2 ->allowEmpty ());
412
412
}
413
413
414
- /**
415
- * @group 7445
416
- */
417
- public function testInputIsValidWhenUsingSetRequiredAtStart ()
418
- {
419
- $ input = new Input ();
420
- $ input ->setName ('foo ' )
421
- ->setRequired (false )
422
- ->setAllowEmpty (false )
423
- ->setContinueIfEmpty (false );
424
-
425
- $ this ->assertTrue ($ input ->isValid ());
426
- }
427
-
428
- /**
429
- * @group 7445
430
- */
431
- public function testInputIsValidWhenUsingSetRequiredAtEnd ()
432
- {
433
- $ input = new Input ();
434
- $ input ->setName ('foo ' )
435
- ->setAllowEmpty (false )
436
- ->setContinueIfEmpty (false )
437
- ->setRequired (false );
438
-
439
- $ this ->assertTrue ($ input ->isValid ());
440
- }
441
-
442
414
public function whenRequiredAndAllowEmptyAndNotContinueIfEmptyValidatorsAreNotRun ()
443
415
{
444
416
$ validator = new Validator \Callback (function ($ value ) {
@@ -451,19 +423,10 @@ public function whenRequiredAndAllowEmptyAndNotContinueIfEmptyValidatorsAreNotRu
451
423
->setContinueIfEmpty (false )
452
424
->getValidatorChain ()->attach ($ validator );
453
425
454
- $ requiredLast = new Input ('foo ' );
455
- $ requiredLast ->setAllowEmpty (true )
456
- ->setContinueIfEmpty (false )
457
- ->setRequired (true )
458
- ->getValidatorChain ()->attach ($ validator );
459
-
460
426
return [
461
427
'required-first-null ' => [$ requiredFirst , null ],
462
- 'required-last-null ' => [$ requiredLast , null ],
463
428
'required-first-empty ' => [$ requiredFirst , '' ],
464
- 'required-last-empty ' => [$ requiredLast , '' ],
465
429
'required-first-array ' => [$ requiredFirst , []],
466
- 'required-last-array ' => [$ requiredLast , []],
467
430
];
468
431
}
469
432
@@ -494,42 +457,22 @@ public function whenRequiredAndAllowEmptyAndContinueIfEmptyValidatorsAreRun()
494
457
});
495
458
496
459
$ requiredFirstInvalid = new Input ('foo ' );
460
+ $ requiredFirstInvalid ->getValidatorChain ()->attach ($ alwaysInvalid );
497
461
$ requiredFirstValid = new Input ('foo ' );
462
+ $ requiredFirstValid ->getValidatorChain ()->attach ($ emptyIsValid );
498
463
foreach ([$ requiredFirstValid , $ requiredFirstInvalid ] as $ input ) {
499
464
$ input ->setRequired (true )
500
465
->setAllowEmpty (true )
501
466
->setContinueIfEmpty (true );
502
467
}
503
468
504
- $ requiredLastInvalid = new Input ('foo ' );
505
- $ requiredLastValid = new Input ('foo ' );
506
- foreach ([$ requiredLastValid , $ requiredLastInvalid ] as $ input ) {
507
- $ input ->setAllowEmpty (true )
508
- ->setContinueIfEmpty (true )
509
- ->setRequired (true );
510
- }
511
-
512
- foreach ([$ requiredFirstValid , $ requiredLastValid ] as $ input ) {
513
- $ input ->getValidatorChain ()->attach ($ emptyIsValid );
514
- }
515
-
516
- foreach ([$ requiredFirstInvalid , $ requiredLastInvalid ] as $ input ) {
517
- $ input ->getValidatorChain ()->attach ($ alwaysInvalid );
518
- }
519
-
520
469
return [
521
470
'required-first-null-valid ' => [$ requiredFirstValid , null , 'assertTrue ' ],
522
471
'required-first-null-invalid ' => [$ requiredFirstInvalid , null , 'assertFalse ' ],
523
- 'required-last-null-valid ' => [$ requiredLastValid , null , 'assertTrue ' ],
524
- 'required-last-null-invalid ' => [$ requiredLastInvalid , null , 'assertFalse ' ],
525
472
'required-first-empty-valid ' => [$ requiredFirstValid , '' , 'assertTrue ' ],
526
473
'required-first-empty-invalid ' => [$ requiredFirstInvalid , '' , 'assertFalse ' ],
527
- 'required-last-empty-valid ' => [$ requiredLastValid , '' , 'assertTrue ' ],
528
- 'required-last-empty-invalid ' => [$ requiredLastInvalid , '' , 'assertFalse ' ],
529
474
'required-first-array-valid ' => [$ requiredFirstValid , [], 'assertTrue ' ],
530
475
'required-first-array-invalid ' => [$ requiredFirstInvalid , [], 'assertFalse ' ],
531
- 'required-last-array-valid ' => [$ requiredLastValid , [], 'assertTrue ' ],
532
- 'required-last-array-invalid ' => [$ requiredLastInvalid , [], 'assertFalse ' ],
533
476
];
534
477
}
535
478
@@ -555,19 +498,10 @@ public function whenRequiredAndNotAllowEmptyAndNotContinueIfEmptyValidatorsAreNo
555
498
->setContinueIfEmpty (false )
556
499
->getValidatorChain ()->attach ($ validator );
557
500
558
- $ requiredLast = new Input ('foo ' );
559
- $ requiredLast ->setAllowEmpty (false )
560
- ->setContinueIfEmpty (false )
561
- ->setRequired (true )
562
- ->getValidatorChain ()->attach ($ validator );
563
-
564
501
return [
565
502
'required-first-null ' => [$ requiredFirst , null ],
566
- 'required-last-null ' => [$ requiredLast , null ],
567
503
'required-first-empty ' => [$ requiredFirst , '' ],
568
- 'required-last-empty ' => [$ requiredLast , '' ],
569
504
'required-first-array ' => [$ requiredFirst , []],
570
- 'required-last-array ' => [$ requiredLast , []],
571
505
];
572
506
}
573
507
@@ -598,42 +532,22 @@ public function whenRequiredAndNotAllowEmptyAndContinueIfEmptyValidatorsAreRun()
598
532
});
599
533
600
534
$ requiredFirstInvalid = new Input ('foo ' );
535
+ $ requiredFirstInvalid ->getValidatorChain ()->attach ($ alwaysInvalid );
601
536
$ requiredFirstValid = new Input ('foo ' );
537
+ $ requiredFirstValid ->getValidatorChain ()->attach ($ emptyIsValid );
602
538
foreach ([$ requiredFirstValid , $ requiredFirstInvalid ] as $ input ) {
603
539
$ input ->setRequired (true )
604
540
->setAllowEmpty (false )
605
541
->setContinueIfEmpty (true );
606
542
}
607
543
608
- $ requiredLastInvalid = new Input ('foo ' );
609
- $ requiredLastValid = new Input ('foo ' );
610
- foreach ([$ requiredLastValid , $ requiredLastInvalid ] as $ input ) {
611
- $ input ->setAllowEmpty (false )
612
- ->setContinueIfEmpty (true )
613
- ->setRequired (true );
614
- }
615
-
616
- foreach ([$ requiredFirstValid , $ requiredLastValid ] as $ input ) {
617
- $ input ->getValidatorChain ()->attach ($ emptyIsValid );
618
- }
619
-
620
- foreach ([$ requiredFirstInvalid , $ requiredLastInvalid ] as $ input ) {
621
- $ input ->getValidatorChain ()->attach ($ alwaysInvalid );
622
- }
623
-
624
544
return [
625
545
'required-first-null-valid ' => [$ requiredFirstValid , null , 'assertTrue ' ],
626
546
'required-first-null-invalid ' => [$ requiredFirstInvalid , null , 'assertFalse ' ],
627
- 'required-last-null-valid ' => [$ requiredLastValid , null , 'assertTrue ' ],
628
- 'required-last-null-invalid ' => [$ requiredLastInvalid , null , 'assertFalse ' ],
629
547
'required-first-empty-valid ' => [$ requiredFirstValid , '' , 'assertTrue ' ],
630
548
'required-first-empty-invalid ' => [$ requiredFirstInvalid , '' , 'assertFalse ' ],
631
- 'required-last-empty-valid ' => [$ requiredLastValid , '' , 'assertTrue ' ],
632
- 'required-last-empty-invalid ' => [$ requiredLastInvalid , '' , 'assertFalse ' ],
633
549
'required-first-array-valid ' => [$ requiredFirstValid , [], 'assertTrue ' ],
634
550
'required-first-array-invalid ' => [$ requiredFirstInvalid , [], 'assertFalse ' ],
635
- 'required-last-array-valid ' => [$ requiredLastValid , [], 'assertTrue ' ],
636
- 'required-last-array-invalid ' => [$ requiredLastInvalid , [], 'assertFalse ' ],
637
551
];
638
552
}
639
553
@@ -659,19 +573,10 @@ public function whenNotRequiredAndAllowEmptyAndNotContinueIfEmptyValidatorsAreNo
659
573
->setContinueIfEmpty (false )
660
574
->getValidatorChain ()->attach ($ validator );
661
575
662
- $ requiredLast = new Input ('foo ' );
663
- $ requiredLast ->setAllowEmpty (true )
664
- ->setContinueIfEmpty (false )
665
- ->setRequired (false )
666
- ->getValidatorChain ()->attach ($ validator );
667
-
668
576
return [
669
577
'required-first-null ' => [$ requiredFirst , null ],
670
- 'required-last-null ' => [$ requiredLast , null ],
671
578
'required-first-empty ' => [$ requiredFirst , '' ],
672
- 'required-last-empty ' => [$ requiredLast , '' ],
673
579
'required-first-array ' => [$ requiredFirst , []],
674
- 'required-last-array ' => [$ requiredLast , []],
675
580
];
676
581
}
677
582
@@ -697,19 +602,10 @@ public function whenNotRequiredAndNotAllowEmptyAndNotContinueIfEmptyValidatorsAr
697
602
->setContinueIfEmpty (false )
698
603
->getValidatorChain ()->attach ($ validator );
699
604
700
- $ requiredLast = new Input ('foo ' );
701
- $ requiredLast ->setAllowEmpty (false )
702
- ->setContinueIfEmpty (false )
703
- ->setRequired (false )
704
- ->getValidatorChain ()->attach ($ validator );
705
-
706
605
return [
707
606
'required-first-null ' => [$ requiredFirst , null ],
708
- 'required-last-null ' => [$ requiredLast , null ],
709
607
'required-first-empty ' => [$ requiredFirst , '' ],
710
- 'required-last-empty ' => [$ requiredLast , '' ],
711
608
'required-first-array ' => [$ requiredFirst , []],
712
- 'required-last-array ' => [$ requiredLast , []],
713
609
];
714
610
}
715
611
@@ -740,42 +636,22 @@ public function whenNotRequiredAndAllowEmptyAndContinueIfEmptyValidatorsAreRun()
740
636
});
741
637
742
638
$ requiredFirstInvalid = new Input ('foo ' );
639
+ $ requiredFirstInvalid ->getValidatorChain ()->attach ($ alwaysInvalid );
743
640
$ requiredFirstValid = new Input ('foo ' );
641
+ $ requiredFirstValid ->getValidatorChain ()->attach ($ emptyIsValid );
744
642
foreach ([$ requiredFirstValid , $ requiredFirstInvalid ] as $ input ) {
745
643
$ input ->setRequired (false )
746
644
->setAllowEmpty (true )
747
645
->setContinueIfEmpty (true );
748
646
}
749
647
750
- $ requiredLastInvalid = new Input ('foo ' );
751
- $ requiredLastValid = new Input ('foo ' );
752
- foreach ([$ requiredLastValid , $ requiredLastInvalid ] as $ input ) {
753
- $ input ->setAllowEmpty (true )
754
- ->setContinueIfEmpty (true )
755
- ->setRequired (false );
756
- }
757
-
758
- foreach ([$ requiredFirstValid , $ requiredLastValid ] as $ input ) {
759
- $ input ->getValidatorChain ()->attach ($ emptyIsValid );
760
- }
761
-
762
- foreach ([$ requiredFirstInvalid , $ requiredLastInvalid ] as $ input ) {
763
- $ input ->getValidatorChain ()->attach ($ alwaysInvalid );
764
- }
765
-
766
648
return [
767
649
'required-first-null-valid ' => [$ requiredFirstValid , null , 'assertTrue ' ],
768
650
'required-first-null-invalid ' => [$ requiredFirstInvalid , null , 'assertFalse ' ],
769
- 'required-last-null-valid ' => [$ requiredLastValid , null , 'assertTrue ' ],
770
- 'required-last-null-invalid ' => [$ requiredLastInvalid , null , 'assertFalse ' ],
771
651
'required-first-empty-valid ' => [$ requiredFirstValid , '' , 'assertTrue ' ],
772
652
'required-first-empty-invalid ' => [$ requiredFirstInvalid , '' , 'assertFalse ' ],
773
- 'required-last-empty-valid ' => [$ requiredLastValid , '' , 'assertTrue ' ],
774
- 'required-last-empty-invalid ' => [$ requiredLastInvalid , '' , 'assertFalse ' ],
775
653
'required-first-array-valid ' => [$ requiredFirstValid , [], 'assertTrue ' ],
776
654
'required-first-array-invalid ' => [$ requiredFirstInvalid , [], 'assertFalse ' ],
777
- 'required-last-array-valid ' => [$ requiredLastValid , [], 'assertTrue ' ],
778
- 'required-last-array-invalid ' => [$ requiredLastInvalid , [], 'assertFalse ' ],
779
655
];
780
656
}
781
657
@@ -806,42 +682,22 @@ public function whenNotRequiredAndNotAllowEmptyAndContinueIfEmptyValidatorsAreRu
806
682
});
807
683
808
684
$ requiredFirstInvalid = new Input ('foo ' );
685
+ $ requiredFirstInvalid ->getValidatorChain ()->attach ($ alwaysInvalid );
809
686
$ requiredFirstValid = new Input ('foo ' );
687
+ $ requiredFirstValid ->getValidatorChain ()->attach ($ emptyIsValid );
810
688
foreach ([$ requiredFirstValid , $ requiredFirstInvalid ] as $ input ) {
811
689
$ input ->setRequired (false )
812
690
->setAllowEmpty (false )
813
691
->setContinueIfEmpty (true );
814
692
}
815
693
816
- $ requiredLastInvalid = new Input ('foo ' );
817
- $ requiredLastValid = new Input ('foo ' );
818
- foreach ([$ requiredLastValid , $ requiredLastInvalid ] as $ input ) {
819
- $ input ->setAllowEmpty (false )
820
- ->setContinueIfEmpty (true )
821
- ->setRequired (false );
822
- }
823
-
824
- foreach ([$ requiredFirstValid , $ requiredLastValid ] as $ input ) {
825
- $ input ->getValidatorChain ()->attach ($ emptyIsValid );
826
- }
827
-
828
- foreach ([$ requiredFirstInvalid , $ requiredLastInvalid ] as $ input ) {
829
- $ input ->getValidatorChain ()->attach ($ alwaysInvalid );
830
- }
831
-
832
694
return [
833
695
'required-first-null-valid ' => [$ requiredFirstValid , null , 'assertTrue ' ],
834
696
'required-first-null-invalid ' => [$ requiredFirstInvalid , null , 'assertFalse ' ],
835
- 'required-last-null-valid ' => [$ requiredLastValid , null , 'assertTrue ' ],
836
- 'required-last-null-invalid ' => [$ requiredLastInvalid , null , 'assertFalse ' ],
837
697
'required-first-empty-valid ' => [$ requiredFirstValid , '' , 'assertTrue ' ],
838
698
'required-first-empty-invalid ' => [$ requiredFirstInvalid , '' , 'assertFalse ' ],
839
- 'required-last-empty-valid ' => [$ requiredLastValid , '' , 'assertTrue ' ],
840
- 'required-last-empty-invalid ' => [$ requiredLastInvalid , '' , 'assertFalse ' ],
841
699
'required-first-array-valid ' => [$ requiredFirstValid , [], 'assertTrue ' ],
842
700
'required-first-array-invalid ' => [$ requiredFirstInvalid , [], 'assertFalse ' ],
843
- 'required-last-array-valid ' => [$ requiredLastValid , [], 'assertTrue ' ],
844
- 'required-last-array-invalid ' => [$ requiredLastInvalid , [], 'assertFalse ' ],
845
701
];
846
702
}
847
703
0 commit comments