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

Commit 3934123

Browse files
committed
Merge pull request #48 from Maks3w/hotfix/simplify-condition
Empty values + Allow Empty + Not continue if empty is always true
2 parents 96dcadd + 3bd4b97 commit 3934123

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/ArrayInput.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function isValid($context = null)
8686
$result = true;
8787
continue;
8888
}
89-
if ($empty && $this->isRequired() && $this->allowEmpty() && !$this->continueIfEmpty()) {
89+
if ($empty && $this->allowEmpty() && !$this->continueIfEmpty()) {
9090
$result = true;
9191
continue;
9292
}

src/FileInput.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public function isValid($context = null)
132132
return true;
133133
}
134134

135-
if ($empty && $required && $allowEmpty && ! $continueIfEmpty) {
135+
if ($empty && $allowEmpty && ! $continueIfEmpty) {
136136
return true;
137137
}
138138

src/Input.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ public function isValid($context = null)
411411
return true;
412412
}
413413

414-
if ($empty && $required && $allowEmpty && ! $continueIfEmpty) {
414+
if ($empty && $allowEmpty && ! $continueIfEmpty) {
415415
return true;
416416
}
417417

0 commit comments

Comments
 (0)