Skip to content

Declare ext/standard constants in stubs - part 6 #9467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Declare ext/standard constants in stubs - part 6 #9467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/standard/basic_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "php_globals.h"
#include "php_variables.h"
#include "php_ini.h"
#include "php_image.h"
#include "php_standard.h"
#include "php_math.h"
#include "php_http.h"
Expand Down Expand Up @@ -348,7 +349,6 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
BASIC_MINIT_SUBMODULE(exec)

BASIC_MINIT_SUBMODULE(user_streams)
BASIC_MINIT_SUBMODULE(imagetypes)

php_register_url_stream_wrapper("php", &php_stream_php_wrapper);
php_register_url_stream_wrapper("file", &php_plain_files_wrapper);
Expand Down
116 changes: 116 additions & 0 deletions ext/standard/basic_functions.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,122 @@
*/
const PHP_ROUND_HALF_ODD = UNKNOWN;

/* image.c */

/**
* @var int
* @cvalue IMAGE_FILETYPE_GIF
*/
const IMAGETYPE_GIF = UNKNOWN;
/**
* @var int
* @cvalue IMAGE_FILETYPE_JPEG
*/
const IMAGETYPE_JPEG = UNKNOWN;
/**
* @var int
* @cvalue IMAGE_FILETYPE_PNG
*/
const IMAGETYPE_PNG = UNKNOWN;
/**
* @var int
* @cvalue IMAGE_FILETYPE_SWF
*/
const IMAGETYPE_SWF = UNKNOWN;
/**
* @var int
* @cvalue IMAGE_FILETYPE_PSD
*/
const IMAGETYPE_PSD = UNKNOWN;
/**
* @var int
* @cvalue IMAGE_FILETYPE_BMP
*/
const IMAGETYPE_BMP = UNKNOWN;
/**
* @var int
* @cvalue IMAGE_FILETYPE_TIFF_II
*/
const IMAGETYPE_TIFF_II = UNKNOWN;
/**
* @var int
* @cvalue IMAGE_FILETYPE_TIFF_MM
*/
const IMAGETYPE_TIFF_MM = UNKNOWN;
/**
* @var int
* @cvalue IMAGE_FILETYPE_JPC
*/
const IMAGETYPE_JPC = UNKNOWN;
/**
* @var int
* @cvalue IMAGE_FILETYPE_JP2
*/
const IMAGETYPE_JP2 = UNKNOWN;
/**
* @var int
* @cvalue IMAGE_FILETYPE_JPX
*/
const IMAGETYPE_JPX = UNKNOWN;
/**
* @var int
* @cvalue IMAGE_FILETYPE_JB2
*/
const IMAGETYPE_JB2 = UNKNOWN;
#if (defined(HAVE_ZLIB) && !defined(COMPILE_DL_ZLIB))
/**
* @var int
* @cvalue IMAGE_FILETYPE_SWC
*/
const IMAGETYPE_SWC = UNKNOWN;
#endif
/**
* @var int
* @cvalue IMAGE_FILETYPE_IFF
*/
const IMAGETYPE_IFF = UNKNOWN;
/**
* @var int
* @cvalue IMAGE_FILETYPE_WBMP
*/
const IMAGETYPE_WBMP = UNKNOWN;
/* keep alias */
/**
* @var int
* @cvalue IMAGE_FILETYPE_JPC
*/
const IMAGETYPE_JPEG2000 = UNKNOWN;
/**
* @var int
* @cvalue IMAGE_FILETYPE_XBM
*/
const IMAGETYPE_XBM = UNKNOWN;
/**
* @var int
* @cvalue IMAGE_FILETYPE_ICO
*/
const IMAGETYPE_ICO = UNKNOWN;
/**
* @var int
* @cvalue IMAGE_FILETYPE_WEBP
*/
const IMAGETYPE_WEBP = UNKNOWN;
/**
* @var int
* @cvalue IMAGE_FILETYPE_AVIF
*/
const IMAGETYPE_AVIF = UNKNOWN;
/**
* @var int
* @cvalue IMAGE_FILETYPE_UNKNOWN
*/
const IMAGETYPE_UNKNOWN = UNKNOWN;
/**
* @var int
* @cvalue IMAGE_FILETYPE_COUNT
*/
const IMAGETYPE_COUNT = UNKNOWN;

/* syslog.c */

/* error levels */
Expand Down
26 changes: 25 additions & 1 deletion ext/standard/basic_functions_arginfo.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 0 additions & 32 deletions ext/standard/image.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,38 +64,6 @@ struct gfxinfo {
unsigned int channels;
};

/* {{{ PHP_MINIT_FUNCTION(imagetypes)
* Register IMAGETYPE_<xxx> constants used by GetImageSize(), image_type_to_mime_type, ext/exif */
PHP_MINIT_FUNCTION(imagetypes)
{
REGISTER_LONG_CONSTANT("IMAGETYPE_GIF", IMAGE_FILETYPE_GIF, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_JPEG", IMAGE_FILETYPE_JPEG, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_PNG", IMAGE_FILETYPE_PNG, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_SWF", IMAGE_FILETYPE_SWF, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_PSD", IMAGE_FILETYPE_PSD, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_BMP", IMAGE_FILETYPE_BMP, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_TIFF_II", IMAGE_FILETYPE_TIFF_II, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_TIFF_MM", IMAGE_FILETYPE_TIFF_MM, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_JPC", IMAGE_FILETYPE_JPC, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_JP2", IMAGE_FILETYPE_JP2, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_JPX", IMAGE_FILETYPE_JPX, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_JB2", IMAGE_FILETYPE_JB2, CONST_CS | CONST_PERSISTENT);
#if defined(HAVE_ZLIB) && !defined(COMPILE_DL_ZLIB)
REGISTER_LONG_CONSTANT("IMAGETYPE_SWC", IMAGE_FILETYPE_SWC, CONST_CS | CONST_PERSISTENT);
#endif
REGISTER_LONG_CONSTANT("IMAGETYPE_IFF", IMAGE_FILETYPE_IFF, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_WBMP", IMAGE_FILETYPE_WBMP, CONST_CS | CONST_PERSISTENT);
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_WEBP", IMAGE_FILETYPE_WEBP, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_AVIF", IMAGE_FILETYPE_AVIF, 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;
}
/* }}} */

/* {{{ php_handle_gif
* routine to handle GIF files. If only everything were that easy... ;} */
static struct gfxinfo *php_handle_gif (php_stream * stream)
Expand Down
4 changes: 1 addition & 3 deletions ext/standard/php_image.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,11 @@ typedef enum
IMAGE_FILETYPE_ICO,
IMAGE_FILETYPE_WEBP,
IMAGE_FILETYPE_AVIF,
/* WHEN EXTENDING: PLEASE ALSO REGISTER IN image.c:PHP_MINIT_FUNCTION(imagetypes) */
/* WHEN EXTENDING: PLEASE ALSO REGISTER IN basic_function.stub.php */
IMAGE_FILETYPE_COUNT
} image_filetype;
/* }}} */

PHP_MINIT_FUNCTION(imagetypes);

PHPAPI int php_getimagetype(php_stream *stream, const char *input, char *filetype);

PHPAPI char * php_image_type_to_mime_type(int image_type);
Expand Down