Skip to content

Declare ext/ftp constants in stubs #8703

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/ftp constants in stubs #8703

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
58 changes: 55 additions & 3 deletions ext/ftp/ftp.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,61 @@
/** @generate-class-entries */

namespace FTP {
/**
* @var int
* @cname FTPTYPE_ASCII
*/
const FTP_ASCII = UNKNOWN;
/**
* @var int
* @cname FTPTYPE_ASCII
*/
const FTP_TEXT = UNKNOWN;
/**
* @var int
* @cname FTPTYPE_IMAGE
*/
const FTP_BINARY = UNKNOWN;
/**
* @var int
* @cname FTPTYPE_IMAGE
*/
const FTP_IMAGE = UNKNOWN;
/**
* @var int
* @cname PHP_FTP_AUTORESUME
*/
const FTP_AUTORESUME = UNKNOWN;
/**
* @var int
* @cname PHP_FTP_OPT_TIMEOUT_SEC
*/
const FTP_TIMEOUT_SEC = UNKNOWN;
/**
* @var int
* @cname PHP_FTP_OPT_AUTOSEEK
*/
const FTP_AUTOSEEK = UNKNOWN;
/**
* @var int
* @cname PHP_FTP_OPT_USEPASVADDRESS
*/
const FTP_USEPASVADDRESS = UNKNOWN;
/**
* @var int
* @cname PHP_FTP_FAILED
*/
const FTP_FAILED = UNKNOWN;
/**
* @var int
* @cname PHP_FTP_FINISHED
*/
const FTP_FINISHED = UNKNOWN;
/**
* @var int
* @cname PHP_FTP_MOREDATA
*/
const FTP_MOREDATA = UNKNOWN;

/**
* @strict-properties
Expand All @@ -11,11 +66,9 @@
final class Connection
{
}

}

namespace {

function ftp_connect(string $hostname, int $port = 21, int $timeout = 90): FTP\Connection|false {}

#ifdef HAVE_FTP_SSL
Expand Down Expand Up @@ -91,5 +144,4 @@ function ftp_quit(FTP\Connection $ftp): bool {}
/** @param int|bool $value */
function ftp_set_option(FTP\Connection $ftp, int $option, $value): bool {}
function ftp_get_option(FTP\Connection $ftp, int $option): int|bool {}

}
17 changes: 16 additions & 1 deletion ext/ftp/ftp_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: 2b1726dd5652839a37e533e20dfcf6782b3c766d */
* Stub hash: bd80737c67a0c10119f97988e41a08870b1f1af9 */

ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_ftp_connect, 0, 1, FTP\\Connection, MAY_BE_FALSE)
ZEND_ARG_TYPE_INFO(0, hostname, IS_STRING, 0)
Expand Down Expand Up @@ -280,6 +280,21 @@ static const zend_function_entry class_FTP_Connection_methods[] = {
ZEND_FE_END
};

static void register_ftp_consts(int module_number)
{
REGISTER_LONG_CONSTANT("FTP_ASCII", FTPTYPE_ASCII, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FTP_TEXT", FTPTYPE_ASCII, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FTP_BINARY", FTPTYPE_IMAGE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FTP_IMAGE", FTPTYPE_IMAGE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FTP_AUTORESUME", PHP_FTP_AUTORESUME, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FTP_TIMEOUT_SEC", PHP_FTP_OPT_TIMEOUT_SEC, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FTP_AUTOSEEK", PHP_FTP_OPT_AUTOSEEK, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FTP_USEPASVADDRESS", PHP_FTP_OPT_USEPASVADDRESS, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FTP_FAILED", PHP_FTP_FAILED, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FTP_FINISHED", PHP_FTP_FINISHED, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FTP_MOREDATA", PHP_FTP_MOREDATA, CONST_CS | CONST_PERSISTENT);
}

static zend_class_entry *register_class_FTP_Connection(void)
{
zend_class_entry ce, *class_entry;
Expand Down
13 changes: 2 additions & 11 deletions ext/ftp/php_ftp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,17 +118,8 @@ PHP_MINIT_FUNCTION(ftp)
ftp_object_handlers.free_obj = ftp_object_destroy;
ftp_object_handlers.clone_obj = NULL;

REGISTER_LONG_CONSTANT("FTP_ASCII", FTPTYPE_ASCII, CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT("FTP_TEXT", FTPTYPE_ASCII, CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT("FTP_BINARY", FTPTYPE_IMAGE, CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT("FTP_IMAGE", FTPTYPE_IMAGE, CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT("FTP_AUTORESUME", PHP_FTP_AUTORESUME, CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT("FTP_TIMEOUT_SEC", PHP_FTP_OPT_TIMEOUT_SEC, CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT("FTP_AUTOSEEK", PHP_FTP_OPT_AUTOSEEK, CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT("FTP_USEPASVADDRESS", PHP_FTP_OPT_USEPASVADDRESS, CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT("FTP_FAILED", PHP_FTP_FAILED, CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT("FTP_FINISHED", PHP_FTP_FINISHED, CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT("FTP_MOREDATA", PHP_FTP_MOREDATA, CONST_PERSISTENT | CONST_CS);
register_ftp_consts(module_number);

return SUCCESS;
}

Expand Down