colder Tue, 27 Apr 2010 05:03:17 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=298635
Log: Merge fix for #51532 Bug: http://bugs.php.net/51532 (Closed) Cannot override SplFileObject::fscanf() Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/ext/spl/spl_directory.c A php/php-src/branches/PHP_5_2/ext/spl/tests/bug51532.phpt Modified: php/php-src/branches/PHP_5_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_2/NEWS 2010-04-27 04:58:44 UTC (rev 298634) +++ php/php-src/branches/PHP_5_2/NEWS 2010-04-27 05:03:17 UTC (rev 298635) @@ -29,6 +29,7 @@ (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) Modified: php/php-src/branches/PHP_5_2/ext/spl/spl_directory.c =================================================================== --- php/php-src/branches/PHP_5_2/ext/spl/spl_directory.c 2010-04-27 04:58:44 UTC (rev 298634) +++ php/php-src/branches/PHP_5_2/ext/spl/spl_directory.c 2010-04-27 05:03:17 UTC (rev 298635) @@ -2264,9 +2264,8 @@ 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 Added: php/php-src/branches/PHP_5_2/ext/spl/tests/bug51532.phpt =================================================================== --- php/php-src/branches/PHP_5_2/ext/spl/tests/bug51532.phpt (rev 0) +++ php/php-src/branches/PHP_5_2/ext/spl/tests/bug51532.phpt 2010-04-27 05:03:17 UTC (rev 298635) @@ -0,0 +1,14 @@ +--TEST-- +SPL: Allow valid extension of SplFileObject::fscanf +--FILE-- +<?php + +class A extends SplFileObject { + public function fscanf($format) { + + } +} +?> +===DONE=== +--EXPECT-- +===DONE===
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
