Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	NEWS
	Zend/zend_compile.c

diff --cc NEWS
index df5db9ea78214740eb2356b59df1dcec0ba7bfb4,29d491c864f8f7775a1fd866cfb298e0381d33de..e7a5e88e1930e8c4454722070432c97e0c101f60
--- 1/NEWS
--- 2/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 beb53402ba62017a7c611f3aa47b9beb5d0eae2d,2fed17d7dddcb9109565873a90cfd3329d04651c..f1c8a678cacbdc111dbdece9657a8bf240a5a44c
--- 1/Zend/zend_compile.c
--- 2/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));