diff options
author | Peter Kokot <peterkokot@gmail.com> | 2019-04-28 00:51:38 +0200 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2019-04-28 00:51:38 +0200 |
commit | 74e72496fabffa2cd967564dfc9b1366e16b711e (patch) | |
tree | cde0689ebb8bfd0276d72ec9a1750f34038f4ef5 /ext/spl/spl_directory.c | |
parent | bb06030bf7ac8aa3a39a9f7bed03c357cff543d9 (diff) | |
parent | f83c207d6094b1a3652552034b3d539bc45a103a (diff) | |
download | php-git-74e72496fabffa2cd967564dfc9b1366e16b711e.tar.gz |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update NEWS
Update NEWS
Fix #77024: SplFileObject::__toString() may return array
Diffstat (limited to 'ext/spl/spl_directory.c')
-rw-r--r-- | ext/spl/spl_directory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 97f4429e8f..cb31bb20e9 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -3106,7 +3106,7 @@ static const zend_function_entry spl_SplFileObject_functions[] = { SPL_ME(SplFileObject, seek, arginfo_file_object_seek, ZEND_ACC_PUBLIC) /* mappings */ SPL_MA(SplFileObject, getCurrentLine, SplFileObject, fgets, arginfo_splfileinfo_void, ZEND_ACC_PUBLIC) - SPL_MA(SplFileObject, __toString, SplFileObject, current, arginfo_splfileinfo_void, ZEND_ACC_PUBLIC) + SPL_MA(SplFileObject, __toString, SplFileObject, fgets, arginfo_splfileinfo_void, ZEND_ACC_PUBLIC) PHP_FE_END }; |