mirror of
https://github.com/php/php-src.git
synced 2024-09-24 11:27:28 +00:00
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: fix GD tests with no GD loaded Fixed typo GD: imagepalettetotruecolor tests
This commit is contained in:
commit
97f894e189
@ -2,7 +2,7 @@
|
|||||||
Bug #67248 (imageaffinematrixget missing check of parameters)
|
Bug #67248 (imageaffinematrixget missing check of parameters)
|
||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?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');
|
if(!function_exists('imageaffinematrixget')) die('skip imageaffinematrixget() not available');
|
||||||
?>
|
?>
|
||||||
--FILE--
|
--FILE--
|
||||||
|
@ -1,5 +1,9 @@
|
|||||||
--TEST--
|
--TEST--
|
||||||
Testing null byte injection in imagegd2
|
Testing null byte injection in imagegd2
|
||||||
|
--SKIPIF--
|
||||||
|
<?php
|
||||||
|
if(!extension_loaded('gd')){ die('skip gd extension not available'); }
|
||||||
|
?>
|
||||||
--CLEAN--
|
--CLEAN--
|
||||||
$tempdir = sys_get_temp_dir(). '/php-gdtest';
|
$tempdir = sys_get_temp_dir(). '/php-gdtest';
|
||||||
foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
|
foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
|
||||||
|
@ -1,5 +1,9 @@
|
|||||||
--TEST--
|
--TEST--
|
||||||
Testing null byte injection in imagegd
|
Testing null byte injection in imagegd
|
||||||
|
--SKIPIF--
|
||||||
|
<?php
|
||||||
|
if(!extension_loaded('gd')){ die('skip gd extension not available'); }
|
||||||
|
?>
|
||||||
--CLEAN--
|
--CLEAN--
|
||||||
$tempdir = sys_get_temp_dir(). '/php-gdtest';
|
$tempdir = sys_get_temp_dir(). '/php-gdtest';
|
||||||
foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
|
foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
|
||||||
|
@ -6,6 +6,7 @@ foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
|
|||||||
rmdir($tempdir);
|
rmdir($tempdir);
|
||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
|
if(!extension_loaded('gd')){ die('skip gd extension not available'); }
|
||||||
$support = gd_info();
|
$support = gd_info();
|
||||||
if (!isset($support['GIF Create Support']) || $support['GIF Create Support'] === false) {
|
if (!isset($support['GIF Create Support']) || $support['GIF Create Support'] === false) {
|
||||||
print 'skip gif support not available';
|
print 'skip gif support not available';
|
||||||
|
@ -6,6 +6,7 @@ foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
|
|||||||
rmdir($tempdir);
|
rmdir($tempdir);
|
||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
|
if(!extension_loaded('gd')){ die('skip gd extension not available'); }
|
||||||
$support = gd_info();
|
$support = gd_info();
|
||||||
if (!isset($support['JPEG Support']) || $support['JPEG Support'] === false) {
|
if (!isset($support['JPEG Support']) || $support['JPEG Support'] === false) {
|
||||||
print 'skip jpeg support not available';
|
print 'skip jpeg support not available';
|
||||||
|
22
ext/gd/tests/imagepalettetotruecolor_basic.phpt
Normal file
22
ext/gd/tests/imagepalettetotruecolor_basic.phpt
Normal file
@ -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)
|
14
ext/gd/tests/imagepalettetotruecolor_error1.phpt
Normal file
14
ext/gd/tests/imagepalettetotruecolor_error1.phpt
Normal file
@ -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
|
14
ext/gd/tests/imagepalettetotruecolor_error2.phpt
Normal file
14
ext/gd/tests/imagepalettetotruecolor_error2.phpt
Normal file
@ -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
|
15
ext/gd/tests/imagepalettetotruecolor_error3.phpt
Normal file
15
ext/gd/tests/imagepalettetotruecolor_error3.phpt
Normal file
@ -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
|
@ -6,6 +6,7 @@ foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
|
|||||||
rmdir($tempdir);
|
rmdir($tempdir);
|
||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
|
if(!extension_loaded('gd')){ die('skip gd extension not available'); }
|
||||||
$support = gd_info();
|
$support = gd_info();
|
||||||
if (!isset($support['PNG Support']) || $support['PNG Support'] === false) {
|
if (!isset($support['PNG Support']) || $support['PNG Support'] === false) {
|
||||||
print 'skip png support not available';
|
print 'skip png support not available';
|
||||||
|
@ -6,6 +6,7 @@ foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
|
|||||||
rmdir($tempdir);
|
rmdir($tempdir);
|
||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
|
if(!extension_loaded('gd')){ die('skip gd extension not available'); }
|
||||||
$support = gd_info();
|
$support = gd_info();
|
||||||
if (!isset($support['WBMP Support']) || $support['WBMP Support'] === false) {
|
if (!isset($support['WBMP Support']) || $support['WBMP Support'] === false) {
|
||||||
print 'skip wbmp support not available';
|
print 'skip wbmp support not available';
|
||||||
|
@ -6,6 +6,7 @@ foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
|
|||||||
rmdir($tempdir);
|
rmdir($tempdir);
|
||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
|
if(!extension_loaded('gd')){ die('skip gd extension not available'); }
|
||||||
$support = gd_info();
|
$support = gd_info();
|
||||||
if (!isset($support['WEBP Support']) || $support['WEBP Support'] === false) {
|
if (!isset($support['WEBP Support']) || $support['WEBP Support'] === false) {
|
||||||
print 'skip webp support not available';
|
print 'skip webp support not available';
|
||||||
|
Loading…
Reference in New Issue
Block a user