summaryrefslogtreecommitdiff
path: root/ext/gd
diff options
context:
space:
mode:
Diffstat (limited to 'ext/gd')
-rw-r--r--ext/gd/tests/001-mb.phpt2
-rw-r--r--ext/gd/tests/001.phpt2
-rw-r--r--ext/gd/tests/bug38179.phpt2
-rw-r--r--ext/gd/tests/bug40764.phpt4
-rw-r--r--ext/gd/tests/bug41442.phpt4
-rw-r--r--ext/gd/tests/bug48555.phpt2
-rw-r--r--ext/gd/tests/bug50194.phpt2
-rw-r--r--ext/gd/tests/bug53156.phpt4
-rw-r--r--ext/gd/tests/bug72298.phpt2
-rw-r--r--ext/gd/tests/bug72339.phpt2
-rw-r--r--ext/gd/tests/bug72697.phpt2
-rw-r--r--ext/gd/tests/bug72730.phpt2
-rw-r--r--ext/gd/tests/copypalette.phpt4
-rw-r--r--ext/gd/tests/gd_info_basic.phpt6
-rw-r--r--ext/gd/tests/github_bug_215.phpt16
-rw-r--r--ext/gd/tests/imageantialias_error1.phpt2
-rw-r--r--ext/gd/tests/imageantialias_error2.phpt2
-rw-r--r--ext/gd/tests/imagearc_basic.phpt2
-rw-r--r--ext/gd/tests/imagearc_error1.phpt2
-rw-r--r--ext/gd/tests/imagearc_variation1.phpt2
-rw-r--r--ext/gd/tests/imagearc_variation2.phpt2
-rw-r--r--ext/gd/tests/imagechar_basic.phpt2
-rw-r--r--ext/gd/tests/imagechar_error1.phpt2
-rw-r--r--ext/gd/tests/imagechar_error2.phpt2
-rw-r--r--ext/gd/tests/imagechar_error3.phpt2
-rw-r--r--ext/gd/tests/imagechar_error4.phpt2
-rw-r--r--ext/gd/tests/imagechar_error5.phpt2
-rw-r--r--ext/gd/tests/imagechar_error6.phpt2
-rw-r--r--ext/gd/tests/imagechar_error7.phpt2
-rw-r--r--ext/gd/tests/imagecharup_basic.phpt2
-rw-r--r--ext/gd/tests/imagecharup_error1.phpt2
-rw-r--r--ext/gd/tests/imagecharup_error2.phpt2
-rw-r--r--ext/gd/tests/imagecharup_error3.phpt2
-rw-r--r--ext/gd/tests/imagecharup_error4.phpt2
-rw-r--r--ext/gd/tests/imagecharup_error5.phpt2
-rw-r--r--ext/gd/tests/imagecharup_error6.phpt2
-rw-r--r--ext/gd/tests/imagecharup_error7.phpt2
-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_variation1.phpt6
-rw-r--r--ext/gd/tests/imagecolorallocate_variation2.phpt6
-rw-r--r--ext/gd/tests/imagecolorallocate_variation3.phpt6
-rw-r--r--ext/gd/tests/imagecolorallocate_variation4.phpt4
-rw-r--r--ext/gd/tests/imagecolorallocate_variation5.phpt2
-rw-r--r--ext/gd/tests/imagecolorallocate_variation6.phpt4
-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/imagecolordeallocate_basic.phpt2
-rw-r--r--ext/gd/tests/imagecolordeallocate_error1.phpt2
-rw-r--r--ext/gd/tests/imagecolordeallocate_error2.phpt2
-rw-r--r--ext/gd/tests/imagecolordeallocate_error3.phpt2
-rw-r--r--ext/gd/tests/imagecolordeallocate_error4.phpt2
-rw-r--r--ext/gd/tests/imagecolormatch_basic.phpt2
-rw-r--r--ext/gd/tests/imagecolormatch_error1.phpt2
-rw-r--r--ext/gd/tests/imagecolormatch_error2.phpt2
-rw-r--r--ext/gd/tests/imagecolormatch_error3.phpt2
-rw-r--r--ext/gd/tests/imagecolormatch_error4.phpt2
-rw-r--r--ext/gd/tests/imagecolorstotal_basic.phpt2
-rw-r--r--ext/gd/tests/imagecolorstotal_error.phpt4
-rw-r--r--ext/gd/tests/imagecolourstotal_basic.phpt2
-rw-r--r--ext/gd/tests/imageconvolution_basic.phpt2
-rw-r--r--ext/gd/tests/imageconvolution_error1.phpt2
-rw-r--r--ext/gd/tests/imageconvolution_error2.phpt2
-rw-r--r--ext/gd/tests/imageconvolution_error3.phpt2
-rw-r--r--ext/gd/tests/imagecopymerge_basic.phpt2
-rw-r--r--ext/gd/tests/imagecopymerge_error.phpt2
-rw-r--r--ext/gd/tests/imagecopymergegray_basic.phpt2
-rw-r--r--ext/gd/tests/imagecopyresampled_basic.phpt14
-rw-r--r--ext/gd/tests/imagecreatetruecolor_basic.phpt2
-rw-r--r--ext/gd/tests/imagecreatetruecolor_error1.phpt2
-rw-r--r--ext/gd/tests/imagecreatetruecolor_error2.phpt2
-rw-r--r--ext/gd/tests/imagecreatetruecolor_error3.phpt2
-rw-r--r--ext/gd/tests/imagecrop_auto-ext.phpt24
-rw-r--r--ext/gd/tests/imagecrop_auto.phpt24
-rw-r--r--ext/gd/tests/imagedashedline_basic.phpt16
-rw-r--r--ext/gd/tests/imageellipse_basic.phpt2
-rw-r--r--ext/gd/tests/imageellipse_error1.phpt2
-rw-r--r--ext/gd/tests/imageellipse_error2.phpt2
-rw-r--r--ext/gd/tests/imageellipse_error3.phpt2
-rw-r--r--ext/gd/tests/imageellipse_error4.phpt2
-rw-r--r--ext/gd/tests/imageellipse_error5.phpt2
-rw-r--r--ext/gd/tests/imageellipse_error7.phpt24
-rw-r--r--ext/gd/tests/imageellipse_error8.phpt2
-rw-r--r--ext/gd/tests/imagefill_1.phpt2
-rw-r--r--ext/gd/tests/imagefilledarc_basic.phpt2
-rw-r--r--ext/gd/tests/imagefilledarc_error1.phpt2
-rw-r--r--ext/gd/tests/imagefilledarc_variation1.phpt2
-rw-r--r--ext/gd/tests/imagefilledarc_variation2.phpt2
-rw-r--r--ext/gd/tests/imagefilledellipse_basic.phpt2
-rw-r--r--ext/gd/tests/imagefilledpolygon_basic.phpt22
-rw-r--r--ext/gd/tests/imagefilledpolygon_negative.phpt4
-rw-r--r--ext/gd/tests/imagefilltoborder_basic.phpt18
-rw-r--r--ext/gd/tests/imagefilltoborder_error1.phpt16
-rw-r--r--ext/gd/tests/imagefilltoborder_error2.phpt16
-rw-r--r--ext/gd/tests/imagefilltoborder_error3.phpt16
-rw-r--r--ext/gd/tests/imagefilltoborder_error4.phpt16
-rw-r--r--ext/gd/tests/imagefilltoborder_error5.phpt16
-rw-r--r--ext/gd/tests/imagefilltoborder_error6.phpt16
-rw-r--r--ext/gd/tests/imagefilltoborder_error7.phpt16
-rw-r--r--ext/gd/tests/imagefilter.phpt16
-rw-r--r--ext/gd/tests/imagefilter_error1.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error10.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error11.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error12.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error13.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error14.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error15.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error16.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error17.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error18.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error19.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error2.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error20.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error3.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error4.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error5.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error6.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error7.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error8.phpt2
-rw-r--r--ext/gd/tests/imagefilter_error9.phpt2
-rw-r--r--ext/gd/tests/imageflip.phpt16
-rw-r--r--ext/gd/tests/imagefontheight_basic.phpt2
-rw-r--r--ext/gd/tests/imagefontheight_error1.phpt2
-rw-r--r--ext/gd/tests/imagefontwidth_basic.phpt2
-rw-r--r--ext/gd/tests/imagefontwidth_error1.phpt2
-rw-r--r--ext/gd/tests/imagefttext.phpt2
-rw-r--r--ext/gd/tests/imagegammacorrect_basic.phpt2
-rw-r--r--ext/gd/tests/imagegammacorrect_error1.phpt2
-rw-r--r--ext/gd/tests/imagegammacorrect_error2.phpt2
-rw-r--r--ext/gd/tests/imagegammacorrect_error3.phpt2
-rw-r--r--ext/gd/tests/imagegammacorrect_error4.phpt2
-rw-r--r--ext/gd/tests/imagegammacorrect_variation1.phpt2
-rw-r--r--ext/gd/tests/imagegammacorrect_variation2.phpt4
-rw-r--r--ext/gd/tests/imageinterlace_basic.phpt2
-rw-r--r--ext/gd/tests/imageinterlace_error1.phpt2
-rw-r--r--ext/gd/tests/imageinterlace_error2.phpt2
-rw-r--r--ext/gd/tests/imageinterlace_variation1.phpt2
-rw-r--r--ext/gd/tests/imageinterlace_variation2.phpt2
-rw-r--r--ext/gd/tests/imageistruecolor_basic.phpt2
-rw-r--r--ext/gd/tests/imageistruecolor_error1.phpt2
-rw-r--r--ext/gd/tests/imagelayereffect_basic.phpt2
-rw-r--r--ext/gd/tests/imagelayereffect_error1.phpt2
-rw-r--r--ext/gd/tests/imagelayereffect_error2.phpt2
-rw-r--r--ext/gd/tests/imagelayereffect_error3.phpt2
-rw-r--r--ext/gd/tests/imageloadfont_error2.phpt2
-rw-r--r--ext/gd/tests/imageloadfont_invalid.phpt4
-rw-r--r--ext/gd/tests/imagepolygon_basic.phpt12
-rw-r--r--ext/gd/tests/imagepolygon_negative.phpt4
-rw-r--r--ext/gd/tests/imagerectangle_basic.phpt18
-rw-r--r--ext/gd/tests/imagerectangle_error1.phpt16
-rw-r--r--ext/gd/tests/imagerectangle_error2.phpt18
-rw-r--r--ext/gd/tests/imagerectangle_error3.phpt16
-rw-r--r--ext/gd/tests/imagerectangle_error4.phpt16
-rw-r--r--ext/gd/tests/imagerectangle_error5.phpt16
-rw-r--r--ext/gd/tests/imagerectangle_error6.phpt16
-rw-r--r--ext/gd/tests/imagerectangle_error7.phpt16
-rw-r--r--ext/gd/tests/imagerectangle_error8.phpt16
-rw-r--r--ext/gd/tests/imagesetbrush_basic.phpt6
-rw-r--r--ext/gd/tests/imagesetthickness_basic.phpt2
-rw-r--r--ext/gd/tests/imagesetthickness_error1.phpt2
-rw-r--r--ext/gd/tests/imagesetthickness_error2.phpt2
-rw-r--r--ext/gd/tests/imagestring_basic.phpt2
-rw-r--r--ext/gd/tests/imagestring_error1.phpt2
-rw-r--r--ext/gd/tests/imagestring_error2.phpt2
-rw-r--r--ext/gd/tests/imagestring_error3.phpt2
-rw-r--r--ext/gd/tests/imagestring_error4.phpt2
-rw-r--r--ext/gd/tests/imagestring_error5.phpt2
-rw-r--r--ext/gd/tests/imagestring_error6.phpt2
-rw-r--r--ext/gd/tests/imagestring_error7.phpt2
-rw-r--r--ext/gd/tests/imagestringup_basic.phpt2
-rw-r--r--ext/gd/tests/imagestringup_error1.phpt2
-rw-r--r--ext/gd/tests/imagestringup_error2.phpt2
-rw-r--r--ext/gd/tests/imagestringup_error3.phpt2
-rw-r--r--ext/gd/tests/imagestringup_error4.phpt2
-rw-r--r--ext/gd/tests/imagestringup_error6.phpt2
-rw-r--r--ext/gd/tests/imagestringup_error7.phpt2
-rw-r--r--ext/gd/tests/imagetruecolortopalette_basic.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/imagetruecolortopalette_error3.phpt2
-rw-r--r--ext/gd/tests/imagetruecolortopalette_error4.phpt2
-rw-r--r--ext/gd/tests/jpeg2wbmp_error1.phpt2
-rw-r--r--ext/gd/tests/jpeg2wbmp_error2-mb.phpt2
-rw-r--r--ext/gd/tests/jpeg2wbmp_error2.phpt2
-rw-r--r--ext/gd/tests/jpeg2wbmp_error3.phpt2
-rw-r--r--ext/gd/tests/png2wbmp_error1-mb.phpt2
-rw-r--r--ext/gd/tests/png2wbmp_error1.phpt2
-rw-r--r--ext/gd/tests/png2wbmp_error2.phpt2
-rw-r--r--ext/gd/tests/png2wbmp_error3.phpt2
-rw-r--r--ext/gd/tests/xbm2png.phpt4
194 files changed, 420 insertions, 420 deletions
diff --git a/ext/gd/tests/001-mb.phpt b/ext/gd/tests/001-mb.phpt
index 743df7d2c7..9307450f5b 100644
--- a/ext/gd/tests/001-mb.phpt
+++ b/ext/gd/tests/001-mb.phpt
@@ -16,7 +16,7 @@ var_dump(imagecreatefrompng($file));
echo "Done\n";
?>
---EXPECTF--
+--EXPECTF--
Warning: imagecreatefrompng(%s001私はガラスを食べられます.test): failed to open stream: No such file or directory in %s on line %d
bool(false)
diff --git a/ext/gd/tests/001.phpt b/ext/gd/tests/001.phpt
index b0ac2a398f..039511a558 100644
--- a/ext/gd/tests/001.phpt
+++ b/ext/gd/tests/001.phpt
@@ -16,7 +16,7 @@ var_dump(imagecreatefrompng($file));
echo "Done\n";
?>
---EXPECTF--
+--EXPECTF--
Warning: imagecreatefrompng(%s001.test): failed to open stream: No such file or directory in %s on line %d
bool(false)
diff --git a/ext/gd/tests/bug38179.phpt b/ext/gd/tests/bug38179.phpt
index 8adc389228..07becd0703 100644
--- a/ext/gd/tests/bug38179.phpt
+++ b/ext/gd/tests/bug38179.phpt
@@ -1,5 +1,5 @@
--TEST--
-Bug #38179 (imagecopy from a palette to a truecolor image loses alpha channel)
+Bug #38179 (imagecopy from a palette to a truecolor image loses alpha channel)
--SKIPIF--
<?php
if (!function_exists('imagecopy')) die("skip gd extension not available\n");
diff --git a/ext/gd/tests/bug40764.phpt b/ext/gd/tests/bug40764.phpt
index cbe262fe7a..3802094e25 100644
--- a/ext/gd/tests/bug40764.phpt
+++ b/ext/gd/tests/bug40764.phpt
@@ -1,8 +1,8 @@
--TEST--
Bug #40764 (line thickness not respected for horizontal and vertical lines)
--SKIPIF--
-<?php
- if (!extension_loaded('gd')) die("skip gd extension not available\n");
+<?php
+ if (!extension_loaded('gd')) die("skip gd extension not available\n");
?>
--FILE--
<?php
diff --git a/ext/gd/tests/bug41442.phpt b/ext/gd/tests/bug41442.phpt
index 78a61bec95..ba5950dd15 100644
--- a/ext/gd/tests/bug41442.phpt
+++ b/ext/gd/tests/bug41442.phpt
@@ -1,7 +1,7 @@
--TEST--
Bug #41442 (imagegd2() under output control)
--SKIPIF--
-<?php
+<?php
if (!extension_loaded('gd')) {
die("skip gd extension not available.");
}
@@ -31,7 +31,7 @@ var_dump(imagecreatefromstring($str2));
echo "Done\n";
?>
---EXPECTF--
+--EXPECTF--
resource(%d) of type (gd)
resource(%d) of type (gd)
Done
diff --git a/ext/gd/tests/bug48555.phpt b/ext/gd/tests/bug48555.phpt
index d378aafd8e..43e14db05f 100644
--- a/ext/gd/tests/bug48555.phpt
+++ b/ext/gd/tests/bug48555.phpt
@@ -21,7 +21,7 @@ var_dump($with_line_break);
if ($with_line_break==$without_line_break) {
echo "with line break == without line break".PHP_EOL;
} else {
- echo "with line break != without line break".PHP_EOL;
+ echo "with line break != without line break".PHP_EOL;
}
?>
diff --git a/ext/gd/tests/bug50194.phpt b/ext/gd/tests/bug50194.phpt
index f68165be42..0ccab83063 100644
--- a/ext/gd/tests/bug50194.phpt
+++ b/ext/gd/tests/bug50194.phpt
@@ -13,7 +13,7 @@ require_once __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
$im = imagecreatetruecolor(240, 55);
$background = imagecolorallocatealpha($im, 60, 60, 60, 0); // no tranparency
$black = imagecolorallocate($im, 0, 0, 0);
-imagealphablending($im, false);
+imagealphablending($im, false);
imagefilledrectangle($im, 0, 0, 239, 54, $background);
$text = 'Testing ... ';
$font = __DIR__ . DIRECTORY_SEPARATOR . 'Tuffy.ttf';
diff --git a/ext/gd/tests/bug53156.phpt b/ext/gd/tests/bug53156.phpt
index ceb37c13c4..63482217a8 100644
--- a/ext/gd/tests/bug53156.phpt
+++ b/ext/gd/tests/bug53156.phpt
@@ -12,7 +12,7 @@ if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3', '<')) {
function draw_and_check_pixel($x, $y)
{
global $img, $black, $red;
-
+
echo (imagecolorat($img, $x, $y) === $black) ? '+' : '-';
imagesetpixel($img, $x, $y, $red);
}
@@ -20,7 +20,7 @@ function draw_and_check_pixel($x, $y)
function draw_and_check_rectangle($x1, $y1, $x2, $y2)
{
global $img, $black;
-
+
echo 'Rectangle: ';
imagerectangle($img, $x1, $y1, $x2, $y2, $black);
$x = ($x1 + $x2) / 2;
diff --git a/ext/gd/tests/bug72298.phpt b/ext/gd/tests/bug72298.phpt
index 7fba241ed1..512aa8b4c1 100644
--- a/ext/gd/tests/bug72298.phpt
+++ b/ext/gd/tests/bug72298.phpt
@@ -6,7 +6,7 @@ Bug #72298: pass2_no_dither out-of-bounds access
?>
--FILE--
<?php
-$img = imagecreatetruecolor (1 , 1);
+$img = imagecreatetruecolor (1 , 1);
imagecolortransparent($img, 0);
imagetruecolortopalette($img, false, 4);
?>
diff --git a/ext/gd/tests/bug72339.phpt b/ext/gd/tests/bug72339.phpt
index 20daea8106..5f8a96d552 100644
--- a/ext/gd/tests/bug72339.phpt
+++ b/ext/gd/tests/bug72339.phpt
@@ -31,7 +31,7 @@ if ($im) {
unlink($fname);
?>
---EXPECTF--
+--EXPECTF--
Warning: imagecreatefromgd2(): product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
in %sbug72339.php on line %d
diff --git a/ext/gd/tests/bug72697.phpt b/ext/gd/tests/bug72697.phpt
index 6110385fcb..d243bd2f14 100644
--- a/ext/gd/tests/bug72697.phpt
+++ b/ext/gd/tests/bug72697.phpt
@@ -1,7 +1,7 @@
--TEST--
Bug #72697: select_colors write out-of-bounds
--SKIPIF--
-<?php
+<?php
if (!function_exists("imagecreatetruecolor")) die("skip");
if (PHP_INT_MAX !== 9223372036854775807) die("skip for 64-bit long systems only");
?>
diff --git a/ext/gd/tests/bug72730.phpt b/ext/gd/tests/bug72730.phpt
index e7c13cb5e9..a15252ea41 100644
--- a/ext/gd/tests/bug72730.phpt
+++ b/ext/gd/tests/bug72730.phpt
@@ -1,7 +1,7 @@
--TEST--
Bug #72730: imagegammacorrect allows arbitrary write access
--SKIPIF--
-<?php
+<?php
if (!function_exists("imagecreatetruecolor")) die("skip");
?>
--FILE--
diff --git a/ext/gd/tests/copypalette.phpt b/ext/gd/tests/copypalette.phpt
index ec00c030a4..3e29b42a43 100644
--- a/ext/gd/tests/copypalette.phpt
+++ b/ext/gd/tests/copypalette.phpt
@@ -20,7 +20,7 @@ for ($i=0; $i<256; $i++) {
if ($c['red']!=$i || $c['green']!=$i || $c['blue']!=$i) {
$failed = true;
break;
- }
+ }
}
echo "copy palette 255 colors: ";
echo $failed ? 'failed' : 'ok';
@@ -34,7 +34,7 @@ imagepalettecopy($im2, $im);
$c = imagecolorsforindex($im2, 0);
if ($c['red']!=0 || $c['green']!=0 || $c['blue']!=0 || $c['alpha']!=100) {
$failed = true;
-}
+}
echo 'copy palette 1 color and alpha: ';
echo $failed ? 'failed' : 'ok';
echo "\n";
diff --git a/ext/gd/tests/gd_info_basic.phpt b/ext/gd/tests/gd_info_basic.phpt
index 61a2304e8f..b027462a41 100644
--- a/ext/gd/tests/gd_info_basic.phpt
+++ b/ext/gd/tests/gd_info_basic.phpt
@@ -1,7 +1,7 @@
--TEST--
gd_info()
--SKIPIF--
-<?php
+<?php
if (!function_exists('gd_info')) {
die('skip gd_info() not available');
}
@@ -15,9 +15,9 @@ gd_info()
* Alias to functions:
*/
echo "basic test of gd_info() function\n";
-
+
var_dump(gd_info());
-
+
echo "\nDone\n";
?>
--EXPECTF--
diff --git a/ext/gd/tests/github_bug_215.phpt b/ext/gd/tests/github_bug_215.phpt
index 8657f95d76..1426186971 100644
--- a/ext/gd/tests/github_bug_215.phpt
+++ b/ext/gd/tests/github_bug_215.phpt
@@ -1,15 +1,15 @@
---TEST--
+--TEST--
Github #215 (imagefilltoborder stack overflow when invalid pallete index used)
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
+--SKIPIF--
+<?php
+if (!extension_loaded("gd")) die("skip GD not present");
if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
die("skip test requires GD 2.2.2 or higher");
}
-?>
+?>
--FILE--
<?php
-$image = imagecreate( 10, 10 );
+$image = imagecreate( 10, 10 );
$bgd = imagecolorallocate( $image, 0, 0, 0 );
$border = imagecolorallocate( $image, 255, 0, 0 );
$fillcolor = imagecolorallocate( $image, 255, 0, 0 );
@@ -37,8 +37,8 @@ imagefilltoborder( $image, 0,0, $border+10, $fillcolor+10);
echo "#5 passes";
-?>
---EXPECT--
+?>
+--EXPECT--
#1 passes
#2 passes
#3 passes
diff --git a/ext/gd/tests/imageantialias_error1.phpt b/ext/gd/tests/imageantialias_error1.phpt
index 53fe0cc66a..8a9d5315a6 100644
--- a/ext/gd/tests/imageantialias_error1.phpt
+++ b/ext/gd/tests/imageantialias_error1.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource in imageantialias() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imageantialias_error2.phpt b/ext/gd/tests/imageantialias_error2.phpt
index 6bde8fe54a..7971e90cae 100644
--- a/ext/gd/tests/imageantialias_error2.phpt
+++ b/ext/gd/tests/imageantialias_error2.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter passing in imageantialias() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagearc_basic.phpt b/ext/gd/tests/imagearc_basic.phpt
index b4761f2399..0cbacc33dd 100644
--- a/ext/gd/tests/imagearc_basic.phpt
+++ b/ext/gd/tests/imagearc_basic.phpt
@@ -4,7 +4,7 @@ Testing imagearc() of GD library
Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagearc_error1.phpt b/ext/gd/tests/imagearc_error1.phpt
index 1e63406832..5437f3da67 100644
--- a/ext/gd/tests/imagearc_error1.phpt
+++ b/ext/gd/tests/imagearc_error1.phpt
@@ -4,7 +4,7 @@ Testing wrong param passing imagearc() of GD library
Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagearc_variation1.phpt b/ext/gd/tests/imagearc_variation1.phpt
index 1b36eedf29..f84d8d76ec 100644
--- a/ext/gd/tests/imagearc_variation1.phpt
+++ b/ext/gd/tests/imagearc_variation1.phpt
@@ -4,7 +4,7 @@ Testing passing negative end angle to imagearc() of GD library
Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagearc_variation2.phpt b/ext/gd/tests/imagearc_variation2.phpt
index 40227c3750..d4b4afefcd 100644
--- a/ext/gd/tests/imagearc_variation2.phpt
+++ b/ext/gd/tests/imagearc_variation2.phpt
@@ -4,7 +4,7 @@ Testing passing negative start angle to imagearc() of GD library
Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagechar_basic.phpt b/ext/gd/tests/imagechar_basic.phpt
index f238aabae4..3616f449ec 100644
--- a/ext/gd/tests/imagechar_basic.phpt
+++ b/ext/gd/tests/imagechar_basic.phpt
@@ -4,7 +4,7 @@ Testing imagechar() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagechar_error1.phpt b/ext/gd/tests/imagechar_error1.phpt
index 373d3042e4..c91a3ec55b 100644
--- a/ext/gd/tests/imagechar_error1.phpt
+++ b/ext/gd/tests/imagechar_error1.phpt
@@ -4,7 +4,7 @@ Testing error on non-resource parameter 1 of imagechar() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagechar_error2.phpt b/ext/gd/tests/imagechar_error2.phpt
index 02a95994f6..1666788ead 100644
--- a/ext/gd/tests/imagechar_error2.phpt
+++ b/ext/gd/tests/imagechar_error2.phpt
@@ -4,7 +4,7 @@ Testing error on non-image resource parameter 1 of imagechar() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagechar_error3.phpt b/ext/gd/tests/imagechar_error3.phpt
index 5fff2013bf..4db74c6198 100644
--- a/ext/gd/tests/imagechar_error3.phpt
+++ b/ext/gd/tests/imagechar_error3.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 2 of imagechar() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagechar_error4.phpt b/ext/gd/tests/imagechar_error4.phpt
index 9220584ae8..469a732759 100644
--- a/ext/gd/tests/imagechar_error4.phpt
+++ b/ext/gd/tests/imagechar_error4.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 3 of imagechar() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagechar_error5.phpt b/ext/gd/tests/imagechar_error5.phpt
index 7ea0e72a82..b01736eadd 100644
--- a/ext/gd/tests/imagechar_error5.phpt
+++ b/ext/gd/tests/imagechar_error5.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 4 of imagechar() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagechar_error6.phpt b/ext/gd/tests/imagechar_error6.phpt
index eaef2f88c2..4ec608a60c 100644
--- a/ext/gd/tests/imagechar_error6.phpt
+++ b/ext/gd/tests/imagechar_error6.phpt
@@ -4,7 +4,7 @@ Testing error on non-string parameter 5 of imagechar() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagechar_error7.phpt b/ext/gd/tests/imagechar_error7.phpt
index 3d847f3410..b2c7d80b70 100644
--- a/ext/gd/tests/imagechar_error7.phpt
+++ b/ext/gd/tests/imagechar_error7.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 6 of imagechar() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecharup_basic.phpt b/ext/gd/tests/imagecharup_basic.phpt
index 50b0a59613..258f8b6e38 100644
--- a/ext/gd/tests/imagecharup_basic.phpt
+++ b/ext/gd/tests/imagecharup_basic.phpt
@@ -4,7 +4,7 @@ Testing imagecharup() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecharup_error1.phpt b/ext/gd/tests/imagecharup_error1.phpt
index e0b3e318a9..aaa2a2a68f 100644
--- a/ext/gd/tests/imagecharup_error1.phpt
+++ b/ext/gd/tests/imagecharup_error1.phpt
@@ -4,7 +4,7 @@ Testing error on non-resource parameter 1 of imagecharup() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecharup_error2.phpt b/ext/gd/tests/imagecharup_error2.phpt
index b78dc9221e..e2db7bb558 100644
--- a/ext/gd/tests/imagecharup_error2.phpt
+++ b/ext/gd/tests/imagecharup_error2.phpt
@@ -4,7 +4,7 @@ Testing error on non-image resource parameter 1 of imagecharup() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecharup_error3.phpt b/ext/gd/tests/imagecharup_error3.phpt
index 13f716b133..8c614520bb 100644
--- a/ext/gd/tests/imagecharup_error3.phpt
+++ b/ext/gd/tests/imagecharup_error3.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 2 of imagecharup() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecharup_error4.phpt b/ext/gd/tests/imagecharup_error4.phpt
index b403d0eec7..62de44f842 100644
--- a/ext/gd/tests/imagecharup_error4.phpt
+++ b/ext/gd/tests/imagecharup_error4.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 3 of imagecharup() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecharup_error5.phpt b/ext/gd/tests/imagecharup_error5.phpt
index a4a7c88100..42661263d0 100644
--- a/ext/gd/tests/imagecharup_error5.phpt
+++ b/ext/gd/tests/imagecharup_error5.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 4 of imagecharup() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecharup_error6.phpt b/ext/gd/tests/imagecharup_error6.phpt
index a1f12f1ea6..c7f40d576c 100644
--- a/ext/gd/tests/imagecharup_error6.phpt
+++ b/ext/gd/tests/imagecharup_error6.phpt
@@ -4,7 +4,7 @@ Testing error on non-string parameter 5 of imagecharup() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecharup_error7.phpt b/ext/gd/tests/imagecharup_error7.phpt
index c10835daae..207154f11c 100644
--- a/ext/gd/tests/imagecharup_error7.phpt
+++ b/ext/gd/tests/imagecharup_error7.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 6 of imagecharup() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecolorallocate_basic.phpt b/ext/gd/tests/imagecolorallocate_basic.phpt
index 22efeb60e9..426350782e 100644
--- a/ext/gd/tests/imagecolorallocate_basic.phpt
+++ b/ext/gd/tests/imagecolorallocate_basic.phpt
@@ -8,7 +8,7 @@ if(!extension_loaded('gd')) {
if(!function_exists('imagecreatetruecolor')) {
die('skip imagecreatetruecolor function is not available');
}
-?>
+?>
--FILE--
<?php
/* Prototype : int imagecolorallocate(resource im, int red, int green, int blue)
diff --git a/ext/gd/tests/imagecolorallocate_error.phpt b/ext/gd/tests/imagecolorallocate_error.phpt
index 6c685b2c98..518eac74d6 100644
--- a/ext/gd/tests/imagecolorallocate_error.phpt
+++ b/ext/gd/tests/imagecolorallocate_error.phpt
@@ -5,7 +5,7 @@ Test imagecolorallocate() function : error conditions
if(!extension_loaded('gd')) {
die('skip gd extension is not loaded');
}
-?>
+?>
--FILE--
<?php
/* Prototype : int imagecolorallocate(resource im, int red, int green, int blue)
diff --git a/ext/gd/tests/imagecolorallocate_variation1.phpt b/ext/gd/tests/imagecolorallocate_variation1.phpt
index a9e13907aa..b5c5823e8e 100644
--- a/ext/gd/tests/imagecolorallocate_variation1.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation1.phpt
@@ -5,7 +5,7 @@ Test imagecolorallocate() function : usage variations - passing different data
if(!extension_loaded('gd')) {
die('skip gd extension is not loaded');
}
-?>
+?>
--FILE--
<?php
/* Prototype : int imagecolorallocate(resource im, int red, int green, int blue)
@@ -70,7 +70,7 @@ $values = array(
'int indexed array' => $index_array,
'associative array' => $assoc_array,
'nested arrays' => array('foo', $index_array, $assoc_array),
-
+
// null data
'uppercase NULL' => NULL,
'lowercase null' => null,
@@ -100,7 +100,7 @@ $values = array(
// unset data
'unset var' => @$unset_var,
-
+
//resource
"file resource" => $fp
);
diff --git a/ext/gd/tests/imagecolorallocate_variation2.phpt b/ext/gd/tests/imagecolorallocate_variation2.phpt
index 9f631af210..aad888e584 100644
--- a/ext/gd/tests/imagecolorallocate_variation2.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation2.phpt
@@ -9,7 +9,7 @@ if(!function_exists('imagecreatetruecolor')) {
die('skip imagecreatetruecolor function is not available');
}
if (PHP_INT_SIZE != 8) die('skip 64-bit only');
-?>
+?>
--FILE--
<?php
/* Prototype : int imagecolorallocate(resource im, int red, int green, int blue)
@@ -65,7 +65,7 @@ $values = array(
'int indexed array' => $index_array,
'associative array' => $assoc_array,
'nested arrays' => array('foo', $index_array, $assoc_array),
-
+
// null data
'uppercase NULL' => NULL,
'lowercase null' => null,
@@ -95,7 +95,7 @@ $values = array(
// unset data
'unset var' => @$unset_var,
-
+
//resource
"file resource" => $fp
);
diff --git a/ext/gd/tests/imagecolorallocate_variation3.phpt b/ext/gd/tests/imagecolorallocate_variation3.phpt
index 76bb4ba360..62fafb3c89 100644
--- a/ext/gd/tests/imagecolorallocate_variation3.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation3.phpt
@@ -8,7 +8,7 @@ if(!extension_loaded('gd')) {
if(!function_exists('imagecreatetruecolor')) {
die('skip imagecreatetruecolor function is not available');
}
-?>
+?>
--FILE--
<?php
/* Prototype : imagecolorallocate(resource im, int red, int green, int blue)
@@ -64,7 +64,7 @@ $values = array(
'int indexed array' => $index_array,
'associative array' => $assoc_array,
'nested arrays' => array('foo', $index_array, $assoc_array),
-
+
// null data
'uppercase NULL' => NULL,
'lowercase null' => null,
@@ -94,7 +94,7 @@ $values = array(
// unset data
'unset var' => @$unset_var,
-
+
//resource
"file resource" => $fp
);
diff --git a/ext/gd/tests/imagecolorallocate_variation4.phpt b/ext/gd/tests/imagecolorallocate_variation4.phpt
index d1e1f45513..18a9172be5 100644
--- a/ext/gd/tests/imagecolorallocate_variation4.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation4.phpt
@@ -64,7 +64,7 @@ $values = array(
'int indexed array' => $index_array,
'associative array' => $assoc_array,
'nested arrays' => array('foo', $index_array, $assoc_array),
-
+
// null data
'uppercase NULL' => NULL,
'lowercase null' => null,
@@ -94,7 +94,7 @@ $values = array(
// unset data
'unset var' => @$unset_var,
-
+
//resource
"file resource" => $fp
);
diff --git a/ext/gd/tests/imagecolorallocate_variation5.phpt b/ext/gd/tests/imagecolorallocate_variation5.phpt
index 27cdaeb5f7..43b51216c1 100644
--- a/ext/gd/tests/imagecolorallocate_variation5.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation5.phpt
@@ -28,7 +28,7 @@ $values = array(
"Octal 012" => 012,
"Octal -012" => -012,
"Octal 0377" => 0377,
-
+
// hexa-decimal integer data
"Hexa-decimal 0x0" => 0x0,
"Hexa-decimal 0xA" => 0xA,
diff --git a/ext/gd/tests/imagecolorallocate_variation6.phpt b/ext/gd/tests/imagecolorallocate_variation6.phpt
index 48b096cb26..ee74ee974e 100644
--- a/ext/gd/tests/imagecolorallocate_variation6.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation6.phpt
@@ -20,10 +20,10 @@ echo "*** Testing imagecolorallocate() : usage variations ***\n";
$values = array(
//Decimal integera data
"Decimal 256" => 256,
-
+
// octal integer data
"Octal 0400" => 0400,
-
+
// hexa-decimal integer data
"Hexa-decimal 0x100" => 0x100
);
diff --git a/ext/gd/tests/imagecolorallocatealpha_basic.phpt b/ext/gd/tests/imagecolorallocatealpha_basic.phpt
index f0d1e45e6e..536e2cf842 100644
--- a/ext/gd/tests/imagecolorallocatealpha_basic.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_basic.phpt
@@ -3,7 +3,7 @@ Testing imagecolorallocatealpha()
--CREDITS--
Rafael Dohms <rdohms [at] gmail [dot] com>
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
die("skip test requires GD 2.2.2 or higher");
diff --git a/ext/gd/tests/imagecolorallocatealpha_error1.phpt b/ext/gd/tests/imagecolorallocatealpha_error1.phpt
index a9030248bb..bba9262422 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error1.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error1.phpt
@@ -3,7 +3,7 @@ Testing imagecolorallocatealpha(): Wrong types for parameter 1
--CREDITS--
Rafael Dohms <rdohms [at] gmail [dot] com>
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecolorallocatealpha_error2.phpt b/ext/gd/tests/imagecolorallocatealpha_error2.phpt
index f1e82b3779..018f243dc4 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error2.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error2.phpt
@@ -3,7 +3,7 @@ Testing imagecolorallocatealpha(): Wrong types for parameter 2
--CREDITS--
Rafael Dohms <rdohms [at] gmail [dot] com>
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecolorallocatealpha_error3.phpt b/ext/gd/tests/imagecolorallocatealpha_error3.phpt
index 51018f797d..b6afa80e8d 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error3.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error3.phpt
@@ -3,7 +3,7 @@ Testing imagecolorallocatealpha(): Wrong types for parameter 3
--CREDITS--
Rafael Dohms <rdohms [at] gmail [dot] com>
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecolorallocatealpha_error4.phpt b/ext/gd/tests/imagecolorallocatealpha_error4.phpt
index 4c517e5c37..6003bf18b4 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error4.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error4.phpt
@@ -3,7 +3,7 @@ Testing imagecolorallocatealpha(): Wrong types for parameter 4
--CREDITS--
Rafael Dohms <rdohms [at] gmail [dot] com>
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecolorallocatealpha_error5.phpt b/ext/gd/tests/imagecolorallocatealpha_error5.phpt
index f1fcc0df73..5c36b9757d 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error5.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error5.phpt
@@ -3,7 +3,7 @@ Testing imagecolorallocatealpha(): Wrong types for parameter 5
--CREDITS--
Rafael Dohms <rdohms [at] gmail [dot] com>
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecolordeallocate_basic.phpt b/ext/gd/tests/imagecolordeallocate_basic.phpt
index 3c80c690f8..877e8b64c4 100644
--- a/ext/gd/tests/imagecolordeallocate_basic.phpt
+++ b/ext/gd/tests/imagecolordeallocate_basic.phpt
@@ -4,7 +4,7 @@ Testing imagecolordeallocate() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecolordeallocate_error1.phpt b/ext/gd/tests/imagecolordeallocate_error1.phpt
index 6d642d4a26..82460139b6 100644
--- a/ext/gd/tests/imagecolordeallocate_error1.phpt
+++ b/ext/gd/tests/imagecolordeallocate_error1.phpt
@@ -4,7 +4,7 @@ Testing imagecolordeallocate() of GD library with invalid resource type
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecolordeallocate_error2.phpt b/ext/gd/tests/imagecolordeallocate_error2.phpt
index 989e0fd97a..ca880529b8 100644
--- a/ext/gd/tests/imagecolordeallocate_error2.phpt
+++ b/ext/gd/tests/imagecolordeallocate_error2.phpt
@@ -4,7 +4,7 @@ Testing imagecolordeallocate() of GD library with no resource
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecolordeallocate_error3.phpt b/ext/gd/tests/imagecolordeallocate_error3.phpt
index 8000218ade..e9be1ea66a 100644
--- a/ext/gd/tests/imagecolordeallocate_error3.phpt
+++ b/ext/gd/tests/imagecolordeallocate_error3.phpt
@@ -4,7 +4,7 @@ Testing imagecolordeallocate() of GD library with Out of range intergers (Above)
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecolordeallocate_error4.phpt b/ext/gd/tests/imagecolordeallocate_error4.phpt
index 7aaeffebee..22fc2fa3ef 100644
--- a/ext/gd/tests/imagecolordeallocate_error4.phpt
+++ b/ext/gd/tests/imagecolordeallocate_error4.phpt
@@ -4,7 +4,7 @@ Testing imagecolordeallocate() of GD library with Out of range intergers (Below)
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecolormatch_basic.phpt b/ext/gd/tests/imagecolormatch_basic.phpt
index 46e8878d9d..ff59e66b7b 100644
--- a/ext/gd/tests/imagecolormatch_basic.phpt
+++ b/ext/gd/tests/imagecolormatch_basic.phpt
@@ -4,7 +4,7 @@ Basic test imagecolormatch() of GD library
Paulo Alves de Sousa Filho <pspalves [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecolormatch_error1.phpt b/ext/gd/tests/imagecolormatch_error1.phpt
index 9750a8b245..5e8d82cc39 100644
--- a/ext/gd/tests/imagecolormatch_error1.phpt
+++ b/ext/gd/tests/imagecolormatch_error1.phpt
@@ -4,7 +4,7 @@ Send only 1 parameter imagecolormatch() of GD library
Paulo Alves de Sousa Filho <pspalves [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecolormatch_error2.phpt b/ext/gd/tests/imagecolormatch_error2.phpt
index bdb3c2460e..2240f987df 100644
--- a/ext/gd/tests/imagecolormatch_error2.phpt
+++ b/ext/gd/tests/imagecolormatch_error2.phpt
@@ -4,7 +4,7 @@ Send not TrueColor to Image 1 parameter imagecolormatch() of GD library
Paulo Alves de Sousa Filho <pspalves [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecolormatch_error3.phpt b/ext/gd/tests/imagecolormatch_error3.phpt
index 8793e15227..245ebca646 100644
--- a/ext/gd/tests/imagecolormatch_error3.phpt
+++ b/ext/gd/tests/imagecolormatch_error3.phpt
@@ -4,7 +4,7 @@ Send not TrueColor to Image 1 parameter imagecolormatch() of GD library
Paulo Alves de Sousa Filho <pspalves [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecolormatch_error4.phpt b/ext/gd/tests/imagecolormatch_error4.phpt
index 0bfe767c2b..4579192571 100644
--- a/ext/gd/tests/imagecolormatch_error4.phpt
+++ b/ext/gd/tests/imagecolormatch_error4.phpt
@@ -4,7 +4,7 @@ using different image sizes imagecolormatch() of GD library
Paulo Alves de Sousa Filho <pspalves [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecolorstotal_basic.phpt b/ext/gd/tests/imagecolorstotal_basic.phpt
index 71eddd9ff4..32e4f8a721 100644
--- a/ext/gd/tests/imagecolorstotal_basic.phpt
+++ b/ext/gd/tests/imagecolorstotal_basic.phpt
@@ -9,7 +9,7 @@ if(!extension_loaded('gd')) {
if(!function_exists('imagecolorstotal') || !function_exists('imagecreatefromgif')) {
die('skip imagecolorstotal and imagecreatefromgif functions not available in this build');
}
-?>
+?>
--FILE--
<?php
/* Prototype : int imagecolorstotal ( resource $image )
diff --git a/ext/gd/tests/imagecolorstotal_error.phpt b/ext/gd/tests/imagecolorstotal_error.phpt
index a7f3b95719..59999423ca 100644
--- a/ext/gd/tests/imagecolorstotal_error.phpt
+++ b/ext/gd/tests/imagecolorstotal_error.phpt
@@ -8,7 +8,7 @@ if(!extension_loaded('gd')) {
if(!function_exists('imagecolorstotal')) {
die('skip imagecolorstotal function is not available');
}
-?>
+?>
--FILE--
<?php
/* Prototype : int imagecolorstotal ( resource $image )
@@ -31,7 +31,7 @@ var_dump( imagecolorstotal($im, $extra_arg) );
echo "\n-- Testing imagecolorstotal() function with a invalid resource\n";
var_dump( imagecolorstotal($im) );
-fclose($im);
+fclose($im);
?>
===DONE===
--EXPECTF--
diff --git a/ext/gd/tests/imagecolourstotal_basic.phpt b/ext/gd/tests/imagecolourstotal_basic.phpt
index 0db589bdf6..599bfa1ed8 100644
--- a/ext/gd/tests/imagecolourstotal_basic.phpt
+++ b/ext/gd/tests/imagecolourstotal_basic.phpt
@@ -16,7 +16,7 @@ Felix De Vliegher <felix.devliegher@gmail.com>
/* Prototype : int imagecolorstotal(resource im)
* Description: Find out the number of colors in an image's palette
* Source code: ext/gd/gd.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "*** Testing imagecolorstotal() : basic functionality ***\n";
diff --git a/ext/gd/tests/imageconvolution_basic.phpt b/ext/gd/tests/imageconvolution_basic.phpt
index 972de76f86..be6ff52eaa 100644
--- a/ext/gd/tests/imageconvolution_basic.phpt
+++ b/ext/gd/tests/imageconvolution_basic.phpt
@@ -4,7 +4,7 @@ Testing imageconvolution() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imageconvolution_error1.phpt b/ext/gd/tests/imageconvolution_error1.phpt
index 5dc250a85b..7090bf4a57 100644
--- a/ext/gd/tests/imageconvolution_error1.phpt
+++ b/ext/gd/tests/imageconvolution_error1.phpt
@@ -4,7 +4,7 @@ Testing wrong param passing imageconvolution() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imageconvolution_error2.phpt b/ext/gd/tests/imageconvolution_error2.phpt
index 5161c198c3..217e3e1547 100644
--- a/ext/gd/tests/imageconvolution_error2.phpt
+++ b/ext/gd/tests/imageconvolution_error2.phpt
@@ -4,7 +4,7 @@ Testing wrong array size 2x3 in imageconvolution() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imageconvolution_error3.phpt b/ext/gd/tests/imageconvolution_error3.phpt
index df6b148bd1..5f1ddc95be 100644
--- a/ext/gd/tests/imageconvolution_error3.phpt
+++ b/ext/gd/tests/imageconvolution_error3.phpt
@@ -4,7 +4,7 @@ Testing wrong array size 3x2 in imageconvolution() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecopymerge_basic.phpt b/ext/gd/tests/imagecopymerge_basic.phpt
index f324eaedf1..d533209f6d 100644
--- a/ext/gd/tests/imagecopymerge_basic.phpt
+++ b/ext/gd/tests/imagecopymerge_basic.phpt
@@ -7,7 +7,7 @@ Cleston Viel Vieira de Sousa <cleston [dot] vs [at] gmail [dot] com>
Updated by Sean Fraaser <frasmage [at] gmail [dot] com>
PHP[tek] 2017
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecopymerge_error.phpt b/ext/gd/tests/imagecopymerge_error.phpt
index e43bf69452..90d9c55871 100644
--- a/ext/gd/tests/imagecopymerge_error.phpt
+++ b/ext/gd/tests/imagecopymerge_error.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter passing imagecopymerge() of GD library
Cleston Viel Vieira de Sousa <cleston [dot] vs [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecopymergegray_basic.phpt b/ext/gd/tests/imagecopymergegray_basic.phpt
index baad9b43ac..a4e587123f 100644
--- a/ext/gd/tests/imagecopymergegray_basic.phpt
+++ b/ext/gd/tests/imagecopymergegray_basic.phpt
@@ -4,7 +4,7 @@ Testing imagecopymergegray() of GD library
Sean Fraser <frasmage [at] gmail [dot] com>
PHP[tek] 2017
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagecopyresampled_basic.phpt b/ext/gd/tests/imagecopyresampled_basic.phpt
index edf7ba6548..619e55af15 100644
--- a/ext/gd/tests/imagecopyresampled_basic.phpt
+++ b/ext/gd/tests/imagecopyresampled_basic.phpt
@@ -1,8 +1,8 @@
--TEST--
imagecopyresampled()
--SKIPIF--
-<?php
- if (!function_exists('imagecopyresampled')) die('skip imagecopyresampled() not available');
+<?php
+ if (!function_exists('imagecopyresampled')) die('skip imagecopyresampled() not available');
?>
--FILE--
<?php
@@ -10,7 +10,7 @@ imagecopyresampled()
/* Prototype : bool imagecopyresampled ( resource $dst_image , resource $src_image , int $dst_x , int $dst_y , int $src_x , int $src_y , int $dst_w , int $dst_h , int $src_w , int $src_h )
* Description: Copy and resize part of an image with resampling.
* Source code: ext/standard/image.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "Simple test of imagecopyresampled() function\n";
@@ -50,14 +50,14 @@ imagepng($image_sml, $dest_sml);
list($width, $height) = getimagesize($dest_sml);
echo "Size of copy: width=". $width . " height=" . $height . "\n";
-imagedestroy($image_lge);
+imagedestroy($image_lge);
imagedestroy($image_sml);
-
-echo "Done\n";
+
+echo "Done\n";
?>
--CLEAN--
-<?php
+<?php
$dest_lge = dirname(realpath(__FILE__)) . '/imagelarge.png';
$dest_sml = dirname(realpath(__FILE__)) . '/imagesmall.png';
@unlink($dest_lge);
diff --git a/ext/gd/tests/imagecreatetruecolor_basic.phpt b/ext/gd/tests/imagecreatetruecolor_basic.phpt
index e2a5a09fba..2da09cd18b 100644
--- a/ext/gd/tests/imagecreatetruecolor_basic.phpt
+++ b/ext/gd/tests/imagecreatetruecolor_basic.phpt
@@ -3,7 +3,7 @@ Testing imagecreatetruecolor() of GD library
--CREDITS--
Rafael Dohms <rdohms [at] gmail [dot] com>
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
?>
diff --git a/ext/gd/tests/imagecreatetruecolor_error1.phpt b/ext/gd/tests/imagecreatetruecolor_error1.phpt
index 6acce13512..349ed8cad0 100644
--- a/ext/gd/tests/imagecreatetruecolor_error1.phpt
+++ b/ext/gd/tests/imagecreatetruecolor_error1.phpt
@@ -3,7 +3,7 @@ Testing imagecreatetruecolor(): error on non-long parameters
--CREDITS--
Rafael Dohms <rdohms [at] gmail [dot] com>
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
?>
diff --git a/ext/gd/tests/imagecreatetruecolor_error2.phpt b/ext/gd/tests/imagecreatetruecolor_error2.phpt
index 7d96f8793f..3ab4cf1e1f 100644
--- a/ext/gd/tests/imagecreatetruecolor_error2.phpt
+++ b/ext/gd/tests/imagecreatetruecolor_error2.phpt
@@ -3,7 +3,7 @@ Testing imagecreatetruecolor(): error on out of bound parameters
--CREDITS--
Rafael Dohms <rdohms [at] gmail [dot] com>
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
?>
diff --git a/ext/gd/tests/imagecreatetruecolor_error3.phpt b/ext/gd/tests/imagecreatetruecolor_error3.phpt
index 332cdef3a3..3982e8aceb 100644
--- a/ext/gd/tests/imagecreatetruecolor_error3.phpt
+++ b/ext/gd/tests/imagecreatetruecolor_error3.phpt
@@ -3,7 +3,7 @@ Testing imagecreatetruecolor(): error on wrong parameter count
--CREDITS--
Rafael Dohms <rdohms [at] gmail [dot] com>
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
?>
diff --git a/ext/gd/tests/imagecrop_auto-ext.phpt b/ext/gd/tests/imagecrop_auto-ext.phpt
index f37b3ca8e2..cc88e5d657 100644
--- a/ext/gd/tests/imagecrop_auto-ext.phpt
+++ b/ext/gd/tests/imagecrop_auto-ext.phpt
@@ -1,36 +1,36 @@
---TEST--
-Testing imagecropauto()
---SKIPIF--
-<?php
-if ( ! extension_loaded('gd') || !function_exists('imagecrop')) die( 'skip GD imagecropauto not present; skipping test' );
+--TEST--
+Testing imagecropauto()
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') || !function_exists('imagecrop')) die( 'skip GD imagecropauto not present; skipping test' );
if (GD_BUNDLED) die('skip requires external libgd');
-?>
+?>
--FILE--
<?php
echo "TC IMG_CROP_DEFAULT\n";
-$im = imagecreatetruecolor(99, 99);
+$im = imagecreatetruecolor(99, 99);
imagefilledrectangle($im, 20, 20, 30, 30, 0xff);
$im_crop = imagecropauto($im, IMG_CROP_DEFAULT);
var_dump(imagesx($im_crop));
var_dump(imagesy($im_crop));
echo "Palette IMG_CROP_DEFAULT\n";
-$im = imagecreate(99, 99);
+$im = imagecreate(99, 99);
imagefilledrectangle($im, 20, 20, 30, 30, 0xff);
$im_crop = imagecropauto($im, IMG_CROP_DEFAULT);
var_dump(imagesx($im_crop));
var_dump(imagesy($im_crop));
echo "TC IMG_CROP_SIDES\n";
-$im = imagecreatetruecolor(99, 99);
+$im = imagecreatetruecolor(99, 99);
imagefilledrectangle($im, 20, 20, 30, 30, 0xff);
$im_crop = imagecropauto($im, IMG_CROP_SIDES);
var_dump(imagesx($im_crop));
var_dump(imagesy($im_crop));
echo "Palette IMG_CROP_SIDES\n";
-$im = imagecreate(99, 99);
+$im = imagecreate(99, 99);
imagefilledrectangle($im, 20, 20, 30, 30, 0xff);
$im_crop = imagecropauto($im, IMG_CROP_SIDES);
var_dump(imagesx($im_crop));
@@ -60,8 +60,8 @@ var_dump(imagesx($im_crop));
var_dump(imagesy($im_crop));
@unlink(__DIR__ . "/crop_threshold.png");
-?>
---EXPECT--
+?>
+--EXPECT--
TC IMG_CROP_DEFAULT
int(99)
int(99)
diff --git a/ext/gd/tests/imagecrop_auto.phpt b/ext/gd/tests/imagecrop_auto.phpt
index 07f6b8ae4c..b12cc971ee 100644
--- a/ext/gd/tests/imagecrop_auto.phpt
+++ b/ext/gd/tests/imagecrop_auto.phpt
@@ -1,36 +1,36 @@
---TEST--
-Testing imagecropauto()
---SKIPIF--
-<?php
-if ( ! extension_loaded('gd') || !function_exists('imagecrop')) die( 'skip GD imagecropauto not present; skipping test' );
+--TEST--
+Testing imagecropauto()
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') || !function_exists('imagecrop')) die( 'skip GD imagecropauto not present; skipping test' );
if (!GD_BUNDLED) die('skip requires bundled libgd');
-?>
+?>
--FILE--
<?php
echo "TC IMG_CROP_DEFAULT\n";
-$im = imagecreatetruecolor(99, 99);
+$im = imagecreatetruecolor(99, 99);
imagefilledrectangle($im, 20, 20, 30, 30, 0xff);
$im_crop = imagecropauto($im, IMG_CROP_DEFAULT);
var_dump(imagesx($im_crop));
var_dump(imagesy($im_crop));
echo "Palette IMG_CROP_DEFAULT\n";
-$im = imagecreate(99, 99);
+$im = imagecreate(99, 99);
imagefilledrectangle($im, 20, 20, 30, 30, 0xff);
$im_crop = imagecropauto($im, IMG_CROP_DEFAULT);
var_dump(imagesx($im_crop));
var_dump(imagesy($im_crop));
echo "TC IMG_CROP_SIDES\n";
-$im = imagecreatetruecolor(99, 99);
+$im = imagecreatetruecolor(99, 99);
imagefilledrectangle($im, 20, 20, 30, 30, 0xff);
$im_crop = imagecropauto($im, IMG_CROP_SIDES);
var_dump(imagesx($im_crop));
var_dump(imagesy($im_crop));
echo "Palette IMG_CROP_SIDES\n";
-$im = imagecreate(99, 99);
+$im = imagecreate(99, 99);
imagefilledrectangle($im, 20, 20, 30, 30, 0xff);
$im_crop = imagecropauto($im, IMG_CROP_SIDES);
var_dump(imagesx($im_crop));
@@ -60,8 +60,8 @@ var_dump(imagesx($im_crop));
var_dump(imagesy($im_crop));
@unlink(__DIR__ . "/crop_threshold.png");
-?>
---EXPECT--
+?>
+--EXPECT--
TC IMG_CROP_DEFAULT
int(11)
int(11)
diff --git a/ext/gd/tests/imagedashedline_basic.phpt b/ext/gd/tests/imagedashedline_basic.phpt
index 35525f57bc..d58825036c 100644
--- a/ext/gd/tests/imagedashedline_basic.phpt
+++ b/ext/gd/tests/imagedashedline_basic.phpt
@@ -1,8 +1,8 @@
--TEST--
imagedashedline()
--SKIPIF--
-<?php
- if (!function_exists('imagedashedline')) die('skip imagedashedline() not available');
+<?php
+ if (!function_exists('imagedashedline')) die('skip imagedashedline() not available');
?>
--FILE--
<?php
@@ -11,7 +11,7 @@ imagedashedline()
* Description: Draws a dashed line.
* This function is deprecated. Use combination of imagesetstyle() and imageline() instead.
* Source code: ext/standard/image.c
- * Alias to functions:
+ * Alias to functions:
*/
@@ -29,8 +29,8 @@ $bg = imagecolorallocate($image, 0, 0, 0);
$col_line = imagecolorallocate($image, 255, 0, 0);
// draw a couple of vertical dashed lines
-imagedashedline($image, 100, 20, 100, 230, $col_line );
-imagedashedline($image, 150, 20, 150, 230, $col_line );
+imagedashedline($image, 100, 20, 100, 230, $col_line );
+imagedashedline($image, 150, 20, 150, 230, $col_line );
// output the picture to a file
imagepng($image, $dest);
@@ -44,11 +44,11 @@ $color1 = imagecolorsforindex($image, $col1);
$color2 = imagecolorsforindex($image, $col2);
var_dump($color1, $color2);
-imagedestroy($image);
-echo "Done\n";
+imagedestroy($image);
+echo "Done\n";
?>
--CLEAN--
-<?php
+<?php
$dest = dirname(realpath(__FILE__)) . '/imagedashedline.png';
@unlink($dest);
?>
diff --git a/ext/gd/tests/imageellipse_basic.phpt b/ext/gd/tests/imageellipse_basic.phpt
index f3b1e10bfe..9f0cf977bb 100644
--- a/ext/gd/tests/imageellipse_basic.phpt
+++ b/ext/gd/tests/imageellipse_basic.phpt
@@ -4,7 +4,7 @@ Testing imageellipse() of GD library
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imageellipse_error1.phpt b/ext/gd/tests/imageellipse_error1.phpt
index aa8ad789d9..476b5daa75 100644
--- a/ext/gd/tests/imageellipse_error1.phpt
+++ b/ext/gd/tests/imageellipse_error1.phpt
@@ -4,7 +4,7 @@ Testing wrong param passing imageellipse() of GD library
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-30
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imageellipse_error2.phpt b/ext/gd/tests/imageellipse_error2.phpt
index 3eb3681c0d..defa52c06f 100644
--- a/ext/gd/tests/imageellipse_error2.phpt
+++ b/ext/gd/tests/imageellipse_error2.phpt
@@ -4,7 +4,7 @@ Testing wrong param passing imageellipse() of GD library
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imageellipse_error3.phpt b/ext/gd/tests/imageellipse_error3.phpt
index 692149dd16..b021fdb350 100644
--- a/ext/gd/tests/imageellipse_error3.phpt
+++ b/ext/gd/tests/imageellipse_error3.phpt
@@ -4,7 +4,7 @@ Testing wrong param passing imageellipse() of GD library
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imageellipse_error4.phpt b/ext/gd/tests/imageellipse_error4.phpt
index e93334ba54..3af4398a88 100644
--- a/ext/gd/tests/imageellipse_error4.phpt
+++ b/ext/gd/tests/imageellipse_error4.phpt
@@ -4,7 +4,7 @@ Testing wrong param passing imageellipse() of GD library
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imageellipse_error5.phpt b/ext/gd/tests/imageellipse_error5.phpt
index a86e25e461..62b54145a3 100644
--- a/ext/gd/tests/imageellipse_error5.phpt
+++ b/ext/gd/tests/imageellipse_error5.phpt
@@ -4,7 +4,7 @@ Testing wrong param passing imageellipse() of GD library
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imageellipse_error7.phpt b/ext/gd/tests/imageellipse_error7.phpt
index 23f1eeeab7..612be4b8bb 100644
--- a/ext/gd/tests/imageellipse_error7.phpt
+++ b/ext/gd/tests/imageellipse_error7.phpt
@@ -1,20 +1,20 @@
---TEST--
+--TEST--
Testing wrong param passing imageellipse() of GD library
---CREDITS--
+--CREDITS--
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
---FILE--
-<?php
+--SKIPIF--
+<?php
+if (!extension_loaded("gd")) die("skip GD not present");
+?>
+--FILE--
+<?php
// Create a resource
-$image = tmpfile();
+$image = tmpfile();
// try to draw a white ellipse
-imageellipse($image, 200, 150, 300, 200, 16777215);
-?>
---EXPECTF--
+imageellipse($image, 200, 150, 300, 200, 16777215);
+?>
+--EXPECTF--
Warning: imageellipse(): supplied resource is not a valid Image resource in %s on line %d
diff --git a/ext/gd/tests/imageellipse_error8.phpt b/ext/gd/tests/imageellipse_error8.phpt
index d02b97eec3..5be5a12c39 100644
--- a/ext/gd/tests/imageellipse_error8.phpt
+++ b/ext/gd/tests/imageellipse_error8.phpt
@@ -4,7 +4,7 @@ Testing wrong param passing imageellipse() of GD library
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if ( ! extension_loaded("gd") ) die( 'skip GD not present; skipping test' );
?>
--FILE--
diff --git a/ext/gd/tests/imagefill_1.phpt b/ext/gd/tests/imagefill_1.phpt
index 04e1cab55a..f356fe826d 100644
--- a/ext/gd/tests/imagefill_1.phpt
+++ b/ext/gd/tests/imagefill_1.phpt
@@ -1,7 +1,7 @@
--TEST--
imagefill() infinite loop with wrong color index
--SKIPIF--
-<?php
+<?php
if (!extension_loaded('gd')) {
die("skip gd extension not available.");
}
diff --git a/ext/gd/tests/imagefilledarc_basic.phpt b/ext/gd/tests/imagefilledarc_basic.phpt
index 9969e6be95..23b9d3a969 100644
--- a/ext/gd/tests/imagefilledarc_basic.phpt
+++ b/ext/gd/tests/imagefilledarc_basic.phpt
@@ -4,7 +4,7 @@ Testing imagefilledarc() of GD library
Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
die("skip test requires GD 2.2.2 or higher");
diff --git a/ext/gd/tests/imagefilledarc_error1.phpt b/ext/gd/tests/imagefilledarc_error1.phpt
index 81d04358fb..bb14543eda 100644
--- a/ext/gd/tests/imagefilledarc_error1.phpt
+++ b/ext/gd/tests/imagefilledarc_error1.phpt
@@ -4,7 +4,7 @@ Testing wrong param passing imagefilledarc() of GD library
Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefilledarc_variation1.phpt b/ext/gd/tests/imagefilledarc_variation1.phpt
index 7eb2350cb3..ef4a98ac79 100644
--- a/ext/gd/tests/imagefilledarc_variation1.phpt
+++ b/ext/gd/tests/imagefilledarc_variation1.phpt
@@ -4,7 +4,7 @@ Testing passing negative end angle to imagefilledarc() of GD library
Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
die("skip test requires GD 2.2.2 or higher");
diff --git a/ext/gd/tests/imagefilledarc_variation2.phpt b/ext/gd/tests/imagefilledarc_variation2.phpt
index 28cb517631..2965cda65a 100644
--- a/ext/gd/tests/imagefilledarc_variation2.phpt
+++ b/ext/gd/tests/imagefilledarc_variation2.phpt
@@ -4,7 +4,7 @@ Testing passing negative start angle to imagefilledarc() of GD library
Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
die("skip test requires GD 2.2.2 or higher");
diff --git a/ext/gd/tests/imagefilledellipse_basic.phpt b/ext/gd/tests/imagefilledellipse_basic.phpt
index 1dee961b13..ed78dde4d2 100644
--- a/ext/gd/tests/imagefilledellipse_basic.phpt
+++ b/ext/gd/tests/imagefilledellipse_basic.phpt
@@ -1,7 +1,7 @@
--TEST--
Testing imagefilledellipse() of GD library
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefilledpolygon_basic.phpt b/ext/gd/tests/imagefilledpolygon_basic.phpt
index b957cce698..cd226179ba 100644
--- a/ext/gd/tests/imagefilledpolygon_basic.phpt
+++ b/ext/gd/tests/imagefilledpolygon_basic.phpt
@@ -1,8 +1,8 @@
--TEST--
imagefilledpolygon()
--SKIPIF--
-<?php
- if (!function_exists('imagefilledpolygon')) die('skip imagefilledpolygon() not available');
+<?php
+ if (!function_exists('imagefilledpolygon')) die('skip imagefilledpolygon() not available');
?>
--FILE--
<?php
@@ -10,7 +10,7 @@ imagefilledpolygon()
/* Prototype : bool imagefilledpolygon ( resource $image , array $points , int $num_points , int $color )
* Description: Draws a filled polygon.
* Source code: ext/standard/image.c
- * Alias to functions:
+ * Alias to functions:
*/
echo "Simple test of imagefilledpolygon() function\n";
@@ -18,11 +18,11 @@ echo "Simple test of imagefilledpolygon() function\n";
$dest = dirname(realpath(__FILE__)) . '/imagefilledpolygon.png';
$points = array(
- 40, 50,
- 20, 240,
- 60, 60,
- 240, 20,
- 50, 40,
+ 40, 50,
+ 20, 240,
+ 60, 60,
+ 240, 20,
+ 50, 40,
10, 10
);
@@ -56,13 +56,13 @@ $color2 = imagecolorsforindex($image_in, $col2);
$color3 = imagecolorsforindex($image_in, $col3);
var_dump($color1, $color2, $color3);
-imagedestroy($image);
+imagedestroy($image);
imagedestroy($image_in);
-echo "Done\n";
+echo "Done\n";
?>
--CLEAN--
-<?php
+<?php
$dest = dirname(realpath(__FILE__)) . '/imagefilledpolygon.png';
@unlink($dest);
?>
diff --git a/ext/gd/tests/imagefilledpolygon_negative.phpt b/ext/gd/tests/imagefilledpolygon_negative.phpt
index ced853067b..a572a195f5 100644
--- a/ext/gd/tests/imagefilledpolygon_negative.phpt
+++ b/ext/gd/tests/imagefilledpolygon_negative.phpt
@@ -1,8 +1,8 @@
--TEST--
imagefilledpolygon() with a negative num of points
--SKIPIF--
-<?php
- if (!function_exists('imagefilledpolygon')) die('skip imagefilledpolygon() not available');
+<?php
+ if (!function_exists('imagefilledpolygon')) die('skip imagefilledpolygon() not available');
?>
--FILE--
<?php
diff --git a/ext/gd/tests/imagefilltoborder_basic.phpt b/ext/gd/tests/imagefilltoborder_basic.phpt
index 843eed473d..e2dfbef2e0 100644
--- a/ext/gd/tests/imagefilltoborder_basic.phpt
+++ b/ext/gd/tests/imagefilltoborder_basic.phpt
@@ -1,16 +1,16 @@
---TEST--
+--TEST--
Testing imagefilltoborder() of GD library
---CREDITS--
+--CREDITS--
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-30
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--SKIPIF--
+<?php
+if (!extension_loaded("gd")) die("skip GD not present");
+?>
--FILE--
<?php
// Create a image
-$image = imagecreatetruecolor( 100, 100 );
+$image = imagecreatetruecolor( 100, 100 );
// Draw a rectangle
imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) );
@@ -24,6 +24,6 @@ imagefilltoborder( $image, 50, 50, imagecolorallocate( $image, 0, 0, 0 ), imagec
include_once __DIR__ . '/func.inc';
test_image_equals_file(__DIR__ . '/imagefilltoborder_basic.png', $image);
-?>
---EXPECT--
+?>
+--EXPECT--
The images are equal.
diff --git a/ext/gd/tests/imagefilltoborder_error1.phpt b/ext/gd/tests/imagefilltoborder_error1.phpt
index 9412da7394..6979a9b8cb 100644
--- a/ext/gd/tests/imagefilltoborder_error1.phpt
+++ b/ext/gd/tests/imagefilltoborder_error1.phpt
@@ -1,16 +1,16 @@
---TEST--
+--TEST--
Testing wrong param passing imagefilltoborder() of GD library
---CREDITS--
+--CREDITS--
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-30
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--SKIPIF--
+<?php
+if (!extension_loaded("gd")) die("skip GD not present");
+?>
--FILE--
<?php
// Create a image
-$image = imagecreatetruecolor( 100, 100 );
+$image = imagecreatetruecolor( 100, 100 );
// Draw a rectangle
imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) );
@@ -21,6 +21,6 @@ imageellipse( $image, 50, 50, 50, 50, imagecolorallocate( $image, 0, 0, 0 ) );
// Try to fill border
imagefilltoborder( 'wrong param', 50, 50, imagecolorallocate( $image, 0, 0, 0 ), imagecolorallocate( $image, 255, 0, 0 ) );
-?>
+?>
--EXPECTF--
Warning: imagefilltoborder() expects parameter 1 to be resource, %s given in %s on line %d
diff --git a/ext/gd/tests/imagefilltoborder_error2.phpt b/ext/gd/tests/imagefilltoborder_error2.phpt
index 2c70ce9f7c..e7efac5e0a 100644
--- a/ext/gd/tests/imagefilltoborder_error2.phpt
+++ b/ext/gd/tests/imagefilltoborder_error2.phpt
@@ -1,16 +1,16 @@
---TEST--
+--TEST--
Testing wrong param passing imagefilltoborder() of GD library
---CREDITS--
+--CREDITS--
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-30
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--SKIPIF--
+<?php
+if (!extension_loaded("gd")) die("skip GD not present");
+?>
--FILE--
<?php
// Create a image
-$image = imagecreatetruecolor( 100, 100 );
+$image = imagecreatetruecolor( 100, 100 );
// Draw a rectangle
imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) );
@@ -21,6 +21,6 @@ imageellipse( $image, 50, 50, 50, 50, imagecolorallocate( $image, 0, 0, 0 ) );
// Try to fill border
imagefilltoborder( $image, 'wrong param', 50, imagecolorallocate( $image, 0, 0, 0 ), imagecolorallocate( $image, 255, 0, 0 ) );
-?>
+?>
--EXPECTF--
Warning: imagefilltoborder() expects parameter 2 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagefilltoborder_error3.phpt b/ext/gd/tests/imagefilltoborder_error3.phpt
index 74f01183a5..e5caf07595 100644
--- a/ext/gd/tests/imagefilltoborder_error3.phpt
+++ b/ext/gd/tests/imagefilltoborder_error3.phpt
@@ -1,16 +1,16 @@
---TEST--
+--TEST--
Testing wrong param passing imagefilltoborder() of GD library
---CREDITS--
+--CREDITS--
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-30
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--SKIPIF--
+<?php
+if (!extension_loaded("gd")) die("skip GD not present");
+?>
--FILE--
<?php
// Create a image
-$image = imagecreatetruecolor( 100, 100 );
+$image = imagecreatetruecolor( 100, 100 );
// Draw a rectangle
imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) );
@@ -21,6 +21,6 @@ imageellipse( $image, 50, 50, 50, 50, imagecolorallocate( $image, 0, 0, 0 ) );
// Try to fill border
imagefilltoborder( $image, 50, 'wrong param', imagecolorallocate( $image, 0, 0, 0 ), imagecolorallocate( $image, 255, 0, 0 ) );
-?>
+?>
--EXPECTF--
Warning: imagefilltoborder() expects parameter 3 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagefilltoborder_error4.phpt b/ext/gd/tests/imagefilltoborder_error4.phpt
index 3eaa719cd9..08806818a1 100644
--- a/ext/gd/tests/imagefilltoborder_error4.phpt
+++ b/ext/gd/tests/imagefilltoborder_error4.phpt
@@ -1,16 +1,16 @@
---TEST--
+--TEST--
Testing wrong param passing imagefilltoborder() of GD library
---CREDITS--
+--CREDITS--
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-30
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--SKIPIF--
+<?php
+if (!extension_loaded("gd")) die("skip GD not present");
+?>
--FILE--
<?php
// Create a image
-$image = imagecreatetruecolor( 100, 100 );
+$image = imagecreatetruecolor( 100, 100 );
// Draw a rectangle
imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) );
@@ -21,6 +21,6 @@ imageellipse( $image, 50, 50, 50, 50, imagecolorallocate( $image, 0, 0, 0 ) );
// Try to fill border
imagefilltoborder( $image, 50, 50, 'wrong param', imagecolorallocate( $image, 255, 0, 0 ) );
-?>
+?>
--EXPECTF--
Warning: imagefilltoborder() expects parameter 4 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagefilltoborder_error5.phpt b/ext/gd/tests/imagefilltoborder_error5.phpt
index b9eb07982d..c56d66207d 100644
--- a/ext/gd/tests/imagefilltoborder_error5.phpt
+++ b/ext/gd/tests/imagefilltoborder_error5.phpt
@@ -1,16 +1,16 @@
---TEST--
+--TEST--
Testing wrong param passing imagefilltoborder() of GD library
---CREDITS--
+--CREDITS--
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-30
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--SKIPIF--
+<?php
+if (!extension_loaded("gd")) die("skip GD not present");
+?>
--FILE--
<?php
// Create a image
-$image = imagecreatetruecolor( 100, 100 );
+$image = imagecreatetruecolor( 100, 100 );
// Draw a rectangle
imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) );
@@ -21,6 +21,6 @@ imageellipse( $image, 50, 50, 50, 50, imagecolorallocate( $image, 0, 0, 0 ) );
// Try to fill border
imagefilltoborder( $image, 50, 50, imagecolorallocate( $image, 0, 0, 0 ), 'wrong param' );
-?>
+?>
--EXPECTF--
Warning: imagefilltoborder() expects parameter 5 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagefilltoborder_error6.phpt b/ext/gd/tests/imagefilltoborder_error6.phpt
index b5ce53b0d6..f1a7fb02bb 100644
--- a/ext/gd/tests/imagefilltoborder_error6.phpt
+++ b/ext/gd/tests/imagefilltoborder_error6.phpt
@@ -1,16 +1,16 @@
---TEST--
+--TEST--
Testing wrong param passing imagefilltoborder() of GD library
---CREDITS--
+--CREDITS--
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-30
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--SKIPIF--
+<?php
+if (!extension_loaded("gd")) die("skip GD not present");
+?>
--FILE--
<?php
// Create a image
-$image = imagecreatetruecolor( 100, 100 );
+$image = imagecreatetruecolor( 100, 100 );
// Draw a rectangle
imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) );
@@ -22,7 +22,7 @@ imageellipse( $image, 50, 50, 50, 50, imagecolorallocate( $image, 0, 0, 0 ) );
$image_foo = tmpfile();
imagefilltoborder( $image_foo, 50, 50, imagecolorallocate( $image, 0, 0, 0 ), imagecolorallocate( $image, 255, 0, 0 ) );
-?>
+?>
--EXPECTF--
Warning: imagefilltoborder(): supplied resource is not a valid Image resource in %s on line %d
diff --git a/ext/gd/tests/imagefilltoborder_error7.phpt b/ext/gd/tests/imagefilltoborder_error7.phpt
index f3313e11f4..e1b45a342a 100644
--- a/ext/gd/tests/imagefilltoborder_error7.phpt
+++ b/ext/gd/tests/imagefilltoborder_error7.phpt
@@ -1,16 +1,16 @@
---TEST--
+--TEST--
Testing wrong param passing imagefilltoborder() of GD library
---CREDITS--
+--CREDITS--
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-30
---SKIPIF--
-<?php
-if ( ! extension_loaded("gd")) die("skip GD not present; skipping test");
-?>
+--SKIPIF--
+<?php
+if ( ! extension_loaded("gd")) die("skip GD not present; skipping test");
+?>
--FILE--
<?php
// Create a image
-$image = imagecreatetruecolor( 100, 100 );
+$image = imagecreatetruecolor( 100, 100 );
// Draw a rectangle
imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) );
@@ -21,6 +21,6 @@ imageellipse( $image, 50, 50, 50, 50, imagecolorallocate( $image, 0, 0, 0 ) );
// Try to fill border
imagefilltoborder( $image, 50, 50 );
-?>
+?>
--EXPECTF--
Warning: imagefilltoborder() expects exactly 5 parameters, %d given in %s on line %d
diff --git a/ext/gd/tests/imagefilter.phpt b/ext/gd/tests/imagefilter.phpt
index 8b17fb80b1..04a2395b8b 100644
--- a/ext/gd/tests/imagefilter.phpt
+++ b/ext/gd/tests/imagefilter.phpt
@@ -21,7 +21,7 @@ $no_arg_filters = array(
$SAVE_DIR = dirname(__FILE__);
$SOURCE_IMG = $SAVE_DIR . "/test.png";
-
+
foreach ($no_arg_filters as $filt) {
$im = imagecreatefrompng($SOURCE_IMG);
if (imagefilter($im, constant($filt))) {
@@ -34,7 +34,7 @@ $SOURCE_IMG = $SAVE_DIR . "/test.png";
}
$im = imagecreatefrompng($SOURCE_IMG);
-
+
if (imagefilter($im, IMG_FILTER_SMOOTH, -1924.124)) {
imagepng($im, $SAVE_DIR . "/IMG_FILTER_SMOOTH.png");
echo "IMG_FILTER_SMOOTH success\n";
@@ -42,9 +42,9 @@ $SOURCE_IMG = $SAVE_DIR . "/test.png";
} else {
echo "IMG_FILTER_SMOOTH failed\n";
}
-
+
$im = imagecreatefrompng($SOURCE_IMG);
-
+
if (imagefilter($im, IMG_FILTER_COLORIZE, -127.12, -127.98, 127)) {
imagepng($im, $SAVE_DIR . "/IMG_FILTER_COLORIZE.png");
echo "IMG_FILTER_COLORIZE success\n";
@@ -52,9 +52,9 @@ $SOURCE_IMG = $SAVE_DIR . "/test.png";
} else {
echo "IMG_FILTER_COLORIZE failed\n";
}
-
+
$im = imagecreatefrompng($SOURCE_IMG);
-
+
if (imagefilter($im, IMG_FILTER_CONTRAST, -90)) {
imagepng($im, $SAVE_DIR . "/IMG_FILTER_CONTRAST.png");
echo "IMG_FILTER_CONTRAST success\n";
@@ -64,7 +64,7 @@ $SOURCE_IMG = $SAVE_DIR . "/test.png";
}
$im = imagecreatefrompng($SOURCE_IMG);
-
+
if (imagefilter($im, IMG_FILTER_BRIGHTNESS, 98)) {
imagepng($im, $SAVE_DIR . "/IMG_FILTER_BRIGHTNESS.png");
echo "IMG_FILTER_BRIGHTNESS success\n";
@@ -74,7 +74,7 @@ $SOURCE_IMG = $SAVE_DIR . "/test.png";
}
$im = imagecreatefrompng($SOURCE_IMG);
-
+
if (imagefilter($im, IMG_FILTER_PIXELATE, 5, true)) {
imagepng($im, $SAVE_DIR . "/IMG_FILTER_PIXELATE.png");
echo "IMG_FILTER_PIXELATE success\n";
diff --git a/ext/gd/tests/imagefilter_error1.phpt b/ext/gd/tests/imagefilter_error1.phpt
index fb96ae32b4..41637994b4 100644
--- a/ext/gd/tests/imagefilter_error1.phpt
+++ b/ext/gd/tests/imagefilter_error1.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter passing in imagefilter() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefilter_error10.phpt b/ext/gd/tests/imagefilter_error10.phpt
index 8b41211629..0cea9aa3c1 100644
--- a/ext/gd/tests/imagefilter_error10.phpt
+++ b/ext/gd/tests/imagefilter_error10.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource of EMBOSS in imagefilter() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefilter_error11.phpt b/ext/gd/tests/imagefilter_error11.phpt
index 9b1cf4d92b..2f162045b8 100644
--- a/ext/gd/tests/imagefilter_error11.phpt
+++ b/ext/gd/tests/imagefilter_error11.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource passing of EDGEDETECT in imagefilter() of GD li
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefilter_error12.phpt b/ext/gd/tests/imagefilter_error12.phpt
index 33fee28e63..29664518a0 100644
--- a/ext/gd/tests/imagefilter_error12.phpt
+++ b/ext/gd/tests/imagefilter_error12.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource of COLORIZE in imagefilter() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefilter_error13.phpt b/ext/gd/tests/imagefilter_error13.phpt
index bcba260b9a..fb17ccc97e 100644
--- a/ext/gd/tests/imagefilter_error13.phpt
+++ b/ext/gd/tests/imagefilter_error13.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter value of COLORIZE in imagefilter() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefilter_error14.phpt b/ext/gd/tests/imagefilter_error14.phpt
index 6da2d8385e..310b848671 100644
--- a/ext/gd/tests/imagefilter_error14.phpt
+++ b/ext/gd/tests/imagefilter_error14.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter type of COLORIZE in imagefilter() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefilter_error15.phpt b/ext/gd/tests/imagefilter_error15.phpt
index 87a412e4cd..9c76bf24ab 100644
--- a/ext/gd/tests/imagefilter_error15.phpt
+++ b/ext/gd/tests/imagefilter_error15.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource of CONTRAST in imagefilter() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefilter_error16.phpt b/ext/gd/tests/imagefilter_error16.phpt
index d0351f9f74..f7173c689e 100644
--- a/ext/gd/tests/imagefilter_error16.phpt
+++ b/ext/gd/tests/imagefilter_error16.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter type of CONTRAST in imagefilter() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefilter_error17.phpt b/ext/gd/tests/imagefilter_error17.phpt
index adafc3e5e8..9a3ba39439 100644
--- a/ext/gd/tests/imagefilter_error17.phpt
+++ b/ext/gd/tests/imagefilter_error17.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource of GRAYSCALE in imagefilter() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefilter_error18.phpt b/ext/gd/tests/imagefilter_error18.phpt
index b636bfc07a..d96d02426f 100644
--- a/ext/gd/tests/imagefilter_error18.phpt
+++ b/ext/gd/tests/imagefilter_error18.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource of NEGATE in imagefilter() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefilter_error19.phpt b/ext/gd/tests/imagefilter_error19.phpt
index aa25994457..a811044869 100644
--- a/ext/gd/tests/imagefilter_error19.phpt
+++ b/ext/gd/tests/imagefilter_error19.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter type of BRIGHTNESS in imagefilter() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefilter_error2.phpt b/ext/gd/tests/imagefilter_error2.phpt
index d4cca5c8d7..17a47f2005 100644
--- a/ext/gd/tests/imagefilter_error2.phpt
+++ b/ext/gd/tests/imagefilter_error2.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter passing in imagefilter() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefilter_error20.phpt b/ext/gd/tests/imagefilter_error20.phpt
index f3db724acb..f1a330dbed 100644
--- a/ext/gd/tests/imagefilter_error20.phpt
+++ b/ext/gd/tests/imagefilter_error20.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource of BRIGHTNESS in imagefilter() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefilter_error3.phpt b/ext/gd/tests/imagefilter_error3.phpt
index 844f12a824..e1c2fe7b36 100644
--- a/ext/gd/tests/imagefilter_error3.phpt
+++ b/ext/gd/tests/imagefilter_error3.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter passing of PIXELATE in imagefilter() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefilter_error4.phpt b/ext/gd/tests/imagefilter_error4.phpt
index babb37e0ac..f60ce11b42 100644
--- a/ext/gd/tests/imagefilter_error4.phpt
+++ b/ext/gd/tests/imagefilter_error4.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource of PIXELATE in imagefilter() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefilter_error5.phpt b/ext/gd/tests/imagefilter_error5.phpt
index 6ed6ae66b8..7965271a54 100644
--- a/ext/gd/tests/imagefilter_error5.phpt
+++ b/ext/gd/tests/imagefilter_error5.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter passing of SMOOTH in imagefilter() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefilter_error6.phpt b/ext/gd/tests/imagefilter_error6.phpt
index 05dd187a2d..1ace03cba3 100644
--- a/ext/gd/tests/imagefilter_error6.phpt
+++ b/ext/gd/tests/imagefilter_error6.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource of SMOOTH in imagefilter() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefilter_error7.phpt b/ext/gd/tests/imagefilter_error7.phpt
index 6c08e5acf3..4e095801e8 100644
--- a/ext/gd/tests/imagefilter_error7.phpt
+++ b/ext/gd/tests/imagefilter_error7.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource of MEAN_REMOVAL in imagefilter() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefilter_error8.phpt b/ext/gd/tests/imagefilter_error8.phpt
index 57c3168f7e..5086e6421d 100644
--- a/ext/gd/tests/imagefilter_error8.phpt
+++ b/ext/gd/tests/imagefilter_error8.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource of SELECTIVE_BLUR in imagefilter() of GD librar
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefilter_error9.phpt b/ext/gd/tests/imagefilter_error9.phpt
index a74ea643cf..268a65f0f7 100644
--- a/ext/gd/tests/imagefilter_error9.phpt
+++ b/ext/gd/tests/imagefilter_error9.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource of GAUSSIAN_BLUR in imagefilter() of GD library
Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imageflip.phpt b/ext/gd/tests/imageflip.phpt
index f4660940a2..84885c4260 100644
--- a/ext/gd/tests/imageflip.phpt
+++ b/ext/gd/tests/imageflip.phpt
@@ -1,13 +1,13 @@
---TEST--
+--TEST--
Testing imageflip() of GD library
---SKIPIF--
-<?php
-if ( ! extension_loaded('gd') || !function_exists('imageflip')) die( 'skip GD not present; skipping test' );
-?>
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') || !function_exists('imageflip')) die( 'skip GD not present; skipping test' );
+?>
--FILE--
<?php
-$im = imagecreatetruecolor( 99, 99 );
+$im = imagecreatetruecolor( 99, 99 );
imagesetpixel($im, 0, 0, 0xFF);
imagesetpixel($im, 0, 98, 0x00FF00);
@@ -22,8 +22,8 @@ var_dump(dechex(imagecolorat($im, 0, 0)));
var_dump(dechex(imagecolorat($im, 0, 98)));
var_dump(dechex(imagecolorat($im, 98, 0)));
var_dump(dechex(imagecolorat($im, 98, 98)));
-?>
---EXPECT--
+?>
+--EXPECT--
string(2) "ff"
string(4) "ff00"
string(6) "ff0000"
diff --git a/ext/gd/tests/imagefontheight_basic.phpt b/ext/gd/tests/imagefontheight_basic.phpt
index bfcd0bb27c..ddb47c7cbd 100644
--- a/ext/gd/tests/imagefontheight_basic.phpt
+++ b/ext/gd/tests/imagefontheight_basic.phpt
@@ -4,7 +4,7 @@ Testing imagefontheight() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefontheight_error1.phpt b/ext/gd/tests/imagefontheight_error1.phpt
index e324772c5f..dbe20cece1 100644
--- a/ext/gd/tests/imagefontheight_error1.phpt
+++ b/ext/gd/tests/imagefontheight_error1.phpt
@@ -4,7 +4,7 @@ Testing error on string parameter for imagefontheight() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefontwidth_basic.phpt b/ext/gd/tests/imagefontwidth_basic.phpt
index 0a9df52095..2e3a5eb3ca 100644
--- a/ext/gd/tests/imagefontwidth_basic.phpt
+++ b/ext/gd/tests/imagefontwidth_basic.phpt
@@ -4,7 +4,7 @@ Testing imagefontwidth() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefontwidth_error1.phpt b/ext/gd/tests/imagefontwidth_error1.phpt
index 46178a22f2..9e1d59fe4e 100644
--- a/ext/gd/tests/imagefontwidth_error1.phpt
+++ b/ext/gd/tests/imagefontwidth_error1.phpt
@@ -4,7 +4,7 @@ Testing error on string parameter for imagefontwidth() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagefttext.phpt b/ext/gd/tests/imagefttext.phpt
index 16e0495ef0..2a516cb6c5 100644
--- a/ext/gd/tests/imagefttext.phpt
+++ b/ext/gd/tests/imagefttext.phpt
@@ -1,7 +1,7 @@
--TEST--
imagefttext() function test
--SKIPIF--
-<?php
+<?php
if (!extension_loaded('gd')) {
die("skip gd extension not available.");
}
diff --git a/ext/gd/tests/imagegammacorrect_basic.phpt b/ext/gd/tests/imagegammacorrect_basic.phpt
index c315c4688e..0e3203e985 100644
--- a/ext/gd/tests/imagegammacorrect_basic.phpt
+++ b/ext/gd/tests/imagegammacorrect_basic.phpt
@@ -4,7 +4,7 @@ Testing imagegammacorrect() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
die("skip test requires GD 2.2.2 or higher");
diff --git a/ext/gd/tests/imagegammacorrect_error1.phpt b/ext/gd/tests/imagegammacorrect_error1.phpt
index fdcdec8bec..2640495457 100644
--- a/ext/gd/tests/imagegammacorrect_error1.phpt
+++ b/ext/gd/tests/imagegammacorrect_error1.phpt
@@ -4,7 +4,7 @@ Testing error with non-resource paramenter of imagegammacorrect() of GD library,
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagegammacorrect_error2.phpt b/ext/gd/tests/imagegammacorrect_error2.phpt
index 604d7da796..57c8a7503a 100644
--- a/ext/gd/tests/imagegammacorrect_error2.phpt
+++ b/ext/gd/tests/imagegammacorrect_error2.phpt
@@ -4,7 +4,7 @@ Testing error with non-Image resource paramenter of imagegammacorrect() of GD li
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagegammacorrect_error3.phpt b/ext/gd/tests/imagegammacorrect_error3.phpt
index 6dcecbe04b..5f9d7b22de 100644
--- a/ext/gd/tests/imagegammacorrect_error3.phpt
+++ b/ext/gd/tests/imagegammacorrect_error3.phpt
@@ -4,7 +4,7 @@ Testing error with non-double first paramenter of imagegammacorrect() of GD libr
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagegammacorrect_error4.phpt b/ext/gd/tests/imagegammacorrect_error4.phpt
index e7ff6b4528..e5f0bd7365 100644
--- a/ext/gd/tests/imagegammacorrect_error4.phpt
+++ b/ext/gd/tests/imagegammacorrect_error4.phpt
@@ -4,7 +4,7 @@ Testing error with non-double second paramenter of imagegammacorrect() of GD lib
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagegammacorrect_variation1.phpt b/ext/gd/tests/imagegammacorrect_variation1.phpt
index 73327c1eff..8cc978a6ff 100644
--- a/ext/gd/tests/imagegammacorrect_variation1.phpt
+++ b/ext/gd/tests/imagegammacorrect_variation1.phpt
@@ -4,7 +4,7 @@ Testing imagegammacorrect() of GD library with non TrueColor image
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
die("skip test requires GD 2.2.2 or higher");
diff --git a/ext/gd/tests/imagegammacorrect_variation2.phpt b/ext/gd/tests/imagegammacorrect_variation2.phpt
index d314df6c4c..6a66147ce9 100644
--- a/ext/gd/tests/imagegammacorrect_variation2.phpt
+++ b/ext/gd/tests/imagegammacorrect_variation2.phpt
@@ -26,9 +26,9 @@ function test_gamma($in, $out, $constructor)
draw_cell($im, $i, $j);
}
}
-
+
imagegammacorrect($im, $in, $out);
-
+
$filename = __DIR__ . DIRECTORY_SEPARATOR
. "imagegammacorrect_variation2_{$in}_{$out}.png";
$kind = $constructor === 'imagecreate' ? 'palette' : 'truecolor';
diff --git a/ext/gd/tests/imageinterlace_basic.phpt b/ext/gd/tests/imageinterlace_basic.phpt
index 657b256d67..62d99bcf91 100644
--- a/ext/gd/tests/imageinterlace_basic.phpt
+++ b/ext/gd/tests/imageinterlace_basic.phpt
@@ -4,7 +4,7 @@ Testing imageinterlace() of GD library
Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imageinterlace_error1.phpt b/ext/gd/tests/imageinterlace_error1.phpt
index 5c871e7bba..2dd438a5e7 100644
--- a/ext/gd/tests/imageinterlace_error1.phpt
+++ b/ext/gd/tests/imageinterlace_error1.phpt
@@ -4,7 +4,7 @@ Testing passing no parameters to imageinterlace() of GD library
Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imageinterlace_error2.phpt b/ext/gd/tests/imageinterlace_error2.phpt
index 808c88a312..e20f3ae901 100644
--- a/ext/gd/tests/imageinterlace_error2.phpt
+++ b/ext/gd/tests/imageinterlace_error2.phpt
@@ -4,7 +4,7 @@ Testing resource that is not a image to imageinterlace() of GD library
Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imageinterlace_variation1.phpt b/ext/gd/tests/imageinterlace_variation1.phpt
index 2c224ef41f..d8eb7972fa 100644
--- a/ext/gd/tests/imageinterlace_variation1.phpt
+++ b/ext/gd/tests/imageinterlace_variation1.phpt
@@ -4,7 +4,7 @@ Testing setting the interlace bit on with imageinterlace() of GD library
Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imageinterlace_variation2.phpt b/ext/gd/tests/imageinterlace_variation2.phpt
index b4735dcfb9..f1ee51502d 100644
--- a/ext/gd/tests/imageinterlace_variation2.phpt
+++ b/ext/gd/tests/imageinterlace_variation2.phpt
@@ -4,7 +4,7 @@ Testing setting the interlace bit off with imageinterlace() of GD library
Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imageistruecolor_basic.phpt b/ext/gd/tests/imageistruecolor_basic.phpt
index a78aaa46ef..d43052db7d 100644
--- a/ext/gd/tests/imageistruecolor_basic.phpt
+++ b/ext/gd/tests/imageistruecolor_basic.phpt
@@ -3,7 +3,7 @@ Testing imageistruecolor() of GD library
--CREDITS--
Rafael Dohms <rdohms [at] gmail [dot] com>
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
?>
diff --git a/ext/gd/tests/imageistruecolor_error1.phpt b/ext/gd/tests/imageistruecolor_error1.phpt
index 06453b7d31..8b3033c39b 100644
--- a/ext/gd/tests/imageistruecolor_error1.phpt
+++ b/ext/gd/tests/imageistruecolor_error1.phpt
@@ -3,7 +3,7 @@ Testing imageistruecolor(): wrong parameters
--CREDITS--
Rafael Dohms <rdohms [at] gmail [dot] com>
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
?>
diff --git a/ext/gd/tests/imagelayereffect_basic.phpt b/ext/gd/tests/imagelayereffect_basic.phpt
index 2c948fd0c5..5a9c380758 100644
--- a/ext/gd/tests/imagelayereffect_basic.phpt
+++ b/ext/gd/tests/imagelayereffect_basic.phpt
@@ -4,7 +4,7 @@ Testing imagelayereffect() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected');
?>
diff --git a/ext/gd/tests/imagelayereffect_error1.phpt b/ext/gd/tests/imagelayereffect_error1.phpt
index 21f37a8a1e..1265b84ad1 100644
--- a/ext/gd/tests/imagelayereffect_error1.phpt
+++ b/ext/gd/tests/imagelayereffect_error1.phpt
@@ -4,7 +4,7 @@ Testing imagelayereffect() with invalid resource of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected');
?>
diff --git a/ext/gd/tests/imagelayereffect_error2.phpt b/ext/gd/tests/imagelayereffect_error2.phpt
index 83210f789f..bf535ffd24 100644
--- a/ext/gd/tests/imagelayereffect_error2.phpt
+++ b/ext/gd/tests/imagelayereffect_error2.phpt
@@ -4,7 +4,7 @@ Testing imagelayereffect() wth invalid effect of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected');
?>
diff --git a/ext/gd/tests/imagelayereffect_error3.phpt b/ext/gd/tests/imagelayereffect_error3.phpt
index d4deff1076..63d1e0e951 100644
--- a/ext/gd/tests/imagelayereffect_error3.phpt
+++ b/ext/gd/tests/imagelayereffect_error3.phpt
@@ -4,7 +4,7 @@ Testing imagelayereffect() with invalid resource of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected');
?>
diff --git a/ext/gd/tests/imageloadfont_error2.phpt b/ext/gd/tests/imageloadfont_error2.phpt
index 459cb71f5f..262009f2cf 100644
--- a/ext/gd/tests/imageloadfont_error2.phpt
+++ b/ext/gd/tests/imageloadfont_error2.phpt
@@ -3,7 +3,7 @@ Testing that imageloadfont() breaks on invalid file passed as first argument
--CREDITS--
Austin Drouare <austin.drouare [at] gmail [dot] com> #testfest #tek11
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imageloadfont_invalid.phpt b/ext/gd/tests/imageloadfont_invalid.phpt
index 871d1510f0..5246a0713d 100644
--- a/ext/gd/tests/imageloadfont_invalid.phpt
+++ b/ext/gd/tests/imageloadfont_invalid.phpt
@@ -1,8 +1,8 @@
--TEST--
imageloadfont() function crashes
--SKIPIF--
-<?php
- if (!extension_loaded('gd')) die("skip gd extension not available\n");
+<?php
+ if (!extension_loaded('gd')) die("skip gd extension not available\n");
?>
--FILE--
<?php
diff --git a/ext/gd/tests/imagepolygon_basic.phpt b/ext/gd/tests/imagepolygon_basic.phpt
index 5c79cdf5be..19e54fa901 100644
--- a/ext/gd/tests/imagepolygon_basic.phpt
+++ b/ext/gd/tests/imagepolygon_basic.phpt
@@ -1,8 +1,8 @@
--TEST--
imageploygon()
--SKIPIF--
-<?php
- if (!function_exists('imagepolygon')) die('skip imagepolygon() not available');
+<?php
+ if (!function_exists('imagepolygon')) die('skip imagepolygon() not available');
require_once('skipif_imagetype.inc');
?>
--FILE--
@@ -11,7 +11,7 @@ imageploygon()
/* Prototype : bool imagepolygon ( resource $image , array $points , int $num_points , int $color )
* Description: Draws a polygon.
* Source code: ext/standard/image.c
- * Alias to functions:
+ * Alias to functions:
*/
@@ -45,16 +45,16 @@ $col2 = imagecolorat($image, 100, 100);
$color1 = imagecolorsforindex($image, $col1);
$color2 = imagecolorsforindex($image, $col2);
var_dump($color1, $color2);
-
+
imagedestroy($image);
-echo "Done\n";
+echo "Done\n";
?>
--CLEAN--
<?php
$dest = dirname(realpath(__FILE__)) . '/imagepolygon.png';
@unlink($dest);
-?>
+?>
--EXPECT--
Simple test of imagepolygon() function
array(4) {
diff --git a/ext/gd/tests/imagepolygon_negative.phpt b/ext/gd/tests/imagepolygon_negative.phpt
index bb9010c92f..d122a3bbaa 100644
--- a/ext/gd/tests/imagepolygon_negative.phpt
+++ b/ext/gd/tests/imagepolygon_negative.phpt
@@ -1,8 +1,8 @@
--TEST--
imagepolygon() with a negative num of points
--SKIPIF--
-<?php
- if (!function_exists('imagepolygon')) die('skip imagepolygon() not available');
+<?php
+ if (!function_exists('imagepolygon')) die('skip imagepolygon() not available');
?>
--FILE--
<?php
diff --git a/ext/gd/tests/imagerectangle_basic.phpt b/ext/gd/tests/imagerectangle_basic.phpt
index d23cbdfe79..01544429f6 100644
--- a/ext/gd/tests/imagerectangle_basic.phpt
+++ b/ext/gd/tests/imagerectangle_basic.phpt
@@ -1,22 +1,22 @@
---TEST--
+--TEST--
Testing imagerectangle() of GD library
---CREDITS--
+--CREDITS--
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-30
---SKIPIF--
-<?php
-if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
-?>
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
+?>
--FILE--
<?php
// Create a image
-$image = imagecreatetruecolor( 100, 100 );
+$image = imagecreatetruecolor( 100, 100 );
// Draw a rectangle
imagerectangle( $image, 0, 0, 50, 50, imagecolorallocate($image, 255, 255, 255) );
include_once __DIR__ . '/func.inc';
test_image_equals_file(__DIR__ . '/imagerectangle_basic.png', $image);
-?>
---EXPECT--
+?>
+--EXPECT--
The images are equal.
diff --git a/ext/gd/tests/imagerectangle_error1.phpt b/ext/gd/tests/imagerectangle_error1.phpt
index 3b9e8d3f0c..4e8c1b4d1d 100644
--- a/ext/gd/tests/imagerectangle_error1.phpt
+++ b/ext/gd/tests/imagerectangle_error1.phpt
@@ -1,19 +1,19 @@
---TEST--
+--TEST--
Testing wrong param passing imagerectangle() of GD library
---CREDITS--
+--CREDITS--
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-30
---SKIPIF--
-<?php
-if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
-?>
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
+?>
--FILE--
<?php
// Create a image
-$image = imagecreatetruecolor( 100, 100 );
+$image = imagecreatetruecolor( 100, 100 );
// Draw a rectangle
imagerectangle( 'wrong param', 0, 0, 50, 50, imagecolorallocate($image, 255, 255, 255) );
-?>
+?>
--EXPECTF--
Warning: imagerectangle() expects parameter 1 to be resource, %s given in %s on line %d
diff --git a/ext/gd/tests/imagerectangle_error2.phpt b/ext/gd/tests/imagerectangle_error2.phpt
index 63525d2cb7..4f20dd81bb 100644
--- a/ext/gd/tests/imagerectangle_error2.phpt
+++ b/ext/gd/tests/imagerectangle_error2.phpt
@@ -1,19 +1,19 @@
---TEST--
+--TEST--
Testing wrong param passing imagerectangle() of GD library
---CREDITS--
+--CREDITS--
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-30
---SKIPIF--
-<?php
-if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
-?>
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
+?>
--FILE--
<?php
// Create a resource
-$image = tmpfile();
+$image = tmpfile();
// Draw a rectangle
imagerectangle( $image, 0, 0, 50, 50, 2 );
-?>
---EXPECTF--
+?>
+--EXPECTF--
Warning: imagerectangle(): supplied resource is not a valid Image resource in %s on line %d \ No newline at end of file
diff --git a/ext/gd/tests/imagerectangle_error3.phpt b/ext/gd/tests/imagerectangle_error3.phpt
index 93a2acb339..dfcc66c69e 100644
--- a/ext/gd/tests/imagerectangle_error3.phpt
+++ b/ext/gd/tests/imagerectangle_error3.phpt
@@ -1,19 +1,19 @@
---TEST--
+--TEST--
Testing wrong param passing imagerectangle() of GD library
---CREDITS--
+--CREDITS--
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-30
---SKIPIF--
-<?php
-if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
-?>
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
+?>
--FILE--
<?php
// Create a image
-$image = imagecreatetruecolor( 100, 100 );
+$image = imagecreatetruecolor( 100, 100 );
// Draw a rectangle
imagerectangle( $image, 'wrong param', 0, 50, 50, imagecolorallocate($image, 255, 255, 255) );
-?>
+?>
--EXPECTF--
Warning: imagerectangle() expects parameter 2 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagerectangle_error4.phpt b/ext/gd/tests/imagerectangle_error4.phpt
index b9253545fc..8ee437dd33 100644
--- a/ext/gd/tests/imagerectangle_error4.phpt
+++ b/ext/gd/tests/imagerectangle_error4.phpt
@@ -1,19 +1,19 @@
---TEST--
+--TEST--
Testing wrong param passing imagerectangle() of GD library
---CREDITS--
+--CREDITS--
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-30
---SKIPIF--
-<?php
-if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
-?>
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
+?>
--FILE--
<?php
// Create a image
-$image = imagecreatetruecolor( 100, 100 );
+$image = imagecreatetruecolor( 100, 100 );
// Draw a rectangle
imagerectangle( $image, 0, 'wrong param', 50, 50, imagecolorallocate($image, 255, 255, 255) );
-?>
+?>
--EXPECTF--
Warning: imagerectangle() expects parameter 3 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagerectangle_error5.phpt b/ext/gd/tests/imagerectangle_error5.phpt
index 6be6b5301d..9ccca07ae7 100644
--- a/ext/gd/tests/imagerectangle_error5.phpt
+++ b/ext/gd/tests/imagerectangle_error5.phpt
@@ -1,19 +1,19 @@
---TEST--
+--TEST--
Testing wrong param passing imagerectangle() of GD library
---CREDITS--
+--CREDITS--
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-30
---SKIPIF--
-<?php
-if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
-?>
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
+?>
--FILE--
<?php
// Create a image
-$image = imagecreatetruecolor( 100, 100 );
+$image = imagecreatetruecolor( 100, 100 );
// Draw a rectangle
imagerectangle( $image, 0, 0, 'wrong param', 50, imagecolorallocate($image, 255, 255, 255) );
-?>
+?>
--EXPECTF--
Warning: imagerectangle() expects parameter 4 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagerectangle_error6.phpt b/ext/gd/tests/imagerectangle_error6.phpt
index 2b89543c31..0b35ec8f71 100644
--- a/ext/gd/tests/imagerectangle_error6.phpt
+++ b/ext/gd/tests/imagerectangle_error6.phpt
@@ -1,19 +1,19 @@
---TEST--
+--TEST--
Testing wrong param passing imagerectangle() of GD library
---CREDITS--
+--CREDITS--
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-30
---SKIPIF--
-<?php
-if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
-?>
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
+?>
--FILE--
<?php
// Create a image
-$image = imagecreatetruecolor( 100, 100 );
+$image = imagecreatetruecolor( 100, 100 );
// Draw a rectangle
imagerectangle( $image, 0, 0, 50, 'wrong param', imagecolorallocate($image, 255, 255, 255) );
-?>
+?>
--EXPECTF--
Warning: imagerectangle() expects parameter 5 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagerectangle_error7.phpt b/ext/gd/tests/imagerectangle_error7.phpt
index dfec56439f..e1187ee2d6 100644
--- a/ext/gd/tests/imagerectangle_error7.phpt
+++ b/ext/gd/tests/imagerectangle_error7.phpt
@@ -1,19 +1,19 @@
---TEST--
+--TEST--
Testing wrong param passing imagerectangle() of GD library
---CREDITS--
+--CREDITS--
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-30
---SKIPIF--
-<?php
-if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
-?>
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
+?>
--FILE--
<?php
// Create a image
-$image = imagecreatetruecolor( 100, 100 );
+$image = imagecreatetruecolor( 100, 100 );
// Draw a rectangle
imagerectangle( $image, 0, 0, 50, 50, 'wrong param' );
-?>
+?>
--EXPECTF--
Warning: imagerectangle() expects parameter 6 to be int, %s given in %s on line %d
diff --git a/ext/gd/tests/imagerectangle_error8.phpt b/ext/gd/tests/imagerectangle_error8.phpt
index cb0746e492..63e293c217 100644
--- a/ext/gd/tests/imagerectangle_error8.phpt
+++ b/ext/gd/tests/imagerectangle_error8.phpt
@@ -1,19 +1,19 @@
---TEST--
+--TEST--
Testing wrong param passing imagerectangle() of GD library
---CREDITS--
+--CREDITS--
Ivan Rosolen <contato [at] ivanrosolen [dot] com>
#testfest PHPSP on 2009-06-30
---SKIPIF--
-<?php
-if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
-?>
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
+?>
--FILE--
<?php
// Create a image
-$image = imagecreatetruecolor( 100, 100 );
+$image = imagecreatetruecolor( 100, 100 );
// Draw a rectangle
imagerectangle( $image, 0, 0, 50, 50 );
-?>
+?>
--EXPECTF--
Warning: imagerectangle() expects exactly 6 parameters, %d given in %s on line %d
diff --git a/ext/gd/tests/imagesetbrush_basic.phpt b/ext/gd/tests/imagesetbrush_basic.phpt
index e1a9c6a80c..0afe6fc1d0 100644
--- a/ext/gd/tests/imagesetbrush_basic.phpt
+++ b/ext/gd/tests/imagesetbrush_basic.phpt
@@ -13,16 +13,16 @@ if (!extension_loaded('gd')) {
<?php
// Create the brush image
$img = imagecreate(10, 10);
-
+
// Create the main image, 100x100
$mainimg = imagecreatetruecolor(100, 100);
-
+
$white = imagecolorallocate($img, 255, 0, 0);
imagefilledrectangle($img, 0, 0, 299, 99, $white);
// Set the brush
imagesetbrush($mainimg, $img);
-
+
// Draw a couple of brushes, each overlaying each
imageline($mainimg, 50, 50, 50, 60, IMG_COLOR_BRUSHED);
diff --git a/ext/gd/tests/imagesetthickness_basic.phpt b/ext/gd/tests/imagesetthickness_basic.phpt
index 3c91a886df..376d18f790 100644
--- a/ext/gd/tests/imagesetthickness_basic.phpt
+++ b/ext/gd/tests/imagesetthickness_basic.phpt
@@ -3,7 +3,7 @@ Testing imagetruecolortopalette() of GD library
--CREDITS--
Rafael Dohms <rdohms [at] gmail [dot] com>
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
?>
diff --git a/ext/gd/tests/imagesetthickness_error1.phpt b/ext/gd/tests/imagesetthickness_error1.phpt
index 0aed3a1f2f..112f9df863 100644
--- a/ext/gd/tests/imagesetthickness_error1.phpt
+++ b/ext/gd/tests/imagesetthickness_error1.phpt
@@ -3,7 +3,7 @@ Testing imagetruecolortopalette(): wrong types for first parameter
--CREDITS--
Rafael Dohms <rdohms [at] gmail [dot] com>
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagesetthickness_error2.phpt b/ext/gd/tests/imagesetthickness_error2.phpt
index f829cbebc5..5052472f7e 100644
--- a/ext/gd/tests/imagesetthickness_error2.phpt
+++ b/ext/gd/tests/imagesetthickness_error2.phpt
@@ -3,7 +3,7 @@ Testing imagetruecolortopalette(): wrong types for second parameter
--CREDITS--
Rafael Dohms <rdohms [at] gmail [dot] com>
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
?>
diff --git a/ext/gd/tests/imagestring_basic.phpt b/ext/gd/tests/imagestring_basic.phpt
index 311683f7af..1265fed6e6 100644
--- a/ext/gd/tests/imagestring_basic.phpt
+++ b/ext/gd/tests/imagestring_basic.phpt
@@ -4,7 +4,7 @@ Testing imagestring() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagestring_error1.phpt b/ext/gd/tests/imagestring_error1.phpt
index b31f74ebfa..96055bd9df 100644
--- a/ext/gd/tests/imagestring_error1.phpt
+++ b/ext/gd/tests/imagestring_error1.phpt
@@ -4,7 +4,7 @@ Testing error on non-resource parameter 1 of imagestring() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagestring_error2.phpt b/ext/gd/tests/imagestring_error2.phpt
index d6146f7089..e4b22651c6 100644
--- a/ext/gd/tests/imagestring_error2.phpt
+++ b/ext/gd/tests/imagestring_error2.phpt
@@ -4,7 +4,7 @@ Testing error on non-image resource parameter 1 of imagestring() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagestring_error3.phpt b/ext/gd/tests/imagestring_error3.phpt
index 783e89e19a..9f5a9ff2cf 100644
--- a/ext/gd/tests/imagestring_error3.phpt
+++ b/ext/gd/tests/imagestring_error3.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 2 of imagestring() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagestring_error4.phpt b/ext/gd/tests/imagestring_error4.phpt
index 3db02d9723..443177e588 100644
--- a/ext/gd/tests/imagestring_error4.phpt
+++ b/ext/gd/tests/imagestring_error4.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 3 of imagestring() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagestring_error5.phpt b/ext/gd/tests/imagestring_error5.phpt
index 05d674e6aa..50c6ff3999 100644
--- a/ext/gd/tests/imagestring_error5.phpt
+++ b/ext/gd/tests/imagestring_error5.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 4 of imagestring() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagestring_error6.phpt b/ext/gd/tests/imagestring_error6.phpt
index 29bc79d4f6..9306e5bf15 100644
--- a/ext/gd/tests/imagestring_error6.phpt
+++ b/ext/gd/tests/imagestring_error6.phpt
@@ -4,7 +4,7 @@ Testing error on non-string parameter 5 of imagestring() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagestring_error7.phpt b/ext/gd/tests/imagestring_error7.phpt
index 8d9e017e1b..5a3c126ed0 100644
--- a/ext/gd/tests/imagestring_error7.phpt
+++ b/ext/gd/tests/imagestring_error7.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 6 of imagestring() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagestringup_basic.phpt b/ext/gd/tests/imagestringup_basic.phpt
index 015d375ede..4a53da464f 100644
--- a/ext/gd/tests/imagestringup_basic.phpt
+++ b/ext/gd/tests/imagestringup_basic.phpt
@@ -4,7 +4,7 @@ Testing imagestringup() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagestringup_error1.phpt b/ext/gd/tests/imagestringup_error1.phpt
index 14477273ba..12f802139b 100644
--- a/ext/gd/tests/imagestringup_error1.phpt
+++ b/ext/gd/tests/imagestringup_error1.phpt
@@ -4,7 +4,7 @@ Testing error on non-resource parameter 1 of imagestringup() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagestringup_error2.phpt b/ext/gd/tests/imagestringup_error2.phpt
index d1d5aa26ac..871dd54fde 100644
--- a/ext/gd/tests/imagestringup_error2.phpt
+++ b/ext/gd/tests/imagestringup_error2.phpt
@@ -4,7 +4,7 @@ Testing error on non-image resource parameter 1 of imagestringup() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagestringup_error3.phpt b/ext/gd/tests/imagestringup_error3.phpt
index d436749829..dbe2b9aabc 100644
--- a/ext/gd/tests/imagestringup_error3.phpt
+++ b/ext/gd/tests/imagestringup_error3.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 2 of imagestringup() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagestringup_error4.phpt b/ext/gd/tests/imagestringup_error4.phpt
index 7d8b2fd9ce..9ecd3d236c 100644
--- a/ext/gd/tests/imagestringup_error4.phpt
+++ b/ext/gd/tests/imagestringup_error4.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 3 of imagestringup() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagestringup_error6.phpt b/ext/gd/tests/imagestringup_error6.phpt
index ac6fe4a88a..8683c0b5b0 100644
--- a/ext/gd/tests/imagestringup_error6.phpt
+++ b/ext/gd/tests/imagestringup_error6.phpt
@@ -4,7 +4,7 @@ Testing error on non-string parameter 5 of imagestringup() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagestringup_error7.phpt b/ext/gd/tests/imagestringup_error7.phpt
index 6afa7cb3a7..1caef65828 100644
--- a/ext/gd/tests/imagestringup_error7.phpt
+++ b/ext/gd/tests/imagestringup_error7.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 6 of imagestringup() of GD library
Rafael Dohms <rdohms [at] gmail [dot] com>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
?>
--FILE--
diff --git a/ext/gd/tests/imagetruecolortopalette_basic.phpt b/ext/gd/tests/imagetruecolortopalette_basic.phpt
index 9bc922a15b..18aa04a35d 100644
--- a/ext/gd/tests/imagetruecolortopalette_basic.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_basic.phpt
@@ -3,7 +3,7 @@ Testing imagetruecolortopalette() of GD library
--CREDITS--
Rafael Dohms <rdohms [at] gmail [dot] com>
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
die("skip test requires GD 2.2.2 or higher");
diff --git a/ext/gd/tests/imagetruecolortopalette_error1.phpt b/ext/gd/tests/imagetruecolortopalette_error1.phpt
index ecafa158b6..2c3dd0d429 100644
--- a/ext/gd/tests/imagetruecolortopalette_error1.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_error1.phpt
@@ -3,7 +3,7 @@ Testing imagetruecolortopalette(): wrong parameters for parameter 1
--CREDITS--
Rafael Dohms <rdohms [at] gmail [dot] com>
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
?>
diff --git a/ext/gd/tests/imagetruecolortopalette_error2.phpt b/ext/gd/tests/imagetruecolortopalette_error2.phpt
index 9a38187421..6486a929f2 100644
--- a/ext/gd/tests/imagetruecolortopalette_error2.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_error2.phpt
@@ -3,7 +3,7 @@ Testing imagetruecolortopalette(): wrong parameters for parameter 2
--CREDITS--
Rafael Dohms <rdohms [at] gmail [dot] com>
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
?>
diff --git a/ext/gd/tests/imagetruecolortopalette_error3.phpt b/ext/gd/tests/imagetruecolortopalette_error3.phpt
index 41d5978274..d89bbcb31b 100644
--- a/ext/gd/tests/imagetruecolortopalette_error3.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_error3.phpt
@@ -3,7 +3,7 @@ Testing imagetruecolortopalette(): wrong parameters for parameter 3
--CREDITS--
Rafael Dohms <rdohms [at] gmail [dot] com>
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
?>
diff --git a/ext/gd/tests/imagetruecolortopalette_error4.phpt b/ext/gd/tests/imagetruecolortopalette_error4.phpt
index f0e18b86be..2db042e89f 100644
--- a/ext/gd/tests/imagetruecolortopalette_error4.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_error4.phpt
@@ -3,7 +3,7 @@ Testing imagetruecolortopalette(): out of range parameter 3
--CREDITS--
Rafael Dohms <rdohms [at] gmail [dot] com>
--SKIPIF--
-<?php
+<?php
if (!extension_loaded("gd")) die("skip GD not present");
if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
?>
diff --git a/ext/gd/tests/jpeg2wbmp_error1.phpt b/ext/gd/tests/jpeg2wbmp_error1.phpt
index 2368e7549f..fcdef0bcb1 100644
--- a/ext/gd/tests/jpeg2wbmp_error1.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error1.phpt
@@ -4,7 +4,7 @@ Test jpeg2wbmp() function : wrong threshold value param
Levi Fukumori <levi [at] fukumori [dot] com [dot] br>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if(!extension_loaded('gd')) {
die('skip gd extension is not loaded');
}
diff --git a/ext/gd/tests/jpeg2wbmp_error2-mb.phpt b/ext/gd/tests/jpeg2wbmp_error2-mb.phpt
index b414cb35aa..4eeac126a4 100644
--- a/ext/gd/tests/jpeg2wbmp_error2-mb.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error2-mb.phpt
@@ -4,7 +4,7 @@ Test jpeg2wbmp() function : wrong origin filename param
Levi Fukumori <levi [at] fukumori [dot] com [dot] br>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if(!extension_loaded('gd')) {
die('skip gd extension is not loaded');
}
diff --git a/ext/gd/tests/jpeg2wbmp_error2.phpt b/ext/gd/tests/jpeg2wbmp_error2.phpt
index 22e2301d99..405eb83129 100644
--- a/ext/gd/tests/jpeg2wbmp_error2.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error2.phpt
@@ -4,7 +4,7 @@ Test jpeg2wbmp() function : wrong origin filename param
Levi Fukumori <levi [at] fukumori [dot] com [dot] br>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if(!extension_loaded('gd')) {
die('skip gd extension is not loaded');
}
diff --git a/ext/gd/tests/jpeg2wbmp_error3.phpt b/ext/gd/tests/jpeg2wbmp_error3.phpt
index e15c94765f..2662b7a86b 100644
--- a/ext/gd/tests/jpeg2wbmp_error3.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error3.phpt
@@ -4,7 +4,7 @@ Test jpeg2wbmp() function : wrong destination filename param
Levi Fukumori <levi [at] fukumori [dot] com [dot] br>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if(!extension_loaded('gd')) {
die('skip gd extension is not loaded');
}
diff --git a/ext/gd/tests/png2wbmp_error1-mb.phpt b/ext/gd/tests/png2wbmp_error1-mb.phpt
index a16e1a67c6..8c779d36d9 100644
--- a/ext/gd/tests/png2wbmp_error1-mb.phpt
+++ b/ext/gd/tests/png2wbmp_error1-mb.phpt
@@ -4,7 +4,7 @@ Test png2wbmp() function : wrong threshold value param
Levi Fukumori <levi [at] fukumori [dot] com [dot] br>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if(!extension_loaded('gd')) {
die('skip gd extension is not loaded');
}
diff --git a/ext/gd/tests/png2wbmp_error1.phpt b/ext/gd/tests/png2wbmp_error1.phpt
index e3496a45c9..543013b4bc 100644
--- a/ext/gd/tests/png2wbmp_error1.phpt
+++ b/ext/gd/tests/png2wbmp_error1.phpt
@@ -4,7 +4,7 @@ Test png2wbmp() function : wrong threshold value param
Levi Fukumori <levi [at] fukumori [dot] com [dot] br>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if(!extension_loaded('gd')) {
die('skip gd extension is not loaded');
}
diff --git a/ext/gd/tests/png2wbmp_error2.phpt b/ext/gd/tests/png2wbmp_error2.phpt
index 71912b6198..a674e0d6cc 100644
--- a/ext/gd/tests/png2wbmp_error2.phpt
+++ b/ext/gd/tests/png2wbmp_error2.phpt
@@ -4,7 +4,7 @@ Test png2wbmp() function : wrong origin filename param
Levi Fukumori <levi [at] fukumori [dot] com [dot] br>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if(!extension_loaded('gd')) {
die('skip gd extension is not loaded');
}
diff --git a/ext/gd/tests/png2wbmp_error3.phpt b/ext/gd/tests/png2wbmp_error3.phpt
index 53ffb54319..3cab3ccb98 100644
--- a/ext/gd/tests/png2wbmp_error3.phpt
+++ b/ext/gd/tests/png2wbmp_error3.phpt
@@ -4,7 +4,7 @@ Test png2wbmp() function : wrong destination filename param
Levi Fukumori <levi [at] fukumori [dot] com [dot] br>
#testfest PHPSP on 2009-06-20
--SKIPIF--
-<?php
+<?php
if(!extension_loaded('gd')) {
die('skip gd extension is not loaded');
}
diff --git a/ext/gd/tests/xbm2png.phpt b/ext/gd/tests/xbm2png.phpt
index 6edebc0b8d..7eaabc410b 100644
--- a/ext/gd/tests/xbm2png.phpt
+++ b/ext/gd/tests/xbm2png.phpt
@@ -1,7 +1,7 @@
--TEST--
xbm --> png conversion test
--SKIPIF--
-<?php
+<?php
if (!extension_loaded('gd')) {
die("skip gd extension not available.");
}
@@ -19,7 +19,7 @@ xbm --> png conversion test
echo "XBM to PNG conversion: ";
echo imagepng(imagecreatefromxbm($cwd . "/conv_test.xbm"), $cwd . "/test_xbm.png") ? 'ok' : 'failed';
echo "\n";
-
+
@unlink($cwd . "/test_xbm.png");
?>
--EXPECT--