Skip to content

Declare ext/fileinfo constants in stubs #8701

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

Merged
merged 1 commit into from
Jun 4, 2022
Merged

Declare ext/fileinfo constants in stubs #8701

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
17 changes: 1 addition & 16 deletions ext/fileinfo/fileinfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,22 +115,7 @@ PHP_MINIT_FUNCTION(finfo)
finfo_object_handlers.free_obj = finfo_objects_free;
finfo_object_handlers.clone_obj = NULL;

REGISTER_LONG_CONSTANT("FILEINFO_NONE", MAGIC_NONE, CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FILEINFO_SYMLINK", MAGIC_SYMLINK, CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FILEINFO_MIME", MAGIC_MIME, CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FILEINFO_MIME_TYPE", MAGIC_MIME_TYPE, CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FILEINFO_MIME_ENCODING",MAGIC_MIME_ENCODING, CONST_CS|CONST_PERSISTENT);
/* REGISTER_LONG_CONSTANT("FILEINFO_COMPRESS", MAGIC_COMPRESS, CONST_CS|CONST_PERSISTENT); disabled, as it does fork now */
REGISTER_LONG_CONSTANT("FILEINFO_DEVICES", MAGIC_DEVICES, CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FILEINFO_CONTINUE", MAGIC_CONTINUE, CONST_CS|CONST_PERSISTENT);
#ifdef MAGIC_PRESERVE_ATIME
REGISTER_LONG_CONSTANT("FILEINFO_PRESERVE_ATIME", MAGIC_PRESERVE_ATIME, CONST_CS|CONST_PERSISTENT);
#endif
#ifdef MAGIC_RAW
REGISTER_LONG_CONSTANT("FILEINFO_RAW", MAGIC_RAW, CONST_CS|CONST_PERSISTENT);
#endif
REGISTER_LONG_CONSTANT("FILEINFO_APPLE", MAGIC_APPLE, CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FILEINFO_EXTENSION", MAGIC_EXTENSION, CONST_CS|CONST_PERSISTENT);
register_fileinfo_consts(module_number);

return SUCCESS;
}
Expand Down
60 changes: 60 additions & 0 deletions ext/fileinfo/fileinfo.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,66 @@

/** @generate-class-entries */

/**
* @var int
* @cname MAGIC_NONE
*/
const FILEINFO_NONE = UNKNOWN;
/**
* @var int
* @cname MAGIC_SYMLINK
*/
const FILEINFO_SYMLINK = UNKNOWN;
/**
* @var int
* @cname MAGIC_MIME
*/
const FILEINFO_MIME = UNKNOWN;
/**
* @var int
* @cname MAGIC_MIME_TYPE
*/
const FILEINFO_MIME_TYPE = UNKNOWN;
/**
* @var int
* @cname MAGIC_MIME_ENCODING
*/
const FILEINFO_MIME_ENCODING = UNKNOWN;
/**
* @var int
* @cname MAGIC_DEVICES
*/
const FILEINFO_DEVICES = UNKNOWN;
/**
* @var int
* @cname MAGIC_CONTINUE
*/
const FILEINFO_CONTINUE = UNKNOWN;
#ifdef MAGIC_PRESERVE_ATIME
/**
* @var int
* @cname MAGIC_PRESERVE_ATIME
*/
const FILEINFO_PRESERVE_ATIME = UNKNOWN;
#endif
#ifdef MAGIC_RAW
/**
* @var int
* @cname MAGIC_RAW
*/
const FILEINFO_RAW = UNKNOWN;
#endif
/**
* @var int
* @cname MAGIC_APPLE
*/
const FILEINFO_APPLE = UNKNOWN;
/**
* @var int
* @cname MAGIC_EXTENSION
*/
const FILEINFO_EXTENSION = UNKNOWN;

/** @not-serializable */
class finfo
{
Expand Down
21 changes: 20 additions & 1 deletion ext/fileinfo/fileinfo_arginfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: 162664644202bf582b09be897e46c9bdc4d66a5b */
* Stub hash: 271c579a0e45c1d3a9bb67a130808ee65ff8cd99 */

ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_finfo_open, 0, 0, finfo, MAY_BE_FALSE)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "FILEINFO_NONE")
Expand Down Expand Up @@ -82,6 +82,25 @@ static const zend_function_entry class_finfo_methods[] = {
ZEND_FE_END
};

static void register_fileinfo_consts(int module_number)
{
REGISTER_LONG_CONSTANT("FILEINFO_NONE", MAGIC_NONE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FILEINFO_SYMLINK", MAGIC_SYMLINK, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FILEINFO_MIME", MAGIC_MIME, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FILEINFO_MIME_TYPE", MAGIC_MIME_TYPE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FILEINFO_MIME_ENCODING", MAGIC_MIME_ENCODING, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FILEINFO_DEVICES", MAGIC_DEVICES, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FILEINFO_CONTINUE", MAGIC_CONTINUE, CONST_CS | CONST_PERSISTENT);
#if defined(MAGIC_PRESERVE_ATIME)
REGISTER_LONG_CONSTANT("FILEINFO_PRESERVE_ATIME", MAGIC_PRESERVE_ATIME, CONST_CS | CONST_PERSISTENT);
#endif
#if defined(MAGIC_RAW)
REGISTER_LONG_CONSTANT("FILEINFO_RAW", MAGIC_RAW, CONST_CS | CONST_PERSISTENT);
#endif
REGISTER_LONG_CONSTANT("FILEINFO_APPLE", MAGIC_APPLE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FILEINFO_EXTENSION", MAGIC_EXTENSION, CONST_CS | CONST_PERSISTENT);
}

static zend_class_entry *register_class_finfo(void)
{
zend_class_entry ce, *class_entry;
Expand Down