com php-src: The first arg is optional: ext/spl/spl_array.c
| From: | Xinchen Hui | Date: | Thu, 10 Dec 2015 11:36:41 +0000 |
| Subject: | com php-src: The first arg is optional: ext/spl/spl_array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90200@lists.php.net to get a copy of this message | ||
Commit: c096a281bebfb94685ce246a172b41f57670087e
Author: Xinchen Hui <laruence@gmail.com> Thu, 10 Dec 2015 19:36:41 +0800
Parents: e4ad9ed8adac91ad62c8245615e5d74e35944dff
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c096a281bebfb94685ce246a172b41f57670087e
Log:
The first arg is optional
Changed paths:
M ext/spl/spl_array.c
Diff:
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index bba8e55..0329270 100644
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -1169,8 +1169,8 @@ zend_object_iterator *spl_array_get_iterator(zend_class_entry *ce, zval
*object,
}
/* }}} */
-/* {{{ proto void ArrayObject::__construct(array|object ar = array() [, int flags = 0 [, string
iterator_class = "ArrayIterator"]])
- proto void ArrayIterator::__construct(array|object ar = array() [, int flags = 0])
+/* {{{ proto void ArrayObject::__construct([array|object ar = array() [, int flags = 0 [, string
iterator_class = "ArrayIterator"]]])
+ proto void ArrayIterator::__construct([array|object ar = array() [, int flags = 0]])
Constructs a new array iterator from a path. */
SPL_METHOD(Array, __construct)
{
@@ -1810,7 +1810,7 @@ outexcept:
} /* }}} */
/* {{{ arginfo and function table */
-ZEND_BEGIN_ARG_INFO_EX(arginfo_array___construct, 0, 0, 1)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_array___construct, 0, 0, 0)
ZEND_ARG_INFO(0, array)
ZEND_ARG_INFO(0, ar_flags)
ZEND_ARG_INFO(0, iterator_class)