diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
index 7099496cfa1d2..d1df50b315683 100644
--- a/src/Symfony/Component/Validator/CHANGELOG.md
+++ b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -1,6 +1,11 @@
CHANGELOG
=========
+3.4.0
+-----
+
+ * added min/max amount of pixels check to `Image` constraint via `minPixels` and `maxPixels`
+
3.3.0
-----
diff --git a/src/Symfony/Component/Validator/Constraints/Image.php b/src/Symfony/Component/Validator/Constraints/Image.php
index a3957f2379567..20b20fb2e189d 100644
--- a/src/Symfony/Component/Validator/Constraints/Image.php
+++ b/src/Symfony/Component/Validator/Constraints/Image.php
@@ -25,6 +25,8 @@ class Image extends File
const TOO_NARROW_ERROR = '9afbd561-4f90-4a27-be62-1780fc43604a';
const TOO_HIGH_ERROR = '7efae81c-4877-47ba-aa65-d01ccb0d4645';
const TOO_LOW_ERROR = 'aef0cb6a-c07f-4894-bc08-1781420d7b4c';
+ const TOO_FEW_PX_ERROR = '1b06b97d-ae48-474e-978f-038a74854c43';
+ const TOO_MANY_PX_ERROR = 'ee0804e8-44db-4eac-9775-be91aaf72ce1';
const RATIO_TOO_BIG_ERROR = '70cafca6-168f-41c9-8c8c-4e47a52be643';
const RATIO_TOO_SMALL_ERROR = '59b8c6ef-bcf2-4ceb-afff-4642ed92f12e';
const SQUARE_NOT_ALLOWED_ERROR = '5d41425b-facb-47f7-a55a-de9fbe45cb46';
@@ -45,6 +47,8 @@ class Image extends File
self::TOO_NARROW_ERROR => 'TOO_NARROW_ERROR',
self::TOO_HIGH_ERROR => 'TOO_HIGH_ERROR',
self::TOO_LOW_ERROR => 'TOO_LOW_ERROR',
+ self::TOO_FEW_PX_ERROR => 'TOO_FEW_PX_ERROR',
+ self::TOO_MANY_PX_ERROR => 'TOO_MANY_PX_ERROR',
self::RATIO_TOO_BIG_ERROR => 'RATIO_TOO_BIG_ERROR',
self::RATIO_TOO_SMALL_ERROR => 'RATIO_TOO_SMALL_ERROR',
self::SQUARE_NOT_ALLOWED_ERROR => 'SQUARE_NOT_ALLOWED_ERROR',
@@ -60,6 +64,8 @@ class Image extends File
public $minHeight;
public $maxRatio;
public $minRatio;
+ public $minPixels;
+ public $maxPixels;
public $allowSquare = true;
public $allowLandscape = true;
public $allowPortrait = true;
@@ -72,6 +78,8 @@ class Image extends File
public $minWidthMessage = 'The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.';
public $maxHeightMessage = 'The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.';
public $minHeightMessage = 'The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.';
+ public $minPixelsMessage = 'The image has too few pixels ({{ pixels }} pixels). Minimum amount expected is {{ min_pixels }} pixels.';
+ public $maxPixelsMessage = 'The image has too many pixels ({{ pixels }} pixels). Maximum amount expected is {{ max_pixels }} pixels.';
public $maxRatioMessage = 'The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.';
public $minRatioMessage = 'The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.';
public $allowSquareMessage = 'The image is square ({{ width }}x{{ height }}px). Square images are not allowed.';
diff --git a/src/Symfony/Component/Validator/Constraints/ImageValidator.php b/src/Symfony/Component/Validator/Constraints/ImageValidator.php
index 0ed0d41782227..c1b82edaa84d3 100644
--- a/src/Symfony/Component/Validator/Constraints/ImageValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/ImageValidator.php
@@ -46,6 +46,7 @@ public function validate($value, Constraint $constraint)
if (null === $constraint->minWidth && null === $constraint->maxWidth
&& null === $constraint->minHeight && null === $constraint->maxHeight
+ && null === $constraint->minPixels && null === $constraint->maxPixels
&& null === $constraint->minRatio && null === $constraint->maxRatio
&& $constraint->allowSquare && $constraint->allowLandscape && $constraint->allowPortrait
&& !$constraint->detectCorrupted) {
@@ -127,6 +128,40 @@ public function validate($value, Constraint $constraint)
}
}
+ $pixels = $width * $height;
+
+ if (null !== $constraint->minPixels) {
+ if (!ctype_digit((string) $constraint->minPixels)) {
+ throw new ConstraintDefinitionException(sprintf('"%s" is not a valid minimum amount of pixels', $constraint->minPixels));
+ }
+
+ if ($pixels < $constraint->minPixels) {
+ $this->context->buildViolation($constraint->minPixelsMessage)
+ ->setParameter('{{ pixels }}', $pixels)
+ ->setParameter('{{ min_pixels }}', $constraint->minPixels)
+ ->setParameter('{{ height }}', $height)
+ ->setParameter('{{ width }}', $width)
+ ->setCode(Image::TOO_FEW_PX_ERROR)
+ ->addViolation();
+ }
+ }
+
+ if (null !== $constraint->maxPixels) {
+ if (!ctype_digit((string) $constraint->maxPixels)) {
+ throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum amount of pixels', $constraint->maxPixels));
+ }
+
+ if ($pixels > $constraint->maxPixels) {
+ $this->context->buildViolation($constraint->maxPixelsMessage)
+ ->setParameter('{{ pixels }}', $pixels)
+ ->setParameter('{{ max_pixels }}', $constraint->maxPixels)
+ ->setParameter('{{ height }}', $height)
+ ->setParameter('{{ width }}', $width)
+ ->setCode(Image::TOO_MANY_PX_ERROR)
+ ->addViolation();
+ }
+ }
+
$ratio = round($width / $height, 2);
if (null !== $constraint->minRatio) {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
index 93b1d05bab7b2..4598f04978f3d 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
@@ -164,6 +164,42 @@ public function testHeightTooBig()
->assertRaised();
}
+ public function testPixelsTooFew()
+ {
+ $constraint = new Image(array(
+ 'minPixels' => 5,
+ 'minPixelsMessage' => 'myMessage',
+ ));
+
+ $this->validator->validate($this->image, $constraint);
+
+ $this->buildViolation('myMessage')
+ ->setParameter('{{ pixels }}', '4')
+ ->setParameter('{{ min_pixels }}', '5')
+ ->setParameter('{{ height }}', '2')
+ ->setParameter('{{ width }}', '2')
+ ->setCode(Image::TOO_FEW_PX_ERROR)
+ ->assertRaised();
+ }
+
+ public function testPixelsTooMany()
+ {
+ $constraint = new Image(array(
+ 'maxPixels' => 3,
+ 'maxPixelsMessage' => 'myMessage',
+ ));
+
+ $this->validator->validate($this->image, $constraint);
+
+ $this->buildViolation('myMessage')
+ ->setParameter('{{ pixels }}', '4')
+ ->setParameter('{{ max_pixels }}', '3')
+ ->setParameter('{{ height }}', '2')
+ ->setParameter('{{ width }}', '2')
+ ->setCode(Image::TOO_MANY_PX_ERROR)
+ ->assertRaised();
+ }
+
/**
* @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
*/
@@ -212,6 +248,30 @@ public function testInvalidMaxHeight()
$this->validator->validate($this->image, $constraint);
}
+ /**
+ * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
+ */
+ public function testInvalidMinPixels()
+ {
+ $constraint = new Image(array(
+ 'minPixels' => '1abc',
+ ));
+
+ $this->validator->validate($this->image, $constraint);
+ }
+
+ /**
+ * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
+ */
+ public function testInvalidMaxPixels()
+ {
+ $constraint = new Image(array(
+ 'maxPixels' => '1abc',
+ ));
+
+ $this->validator->validate($this->image, $constraint);
+ }
+
public function testRatioTooSmall()
{
$constraint = new Image(array(
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy