[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/spl/ spl_directory.c

2011-04-05 Thread Gustavo André dos Santos Lopes 
cataphract   Tue, 05 Apr 2011 08:38:09 +

Revision: http://svn.php.net/viewvc?view=revision&revision=309962

Log:
- Make SplFileInfo::_bad_state_ex final.

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c

Modified: php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c
===
--- php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c2011-04-05 
08:17:11 UTC (rev 309961)
+++ php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c2011-04-05 
08:38:09 UTC (rev 309962)
@@ -1925,7 +1925,7 @@
SPL_ME(SplFileInfo,   openFile,  arginfo_info_openFile, 
ZEND_ACC_PUBLIC)
SPL_ME(SplFileInfo,   setFileClass,  arginfo_info_optinalFileClass, 
ZEND_ACC_PUBLIC)
SPL_ME(SplFileInfo,   setInfoClass,  arginfo_info_optinalFileClass, 
ZEND_ACC_PUBLIC)
-   SPL_ME(SplFileInfo,   _bad_state_ex, NULL,  
ZEND_ACC_PUBLIC)
+   SPL_ME(SplFileInfo,   _bad_state_ex, NULL,  
ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
SPL_MA(SplFileInfo,   __toString, SplFileInfo, getPathname, 
arginfo_splfileinfo_void, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
 };

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] 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

2010-04-24 Thread Etienne Kneuss 
colder   Sun, 25 Apr 2010 05:18:42 +

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.c2010-04-25 
04:59:14 UTC (rev 298474)
+++ php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c2010-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.phpt2010-04-25 
05:18:42 UTC (rev 298475)
@@ -0,0 +1,14 @@
+--TEST--
+SPL: Allow valid extension of SplFileObject::fscanf
+--FILE--
+
+===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--
+
+===DONE===
+--EXPECT--
+===DONE===

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php