summaryrefslogtreecommitdiff
path: root/ext/ftp
diff options
context:
space:
mode:
Diffstat (limited to 'ext/ftp')
-rw-r--r--ext/ftp/ftp.c2
-rw-r--r--ext/ftp/ftp.h2
-rw-r--r--ext/ftp/ftp.stub.php120
-rw-r--r--ext/ftp/ftp_arginfo.h194
-rw-r--r--ext/ftp/php_ftp.c348
-rw-r--r--ext/ftp/php_ftp.h2
-rw-r--r--ext/ftp/tests/004.phpt58
-rw-r--r--ext/ftp/tests/006.phpt108
-rw-r--r--ext/ftp/tests/007.phpt331
-rw-r--r--ext/ftp/tests/ftp_fget_basic.phpt4
-rw-r--r--ext/ftp/tests/ftp_get_basic.phpt6
-rw-r--r--ext/ftp/tests/ftp_set_option_errors.phpt2
-rw-r--r--ext/ftp/tests/ftp_ssl_connect_error.phpt20
13 files changed, 591 insertions, 606 deletions
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
index e5355b1bd4..cb8161a456 100644
--- a/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@@ -1,7 +1,5 @@
/*
+----------------------------------------------------------------------+
- | PHP Version 7 |
- +----------------------------------------------------------------------+
| Copyright (c) The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
diff --git a/ext/ftp/ftp.h b/ext/ftp/ftp.h
index 2b1338d81d..27c39b5486 100644
--- a/ext/ftp/ftp.h
+++ b/ext/ftp/ftp.h
@@ -1,7 +1,5 @@
/*
+----------------------------------------------------------------------+
- | PHP Version 7 |
- +----------------------------------------------------------------------+
| Copyright (c) The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
diff --git a/ext/ftp/ftp.stub.php b/ext/ftp/ftp.stub.php
new file mode 100644
index 0000000000..e01603a99c
--- /dev/null
+++ b/ext/ftp/ftp.stub.php
@@ -0,0 +1,120 @@
+<?php
+
+/** @return resource|false */
+function ftp_connect(string $host, 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) {}
+#endif
+
+/** @param resource $ftp */
+function ftp_login($ftp, string $username, string $password): bool {}
+
+/** @param resource $ftp */
+function ftp_pwd($ftp): string|false {}
+
+/** @param resource $ftp */
+function ftp_cdup($ftp): bool {}
+
+/** @param resource $ftp */
+function ftp_chdir($ftp, string $directory): bool {}
+
+/** @param resource $ftp */
+function ftp_exec($ftp, string $command): bool {}
+
+/** @param resource $ftp */
+function ftp_raw($ftp, string $command): array {}
+
+/** @param resource $ftp */
+function ftp_mkdir($ftp, string $directory): string|false {}
+
+/** @param resource $ftp */
+function ftp_rmdir($ftp, string $directory): bool {}
+
+/** @param resource $ftp */
+function ftp_chmod($ftp, int $mode, string $filename): int|false {}
+
+/** @param resource $ftp */
+function ftp_alloc($ftp, int $size, &$response = UNKNOWN): bool {}
+
+/** @param resource $ftp */
+function ftp_nlist($ftp, string $directory): array|false {}
+
+/** @param resource $ftp */
+function ftp_rawlist($ftp, string $directory, bool $recurse = false): array|false {}
+
+/** @param resource $ftp */
+function ftp_mlsd($ftp, string $directory): array|false {}
+
+/** @param resource $ftp */
+function ftp_systype($ftp): string|false {}
+
+/**
+ * @param resource $ftp
+ * @param resource $fp
+ */
+function ftp_fget($ftp, $fp, string $remote_file, int $mode = FTP_BINARY, int $resumepos = 0): bool {}
+
+/**
+ * @param resource $ftp
+ * @param resource $fp
+ */
+function ftp_nb_fget($ftp, $fp, string $remote_file, int $mode = FTP_BINARY, int $resumpos = 0): int|false {}
+
+/** @param resource $ftp */
+function ftp_pasv($ftp, bool $pasv): bool {}
+
+/** @param resource $ftp */
+function ftp_get($ftp, string $local_file, string $remote_file, int $mode = FTP_BINARY, int $resumepos = 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 {}
+
+/** @param resource $ftp */
+function ftp_nb_continue($ftp): int {}
+
+/**
+ * @param resource $ftp
+ * @param resource $fp
+ */
+function ftp_fput($ftp, string $remote_file, $fp, int $mode = FTP_BINARY, int $startpos = 0): bool {}
+
+/**
+ * @param resource $ftp
+ * @param resource $fp
+ */
+function ftp_nb_fput($ftp, string $remote_file, $fp, $mode = FTP_BINARY, $startpos = 0): int|false {}
+
+/** @param resource $ftp */
+function ftp_put($ftp, string $remote_file, string $local_file, int $mode = FTP_BINARY, int $startpos = 0): bool {}
+
+/** @param resource $ftp */
+function ftp_append($ftp, string $remove_file, string $local_file, 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 {}
+
+/** @param resource $ftp */
+function ftp_size($ftp, string $filename): int {}
+
+/** @param resource $ftp */
+function ftp_mdtm($ftp, string $filename): int {}
+
+/** @param resource $ftp */
+function ftp_rename($ftp, string $src, string $dest): bool {}
+
+/** @param resource $ftp */
+function ftp_delete($ftp, string $file): bool {}
+
+/** @param resource $ftp */
+function ftp_site($ftp, string $cmd): bool {}
+
+/** @param resource $ftp */
+function ftp_close($ftp): bool {}
+
+/** @param resource $ftp */
+function ftp_set_option($ftp, int $option, $value): bool {}
+
+/** @param resource $ftp */
+function ftp_get_option($ftp, int $option): int|bool {}
diff --git a/ext/ftp/ftp_arginfo.h b/ext/ftp/ftp_arginfo.h
new file mode 100644
index 0000000000..69a3cd01e9
--- /dev/null
+++ b/ext/ftp/ftp_arginfo.h
@@ -0,0 +1,194 @@
+/* This is a generated file, edit the .stub.php file instead. */
+
+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, port, IS_LONG, 0)
+ ZEND_ARG_TYPE_INFO(0, timeout, IS_LONG, 0)
+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, port, IS_LONG, 0)
+ ZEND_ARG_TYPE_INFO(0, timeout, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+#endif
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_login, 0, 3, _IS_BOOL, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_TYPE_INFO(0, username, IS_STRING, 0)
+ ZEND_ARG_TYPE_INFO(0, password, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_pwd, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
+ ZEND_ARG_INFO(0, ftp)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_cdup, 0, 1, _IS_BOOL, 0)
+ ZEND_ARG_INFO(0, ftp)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_chdir, 0, 2, _IS_BOOL, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_TYPE_INFO(0, directory, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_exec, 0, 2, _IS_BOOL, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_TYPE_INFO(0, command, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_raw, 0, 2, IS_ARRAY, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_TYPE_INFO(0, command, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_mkdir, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_TYPE_INFO(0, directory, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_ftp_rmdir arginfo_ftp_chdir
+
+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_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_alloc, 0, 2, _IS_BOOL, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_TYPE_INFO(0, size, IS_LONG, 0)
+ ZEND_ARG_INFO(1, response)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_nlist, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_TYPE_INFO(0, directory, IS_STRING, 0)
+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(0, recurse, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_ftp_mlsd arginfo_ftp_nlist
+
+#define arginfo_ftp_systype arginfo_ftp_pwd
+
+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_TYPE_INFO(0, mode, IS_LONG, 0)
+ ZEND_ARG_TYPE_INFO(0, resumepos, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_nb_fget, 0, 3, MAY_BE_LONG|MAY_BE_FALSE)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, fp)
+ ZEND_ARG_TYPE_INFO(0, remote_file, IS_STRING, 0)
+ ZEND_ARG_TYPE_INFO(0, mode, IS_LONG, 0)
+ ZEND_ARG_TYPE_INFO(0, resumpos, IS_LONG, 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_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, mode, IS_LONG, 0)
+ ZEND_ARG_TYPE_INFO(0, resumepos, IS_LONG, 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, mode, IS_LONG, 0)
+ ZEND_ARG_TYPE_INFO(0, resume_pos, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_nb_continue, 0, 1, IS_LONG, 0)
+ ZEND_ARG_INFO(0, ftp)
+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, mode, IS_LONG, 0)
+ ZEND_ARG_TYPE_INFO(0, startpos, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_nb_fput, 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_INFO(0, fp)
+ ZEND_ARG_INFO(0, mode)
+ ZEND_ARG_INFO(0, startpos)
+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, mode, IS_LONG, 0)
+ ZEND_ARG_TYPE_INFO(0, startpos, IS_LONG, 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, mode, IS_LONG, 0)
+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, mode, IS_LONG, 0)
+ ZEND_ARG_TYPE_INFO(0, startpos, IS_LONG, 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_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_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_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_close arginfo_ftp_cdup
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_set_option, 0, 3, _IS_BOOL, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
+ ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_get_option, 0, 2, MAY_BE_LONG|MAY_BE_BOOL)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
+ZEND_END_ARG_INFO()
diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c
index e3b425ef0f..e135cec027 100644
--- a/ext/ftp/php_ftp.c
+++ b/ext/ftp/php_ftp.c
@@ -1,7 +1,5 @@
/*
+----------------------------------------------------------------------+
- | PHP Version 7 |
- +----------------------------------------------------------------------+
| Copyright (c) The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
@@ -34,219 +32,11 @@
#include "php_ftp.h"
#include "ftp.h"
+#include "ftp_arginfo.h"
static int le_ftpbuf;
#define le_ftpbuf_name "FTP Buffer"
-/* {{{ arginfo */
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_connect, 0, 0, 1)
- ZEND_ARG_INFO(0, host)
- ZEND_ARG_INFO(0, port)
- ZEND_ARG_INFO(0, timeout)
-ZEND_END_ARG_INFO()
-
-#ifdef HAVE_FTP_SSL
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_ssl_connect, 0, 0, 1)
- ZEND_ARG_INFO(0, host)
- ZEND_ARG_INFO(0, port)
- ZEND_ARG_INFO(0, timeout)
-ZEND_END_ARG_INFO()
-#endif
-
-ZEND_BEGIN_ARG_INFO(arginfo_ftp_login, 0)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, username)
- ZEND_ARG_INFO(0, password)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_ftp_pwd, 0)
- ZEND_ARG_INFO(0, ftp)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_ftp_cdup, 0)
- ZEND_ARG_INFO(0, ftp)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_ftp_chdir, 0)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, directory)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_ftp_exec, 0)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, command)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_ftp_raw, 0)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, command)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_ftp_mkdir, 0)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, directory)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_ftp_rmdir, 0)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, directory)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_ftp_chmod, 0)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, mode)
- ZEND_ARG_INFO(0, filename)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_alloc, 0, 0, 2)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, size)
- ZEND_ARG_INFO(1, response)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_ftp_nlist, 0)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, directory)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_rawlist, 0, 0, 2)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, directory)
- ZEND_ARG_INFO(0, recursive)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_ftp_mlsd, 0)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, directory)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_ftp_systype, 0)
- ZEND_ARG_INFO(0, ftp)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_fget, 0, 0, 3)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, fp)
- ZEND_ARG_INFO(0, remote_file)
- ZEND_ARG_INFO(0, mode)
- ZEND_ARG_INFO(0, resumepos)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_fget, 0, 0, 3)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, fp)
- ZEND_ARG_INFO(0, remote_file)
- ZEND_ARG_INFO(0, mode)
- ZEND_ARG_INFO(0, resumepos)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_pasv, 0, 0, 2)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, pasv)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_get, 0, 0, 3)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, local_file)
- ZEND_ARG_INFO(0, remote_file)
- ZEND_ARG_INFO(0, mode)
- ZEND_ARG_INFO(0, resume_pos)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_get, 0, 0, 3)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, local_file)
- ZEND_ARG_INFO(0, remote_file)
- ZEND_ARG_INFO(0, mode)
- ZEND_ARG_INFO(0, resume_pos)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_ftp_nb_continue, 0)
- ZEND_ARG_INFO(0, ftp)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_fput, 0, 0, 3)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, remote_file)
- ZEND_ARG_INFO(0, fp)
- ZEND_ARG_INFO(0, mode)
- ZEND_ARG_INFO(0, startpos)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_fput, 0, 0, 3)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, remote_file)
- ZEND_ARG_INFO(0, fp)
- ZEND_ARG_INFO(0, mode)
- ZEND_ARG_INFO(0, startpos)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_put, 0, 0, 3)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, remote_file)
- ZEND_ARG_INFO(0, local_file)
- ZEND_ARG_INFO(0, mode)
- ZEND_ARG_INFO(0, startpos)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_append, 0, 0, 3)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, remote_file)
- ZEND_ARG_INFO(0, local_file)
- ZEND_ARG_INFO(0, mode)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_put, 0, 0, 3)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, remote_file)
- ZEND_ARG_INFO(0, local_file)
- ZEND_ARG_INFO(0, mode)
- ZEND_ARG_INFO(0, startpos)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_ftp_size, 0)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, filename)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_ftp_mdtm, 0)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, filename)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_ftp_rename, 0)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, src)
- ZEND_ARG_INFO(0, dest)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_ftp_delete, 0)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, file)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_ftp_site, 0)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, cmd)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_ftp_close, 0)
- ZEND_ARG_INFO(0, ftp)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_ftp_set_option, 0)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, option)
- ZEND_ARG_INFO(0, value)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_ftp_get_option, 0)
- ZEND_ARG_INFO(0, ftp)
- ZEND_ARG_INFO(0, option)
-ZEND_END_ARG_INFO()
-
-/* }}} */
-
static const zend_function_entry php_ftp_functions[] = {
PHP_FE(ftp_connect, arginfo_ftp_connect)
#ifdef HAVE_FTP_SSL
@@ -375,7 +165,7 @@ PHP_FUNCTION(ftp_connect)
zend_long timeout_sec = FTP_DEFAULT_TIMEOUT;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|ll", &host, &host_len, &port, &timeout_sec) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if (timeout_sec <= 0) {
@@ -412,7 +202,7 @@ PHP_FUNCTION(ftp_ssl_connect)
zend_long timeout_sec = FTP_DEFAULT_TIMEOUT;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|ll", &host, &host_len, &port, &timeout_sec) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if (timeout_sec <= 0) {
@@ -446,11 +236,11 @@ PHP_FUNCTION(ftp_login)
size_t user_len, pass_len;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rss", &z_ftp, &user, &user_len, &pass, &pass_len) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
/* log in */
@@ -472,11 +262,11 @@ PHP_FUNCTION(ftp_pwd)
const char *pwd;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_ftp) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
if (!(pwd = ftp_pwd(ftp))) {
@@ -496,11 +286,11 @@ PHP_FUNCTION(ftp_cdup)
ftpbuf_t *ftp;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_ftp) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
if (!ftp_cdup(ftp)) {
@@ -522,11 +312,11 @@ PHP_FUNCTION(ftp_chdir)
size_t dir_len;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &dir, &dir_len) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
/* change directories */
@@ -549,11 +339,11 @@ PHP_FUNCTION(ftp_exec)
size_t cmd_len;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &cmd, &cmd_len) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
/* execute serverside command */
@@ -576,11 +366,11 @@ PHP_FUNCTION(ftp_raw)
size_t cmd_len;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &cmd, &cmd_len) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
/* execute arbitrary ftp command */
@@ -599,11 +389,11 @@ PHP_FUNCTION(ftp_mkdir)
size_t dir_len;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &dir, &dir_len) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
/* create directory */
@@ -626,11 +416,11 @@ PHP_FUNCTION(ftp_rmdir)
size_t dir_len;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &dir, &dir_len) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
/* remove directorie */
@@ -654,11 +444,11 @@ PHP_FUNCTION(ftp_chmod)
zend_long mode;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rlp", &z_ftp, &mode, &filename, &filename_len) == FAILURE) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
if (!ftp_chmod(ftp, mode, filename, filename_len)) {
@@ -680,11 +470,11 @@ PHP_FUNCTION(ftp_alloc)
zend_string *response = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl|z", &z_ftp, &size, &zresponse) == FAILURE) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
ret = ftp_alloc(ftp, size, zresponse ? &response : NULL);
@@ -711,11 +501,11 @@ PHP_FUNCTION(ftp_nlist)
size_t dir_len;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rp", &z_ftp, &dir, &dir_len) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
/* get list of files */
@@ -742,11 +532,11 @@ PHP_FUNCTION(ftp_rawlist)
zend_bool recursive = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs|b", &z_ftp, &dir, &dir_len, &recursive) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
/* get raw directory listing */
@@ -773,11 +563,11 @@ PHP_FUNCTION(ftp_mlsd)
zval entry;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &dir, &dir_len) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
/* get raw directory listing */
@@ -808,11 +598,11 @@ PHP_FUNCTION(ftp_systype)
const char *syst;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_ftp) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
if (NULL == (syst = ftp_syst(ftp))) {
@@ -837,11 +627,11 @@ PHP_FUNCTION(ftp_fget)
zend_long mode=FTPTYPE_IMAGE, resumepos=0;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rrs|ll", &z_ftp, &z_file, &file, &file_len, &mode, &resumepos) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
php_stream_from_res(stream, Z_RES_P(z_file));
XTYPE(xtype, mode);
@@ -883,11 +673,11 @@ PHP_FUNCTION(ftp_nb_fget)
zend_long mode=FTPTYPE_IMAGE, resumepos=0, ret;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rrs|ll", &z_ftp, &z_file, &file, &file_len, &mode, &resumepos) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
php_stream_from_res(stream, Z_RES_P(z_file));
XTYPE(xtype, mode);
@@ -929,11 +719,11 @@ PHP_FUNCTION(ftp_pasv)
zend_bool pasv;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rb", &z_ftp, &pasv) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
if (!ftp_pasv(ftp, pasv ? 1 : 0)) {
@@ -957,11 +747,11 @@ PHP_FUNCTION(ftp_get)
zend_long mode=FTPTYPE_IMAGE, resumepos=0;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rpp|ll", &z_ftp, &local, &local_len, &remote, &remote_len, &mode, &resumepos) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
XTYPE(xtype, mode);
@@ -1023,11 +813,11 @@ PHP_FUNCTION(ftp_nb_get)
zend_long mode=FTPTYPE_IMAGE, resumepos=0;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rss|ll", &z_ftp, &local, &local_len, &remote, &remote_len, &mode, &resumepos) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
XTYPE(xtype, mode);
@@ -1091,11 +881,11 @@ PHP_FUNCTION(ftp_nb_continue)
zend_long ret;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_ftp) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
if (!ftp->nb) {
@@ -1135,11 +925,11 @@ PHP_FUNCTION(ftp_fput)
char *remote;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsr|ll", &z_ftp, &remote, &remote_len, &z_file, &mode, &startpos) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
php_stream_from_zval(stream, z_file);
XTYPE(xtype, mode);
@@ -1185,11 +975,11 @@ PHP_FUNCTION(ftp_nb_fput)
char *remote;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsr|ll", &z_ftp, &remote, &remote_len, &z_file, &mode, &startpos) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
php_stream_from_res(stream, Z_RES_P(z_file));
XTYPE(xtype, mode);
@@ -1239,11 +1029,11 @@ PHP_FUNCTION(ftp_put)
php_stream *instream;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rpp|ll", &z_ftp, &remote, &remote_len, &local, &local_len, &mode, &startpos) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
XTYPE(xtype, mode);
@@ -1293,11 +1083,11 @@ PHP_FUNCTION(ftp_append)
php_stream *instream;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rpp|l", &z_ftp, &remote, &remote_len, &local, &local_len, &mode) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
XTYPE(xtype, mode);
@@ -1329,11 +1119,11 @@ PHP_FUNCTION(ftp_nb_put)
php_stream *instream;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rpp|ll", &z_ftp, &remote, &remote_len, &local, &local_len, &mode, &startpos) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
XTYPE(xtype, mode);
@@ -1388,11 +1178,11 @@ PHP_FUNCTION(ftp_size)
size_t file_len;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rp", &z_ftp, &file, &file_len) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
/* get file size */
@@ -1410,11 +1200,11 @@ PHP_FUNCTION(ftp_mdtm)
size_t file_len;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rp", &z_ftp, &file, &file_len) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
/* get file mod time */
@@ -1432,11 +1222,11 @@ PHP_FUNCTION(ftp_rename)
size_t src_len, dest_len;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rss", &z_ftp, &src, &src_len, &dest, &dest_len) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
/* rename the file */
@@ -1459,11 +1249,11 @@ PHP_FUNCTION(ftp_delete)
size_t file_len;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &file, &file_len) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
/* delete the file */
@@ -1486,11 +1276,11 @@ PHP_FUNCTION(ftp_site)
size_t cmd_len;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &cmd, &cmd_len) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
/* send the site command */
@@ -1511,11 +1301,11 @@ PHP_FUNCTION(ftp_close)
ftpbuf_t *ftp;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_ftp) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
ftp_quit(ftp);
@@ -1533,11 +1323,11 @@ PHP_FUNCTION(ftp_set_option)
ftpbuf_t *ftp;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rlz", &z_ftp, &option, &z_value) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
switch (option) {
@@ -1589,11 +1379,11 @@ PHP_FUNCTION(ftp_get_option)
ftpbuf_t *ftp;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl", &z_ftp, &option) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if ((ftp = (ftpbuf_t *)zend_fetch_resource(Z_RES_P(z_ftp), le_ftpbuf_name, le_ftpbuf)) == NULL) {
- RETURN_FALSE;
+ RETURN_THROWS();
}
switch (option) {
diff --git a/ext/ftp/php_ftp.h b/ext/ftp/php_ftp.h
index f3033df8fe..0d85f64880 100644
--- a/ext/ftp/php_ftp.h
+++ b/ext/ftp/php_ftp.h
@@ -1,7 +1,5 @@
/*
+----------------------------------------------------------------------+
- | PHP Version 7 |
- +----------------------------------------------------------------------+
| Copyright (c) The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
diff --git a/ext/ftp/tests/004.phpt b/ext/ftp/tests/004.phpt
index 3fcf272e3b..b95c12c518 100644
--- a/ext/ftp/tests/004.phpt
+++ b/ext/ftp/tests/004.phpt
@@ -8,68 +8,22 @@ require 'skipif.inc';
<?php
require 'server.inc';
+// Negative timeout
+var_dump(ftp_connect('127.0.0.1', 0, -3));
+
$ftp = ftp_connect('127.0.0.1', $port);
if (!$ftp) die("Couldn't connect to the server");
var_dump(ftp_login($ftp, 'user', 'pass'));
-
-var_dump(ftp_systype($ftp));
-
-/* some bogus usage */
-var_dump(ftp_alloc($ftp, array()));
-var_dump(ftp_cdup($ftp, 0));
-var_dump(ftp_chdir($ftp, array()));
-var_dump(ftp_chmod($ftp, 0666));
-var_dump(ftp_close());
-var_dump(ftp_connect('sfjkfjaksfjkasjf'));
-var_dump(ftp_delete($ftp, array()));
-var_dump(ftp_exec($ftp, array()));
-
-var_dump(ftp_systype($ftp, 0));
-var_dump(ftp_pwd($ftp, array()));
-
-var_dump(ftp_login($ftp));
var_dump(ftp_login($ftp, 'user', 'bogus'));
var_dump(ftp_quit($ftp));
?>
--EXPECTF--
-bool(true)
-string(4) "UNIX"
-
-Warning: ftp_alloc() expects parameter 2 to be int, array given in %s004.php on line 12
-bool(false)
-
-Warning: ftp_cdup() expects exactly 1 parameter, 2 given in %s004.php on line 13
-NULL
-
-Warning: ftp_chdir() expects parameter 2 to be string, array given in %s004.php on line 14
-NULL
-
-Warning: ftp_chmod() expects exactly 3 parameters, 2 given in %s on line %d
+Warning: ftp_connect(): Timeout has to be greater than 0 in %s on line %d
bool(false)
+bool(true)
-Warning: ftp_close() expects exactly 1 parameter, 0 given in %s004.php on line 16
-NULL
-
-Warning: ftp_connect(): php_network_getaddresses: getaddrinfo failed: %s in %s004.php on line 17
-bool(false)
-
-Warning: ftp_delete() expects parameter 2 to be string, array given in %s004.php on line 18
-NULL
-
-Warning: ftp_exec() expects parameter 2 to be string, array given in %s004.php on line 19
-NULL
-
-Warning: ftp_systype() expects exactly 1 parameter, 2 given in %s004.php on line 21
-NULL
-
-Warning: ftp_pwd() expects exactly 1 parameter, 2 given in %s004.php on line 22
-NULL
-
-Warning: ftp_login() expects exactly 3 parameters, 1 given in %s004.php on line 24
-NULL
-
-Warning: ftp_login(): Not logged in. in %s004.php on line 25
+Warning: ftp_login(): Not logged in. in %s on line %d
bool(false)
bool(true)
diff --git a/ext/ftp/tests/006.phpt b/ext/ftp/tests/006.phpt
deleted file mode 100644
index ff0d258917..0000000000
--- a/ext/ftp/tests/006.phpt
+++ /dev/null
@@ -1,108 +0,0 @@
---TEST--
-FTP with bogus parameters
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
---FILE--
-<?php
-$ftp=null;
-
-var_dump(ftp_connect(array()));
-var_dump(ftp_connect('127.0.0.1', 0, -3));
-var_dump(ftp_raw($ftp));
-var_dump(ftp_mkdir($ftp));
-var_dump(ftp_rmdir($ftp));
-var_dump(ftp_nlist($ftp));
-var_dump(ftp_rawlist($ftp));
-var_dump(ftp_fget($ftp));
-var_dump(ftp_nb_fget($ftp));
-var_dump(ftp_nb_get($ftp));
-var_dump(ftp_pasv($ftp));
-var_dump(ftp_nb_continue());
-var_dump(ftp_fput());
-var_dump(ftp_nb_fput($ftp));
-var_dump(ftp_put($ftp));
-var_dump(ftp_nb_put($ftp));
-var_dump(ftp_size($ftp));
-var_dump(ftp_mdtm($ftp));
-var_dump(ftp_rename($ftp));
-var_dump(ftp_site($ftp));
-var_dump(ftp_set_option($ftp));
-var_dump(ftp_get_option($ftp));
-var_dump(ftp_mlsd($ftp));
-var_dump(ftp_append($ftp));
-
-?>
---EXPECTF--
-Warning: ftp_connect() expects parameter 1 to be string, array given in %s006.php on line 4
-NULL
-
-Warning: ftp_connect(): Timeout has to be greater than 0 in %s006.php on line 5
-bool(false)
-
-Warning: ftp_raw() expects exactly 2 parameters, 1 given in %s006.php on line 6
-NULL
-
-Warning: ftp_mkdir() expects exactly 2 parameters, 1 given in %s006.php on line 7
-NULL
-
-Warning: ftp_rmdir() expects exactly 2 parameters, 1 given in %s006.php on line 8
-NULL
-
-Warning: ftp_nlist() expects exactly 2 parameters, 1 given in %s006.php on line 9
-NULL
-
-Warning: ftp_rawlist() expects at least 2 parameters, 1 given in %s006.php on line 10
-NULL
-
-Warning: ftp_fget() expects at least 3 parameters, 1 given in %s006.php on line 11
-NULL
-
-Warning: ftp_nb_fget() expects at least 3 parameters, 1 given in %s006.php on line 12
-NULL
-
-Warning: ftp_nb_get() expects at least 3 parameters, 1 given in %s006.php on line 13
-NULL
-
-Warning: ftp_pasv() expects exactly 2 parameters, 1 given in %s006.php on line 14
-NULL
-
-Warning: ftp_nb_continue() expects exactly 1 parameter, 0 given in %s006.php on line 15
-NULL
-
-Warning: ftp_fput() expects at least 3 parameters, 0 given in %s006.php on line 16
-NULL
-
-Warning: ftp_nb_fput() expects at least 3 parameters, 1 given in %s006.php on line 17
-NULL
-
-Warning: ftp_put() expects at least 3 parameters, 1 given in %s006.php on line 18
-NULL
-
-Warning: ftp_nb_put() expects at least 3 parameters, 1 given in %s006.php on line 19
-NULL
-
-Warning: ftp_size() expects exactly 2 parameters, 1 given in %s006.php on line 20
-NULL
-
-Warning: ftp_mdtm() expects exactly 2 parameters, 1 given in %s006.php on line 21
-NULL
-
-Warning: ftp_rename() expects exactly 3 parameters, 1 given in %s006.php on line 22
-NULL
-
-Warning: ftp_site() expects exactly 2 parameters, 1 given in %s006.php on line 23
-NULL
-
-Warning: ftp_set_option() expects exactly 3 parameters, 1 given in %s006.php on line 24
-NULL
-
-Warning: ftp_get_option() expects exactly 2 parameters, 1 given in %s006.php on line 25
-NULL
-
-Warning: ftp_mlsd() expects exactly 2 parameters, 1 given in %s006.php on line 26
-NULL
-
-Warning: ftp_append() expects at least 3 parameters, 1 given in %s006.php on line 27
-NULL
diff --git a/ext/ftp/tests/007.phpt b/ext/ftp/tests/007.phpt
index eebe8cf1e3..0520b37293 100644
--- a/ext/ftp/tests/007.phpt
+++ b/ext/ftp/tests/007.phpt
@@ -11,138 +11,205 @@ require 'skipif.inc';
<?php
$ftp = tmpfile();
-var_dump(ftp_login($ftp, 'user', 'pass'));
-var_dump(ftp_pwd($ftp));
-var_dump(ftp_cdup($ftp));
-var_dump(ftp_chdir($ftp, '~'));
-var_dump(ftp_exec($ftp, 'x'));
-var_dump(ftp_raw($ftp, 'x'));
-var_dump(ftp_mkdir($ftp, '/'));
-var_dump(ftp_rmdir($ftp, '/'));
-var_dump(ftp_chmod($ftp, 7777, '/'));
-var_dump(ftp_alloc($ftp, 7777));
-var_dump(ftp_nlist($ftp, '/'));
-var_dump(ftp_rawlist($ftp, '~'));
-var_dump(ftp_mlsd($ftp, '~'));
-var_dump(ftp_systype($ftp));
-var_dump(ftp_fget($ftp, $ftp, 'remote', 7777));
-var_dump(ftp_nb_fget($ftp, $ftp, 'remote', 7777));
-var_dump(ftp_pasv($ftp, false));
-var_dump(ftp_get($ftp, 'local', 'remote', 7777));
-var_dump(ftp_nb_get($ftp, 'local', 'remote', 7777));
-var_dump(ftp_nb_continue($ftp));
-var_dump(ftp_fput($ftp, 'remote', $ftp, 9999));
-var_dump(ftp_nb_fput($ftp, 'remote', $ftp, 9999));
-var_dump(ftp_put($ftp, 'remote', 'local', 9999));
-var_dump(ftp_append($ftp, 'remote', 'local', 9999));
-var_dump(ftp_nb_put($ftp, 'remote', 'local', 9999));
-var_dump(ftp_size($ftp, '~'));
-var_dump(ftp_mdtm($ftp, '~'));
-var_dump(ftp_rename($ftp, 'old', 'new'));
-var_dump(ftp_delete($ftp, 'gone'));
-var_dump(ftp_site($ftp, 'localhost'));
-var_dump(ftp_close($ftp));
-var_dump(ftp_set_option($ftp, 1, 2));
-var_dump(ftp_get_option($ftp, 1));
+try {
+ var_dump(ftp_login($ftp, 'user', 'pass'));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_pwd($ftp));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_cdup($ftp));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_chdir($ftp, '~'));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_exec($ftp, 'x'));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_raw($ftp, 'x'));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_mkdir($ftp, '/'));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_rmdir($ftp, '/'));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_chmod($ftp, 7777, '/'));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_alloc($ftp, 7777));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_nlist($ftp, '/'));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_rawlist($ftp, '~'));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_mlsd($ftp, '~'));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_systype($ftp));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_fget($ftp, $ftp, 'remote', 7777));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_nb_fget($ftp, $ftp, 'remote', 7777));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_pasv($ftp, false));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_get($ftp, 'local', 'remote', 7777));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_nb_get($ftp, 'local', 'remote', 7777));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_nb_continue($ftp));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_fput($ftp, 'remote', $ftp, 9999));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_nb_fput($ftp, 'remote', $ftp, 9999));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_put($ftp, 'remote', 'local', 9999));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_append($ftp, 'remote', 'local', 9999));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_nb_put($ftp, 'remote', 'local', 9999));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_size($ftp, '~'));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_mdtm($ftp, '~'));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_rename($ftp, 'old', 'new'));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_delete($ftp, 'gone'));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_site($ftp, 'localhost'));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_close($ftp));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_set_option($ftp, 1, 2));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
+try {
+ var_dump(ftp_get_option($ftp, 1));
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+}
fclose($ftp);
?>
---EXPECTF--
-Warning: ftp_login(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_pwd(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_cdup(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_chdir(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_exec(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_raw(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_mkdir(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_rmdir(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_chmod(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_alloc(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_nlist(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_rawlist(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_mlsd(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_systype(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_fget(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_nb_fget(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_pasv(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_get(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_nb_get(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_nb_continue(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_fput(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_nb_fput(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_put(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_append(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_nb_put(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_size(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_mdtm(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_rename(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_delete(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_site(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_close(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_set_option(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
-
-Warning: ftp_get_option(): supplied resource is not a valid FTP Buffer resource in %s007.php on line %d
-bool(false)
+--EXPECT--
+ftp_login(): supplied resource is not a valid FTP Buffer resource
+ftp_pwd(): supplied resource is not a valid FTP Buffer resource
+ftp_cdup(): supplied resource is not a valid FTP Buffer resource
+ftp_chdir(): supplied resource is not a valid FTP Buffer resource
+ftp_exec(): supplied resource is not a valid FTP Buffer resource
+ftp_raw(): supplied resource is not a valid FTP Buffer resource
+ftp_mkdir(): supplied resource is not a valid FTP Buffer resource
+ftp_rmdir(): supplied resource is not a valid FTP Buffer resource
+ftp_chmod(): supplied resource is not a valid FTP Buffer resource
+ftp_alloc(): supplied resource is not a valid FTP Buffer resource
+ftp_nlist(): supplied resource is not a valid FTP Buffer resource
+ftp_rawlist(): supplied resource is not a valid FTP Buffer resource
+ftp_mlsd(): supplied resource is not a valid FTP Buffer resource
+ftp_systype(): supplied resource is not a valid FTP Buffer resource
+ftp_fget(): supplied resource is not a valid FTP Buffer resource
+ftp_nb_fget(): supplied resource is not a valid FTP Buffer resource
+ftp_pasv(): supplied resource is not a valid FTP Buffer resource
+ftp_get(): supplied resource is not a valid FTP Buffer resource
+ftp_nb_get(): supplied resource is not a valid FTP Buffer resource
+ftp_nb_continue(): supplied resource is not a valid FTP Buffer resource
+ftp_fput(): supplied resource is not a valid FTP Buffer resource
+ftp_nb_fput(): supplied resource is not a valid FTP Buffer resource
+ftp_put(): supplied resource is not a valid FTP Buffer resource
+ftp_append(): supplied resource is not a valid FTP Buffer resource
+ftp_nb_put(): supplied resource is not a valid FTP Buffer resource
+ftp_size(): supplied resource is not a valid FTP Buffer resource
+ftp_mdtm(): supplied resource is not a valid FTP Buffer resource
+ftp_rename(): supplied resource is not a valid FTP Buffer resource
+ftp_delete(): supplied resource is not a valid FTP Buffer resource
+ftp_site(): supplied resource is not a valid FTP Buffer resource
+ftp_close(): supplied resource is not a valid FTP Buffer resource
+ftp_set_option(): supplied resource is not a valid FTP Buffer resource
+ftp_get_option(): supplied resource is not a valid FTP Buffer resource
diff --git a/ext/ftp/tests/ftp_fget_basic.phpt b/ext/ftp/tests/ftp_fget_basic.phpt
index 336594e316..62092f897d 100644
--- a/ext/ftp/tests/ftp_fget_basic.phpt
+++ b/ext/ftp/tests/ftp_fget_basic.phpt
@@ -21,10 +21,10 @@ var_dump(ftp_fget($ftp, $fp ,'a story.txt', FTP_ASCII));
fseek($fp, 0);
echo fgets($fp);
-$postition = ftell($fp);
+$position = ftell($fp);
//test binary data transfer
var_dump(ftp_fget($ftp, $fp, 'binary data.bin', FTP_BINARY));
-fseek($fp, $postition);
+fseek($fp, $position);
var_dump(urlencode(fgets($fp)));
//test non-existent file request
diff --git a/ext/ftp/tests/ftp_get_basic.phpt b/ext/ftp/tests/ftp_get_basic.phpt
index 2c5f6f58a6..c52ea56218 100644
--- a/ext/ftp/tests/ftp_get_basic.phpt
+++ b/ext/ftp/tests/ftp_get_basic.phpt
@@ -29,9 +29,6 @@ unlink($tmpfname);
//test non-existent file request
ftp_get($ftp, $tmpfname ,'a warning.txt', FTP_ASCII);
-
-//test invalid ftp_get params
-var_dump(ftp_get('foo', 'bar', 'baz'));
?>
--EXPECTF--
bool(true)
@@ -41,6 +38,3 @@ bool(true)
string(21) "BINARYFoo%00Bar%0D%0A"
Warning: ftp_get(): a warning: No such file or directory in %sftp_get_basic.php on line %d
-
-Warning: ftp_get() expects parameter 1 to be resource, string given in %s on line %d
-NULL
diff --git a/ext/ftp/tests/ftp_set_option_errors.phpt b/ext/ftp/tests/ftp_set_option_errors.phpt
index 1ad8a072c9..ad91be56e8 100644
--- a/ext/ftp/tests/ftp_set_option_errors.phpt
+++ b/ext/ftp/tests/ftp_set_option_errors.phpt
@@ -1,5 +1,5 @@
--TEST--
-Testing ftp_set_option erros while setting up
+Testing ftp_set_option errors while setting up
--CREDITS--
Gabriel Caruso (carusogabriel34@gmail.com)
--SKIPIF--
diff --git a/ext/ftp/tests/ftp_ssl_connect_error.phpt b/ext/ftp/tests/ftp_ssl_connect_error.phpt
index b0ece5d63b..13c8f9e9c0 100644
--- a/ext/ftp/tests/ftp_ssl_connect_error.phpt
+++ b/ext/ftp/tests/ftp_ssl_connect_error.phpt
@@ -12,14 +12,6 @@ echo "*** Testing ftp_ssl_connect() function : error conditions ***\n";
echo "\n-- Testing ftp_ssl_connect() function on failure --\n";
var_dump(ftp_ssl_connect('totes.invalid'));
-echo "\n-- Testing ftp_ssl_connect() function invalid argument type --\n";
-ftp_ssl_connect([]);
-ftp_ssl_connect('totes.invalid', []);
-ftp_ssl_connect('totes.invalid', 21, []);
-
-echo "\n-- Testing ftp_ssl_connect() function with more than expected no. of arguments --\n";
-ftp_ssl_connect('totes.invalid', 21, 1, []);
-
echo "\n-- Testing ftp_ssl_connect() function timeout warning for value 0 --\n";
ftp_ssl_connect('totes.invalid', 21, 0);
@@ -32,18 +24,6 @@ echo "===DONE===\n";
Warning: ftp_ssl_connect(): php_network_getaddresses: getaddrinfo failed: %s in %s on line %d
bool(false)
--- Testing ftp_ssl_connect() function invalid argument type --
-
-Warning: ftp_ssl_connect() expects parameter 1 to be string, array given in %s on line %d
-
-Warning: ftp_ssl_connect() expects parameter 2 to be int, array given in %s on line %d
-
-Warning: ftp_ssl_connect() expects parameter 3 to be int, array given in %s on line %d
-
--- Testing ftp_ssl_connect() function with more than expected no. of arguments --
-
-Warning: ftp_ssl_connect() expects at most 3 parameters, 4 given in %s on line %d
-
-- Testing ftp_ssl_connect() function timeout warning for value 0 --
Warning: ftp_ssl_connect(): Timeout has to be greater than 0 in %s on line %d
View Lorry Controller Status