Review parameter names in ext/ftp

Closes GH-6254

diff --git a/ext/ftp/ftp.stub.php b/ext/ftp/ftp.stub.php
index 17b047399572aad2e2cf7a776aaf0a12718c343f..f4812655a4c5045a4f105419e5e2a2ee086e5cd7 100644 (file)
--- 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 $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,48 +57,48 @@ 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 $offset = 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 $offset = 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 $offset = 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 $offset = 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 $offset = 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 $offset = 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 $offset = 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 $offset = 0): int|false {}
 
 /** @param resource $ftp */
 function ftp_size($ftp, string $filename): int {}
@@ -107,13 +107,13 @@ function ftp_size($ftp, string $filename): int {}
 function ftp_mdtm($ftp, string $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 $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 b5f160f74c65a522aabd5c86cc872d07ef80fcfc..e1a9d770bc34b50c00b19fb6ef575b44e584725b 100644 (file)
--- 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: 4957601533b387d70ebb15811821fc06507cdbc2 */
 
 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,7 +53,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, mode, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, permissions, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
@@ -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, 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, 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, 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)
        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, 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)
        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, 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,41 +121,41 @@ 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, 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_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, 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)
        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, 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)
        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, 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)
@@ -167,19 +167,16 @@ ZEND_END_ARG_INFO()
 
 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, 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