From: Etienne Kneuss <colder@php.net>
Date: Sun, 25 Apr 2010 05:18:42 +0000 (+0000)
Subject: Fix #51532 (Invalid prototype for SplFileInfo::fscanf)
X-Git-Tag: php-5.3.3RC1~267
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb88d58e6ccc9707a346c6ca7512a779c281f0bd;p=php

Fix #51532 (Invalid prototype for SplFileInfo::fscanf)
---

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index 5721f06f90..3b47374206 100755
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -2567,9 +2567,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fgetss, 0, 0, 0)
 	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) 
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--
+<?php
+
+class A extends SplFileObject {
+    public function fscanf($format) {
+
+    }
+}
+?>
+===DONE===
+--EXPECT--
+===DONE===