From: Bob Weinand <bobwei9@hotmail.com>
Date: Mon, 16 Jun 2014 09:18:45 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~183^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c2b42ac41d01f856548b350945018ad2b485942;p=php

Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	Zend/zend_compile.c
---

3c2b42ac41d01f856548b350945018ad2b485942
diff --cc Zend/zend_compile.c
index f1c8a678ca,0ac3bceddc..7c979d56b7
--- a/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));