[Pkg-php-commits] [php/debian-sid] Cherry pick patch to fix SplFileInf::fscanf()'s prototype

[Raphael Geissert]

---
 debian/patches/series                              |    1 +
 .../incorrect_SplFileInfo_fscanf_prototype.patch   |   39 ++++++++++++++++++++
 2 files changed, 40 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/upstream/incorrect_SplFileInfo_fscanf_prototype.patch

diff --git a/debian/patches/series b/debian/patches/series
index ef9ed57..6681d95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -67,3 +67,4 @@ upstream/db4.8_workarounds.patch
 upstream/mssql_per_query_timeout.patch
 upstream/incorrect_docroot_eval.patch
 upstream/soap_mem_leak.patch
+upstream/incorrect_SplFileInfo_fscanf_prototype.patch
diff --git a/debian/patches/upstream/incorrect_SplFileInfo_fscanf_prototype.patch b/debian/patches/upstream/incorrect_SplFileInfo_fscanf_prototype.patch
new file mode 100644
index 0000000..280eff7
--- /dev/null
+++ b/debian/patches/upstream/incorrect_SplFileInfo_fscanf_prototype.patch
@@ -0,0 +1,39 @@
+Description: Fix the prototype of SplFileInfo::fscanf so that it can be
+ extended.
+Origin: http://svn.php.net/viewvc?view=revision&revision=298475
+Last-Update: 2010-05-02
+
+Index: php/ext/spl/spl_directory.c
+===================================================================
+--- php.orig/ext/spl/spl_directory.c
++++ php/ext/spl/spl_directory.c
+@@ -2570,9 +2570,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_file_obje
+ 	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) 
+Index: php/ext/spl/tests/bug51532.phpt
+===================================================================
+--- /dev/null
++++ php/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===
-- 
1.6.5