Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	Zend/zend_compile.c

diff --cc Zend/zend_compile.c
index f1c8a678cacbdc111dbdece9657a8bf240a5a44c,0ac3bceddcc51cc677fb9e0ac80c6eed5ea69f38..7c979d56b773833034d97241eb8475ab6ab36960
--- 1/Zend/zend_compile.c
--- 2/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@@ -3487,12 -3362,9 +3487,12 @@@ static char * zend_get_function_declara
                                                                *(offset++) = '.';
                                                        }
                                                        *(offset++) = '\'';
 -                                              } else if (Z_TYPE_P(zv) == IS_ARRAY || (Z_TYPE_P(zv) & IS_CONSTANT_TYPE_MASK) == IS_CONSTANT_ARRAY) {
 +                                              } else if (Z_TYPE_P(zv) == IS_ARRAY) {
                                                        memcpy(offset, "Array", 5);
                                                        offset += 5;
-                                               } else if (Z_TYPE_P(zv) == IS_CONSTANT_AST) {
++                                              } else if ((Z_TYPE_P(zv) & IS_CONSTANT_TYPE_MASK) == IS_CONSTANT_AST) {
 +                                                      memcpy(offset, "<expression>", 12);
 +                                                      offset += 12;
                                                } else {
                                                        zend_make_printable_zval(zv, &zv_copy, &use_copy);
                                                        REALLOC_BUF_IF_EXCEED(buf, offset, length, Z_STRLEN(zv_copy));