Revert "[ci skip] Add missing return types to protos"

This reverts commit a2c7c46d5ef5b9fc945d7b655d31d5c9f1a72d34.

Since apparently there have been some mistakes in this commit, and it's
not clear yet how to solve them, we're reverting for now.

diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c
index d1aa710ba6dec49a76a510735952398baa6101af..e3da91d8c1438bb9bada244472313aad15ea3d32 100644 (file)
--- a/Zend/zend_closures.c
+++ b/Zend/zend_closures.c
@@ -563,7 +563,7 @@ static HashTable *zend_closure_get_gc(zval *obj, zval **table, int *n) /* {{{ */
 }
 /* }}} */
 
-/* {{{ proto void Closure::__construct()
+/* {{{ proto Closure::__construct()
    Private constructor preventing instantiation */
 ZEND_COLD ZEND_METHOD(Closure, __construct)
 {

diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index 927edbfa5482e44064419969d4a63bbab6f1a466..64a2a8e8f6506c1dcfa2173c0f81549fe2fe6a8d 100644 (file)
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -303,7 +303,7 @@ ZEND_METHOD(exception, __construct)
 }
 /* }}} */
 
-/* {{{ proto void Exception::__wakeup()
+/* {{{ proto Exception::__wakeup()
    Exception unserialize checks */
 #define CHECK_EXC_TYPE(id, type) \
        pvalue = zend_read_property_ex(i_get_exception_base(object), (object), ZSTR_KNOWN(id), 1, &value); \
@@ -330,7 +330,7 @@ ZEND_METHOD(exception, __wakeup)
 }
 /* }}} */
 
-/* {{{ proto void ErrorException::__construct(string message, int code, int severity [, string filename [, int lineno [, Throwable previous]]])
+/* {{{ proto ErrorException::__construct(string message, int code, int severity [, string filename [, int lineno [, Throwable previous]]])
    ErrorException constructor */
 ZEND_METHOD(error_exception, __construct)
 {

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index a266994b31e363962cbae48fdd271b24b6a3f0dc..07c6371317af9b0cf5fd3f11413177446352607e 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -2826,7 +2826,7 @@ PHP_FUNCTION(date_create_immutable_from_format)
 }
 /* }}} */
 
-/* {{{ proto void DateTime::__construct([string time[, DateTimeZone object]])
+/* {{{ proto DateTime::__construct([string time[, DateTimeZone object]])
    Creates new DateTime object
 */
 PHP_METHOD(DateTime, __construct)
@@ -2848,7 +2848,7 @@ PHP_METHOD(DateTime, __construct)
 }
 /* }}} */
 
-/* {{{ proto void DateTimeImmutable::__construct([string time[, DateTimeZone object]])
+/* {{{ proto DateTimeImmutable::__construct([string time[, DateTimeZone object]])
    Creates new DateTimeImmutable object
 */
 PHP_METHOD(DateTimeImmutable, __construct)
@@ -2870,7 +2870,7 @@ PHP_METHOD(DateTimeImmutable, __construct)
 }
 /* }}} */
 
-/* {{{ proto DateTime DateTime::createFromImmutable(DateTimeImmutable object)
+/* {{{ proto DateTime::createFromImmutable(DateTimeImmutable object)
    Creates new DateTime object from an existing immutable DateTimeImmutable object.
 */
 PHP_METHOD(DateTime, createFromImmutable)
@@ -2891,7 +2891,7 @@ PHP_METHOD(DateTime, createFromImmutable)
 }
 /* }}} */
 
-/* {{{ proto DateTimeImmutable DateTimeImmutable::createFromMutable(DateTime object)
+/* {{{ proto DateTimeImmutable::createFromMutable(DateTime object)
    Creates new DateTimeImmutable object from an existing mutable DateTime object.
 */
 PHP_METHOD(DateTimeImmutable, createFromMutable)
@@ -2961,7 +2961,7 @@ static int php_date_initialize_from_hash(php_date_obj **dateobj, HashTable *myht
        return 0;
 } /* }}} */
 
-/* {{{ proto DateTime DateTime::__set_state(array array)
+/* {{{ proto DateTime::__set_state(array array)
 */
 PHP_METHOD(DateTime, __set_state)
 {
@@ -2983,7 +2983,7 @@ PHP_METHOD(DateTime, __set_state)
 }
 /* }}} */
 
-/* {{{ proto DateTimeImmutable DateTimeImmutable::__set_state(array array)
+/* {{{ proto DateTimeImmutable::__set_state(array array)
 */
 PHP_METHOD(DateTimeImmutable, __set_state)
 {
@@ -3005,7 +3005,7 @@ PHP_METHOD(DateTimeImmutable, __set_state)
 }
 /* }}} */
 
-/* {{{ proto void DateTime::__wakeup()
+/* {{{ proto DateTime::__wakeup()
 */
 PHP_METHOD(DateTime, __wakeup)
 {
@@ -3278,7 +3278,7 @@ PHP_FUNCTION(date_modify)
 }
 /* }}} */
 
-/* {{{ proto DateTimeImmutable DateTimeImmutable::modify()
+/* {{{ proto DateTimeImmutable::modify()
 */
 PHP_METHOD(DateTimeImmutable, modify)
 {
@@ -3333,7 +3333,7 @@ PHP_FUNCTION(date_add)
 }
 /* }}} */
 
-/* {{{ proto DateTimeImmutable DateTimeImmutable::add()
+/* {{{ proto DateTimeImmutable::add()
 */
 PHP_METHOD(DateTimeImmutable, add)
 {
@@ -3389,7 +3389,7 @@ PHP_FUNCTION(date_sub)
 }
 /* }}} */
 
-/* {{{ proto DateTimeImmutable DateTimeImmutable::sub()
+/* {{{ proto DateTimeImmutable::sub()
 */
 PHP_METHOD(DateTimeImmutable, sub)
 {
@@ -3492,7 +3492,7 @@ PHP_FUNCTION(date_timezone_set)
 }
 /* }}} */
 
-/* {{{ proto DateTimeImmutable DateTimeImmutable::setTimezone()
+/* {{{ proto DateTimeImmutable::setTimezone()
 */
 PHP_METHOD(DateTimeImmutable, setTimezone)
 {
@@ -3577,7 +3577,7 @@ PHP_FUNCTION(date_time_set)
 }
 /* }}} */
 
-/* {{{ proto DateTimeImmutable DateTimeImmutable::setTime()
+/* {{{ proto DateTimeImmutable::setTime()
 */
 PHP_METHOD(DateTimeImmutable, setTime)
 {
@@ -3626,7 +3626,7 @@ PHP_FUNCTION(date_date_set)
 }
 /* }}} */
 
-/* {{{ proto DateTimeImmutable DateTimeImmutable::setDate()
+/* {{{ proto DateTimeImmutable::setDate()
 */
 PHP_METHOD(DateTimeImmutable, setDate)
 {
@@ -3679,7 +3679,7 @@ PHP_FUNCTION(date_isodate_set)
 }
 /* }}} */
 
-/* {{{ proto DateTimeImmutable DateTimeImmutable::setISODate()
+/* {{{ proto DateTimeImmutable::setISODate()
 */
 PHP_METHOD(DateTimeImmutable, setISODate)
 {
@@ -3727,7 +3727,7 @@ PHP_FUNCTION(date_timestamp_set)
 }
 /* }}} */
 
-/* {{{ proto DateTimeImmutable DateTimeImmutable::setTimestamp()
+/* {{{ proto DateTimeImmutable::setTimestamp()
 */
 PHP_METHOD(DateTimeImmutable, setTimestamp)
 {
@@ -3846,7 +3846,7 @@ PHP_FUNCTION(timezone_open)
 }
 /* }}} */
 
-/* {{{ proto void DateTimeZone::__construct(string timezone)
+/* {{{ proto DateTimeZone::__construct(string timezone)
    Creates new DateTimeZone object.
 */
 PHP_METHOD(DateTimeZone, __construct)
@@ -3888,7 +3888,7 @@ static int php_date_timezone_initialize_from_hash(zval **return_value, php_timez
        return FAILURE;
 } /* }}} */
 
-/* {{{ proto DateTimeZone DateTimeZone::__set_state(array array)
+/* {{{ proto DateTimeZone::__set_state(array array)
  *  */
 PHP_METHOD(DateTimeZone, __set_state)
 {
@@ -3911,7 +3911,7 @@ PHP_METHOD(DateTimeZone, __set_state)
 }
 /* }}} */
 
-/* {{{ proto void DateTimeZone::__wakeup()
+/* {{{ proto DateTimeZone::__wakeup()
  *  */
 PHP_METHOD(DateTimeZone, __wakeup)
 {
@@ -4302,7 +4302,7 @@ static zval *date_interval_get_property_ptr_ptr(zval *object, zval *member, int
 }
 /* }}} */
 
-/* {{{ proto void DateInterval::__construct([string interval_spec])
+/* {{{ proto DateInterval::__construct([string interval_spec])
    Creates new DateInterval object.
 */
 PHP_METHOD(DateInterval, __construct)
@@ -4391,7 +4391,7 @@ static int php_date_interval_initialize_from_hash(zval **return_value, php_inter
        return 0;
 } /* }}} */
 
-/* {{{ proto DateInterval DateInterval::__set_state(array array)
+/* {{{ proto DateInterval::__set_state(array array)
 */
 PHP_METHOD(DateInterval, __set_state)
 {
@@ -4411,7 +4411,7 @@ PHP_METHOD(DateInterval, __set_state)
 }
 /* }}} */
 
-/* {{{ proto void DateInterval::__wakeup()
+/* {{{ proto DateInterval::__wakeup()
 */
 PHP_METHOD(DateInterval, __wakeup)
 {
@@ -4566,7 +4566,7 @@ static int date_period_initialize(timelib_time **st, timelib_time **et, timelib_
        return retval;
 } /* }}} */
 
-/* {{{ proto void DatePeriod::__construct(DateTime $start, DateInterval $interval, int recurrences|DateTime $end)
+/* {{{ proto DatePeriod::__construct(DateTime $start, DateInterval $interval, int recurrences|DateTime $end)
    Creates new DatePeriod object.
 */
 PHP_METHOD(DatePeriod, __construct)
@@ -4653,7 +4653,7 @@ PHP_METHOD(DatePeriod, __construct)
 }
 /* }}} */
 
-/* {{{ proto DateTimeInterface DatePeriod::getStartDate()
+/* {{{ proto DatePeriod::getStartDate()
    Get start date.
 */
 PHP_METHOD(DatePeriod, getStartDate)
@@ -4680,7 +4680,7 @@ PHP_METHOD(DatePeriod, getStartDate)
 }
 /* }}} */
 
-/* {{{ proto DateTimeInterface DatePeriod::getEndDate()
+/* {{{ proto DatePeriod::getEndDate()
    Get end date.
 */
 PHP_METHOD(DatePeriod, getEndDate)
@@ -4711,7 +4711,7 @@ PHP_METHOD(DatePeriod, getEndDate)
 }
 /* }}} */
 
-/* {{{ proto DateInterval DatePeriod::getDateInterval()
+/* {{{ proto DatePeriod::getDateInterval()
    Get date interval.
 */
 PHP_METHOD(DatePeriod, getDateInterval)
@@ -5243,7 +5243,7 @@ static int php_date_period_initialize_from_hash(php_period_obj *period_obj, Hash
        return 1;
 } /* }}} */
 
-/* {{{ proto DatePeriod DatePeriod::__set_state(array array)
+/* {{{ proto DatePeriod::__set_state(array array)
 */
 PHP_METHOD(DatePeriod, __set_state)
 {
@@ -5265,7 +5265,7 @@ PHP_METHOD(DatePeriod, __set_state)
 }
 /* }}} */
 
-/* {{{ proto void DatePeriod::__wakeup()
+/* {{{ proto DatePeriod::__wakeup()
 */
 PHP_METHOD(DatePeriod, __wakeup)
 {

diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 63e5424fe12fcb53d97b544760dfc78265f16592..8ed8427bc44f210448a982c9fef547195321f312 100644 (file)
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -850,7 +850,7 @@ PHP_FUNCTION(filter_var_array)
 }
 /* }}} */
 
-/* {{{ proto array filter_list()
+/* {{{ proto filter_list()
  * Returns a list of all supported filters */
 PHP_FUNCTION(filter_list)
 {
@@ -867,7 +867,7 @@ PHP_FUNCTION(filter_list)
 }
 /* }}} */
 
-/* {{{ proto int filter_id(string filtername)
+/* {{{ proto filter_id(string filtername)
  * Returns the filter ID belonging to a named filter */
 PHP_FUNCTION(filter_id)
 {

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 13f40cf57d91d59d799a6f1193e0e912624c8ca7..7a5767871d196dd3112e8ecdfa9f5efd1abc5684 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -2286,7 +2286,7 @@ PHP_FUNCTION(simplexml_load_string)
 }
 /* }}} */
 
-/* {{{ proto void SimpleXMLElement::__construct(string data [, int options [, bool data_is_url [, string ns [, bool is_prefix]]]])
+/* {{{ proto SimpleXMLElement::__construct(string data [, int options [, bool data_is_url [, string ns [, bool is_prefix]]]])
    SimpleXMLElement constructor */
 SXE_METHOD(__construct)
 {

diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 1e05df4a5202a7eed65a111c3f2d0ca98a4c2c97..d8fa8d490dad7cc736b8ff974b04c500141c00e7 100644 (file)
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -1987,7 +1987,7 @@ fail:
 /* }}} */
 
 
-/* {{{ proto void SoapServer::fault(staring code, string string [, string actor [, mixed details [, string name]]])
+/* {{{ proto SoapServer::fault ( staring code, string string [, string actor [, mixed details [, string name]]] )
    Issue SoapFault indicating an error */
 PHP_METHOD(SoapServer, fault)
 {

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index 844c8e2096824e28a3218155f27ca0f44e774af8..5c144b0f98cb4998526a5fe0a0d408ee8ba29507 100644 (file)
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -1411,7 +1411,7 @@ SPL_METHOD(SplFileInfo, getPathInfo)
 }
 /* }}} */
 
-/* {{{  proto void SplFileInfo::_bad_state_ex(void) */
+/* {{{  proto SplFileInfo::_bad_state_ex(void) */
 SPL_METHOD(SplFileInfo, _bad_state_ex)
 {
        zend_throw_exception_ex(spl_ce_LogicException, 0,

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index a1cb55bb95c8b83a3201c7a9051bdb47fb70c287..fdb8c4b401f19fae4109a1cb2e4a18b1e0afcdf3 100644 (file)
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -2531,7 +2531,7 @@ static inline void spl_limit_it_seek(spl_dual_it_object *intern, zend_long pos)
        }
 }
 
-/* {{{ proto void LimitIterator::__construct(Iterator it [, int offset, int count])
+/* {{{ proto LimitIterator::__construct(Iterator it [, int offset, int count])
    Construct a LimitIterator from an Iterator with a given starting offset and optionally a maximum count */
 SPL_METHOD(LimitIterator, __construct)
 {