]> granicus.if.org Git - php/commitdiff
Fixed bug #60174 (Notice when array in method prototype error)
authorXinchen Hui <laruence@php.net>
Mon, 31 Oct 2011 03:47:11 +0000 (03:47 +0000)
committerXinchen Hui <laruence@php.net>
Mon, 31 Oct 2011 03:47:11 +0000 (03:47 +0000)
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

Zend/zend_compile.c

index 727380dac9a484d37cf20cfe5874777d71cb2ad5..47e6f5373683ec1dc4a5511808e45699ea484170 100644 (file)
@@ -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++) = ')';