diff options
author | Stanislav Malyshev <stas@php.net> | 2015-01-04 19:57:29 -0800 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2015-01-04 19:57:29 -0800 |
commit | 97f894e1899ba9773b8c213b56d34b1f1a9b03d9 (patch) | |
tree | f2d09728cad5f8ba1e8876f32ae1f3ec2cce9c60 /ext/gd | |
parent | 03ae6f22b6e49aa346021ec5dd6ad8a7a16760b2 (diff) | |
parent | 5639c3350e2d33b7e8f4b3c792f998aad08c293a (diff) | |
download | php-git-97f894e1899ba9773b8c213b56d34b1f1a9b03d9.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix GD tests with no GD loaded
Fixed typo
GD: imagepalettetotruecolor tests
Diffstat (limited to 'ext/gd')
-rw-r--r-- | ext/gd/tests/bug67248.phpt | 2 | ||||
-rw-r--r-- | ext/gd/tests/imagegd2_nullbyte_injection.phpt | 4 | ||||
-rw-r--r-- | ext/gd/tests/imagegd_nullbyte_injection.phpt | 4 | ||||
-rw-r--r-- | ext/gd/tests/imagegif_nullbyte_injection.phpt | 1 | ||||
-rw-r--r-- | ext/gd/tests/imagejpeg_nullbyte_injection.phpt | 1 | ||||
-rw-r--r-- | ext/gd/tests/imagepalettetotruecolor_basic.phpt | 22 | ||||
-rw-r--r-- | ext/gd/tests/imagepalettetotruecolor_error1.phpt | 14 | ||||
-rw-r--r-- | ext/gd/tests/imagepalettetotruecolor_error2.phpt | 14 | ||||
-rw-r--r-- | ext/gd/tests/imagepalettetotruecolor_error3.phpt | 15 | ||||
-rw-r--r-- | ext/gd/tests/imagepng_nullbyte_injection.phpt | 1 | ||||
-rw-r--r-- | ext/gd/tests/imagewbmp_nullbyte_injection.phpt | 1 | ||||
-rw-r--r-- | ext/gd/tests/imagewebp_nullbyte_injection.phpt | 1 |
12 files changed, 79 insertions, 1 deletions
diff --git a/ext/gd/tests/bug67248.phpt b/ext/gd/tests/bug67248.phpt index 9c83966a60..5cae5f8c98 100644 --- a/ext/gd/tests/bug67248.phpt +++ b/ext/gd/tests/bug67248.phpt @@ -2,7 +2,7 @@ Bug #67248 (imageaffinematrixget missing check of parameters) --SKIPIF-- <?php - if(!extension_loaded('gd')){ die('skip gd extension not available')} + if(!extension_loaded('gd')){ die('skip gd extension not available'); } if(!function_exists('imageaffinematrixget')) die('skip imageaffinematrixget() not available'); ?> --FILE-- diff --git a/ext/gd/tests/imagegd2_nullbyte_injection.phpt b/ext/gd/tests/imagegd2_nullbyte_injection.phpt index 49affefb96..278a4a8023 100644 --- a/ext/gd/tests/imagegd2_nullbyte_injection.phpt +++ b/ext/gd/tests/imagegd2_nullbyte_injection.phpt @@ -1,5 +1,9 @@ --TEST-- Testing null byte injection in imagegd2 +--SKIPIF-- +<?php + if(!extension_loaded('gd')){ die('skip gd extension not available'); } +?> --CLEAN-- $tempdir = sys_get_temp_dir(). '/php-gdtest'; foreach (glob($tempdir . "/test*") as $file ) { unlink($file); } diff --git a/ext/gd/tests/imagegd_nullbyte_injection.phpt b/ext/gd/tests/imagegd_nullbyte_injection.phpt index a423a551fd..1ef9354919 100644 --- a/ext/gd/tests/imagegd_nullbyte_injection.phpt +++ b/ext/gd/tests/imagegd_nullbyte_injection.phpt @@ -1,5 +1,9 @@ --TEST-- Testing null byte injection in imagegd +--SKIPIF-- +<?php + if(!extension_loaded('gd')){ die('skip gd extension not available'); } +?> --CLEAN-- $tempdir = sys_get_temp_dir(). '/php-gdtest'; foreach (glob($tempdir . "/test*") as $file ) { unlink($file); } diff --git a/ext/gd/tests/imagegif_nullbyte_injection.phpt b/ext/gd/tests/imagegif_nullbyte_injection.phpt index c3d0c30175..44b1be144f 100644 --- a/ext/gd/tests/imagegif_nullbyte_injection.phpt +++ b/ext/gd/tests/imagegif_nullbyte_injection.phpt @@ -6,6 +6,7 @@ foreach (glob($tempdir . "/test*") as $file ) { unlink($file); } rmdir($tempdir); --SKIPIF-- <?php +if(!extension_loaded('gd')){ die('skip gd extension not available'); } $support = gd_info(); if (!isset($support['GIF Create Support']) || $support['GIF Create Support'] === false) { print 'skip gif support not available'; diff --git a/ext/gd/tests/imagejpeg_nullbyte_injection.phpt b/ext/gd/tests/imagejpeg_nullbyte_injection.phpt index 9c52355011..4a45fa3c47 100644 --- a/ext/gd/tests/imagejpeg_nullbyte_injection.phpt +++ b/ext/gd/tests/imagejpeg_nullbyte_injection.phpt @@ -6,6 +6,7 @@ foreach (glob($tempdir . "/test*") as $file ) { unlink($file); } rmdir($tempdir); --SKIPIF-- <?php +if(!extension_loaded('gd')){ die('skip gd extension not available'); } $support = gd_info(); if (!isset($support['JPEG Support']) || $support['JPEG Support'] === false) { print 'skip jpeg support not available'; diff --git a/ext/gd/tests/imagepalettetotruecolor_basic.phpt b/ext/gd/tests/imagepalettetotruecolor_basic.phpt new file mode 100644 index 0000000000..63a2b51e77 --- /dev/null +++ b/ext/gd/tests/imagepalettetotruecolor_basic.phpt @@ -0,0 +1,22 @@ +--TEST-- +does the imagepalettetotruecollor function realy converts the image palette? +--CREDITS-- +Carlos André Ferrari <caferrari [at] gmail [dot] com> +--SKIPIF-- +<?php + if (!extension_loaded('gd')) die("skip gd extension not available."); +?> +--FILE-- +<?php +$im = imagecreate(100, 100); +var_dump(is_resource($im)); +var_dump(imageistruecolor($im)); +var_dump(imagepalettetotruecolor($im)); +var_dump(imageistruecolor($im)); +imagedestroy($im); +?> +--EXPECT-- +bool(true) +bool(false) +bool(true) +bool(true) diff --git a/ext/gd/tests/imagepalettetotruecolor_error1.phpt b/ext/gd/tests/imagepalettetotruecolor_error1.phpt new file mode 100644 index 0000000000..3c994e59a2 --- /dev/null +++ b/ext/gd/tests/imagepalettetotruecolor_error1.phpt @@ -0,0 +1,14 @@ +--TEST-- +imagepalettetotruecollor must return an error if no resource is given +--CREDITS-- +Carlos André Ferrari <caferrari [at] gmail [dot] com> +--SKIPIF-- +<?php + if (!extension_loaded('gd')) die("skip gd extension not available."); +?> +--FILE-- +<?php +imagepalettetotruecolor(); +?> +--EXPECTF-- +Warning: imagepalettetotruecolor() expects exactly 1 parameter, 0 given in %s on line %d diff --git a/ext/gd/tests/imagepalettetotruecolor_error2.phpt b/ext/gd/tests/imagepalettetotruecolor_error2.phpt new file mode 100644 index 0000000000..7a9a9ce574 --- /dev/null +++ b/ext/gd/tests/imagepalettetotruecolor_error2.phpt @@ -0,0 +1,14 @@ +--TEST-- +imagepalettetotruecollor must return an error if not a resource is given +--CREDITS-- +Carlos André Ferrari <caferrari [at] gmail [dot] com> +--SKIPIF-- +<?php + if (!extension_loaded('gd')) die("skip gd extension not available."); +?> +--FILE-- +<?php +imagepalettetotruecolor("bla"); +?> +--EXPECTF-- +Warning: imagepalettetotruecolor() expects parameter 1 to be resource, string given in %s on line %d diff --git a/ext/gd/tests/imagepalettetotruecolor_error3.phpt b/ext/gd/tests/imagepalettetotruecolor_error3.phpt new file mode 100644 index 0000000000..42a7e71773 --- /dev/null +++ b/ext/gd/tests/imagepalettetotruecolor_error3.phpt @@ -0,0 +1,15 @@ +--TEST-- +imagepalettetotruecollor must return an error if not an image resource is given +--CREDITS-- +Carlos André Ferrari <caferrari [at] gmail [dot] com> +--SKIPIF-- +<?php + if (!extension_loaded('gd')) die("skip gd extension not available."); +?> +--FILE-- +<?php +$im = fopen('php://memory', 'w'); +imagepalettetotruecolor($im); +?> +--EXPECTF-- +Warning: imagepalettetotruecolor(): supplied resource is not a valid Image resource in %s on line %d diff --git a/ext/gd/tests/imagepng_nullbyte_injection.phpt b/ext/gd/tests/imagepng_nullbyte_injection.phpt index 13949dca0d..9a5b7c39ea 100644 --- a/ext/gd/tests/imagepng_nullbyte_injection.phpt +++ b/ext/gd/tests/imagepng_nullbyte_injection.phpt @@ -6,6 +6,7 @@ foreach (glob($tempdir . "/test*") as $file ) { unlink($file); } rmdir($tempdir); --SKIPIF-- <?php +if(!extension_loaded('gd')){ die('skip gd extension not available'); } $support = gd_info(); if (!isset($support['PNG Support']) || $support['PNG Support'] === false) { print 'skip png support not available'; diff --git a/ext/gd/tests/imagewbmp_nullbyte_injection.phpt b/ext/gd/tests/imagewbmp_nullbyte_injection.phpt index f199626389..54a5749605 100644 --- a/ext/gd/tests/imagewbmp_nullbyte_injection.phpt +++ b/ext/gd/tests/imagewbmp_nullbyte_injection.phpt @@ -6,6 +6,7 @@ foreach (glob($tempdir . "/test*") as $file ) { unlink($file); } rmdir($tempdir); --SKIPIF-- <?php +if(!extension_loaded('gd')){ die('skip gd extension not available'); } $support = gd_info(); if (!isset($support['WBMP Support']) || $support['WBMP Support'] === false) { print 'skip wbmp support not available'; diff --git a/ext/gd/tests/imagewebp_nullbyte_injection.phpt b/ext/gd/tests/imagewebp_nullbyte_injection.phpt index 3bd632591b..166beb181f 100644 --- a/ext/gd/tests/imagewebp_nullbyte_injection.phpt +++ b/ext/gd/tests/imagewebp_nullbyte_injection.phpt @@ -6,6 +6,7 @@ foreach (glob($tempdir . "/test*") as $file ) { unlink($file); } rmdir($tempdir); --SKIPIF-- <?php +if(!extension_loaded('gd')){ die('skip gd extension not available'); } $support = gd_info(); if (!isset($support['WEBP Support']) || $support['WEBP Support'] === false) { print 'skip webp support not available'; |