Skip to content

Commit 1b6fb92

Browse files
AyeshAyesh
committed
Move FTP extension class FTPConnection to FTP\Connection
With the [namespaces in bundled extensions RFC](https://wiki.php.net/rfc/namespaces_in_bundled_extensions) passed, it is possible to rename the new `\FTPConnection` class to `\FTP` namespace. This also adds the entry to `./UPGRADING` file. Related: php#6925, php#5945
1 parent 05e6f3e commit 1b6fb92

File tree

8 files changed

+124
-114
lines changed

8 files changed

+124
-114
lines changed

‎NEWS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ PHP NEWS
5454
(Paulius Sapragonas)
5555

5656
- FTP:
57-
. Convert resource<ftp> to object \FTPConnection. (Sara)
57+
. Convert resource<ftp> to object \FTP\Connection. (Sara)
5858

5959
- GD:
6060
. Convert resource<gd font> to object \GdFont. (Sara)

‎UPGRADING

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ PHP 8.1 UPGRADE NOTES
6262
. The fileinfo functions now accept and return, respectively, finfo objects
6363
instead of resources.
6464

65+
- FTP:
66+
. The FTP functions now accept and return, respectively, FTP\Connection objects
67+
instead of resources.
68+
6569
- IMAP:
6670
. The IMAP functions now accept and return, respectively, IMAP\Connection objects
6771
instead of resources.

‎ext/ftp/ftp.stub.php

Lines changed: 45 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,62 +2,68 @@
22

33
/** @generate-class-entries */
44

5-
/** @strict-properties */
6-
final class FTPConnection
7-
{
5+
namespace FTP {
6+
/** @strict-properties */
7+
final class Connection
8+
{
9+
}
810
}
911

10-
function ftp_connect(string $hostname, int $port = 21, int $timeout = 90): FTPConnection|false {}
12+
namespace {
13+
14+
function ftp_connect(string $hostname, int $port = 21, int $timeout = 90): FTP\Connection|false {}
1115

1216
#ifdef HAVE_FTP_SSL
13-
function ftp_ssl_connect(string $hostname, int $port = 21, int $timeout = 90): FTPConnection|false {}
17+
function ftp_ssl_connect(string $hostname, int $port = 21, int $timeout = 90): FTP\Connection|false {}
1418
#endif
1519

16-
function ftp_login(FTPConnection $ftp, string $username, string $password): bool {}
17-
function ftp_pwd(FTPConnection $ftp): string|false {}
18-
function ftp_cdup(FTPConnection $ftp): bool {}
19-
function ftp_chdir(FTPConnection $ftp, string $directory): bool {}
20-
function ftp_exec(FTPConnection $ftp, string $command): bool {}
21-
function ftp_raw(FTPConnection $ftp, string $command): array {}
22-
function ftp_mkdir(FTPConnection $ftp, string $directory): string|false {}
23-
function ftp_rmdir(FTPConnection $ftp, string $directory): bool {}
24-
function ftp_chmod(FTPConnection $ftp, int $permissions, string $filename): int|false {}
20+
function ftp_login(FTP\Connection $ftp, string $username, string $password): bool {}
21+
function ftp_pwd(FTP\Connection $ftp): string|false {}
22+
function ftp_cdup(FTP\Connection $ftp): bool {}
23+
function ftp_chdir(FTP\Connection $ftp, string $directory): bool {}
24+
function ftp_exec(FTP\Connection $ftp, string $command): bool {}
25+
function ftp_raw(FTP\Connection $ftp, string $command): array {}
26+
function ftp_mkdir(FTP\Connection $ftp, string $directory): string|false {}
27+
function ftp_rmdir(FTP\Connection $ftp, string $directory): bool {}
28+
function ftp_chmod(FTP\Connection $ftp, int $permissions, string $filename): int|false {}
2529

2630
/** @param string $response */
27-
function ftp_alloc(FTPConnection $ftp, int $size, &$response = null): bool {}
28-
function ftp_nlist(FTPConnection $ftp, string $directory): array|false {}
29-
function ftp_rawlist(FTPConnection $ftp, string $directory, bool $recursive = false): array|false {}
30-
function ftp_mlsd(FTPConnection $ftp, string $directory): array|false {}
31-
function ftp_systype(FTPConnection $ftp): string|false {}
31+
function ftp_alloc(FTP\Connection $ftp, int $size, &$response = null): bool {}
32+
function ftp_nlist(FTP\Connection $ftp, string $directory): array|false {}
33+
function ftp_rawlist(FTP\Connection $ftp, string $directory, bool $recursive = false): array|false {}
34+
function ftp_mlsd(FTP\Connection $ftp, string $directory): array|false {}
35+
function ftp_systype(FTP\Connection $ftp): string|false {}
3236

3337
/** @param resource $stream */
34-
function ftp_fget(FTPConnection $ftp, $stream, string $remote_filename, int $mode = FTP_BINARY, int $offset = 0): bool {}
38+
function ftp_fget(FTP\Connection $ftp, $stream, string $remote_filename, int $mode = FTP_BINARY, int $offset = 0): bool {}
3539

3640
/** @param resource $stream */
37-
function ftp_nb_fget(FTPConnection $ftp, $stream, string $remote_filename, int $mode = FTP_BINARY, int $offset = 0): int {}
38-
function ftp_pasv(FTPConnection $ftp, bool $enable): bool {}
39-
function ftp_get(FTPConnection $ftp, string $local_filename, string $remote_filename, int $mode = FTP_BINARY, int $offset = 0): bool {}
40-
function ftp_nb_get(FTPConnection $ftp, string $local_filename, string $remote_filename, int $mode = FTP_BINARY, int $offset = 0): int {}
41-
function ftp_nb_continue(FTPConnection $ftp): int {}
41+
function ftp_nb_fget(FTP\Connection $ftp, $stream, string $remote_filename, int $mode = FTP_BINARY, int $offset = 0): int {}
42+
function ftp_pasv(FTP\Connection $ftp, bool $enable): bool {}
43+
function ftp_get(FTP\Connection $ftp, string $local_filename, string $remote_filename, int $mode = FTP_BINARY, int $offset = 0): bool {}
44+
function ftp_nb_get(FTP\Connection $ftp, string $local_filename, string $remote_filename, int $mode = FTP_BINARY, int $offset = 0): int {}
45+
function ftp_nb_continue(FTP\Connection $ftp): int {}
4246

4347
/** @param resource $stream */
44-
function ftp_fput(FTPConnection $ftp, string $remote_filename, $stream, int $mode = FTP_BINARY, int $offset = 0): bool {}
48+
function ftp_fput(FTP\Connection $ftp, string $remote_filename, $stream, int $mode = FTP_BINARY, int $offset = 0): bool {}
4549

4650
/** @param resource $stream */
47-
function ftp_nb_fput(FTPConnection $ftp, string $remote_filename, $stream, int $mode = FTP_BINARY, int $offset = 0): int {}
48-
function ftp_put(FTPConnection $ftp, string $remote_filename, string $local_filename, int $mode = FTP_BINARY, int $offset = 0): bool {}
49-
function ftp_append(FTPConnection $ftp, string $remote_filename, string $local_filename, int $mode = FTP_BINARY): bool {}
50-
function ftp_nb_put(FTPConnection $ftp, string $remote_filename, string $local_filename, int $mode = FTP_BINARY, int $offset = 0): int|false {}
51-
function ftp_size(FTPConnection $ftp, string $filename): int {}
52-
function ftp_mdtm(FTPConnection $ftp, string $filename): int {}
53-
function ftp_rename(FTPConnection $ftp, string $from, string $to): bool {}
54-
function ftp_delete(FTPConnection $ftp, string $filename): bool {}
55-
function ftp_site(FTPConnection $ftp, string $command): bool {}
56-
function ftp_close(FTPConnection $ftp): bool {}
51+
function ftp_nb_fput(FTP\Connection $ftp, string $remote_filename, $stream, int $mode = FTP_BINARY, int $offset = 0): int {}
52+
function ftp_put(FTP\Connection $ftp, string $remote_filename, string $local_filename, int $mode = FTP_BINARY, int $offset = 0): bool {}
53+
function ftp_append(FTP\Connection $ftp, string $remote_filename, string $local_filename, int $mode = FTP_BINARY): bool {}
54+
function ftp_nb_put(FTP\Connection $ftp, string $remote_filename, string $local_filename, int $mode = FTP_BINARY, int $offset = 0): int|false {}
55+
function ftp_size(FTP\Connection $ftp, string $filename): int {}
56+
function ftp_mdtm(FTP\Connection $ftp, string $filename): int {}
57+
function ftp_rename(FTP\Connection $ftp, string $from, string $to): bool {}
58+
function ftp_delete(FTP\Connection $ftp, string $filename): bool {}
59+
function ftp_site(FTP\Connection $ftp, string $command): bool {}
60+
function ftp_close(FTP\Connection $ftp): bool {}
5761

5862
/** @alias ftp_close */
59-
function ftp_quit(FTPConnection $ftp): bool {}
63+
function ftp_quit(FTP\Connection $ftp): bool {}
6064

6165
/** @param int|bool $value */
62-
function ftp_set_option(FTPConnection $ftp, int $option, $value): bool {}
63-
function ftp_get_option(FTPConnection $ftp, int $option): int|bool {}
66+
function ftp_set_option(FTP\Connection $ftp, int $option, $value): bool {}
67+
function ftp_get_option(FTP\Connection $ftp, int $option): int|bool {}
68+
69+
}

‎ext/ftp/ftp_arginfo.h

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,75 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: db52e4b33562b93173c41d00f20e313553b173b4 */
2+
* Stub hash: 0ea788bc7779d9c340b9fb3ad72fa0571df9341e */
33

4-
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_ftp_connect, 0, 1, FTPConnection, MAY_BE_FALSE)
4+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_ftp_connect, 0, 1, FTP\\Connection, MAY_BE_FALSE)
55
ZEND_ARG_TYPE_INFO(0, hostname, IS_STRING, 0)
66
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 0, "21")
77
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timeout, IS_LONG, 0, "90")
88
ZEND_END_ARG_INFO()
99

1010
#if defined(HAVE_FTP_SSL)
11-
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_ftp_ssl_connect, 0, 1, FTPConnection, MAY_BE_FALSE)
11+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_ftp_ssl_connect, 0, 1, FTP\\Connection, MAY_BE_FALSE)
1212
ZEND_ARG_TYPE_INFO(0, hostname, IS_STRING, 0)
1313
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 0, "21")
1414
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timeout, IS_LONG, 0, "90")
1515
ZEND_END_ARG_INFO()
1616
#endif
1717

1818
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_login, 0, 3, _IS_BOOL, 0)
19-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
19+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
2020
ZEND_ARG_TYPE_INFO(0, username, IS_STRING, 0)
2121
ZEND_ARG_TYPE_INFO(0, password, IS_STRING, 0)
2222
ZEND_END_ARG_INFO()
2323

2424
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_pwd, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
25-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
25+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
2626
ZEND_END_ARG_INFO()
2727

2828
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_cdup, 0, 1, _IS_BOOL, 0)
29-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
29+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
3030
ZEND_END_ARG_INFO()
3131

3232
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_chdir, 0, 2, _IS_BOOL, 0)
33-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
33+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
3434
ZEND_ARG_TYPE_INFO(0, directory, IS_STRING, 0)
3535
ZEND_END_ARG_INFO()
3636

3737
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_exec, 0, 2, _IS_BOOL, 0)
38-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
38+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
3939
ZEND_ARG_TYPE_INFO(0, command, IS_STRING, 0)
4040
ZEND_END_ARG_INFO()
4141

4242
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_raw, 0, 2, IS_ARRAY, 0)
43-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
43+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
4444
ZEND_ARG_TYPE_INFO(0, command, IS_STRING, 0)
4545
ZEND_END_ARG_INFO()
4646

4747
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_mkdir, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
48-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
48+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
4949
ZEND_ARG_TYPE_INFO(0, directory, IS_STRING, 0)
5050
ZEND_END_ARG_INFO()
5151

5252
#define arginfo_ftp_rmdir arginfo_ftp_chdir
5353

5454
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_chmod, 0, 3, MAY_BE_LONG|MAY_BE_FALSE)
55-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
55+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
5656
ZEND_ARG_TYPE_INFO(0, permissions, IS_LONG, 0)
5757
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
5858
ZEND_END_ARG_INFO()
5959

6060
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_alloc, 0, 2, _IS_BOOL, 0)
61-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
61+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
6262
ZEND_ARG_TYPE_INFO(0, size, IS_LONG, 0)
6363
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, response, "null")
6464
ZEND_END_ARG_INFO()
6565

6666
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_nlist, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE)
67-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
67+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
6868
ZEND_ARG_TYPE_INFO(0, directory, IS_STRING, 0)
6969
ZEND_END_ARG_INFO()
7070

7171
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_rawlist, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE)
72-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
72+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
7373
ZEND_ARG_TYPE_INFO(0, directory, IS_STRING, 0)
7474
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, recursive, _IS_BOOL, 0, "false")
7575
ZEND_END_ARG_INFO()
@@ -79,100 +79,100 @@ ZEND_END_ARG_INFO()
7979
#define arginfo_ftp_systype arginfo_ftp_pwd
8080

8181
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_fget, 0, 3, _IS_BOOL, 0)
82-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
82+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
8383
ZEND_ARG_INFO(0, stream)
8484
ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0)
8585
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY")
8686
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0")
8787
ZEND_END_ARG_INFO()
8888

8989
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_nb_fget, 0, 3, IS_LONG, 0)
90-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
90+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
9191
ZEND_ARG_INFO(0, stream)
9292
ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0)
9393
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY")
9494
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0")
9595
ZEND_END_ARG_INFO()
9696

9797
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_pasv, 0, 2, _IS_BOOL, 0)
98-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
98+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
9999
ZEND_ARG_TYPE_INFO(0, enable, _IS_BOOL, 0)
100100
ZEND_END_ARG_INFO()
101101

102102
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_get, 0, 3, _IS_BOOL, 0)
103-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
103+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
104104
ZEND_ARG_TYPE_INFO(0, local_filename, IS_STRING, 0)
105105
ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0)
106106
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY")
107107
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0")
108108
ZEND_END_ARG_INFO()
109109

110110
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_nb_get, 0, 3, IS_LONG, 0)
111-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
111+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
112112
ZEND_ARG_TYPE_INFO(0, local_filename, IS_STRING, 0)
113113
ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0)
114114
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY")
115115
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0")
116116
ZEND_END_ARG_INFO()
117117

118118
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_nb_continue, 0, 1, IS_LONG, 0)
119-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
119+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
120120
ZEND_END_ARG_INFO()
121121

122122
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_fput, 0, 3, _IS_BOOL, 0)
123-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
123+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
124124
ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0)
125125
ZEND_ARG_INFO(0, stream)
126126
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY")
127127
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0")
128128
ZEND_END_ARG_INFO()
129129

130130
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_nb_fput, 0, 3, IS_LONG, 0)
131-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
131+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
132132
ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0)
133133
ZEND_ARG_INFO(0, stream)
134134
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY")
135135
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0")
136136
ZEND_END_ARG_INFO()
137137

138138
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_put, 0, 3, _IS_BOOL, 0)
139-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
139+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
140140
ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0)
141141
ZEND_ARG_TYPE_INFO(0, local_filename, IS_STRING, 0)
142142
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY")
143143
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0")
144144
ZEND_END_ARG_INFO()
145145

146146
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_append, 0, 3, _IS_BOOL, 0)
147-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
147+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
148148
ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0)
149149
ZEND_ARG_TYPE_INFO(0, local_filename, IS_STRING, 0)
150150
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY")
151151
ZEND_END_ARG_INFO()
152152

153153
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_nb_put, 0, 3, MAY_BE_LONG|MAY_BE_FALSE)
154-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
154+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
155155
ZEND_ARG_TYPE_INFO(0, remote_filename, IS_STRING, 0)
156156
ZEND_ARG_TYPE_INFO(0, local_filename, IS_STRING, 0)
157157
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "FTP_BINARY")
158158
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0")
159159
ZEND_END_ARG_INFO()
160160

161161
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_size, 0, 2, IS_LONG, 0)
162-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
162+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
163163
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
164164
ZEND_END_ARG_INFO()
165165

166166
#define arginfo_ftp_mdtm arginfo_ftp_size
167167

168168
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_rename, 0, 3, _IS_BOOL, 0)
169-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
169+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
170170
ZEND_ARG_TYPE_INFO(0, from, IS_STRING, 0)
171171
ZEND_ARG_TYPE_INFO(0, to, IS_STRING, 0)
172172
ZEND_END_ARG_INFO()
173173

174174
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_delete, 0, 2, _IS_BOOL, 0)
175-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
175+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
176176
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
177177
ZEND_END_ARG_INFO()
178178

@@ -183,13 +183,13 @@ ZEND_END_ARG_INFO()
183183
#define arginfo_ftp_quit arginfo_ftp_cdup
184184

185185
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_set_option, 0, 3, _IS_BOOL, 0)
186-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
186+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
187187
ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
188188
ZEND_ARG_INFO(0, value)
189189
ZEND_END_ARG_INFO()
190190

191191
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_get_option, 0, 2, MAY_BE_LONG|MAY_BE_BOOL)
192-
ZEND_ARG_OBJ_INFO(0, ftp, FTPConnection, 0)
192+
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
193193
ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
194194
ZEND_END_ARG_INFO()
195195

@@ -276,15 +276,15 @@ static const zend_function_entry ext_functions[] = {
276276
};
277277

278278

279-
static const zend_function_entry class_FTPConnection_methods[] = {
279+
static const zend_function_entry class_FTP_Connection_methods[] = {
280280
ZEND_FE_END
281281
};
282282

283-
static zend_class_entry *register_class_FTPConnection(void)
283+
static zend_class_entry *register_class_FTP_Connection(void)
284284
{
285285
zend_class_entry ce, *class_entry;
286286

287-
INIT_CLASS_ENTRY(ce, "FTPConnection", class_FTPConnection_methods);
287+
INIT_NS_CLASS_ENTRY(ce, "FTP", "Connection", class_FTP_Connection_methods);
288288
class_entry = zend_register_internal_class_ex(&ce, NULL);
289289
class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_NO_DYNAMIC_PROPERTIES;
290290

‎ext/ftp/php_ftp.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ static zend_object* ftp_object_create(zend_class_entry* ce) {
8383
}
8484

8585
static zend_function *ftp_object_get_constructor(zend_object *zobj) {
86-
zend_throw_error(NULL, "Cannot directly construct FTPConnection, use ftp_connect() or ftp_ssl_connect() instead");
86+
zend_throw_error(NULL, "Cannot directly construct FTP\\Connection, use ftp_connect() or ftp_ssl_connect() instead");
8787
return NULL;
8888
}
8989

@@ -108,7 +108,7 @@ PHP_MINIT_FUNCTION(ftp)
108108
#endif
109109
#endif
110110

111-
php_ftp_ce = register_class_FTPConnection();
111+
php_ftp_ce = register_class_FTP_Connection();
112112
php_ftp_ce->create_object = ftp_object_create;
113113
php_ftp_ce->serialize = zend_class_serialize_deny;
114114
php_ftp_ce->unserialize = zend_class_unserialize_deny;
@@ -229,7 +229,7 @@ PHP_FUNCTION(ftp_ssl_connect)
229229
#define GET_FTPBUF(ftpbuf, zftp) \
230230
ftpbuf = ftp_object_from_zend_object(Z_OBJ_P(zftp))->ftp; \
231231
if (!ftpbuf) { \
232-
zend_throw_exception(zend_ce_value_error, "FTPConnection is already closed", 0); \
232+
zend_throw_exception(zend_ce_value_error, "FTP\\Connection is already closed", 0); \
233233
RETURN_THROWS(); \
234234
}
235235

0 commit comments

Comments
 (0)