Remove return types from some magic method in protos

__construct, __destruct, __wakeup does not have return types defined.

diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index 56eb131194f8133a2dfe8fd6fe9735d24b1faff4..07d247d0683d32a2c8a8fc569196103d0d043041 100644 (file)
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -1038,7 +1038,7 @@ ZEND_METHOD(Generator, getReturn)
 }
 /* }}} */
 
-/* {{{ proto void Generator::__wakeup()
+/* {{{ proto Generator::__wakeup()
  * Throws an Exception as generators can't be serialized */
 ZEND_METHOD(Generator, __wakeup)
 {

diff --git a/ext/com_dotnet/com_persist.c b/ext/com_dotnet/com_persist.c
index cff853750f934954016bd1f0acb0b7a65a5e9eea..68e9de945517b8e1ce10439d89cf92d0359f7f73 100644 (file)
--- a/ext/com_dotnet/com_persist.c
+++ b/ext/com_dotnet/com_persist.c
@@ -645,7 +645,7 @@ CPH_METHOD(SaveToStream)
 }
 /* }}} */
 
-/* {{{ proto int COMPersistHelper::__construct([object com_object])
+/* {{{ proto COMPersistHelper::__construct([object com_object])
    Creates a persistence helper object, usually associated with a com_object */
 CPH_METHOD(__construct)
 {

diff --git a/ext/curl/curl_file.c b/ext/curl/curl_file.c
index d30db86c5461021c31dd4dbe4b088a1bdbf66917..8b476372fa77114d8a3a5538c2a6474f1df6925e 100644 (file)
--- a/ext/curl/curl_file.c
+++ b/ext/curl/curl_file.c
@@ -52,7 +52,7 @@ static void curlfile_ctor(INTERNAL_FUNCTION_PARAMETERS)
        }
 }
 
-/* {{{ proto void CURLFile::__construct(string $name, [string $mimetype [, string $postfilename]])
+/* {{{ proto CURLFile::__construct(string $name, [string $mimetype [, string $postfilename]])
    Create the CURLFile object */
 ZEND_METHOD(CURLFile, __construct)
 {
@@ -133,7 +133,7 @@ ZEND_METHOD(CURLFile, setPostFilename)
 }
 /* }}} */
 
-/* {{{ proto void CURLFile::__wakeup()
+/* {{{ proto CURLFile::__wakeup()
    Unserialization handler */
 ZEND_METHOD(CURLFile, __wakeup)
 {

diff --git a/ext/dom/attr.c b/ext/dom/attr.c
index 26a77f5793a9127980774f3696480dffa8f4cf5c..13238c9bddcccefafde04f02861f873eb781f5fa 100644 (file)
--- a/ext/dom/attr.c
+++ b/ext/dom/attr.c
@@ -52,7 +52,7 @@ const zend_function_entry php_dom_attr_class_functions[] = {
        PHP_FE_END
 };
 
-/* {{{ proto void DOMAttr::__construct(string name, [string value]) */
+/* {{{ proto DOMAttr::__construct(string name, [string value]) */
 PHP_METHOD(domattr, __construct)
 {
        zval *id = getThis();

diff --git a/ext/dom/cdatasection.c b/ext/dom/cdatasection.c
index 1ee9ba7f4faac58fc2661876a3a573c16cb9e8f0..8328e13f66832fbb9e1ff7efa0d3e595882d41da 100644 (file)
--- a/ext/dom/cdatasection.c
+++ b/ext/dom/cdatasection.c
@@ -46,7 +46,7 @@ const zend_function_entry php_dom_cdatasection_class_functions[] = {
        PHP_FE_END
 };
 
-/* {{{ proto void DOMCdataSection::__construct(string value); */
+/* {{{ proto DOMCdataSection::__construct(string value); */
 PHP_METHOD(domcdatasection, __construct)
 {
 

diff --git a/ext/dom/comment.c b/ext/dom/comment.c
index 46c7d5b21402403fe0da454b6481f48dacfe5561..d1037feaeeba8475df4079cd57729601e6c4082c 100644 (file)
--- a/ext/dom/comment.c
+++ b/ext/dom/comment.c
@@ -46,7 +46,7 @@ const zend_function_entry php_dom_comment_class_functions[] = {
        PHP_FE_END
 };
 
-/* {{{ proto void DOMComment::__construct([string value]); */
+/* {{{ proto DOMComment::__construct([string value]); */
 PHP_METHOD(domcomment, __construct)
 {
 

diff --git a/ext/dom/document.c b/ext/dom/document.c
index 22bdd81f9f1a1dea2223bb1bea12b71775109dc8..2d70338994af35b6110f3cc8a13996492c4b64e2 100644 (file)
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -1250,7 +1250,7 @@ PHP_FUNCTION(dom_document_rename_node)
 }
 /* }}} end dom_document_rename_node */
 
-/* {{{ proto void DOMDocument::__construct([string version], [string encoding]); */
+/* {{{ proto DOMDocument::__construct([string version], [string encoding]); */
 PHP_METHOD(domdocument, __construct)
 {
 

diff --git a/ext/dom/documentfragment.c b/ext/dom/documentfragment.c
index 31f7713c89080046df5c9f915e365d45057ae6db..c4849acf0a2fbf48516e54b427f92c3edc19206f 100644 (file)
--- a/ext/dom/documentfragment.c
+++ b/ext/dom/documentfragment.c
@@ -49,7 +49,7 @@ const zend_function_entry php_dom_documentfragment_class_functions[] = {
        PHP_FE_END
 };
 
-/* {{{ proto void DOMDocumentFragment::__construct() */
+/* {{{ proto DOMDocumentFragment::__construct() */
 PHP_METHOD(domdocumentfragment, __construct)
 {
 

diff --git a/ext/dom/element.c b/ext/dom/element.c
index 16814b1361000e0367456360fd9e9a77e83ececf..16545753b3846d9570d890217bb749b5a171d5b8 100644 (file)
--- a/ext/dom/element.c
+++ b/ext/dom/element.c
@@ -150,7 +150,7 @@ const zend_function_entry php_dom_element_class_functions[] = { /* {{{ */
 };
 /* }}} */
 
-/* {{{ proto void DOMElement::__construct(string name, [string value], [string uri]) */
+/* {{{ proto DOMElement::__construct(string name, [string value], [string uri]) */
 PHP_METHOD(domelement, __construct)
 {
 

diff --git a/ext/dom/entityreference.c b/ext/dom/entityreference.c
index 9312ac971f97128ca27cca870c7d6d34dba89e13..dcb3a721e01ca964e0d6b558b0595e7802520fbd 100644 (file)
--- a/ext/dom/entityreference.c
+++ b/ext/dom/entityreference.c
@@ -45,7 +45,7 @@ const zend_function_entry php_dom_entityreference_class_functions[] = {
        PHP_FE_END
 };
 
-/* {{{ proto void DOMEntityReference::__construct(string name) */
+/* {{{ proto DOMEntityReference::__construct(string name) */
 PHP_METHOD(domentityreference, __construct)
 {
        zval *id = getThis();

diff --git a/ext/dom/processinginstruction.c b/ext/dom/processinginstruction.c
index 0f38a79ab1967e3700e513eeb149594ca6e77c9e..dca6c2e8f7e0f73dc4639220175f1b74062aaf0d 100644 (file)
--- a/ext/dom/processinginstruction.c
+++ b/ext/dom/processinginstruction.c
@@ -47,7 +47,7 @@ const zend_function_entry php_dom_processinginstruction_class_functions[] = {
        PHP_FE_END
 };
 
-/* {{{ proto void DOMProcessingInstruction::__construct(string name, [string value]); */
+/* {{{ proto DOMProcessingInstruction::__construct(string name, [string value]); */
 PHP_METHOD(domprocessinginstruction, __construct)
 {
        zval *id = getThis();

diff --git a/ext/dom/text.c b/ext/dom/text.c
index a5a6323ef2f8696ab89aab0978fd881996b0affd..47c4ca90a5ad3e5d5800359e86992acb40bc4ef1 100644 (file)
--- a/ext/dom/text.c
+++ b/ext/dom/text.c
@@ -61,7 +61,7 @@ const zend_function_entry php_dom_text_class_functions[] = {
        PHP_FE_END
 };
 
-/* {{{ proto void DOMText::__construct([string value]); */
+/* {{{ proto DOMText::__construct([string value]); */
 PHP_METHOD(domtext, __construct)
 {
 

diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c
index a85ae1d801364048699d97f713c3a2d7dd7f7685..27d88055d08d3c8ca57346cb5571e632d2fa4569 100644 (file)
--- a/ext/dom/xpath.c
+++ b/ext/dom/xpath.c
@@ -249,7 +249,7 @@ static void dom_xpath_ext_function_object_php(xmlXPathParserContextPtr ctxt, int
 }
 /* }}} */
 
-/* {{{ proto void DOMXPath::__construct(DOMDocument doc) U */
+/* {{{ proto DOMXPath::__construct(DOMDocument doc) U */
 PHP_METHOD(domxpath, __construct)
 {
        zval *id = getThis(), *doc;

diff --git a/ext/hash/hash.c b/ext/hash/hash.c
index df17deef96689cbc14a0a9811bf9270b953a5977..9e1e7286dd5bae33f88f0c1c4bf74c6adc14b7a7 100644 (file)
--- a/ext/hash/hash.c
+++ b/ext/hash/hash.c
@@ -882,7 +882,7 @@ PHP_FUNCTION(hash_equals)
 }
 /* }}} */
 
-/* {{{ proto void HashContext::__construct() */
+/* {{{ proto HashContext::__construct() */
 static PHP_METHOD(HashContext, __construct) {
        /* Normally unreachable as private/final */
        zend_throw_exception(zend_ce_error, "Illegal call to private/final constructor", 0);

diff --git a/ext/intl/collator/collator_create.c b/ext/intl/collator/collator_create.c
index d32a4c637f0b24c44cf9f5b542d898ca01c4e9f1..424e680b13e0eb3c8ed33ebb45ca3b31126ba3ec 100644 (file)
--- a/ext/intl/collator/collator_create.c
+++ b/ext/intl/collator/collator_create.c
@@ -71,7 +71,7 @@ PHP_FUNCTION( collator_create )
 }
 /* }}} */
 
-/* {{{ proto Collator Collator::__construct( string $locale )
+/* {{{ proto Collator::__construct( string $locale )
  * Collator object constructor.
  */
 PHP_METHOD( Collator, __construct )

diff --git a/ext/intl/converter/converter.c b/ext/intl/converter/converter.c
index d593589c6ed6156803b539aad2df30a303eb86bd..2de2576e3d8e1cfb5d21eafe23082421adb3715b 100644 (file)
--- a/ext/intl/converter/converter.c
+++ b/ext/intl/converter/converter.c
@@ -545,7 +545,7 @@ static void php_converter_resolve_callback(zval *zobj,
 }
 /* }}} */
 
-/* {{{ proto void UConverter::__construct([string dest = 'utf-8',[string src = 'utf-8']]) */
+/* {{{ proto UConverter::__construct([string dest = 'utf-8',[string src = 'utf-8']]) */
 ZEND_BEGIN_ARG_INFO_EX(php_converter_arginfo, 0, ZEND_RETURN_VALUE, 0)
        ZEND_ARG_INFO(0, destination_encoding)
        ZEND_ARG_INFO(0, source_encoding)

diff --git a/ext/intl/formatter/formatter_main.c b/ext/intl/formatter/formatter_main.c
index bf0d2a80b7ddf1768d8145cbce7958b27e9320d7..28234043d5c93039431e348fc81985099b17fb5a 100644 (file)
--- a/ext/intl/formatter/formatter_main.c
+++ b/ext/intl/formatter/formatter_main.c
@@ -86,7 +86,7 @@ PHP_FUNCTION( numfmt_create )
 }
 /* }}} */
 
-/* {{{ proto void NumberFormatter::__construct( string $locale, int style[, string $pattern ] )
+/* {{{ proto NumberFormatter::__construct( string $locale, int style[, string $pattern ] )
  * NumberFormatter object constructor.
  */
 PHP_METHOD( NumberFormatter, __construct )

diff --git a/ext/intl/msgformat/msgformat.c b/ext/intl/msgformat/msgformat.c
index d3f8416c031a087a2cb14f93cad02f71c5ca28f2..3f5af5fd6729e3c9aecce9c378ecffdfb5187561 100644 (file)
--- a/ext/intl/msgformat/msgformat.c
+++ b/ext/intl/msgformat/msgformat.c
@@ -105,7 +105,7 @@ PHP_FUNCTION( msgfmt_create )
 }
 /* }}} */
 
-/* {{{ proto void MessageFormatter::__construct( string $locale, string $pattern )
+/* {{{ proto MessageFormatter::__construct( string $locale, string $pattern )
  * MessageFormatter object constructor.
  */
 PHP_METHOD( MessageFormatter, __construct )

diff --git a/ext/intl/resourcebundle/resourcebundle_class.c b/ext/intl/resourcebundle/resourcebundle_class.c
index 973f4c2e6514a0f95970e638c6dae182f725c03b..0dd704745663e1b0e27251069b861c91e8289144 100644 (file)
--- a/ext/intl/resourcebundle/resourcebundle_class.c
+++ b/ext/intl/resourcebundle/resourcebundle_class.c
@@ -144,7 +144,7 @@ ZEND_BEGIN_ARG_INFO_EX( arginfo_resourcebundle___construct, 0, 0, 2 )
 ZEND_END_ARG_INFO()
 /* }}} */
 
-/* {{{ proto void ResourceBundle::__construct( string $locale [, string $bundlename [, bool $fallback = true ]] )
+/* {{{ proto ResourceBundle::__construct( string $locale [, string $bundlename [, bool $fallback = true ]] )
  * ResourceBundle object constructor
  */
 PHP_METHOD( ResourceBundle, __construct )

diff --git a/ext/intl/spoofchecker/spoofchecker_create.c b/ext/intl/spoofchecker/spoofchecker_create.c
index 4342d3d31ee4a49fd5ae82724042f2f1820d54d8..f667f731f0b552cda9adcbec3d3bd60619aa00f6 100644 (file)
--- a/ext/intl/spoofchecker/spoofchecker_create.c
+++ b/ext/intl/spoofchecker/spoofchecker_create.c
@@ -23,7 +23,7 @@
 #include "spoofchecker_create.h"
 #include "intl_data.h"
 
-/* {{{ proto Spoofchecker Spoofchecker::__construct()
+/* {{{ proto Spoofchecker::__construct()
  * Spoofchecker object constructor.
  */
 PHP_METHOD(Spoofchecker, __construct)

diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index eaf789a22be1347213854a6e32ff580f22751067..5f6dc6cdc622e54254365213836f6d87fafe5836 100644 (file)
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -192,7 +192,7 @@ static char *dsn_from_uri(char *uri, char *buf, size_t buflen) /* {{{ */
 }
 /* }}} */
 
-/* {{{ proto void PDO::__construct(string dsn[, string username[, string passwd [, array options]]])
+/* {{{ proto PDO::__construct(string dsn[, string username[, string passwd [, array options]]])
    */
 static PHP_METHOD(PDO, dbh_constructor)
 {
@@ -1156,7 +1156,7 @@ static PHP_METHOD(PDO, quote)
 }
 /* }}} */
 
-/* {{{ proto int PDO::__wakeup()
+/* {{{ proto PDO::__wakeup()
    Prevents use of a PDO instance that has been unserialized */
 static PHP_METHOD(PDO, __wakeup)
 {

diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 423f0e626005a21c2161b47cb0e7fa5a2eab1c6f..4f962376759991786e42d095a01795c40d673bcf 100644 (file)
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -2148,7 +2148,7 @@ static PHP_METHOD(PDOStatement, debugDumpParams)
 }
 /* }}} */
 
-/* {{{ proto int PDOStatement::__wakeup()
+/* {{{ proto PDOStatement::__wakeup()
    Prevents use of a PDOStatement instance that has been unserialized */
 static PHP_METHOD(PDOStatement, __wakeup)
 {

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 6cbcfba8fbdd4f7e6dd53f6a4753aec72a41ee79..95d3816f0376dd72154676fc33d30ad6fef93e44 100644 (file)
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -1134,10 +1134,10 @@ static const spl_other_handler phar_spl_foreign_handler = {
        phar_spl_foreign_clone
 };
 
-/* {{{ proto void Phar::__construct(string fname [, int flags [, string alias]])
+/* {{{ proto Phar::__construct(string fname [, int flags [, string alias]])
  * Construct a Phar archive object
  *
- * proto void PharData::__construct(string fname [[, int flags [, string alias]], int file format = Phar::TAR])
+ * proto PharData::__construct(string fname [[, int flags [, string alias]], int file format = Phar::TAR])
  * Construct a PharData archive object
  *
  * This function is used as the constructor for both the Phar and PharData
@@ -1402,7 +1402,7 @@ PHP_METHOD(Phar, unlinkArchive)
                return; \
        }
 
-/* {{{ proto void Phar::__destruct()
+/* {{{ proto Phar::__destruct()
  * if persistent, remove from the cache
  */
 PHP_METHOD(Phar, __destruct)
@@ -4497,7 +4497,7 @@ PHP_METHOD(Phar, extractTo)
 /* }}} */
 
 
-/* {{{ proto void PharFileInfo::__construct(string entry)
+/* {{{ proto PharFileInfo::__construct(string entry)
  * Construct a Phar entry object
  */
 PHP_METHOD(PharFileInfo, __construct)
@@ -4572,7 +4572,7 @@ PHP_METHOD(PharFileInfo, __construct)
                return; \
        }
 
-/* {{{ proto void PharFileInfo::__destruct()
+/* {{{ proto PharFileInfo::__destruct()
  * clean up directory-based entry objects
  */
 PHP_METHOD(PharFileInfo, __destruct)

diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
index 980d74785d150b80deb369743b5a6baf0d301530..ce1f3ed1e8dce334ae1d98c16937ed6efaa6faaf 100644 (file)
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -1745,7 +1745,7 @@ PHP_FUNCTION(snmp_read_mib)
 }
 /* }}} */
 
-/* {{{ proto SNMP SNMP::__construct(int version, string hostname, string community|securityName [, int timeout [, int retries]])
+/* {{{ proto SNMP::__construct(int version, string hostname, string community|securityName [, int timeout [, int retries]])
        Creates a new SNMP session to specified host. */
 PHP_METHOD(snmp, __construct)
 {

diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index 0093831dde409bb563eb45cd130576530ed457ff..d0a1f68215f751fafcd345380b1738aa95686334 100644 (file)
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -1192,7 +1192,7 @@ 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 ArrayObject::__construct([array|object ar = array() [, int flags = 0 [, string iterator_class = "ArrayIterator"]]])
    Constructs a new array object from an array or object. */
 SPL_METHOD(Array, __construct)
 {
@@ -1222,7 +1222,7 @@ SPL_METHOD(Array, __construct)
 }
  /* }}} */
 
-/* {{{ proto void ArrayIterator::__construct([array|object ar = array() [, int flags = 0]])
+/* {{{ proto ArrayIterator::__construct([array|object ar = array() [, int flags = 0]])
    Constructs a new array iterator from an array or object. */
 SPL_METHOD(ArrayIterator, __construct)
 {

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index 5c144b0f98cb4998526a5fe0a0d408ee8ba29507..9e21f8d5afdbd076bf5e5810dab036f799f978a5 100644 (file)
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -750,7 +750,7 @@ void spl_filesystem_object_construct(INTERNAL_FUNCTION_PARAMETERS, zend_long cto
 }
 /* }}} */
 
-/* {{{ proto void DirectoryIterator::__construct(string path)
+/* {{{ proto DirectoryIterator::__construct(string path)
  Cronstructs a new dir iterator from a path. */
 SPL_METHOD(DirectoryIterator, __construct)
 {
@@ -1117,7 +1117,7 @@ SPL_METHOD(DirectoryIterator, isDot)
 }
 /* }}} */
 
-/* {{{ proto void SplFileInfo::__construct(string file_name)
+/* {{{ proto SplFileInfo::__construct(string file_name)
  Cronstructs a new SplFileInfo from a path. */
 /* When the constructor gets called the object is already created
    by the engine, so we must only call 'additional' initializations.
@@ -1420,7 +1420,7 @@ SPL_METHOD(SplFileInfo, _bad_state_ex)
 }
 /* }}} */
 
-/* {{{ proto void FilesystemIterator::__construct(string path [, int flags])
+/* {{{ proto FilesystemIterator::__construct(string path [, int flags])
  Cronstructs a new dir iterator from a path. */
 SPL_METHOD(FilesystemIterator, __construct)
 {
@@ -1575,7 +1575,7 @@ SPL_METHOD(RecursiveDirectoryIterator, getSubPathname)
 }
 /* }}} */
 
-/* {{{ proto int RecursiveDirectoryIterator::__construct(string path [, int flags])
+/* {{{ proto RecursiveDirectoryIterator::__construct(string path [, int flags])
  Cronstructs a new dir iterator from a path. */
 SPL_METHOD(RecursiveDirectoryIterator, __construct)
 {
@@ -1584,7 +1584,7 @@ SPL_METHOD(RecursiveDirectoryIterator, __construct)
 /* }}} */
 
 #ifdef HAVE_GLOB
-/* {{{ proto int GlobIterator::__construct(string path [, int flags])
+/* {{{ proto GlobIterator::__construct(string path [, int flags])
  Cronstructs a new dir iterator from a glob expression (no glob:// needed). */
 SPL_METHOD(GlobIterator, __construct)
 {
@@ -2246,7 +2246,7 @@ static void spl_filesystem_file_rewind(zval * this_ptr, spl_filesystem_object *i
        }
 } /* }}} */
 
-/* {{{ proto void SplFileObject::__construct(string filename [, string mode = 'r' [, bool use_include_path  [, resource context]]]])
+/* {{{ proto SplFileObject::__construct(string filename [, string mode = 'r' [, bool use_include_path  [, resource context]]]])
    Construct a new file object */
 SPL_METHOD(SplFileObject, __construct)
 {
@@ -2306,7 +2306,7 @@ SPL_METHOD(SplFileObject, __construct)
 
 } /* }}} */
 
-/* {{{ proto void SplTempFileObject::__construct([int max_memory])
+/* {{{ proto SplTempFileObject::__construct([int max_memory])
    Construct a new temp file object */
 SPL_METHOD(SplTempFileObject, __construct)
 {

diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c
index b8a0648bd20265d0fb1bb61779efea6579f1980a..104b3d071e6ab367be811a78d44c779979cc108c 100644 (file)
--- a/ext/spl/spl_fixedarray.c
+++ b/ext/spl/spl_fixedarray.c
@@ -546,7 +546,7 @@ static int spl_fixedarray_object_count_elements(zval *object, zend_long *count)
 }
 /* }}} */
 
-/* {{{ proto void SplFixedArray::__construct([int size])
+/* {{{ proto SplFixedArray::__construct([int size])
 */
 SPL_METHOD(SplFixedArray, __construct)
 {
@@ -574,7 +574,7 @@ SPL_METHOD(SplFixedArray, __construct)
 }
 /* }}} */
 
-/* {{{ proto void SplFixedArray::__wakeup()
+/* {{{ proto SplFixedArray::__wakeup()
 */
 SPL_METHOD(SplFixedArray, __wakeup)
 {

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index fdb8c4b401f19fae4109a1cb2e4a18b1e0afcdf3..2cf658af29272341d62a779631981430c91099dd 100644 (file)
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -603,7 +603,7 @@ static void spl_recursive_it_it_construct(INTERNAL_FUNCTION_PARAMETERS, zend_cla
        }
 }
 
-/* {{{ proto void RecursiveIteratorIterator::__construct(RecursiveIterator|IteratorAggregate it [, int mode = RIT_LEAVES_ONLY [, int flags = 0]]) throws InvalidArgumentException
+/* {{{ proto RecursiveIteratorIterator::__construct(RecursiveIterator|IteratorAggregate it [, int mode = RIT_LEAVES_ONLY [, int flags = 0]]) throws InvalidArgumentException
    Creates a RecursiveIteratorIterator from a RecursiveIterator. */
 SPL_METHOD(RecursiveIteratorIterator, __construct)
 {
@@ -1097,7 +1097,7 @@ static void spl_recursive_tree_iterator_get_postfix(spl_recursive_it_object *obj
        Z_ADDREF_P(return_value);
 }
 
-/* {{{ proto void RecursiveTreeIterator::__construct(RecursiveIterator|IteratorAggregate it [, int flags = RTIT_BYPASS_KEY [, int cit_flags = CIT_CATCH_GET_CHILD [, mode = RIT_SELF_FIRST ]]]) throws InvalidArgumentException
+/* {{{ proto RecursiveTreeIterator::__construct(RecursiveIterator|IteratorAggregate it [, int flags = RTIT_BYPASS_KEY [, int cit_flags = CIT_CATCH_GET_CHILD [, mode = RIT_SELF_FIRST ]]]) throws InvalidArgumentException
    RecursiveIteratorIterator to generate ASCII graphic trees for the entries in a RecursiveIterator */
 SPL_METHOD(RecursiveTreeIterator, __construct)
 {
@@ -1610,14 +1610,14 @@ static spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAMETERS, z
        return intern;
 }
 
-/* {{{ proto void FilterIterator::__construct(Iterator it)
+/* {{{ proto FilterIterator::__construct(Iterator it)
    Create an Iterator from another iterator */
 SPL_METHOD(FilterIterator, __construct)
 {
        spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, spl_ce_FilterIterator, zend_ce_iterator, DIT_FilterIterator);
 } /* }}} */
 
-/* {{{ proto void CallbackFilterIterator::__construct(Iterator it, callback func)
+/* {{{ proto CallbackFilterIterator::__construct(Iterator it, callback func)
    Create an Iterator from another iterator */
 SPL_METHOD(CallbackFilterIterator, __construct)
 {
@@ -1899,7 +1899,7 @@ SPL_METHOD(FilterIterator, next)
        spl_filter_it_next(getThis(), intern);
 } /* }}} */
 
-/* {{{ proto void RecursiveCallbackFilterIterator::__construct(RecursiveIterator it, callback func)
+/* {{{ proto RecursiveCallbackFilterIterator::__construct(RecursiveIterator it, callback func)
    Create a RecursiveCallbackFilterIterator from a RecursiveIterator */
 SPL_METHOD(RecursiveCallbackFilterIterator, __construct)
 {
@@ -1907,7 +1907,7 @@ SPL_METHOD(RecursiveCallbackFilterIterator, __construct)
 } /* }}} */
 
 
-/* {{{ proto void RecursiveFilterIterator::__construct(RecursiveIterator it)
+/* {{{ proto RecursiveFilterIterator::__construct(RecursiveIterator it)
    Create a RecursiveFilterIterator from a RecursiveIterator */
 SPL_METHOD(RecursiveFilterIterator, __construct)
 {
@@ -1974,7 +1974,7 @@ SPL_METHOD(RecursiveCallbackFilterIterator, getChildren)
        }
        zval_ptr_dtor(&retval);
 } /* }}} */
-/* {{{ proto void ParentIterator::__construct(RecursiveIterator it)
+/* {{{ proto ParentIterator::__construct(RecursiveIterator it)
    Create a ParentIterator from a RecursiveIterator */
 SPL_METHOD(ParentIterator, __construct)
 {
@@ -1982,7 +1982,7 @@ SPL_METHOD(ParentIterator, __construct)
 } /* }}} */
 
 #if HAVE_PCRE || HAVE_BUNDLED_PCRE
-/* {{{ proto void RegexIterator::__construct(Iterator it, string regex [, int mode [, int flags [, int preg_flags]]])
+/* {{{ proto RegexIterator::__construct(Iterator it, string regex [, int mode [, int flags [, int preg_flags]]])
    Create an RegexIterator from another iterator and a regular expression */
 SPL_METHOD(RegexIterator, __construct)
 {
@@ -2236,7 +2236,7 @@ SPL_METHOD(RegexIterator, setPregFlags)
        intern->u.regex.use_flags = 1;
 } /* }}} */
 
-/* {{{ proto void RecursiveRegexIterator::__construct(RecursiveIterator it, string regex [, int mode [, int flags [, int preg_flags]]])
+/* {{{ proto RecursiveRegexIterator::__construct(RecursiveIterator it, string regex [, int mode [, int flags [, int preg_flags]]])
    Create an RecursiveRegexIterator from another recursive iterator and a regular expression */
 SPL_METHOD(RecursiveRegexIterator, __construct)
 {
@@ -2722,7 +2722,7 @@ static inline void spl_caching_it_rewind(spl_dual_it_object *intern)
        spl_caching_it_next(intern);
 }
 
-/* {{{ proto void CachingIterator::__construct(Iterator it [, flags = CIT_CALL_TOSTRING])
+/* {{{ proto CachingIterator::__construct(Iterator it [, flags = CIT_CALL_TOSTRING])
    Construct a CachingIterator from an Iterator */
 SPL_METHOD(CachingIterator, __construct)
 {
@@ -3044,7 +3044,7 @@ static const zend_function_entry spl_funcs_CachingIterator[] = {
        PHP_FE_END
 };
 
-/* {{{ proto void RecursiveCachingIterator::__construct(RecursiveIterator it [, flags = CIT_CALL_TOSTRING])
+/* {{{ proto RecursiveCachingIterator::__construct(RecursiveIterator it [, flags = CIT_CALL_TOSTRING])
    Create an iterator from a RecursiveIterator */
 SPL_METHOD(RecursiveCachingIterator, __construct)
 {
@@ -3100,7 +3100,7 @@ static const zend_function_entry spl_funcs_RecursiveCachingIterator[] = {
        PHP_FE_END
 };
 
-/* {{{ proto void IteratorIterator::__construct(Traversable it)
+/* {{{ proto IteratorIterator::__construct(Traversable it)
    Create an iterator from anything that is traversable */
 SPL_METHOD(IteratorIterator, __construct)
 {
@@ -3122,7 +3122,7 @@ static const zend_function_entry spl_funcs_IteratorIterator[] = {
        PHP_FE_END
 };
 
-/* {{{ proto void NoRewindIterator::__construct(Iterator it)
+/* {{{ proto NoRewindIterator::__construct(Iterator it)
    Create an iterator from another iterator */
 SPL_METHOD(NoRewindIterator, __construct)
 {
@@ -3220,7 +3220,7 @@ static const zend_function_entry spl_funcs_NoRewindIterator[] = {
        PHP_FE_END
 };
 
-/* {{{ proto void InfiniteIterator::__construct(Iterator it)
+/* {{{ proto InfiniteIterator::__construct(Iterator it)
    Create an iterator from another iterator */
 SPL_METHOD(InfiniteIterator, __construct)
 {
@@ -3359,7 +3359,7 @@ void spl_append_it_next(spl_dual_it_object *intern) /* {{{ */
        spl_append_it_fetch(intern);
 } /* }}} */
 
-/* {{{ proto void AppendIterator::__construct()
+/* {{{ proto AppendIterator::__construct()
    Create an AppendIterator */
 SPL_METHOD(AppendIterator, __construct)
 {

diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c
index 96fc3a10479a9ea547caff05f301878a9a8ae985..295f7765d28a3b72f319a19da5128115a25f60ac 100644 (file)
--- a/ext/spl/spl_observer.c
+++ b/ext/spl/spl_observer.c
@@ -939,7 +939,7 @@ typedef enum {
 #define SPL_MULTIPLE_ITERATOR_GET_ALL_CURRENT   1
 #define SPL_MULTIPLE_ITERATOR_GET_ALL_KEY       2
 
-/* {{{ proto void MultipleIterator::__construct([int flags = MIT_NEED_ALL|MIT_KEYS_NUMERIC])
+/* {{{ proto MultipleIterator::__construct([int flags = MIT_NEED_ALL|MIT_KEYS_NUMERIC])
    Iterator that iterates over several iterators one after the other */
 SPL_METHOD(MultipleIterator, __construct)
 {

diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
index 783db16ae1c66dbb4b9ce523e89d88d352c6de21..eb87a5eef15c785b69c3dd362cc77c5a389e2031 100644 (file)
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@ -1669,7 +1669,7 @@ PHP_METHOD(sqlite3stmt, execute)
 }
 /* }}} */
 
-/* {{{ proto int SQLite3Stmt::__construct(SQLite3 dbobject, String Statement)
+/* {{{ proto SQLite3Stmt::__construct(SQLite3 dbobject, String Statement)
    __constructor for SQLite3Stmt. */
 PHP_METHOD(sqlite3stmt, __construct)
 {
@@ -1891,7 +1891,7 @@ PHP_METHOD(sqlite3result, finalize)
 }
 /* }}} */
 
-/* {{{ proto int SQLite3Result::__construct()
+/* {{{ proto SQLite3Result::__construct()
    __constructor for SQLite3Result. */
 PHP_METHOD(sqlite3result, __construct)
 {

diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 2a0ed7b6e3816d9e5ef7efce5b6156132477f79e..61fd0f32cb7cc4cc75de9ca2dd0788f3727dbf94 100644 (file)
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -1877,7 +1877,7 @@ static TIDY_NODE_METHOD(getParent)
 /* }}} */
 
 
-/* {{{ proto void tidyNode::__construct()
+/* {{{ proto tidyNode::__construct()
          __constructor for tidyNode. */
 static TIDY_NODE_METHOD(__construct)
 {