Skip to content

Commit a55c638

Browse files
committed
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: Fix the return type of ftp_raw()
2 parents d670d93 + 4b3206d commit a55c638

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ext/ftp/ftp.stub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function ftp_pwd(FTP\Connection $ftp): string|false {}
2727
function ftp_cdup(FTP\Connection $ftp): bool {}
2828
function ftp_chdir(FTP\Connection $ftp, string $directory): bool {}
2929
function ftp_exec(FTP\Connection $ftp, string $command): bool {}
30-
function ftp_raw(FTP\Connection $ftp, string $command): array {}
30+
function ftp_raw(FTP\Connection $ftp, string $command): ?array {}
3131
function ftp_mkdir(FTP\Connection $ftp, string $directory): string|false {}
3232
function ftp_rmdir(FTP\Connection $ftp, string $directory): bool {}
3333
function ftp_chmod(FTP\Connection $ftp, int $permissions, string $filename): int|false {}

ext/ftp/ftp_arginfo.h

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

44
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)
@@ -39,7 +39,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_exec, 0, 2, _IS_BOOL, 0)
3939
ZEND_ARG_TYPE_INFO(0, command, IS_STRING, 0)
4040
ZEND_END_ARG_INFO()
4141

42-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_raw, 0, 2, IS_ARRAY, 0)
42+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_raw, 0, 2, IS_ARRAY, 1)
4343
ZEND_ARG_OBJ_INFO(0, ftp, FTP\\Connection, 0)
4444
ZEND_ARG_TYPE_INFO(0, command, IS_STRING, 0)
4545
ZEND_END_ARG_INFO()

0 commit comments

Comments
 (0)