summaryrefslogtreecommitdiff
path: root/ext/gd
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-10-15 04:29:24 +0200
committerPeter Kokot <peterkokot@gmail.com>2018-10-15 04:29:24 +0200
commit113213f0277562a4ca6d020cb28ba98321d3c62a (patch)
treebbe57fa40e644a1e1861af1d362a3e40e345b620 /ext/gd
parent7af945e271d042a4991c9510f78b6ff7ac43ac34 (diff)
downloadphp-git-113213f0277562a4ca6d020cb28ba98321d3c62a.tar.gz
Sync leading and final newlines in *.phpt sections
This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines in all *.phpt sections. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
Diffstat (limited to 'ext/gd')
-rw-r--r--ext/gd/tests/bug38179.phpt1
-rw-r--r--ext/gd/tests/bug38212-mb.phpt1
-rw-r--r--ext/gd/tests/bug38212.phpt1
-rw-r--r--ext/gd/tests/bug39286-mb.phpt1
-rw-r--r--ext/gd/tests/bug39286.phpt1
-rw-r--r--ext/gd/tests/bug39780.phpt1
-rw-r--r--ext/gd/tests/bug39780_extern.phpt2
-rw-r--r--ext/gd/tests/bug42434.phpt2
-rw-r--r--ext/gd/tests/bug45799.phpt1
-rw-r--r--ext/gd/tests/bug49600.phpt2
-rw-r--r--ext/gd/tests/bug66356.phpt2
-rw-r--r--ext/gd/tests/bug70976.phpt2
-rw-r--r--ext/gd/tests/bug71912-mb.phpt1
-rw-r--r--ext/gd/tests/bug71912.phpt1
-rw-r--r--ext/gd/tests/bug71952.phpt2
-rw-r--r--ext/gd/tests/bug72227.phpt2
-rw-r--r--ext/gd/tests/bug72298.phpt2
-rw-r--r--ext/gd/tests/bug72512.phpt1
-rw-r--r--ext/gd/tests/bug72697.phpt2
-rw-r--r--ext/gd/tests/bug72730.phpt2
-rw-r--r--ext/gd/tests/bug73869.phpt2
-rw-r--r--ext/gd/tests/crafted_gd2.phpt2
-rw-r--r--ext/gd/tests/gd_info_error.phpt2
-rw-r--r--ext/gd/tests/imagealphablending_error1.phpt6
-rw-r--r--ext/gd/tests/imagecolorallocate_basic.phpt2
-rw-r--r--ext/gd/tests/imagecolorallocate_error.phpt2
-rw-r--r--ext/gd/tests/imagecolorallocate_variation3.phpt2
-rw-r--r--ext/gd/tests/imagecolorallocatealpha_basic.phpt2
-rw-r--r--ext/gd/tests/imagecolorallocatealpha_error1.phpt2
-rw-r--r--ext/gd/tests/imagecolorallocatealpha_error2.phpt2
-rw-r--r--ext/gd/tests/imagecolorallocatealpha_error3.phpt2
-rw-r--r--ext/gd/tests/imagecolorallocatealpha_error4.phpt2
-rw-r--r--ext/gd/tests/imagecolorallocatealpha_error5.phpt2
-rw-r--r--ext/gd/tests/imagecolorresolvealpha_error3.phpt6
-rw-r--r--ext/gd/tests/imagecolorstotal_basic.phpt2
-rw-r--r--ext/gd/tests/imagecreatetruecolor_error3.phpt2
-rw-r--r--ext/gd/tests/imagefilltoborder_error6.phpt2
-rw-r--r--ext/gd/tests/imageflip.phpt2
-rw-r--r--ext/gd/tests/imagegd2_nullbyte_injection.phpt1
-rw-r--r--ext/gd/tests/imagegd_nullbyte_injection.phpt1
-rw-r--r--ext/gd/tests/imagegif_nullbyte_injection.phpt1
-rw-r--r--ext/gd/tests/imageistruecolor_basic.phpt2
-rw-r--r--ext/gd/tests/imageistruecolor_error1.phpt2
-rw-r--r--ext/gd/tests/imagejpeg_nullbyte_injection.phpt1
-rw-r--r--ext/gd/tests/imagepng_nullbyte_injection.phpt1
-rw-r--r--ext/gd/tests/imagerectangle_error2.phpt2
-rw-r--r--ext/gd/tests/imagesavealpha_error2.phpt6
-rw-r--r--ext/gd/tests/imagesetthickness_error1.phpt2
-rw-r--r--ext/gd/tests/imagesetthickness_error2.phpt2
-rw-r--r--ext/gd/tests/imagetruecolortopalette_error1.phpt2
-rw-r--r--ext/gd/tests/imagetruecolortopalette_error2.phpt2
-rw-r--r--ext/gd/tests/imagettftext_charmap_order.phpt2
-rw-r--r--ext/gd/tests/imagewbmp_nullbyte_injection.phpt1
-rw-r--r--ext/gd/tests/libgd00086.phpt1
-rw-r--r--ext/gd/tests/libgd00094-mb.phpt1
-rw-r--r--ext/gd/tests/libgd00094.phpt1
-rw-r--r--ext/gd/tests/lines.phpt1
57 files changed, 35 insertions, 71 deletions
diff --git a/ext/gd/tests/bug38179.phpt b/ext/gd/tests/bug38179.phpt
index 9b0318829a..ef95be2f3c 100644
--- a/ext/gd/tests/bug38179.phpt
+++ b/ext/gd/tests/bug38179.phpt
@@ -25,4 +25,3 @@ imagedestroy($src); imagedestroy($dst_tc);
?>
--EXPECTF--
46FF0000
-
diff --git a/ext/gd/tests/bug38212-mb.phpt b/ext/gd/tests/bug38212-mb.phpt
index 905865f28f..266e470de0 100644
--- a/ext/gd/tests/bug38212-mb.phpt
+++ b/ext/gd/tests/bug38212-mb.phpt
@@ -14,5 +14,4 @@ $im = imagecreatefromgd2part($file, 0,0, -25,10);
unlink($file);
?>
--EXPECTF--
-
Warning: imagecreatefromgd2part(): Zero width or height not allowed in %s on line %d
diff --git a/ext/gd/tests/bug38212.phpt b/ext/gd/tests/bug38212.phpt
index 7548008a62..1459bb000d 100644
--- a/ext/gd/tests/bug38212.phpt
+++ b/ext/gd/tests/bug38212.phpt
@@ -14,5 +14,4 @@ $im = imagecreatefromgd2part($file, 0,0, -25,10);
unlink($file);
?>
--EXPECTF--
-
Warning: imagecreatefromgd2part(): Zero width or height not allowed in %s on line %d
diff --git a/ext/gd/tests/bug39286-mb.phpt b/ext/gd/tests/bug39286-mb.phpt
index d926fac38e..87390cb489 100644
--- a/ext/gd/tests/bug39286-mb.phpt
+++ b/ext/gd/tests/bug39286-mb.phpt
@@ -9,5 +9,4 @@ Bug #39508 (imagefill crashes with small images 3 pixels or less)
$img =imagecreatefromgd2part("foo私はガラスを食べられます.png",0, 100, 0, 100);
?>
--EXPECTF--
-
Warning: imagecreatefromgd2part(): Zero width or height not allowed in %s on line %d
diff --git a/ext/gd/tests/bug39286.phpt b/ext/gd/tests/bug39286.phpt
index 9171fb7f06..4fe4769a7b 100644
--- a/ext/gd/tests/bug39286.phpt
+++ b/ext/gd/tests/bug39286.phpt
@@ -9,5 +9,4 @@ Bug #39508 (imagefill crashes with small images 3 pixels or less)
$img =imagecreatefromgd2part("foo.png",0, 100, 0, 100);
?>
--EXPECTF--
-
Warning: imagecreatefromgd2part(): Zero width or height not allowed in %s on line %d
diff --git a/ext/gd/tests/bug39780.phpt b/ext/gd/tests/bug39780.phpt
index 964cf6953b..7bf9f56cb0 100644
--- a/ext/gd/tests/bug39780.phpt
+++ b/ext/gd/tests/bug39780.phpt
@@ -12,7 +12,6 @@ $im = imagecreatefrompng(dirname(__FILE__) . '/bug39780.png');
var_dump($im);
?>
--EXPECTF--
-
Warning: imagecreatefrompng(): gd-png: fatal libpng error: Read Error: truncated data in %s on line %d
Warning: imagecreatefrompng(): gd-png error: setjmp returns error condition in %s on line %d
diff --git a/ext/gd/tests/bug39780_extern.phpt b/ext/gd/tests/bug39780_extern.phpt
index 79ed4f2cf4..65c3859c6a 100644
--- a/ext/gd/tests/bug39780_extern.phpt
+++ b/ext/gd/tests/bug39780_extern.phpt
@@ -15,4 +15,4 @@ var_dump($im);
gd-png: fatal libpng error: Read Error: truncated data
gd-png error: setjmp returns error condition 2
Warning: imagecreatefrompng(): '%sbug39780.png' is not a valid PNG file in /%s on line %d
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/gd/tests/bug42434.phpt b/ext/gd/tests/bug42434.phpt
index 9067500090..6c0d35e30a 100644
--- a/ext/gd/tests/bug42434.phpt
+++ b/ext/gd/tests/bug42434.phpt
@@ -24,4 +24,4 @@ if (imagecolorat($im, 9, 0) == 0x000000) {
imagedestroy($im);
?>
--EXPECTF--
-DONE \ No newline at end of file
+DONE
diff --git a/ext/gd/tests/bug45799.phpt b/ext/gd/tests/bug45799.phpt
index a28f940b76..34fafa9423 100644
--- a/ext/gd/tests/bug45799.phpt
+++ b/ext/gd/tests/bug45799.phpt
@@ -11,5 +11,4 @@ imagepng($img);
imagedestroy($img);
?>
--EXPECTF--
-
Warning: imagepng(): gd-png error: no colors in palette in %s on line %d
diff --git a/ext/gd/tests/bug49600.phpt b/ext/gd/tests/bug49600.phpt
index 068f8f36a8..609ed9fd29 100644
--- a/ext/gd/tests/bug49600.phpt
+++ b/ext/gd/tests/bug49600.phpt
@@ -29,4 +29,4 @@ foreach (array("E", "I", "P", "g", "i", "q") as $c)
echo 'OK';
?>
--EXPECTF--
-OK \ No newline at end of file
+OK
diff --git a/ext/gd/tests/bug66356.phpt b/ext/gd/tests/bug66356.phpt
index 583d74942c..eb19112183 100644
--- a/ext/gd/tests/bug66356.phpt
+++ b/ext/gd/tests/bug66356.phpt
@@ -46,4 +46,4 @@ resource(%d) of type (gd)
Warning: imagecrop(): gd warning: product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
in %sbug66356.php on line %d
-bool(false) \ No newline at end of file
+bool(false)
diff --git a/ext/gd/tests/bug70976.phpt b/ext/gd/tests/bug70976.phpt
index dfbd4b49ec..7c9bb125f9 100644
--- a/ext/gd/tests/bug70976.phpt
+++ b/ext/gd/tests/bug70976.phpt
@@ -10,4 +10,4 @@ $img = imagerotate(imagecreate(10,10),45,0x7ffffff9);
var_dump($img);
?>
--EXPECTF--
-resource(5) of type (gd) \ No newline at end of file
+resource(5) of type (gd)
diff --git a/ext/gd/tests/bug71912-mb.phpt b/ext/gd/tests/bug71912-mb.phpt
index 5714e107ce..d0bf3a89c2 100644
--- a/ext/gd/tests/bug71912-mb.phpt
+++ b/ext/gd/tests/bug71912-mb.phpt
@@ -11,6 +11,5 @@ imagecreatefromgd2(__DIR__ . DIRECTORY_SEPARATOR . "invalid_neg_size私はガラ
?>
OK
--EXPECTF--
-
Warning: imagecreatefromgd2(): '%s%einvalid_neg_size私はガラスを食べられます.gd2' is not a valid GD2 file in %s%ebug71912-mb.php on line %d
OK
diff --git a/ext/gd/tests/bug71912.phpt b/ext/gd/tests/bug71912.phpt
index 9cb792126d..ed4665f439 100644
--- a/ext/gd/tests/bug71912.phpt
+++ b/ext/gd/tests/bug71912.phpt
@@ -14,6 +14,5 @@ imagecreatefromgd2(__DIR__ . DIRECTORY_SEPARATOR . "invalid_neg_size.gd2");
?>
OK
--EXPECTF--
-
Warning: imagecreatefromgd2(): '%s%einvalid_neg_size.gd2' is not a valid GD2 file in %s%ebug71912.php on line %d
OK
diff --git a/ext/gd/tests/bug71952.phpt b/ext/gd/tests/bug71952.phpt
index f1f66bf26d..5b6830bd63 100644
--- a/ext/gd/tests/bug71952.phpt
+++ b/ext/gd/tests/bug71952.phpt
@@ -11,4 +11,4 @@ imageaffinematrixget(4,$vals[0]);
var_dump($vals[0]);
?>
--EXPECTF--
-string(200) "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" \ No newline at end of file
+string(200) "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
diff --git a/ext/gd/tests/bug72227.phpt b/ext/gd/tests/bug72227.phpt
index 6252be7d0e..fb1b5bde94 100644
--- a/ext/gd/tests/bug72227.phpt
+++ b/ext/gd/tests/bug72227.phpt
@@ -12,4 +12,4 @@ imagescale($img, 13, 1, IMG_BICUBIC);
?>
DONE
--EXPECT--
-DONE \ No newline at end of file
+DONE
diff --git a/ext/gd/tests/bug72298.phpt b/ext/gd/tests/bug72298.phpt
index 512aa8b4c1..a3aa491cbe 100644
--- a/ext/gd/tests/bug72298.phpt
+++ b/ext/gd/tests/bug72298.phpt
@@ -12,4 +12,4 @@ imagetruecolortopalette($img, false, 4);
?>
DONE
--EXPECT--
-DONE \ No newline at end of file
+DONE
diff --git a/ext/gd/tests/bug72512.phpt b/ext/gd/tests/bug72512.phpt
index 3f9e219fc3..e9331ec600 100644
--- a/ext/gd/tests/bug72512.phpt
+++ b/ext/gd/tests/bug72512.phpt
@@ -17,4 +17,3 @@ echo "OK";
?>
--EXPECT--
OK
-
diff --git a/ext/gd/tests/bug72697.phpt b/ext/gd/tests/bug72697.phpt
index d243bd2f14..97bd3bdf88 100644
--- a/ext/gd/tests/bug72697.phpt
+++ b/ext/gd/tests/bug72697.phpt
@@ -14,4 +14,4 @@ imagetruecolortopalette($img, false, PHP_INT_MAX / 8);
DONE
--EXPECTF--
Warning: imagetruecolortopalette(): Number of colors has to be greater than zero and no more than 2147483647 in %sbug72697.php on line %d
-DONE \ No newline at end of file
+DONE
diff --git a/ext/gd/tests/bug72730.phpt b/ext/gd/tests/bug72730.phpt
index a15252ea41..403354d1e2 100644
--- a/ext/gd/tests/bug72730.phpt
+++ b/ext/gd/tests/bug72730.phpt
@@ -12,4 +12,4 @@ imagegammacorrect($img, -1, 1337);
DONE
--EXPECTF--
Warning: imagegammacorrect(): Gamma values should be positive in %sbug72730.php on line %d
-DONE \ No newline at end of file
+DONE
diff --git a/ext/gd/tests/bug73869.phpt b/ext/gd/tests/bug73869.phpt
index 3cc10a4201..16b2edc7a1 100644
--- a/ext/gd/tests/bug73869.phpt
+++ b/ext/gd/tests/bug73869.phpt
@@ -16,4 +16,4 @@ bool(false)
Warning: imagecreatefromgd2(): '%s' is not a valid GD2 file in %s on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/gd/tests/crafted_gd2.phpt b/ext/gd/tests/crafted_gd2.phpt
index 7bcbc4e68b..3fb7c2e004 100644
--- a/ext/gd/tests/crafted_gd2.phpt
+++ b/ext/gd/tests/crafted_gd2.phpt
@@ -11,6 +11,4 @@ Test max colors for a gd image.
imagecreatefromgd(dirname(__FILE__) . '/crafted.gd2');
?>
--EXPECTF--
-
Warning: imagecreatefromgd(): '%scrafted.gd2' is not a valid GD file in %s on line %d
-
diff --git a/ext/gd/tests/gd_info_error.phpt b/ext/gd/tests/gd_info_error.phpt
index 15a26e4a49..7b887c4255 100644
--- a/ext/gd/tests/gd_info_error.phpt
+++ b/ext/gd/tests/gd_info_error.phpt
@@ -35,4 +35,4 @@ bool(false)
Warning: gd_info() expects exactly 0 parameters, 2 given in %s on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/gd/tests/imagealphablending_error1.phpt b/ext/gd/tests/imagealphablending_error1.phpt
index 6d49f32b07..4f7607b5dd 100644
--- a/ext/gd/tests/imagealphablending_error1.phpt
+++ b/ext/gd/tests/imagealphablending_error1.phpt
@@ -1,19 +1,15 @@
--TEST--
test imagealphablending without arguments
-
--CREDITS--
Marcelo Diniz <marcelo.leo27 [at] gmail [dot] com
‪#‎phpspMaisTestFest PHPSP on 2014-07-05
-
--SKIPIF--
<?php
if (!extension_loaded('gd')) die("skip gd extension not available.");
?>
-
--FILE--
<?php
imagealphablending();
?>
-
--EXPECTF--
-Warning: imagealphablending() expects exactly 2 parameters, 0 given in %s on line %d \ No newline at end of file
+Warning: imagealphablending() expects exactly 2 parameters, 0 given in %s on line %d
diff --git a/ext/gd/tests/imagecolorallocate_basic.phpt b/ext/gd/tests/imagecolorallocate_basic.phpt
index 874501dd4a..135d7f45a8 100644
--- a/ext/gd/tests/imagecolorallocate_basic.phpt
+++ b/ext/gd/tests/imagecolorallocate_basic.phpt
@@ -32,4 +32,4 @@ int(16711680)
int(65280)
int(255)
int(16777215)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/gd/tests/imagecolorallocate_error.phpt b/ext/gd/tests/imagecolorallocate_error.phpt
index b584e18634..c2ed9446d6 100644
--- a/ext/gd/tests/imagecolorallocate_error.phpt
+++ b/ext/gd/tests/imagecolorallocate_error.phpt
@@ -46,4 +46,4 @@ NULL
Warning: imagecolorallocate() expects exactly 4 parameters, 3 given in %s on line %d
NULL
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/gd/tests/imagecolorallocate_variation3.phpt b/ext/gd/tests/imagecolorallocate_variation3.phpt
index 0066810991..7a6254ab55 100644
--- a/ext/gd/tests/imagecolorallocate_variation3.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation3.phpt
@@ -211,4 +211,4 @@ int(655370)
Warning: imagecolorallocate() expects parameter 3 to be integer, resource given in %s on line %d
NULL
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/gd/tests/imagecolorallocatealpha_basic.phpt b/ext/gd/tests/imagecolorallocatealpha_basic.phpt
index 536e2cf842..e7b5807bbc 100644
--- a/ext/gd/tests/imagecolorallocatealpha_basic.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_basic.phpt
@@ -26,4 +26,4 @@ var_dump($corA);
?>
--EXPECT--
The images are equal.
-int(842163455) \ No newline at end of file
+int(842163455)
diff --git a/ext/gd/tests/imagecolorallocatealpha_error1.phpt b/ext/gd/tests/imagecolorallocatealpha_error1.phpt
index bba9262422..793c02d106 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error1.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error1.phpt
@@ -22,4 +22,4 @@ Warning: imagecolorallocatealpha() expects parameter 1 to be resource, %s given
Warning: imagecolorallocatealpha() expects parameter 1 to be resource, array given in %s on line %d
-Warning: imagecolorallocatealpha() expects parameter 1 to be resource, null given in %s on line %d \ No newline at end of file
+Warning: imagecolorallocatealpha() expects parameter 1 to be resource, null given in %s on line %d
diff --git a/ext/gd/tests/imagecolorallocatealpha_error2.phpt b/ext/gd/tests/imagecolorallocatealpha_error2.phpt
index 7b50b0b35f..4a6d18b979 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error2.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error2.phpt
@@ -19,4 +19,4 @@ Warning: imagecolorallocatealpha() expects parameter 2 to be integer, %s given i
Warning: imagecolorallocatealpha() expects parameter 2 to be integer, array given in %s on line %d
-Warning: imagecolorallocatealpha() expects parameter 2 to be integer, resource given in %s on line %d \ No newline at end of file
+Warning: imagecolorallocatealpha() expects parameter 2 to be integer, resource given in %s on line %d
diff --git a/ext/gd/tests/imagecolorallocatealpha_error3.phpt b/ext/gd/tests/imagecolorallocatealpha_error3.phpt
index 406d20eea0..2699e7604d 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error3.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error3.phpt
@@ -19,4 +19,4 @@ Warning: imagecolorallocatealpha() expects parameter 3 to be integer, %s given i
Warning: imagecolorallocatealpha() expects parameter 3 to be integer, array given in %s on line %d
-Warning: imagecolorallocatealpha() expects parameter 3 to be integer, resource given in %s on line %d \ No newline at end of file
+Warning: imagecolorallocatealpha() expects parameter 3 to be integer, resource given in %s on line %d
diff --git a/ext/gd/tests/imagecolorallocatealpha_error4.phpt b/ext/gd/tests/imagecolorallocatealpha_error4.phpt
index b0c8f51351..623f450b05 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error4.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error4.phpt
@@ -19,4 +19,4 @@ Warning: imagecolorallocatealpha() expects parameter 4 to be integer, %s given i
Warning: imagecolorallocatealpha() expects parameter 4 to be integer, array given in %s on line %d
-Warning: imagecolorallocatealpha() expects parameter 4 to be integer, resource given in %s on line %d \ No newline at end of file
+Warning: imagecolorallocatealpha() expects parameter 4 to be integer, resource given in %s on line %d
diff --git a/ext/gd/tests/imagecolorallocatealpha_error5.phpt b/ext/gd/tests/imagecolorallocatealpha_error5.phpt
index a4d485b61e..798623c258 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error5.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error5.phpt
@@ -19,4 +19,4 @@ Warning: imagecolorallocatealpha() expects parameter 5 to be integer, %s given i
Warning: imagecolorallocatealpha() expects parameter 5 to be integer, array given in %s on line %d
-Warning: imagecolorallocatealpha() expects parameter 5 to be integer, resource given in %s on line %d \ No newline at end of file
+Warning: imagecolorallocatealpha() expects parameter 5 to be integer, resource given in %s on line %d
diff --git a/ext/gd/tests/imagecolorresolvealpha_error3.phpt b/ext/gd/tests/imagecolorresolvealpha_error3.phpt
index 735b4c97db..586e1f8461 100644
--- a/ext/gd/tests/imagecolorresolvealpha_error3.phpt
+++ b/ext/gd/tests/imagecolorresolvealpha_error3.phpt
@@ -1,19 +1,15 @@
--TEST--
test imagecolorresolvealpha without arguments
-
--CREDITS--
Marcelo Diniz <marcelo.leo27 [at] gmail [dot] com
‪#‎phpspMaisTestFest PHPSP on 2014-07-05
-
--SKIPIF--
<?php
if (!extension_loaded('gd')) die("skip gd extension not available.");
?>
-
--FILE--
<?php
imagecolorresolvealpha();
?>
-
--EXPECTF--
-Warning: imagecolorresolvealpha() expects exactly 5 parameters, 0 given in %s on line %d \ No newline at end of file
+Warning: imagecolorresolvealpha() expects exactly 5 parameters, 0 given in %s on line %d
diff --git a/ext/gd/tests/imagecolorstotal_basic.phpt b/ext/gd/tests/imagecolorstotal_basic.phpt
index 771ce429f7..b6ceafe333 100644
--- a/ext/gd/tests/imagecolorstotal_basic.phpt
+++ b/ext/gd/tests/imagecolorstotal_basic.phpt
@@ -33,4 +33,4 @@ imagedestroy($im);
--EXPECTF--
*** Testing imagecolorstotal() : basic functionality ***
Total colors in image: 128
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/gd/tests/imagecreatetruecolor_error3.phpt b/ext/gd/tests/imagecreatetruecolor_error3.phpt
index 3982e8aceb..932cad5ea2 100644
--- a/ext/gd/tests/imagecreatetruecolor_error3.phpt
+++ b/ext/gd/tests/imagecreatetruecolor_error3.phpt
@@ -18,4 +18,4 @@ Warning: imagecreatetruecolor() expects exactly 2 parameters, 0 given in %s on l
Warning: imagecreatetruecolor() expects exactly 2 parameters, 1 given in %s on line %d
-Warning: imagecreatetruecolor() expects exactly 2 parameters, 3 given in %s on line %d \ No newline at end of file
+Warning: imagecreatetruecolor() expects exactly 2 parameters, 3 given in %s on line %d
diff --git a/ext/gd/tests/imagefilltoborder_error6.phpt b/ext/gd/tests/imagefilltoborder_error6.phpt
index 03ac65be9c..421c5932ee 100644
--- a/ext/gd/tests/imagefilltoborder_error6.phpt
+++ b/ext/gd/tests/imagefilltoborder_error6.phpt
@@ -25,5 +25,3 @@ imagefilltoborder( $image_foo, 50, 50, imagecolorallocate( $image, 0, 0, 0 ), im
?>
--EXPECTF--
Warning: imagefilltoborder(): supplied resource is not a valid Image resource in %s on line %d
-
-
diff --git a/ext/gd/tests/imageflip.phpt b/ext/gd/tests/imageflip.phpt
index 8a439075f2..7f0d2f366a 100644
--- a/ext/gd/tests/imageflip.phpt
+++ b/ext/gd/tests/imageflip.phpt
@@ -27,4 +27,4 @@ var_dump(dechex(imagecolorat($im, 98, 98)));
string(2) "ff"
string(4) "ff00"
string(6) "ff0000"
-string(2) "ff" \ No newline at end of file
+string(2) "ff"
diff --git a/ext/gd/tests/imagegd2_nullbyte_injection.phpt b/ext/gd/tests/imagegd2_nullbyte_injection.phpt
index 278a4a8023..2370d5036e 100644
--- a/ext/gd/tests/imagegd2_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagegd2_nullbyte_injection.phpt
@@ -26,7 +26,6 @@ imagegd2($image, $temp);
var_dump(file_exists($tempdir. "/test1"));
var_dump(file_exists($tempdir. "/test1.tmp"));
foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
-
--EXPECTF--
imagegd2 TEST
diff --git a/ext/gd/tests/imagegd_nullbyte_injection.phpt b/ext/gd/tests/imagegd_nullbyte_injection.phpt
index 1ef9354919..25e54fe36c 100644
--- a/ext/gd/tests/imagegd_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagegd_nullbyte_injection.phpt
@@ -26,7 +26,6 @@ imagegd($image, $temp);
var_dump(file_exists($tempdir. "/test1"));
var_dump(file_exists($tempdir. "/test1.tmp"));
foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
-
--EXPECTF--
imagegd TEST
diff --git a/ext/gd/tests/imagegif_nullbyte_injection.phpt b/ext/gd/tests/imagegif_nullbyte_injection.phpt
index 44b1be144f..26cddf3400 100644
--- a/ext/gd/tests/imagegif_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagegif_nullbyte_injection.phpt
@@ -30,7 +30,6 @@ imagegif($image, $temp);
var_dump(file_exists($tempdir. "/test1"));
var_dump(file_exists($tempdir. "/test1.tmp"));
foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
-
--EXPECTF--
imagegif TEST
diff --git a/ext/gd/tests/imageistruecolor_basic.phpt b/ext/gd/tests/imageistruecolor_basic.phpt
index d43052db7d..fa323897ba 100644
--- a/ext/gd/tests/imageistruecolor_basic.phpt
+++ b/ext/gd/tests/imageistruecolor_basic.phpt
@@ -14,4 +14,4 @@ $image = imagecreatetruecolor(180, 30);
var_dump(imageistruecolor($image));
?>
--EXPECT--
-bool(true) \ No newline at end of file
+bool(true)
diff --git a/ext/gd/tests/imageistruecolor_error1.phpt b/ext/gd/tests/imageistruecolor_error1.phpt
index 8b3033c39b..ab0a9fe653 100644
--- a/ext/gd/tests/imageistruecolor_error1.phpt
+++ b/ext/gd/tests/imageistruecolor_error1.phpt
@@ -21,4 +21,4 @@ Warning: imageistruecolor() expects parameter 1 to be resource, string given in
Warning: imageistruecolor(): supplied resource is not a valid Image resource in %s on line %d
-Warning: imageistruecolor() expects parameter 1 to be resource, array given in %s on line %d \ No newline at end of file
+Warning: imageistruecolor() expects parameter 1 to be resource, array given in %s on line %d
diff --git a/ext/gd/tests/imagejpeg_nullbyte_injection.phpt b/ext/gd/tests/imagejpeg_nullbyte_injection.phpt
index 4a45fa3c47..3d49584791 100644
--- a/ext/gd/tests/imagejpeg_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagejpeg_nullbyte_injection.phpt
@@ -30,7 +30,6 @@ imagejpeg($image, $temp);
var_dump(file_exists($tempdir. "/test1"));
var_dump(file_exists($tempdir. "/test1.tmp"));
foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
-
--EXPECTF--
imagejpeg TEST
diff --git a/ext/gd/tests/imagepng_nullbyte_injection.phpt b/ext/gd/tests/imagepng_nullbyte_injection.phpt
index 9a5b7c39ea..56ba6462e4 100644
--- a/ext/gd/tests/imagepng_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagepng_nullbyte_injection.phpt
@@ -30,7 +30,6 @@ imagepng($image, $temp);
var_dump(file_exists($tempdir. "/test1"));
var_dump(file_exists($tempdir. "/test1.tmp"));
foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
-
--EXPECTF--
imagepng TEST
diff --git a/ext/gd/tests/imagerectangle_error2.phpt b/ext/gd/tests/imagerectangle_error2.phpt
index dd84ff414a..4e2e665bda 100644
--- a/ext/gd/tests/imagerectangle_error2.phpt
+++ b/ext/gd/tests/imagerectangle_error2.phpt
@@ -16,4 +16,4 @@ $image = tmpfile();
imagerectangle( $image, 0, 0, 50, 50, 2 );
?>
--EXPECTF--
-Warning: imagerectangle(): supplied resource is not a valid Image resource in %s on line %d \ No newline at end of file
+Warning: imagerectangle(): supplied resource is not a valid Image resource in %s on line %d
diff --git a/ext/gd/tests/imagesavealpha_error2.phpt b/ext/gd/tests/imagesavealpha_error2.phpt
index 1a7083d526..356d647469 100644
--- a/ext/gd/tests/imagesavealpha_error2.phpt
+++ b/ext/gd/tests/imagesavealpha_error2.phpt
@@ -1,19 +1,15 @@
--TEST--
test imagesavealpha without arguments
-
--CREDITS--
Marcelo Diniz <marcelo.leo27 [at] gmail [dot] com
‪#‎phpspMaisTestFest PHPSP on 2014-07-05
-
--SKIPIF--
<?php
if (!extension_loaded('gd')) die("skip gd extension not available.");
?>
-
--FILE--
<?php
imagesavealpha();
?>
-
--EXPECTF--
-Warning: imagesavealpha() expects exactly 2 parameters, 0 given in %s on line %d \ No newline at end of file
+Warning: imagesavealpha() expects exactly 2 parameters, 0 given in %s on line %d
diff --git a/ext/gd/tests/imagesetthickness_error1.phpt b/ext/gd/tests/imagesetthickness_error1.phpt
index 112f9df863..f54270afbc 100644
--- a/ext/gd/tests/imagesetthickness_error1.phpt
+++ b/ext/gd/tests/imagesetthickness_error1.phpt
@@ -19,4 +19,4 @@ Warning: imagesetthickness() expects parameter 1 to be resource, %s given in %s
Warning: imagesetthickness() expects parameter 1 to be resource, array given in %s on line %d
-Warning: imagesetthickness(): supplied resource is not a valid Image resource in %s on line %d \ No newline at end of file
+Warning: imagesetthickness(): supplied resource is not a valid Image resource in %s on line %d
diff --git a/ext/gd/tests/imagesetthickness_error2.phpt b/ext/gd/tests/imagesetthickness_error2.phpt
index 01050bce09..0f33de0092 100644
--- a/ext/gd/tests/imagesetthickness_error2.phpt
+++ b/ext/gd/tests/imagesetthickness_error2.phpt
@@ -21,4 +21,4 @@ Warning: imagesetthickness() expects parameter 2 to be integer, string given in
Warning: imagesetthickness() expects parameter 2 to be integer, array given in %s on line %d
-Warning: imagesetthickness() expects parameter 2 to be integer, resource given in %s on line %d \ No newline at end of file
+Warning: imagesetthickness() expects parameter 2 to be integer, resource given in %s on line %d
diff --git a/ext/gd/tests/imagetruecolortopalette_error1.phpt b/ext/gd/tests/imagetruecolortopalette_error1.phpt
index 2c3dd0d429..3418449c01 100644
--- a/ext/gd/tests/imagetruecolortopalette_error1.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_error1.phpt
@@ -23,4 +23,4 @@ Warning: imagetruecolortopalette() expects parameter 1 to be resource, %s given
Warning: imagetruecolortopalette() expects parameter 1 to be resource, array given in %s on line %d
-Warning: imagetruecolortopalette() expects parameter 1 to be resource, null given in %s on line %d \ No newline at end of file
+Warning: imagetruecolortopalette() expects parameter 1 to be resource, null given in %s on line %d
diff --git a/ext/gd/tests/imagetruecolortopalette_error2.phpt b/ext/gd/tests/imagetruecolortopalette_error2.phpt
index afc9c3b058..0536df70f2 100644
--- a/ext/gd/tests/imagetruecolortopalette_error2.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_error2.phpt
@@ -19,4 +19,4 @@ imagetruecolortopalette($image, array(), 2);
--EXPECTF--
Warning: imagetruecolortopalette() expects parameter 2 to be boolean, resource given in %s on line %d
-Warning: imagetruecolortopalette() expects parameter 2 to be boolean, array given in %s on line %d \ No newline at end of file
+Warning: imagetruecolortopalette() expects parameter 2 to be boolean, array given in %s on line %d
diff --git a/ext/gd/tests/imagettftext_charmap_order.phpt b/ext/gd/tests/imagettftext_charmap_order.phpt
index 221e6b851a..850ca806b6 100644
--- a/ext/gd/tests/imagettftext_charmap_order.phpt
+++ b/ext/gd/tests/imagettftext_charmap_order.phpt
@@ -63,4 +63,4 @@ if ($black_pixels >= 10) {
imagedestroy($im);
?>
--EXPECTF--
-SUCCESS %d black pixels \ No newline at end of file
+SUCCESS %d black pixels
diff --git a/ext/gd/tests/imagewbmp_nullbyte_injection.phpt b/ext/gd/tests/imagewbmp_nullbyte_injection.phpt
index 54a5749605..1d3e460444 100644
--- a/ext/gd/tests/imagewbmp_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagewbmp_nullbyte_injection.phpt
@@ -30,7 +30,6 @@ imagewbmp($image, $temp);
var_dump(file_exists($tempdir. "/test1"));
var_dump(file_exists($tempdir. "/test1.tmp"));
foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
-
--EXPECTF--
imagewbmp TEST
diff --git a/ext/gd/tests/libgd00086.phpt b/ext/gd/tests/libgd00086.phpt
index 4c909343ca..7756b34d5a 100644
--- a/ext/gd/tests/libgd00086.phpt
+++ b/ext/gd/tests/libgd00086.phpt
@@ -12,7 +12,6 @@ $im = imagecreatefrompng(dirname(__FILE__) . '/libgd00086.png');
var_dump($im);
?>
--EXPECTF--
-
Warning: imagecreatefrompng(): gd-png: fatal libpng error: Read Error: truncated data in %s on line %d
Warning: imagecreatefrompng(): gd-png error: setjmp returns error condition in %s on line %d
diff --git a/ext/gd/tests/libgd00094-mb.phpt b/ext/gd/tests/libgd00094-mb.phpt
index c18b4fd3d1..8a14ceba1e 100644
--- a/ext/gd/tests/libgd00094-mb.phpt
+++ b/ext/gd/tests/libgd00094-mb.phpt
@@ -13,4 +13,3 @@ var_dump($im);
--EXPECTF--
Warning: imagecreatefromxbm(): '%slibgd00094私はガラスを食べられます.xbm' is not a valid XBM file in %slibgd00094-mb.php on line %d
bool(false)
-
diff --git a/ext/gd/tests/libgd00094.phpt b/ext/gd/tests/libgd00094.phpt
index d06afc4729..f658fc64cf 100644
--- a/ext/gd/tests/libgd00094.phpt
+++ b/ext/gd/tests/libgd00094.phpt
@@ -13,4 +13,3 @@ var_dump($im);
--EXPECTF--
Warning: imagecreatefromxbm(): '%slibgd00094.xbm' is not a valid XBM file in %slibgd00094.php on line %d
bool(false)
-
diff --git a/ext/gd/tests/lines.phpt b/ext/gd/tests/lines.phpt
index 2c999695e9..dda8497222 100644
--- a/ext/gd/tests/lines.phpt
+++ b/ext/gd/tests/lines.phpt
@@ -105,7 +105,6 @@ if ($p3) {
?>
--EXPECTF--
-
Warning: imageline() expects exactly 6 parameters, 5 given in %s on line %d
Horizontal: ok
Vertical: ok