Fixed bug #60174 (Notice when array in method prototype error)

this should also exists in ext/reflection. since the new warning of "array to string convert" is introduced in zend_make_printable_zval which is used in ext/reflection too

diff --git a/NEWS b/NEWS
index 4a6dfec63ecb1bc8910135e74df366ceb8a16db1..02a1ce9ae1bfcbd1e30fc64edb6924de164b002e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ PHP                                                                        NEWS
 - Core:
   . Fixed bug #60120 (proc_open's streams may hang with stdin/out/err when 
     the data exceeds or is equal to 2048 bytes). (Pierre, Pascal Borreli)
+  . Fixed bug #60174 (Notice when array in method prototype error). Laruence
 
 - Oracle Database extension (OCI8):
   . Increased maxium Oracle error message buffer length for new 11.2.0.3 size 

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 727380dac9a484d37cf20cfe5874777d71cb2ad5..47e6f5373683ec1dc4a5511808e45699ea484170 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3133,6 +3133,9 @@ static char * zend_get_function_declaration(zend_function *fptr TSRMLS_DC) /* {{
                                                                *(offset++) = '.';
                                                        }
                                                        *(offset++) = '\'';
+                                               } else if (Z_TYPE_P(zv) == IS_ARRAY) {
+                                                       memcpy(offset, "Array", 5);
+                                                       offset += 5;
                                                } else {
                                                        zend_make_printable_zval(zv, &zv_copy, &use_copy);
                                                        REALLOC_BUF_IF_EXCEED(buf, offset, length, Z_STRLEN(zv_copy));
@@ -3155,7 +3158,7 @@ static char * zend_get_function_declaration(zend_function *fptr TSRMLS_DC) /* {{
                                *(offset++) = ' ';
                        }
                        arg_info++;
-                       REALLOC_BUF_IF_EXCEED(buf, offset, length, 23);
+                       REALLOC_BUF_IF_EXCEED(buf, offset, length, 32);
                }
        }
        *(offset++) = ')';