svn: /php/php-src/ branches/PHP_5_3/ext/spl/spl_observer.c trunk/ext/spl/spl_observer.c

felipe Tue, 01 Mar 2011 00:13:23 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=308784 Log: - Fixed SplObjectStorage::offsetSet arginfo, reported in bug #54118 Bug: http://bugs.php.net/54118 (Open) splobjectstorage::offsetset Changed paths: U php/php-src/branches/PHP_5_3/ext/spl/spl_observer.c U php/php-src/trunk/ext/spl/spl_observer.c Modified: php/php-src/branches/PHP_5_3/ext/spl/spl_observer.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/spl/spl_observer.c 2011-03-01 00:06:43 UTC (rev 308783) +++ php/php-src/branches/PHP_5_3/ext/spl/spl_observer.c 2011-03-01 00:13:23 UTC (rev 308784) @@ -843,11 +843,6 @@ ZEND_ARG_INFO(0, object) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_offsetSet, 0, 0, 2) - ZEND_ARG_INFO(0, object) - ZEND_ARG_INFO(0, info) -ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_INFO(arginfo_splobject_void, 0) ZEND_END_ARG_INFO() @@ -873,7 +868,7 @@ SPL_ME(SplObjectStorage, serialize, arginfo_splobject_void,0) /* ArrayAccess */ SPL_MA(SplObjectStorage, offsetExists, SplObjectStorage, contains, arginfo_offsetGet, 0) - SPL_MA(SplObjectStorage, offsetSet, SplObjectStorage, attach, arginfo_offsetSet, 0) + SPL_MA(SplObjectStorage, offsetSet, SplObjectStorage, attach, arginfo_attach, 0) SPL_MA(SplObjectStorage, offsetUnset, SplObjectStorage, detach, arginfo_offsetGet, 0) SPL_ME(SplObjectStorage, offsetGet, arginfo_offsetGet, 0) {NULL, NULL, NULL} Modified: php/php-src/trunk/ext/spl/spl_observer.c =================================================================== --- php/php-src/trunk/ext/spl/spl_observer.c 2011-03-01 00:06:43 UTC (rev 308783) +++ php/php-src/trunk/ext/spl/spl_observer.c 2011-03-01 00:13:23 UTC (rev 308784) @@ -956,11 +956,6 @@ ZEND_ARG_INFO(0, object) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_offsetSet, 0, 0, 2) - ZEND_ARG_INFO(0, object) - ZEND_ARG_INFO(0, info) -ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_INFO(arginfo_splobject_void, 0) ZEND_END_ARG_INFO() @@ -987,7 +982,7 @@ SPL_ME(SplObjectStorage, serialize, arginfo_splobject_void,0) /* ArrayAccess */ SPL_MA(SplObjectStorage, offsetExists, SplObjectStorage, contains, arginfo_offsetGet, 0) - SPL_MA(SplObjectStorage, offsetSet, SplObjectStorage, attach, arginfo_offsetSet, 0) + SPL_MA(SplObjectStorage, offsetSet, SplObjectStorage, attach, arginfo_attach, 0) SPL_MA(SplObjectStorage, offsetUnset, SplObjectStorage, detach, arginfo_offsetGet, 0) SPL_ME(SplObjectStorage, offsetGet, arginfo_offsetGet, 0) {NULL, NULL, NULL}