Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[10.x] Fix breaking changes in before validation #49947

Closed
wants to merge 5 commits into from
Closed

[10.x] Fix breaking changes in before validation #49947

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8835393
added checks for 2nd date in compareDates
MrPunyapal Jan 27, 2024
302a484
Add validation tests for date comparison
MrPunyapal Jan 27, 2024
567ffcb
fix: breaking changes
MrPunyapal Feb 1, 2024
981db21
Merge branch '10.x' into fix-before-validation
MrPunyapal Feb 1, 2024
9db846e
removed tests for before:x
MrPunyapal Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Illuminate/Validation/Concerns/ValidatesAttributes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ protected function compareDates($attribute, $value, $parameters, $operator)
if (is_null($date = $this->getDateTimestamp($parameters[0]))) {
$comparedValue = $this->getValue($parameters[0]);

if (! is_string($comparedValue) && ! is_numeric($comparedValue) && ! $comparedValue instanceof DateTimeInterface) {
if (! is_null($comparedValue) && ! is_string($comparedValue) && ! is_numeric($comparedValue) && ! $comparedValue instanceof DateTimeInterface) {
return false;
}

Expand Down
6 changes: 6 additions & 0 deletions tests/Validation/ValidationValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5986,6 +5986,12 @@ public function testBeforeAndAfter()

$v = new Validator($trans, ['x' => ['a' => ['v' => 'c']], 'y' => 'invalid'], ['x' => 'date', 'y' => 'date|before:x']);
$this->assertTrue($v->fails());

$v = new Validator($trans, ['y' => '1970-01-01'], ['x' => 'nullable|date', 'y' => 'nullable|date|after:x']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['y' => '1970-01-01'], ['x' => 'nullable|date', 'y' => 'nullable|date|before:x']);
$this->assertTrue($v->passes());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't believe was ever true, so should be removed (or just reverse the condition). Essentially every date is "after" null

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so it can be after null but cannot be before null? 👀

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't believe was ever true, so should be removed (or just reverse the condition). Essentially every date is "after" null

okay before:x test was failing before adding all of those conditions too 🫡

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But after:x was not? Why did you close?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by mistakenly added with old branch

}

public function testBeforeAndAfterWithFormat()
Expand Down
Loading