Skip to content
This repository was archived by the owner on Jan 30, 2020. It is now read-only.

Commit 5ba4cd3

Browse files
weierophinneyweierophinney
committed
Merge branch 'hotfix/40'
Close #40
2 parents 25cd01e + 35b6b40 commit 5ba4cd3

File tree

1 file changed

+8
-152
lines changed

1 file changed

+8
-152
lines changed

‎test/InputTest.php

+8-152
Original file line numberDiff line numberDiff line change
@@ -458,34 +458,6 @@ public function testMergeRetainsAllowEmptyFlag()
458458
$this->assertTrue($input2->allowEmpty());
459459
}
460460

461-
/**
462-
* @group 7445
463-
*/
464-
public function testInputIsValidWhenUsingSetRequiredAtStart()
465-
{
466-
$input = new Input();
467-
$input->setName('foo')
468-
->setRequired(false)
469-
->setAllowEmpty(false)
470-
->setContinueIfEmpty(false);
471-
472-
$this->assertTrue($input->isValid());
473-
}
474-
475-
/**
476-
* @group 7445
477-
*/
478-
public function testInputIsValidWhenUsingSetRequiredAtEnd()
479-
{
480-
$input = new Input();
481-
$input->setName('foo')
482-
->setAllowEmpty(false)
483-
->setContinueIfEmpty(false)
484-
->setRequired(false);
485-
486-
$this->assertTrue($input->isValid());
487-
}
488-
489461
public function whenRequiredAndAllowEmptyAndNotContinueIfEmptyValidatorsAreNotRun()
490462
{
491463
$validator = new Validator\Callback(function ($value) {
@@ -498,19 +470,10 @@ public function whenRequiredAndAllowEmptyAndNotContinueIfEmptyValidatorsAreNotRu
498470
->setContinueIfEmpty(false)
499471
->getValidatorChain()->attach($validator);
500472

501-
$requiredLast = new Input('foo');
502-
$requiredLast->setAllowEmpty(true)
503-
->setContinueIfEmpty(false)
504-
->setRequired(true)
505-
->getValidatorChain()->attach($validator);
506-
507473
return [
508474
'required-first-null' => [$requiredFirst, null],
509-
'required-last-null' => [$requiredLast, null],
510475
'required-first-empty' => [$requiredFirst, ''],
511-
'required-last-empty' => [$requiredLast, ''],
512476
'required-first-array' => [$requiredFirst, []],
513-
'required-last-array' => [$requiredLast, []],
514477
];
515478
}
516479

@@ -541,42 +504,22 @@ public function whenRequiredAndAllowEmptyAndContinueIfEmptyValidatorsAreRun()
541504
});
542505

543506
$requiredFirstInvalid = new Input('foo');
507+
$requiredFirstInvalid->getValidatorChain()->attach($alwaysInvalid);
544508
$requiredFirstValid = new Input('foo');
509+
$requiredFirstValid->getValidatorChain()->attach($emptyIsValid);
545510
foreach ([$requiredFirstValid, $requiredFirstInvalid] as $input) {
546511
$input->setRequired(true)
547512
->setAllowEmpty(true)
548513
->setContinueIfEmpty(true);
549514
}
550515

551-
$requiredLastInvalid = new Input('foo');
552-
$requiredLastValid = new Input('foo');
553-
foreach ([$requiredLastValid, $requiredLastInvalid] as $input) {
554-
$input->setAllowEmpty(true)
555-
->setContinueIfEmpty(true)
556-
->setRequired(true);
557-
}
558-
559-
foreach ([$requiredFirstValid, $requiredLastValid] as $input) {
560-
$input->getValidatorChain()->attach($emptyIsValid);
561-
}
562-
563-
foreach ([$requiredFirstInvalid, $requiredLastInvalid] as $input) {
564-
$input->getValidatorChain()->attach($alwaysInvalid);
565-
}
566-
567516
return [
568517
'required-first-null-valid' => [$requiredFirstValid, null, 'assertTrue'],
569518
'required-first-null-invalid' => [$requiredFirstInvalid, null, 'assertFalse'],
570-
'required-last-null-valid' => [$requiredLastValid, null, 'assertTrue'],
571-
'required-last-null-invalid' => [$requiredLastInvalid, null, 'assertFalse'],
572519
'required-first-empty-valid' => [$requiredFirstValid, '', 'assertTrue'],
573520
'required-first-empty-invalid' => [$requiredFirstInvalid, '', 'assertFalse'],
574-
'required-last-empty-valid' => [$requiredLastValid, '', 'assertTrue'],
575-
'required-last-empty-invalid' => [$requiredLastInvalid, '', 'assertFalse'],
576521
'required-first-array-valid' => [$requiredFirstValid, [], 'assertTrue'],
577522
'required-first-array-invalid' => [$requiredFirstInvalid, [], 'assertFalse'],
578-
'required-last-array-valid' => [$requiredLastValid, [], 'assertTrue'],
579-
'required-last-array-invalid' => [$requiredLastInvalid, [], 'assertFalse'],
580523
];
581524
}
582525

@@ -602,19 +545,10 @@ public function whenRequiredAndNotAllowEmptyAndNotContinueIfEmptyValidatorsAreNo
602545
->setContinueIfEmpty(false)
603546
->getValidatorChain()->attach($validator);
604547

605-
$requiredLast = new Input('foo');
606-
$requiredLast->setAllowEmpty(false)
607-
->setContinueIfEmpty(false)
608-
->setRequired(true)
609-
->getValidatorChain()->attach($validator);
610-
611548
return [
612549
'required-first-null' => [$requiredFirst, null],
613-
'required-last-null' => [$requiredLast, null],
614550
'required-first-empty' => [$requiredFirst, ''],
615-
'required-last-empty' => [$requiredLast, ''],
616551
'required-first-array' => [$requiredFirst, []],
617-
'required-last-array' => [$requiredLast, []],
618552
];
619553
}
620554

@@ -645,42 +579,22 @@ public function whenRequiredAndNotAllowEmptyAndContinueIfEmptyValidatorsAreRun()
645579
});
646580

647581
$requiredFirstInvalid = new Input('foo');
582+
$requiredFirstInvalid->getValidatorChain()->attach($alwaysInvalid);
648583
$requiredFirstValid = new Input('foo');
584+
$requiredFirstValid->getValidatorChain()->attach($emptyIsValid);
649585
foreach ([$requiredFirstValid, $requiredFirstInvalid] as $input) {
650586
$input->setRequired(true)
651587
->setAllowEmpty(false)
652588
->setContinueIfEmpty(true);
653589
}
654590

655-
$requiredLastInvalid = new Input('foo');
656-
$requiredLastValid = new Input('foo');
657-
foreach ([$requiredLastValid, $requiredLastInvalid] as $input) {
658-
$input->setAllowEmpty(false)
659-
->setContinueIfEmpty(true)
660-
->setRequired(true);
661-
}
662-
663-
foreach ([$requiredFirstValid, $requiredLastValid] as $input) {
664-
$input->getValidatorChain()->attach($emptyIsValid);
665-
}
666-
667-
foreach ([$requiredFirstInvalid, $requiredLastInvalid] as $input) {
668-
$input->getValidatorChain()->attach($alwaysInvalid);
669-
}
670-
671591
return [
672592
'required-first-null-valid' => [$requiredFirstValid, null, 'assertTrue'],
673593
'required-first-null-invalid' => [$requiredFirstInvalid, null, 'assertFalse'],
674-
'required-last-null-valid' => [$requiredLastValid, null, 'assertTrue'],
675-
'required-last-null-invalid' => [$requiredLastInvalid, null, 'assertFalse'],
676594
'required-first-empty-valid' => [$requiredFirstValid, '', 'assertTrue'],
677595
'required-first-empty-invalid' => [$requiredFirstInvalid, '', 'assertFalse'],
678-
'required-last-empty-valid' => [$requiredLastValid, '', 'assertTrue'],
679-
'required-last-empty-invalid' => [$requiredLastInvalid, '', 'assertFalse'],
680596
'required-first-array-valid' => [$requiredFirstValid, [], 'assertTrue'],
681597
'required-first-array-invalid' => [$requiredFirstInvalid, [], 'assertFalse'],
682-
'required-last-array-valid' => [$requiredLastValid, [], 'assertTrue'],
683-
'required-last-array-invalid' => [$requiredLastInvalid, [], 'assertFalse'],
684598
];
685599
}
686600

@@ -706,19 +620,10 @@ public function whenNotRequiredAndAllowEmptyAndNotContinueIfEmptyValidatorsAreNo
706620
->setContinueIfEmpty(false)
707621
->getValidatorChain()->attach($validator);
708622

709-
$requiredLast = new Input('foo');
710-
$requiredLast->setAllowEmpty(true)
711-
->setContinueIfEmpty(false)
712-
->setRequired(false)
713-
->getValidatorChain()->attach($validator);
714-
715623
return [
716624
'required-first-null' => [$requiredFirst, null],
717-
'required-last-null' => [$requiredLast, null],
718625
'required-first-empty' => [$requiredFirst, ''],
719-
'required-last-empty' => [$requiredLast, ''],
720626
'required-first-array' => [$requiredFirst, []],
721-
'required-last-array' => [$requiredLast, []],
722627
];
723628
}
724629

@@ -744,19 +649,10 @@ public function whenNotRequiredAndNotAllowEmptyAndNotContinueIfEmptyValidatorsAr
744649
->setContinueIfEmpty(false)
745650
->getValidatorChain()->attach($validator);
746651

747-
$requiredLast = new Input('foo');
748-
$requiredLast->setAllowEmpty(false)
749-
->setContinueIfEmpty(false)
750-
->setRequired(false)
751-
->getValidatorChain()->attach($validator);
752-
753652
return [
754653
'required-first-null' => [$requiredFirst, null],
755-
'required-last-null' => [$requiredLast, null],
756654
'required-first-empty' => [$requiredFirst, ''],
757-
'required-last-empty' => [$requiredLast, ''],
758655
'required-first-array' => [$requiredFirst, []],
759-
'required-last-array' => [$requiredLast, []],
760656
];
761657
}
762658

@@ -787,42 +683,22 @@ public function whenNotRequiredAndAllowEmptyAndContinueIfEmptyValidatorsAreRun()
787683
});
788684

789685
$requiredFirstInvalid = new Input('foo');
686+
$requiredFirstInvalid->getValidatorChain()->attach($alwaysInvalid);
790687
$requiredFirstValid = new Input('foo');
688+
$requiredFirstValid->getValidatorChain()->attach($emptyIsValid);
791689
foreach ([$requiredFirstValid, $requiredFirstInvalid] as $input) {
792690
$input->setRequired(false)
793691
->setAllowEmpty(true)
794692
->setContinueIfEmpty(true);
795693
}
796694

797-
$requiredLastInvalid = new Input('foo');
798-
$requiredLastValid = new Input('foo');
799-
foreach ([$requiredLastValid, $requiredLastInvalid] as $input) {
800-
$input->setAllowEmpty(true)
801-
->setContinueIfEmpty(true)
802-
->setRequired(false);
803-
}
804-
805-
foreach ([$requiredFirstValid, $requiredLastValid] as $input) {
806-
$input->getValidatorChain()->attach($emptyIsValid);
807-
}
808-
809-
foreach ([$requiredFirstInvalid, $requiredLastInvalid] as $input) {
810-
$input->getValidatorChain()->attach($alwaysInvalid);
811-
}
812-
813695
return [
814696
'required-first-null-valid' => [$requiredFirstValid, null, 'assertTrue'],
815697
'required-first-null-invalid' => [$requiredFirstInvalid, null, 'assertFalse'],
816-
'required-last-null-valid' => [$requiredLastValid, null, 'assertTrue'],
817-
'required-last-null-invalid' => [$requiredLastInvalid, null, 'assertFalse'],
818698
'required-first-empty-valid' => [$requiredFirstValid, '', 'assertTrue'],
819699
'required-first-empty-invalid' => [$requiredFirstInvalid, '', 'assertFalse'],
820-
'required-last-empty-valid' => [$requiredLastValid, '', 'assertTrue'],
821-
'required-last-empty-invalid' => [$requiredLastInvalid, '', 'assertFalse'],
822700
'required-first-array-valid' => [$requiredFirstValid, [], 'assertTrue'],
823701
'required-first-array-invalid' => [$requiredFirstInvalid, [], 'assertFalse'],
824-
'required-last-array-valid' => [$requiredLastValid, [], 'assertTrue'],
825-
'required-last-array-invalid' => [$requiredLastInvalid, [], 'assertFalse'],
826702
];
827703
}
828704

@@ -853,42 +729,22 @@ public function whenNotRequiredAndNotAllowEmptyAndContinueIfEmptyValidatorsAreRu
853729
});
854730

855731
$requiredFirstInvalid = new Input('foo');
732+
$requiredFirstInvalid->getValidatorChain()->attach($alwaysInvalid);
856733
$requiredFirstValid = new Input('foo');
734+
$requiredFirstValid->getValidatorChain()->attach($emptyIsValid);
857735
foreach ([$requiredFirstValid, $requiredFirstInvalid] as $input) {
858736
$input->setRequired(false)
859737
->setAllowEmpty(false)
860738
->setContinueIfEmpty(true);
861739
}
862740

863-
$requiredLastInvalid = new Input('foo');
864-
$requiredLastValid = new Input('foo');
865-
foreach ([$requiredLastValid, $requiredLastInvalid] as $input) {
866-
$input->setAllowEmpty(false)
867-
->setContinueIfEmpty(true)
868-
->setRequired(false);
869-
}
870-
871-
foreach ([$requiredFirstValid, $requiredLastValid] as $input) {
872-
$input->getValidatorChain()->attach($emptyIsValid);
873-
}
874-
875-
foreach ([$requiredFirstInvalid, $requiredLastInvalid] as $input) {
876-
$input->getValidatorChain()->attach($alwaysInvalid);
877-
}
878-
879741
return [
880742
'required-first-null-valid' => [$requiredFirstValid, null, 'assertTrue'],
881743
'required-first-null-invalid' => [$requiredFirstInvalid, null, 'assertFalse'],
882-
'required-last-null-valid' => [$requiredLastValid, null, 'assertTrue'],
883-
'required-last-null-invalid' => [$requiredLastInvalid, null, 'assertFalse'],
884744
'required-first-empty-valid' => [$requiredFirstValid, '', 'assertTrue'],
885745
'required-first-empty-invalid' => [$requiredFirstInvalid, '', 'assertFalse'],
886-
'required-last-empty-valid' => [$requiredLastValid, '', 'assertTrue'],
887-
'required-last-empty-invalid' => [$requiredLastInvalid, '', 'assertFalse'],
888746
'required-first-array-valid' => [$requiredFirstValid, [], 'assertTrue'],
889747
'required-first-array-invalid' => [$requiredFirstInvalid, [], 'assertFalse'],
890-
'required-last-array-valid' => [$requiredLastValid, [], 'assertTrue'],
891-
'required-last-array-invalid' => [$requiredLastInvalid, [], 'assertFalse'],
892748
];
893749
}
894750

0 commit comments

Comments
 (0)