Skip to content

[13.x] Fix inverted ratio comparison operators in image dimension validation #60290

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

Merged
taylorotwell merged 2 commits into from
May 27, 2026
+28 −13
Merged

[13.x] Fix inverted ratio comparison operators in image dimension validation #60290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
562e9ad
fix inverted dimensions min and max ratio validations
Button99 May 27, 2026
bbe7eb2
more fixes
taylorotwell May 27, 2026
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
8 changes: 6 additions & 2 deletions src/Illuminate/Validation/Concerns/ValidatesAttributes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,9 @@ private function failsMinRatioCheck($parameters, $width, $height)
[1, 1], array_filter(sscanf($parameters['min_ratio'], '%f/%d'))
);

return ($width / $height) > ($minNumerator / $minDenominator);
$precision = 1 / (max(($width + $height) / 2, $height) + 1);

return ($minNumerator / $minDenominator) - ($width / $height) > $precision;
}

/**
Expand All @@ -871,7 +873,9 @@ private function failsMaxRatioCheck($parameters, $width, $height)
[1, 1], array_filter(sscanf($parameters['max_ratio'], '%f/%d'))
);

return ($width / $height) < ($maxNumerator / $maxDenominator);
$precision = 1 / (max(($width + $height) / 2, $height) + 1);

return ($width / $height) - ($maxNumerator / $maxDenominator) > $precision;
}

/**
Expand Down
23 changes: 17 additions & 6 deletions tests/Validation/ValidationImageFileRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,42 +60,53 @@ public function testDimensionWithTheRatioMethod()

public function testDimensionWithTheMinRatioMethod()
{
$this->fails(
$this->passes(
File::image()->dimensions(Rule::dimensions()->minRatio(1 / 2)),
UploadedFile::fake()->image('foo.png', 100, 100),
['validation.dimensions'],
);

$this->passes(
File::image()->dimensions(Rule::dimensions()->minRatio(2 / 3)),
UploadedFile::fake()->image('foo.png', 200, 300),
);

$this->fails(
File::image()->dimensions(Rule::dimensions()->minRatio(1 / 2)),
UploadedFile::fake()->image('foo.png', 100, 200),
UploadedFile::fake()->image('foo.png', 100, 300),
['validation.dimensions'],
);
}

public function testDimensionWithTheMaxRatioMethod()
{
$this->fails(
$this->passes(
File::image()->dimensions(Rule::dimensions()->maxRatio(1 / 2)),
UploadedFile::fake()->image('foo.png', 100, 300),
['validation.dimensions'],
);

$this->passes(
File::image()->dimensions(Rule::dimensions()->maxRatio(1 / 3)),
UploadedFile::fake()->image('foo.png', 100, 300),
);

$this->fails(
File::image()->dimensions(Rule::dimensions()->maxRatio(1 / 2)),
UploadedFile::fake()->image('foo.png', 100, 100),
['validation.dimensions'],
);
}

public function testDimensionWithTheRatioBetweenMethod()
{
$this->fails(
File::image()->dimensions(Rule::dimensions()->ratioBetween(1 / 2, 1 / 3)),
File::image()->dimensions(Rule::dimensions()->ratioBetween(1 / 3, 1 / 2)),
UploadedFile::fake()->image('foo.png', 100, 100),
['validation.dimensions'],
);

$this->passes(
File::image()->dimensions(Rule::dimensions()->ratioBetween(1 / 2, 1 / 3)),
File::image()->dimensions(Rule::dimensions()->ratioBetween(1 / 3, 1 / 2)),
UploadedFile::fake()->image('foo.png', 100, 200),
);
}
Expand Down
10 changes: 5 additions & 5 deletions tests/Validation/ValidationValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5491,11 +5491,11 @@ public function testValidateImageDimensions()

// for min_ratio
$v = new Validator($trans, ['x' => $uploadedFile], ['x' => 'dimensions:min_ratio=1/2']);
$this->assertTrue($v->fails());
$this->assertTrue($v->passes());

// for max_ratio
$v = new Validator($trans, ['x' => $uploadedFile], ['x' => 'dimensions:max_ratio=2/5']);
$this->assertTrue($v->passes());
$this->assertTrue($v->fails());

// Knowing that demo image2.png has width = 4 and height = 2
$uploadedFile = new UploadedFile(__DIR__.'/fixtures/image2.png', '', null, null, true);
Expand Down Expand Up @@ -5556,11 +5556,11 @@ public function testValidateImageDimensions()

// evaluates to (64 / 65) > (1 / 1.0) which is true/fails
$v = new Validator($trans, ['x' => $uploadedFile], ['x' => 'dimensions:min_ratio=1']);
$this->assertFalse($v->fails());
$this->assertTrue($v->fails());

// evaluates to (64 / 65) < (1 / 1.0) which is false/passes
// evaluates to (64 / 65) > (1 / 1.0) which is false/passes
$v = new Validator($trans, ['x' => $uploadedFile], ['x' => 'dimensions:max_ratio=1']);
$this->assertFalse($v->passes());
$this->assertTrue($v->passes());

// Knowing that demo image5.png has width = 1366 and height = 768
$uploadedFile = new UploadedFile(__DIR__.'/fixtures/image5.png', '', null, null, true);
Expand Down
Loading