From 7622d5d920240b2357ef30bcebbfd4a1383e4e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Thu, 1 Oct 2020 20:12:22 +0200 Subject: [PATCH 1/3] Review parameter names in ext/ftp --- ext/ftp/ftp.stub.php | 46 ++++++++++++------------- ext/ftp/ftp_arginfo.h | 79 +++++++++++++++++++++---------------------- 2 files changed, 61 insertions(+), 64 deletions(-) diff --git a/ext/ftp/ftp.stub.php b/ext/ftp/ftp.stub.php index 17b047399572a..3c91c1ac2ce33 100644 --- a/ext/ftp/ftp.stub.php +++ b/ext/ftp/ftp.stub.php @@ -3,11 +3,11 @@ /** @generate-function-entries */ /** @return resource|false */ -function ftp_connect(string $host, int $port = 21, int $timeout = 90) {} +function ftp_connect(string $hostname, int $port = 21, int $timeout = 90) {} #ifdef HAVE_FTP_SSL /** @return resource|false */ -function ftp_ssl_connect(string $host, int $port = 21, int $timeout = 90) {} +function ftp_ssl_connect(string $hostname, int $port = 21, int $timeout = 90) {} #endif /** @param resource $ftp */ @@ -35,7 +35,7 @@ function ftp_mkdir($ftp, string $directory): string|false {} function ftp_rmdir($ftp, string $directory): bool {} /** @param resource $ftp */ -function ftp_chmod($ftp, int $mode, string $filename): int|false {} +function ftp_chmod($ftp, int $permissions, string $remote_filename): int|false {} /** * @param resource $ftp @@ -47,7 +47,7 @@ function ftp_alloc($ftp, int $size, &$response = null): bool {} function ftp_nlist($ftp, string $directory): array|false {} /** @param resource $ftp */ -function ftp_rawlist($ftp, string $directory, bool $recurse = false): array|false {} +function ftp_rawlist($ftp, string $directory, bool $recursive = false): array|false {} /** @param resource $ftp */ function ftp_mlsd($ftp, string $directory): array|false {} @@ -57,63 +57,63 @@ function ftp_systype($ftp): string|false {} /** * @param resource $ftp - * @param resource $fp + * @param resource $stream */ -function ftp_fget($ftp, $fp, string $remote_file, int $mode = FTP_BINARY, int $resumepos = 0): bool {} +function ftp_fget($ftp, $stream, string $remote_filename, int $mode = FTP_BINARY, int $resume_position = 0): bool {} /** * @param resource $ftp - * @param resource $fp + * @param resource $stream */ -function ftp_nb_fget($ftp, $fp, string $remote_file, int $mode = FTP_BINARY, int $resumpos = 0): int {} +function ftp_nb_fget($ftp, $stream, string $remote_filename, int $mode = FTP_BINARY, int $resume_position = 0): int {} /** @param resource $ftp */ -function ftp_pasv($ftp, bool $pasv): bool {} +function ftp_pasv($ftp, bool $enable): bool {} /** @param resource $ftp */ -function ftp_get($ftp, string $local_file, string $remote_file, int $mode = FTP_BINARY, int $resumepos = 0): bool {} +function ftp_get($ftp, string $local_filename, string $remote_filename, int $mode = FTP_BINARY, int $resume_position = 0): bool {} /** @param resource $ftp */ -function ftp_nb_get($ftp, string $local_file, string $remote_file, int $mode = FTP_BINARY, int $resume_pos = 0): int {} +function ftp_nb_get($ftp, string $local_filename, string $remote_filename, int $mode = FTP_BINARY, int $resume_position = 0): int {} /** @param resource $ftp */ function ftp_nb_continue($ftp): int {} /** * @param resource $ftp - * @param resource $fp + * @param resource $stream */ -function ftp_fput($ftp, string $remote_file, $fp, int $mode = FTP_BINARY, int $startpos = 0): bool {} +function ftp_fput($ftp, string $remote_filename, $stream, int $mode = FTP_BINARY, int $start_position = 0): bool {} /** * @param resource $ftp - * @param resource $fp + * @param resource $stream */ -function ftp_nb_fput($ftp, string $remote_file, $fp, int $mode = FTP_BINARY, int $startpos = 0): int {} +function ftp_nb_fput($ftp, string $remote_filename, $stream, int $mode = FTP_BINARY, int $start_position = 0): int {} /** @param resource $ftp */ -function ftp_put($ftp, string $remote_file, string $local_file, int $mode = FTP_BINARY, int $startpos = 0): bool {} +function ftp_put($ftp, string $remote_filename, string $local_filename, int $mode = FTP_BINARY, int $start_position = 0): bool {} /** @param resource $ftp */ -function ftp_append($ftp, string $remove_file, string $local_file, int $mode = FTP_BINARY): bool {} +function ftp_append($ftp, string $remote_filename, string $local_filename, int $mode = FTP_BINARY): bool {} /** @param resource $ftp */ -function ftp_nb_put($ftp, string $remote_file, string $local_file, int $mode = FTP_BINARY, int $startpos = 0): int|false {} +function ftp_nb_put($ftp, string $remote_filename, string $local_filename, int $mode = FTP_BINARY, int $start_position = 0): int|false {} /** @param resource $ftp */ -function ftp_size($ftp, string $filename): int {} +function ftp_size($ftp, string $remote_filename): int {} /** @param resource $ftp */ -function ftp_mdtm($ftp, string $filename): int {} +function ftp_mdtm($ftp, string $remote_filename): int {} /** @param resource $ftp */ -function ftp_rename($ftp, string $src, string $dest): bool {} +function ftp_rename($ftp, string $from, string $to): bool {} /** @param resource $ftp */ -function ftp_delete($ftp, string $file): bool {} +function ftp_delete($ftp, string $remote_filename): bool {} /** @param resource $ftp */ -function ftp_site($ftp, string $cmd): bool {} +function ftp_site($ftp, string $command): bool {} /** @param resource $ftp */ function ftp_close($ftp): bool {} diff --git a/ext/ftp/ftp_arginfo.h b/ext/ftp/ftp_arginfo.h index b5f160f74c65a..2fcc5559727d6 100644 --- a/ext/ftp/ftp_arginfo.h +++ b/ext/ftp/ftp_arginfo.h @@ -1,15 +1,15 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 7cf8b5776e7d2ad943683d1f1c43d44b85dea7a1 */ + * Stub hash: dafab5db09b7346c71140a70c94a20cab172c428 */ ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_connect, 0, 0, 1) - ZEND_ARG_TYPE_INFO(0, host, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, hostname, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 0, "21") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timeout, IS_LONG, 0, "90") ZEND_END_ARG_INFO() #if defined(HAVE_FTP_SSL) ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_ssl_connect, 0, 0, 1) - ZEND_ARG_TYPE_INFO(0, host, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, hostname, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 0, "21") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timeout, IS_LONG, 0, "90") ZEND_END_ARG_INFO() @@ -53,8 +53,8 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_chmod, 0, 3, MAY_BE_LONG|MAY_BE_FALSE) ZEND_ARG_INFO(0, ftp) - ZEND_ARG_TYPE_INFO(0, mode, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, permissions, IS_LONG, 0) + ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_alloc, 0, 2, _IS_BOOL, 0) @@ -71,7 +71,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_rawlist, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE) ZEND_ARG_INFO(0, ftp) ZEND_ARG_TYPE_INFO(0, directory, IS_STRING, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, recurse, _IS_BOOL, 0, "false") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, recursive, _IS_BOOL, 0, "false") ZEND_END_ARG_INFO() #define arginfo_ftp_mlsd arginfo_ftp_nlist @@ -80,39 +80,39 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_fget, 0, 3, _IS_BOOL, 0) ZEND_ARG_INFO(0, ftp) - ZEND_ARG_INFO(0, fp) - ZEND_ARG_TYPE_INFO(0, remote_file, IS_STRING, 0) + ZEND_ARG_INFO(0, stream) + ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, resumepos, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, resume_position, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_nb_fget, 0, 3, IS_LONG, 0) ZEND_ARG_INFO(0, ftp) - ZEND_ARG_INFO(0, fp) - ZEND_ARG_TYPE_INFO(0, remote_file, IS_STRING, 0) + ZEND_ARG_INFO(0, stream) + ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, resumpos, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, resume_position, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_pasv, 0, 2, _IS_BOOL, 0) ZEND_ARG_INFO(0, ftp) - ZEND_ARG_TYPE_INFO(0, pasv, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, enable, _IS_BOOL, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_get, 0, 3, _IS_BOOL, 0) ZEND_ARG_INFO(0, ftp) - ZEND_ARG_TYPE_INFO(0, local_file, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, remote_file, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, local_filename, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, resumepos, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, resume_position, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_nb_get, 0, 3, IS_LONG, 0) ZEND_ARG_INFO(0, ftp) - ZEND_ARG_TYPE_INFO(0, local_file, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, remote_file, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, local_filename, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, resume_pos, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, resume_position, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_nb_continue, 0, 1, IS_LONG, 0) @@ -121,65 +121,62 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_fput, 0, 3, _IS_BOOL, 0) ZEND_ARG_INFO(0, ftp) - ZEND_ARG_TYPE_INFO(0, remote_file, IS_STRING, 0) - ZEND_ARG_INFO(0, fp) + ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) + ZEND_ARG_INFO(0, stream) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, startpos, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, start_position, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_nb_fput, 0, 3, IS_LONG, 0) ZEND_ARG_INFO(0, ftp) - ZEND_ARG_TYPE_INFO(0, remote_file, IS_STRING, 0) - ZEND_ARG_INFO(0, fp) + ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) + ZEND_ARG_INFO(0, stream) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, startpos, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, start_position, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_put, 0, 3, _IS_BOOL, 0) ZEND_ARG_INFO(0, ftp) - ZEND_ARG_TYPE_INFO(0, remote_file, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, local_file, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, local_filename, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, startpos, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, start_position, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_append, 0, 3, _IS_BOOL, 0) ZEND_ARG_INFO(0, ftp) - ZEND_ARG_TYPE_INFO(0, remove_file, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, local_file, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, local_filename, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_nb_put, 0, 3, MAY_BE_LONG|MAY_BE_FALSE) ZEND_ARG_INFO(0, ftp) - ZEND_ARG_TYPE_INFO(0, remote_file, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, local_file, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, local_filename, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, startpos, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, start_position, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_size, 0, 2, IS_LONG, 0) ZEND_ARG_INFO(0, ftp) - ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) ZEND_END_ARG_INFO() #define arginfo_ftp_mdtm arginfo_ftp_size ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_rename, 0, 3, _IS_BOOL, 0) ZEND_ARG_INFO(0, ftp) - ZEND_ARG_TYPE_INFO(0, src, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, dest, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, from, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, to, IS_STRING, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_delete, 0, 2, _IS_BOOL, 0) ZEND_ARG_INFO(0, ftp) - ZEND_ARG_TYPE_INFO(0, file, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_site, 0, 2, _IS_BOOL, 0) - ZEND_ARG_INFO(0, ftp) - ZEND_ARG_TYPE_INFO(0, cmd, IS_STRING, 0) -ZEND_END_ARG_INFO() +#define arginfo_ftp_site arginfo_ftp_exec #define arginfo_ftp_close arginfo_ftp_cdup From 3a588a2fd6d09046f7a70e8c0b3477b8718bf52e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Fri, 2 Oct 2020 11:22:43 +0200 Subject: [PATCH 2/3] Review --- ext/ftp/ftp.stub.php | 24 ++++++++++++------------ ext/ftp/ftp_arginfo.h | 32 ++++++++++++++++---------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/ext/ftp/ftp.stub.php b/ext/ftp/ftp.stub.php index 3c91c1ac2ce33..34541e3e917a3 100644 --- a/ext/ftp/ftp.stub.php +++ b/ext/ftp/ftp.stub.php @@ -35,7 +35,7 @@ function ftp_mkdir($ftp, string $directory): string|false {} function ftp_rmdir($ftp, string $directory): bool {} /** @param resource $ftp */ -function ftp_chmod($ftp, int $permissions, string $remote_filename): int|false {} +function ftp_chmod($ftp, int $permissions, string $filename): int|false {} /** * @param resource $ftp @@ -59,22 +59,22 @@ function ftp_systype($ftp): string|false {} * @param resource $ftp * @param resource $stream */ -function ftp_fget($ftp, $stream, string $remote_filename, int $mode = FTP_BINARY, int $resume_position = 0): bool {} +function ftp_fget($ftp, $stream, string $filename, int $mode = FTP_BINARY, int $offset = 0): bool {} /** * @param resource $ftp * @param resource $stream */ -function ftp_nb_fget($ftp, $stream, string $remote_filename, int $mode = FTP_BINARY, int $resume_position = 0): int {} +function ftp_nb_fget($ftp, $stream, string $filename, int $mode = FTP_BINARY, int $offset = 0): int {} /** @param resource $ftp */ function ftp_pasv($ftp, bool $enable): bool {} /** @param resource $ftp */ -function ftp_get($ftp, string $local_filename, string $remote_filename, int $mode = FTP_BINARY, int $resume_position = 0): bool {} +function ftp_get($ftp, string $local_filename, string $remote_filename, int $mode = FTP_BINARY, int $offset = 0): bool {} /** @param resource $ftp */ -function ftp_nb_get($ftp, string $local_filename, string $remote_filename, int $mode = FTP_BINARY, int $resume_position = 0): int {} +function ftp_nb_get($ftp, string $local_filename, string $remote_filename, int $mode = FTP_BINARY, int $offset = 0): int {} /** @param resource $ftp */ function ftp_nb_continue($ftp): int {} @@ -83,34 +83,34 @@ function ftp_nb_continue($ftp): int {} * @param resource $ftp * @param resource $stream */ -function ftp_fput($ftp, string $remote_filename, $stream, int $mode = FTP_BINARY, int $start_position = 0): bool {} +function ftp_fput($ftp, string $filename, $stream, int $mode = FTP_BINARY, int $offset = 0): bool {} /** * @param resource $ftp * @param resource $stream */ -function ftp_nb_fput($ftp, string $remote_filename, $stream, int $mode = FTP_BINARY, int $start_position = 0): int {} +function ftp_nb_fput($ftp, string $filename, $stream, int $mode = FTP_BINARY, int $offset = 0): int {} /** @param resource $ftp */ -function ftp_put($ftp, string $remote_filename, string $local_filename, int $mode = FTP_BINARY, int $start_position = 0): bool {} +function ftp_put($ftp, string $remote_filename, string $local_filename, int $mode = FTP_BINARY, int $offset = 0): bool {} /** @param resource $ftp */ function ftp_append($ftp, string $remote_filename, string $local_filename, int $mode = FTP_BINARY): bool {} /** @param resource $ftp */ -function ftp_nb_put($ftp, string $remote_filename, string $local_filename, int $mode = FTP_BINARY, int $start_position = 0): int|false {} +function ftp_nb_put($ftp, string $remote_filename, string $local_filename, int $mode = FTP_BINARY, int $offset = 0): int|false {} /** @param resource $ftp */ -function ftp_size($ftp, string $remote_filename): int {} +function ftp_size($ftp, string $filename): int {} /** @param resource $ftp */ -function ftp_mdtm($ftp, string $remote_filename): int {} +function ftp_mdtm($ftp, string $filename): int {} /** @param resource $ftp */ function ftp_rename($ftp, string $from, string $to): bool {} /** @param resource $ftp */ -function ftp_delete($ftp, string $remote_filename): bool {} +function ftp_delete($ftp, string $filename): bool {} /** @param resource $ftp */ function ftp_site($ftp, string $command): bool {} diff --git a/ext/ftp/ftp_arginfo.h b/ext/ftp/ftp_arginfo.h index 2fcc5559727d6..e5b5cb4b5d895 100644 --- a/ext/ftp/ftp_arginfo.h +++ b/ext/ftp/ftp_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: dafab5db09b7346c71140a70c94a20cab172c428 */ + * Stub hash: 285945c811e5003d17afc5d459d4c61be542eee7 */ ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_connect, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, hostname, IS_STRING, 0) @@ -54,7 +54,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_chmod, 0, 3, MAY_BE_LONG|MAY_BE_FALSE) ZEND_ARG_INFO(0, ftp) ZEND_ARG_TYPE_INFO(0, permissions, IS_LONG, 0) - ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_alloc, 0, 2, _IS_BOOL, 0) @@ -81,17 +81,17 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_fget, 0, 3, _IS_BOOL, 0) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, stream) - ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, resume_position, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_nb_fget, 0, 3, IS_LONG, 0) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, stream) - ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, resume_position, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_pasv, 0, 2, _IS_BOOL, 0) @@ -104,7 +104,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_get, 0, 3, _IS_BOOL, 0) ZEND_ARG_TYPE_INFO(0, local_filename, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, resume_position, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_nb_get, 0, 3, IS_LONG, 0) @@ -112,7 +112,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_nb_get, 0, 3, IS_LONG, 0) ZEND_ARG_TYPE_INFO(0, local_filename, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, resume_position, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_nb_continue, 0, 1, IS_LONG, 0) @@ -121,18 +121,18 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_fput, 0, 3, _IS_BOOL, 0) ZEND_ARG_INFO(0, ftp) - ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) ZEND_ARG_INFO(0, stream) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, start_position, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_nb_fput, 0, 3, IS_LONG, 0) ZEND_ARG_INFO(0, ftp) - ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) ZEND_ARG_INFO(0, stream) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, start_position, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_put, 0, 3, _IS_BOOL, 0) @@ -140,7 +140,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_put, 0, 3, _IS_BOOL, 0) ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, local_filename, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, start_position, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_append, 0, 3, _IS_BOOL, 0) @@ -155,12 +155,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_nb_put, 0, 3, MAY_BE_LONG|MA ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, local_filename, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, start_position, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_size, 0, 2, IS_LONG, 0) ZEND_ARG_INFO(0, ftp) - ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) ZEND_END_ARG_INFO() #define arginfo_ftp_mdtm arginfo_ftp_size @@ -173,7 +173,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_delete, 0, 2, _IS_BOOL, 0) ZEND_ARG_INFO(0, ftp) - ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) ZEND_END_ARG_INFO() #define arginfo_ftp_site arginfo_ftp_exec From 8de47b5bb96a8891d1f8bd58e025bc106c6904b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Fri, 2 Oct 2020 11:48:34 +0200 Subject: [PATCH 3/3] Address another comment --- ext/ftp/ftp.stub.php | 8 ++++---- ext/ftp/ftp_arginfo.h | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ext/ftp/ftp.stub.php b/ext/ftp/ftp.stub.php index 34541e3e917a3..f4812655a4c50 100644 --- a/ext/ftp/ftp.stub.php +++ b/ext/ftp/ftp.stub.php @@ -59,13 +59,13 @@ function ftp_systype($ftp): string|false {} * @param resource $ftp * @param resource $stream */ -function ftp_fget($ftp, $stream, string $filename, int $mode = FTP_BINARY, int $offset = 0): bool {} +function ftp_fget($ftp, $stream, string $remote_filename, int $mode = FTP_BINARY, int $offset = 0): bool {} /** * @param resource $ftp * @param resource $stream */ -function ftp_nb_fget($ftp, $stream, string $filename, int $mode = FTP_BINARY, int $offset = 0): int {} +function ftp_nb_fget($ftp, $stream, string $remote_filename, int $mode = FTP_BINARY, int $offset = 0): int {} /** @param resource $ftp */ function ftp_pasv($ftp, bool $enable): bool {} @@ -83,13 +83,13 @@ function ftp_nb_continue($ftp): int {} * @param resource $ftp * @param resource $stream */ -function ftp_fput($ftp, string $filename, $stream, int $mode = FTP_BINARY, int $offset = 0): bool {} +function ftp_fput($ftp, string $remote_filename, $stream, int $mode = FTP_BINARY, int $offset = 0): bool {} /** * @param resource $ftp * @param resource $stream */ -function ftp_nb_fput($ftp, string $filename, $stream, int $mode = FTP_BINARY, int $offset = 0): int {} +function ftp_nb_fput($ftp, string $remote_filename, $stream, int $mode = FTP_BINARY, int $offset = 0): int {} /** @param resource $ftp */ function ftp_put($ftp, string $remote_filename, string $local_filename, int $mode = FTP_BINARY, int $offset = 0): bool {} diff --git a/ext/ftp/ftp_arginfo.h b/ext/ftp/ftp_arginfo.h index e5b5cb4b5d895..e1a9d770bc34b 100644 --- a/ext/ftp/ftp_arginfo.h +++ b/ext/ftp/ftp_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 285945c811e5003d17afc5d459d4c61be542eee7 */ + * Stub hash: 4957601533b387d70ebb15811821fc06507cdbc2 */ ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_connect, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, hostname, IS_STRING, 0) @@ -81,7 +81,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_fget, 0, 3, _IS_BOOL, 0) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, stream) - ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0") ZEND_END_ARG_INFO() @@ -89,7 +89,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_nb_fget, 0, 3, IS_LONG, 0) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, stream) - ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0") ZEND_END_ARG_INFO() @@ -121,7 +121,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_fput, 0, 3, _IS_BOOL, 0) ZEND_ARG_INFO(0, ftp) - ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) ZEND_ARG_INFO(0, stream) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0") @@ -129,7 +129,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_nb_fput, 0, 3, IS_LONG, 0) ZEND_ARG_INFO(0, ftp) - ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0) ZEND_ARG_INFO(0, stream) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0")