From e9237c98d791f512c2dbfc26806f5be33f49f239 Mon Sep 17 00:00:00 2001 From: Etienne Kneuss Date: Tue, 27 Apr 2010 05:03:17 +0000 Subject: [PATCH] Merge fix for #51532 --- NEWS | 1 + ext/spl/spl_directory.c | 3 +-- ext/spl/tests/bug51532.phpt | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 ext/spl/tests/bug51532.phpt diff --git a/NEWS b/NEWS index 6047b50cc9..f098b56fce 100644 --- a/NEWS +++ b/NEWS @@ -29,6 +29,7 @@ PHP NEWS (Daniel Egeberg) - Fixed bug #51562 (query timeout in mssql can not be changed per query). (ejsmont dot artur at gmail dot com) +- Fixed bug #51532 (Wrong prototype for SplFileObject::fscanf()). (Etienne) - Fixed bug #51445 (var_dump() invalid/slow *RECURSION* detection). (Felipe) - Fixed bug #51393 (DateTime::createFromFormat() fails if format string contains timezone). (Adam) diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index f0646e13ba..a0a9251aa8 100755 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -2264,9 +2264,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fgetss, 0, 0, 0) ZEND_END_ARG_INFO() static -ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fscanf, 1, 0, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fscanf, 0, 0, 1) ZEND_ARG_INFO(0, format) - ZEND_ARG_INFO(1, ...) ZEND_END_ARG_INFO() static diff --git a/ext/spl/tests/bug51532.phpt b/ext/spl/tests/bug51532.phpt new file mode 100644 index 0000000000..3a0722b2af --- /dev/null +++ b/ext/spl/tests/bug51532.phpt @@ -0,0 +1,14 @@ +--TEST-- +SPL: Allow valid extension of SplFileObject::fscanf +--FILE-- + +===DONE=== +--EXPECT-- +===DONE=== -- 2.50.1