- Add constants and new test (test from testfest.php.net)

This commit is contained in:
Marcus Boerger 2008-05-24 11:53:35 +00:00
parent d77aaad7b6
commit 42c955d77b
3 changed files with 143 additions and 1 deletions

View File

@ -89,6 +89,8 @@ PHP_MINIT_FUNCTION(imagetypes)
REGISTER_LONG_CONSTANT("IMAGETYPE_JPEG2000",IMAGE_FILETYPE_JPC, CONST_CS | CONST_PERSISTENT); /* keep alias */
REGISTER_LONG_CONSTANT("IMAGETYPE_XBM", IMAGE_FILETYPE_XBM, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_ICO", IMAGE_FILETYPE_ICO, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_UNKNOWN", IMAGE_FILETYPE_UNKNOWN, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_COUNT", IMAGE_FILETYPE_COUNT, CONST_CS | CONST_PERSISTENT);
return SUCCESS;
}
/* }}} */

View File

@ -50,8 +50,9 @@ typedef enum
IMAGE_FILETYPE_WBMP,
/* IMAGE_FILETYPE_JPEG2000 is a userland alias for IMAGE_FILETYPE_JPC */
IMAGE_FILETYPE_XBM,
IMAGE_FILETYPE_ICO
IMAGE_FILETYPE_ICO,
/* WHEN EXTENDING: PLEASE ALSO REGISTER IN image.c:PHP_MINIT_FUNCTION(imagetypes) */
IMAGE_FILETYPE_COUNT
} image_filetype;
/* }}} */

View File

@ -0,0 +1,139 @@
--TEST--
image_type_to_mime_type() (passinf equivalent integer values)
--CREDITS--
Sanjay Mantoor <sanjay.mantoor@gmail.com>
--FILE--
<?php
/* Prototype : string image_type_to_mime_type(int imagetype)
* Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype
* Source code: ext/standard/image.c
*/
echo "*** Testing image_type_to_mime_type() : usage variations ***\n";
for($imagetype = 0; $imagetype <= IMAGETYPE_COUNT; ++$imagetype) {
echo "\n-- Iteration $imagetype --\n";
var_dump(image_type_to_mime_type($imagetype));
}
?>
===DONE===
--EXPECTREGEX--
\*\*\* Testing image_type_to_mime_type\(\) : usage variations \*\*\*
-- Iteration 0 --
string\(24\) "application\/octet-stream"
-- Iteration 1 --
string\(9\) "image\/gif"
-- Iteration 2 --
string\(10\) "image\/jpeg"
-- Iteration 3 --
string\(9\) "image\/png"
-- Iteration 4 --
string\(29\) "application\/x-shockwave-flash"
-- Iteration 5 --
string\(9\) "image\/psd"
-- Iteration 6 --
string\(9\) "image\/bmp"
-- Iteration 7 --
string\(10\) "image\/tiff"
-- Iteration 8 --
string\(10\) "image\/tiff"
-- Iteration 9 --
string\(24\) "application\/octet-stream"
-- Iteration 10 --
string\(9\) "image\/jp2"
-- Iteration 11 --
string\(24\) "application\/octet-stream"
-- Iteration 12 --
string\(24\) "application\/octet-stream"
-- Iteration 13 --
string\(2[49]\) "application\/(x-shockwave-flash|octet-stream)"
-- Iteration 14 --
string\(9\) "image\/iff"
-- Iteration 15 --
string\(18\) "image\/vnd.wap.wbmp"
-- Iteration 16 --
string\(9\) "image\/xbm"
-- Iteration 17 --
string\(24\) "image\/vnd.microsoft.icon"
-- Iteration 18 --
string\(24\) "application\/octet-stream"
===DONE===
--UEXPECTREGEX--
\*\*\* Testing image_type_to_mime_type\(\) : usage variations \*\*\*
-- Iteration 0 --
unicode\(24\) "application\/octet-stream"
-- Iteration 1 --
unicode\(9\) "image\/gif"
-- Iteration 2 --
unicode\(10\) "image\/jpeg"
-- Iteration 3 --
unicode\(9\) "image\/png"
-- Iteration 4 --
unicode\(29\) "application\/x-shockwave-flash"
-- Iteration 5 --
unicode\(9\) "image\/psd"
-- Iteration 6 --
unicode\(9\) "image\/bmp"
-- Iteration 7 --
unicode\(10\) "image\/tiff"
-- Iteration 8 --
unicode\(10\) "image\/tiff"
-- Iteration 9 --
unicode\(24\) "application\/octet-stream"
-- Iteration 10 --
unicode\(9\) "image\/jp2"
-- Iteration 11 --
unicode\(24\) "application\/octet-stream"
-- Iteration 12 --
unicode\(24\) "application\/octet-stream"
-- Iteration 13 --
unicode\(2[49]\) "application\/(x-shockwave-flash|octet-stream)"
-- Iteration 14 --
unicode\(9\) "image\/iff"
-- Iteration 15 --
unicode\(18\) "image\/vnd.wap.wbmp"
-- Iteration 16 --
unicode\(9\) "image\/xbm"
-- Iteration 17 --
unicode\(24\) "image\/vnd.microsoft.icon"
-- Iteration 18 --
unicode\(24\) "application\/octet-stream"
===DONE===