diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 6a056287c451..937a78e7e773 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -785,7 +785,7 @@ PHP_FUNCTION(imagecolormatch) zend_argument_value_error(2, "must be Palette"); RETURN_THROWS(); case -3: - zend_argument_value_error(2, "must be the same size as argument #1 ($im1)"); + zend_argument_value_error(2, "must be the same size as argument #1 ($image1)"); RETURN_THROWS(); case -4: zend_argument_value_error(2, "must have at least one color"); @@ -2114,7 +2114,7 @@ PHP_FUNCTION(imagejpeg) } if (quality < -1 || quality > 100) { - zend_argument_value_error(3, "must be at between -1 and 100"); + zend_argument_value_error(3, "must be between -1 and 100"); ctx->gd_free(ctx); RETURN_THROWS(); } diff --git a/ext/gd/tests/imagecolormatch_error4.phpt b/ext/gd/tests/imagecolormatch_error4.phpt index 2c117dcd46ab..4c3e11f4a6de 100644 --- a/ext/gd/tests/imagecolormatch_error4.phpt +++ b/ext/gd/tests/imagecolormatch_error4.phpt @@ -18,6 +18,13 @@ try { echo $exception::class, ': ', $exception->getMessage(), "\n"; } +/* the message names argument #1, so that name has to be the real one */ +foreach ((new ReflectionFunction('imagecolormatch'))->getParameters() as $parameter) { + echo '$', $parameter->getName(), "\n"; +} + ?> --EXPECT-- -ValueError: imagecolormatch(): Argument #2 ($image2) must be the same size as argument #1 ($im1) +ValueError: imagecolormatch(): Argument #2 ($image2) must be the same size as argument #1 ($image1) +$image1 +$image2 diff --git a/ext/gd/tests/imagejpeg_quality_range.phpt b/ext/gd/tests/imagejpeg_quality_range.phpt new file mode 100644 index 000000000000..3a6aa292976e --- /dev/null +++ b/ext/gd/tests/imagejpeg_quality_range.phpt @@ -0,0 +1,31 @@ +--TEST-- +imagejpeg(): the accepted range of $quality and the message for values outside it +--EXTENSIONS-- +gd +--SKIPIF-- + +--FILE-- +getMessage(), "\n"; + } +} +?> +--CLEAN-- + +--EXPECT-- +ValueError: imagejpeg(): Argument #3 ($quality) must be between -1 and 100 +bool(true) +bool(true) +bool(true) +ValueError: imagejpeg(): Argument #3 ($quality) must be between -1 and 100 diff --git a/ext/gd/tests/imageresolution_jpeg.phpt b/ext/gd/tests/imageresolution_jpeg.phpt index a918c7402d2c..fcca0f7f279f 100644 --- a/ext/gd/tests/imageresolution_jpeg.phpt +++ b/ext/gd/tests/imageresolution_jpeg.phpt @@ -43,7 +43,7 @@ array(2) { [1]=> int(299) } -ValueError: imagejpeg(): Argument #3 ($quality) must be at between -1 and 100 +ValueError: imagejpeg(): Argument #3 ($quality) must be between -1 and 100 --CLEAN--