svn: /php/php-src/ branches/PHP_5_3/ext/spl/spl_directory.c branches/PHP_5_3/ext/spl/tests/bug51532.phpt trunk/ext/spl/spl_directory.c
trunk/ext/spl/tests/bug51532.phpt
| From: | Etienne Kneuss | Date: | Sun, 25 Apr 2010 05:18:42 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/ext/spl/spl_directory.c branches/PHP_5_3/ext/spl/tests/bug51532.phpt trunk/ext/spl/spl_directory.c trunk/ext/spl/tests/bug51532.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-62397@lists.php.net to get a copy of this message | ||
colder Sun, 25 Apr 2010 05:18:42 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=298475
Log:
Fix #51532 (Invalid prototype for SplFileInfo::fscanf)
Bug: http://bugs.php.net/51532 (Open) Cannot override
SplFileObject::fscanf()
Changed paths:
U php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c
A php/php-src/branches/PHP_5_3/ext/spl/tests/bug51532.phpt
U php/php-src/trunk/ext/spl/spl_directory.c
A php/php-src/trunk/ext/spl/tests/bug51532.phpt
Modified: php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c 2010-04-25 04:59:14 UTC (rev 298474)
+++ php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c 2010-04-25 05:18:42 UTC (rev 298475)
@@ -2567,9 +2567,8 @@
ZEND_ARG_INFO(0, allowable_tags)
ZEND_END_ARG_INFO()
-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()
ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fwrite, 0, 0, 1)
Added: php/php-src/branches/PHP_5_3/ext/spl/tests/bug51532.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/tests/bug51532.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/bug51532.phpt 2010-04-25 05:18:42 UTC (rev 298475)
@@ -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===
Modified: php/php-src/trunk/ext/spl/spl_directory.c
===================================================================
--- php/php-src/trunk/ext/spl/spl_directory.c 2010-04-25 04:59:14 UTC (rev 298474)
+++ php/php-src/trunk/ext/spl/spl_directory.c 2010-04-25 05:18:42 UTC (rev 298475)
@@ -2567,9 +2567,8 @@
ZEND_ARG_INFO(0, allowable_tags)
ZEND_END_ARG_INFO()
-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()
ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fwrite, 0, 0, 1)
Added: php/php-src/trunk/ext/spl/tests/bug51532.phpt
===================================================================
--- php/php-src/trunk/ext/spl/tests/bug51532.phpt (rev 0)
+++ php/php-src/trunk/ext/spl/tests/bug51532.phpt 2010-04-25 05:18:42 UTC (rev 298475)
@@ -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===