From: Bob Weinand <bobwei9@hotmail.com>
Date: Sun, 15 Jun 2014 21:06:15 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~188^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f92143f740c06d4344e15fa2b310f1cc674be77c;p=php

Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	NEWS
	Zend/zend_compile.c
---

f92143f740c06d4344e15fa2b310f1cc674be77c
diff --cc NEWS
index df5db9ea78,29d491c864..e7a5e88e19
--- a/NEWS
+++ b/NEWS
@@@ -1,10 -1,24 +1,12 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2014, PHP 5.5.15
 +?? ??? 2014, PHP 5.6.0 Release Candidate 1
  
  - Core:
 -  . Fixed bug #67428 (header('Location: foo') will override a 308-399 response
 -    code). (Adam)
 +  . Implemented FR #64744 (Differentiate between member function call on a null 
 +    and non-null, non-objects). (Boro Sitnikovski)
+   . Fixed bug #67436 (Autoloader isn't called if two method definitions don't
+     match). (Bob)
 -
 -- CLI server:
 -  . Implemented FR #67429 (CLI server is missing some new HTTP response codes).
 -    (Adam)
 -
 -- Streams:
 -  . Fixed bug #67430 (http:// wrapper doesn't follow 308 redirects). (Adam)
 -
 -?? ??? 2014, PHP 5.5.14
 -
 -- Core:
 -  . Fixed BC break introduced by patch for bug #67072. (Anatol)
    . Fixed bug #66622 (Closures do not correctly capture the late bound class
      (static::) in some cases). (Levi Morrison)
    . Fixed bug #67390 (insecure temporary file use in the configure script).
diff --cc Zend/zend_compile.c
index beb53402ba,2fed17d7dd..f1c8a678ca
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@@ -3484,9 -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_ARRAY) {
 +						} else if (Z_TYPE_P(zv) == IS_ARRAY) {
  							memcpy(offset, "Array", 5);
  							offset += 5;
++						} else if (Z_TYPE_P(zv) == 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));