Fix weird asm instruction order with gcc by marking as volatile in phpdbg

Preserve return value in zend_vm_call_opcode_handler with global opline/ex registers enabled
Don't return T_ERROR from token_get_all()
2026-11-08 09:47:30 +00:00 · 2015-07-13 14:11:39 +02:00 · 2015-07-13 13:45:27 +02:00 · 2015-07-09 23:02:21 +02:00 · 2015-07-09 22:56:11 +02:00 · 2015-07-09 23:20:50 +03:00
4549 changed files with 381530 additions and 232885 deletions
@@ -73,7 +73,7 @@ define dump_bt

 			set $callFrameSize = (sizeof(zend_execute_data) + sizeof(zval) - 1) / sizeof(zval)

-			set $count = $ex->num_args
+			set $count = $ex->This.u2.num_args
 			set $arg = 0
 			while $arg < $count
 				if $arg > 0
@@ -181,7 +181,7 @@ define ____printzv_contents
 		printf "array: "
 		if ! $arg1
 			set $ind = $ind + 1
-			____print_ht $zvalue->value.ht 1
+			____print_ht $zvalue->value.arr
 			set $ind = $ind - 1
 			set $i = $ind
 			while $i > 0
@@ -49,7 +49,6 @@ UPGRADING.INTERNALS             merge=NEWS
 /ext/spl/tests/SplArray_fromArray.phpt	-crlf
 /ext/standard/tests/dir/scandir_variation3.phpt	-crlf
 /ext/standard/tests/general_functions/escapeshellcmd-win32.phpt	-crlf
-/ext/standard/tests/general_functions/set_magic_quotes_runtime_error.phpt	-crlf
 /ext/standard/tests/strings/bug26817.phpt	-crlf
 /ext/standard/tests/strings/bug26973.phpt	-crlf
 /ext/standard/tests/strings/bug27457.phpt	-crlf
@@ -188,6 +188,7 @@ ext/iconv/php_have_glibc_iconv.h
 ext/iconv/php_php_iconv_impl.h
 ext/iconv/php_have_iconv.h
 ext/iconv/php_iconv_supports_errno.h
+ext/iconv/php_iconv_broken_ignore.h
 ext/mbstring/libmbfl/Makefile.in
 ext/mbstring/libmbfl/autoscan.log
 ext/mbstring/libmbfl/config.sub
@@ -256,7 +257,7 @@ main/config.w32.h
 main/stamp-h1
 main/streams/build-defs.h
 main/streams/stamp-h1
-pear/install-pear-nozlib.phar
+#pear/install-pear-nozlib.phar
 pear/phpize
 pear/run-tests
 pear/php-config
@@ -284,5 +285,3 @@ win32/*.positions
 win32/ext
 win32/phpts.def
 win32/wsyslog.h
-win32/win32.dsp
-win32/php.dsw
@@ -7,6 +7,11 @@ branches:
 notifications:
    email: 
       on_failure: change
+    irc:
+      channels:
+        - "irc.efnet.org#php.pecl"
+      on_success: change
+      on_failure: always

 cache: 
    - apt
@@ -26,7 +31,7 @@ env:

 before_install:
    - sudo apt-get update -qq
-    - sudo apt-get install -y libenchant-dev libaspell-dev libpspell-dev librecode-dev
+    - sudo apt-get install -y libenchant-dev libaspell-dev libpspell-dev librecode-dev libsasl2-dev libxpm-dev libt1-dev libc-client2007e-dev
    - sudo cp ./travis/de /var/lib/locales/supported.d/de
    - sudo dpkg-reconfigure locales
    - ./travis/install.sh
@@ -40,8 +45,9 @@ before_script:
    - . ./travis/ext/pdo_mysql/setup.sh
    - . ./travis/ext/pgsql/setup.sh
    - . ./travis/ext/pdo_pgsql/setup.sh
+    - . ./travis/ext/imap/setup.sh

 # Run PHPs run-tests.php 
 script:
-    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --set-timeout 120
+    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 1 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --set-timeout 120
    - ./sapi/cli/php sapi/phpdbg/tests/run-tests.php -diff2stdout --phpdbg sapi/phpdbg/phpdbg
@@ -18,6 +18,7 @@ Code Implementation

 For instance, ``function int mail(char *to, char *from)`` should NOT free
 to and/or from.
+
 Exceptions:

 - The function's designated behavior is freeing that resource.  E.g. efree()
@@ -112,6 +113,7 @@ User Functions/Methods Naming Conventions
    of ``parent_*``::

    A family of 'foo' functions, for example:
+    
    Good:
    'foo_select_bar'
    'foo_insert_baz'
@@ -0,0 +1,73 @@
+# Contributing to PHP
+
+Anybody who programs in PHP can be a contributing member of the community that
+develops and deploys it; the task of deploying PHP, documentation and
+associated websites is a never ending one. With every release, or release
+candidate comes a wave of work, which takes a lot of organization and
+co-ordination.
+
+## Pull requests
+
+PHP welcomes pull requests to [add tests](#writing-tests), fix bugs and to
+implement RFCs. Please be sure to include tests as appropriate!
+
+If you are fixing a bug, then please submit your PR against the lowest branch
+of PHP that the bug affects, or the oldest fully supported version (the first
+green branch on
+[the supported version page](http://php.net/supported-versions.php). For
+example, at the time of writing in mid-2015, this is PHP 5.5, which corresponds
+to the `PHP-5.5` branch in Git. Please also make sure you add a link to the PR
+in the bug on [the bug tracker](https://bugs.php.net/).
+
+Pull requests to implement RFCs should be submitted against `master`.
+
+## Filing bugs
+
+Bugs can be filed on the [PHP bug tracker](https://bugs.php.net/). If this is
+the first time you've filed a bug, we suggest reading the
+[guide to reporting a bug](https://bugs.php.net/how-to-report.php).
+
+Where possible, please include a self-contained reproduction case!
+
+## Feature requests
+
+Feature requests are generally submitted in the form of
+[Requests for Comment](https://wiki.php.net/rfc/howto), ideally accompanied by
+[pull requests](#pull-requests). You can find the extremely large list of RFCs
+that have been previously considered on the
+[PHP Wiki](https://wiki.php.net/rfc).
+
+You may want to read
+[The Mysterious PHP RFC Process](https://blogs.oracle.com/opal/entry/the_mysterious_php_rfc_process)
+for additional notes on the best way to approach submitting an RFC.
+
+## Writing tests
+
+We love getting new tests! PHP is a huge project and improving code coverage is
+a huge win for every PHP user.
+
+[Our QA site includes a page detailing how to write test cases.](http://qa.php.net/write-test.php)
+Please note that the section on submitting pull requests is outdated: in
+addition to the process listed there, you can also
+[submit pull requests](#pull-requests).
+
+## Writing documentation
+
+There are two ways to contribute to the PHP manual. You can edit the manual and
+send patches anonymously via [the online editor](https://edit.php.net/), or you
+can check the XML source out from Subversion and edit that and build it
+[per the instructions on the documentation site](http://doc.php.net/tutorial/).
+Patches created that way should be sent to the
+[documentation mailing list](mailto:phpdoc@lists.php.net).
+
+## Getting help
+
+If you are having trouble contributing to PHP, or just want to talk to a human
+about what you're working on, you can contact us via the
+[internals mailing list](mailto:internals@lists.php.net), or the
+[documentation mailing list](mailto:phpdoc@lists.php.net) for documentation
+issues.
+
+Although not a formal channel, you can also find a number of core developers on
+the #php.pecl channel on [EFnet](http://www.efnet.org/). Similarly, many
+documentation writers can be found on #php.doc.
@@ -26,34 +26,12 @@ Status legend

 == Server APIs ==

-------------------------------------------------------------------------------
-EXTENSION:           aolserver
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
-EXTENSION:           apache
-PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-------------------------------------------------------------------------------
-EXTENSION:           apache_hooks
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
-EXTENSION:           apache2filter
-PRIMARY MAINTAINER:  Aaron Bannert <aaron@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Experimental
 -------------------------------------------------------------------------------
 EXTENSION:           apache2handler
 PRIMARY MAINTAINER:  Aaron Bannert <aaron@php.net>, Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           caudium
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
 EXTENSION:           cgi
 MAINTENANCE:         Unknown
 STATUS:              Working
@@ -63,11 +41,6 @@ MAINTENANCE:         Marcus Boerger <helly@php.net>, Edin Kadribasic <edink@php.
 STATUS:              Working
 SINCE:               4.3.0
 -------------------------------------------------------------------------------
-EXTENSION:           continuity
-PRIMARY MAINTAINER:  Alex Leigh <aleigh@php.net>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
 EXTENSION:           embed
 PRIMARY MAINTAINER:  Edin Kadribasic <edink@php.net>
 MAINTENANCE:         Maintained
@@ -79,50 +52,15 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3.3
 -------------------------------------------------------------------------------
-EXTENSION:           isapi
-MAINTENANCE:         Unknown
-STATUS:              Working
-------------------------------------------------------------------------------
 EXTENSION:           litespeed
 PRIMARY MAINTAINER:  George Wang <gwang@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3
 -------------------------------------------------------------------------------
-EXTENSION:           milter
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
-EXTENSION:           nsapi
-PRIMARY MAINTAINER:  Uwe Schindler <thetaphi@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-------------------------------------------------------------------------------
-EXTENSION:           phttpd
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
-EXTENSION:           pi3web
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
-EXTENSION:           roxen
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
-EXTENSION:           thttpd
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
-MAINTENANCE:         Odd fixes
-STATUS:              Working
-------------------------------------------------------------------------------
-EXTENSION:           tux
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-------------------------------------------------------------------------------
-EXTENSION:           webjames
-PRIMARY MAINTAINER:  Alex Waugh <alex@alexwaugh.com>
-MAINTENANCE:         Maintained
-STATUS:              Experimental
+EXTENSION:           phpdbg
+MAINTENANCE:         Joe Watkins <krakjoe@php.net>, Bob Weinand <bwoebi@php.net>
+STATUS:              5.6
 -------------------------------------------------------------------------------


@@ -136,21 +74,10 @@ STATUS:              Working
 COMMENT:             DBM abstraction for db2, db3, db4, dbm, ndbm, gdbm, ini
 -------------------------------------------------------------------------------
 EXTENSION:           interbase
-PRIMARY MAINTAINER:  Ard Biesheuvel <ard@ard.nu>, Jouni Ahto <jouni.ahto@exdec.fi>
+PRIMARY MAINTAINER:  Ard Biesheuvel <ard@ard.nu>
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           mssql
-PRIMARY MAINTAINER:  Frank M. Kromann <fmk@swwwing.com>
-MAINTENANCE:         Maintained
-STATUS:              Working
-COMMENT:             Tested on phpts and isapi versions
-------------------------------------------------------------------------------
-EXTENSION:           mysql
-PRIMARY MAINTAINER:  Zak Greant <zak@mysql.com>, Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>, Johannes Schlüter <johannes@php.net>,  Ulf Wendel <uw@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-------------------------------------------------------------------------------
 EXTENSION:           mysqli
 PRIMARY MAINTAINER:  Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>,  Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>      
 MAINTENANCE:         Maintained
@@ -235,11 +162,6 @@ STATUS:              Working
 SINCE:               5.3
 COMMENT:             Integrates SQLite 3 embeddable SQL database engine.
 -------------------------------------------------------------------------------
-EXTENSION:           sybase_ct
-PRIMARY MAINTAINER:  Timm Friebe <thekid@thekid.de>
-MAINTENANCE:         Maintained
-STATUS:              Working
-------------------------------------------------------------------------------


 == XML extensions ==
@@ -401,13 +323,13 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           json
-PRIMARY MAINTAINER:  Unknown
-MAINTENANCE:         Odd fixes
+PRIMARY MAINTAINER:  Jakub Zelenka <bukka@php.net>
+MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.2
 -------------------------------------------------------------------------------
 EXTENSION:           ldap
-PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net>, Douglas Goldstein <cardoe@php.net>, Pierre-Alain Joye <pajoye@php.net>
+PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net>, Douglas Goldstein <cardoe@php.net>, Pierre-Alain Joye <pajoye@php.net>, Côme Bernigaud <mcmic@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -464,7 +464,7 @@ LoadModule php7_module modules/libphp7.so
       Or,  if we wanted to allow .php, .php2, .php3, .php4, .php5, .php7,
       and  .phtml files to be executed as PHP, but nothing else, we'd use
       this:
-<FilesMatch "\.ph(p[2-6]?|tml)$">
+<FilesMatch "\.ph(p[2-7]?|tml)$">
    SetHandler application/x-httpd-php
 </FilesMatch>
       And  to  allow  .phps files to be handled by the php source filter,
@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
                  The PHP License, version 3.01
-Copyright (c) 1999 - 2014 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2015 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 

 Redistribution and use in source and binary forms, with or without
@@ -20,4 +20,4 @@ $(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
 $(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
 	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l)

-$(builddir)/zend_indent.lo $(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h
+$(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h
@@ -130,5 +130,18 @@ distclean: clean
 	fi
 	$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f

-.PHONY: all clean install distclean test
+prof-gen:
+	CCACHE_DISABLE=1 $(MAKE) PROF_FLAGS=-fprofile-generate all
+
+prof-clean:
+	find . -name \*.lo -o -name \*.o | xargs rm -f
+	find . -name \*.la -o -name \*.a | xargs rm -f 
+	find . -name \*.so | xargs rm -f
+	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
+
+prof-use:
+	CCACHE_DISABLE=1 $(MAKE) PROF_FLAGS=-fprofile-use all
+
+
+.PHONY: all clean install distclean test prof-gen prof-clean prof-use
 .NOEXPORT:
@@ -1,47 +1,269 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 20??, PHP 7.0.0
+23 Jul 2015, PHP 7.0.0 Beta 2
+
+- Core:
+  . Fixed bug #70012 (Exception lost with nested finally block). (Laruence)
+
+- Soap:
+  . Fixed bug #70032 (make_http_soap_request calls
+    zend_hash_get_current_key_ex(,,,NULL). (Laruence)
+
+- Standard:
+  . Fixed bug #70018 (exec does not strip all whitespace). (Laruence)
+
+- Tokenizer:
+  . Fixed bug #69430 (token_get_all has new irrecoverable errors). (Nikita)
+
+09 Jul 2015, PHP 7.0.0 Beta 1
+
+- Core:
+  . Fixed bug #70006 (cli - function with default arg = STDOUT crash output).
+    (Laruence)
+  . Fixed bug #69521 (Segfault in gc_collect_cycles()).
+    (arjen at react dot com, Laruence)
+  . Improved zend_string API (Francois Laupretre)
+  . Fixed bug #69955 (Segfault when trying to combine [] and assign-op on
+    ArrayAccess object). (Laruence)
+  . Fixed bug #69957 (Different ways of handling div/mod/intdiv). (Bob)
+  . Fixed bug #69900 (Too long timeout on pipes). (Anatol)
+  . Fixed bug #62210 (Exceptions can leak temporary variables. As a part of
+    the fix serious refactoring was done. op_array->brk_cont_array was removed,
+    and replaced with more general and speed efficient op_array->T_liveliness.
+    ZEND_GOTO opcode is always replaced by ZEND_JMP at compile time).
+    (Bob, Dmitry, Laruence)
+
+- CLI server:
+  . Fixed bug #69655 (php -S changes MKCALENDAR request method to MKCOL). (cmb)
+  . Fixed bug #64878 (304 responses return Content-Type header). (cmb)
+
+- COM:
+  . Fixed bug #69939 (Casting object to bool returns false). (Kalle)
+
+- JSON
+  . Fixed bug #62010 (json_decode produces invalid byte-sequences).
+    (Jakub Zelenka)
+
+- OCI8:
+  . Corrected oci8 hash destructors to prevent segfaults, and a few other fixes.
+    (Cameron Porter)
+
+- ODBC:
+  . Fixed bug #69975 (PHP segfaults when accessing nvarchar(max) defined
+    columns). (cmb)
+
+- OpenSSL:
+  . Fixed bug #69882 (OpenSSL error "key values mismatch" after
+    openssl_pkcs12_read with extra cert) (Tomasz Sawicki)
+
+- PCRE:
+  . Fixed bug #53823 (preg_replace: * qualifier on unicode replace garbles the
+    string). (cmb)
+
+- Session:
+  . Fixed bug #69952 (Data integrity issues accessing superglobals by
+    reference). (Bob)
+
+- SPL:
+  . Fixed bug #69970 (Use-after-free vulnerability in
+    spl_recursive_it_move_forward_ex()). (Laruence)
+  
+- Standard:
+  . Fixed bug #69983 (get_browser fails with user agent of null).
+    (Kalle, cmb, Laruence)
+  . Fixed bug #69976 (Unable to parse "all" urls with colon char). (cmb)
+  . Fixed bug #69768 (escapeshell*() doesn't cater to !). (cmb)
+
+- Sqlite3:
+  . Fixed bug #69972 (Use-after-free vulnerability in
+    sqlite3SafetyCheckSickOrOk()). (Laruence)
+
+25 Jun 2015, PHP 7.0.0 Alpha 2
+
+- Core:
+  . Fixed bug #69872 (uninitialised value in strtr with array). (Laruence)
+  . Fixed bug #69868 (Invalid read of size 1 in zend_compile_short_circuiting).
+    (Laruence)
+  . Fixed bug #69849 (Broken output of apache_request_headers). (Kalle)
+  . Fixed bug #69840 (iconv_substr() doesn't work with UTF-16BE). (Kalle)
+  . Fixed bug #69823 (PHP 7.0.0alpha1 segmentation fault when exactly 33
+    extensions are loaded). (Laruence)
+  . Fixed bug #69805 (null ptr deref and seg fault in zend_resolve_class_name).
+    (Laruence)
+  . Fixed bug #69802 (Reflection on Closure::__invoke borks type hint class
+    name). (Dmitry)
+  . Fixed bug #69761 (Serialization of anonymous classes should be prevented).
+    (Laruence)
+  . Fixed bug #69551 (parse_ini_file() and parse_ini_string() segmentation
+    fault). (Christoph M. Becker)
+  . Fixed bug #69781 (phpinfo() reports Professional Editions of Windows
+    7/8/8.1/10 as "Business"). (Christian Wenz)
+  . Fixed bug #69835 (phpinfo() does not report many Windows SKUs).
+    (Christian Wenz)
+  . Fixed bug #69889 (Null coalesce operator doesn't work for string offsets).
+    (Nikita)
+  . Fixed bug #69891 (Unexpected array comparison result). (Nikita)
+  . Fixed bug #69892 (Different arrays compare indentical due to integer key
+    truncation). (Nikita)
+  . Fixed bug #69893 (Strict comparison between integer and empty string keys
+    crashes). (Nikita)
+
+- DOM:
+  . Fixed bug #69846 (Segmenation fault (access violation) when iterating over
+    DOMNodeList). (Anatol Belski)
+
+- GD:
+  . Fixed bug #61221 (imagegammacorrect function loses alpha channel). (cmb)
+
+- JSON
+  . Fixed bug #68546 (json_decode() Fatal error: Cannot access property
+    started with '\0'). (Jakub Zelenka)
+
+- mysqlnd:
+  . Fixed Bug #69796 (mysqli_stmt::fetch doesn't assign null values to
+    bound variables). (Laruence)
+
+- Curl:
+  . Fixed bug #69831 (Segmentation fault in curl_getinfo). (im dot denisenko at
+    yahoo dot com)
+
+- Opcache:
+  . Removed opcache.load_comments configuration directive. Now doc comments
+    loading costs nothing and always enabled. (Dmitry)
+  . Fixed bug #69838 (Wrong size calculation for function table). (Anatol)
+  
+- PCRE:
+  . Fixed bug #69864 (Segfault in preg_replace_callback) (cmb, ab)
+
+- PDO_pgsql:
+  . Fixed bug #69752 (PDOStatement::execute() leaks memory with DML
+    Statements when closeCuror() is u). (Philip Hofstetter)
+
+- SPL
+  . Fixed bug #69845 (ArrayObject with ARRAY_AS_PROPS broken). (Dmitry)
+
+- SQLite3
+  . Fixed bug #69897 (segfault when manually constructing SQLite3Result). 
+    (Kalle)
+
+- Standard
+  . Fixed bug #62922 (Truncating entire string should result in string).
+    (Nikita)
+
+11 Jun 2015, PHP 7.0.0 Alpha 1
+
+- Core:
+  . Fixed bug #69767 (Default parameter value with wrong type segfaults).
+    (cmb, Laruence)
+  . Fixed bug #69756 (Fatal error: Nesting level too deep - recursive dependency
+    ? with ===). (Dmitry, Laruence)
+  . Fixed bug #69758 (Item added to array not being removed by array_pop/shift
+    ). (Laruence)
+  . Fixed bug #68475 (Add support for $callable() sytnax with 'Class::method').
+    (Julien, Aaron Piotrowski)
+  . Fixed bug #69485 (Double free on zend_list_dtor). (Laruence)
+  . Fixed bug #69427 (Segfault on magic method __call of private method in 
+    superclass). (Laruence)
+  . Improved __call() and __callStatic() magic method handling. Now they are
+    called in a stackless way using ZEND_CALL_TRAMPOLINE opcode, without
+    additional stack frame. (Laruence, Dmitry)
+  . Optimized strings concatenation. (Dmitry, Laruence)
+  . Fixed weird operators behavior. Division by zero now emits warning and 
+    returns +/-INF, modulo by zero and intdid() throws an exception, shifts
+    by negative offset throw exceptions. Compile-time evaluation of division
+    by zero is disabled. (Dmitry, Andrea, Nikita)
+  . Fixed bug #69371 (Hash table collision leads to inaccessible array keys).
+    (Laruence)
+  . Fixed bug #68933 (Invalid read of size 8 in zend_std_read_property).
+    (Laruence, arjen at react dot com)
+  . Fixed bug #68252 (segfault in Zend/zend_hash.c in function
+    _zend_hash_del_el). (Laruence)
+  . Fixed bug #65598 (Closure executed via static autoload incorrectly marked as
+    static). (Nikita)
+  . Fixed bug #66811 (Cannot access static::class in lambda, writen outside of a
+    class). (Nikita)
+  . Fixed bug #69568 (call a private function in closure failed). (Nikita)
+  . Added PHP_INT_MIN constant. (Andrea)
+  . Added Closure::call() method. (Andrea)
+  . Fixed bug #67959 (Segfault when calling phpversion('spl')). (Florian)
+  . Implemented the RFC `Catchable "Call to a member function bar() on a
+    non-object"`. (Timm)
+  . Added options parameter for unserialize allowing to specify acceptable
+    classes (https://wiki.php.net/rfc/secure_unserialize). (Stas)
+  . Fixed bug #63734 (Garbage collector can free zvals that are still
+    referenced). (Dmitry)
+  . Removed ZEND_ACC_FINAL_CLASS, promoting ZEND_ACC_FINAL as final class 
+    modifier. (Guilherme Blanco)
+  . is_long() & is_integer() is now an alias of is_int(). (Kalle)
+  . Implemented FR #55467 (phpinfo: PHP Variables with $ and single quotes). (Kalle)
+  . Added ?? operator. (Andrea)
+  . Added <=> operator. (Andrea)
+  . Added \u{xxxxx} Unicode Codepoint Escape Syntax. (Andrea)
+  . Fixed oversight where define() did not support arrays yet const syntax did.
+    (Andrea, Dmitry)
+  . Use "integer" and "float" instead of "long" and "double" in ZPP, type hint
+    and conversion error messages. (Andrea)
+  . Implemented FR #55428 (E_RECOVERABLE_ERROR when output buffering in output
+    buffering handler). (Kalle)
+  . Removed scoped calls of non-static methods from an incompatible $this
+    context. (Nikita)
+  . Removed support for #-style comments in ini files. (Nikita)
+  . Removed support for assigning the result of new by reference. (Nikita)
+  . Invalid octal literals in source code now produce compile errors, fixes
+    PHPSadness #31. (Andrea)
+  . Removed dl() function on fpm-fcgi. (Nikita)
+  . Removed support for hexadecimal numeric strings. (Nikita)
+  . Removed obsolete extensions and SAPIs. See the full list in UPGRADING. (Anatol)
+  . Added NULL byte protection to exec, system and passthru. (Yasuo)
+  . Added error_clear_last() function. (Reeze Xia)
+  . Fixed bug #68797 (Number 2.2250738585072012e-308 converted incorrectly).
+    (Anatol)
+  . Improved zend_qsort(using hybrid sorting algo) for better performance, 
+    and also renamed zend_qsort to zend_sort. (Laruence)
+  . Added stable sorting algo zend_insert_sort. (Laruence)
+  . Implemented the RFC `Scalar Type Decalarations v0.5`. (Anthony)
+  . Implemented the RFC `Group Use Declarations`. (Marcio)
+  . Implemented the RFC `Continue Output Buffering`. (Mike)
+  . Implemented the RFC `Constructor behaviour of internal classes`. (Dan, Dmitry)
+  . Implemented the RFC `Fix "foreach" behavior`. (Dmitry)
+  . Implemented the RFC `Generator Delegation`. (Bob)
+  . Implemented the RFC `Anonymous Class Support`. (Joe, Nikita, Dmitry)
+  . Implemented the RFC `Context Sensitive Lexer`. (Marcio Almada)
+  . Fixed bug #69511 (Off-by-one buffer overflow in php_sys_readlink).
+    (Jan Starke, Anatol)

 - CLI server:
  . Refactor MIME type handling to use a hash table instead of linear search.
    (Adam)
  . Update the MIME type list from the one shipped by Apache HTTPD. (Adam)
+  . Added support for SEARCH WebDav method. (Mats Lindh)

- Core:
-  . Fixed bug #68104 (Segfault while pre-evaluating a disabled function).
-    (Laruence)
-  . Fixed bug #68252 (segfault in Zend/zend_hash.c in function
-    _zend_hash_del_el). (Laruence)
-  . Added PHP_INT_MIN constant. (Andrea)
-  . Added Closure::call() method. (Andrea)
-  . Implemented FR #38409 (parse_ini_file() looses the type of booleans). (Tjerk)
-  . Fixed #67959 (Segfault when calling phpversion('spl')). (Florian)
-  . Implemented the RFC `Catchable "Call to a member function bar() on a
-    non-object"`. (Timm)
-  . Added options parameter for unserialize allowing to specify acceptable
-    classes (https://wiki.php.net/rfc/secure_unserialize). (Stas)
-  . Fixed bug #68185 ("Inconsistent insteadof definition."- incorrectly triggered). (Julien)
-  . Fixed bug #65419 (Inside trait, self::class != __CLASS__). (Julien)
-  . Fixed bug #65576 (Constructor from trait conflicts with inherited
-    constructor). (dunglas at gmail dot com)
-  . Removed ZEND_ACC_FINAL_CLASS, promoting ZEND_ACC_FINAL as final class 
-    modifier. (Guilherme Blanco)
-  . is_long() & is_integer() is now an alias of is_int(). (Kalle)
-  . Implemented FR #55467 (phpinfo: PHP Variables with $ and single quotes). (Kalle)
-  . Fixed bug #55415 (php_info produces invalid anchor names). (Kalle, Johannes)
+- Curl:
+  . Fixed bug #68937 (Segfault in curl_multi_exec). (Laruence)
+  . Removed support for unsafe file uploads. (Nikita)

 - Date:
  . Fixed day_of_week function as it could sometimes return negative values
    internally. (Derick)
+  . Removed $is_dst parameter from mktime() and gmmktime(). (Nikita)
+  . Removed date.timezone warning
+    (https://wiki.php.net/rfc/date.timezone_warning_removal). (Bob)
+  . Added "v" DateTime format modifier to get the 3-digit version of fraction 
+    of seconds. (Mariano Iglesias)
+  . Implemented FR #69089: Added DateTime::RFC3339_EXTENDED to output in 
+    RFC3339 Extended format which includes fraction of seconds (Mariano 
+    Iglesias)

 - DBA:
  . Fixed bug #62490 (dba_delete returns true on missing item (inifile)). (Mike)
+  . Fixed bug #68711 (useless comparisons). (bugreports at internot dot info)

 - DOM:
  . Made DOMNode::textContent writeable. (Tjerk)

 - GD:
  . Made fontFetch's path parser thread-safe. (Sara)
+  . Removed T1Lib support. (Kalle)

 - Fileinfo:
  . Fixed bug #66242 (libmagic: don't assume char is signed). (ArdB)
@@ -50,51 +272,149 @@
  . New FILTER_VALIDATE_DOMAIN and better RFC conformance for FILTER_VALIDATE_URL. (Kevin Dunglas)

 - FPM:
+  . Fixed bug #68945 (Unknown admin values segfault pools). (Laruence)
  . Fixed bug #65933 (Cannot specify config lines longer than 1024 bytes). (Chris Wright)
  . Implement request #67106 (Split main fpm config). (Elan Ruusamäe, Remi)

+- FTP:
+  . Fixed bug #69082 (FTPS support on Windows). (Anatol) 
+
+- Intl:
+  . Removed deprecated aliases datefmt_set_timezone_id() and
+    IntlDateFormatter::setTimeZoneID(). (Nikita)
+
+- JSON
+  . Replace non-free JSON parser with a parser from Jsond extension, fixes #63520
+    (JSON extension includes a problematic license statement). (Jakub Zelenka)
+  . Fixed bug #68938 (json_decode() decodes empty string without error).
+    (jeremy at bat-country dot us)
+
+- LDAP
+  . Fixed bug #47222 (Implement LDAP_OPT_DIAGNOSTIC_MESSAGE). (Andreas Heigl)
+
 - LiteSpeed:
  . Updated LiteSpeed SAPI code from V5.5 to V6.6. (George Wang)

+- libxml:
+  . Fixed handling of big lines in error messages with libxml >= 2.9.0.
+    (Christoph M. Becker)
+
 - Mcrypt:
  . Fixed possible read after end of buffer and use after free. (Dmitry)
+  . Removed mcrypt_generic_end() alias. (Nikita)
+  . Removed mcrypt_ecb(), mcrypt_cbc(), mcrypt_cfb(), mcrypt_ofb(). (Nikita)
+
+- Opcache:
+  . Fixed bug #69688 (segfault with eval and opcache fast shutdown).
+    (Laruence)
+  . Added experimental (disabled by default) file based opcode cache.
+    (Dmitry, Laruence, Anatol)
+  . Fixed bug with try blocks being removed when extended_info opcode
+    generation is turned on. (Laruence)
+  . Fixed bug #68644 (strlen incorrect : mbstring + func_overload=2 +UTF-8
+    + Opcache). (Laruence)
+
+- OpenSSL:
+  . Added "alpn_protocols" SSL context option allowing encrypted client/server
+    streams to negotiate alternative protocols using the ALPN TLS extension when
+    built against OpenSSL 1.0.2 or newer. Negotiated protocol information is
+    accessible through stream_get_meta_data() output.
+  . Removed "CN_match" and "SNI_server_name" SSL context options. Use automatic
+    detection or the "peer_name" option instead. (Nikita)

 - pcntl:
  . Fixed bug #60509 (pcntl_signal doesn't decrease ref-count of old handler
    when setting SIG_DFL). (Julien)
+  . Added wifcontinued and wcontinued. (xilon-jul)
+  . Added rusage support to pcntl_wait() and pcntl_waitpid(). (Anton Stepanenko,
+    Tony)
+
+- PCRE:
+  . Removed support for the /e (PREG_REPLACE_EVAL) modifier. (Nikita)
+
+- PDO:
+  . Fixed bug #59450 (./configure fails with "Cannot find php_pdo_driver.h").
+    (maxime dot besson at smile dot fr)

 - PDO_mysql:
  . Fixed bug #68424 (Add new PDO mysql connection attr to control multi
    statements option). (peter dot wolanin at acquia dot com)

+- PDO_pgsql:
+  . Removed PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT attribute in favor of
+    ATTR_EMULATE_PREPARES). (Nikita)
+
 - Reflection
-  . Fixed inheritance chain of Reflector interface (Tjerk)
+  . Fixed inheritance chain of Reflector interface. (Tjerk)
+  . Added ReflectionGenerator class. (Bob)
+  . Added reflection support for return types and type declarations. (Sara,
+    Matteo)

 - Session:
  . Fixed bug #67694 (Regression in session_regenerate_id()). (Tjerk)
+  . Fixed bug #68941 (mod_files.sh is a bash-script). (bugzilla at ii.nl, Yasuo)

 - SOAP:
-  . Fixed bug #68361 (Segmentation fault on SoapClient::__getTypes).
-    (Laruence)
+  . Fixed bug #68361 (Segmentation fault on SoapClient::__getTypes). (Laruence)

 - SPL:
+  . Changed ArrayIterator implementation using zend_hash_iterator_... API.
+    Allowed modification of iterated ArrayObject using the same behavior
+    as proposed in `Fix "foreach" behavior`. Removed "Array was modified
+    outside object and internal position is no longer valid" hack. (Dmitry)
  . Implemented #67886 (SplPriorityQueue/SplHeap doesn't expose extractFlags
    nor curruption state). (Julien)
  . Fixed bug #66405 (RecursiveDirectoryIterator::CURRENT_AS_PATHNAME
    breaks the RecursiveIterator). (Paul Garvin)
-  . Fixed bug #68479 (Added escape parameter to SplFileObject::fputcsv). (Salathe)
+
+- Sqlite3:
+  . Fixed bug #68260 (SQLite3Result::fetchArray declares wrong
+    required_num_args). (Julien)

 - Standard:
+  . Fixed bug #69723 (Passing parameters by reference and array_column).
+    (Laruence)
+  . Fixed bug #69523 (Cookie name cannot be empty). (Christoph M. Becker)
+  . Fixed bug #69325 (php_copy_file_ex does not pass the argument).
+    (imbolk at gmail dot com)
+  . Fixed bug #69299 (Regression in array_filter's $flag argument in PHP 7).
+    (Laruence)
  . Removed call_user_method() and call_user_method_array() functions. (Kalle)
-  . Fix user session handlers (See rfc:session.user.return-value). (Sara)
+  . Fixed user session handlers (See rfc:session.user.return-value). (Sara)
  . Added intdiv() function. (Andrea)
  . Improved precision of log() function for base 2 and 10. (Marc Bennewitz)
+  . Remove string category support in setlocale(). (Nikita)
+  . Remove set_magic_quotes_runtime() and its alias magic_quotes_runtime().
+    (Nikita)
+  . Fixed bug #65272 (flock() out parameter not set correctly in windows).
+    (Daniel Lowrey)
+  . Added preg_replace_callback_array function. (Wei Dai)
+  . Deprecated salt option to password_hash. (Anthony)
+  . Fixed bug #69686 (password_verify reports back error on PHP7 will null
+    string). (Anthony)
+  . Added Windows support for getrusage(). (Kalle)
+  . Removed hardcoded limit on number of pipes in proc_open(). (Tony)

 - Streams:
  . Fixed bug #68532 (convert.base64-encode omits padding bytes).
    (blaesius at krumedia dot de)
+  . Removed set_socket_blocking() in favor of its alias stream_set_blocking().
+    (Nikita)

 - XSL:
  . Fixed bug #64776 (The XSLT extension is not thread safe). (Mike)
+  . Removed xsl.security_prefs ini option. (Nikita)
+
+- Zlib:
+  . Added deflate_init(), deflate_add(), inflate_init(), inflate_add()
+    functions allowing incremental/streaming compression/decompression.
+    (Daniel Lowrey & Bob Weinand)
+
+- Zip:
+  . Added ZipArchive::setCompressionName and ZipArchive::setCompressionIndex
+    methods (Remi, Cedric Delmas)
+  . Update bundled libzip to 1.0.1 (Remi, Anatol)
+  . Fixed bug #67161. (ZipArchive::getStream() returns NULL for certain file)
+    (Christoph M. Becker)

 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>
@@ -164,11 +164,11 @@ PHP_FUNCTION(module_name_drawtext)
    char *text = NULL;
    int argc = ZEND_NUM_ARGS();
    int image_id = -1;
-    int text_len;
+    size_t text_len;
    int font_id = -1;
-    long x;
-    long y;
-    long color;
+    zend_long x;
+    zend_long y;
+    zend_long color;
    zval *image = NULL;
    zval *font = NULL;

@@ -114,9 +114,9 @@ If you fix some bugs, you should note the bug ID numbers in your
 commit message. Bug ID should be prefixed by "#" for easier access to
 bug report when developers are browsing CVS via LXR or Bonsai.

-Example::
+Example:

-  Fixed bug #14016 (pgsql notice handler double free crash bug.)
+Fixed bug #14016 (pgsql notice handler double free crash bug.)

 When you change the NEWS file for a bug fix, then please keep the bugs
 sorted in decreasing order under the fixed version.
@@ -34,7 +34,7 @@ API adjustment to the old output control code:
 		php_output_handler_started(handler_name, handler_name_len TSRMLS_CC);

 	Flushing one output buffer:
-		// php_ob_end_buffer(1, 1 TSRMLS_CC);
+		// php_end_ob_buffer(1, 1 TSRMLS_CC);
 		php_output_flush(TSRMLS_C);

 	Flushing all output buffers:
@@ -59,7 +59,7 @@ Type specifiers
 h  - array (returned as HashTable*)
 H  - array or HASH_OF(object) (returned as HashTable*)
 l  - long (zend_long)
- L  - long, limits out-of-range numbers to LONG_MAX/LONG_MIN (zend_long)
+ L  - long, limits out-of-range numbers to LONG_MAX/LONG_MIN (zend_long, ZEND_LONG_MAX/ZEND_LONG_MIN)
 o  - object of any type (zval*)
 O  - object of specific type given by class entry (zval*, zend_class_entry)
 p  - valid path (string without null bytes in the middle) and its length (char*, size_t)
@@ -90,7 +90,7 @@ Note on 64bit compatibility
 ---------------------------
 Please note that since version 7 PHP uses zend_long as integer type and 
 zend_string with size_t as length, so make sure you pass zend_longs to "l" 
-and size_t to strings length (i.e. for "s" you need to pass char * and int), 
+and size_t to strings length (i.e. for "s" you need to pass char * and size_t), 
 not the other way round!

 Both mistakes might cause memory corruptions and segfaults:
@@ -196,11 +196,11 @@ last commit id to web/php.git, then, mirrors will now sync
 Getting the stable release announced
 ------------------------------------

-1. Run the bumpRelease script for phpweb on your local checkout
+1. Update phpweb/include/releases.inc with the old release info
+  (updates the download archives)

- a. ``php bin/bumpRelease 5`` to create the release file (releases/x_y_z.php)
-    The release announcement file should list in detail security fixes and
-    changes in behavior (whether due to a bug fix or not).
+ a. You can run ``php bin/bumpRelease 5`` if you are making a release for the
+    highest branch, otherwise you have to do this manually, see point 1.b

 b. In case multiple PHP minor versions are in active development you have
    to manually copy the old information to include/releases.inc
@@ -213,15 +213,18 @@ Getting the stable release announced

 c. ``$PHP_X_MD5`` array and update all the md5 sums

- d. set ``$PHP_X_RC`` to false!
+ d. ``$PHP_X_SHA256`` array and update all the SHA256 sums

- e. Make sure there are no outdated "notes" or edited "date" keys in the
+ e. set ``$PHP_X_RC`` to false!
+
+ f. Make sure there are no outdated "notes" or edited "date" keys in the
 ``$RELEASES[X][$PHP_X_VERSION]["source"]`` array

- f. if the windows builds aren't ready yet prefix the "windows" key with a dot (".windows")
+ g. if the windows builds aren't ready yet prefix the "windows" key with a dot (".windows")

-3. Update phpweb/include/releases.php with the old release info
-  (updates the download archives)
+3. Create the release file (releases/x_y_z.php)
+   Usually we use the same content as for point 6, but included in php template
+   instead of the release xml.

 4. Update php-qa/include/release-qa.php and add the next version as an QARELEASE
   (prepare for next RC)
@@ -263,9 +266,14 @@ to upgrade.

 8. Commit all the changes to their respective git repos

-9. Wait an hour or two, then send a mail to php-announce@lists.php.net,
+9. Please note down the sha256 and the PGP signature (.asc). These *must* be
+   included in the release mail.
+10. Wait an hour or two, then send a mail to php-announce@lists.php.net,
 php-general@lists.php.net and internals@lists.php.net with a text similar to
 http://news.php.net/php.internals/17222.
+Please make sure that the mail to php-announce@ is its own completely seperate email.
+This is to make sure that repiles to the announcement on php-general@ or internals@
+will not accidentally hit the php-announce@ mailinglist.

 Re-releasing the same version (or -pl)
 --------------------------------------
@@ -282,7 +290,9 @@ Re-releasing the same version (or -pl)

 d. ``$PHP_X_MD5`` array and update all the md5 sums

- e. Make sure there are no outdated "notes" or edited "date" keys in the
+ e. ``$PHP_X_SHA256`` array and update all the SHA256 sums
+
+ f. Make sure there are no outdated "notes" or edited "date" keys in the
 ``$RELEASES[X][$PHP_X_VERSION]["source"]`` array

 3. Add a short notice to phpweb stating that there is a new release, and
@@ -299,3 +309,6 @@ to upgrade.
 5. Wait an hour or two, then send a mail to php-announce@lists.php.net,
 php-general@lists.php.net and internals@lists.php.net with a text similar to
 the news entry.
+Please make sure that the mail to php-announce@ is its own completely seperate email.
+This is to make sure that repiles to the announcement on php-general@ or internals@
+will not accidentally hit the php-announce@ mailinglist.
@@ -104,7 +104,8 @@ The php file will be generated always.
 NOTE: You can set environment variable TEST_PHP_DETAILED to enable
 detailed test information.

-[Automated testing]
+[Automated Testing]
+--------------
 If you like to keep up to speed, with latest developments and quality
 assurance, setting the environment variable NO_INTERACTION to 1, will not
 prompt the tester for any user input.
@@ -142,7 +143,7 @@ then
 fi
 ========== end of qa-test.sh =============

-NOTE: the exit status of run-tests.php will be 1 when
+NOTE: The exit status of run-tests.php will be 1 when
 REPORT_EXIT_STATUS is set. The result of "make test" may be higher
 than that. At present, gmake 3.79.1 returns 2, so it is
 advised to test for non-zero, rather then a specific value.
@@ -4,7 +4,7 @@ The PHP Interpreter
 This is the github mirror of the official PHP repository located at
 http://git.php.net.

-[![Build Status](https://secure.travis-ci.org/php/php-src.png?branch=master)](http://travis-ci.org/php/php-src)
+[![Build Status](https://secure.travis-ci.org/php/php-src.svg?branch=master)](http://travis-ci.org/php/php-src)

 Pull Requests
 =============
@@ -277,7 +277,10 @@ static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_

 	TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Creating data structures for thread %x", thread_id));
 	(*thread_resources_ptr) = (tsrm_tls_entry *) malloc(sizeof(tsrm_tls_entry));
-	(*thread_resources_ptr)->storage = (void **) malloc(sizeof(void *)*id_count);
+	(*thread_resources_ptr)->storage = NULL;
+	if (id_count > 0) {
+		(*thread_resources_ptr)->storage = (void **) malloc(sizeof(void *)*id_count);
+	}
 	(*thread_resources_ptr)->count = id_count;
 	(*thread_resources_ptr)->thread_id = thread_id;
 	(*thread_resources_ptr)->next = NULL;
@@ -435,7 +438,7 @@ void *tsrm_new_interpreter_context(void)
 	current = tsrm_tls_get();

 	allocate_new_resource(&new_ctx, thread_id);
-	
+
 	/* switch back to the context that was in use prior to our creation
 	 * of the new one */
 	return tsrm_set_interpreter_context(current);
@@ -613,7 +616,7 @@ TSRM_API MUTEX_T tsrm_mutex_alloc(void)
 #elif defined(BETHREADS)
 	mutexp = (beos_ben*)malloc(sizeof(beos_ben));
 	mutexp->ben = 0;
-	mutexp->sem = create_sem(1, "PHP sempahore"); 
+	mutexp->sem = create_sem(1, "PHP sempahore");
 #endif
 #ifdef THR_DEBUG
 	printf("Mutex created thread: %d\n",mythreadid());
@@ -642,7 +645,7 @@ TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
 		st_mutex_destroy(mutexp);
 #elif defined(BETHREADS)
 		delete_sem(mutexp->sem);
-		free(mutexp);  
+		free(mutexp);
 #endif
 	}
 #ifdef THR_DEBUG
@@ -676,8 +679,8 @@ TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
 #elif defined(TSRM_ST)
 	return st_mutex_lock(mutexp);
 #elif defined(BETHREADS)
-	if (atomic_add(&mutexp->ben, 1) != 0)  
-		return acquire_sem(mutexp->sem);   
+	if (atomic_add(&mutexp->ben, 1) != 0)
+		return acquire_sem(mutexp->sem);
 	return 0;
 #endif
 }
@@ -708,9 +711,9 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
 #elif defined(TSRM_ST)
 	return st_mutex_unlock(mutexp);
 #elif defined(BETHREADS)
-	if (atomic_add(&mutexp->ben, -1) != 1) 
+	if (atomic_add(&mutexp->ben, -1) != 1)
 		return release_sem(mutexp->sem);
-	return 0;   
+	return 0;
 #endif
 }

@@ -795,7 +798,7 @@ void tsrm_error_set(int level, char *debug_filename)
 #endif
 }

-TSRM_API inline void *tsrm_get_ls_cache(void)
+TSRM_API void *tsrm_get_ls_cache(void)
 {
 	return tsrm_tls_get();
 }
@@ -20,6 +20,8 @@
 # include <tsrm_config.h>
 #endif

+#include "main/php_stdint.h"
+
 #ifdef TSRM_WIN32
 #	ifdef TSRM_EXPORTS
 #		define TSRM_API __declspec(dllexport)
@@ -32,13 +34,8 @@
 #	define TSRM_API
 #endif

-#ifdef _WIN64
-typedef __int64 tsrm_intptr_t;
-typedef unsigned __int64 tsrm_uintptr_t;
-#else
-typedef long tsrm_intptr_t;
-typedef unsigned long tsrm_uintptr_t;
-#endif
+typedef intptr_t tsrm_intptr_t;
+typedef uintptr_t tsrm_uintptr_t;

 /* Only compile multi-threading functions if we're in ZTS mode */
 #ifdef ZTS
@@ -56,7 +53,7 @@ typedef unsigned long tsrm_uintptr_t;
 #elif defined(TSRM_ST)
 # include <st.h>
 #elif defined(BETHREADS)
-#include <kernel/OS.h> 
+#include <kernel/OS.h>
 #include <TLS.h>
 #endif

@@ -87,7 +84,7 @@ typedef struct {
  sem_id sem;
  int32 ben;
 } beos_ben;
-# define MUTEX_T beos_ben * 
+# define MUTEX_T beos_ben *
 #endif

 #ifdef HAVE_SIGNAL_H
@@ -155,7 +152,7 @@ TSRM_API void *tsrm_new_interpreter_context(void);
 TSRM_API void *tsrm_set_interpreter_context(void *new_ctx);
 TSRM_API void tsrm_free_interpreter_context(void *context);

-TSRM_API inline void *tsrm_get_ls_cache(void);
+TSRM_API void *tsrm_get_ls_cache(void);

 #ifdef TSRM_WIN32
 # define TSRM_TLS __declspec(thread)
@@ -171,15 +168,19 @@ TSRM_API inline void *tsrm_get_ls_cache(void);
 #define TSRMG(id, type, element)	(((type) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element)

 #define TSRMG_STATIC(id, type, element)	(((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element)
-#define TSRMLS_CACHE_EXTERN extern TSRM_TLS void *TSRMLS_CACHE
-#define TSRMLS_CACHE_DEFINE TSRM_TLS void *TSRMLS_CACHE = NULL
-#define TSRMLS_CACHE_UPDATE if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache()
+#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE
+#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL
+#if ZEND_DEBUG
+#define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache()
+#else
+#define TSRMLS_CACHE_UPDATE() if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache()
+#endif
 #define TSRMLS_CACHE _tsrm_ls_cache

 /* BC only */
 #define TSRMLS_D void
 #define TSRMLS_DC
-#define TSRMLS_C	
+#define TSRMLS_C
 #define TSRMLS_CC
 #define TSRMLS_FETCH()

@@ -194,9 +195,9 @@ TSRM_API inline void *tsrm_get_ls_cache(void);
 #define TSRMLS_SET_CTX(ctx)

 #define TSRMG_STATIC(id, type, element)
-#define TSRMLS_CACHE_EXTERN
-#define TSRMLS_CACHE_DEFINE
-#define TSRMLS_CACHE_UPDATE
+#define TSRMLS_CACHE_EXTERN()
+#define TSRMLS_CACHE_DEFINE()
+#define TSRMLS_CACHE_UPDATE()
 #define TSRMLS_CACHE

 /* BC only */
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2014 The PHP Group                                |
+   | Copyright (c) 1997-2015 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2014 The PHP Group                                |
+   | Copyright (c) 1997-2015 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -56,7 +56,7 @@ main()
 		printf ("Token = '%s'\n", token);
 		token = tsrm_strtok_r(NULL, "/\\", &last);
 	}
-	
+
 	return 0;
 }

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2014 The PHP Group                                |
+   | Copyright (c) 1997-2015 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -43,7 +43,7 @@ static tsrm_win32_globals win32_globals;
 static void tsrm_win32_ctor(tsrm_win32_globals *globals)
 {
 #ifdef ZTS
-TSRMLS_CACHE_UPDATE;
+TSRMLS_CACHE_UPDATE();
 #endif
 	globals->process = NULL;
 	globals->shm	 = NULL;
@@ -52,7 +52,7 @@ TSRMLS_CACHE_UPDATE;
 	globals->comspec = _strdup((GetVersion()<0x80000000)?"cmd.exe":"command.com");

 	/* Set it to INVALID_HANDLE_VALUE
-	 * It will be initialized correctly in tsrm_win32_access or set to 
+	 * It will be initialized correctly in tsrm_win32_access or set to
 	 * NULL if no impersonation has been done.
 	 * the impersonated token can't be set here as the impersonation
 	 * will happen later, in fcgi_accept_request (or whatever is the
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2014 The PHP Group                                |
+   | Copyright (c) 1997-2015 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -72,7 +72,7 @@ typedef struct {

 #ifdef ZTS
 # define TWG(v) TSRMG_STATIC(win32_globals_id, tsrm_win32_globals *, v)
-TSRMLS_CACHE_EXTERN;
+TSRMLS_CACHE_EXTERN();
 #else
 # define TWG(v) (win32_globals.v)
 #endif
@@ -1,4 +1,4 @@
-$Id$
+$Id$

 PHP X.Y UPGRADE NOTES

@@ -9,7 +9,7 @@ PHP X.Y UPGRADE NOTES
 5. Changed Functions
 6. New Functions
 7. New Classes and Interfaces
-8. Removed Extensions
+8. Removed Extensions and SAPIs
 9. Other Changes to Extensions
 10. New Global Constants
 11. Changes to INI File Handling
@@ -21,32 +21,432 @@ PHP X.Y UPGRADE NOTES
 1. Backward Incompatible Changes
 ========================================

- Core
-  . list() now always supports ArrayAccess and never supports strings.
-    Previously both were accepted in some situations and not in others.
-    (RFC: https://wiki.php.net/rfc/fix_list_behavior_inconsistency)
-  . Bitwise shifts by negative numbers of bits are disallowed (throws E_WARNING
-    and gives FALSE, like a division by zero).
-  . Left bitwise shifts by a number of bits beyond the bit width of an integer
-    will always result in 0, even on CPUs which wrap around.
-  . Right bitwise shifts by a number of bits beyond the bit width of an integer
-    will always result in 0 or -1 (depending on sign), even on CPUs which wrap
-    around.
+Language changes
+================
+
+Changes to variable handling
+----------------------------
+
+* Indirect variable, property and method references are now interpreted with
+  left-to-right semantics. Some examples:
+
+      $$foo['bar']['baz'] // interpreted as ($$foo)['bar']['baz']
+      $foo->$bar['baz']   // interpreted as ($foo->$bar)['baz']
+      $foo->$bar['baz']() // interpreted as ($foo->$bar)['baz']()
+      Foo::$bar['baz']()  // interpreted as (Foo::$bar)['baz']()
+
+  To restore the previous behavior add explicit curly braces:
+
+      ${$foo['bar']['baz']}
+      $foo->{$bar['baz']}
+      $foo->{$bar['baz']}()
+      Foo::{$bar['baz']}()
+      
+* The global keyword now only accepts simple variables. Instead of
+
+      global $$foo->bar;
+
+  it is now required to write the following:
+
+      global ${$foo->bar};
+
+* Parentheses around variables or function calls no longer have any influence
+  on behavior. For example the following code, where the result of a function
+  call is passed to a by-reference function
+
+      function getArray() { return [1, 2, 3]; }
+
+      $last = array_pop(getArray());
+      // Strict Standards: Only variables should be passed by reference
+      $last = array_pop((getArray()));
+      // Strict Standards: Only variables should be passed by reference
+
+  will now throw a strict standards error regardless of whether parentheses
+  are used. Previously no notice was generated in the second case.
+
+* Array elements or object properties that are automatically created during
+  by-reference assignments will now result in a different order. For example
+
+      $array = [];
+      $array["a"] =& $array["b"];
+      $array["b"] = 1;
+      var_dump($array);
+
+  now results in the array ["a" => 1, "b" => 1], while previously the result
+  was ["b" => 1, "a" => 1];
+
+Relevant RFCs:
+* https://wiki.php.net/rfc/uniform_variable_syntax
+* https://wiki.php.net/rfc/abstract_syntax_tree
+
+Changes to list()
+-----------------
+
+* list() will no longer assign variables in reverse order. For example
+
+      list($array[], $array[], $array[]) = [1, 2, 3];
+      var_dump($array);
+
+  will now result in $array == [1, 2, 3] rather than [3, 2, 1]. Note that only
+  the **order** of the assignments changed, but the assigned values stay the
+  same. E.g. a normal usage like
+
+      list($a, $b, $c) = [1, 2, 3];
+      // $a = 1; $b = 2; $c = 3;
+  
+  will retain its current behavior.
+
+* Empty list() assignments are no longer allowed. As such all of the following
+  are invalid:
+
+      list() = $a;
+      list(,,) = $a;
+      list($x, list(), $y) = $a;
+
+* list() no longer supports unpacking strings (while previously this was only
+  supported in some cases). The code
+
+      $string = "xy";
+      list($x, $y) = $string;
+
+  will now result in $x == null and $y == null (without notices) instead of
+  $x == "x" and $y == "y". Furthermore list() is now always guaranteed to
+  work with objects implementing ArrayAccess, e.g.
+
+      list($a, $b) = (object) new ArrayObject([0, 1]);
+
+  will now result in $a == 0 and $b == 1. Previously both $a and $b were null.
+
+Relevant RFCs:
+* https://wiki.php.net/rfc/abstract_syntax_tree#changes_to_list
+* https://wiki.php.net/rfc/fix_list_behavior_inconsistency
+
+Changes to foreach
+------------------
+
+* Iteration with foreach() no longer has any effect on the internal array
+  pointer, which can be accessed through the current()/next()/etc family of
+  functions. For example
+
+      $array = [0, 1, 2];
+      foreach ($array as &$val) {
+          var_dump(current($array));
+      }
+
+  will now print the value int(0) three times. Previously the output was int(1),
+  int(2) and bool(false).
+
+* When iterating arrays by-value, foreach will now always operate on a copy of
+  the array, as such changes to the array during iteration will not influence
+  iteration behavior. For example
+
+      $array = [0, 1, 2];
+      $ref =& $array; // Necessary to trigger the old behavior
+      foreach ($array as $val) {
+          var_dump($val);
+          unset($array[1]);
+      }
+
+  will now print all three elements (0 1 2), while previously the second element
+  1 was skipped (0 2).
+
+* When iterating arrays by-reference, modifications to the array will continue
+  to influence the iteration. However PHP will now do a better job of
+  maintaining a correct position in a number of cases. E.g. appending to an
+  array during by-reference iteration
+
+      $array = [0];
+      foreach ($array as &$val) {
+          var_dump($val);
+          $array[1] = 1;
+      }
+
+  will now iterate over the appended element as well. As such the output of this
+  example will now be "int(0) int(1)", while previously it was only "int(0)".
+
+* Iteration of plain (non-Traversable) objects by-value or by-reference will
+  behave like by-reference iteration of arrays. This matches the previous
+  behavior apart from the more accurate position management mentioned in the
+  previous point.
+
+* Iteration of Traversable objects remains unchanged.
+
+Relevant RFC: https://wiki.php.net/rfc/php7_foreach
+
+Changes to parameter handling
+-----------------------------
+
+* It is no longer possible to define two function parameters with the same name.
+  For example, the following method will trigger a compile-time error:
+
+      public function foo($a, $b, $unused, $unused) {
+          // ...
+      }
+
+  Code like this should be changed to use distinct parameter names, for example:
+
+      public function foo($a, $b, $unused1, $unused2) {
+          // ...
+      }
+
+* The func_get_arg() and func_get_args() functions will no longer return the
+  original value that was passed to a parameter and will instead provide the
+  current value (which might have been modified). For example
+
+      function foo($x) {
+          $x++;
+          var_dump(func_get_arg(0));
+      }
+      foo(1);
+
+  will now print "2" instead of "1". This code should be changed to either
+  perform modifications only after calling func_get_arg(s)
+
+      function foo($x) {
+          var_dump(func_get_arg(0));
+          $x++;
+      }
+
+  or avoid modifying the parameters altogether:
+
+      function foo($x) {
+          $newX = $x + 1;
+          var_dump(func_get_arg(0));
+      }
+
+* Similarly exception backtraces will no longer display the original value that
+  was passed to a function and show the modified value instead. For example
+
+      function foo($x) {
+          $x = 42;
+          throw new Exception;
+      }
+      foo("string");
+
+  will now result in the stack trace
+
+      Stack trace:
+      #0 file.php(4): foo(42)
+      #1 {main}
+
+  while previously it was:
+
+      Stack trace:
+      #0 file.php(4): foo('string')
+      #1 {main}
+
+  While this should not impact runtime behavior of your code, it is worthwhile
+  to be aware of this difference for debugging purposes.
+
+  The same limitation also applies to debug_backtrace() and other functions
+  inspecting function arguments.
+
+Relevant RFC: https://wiki.php.net/phpng
+
+Changes to integer handling
+---------------------------
+
+* Invalid octal literals (containing digits larger than 7) now produce compile
+  errors. For example, the following is no longer valid:
+  
+      $i = 0781; // 8 is not a valid octal digit!
+
+  Previously the invalid digits (and any following valid digits) were simply
+  ignored. As such $i previously held the value 7, because the last two digits
+  were silently discarded.
+
+* Bitwise shifts by negative numbers will now throw an ArithmeticError:
+
+      var_dump(1 >> -1);
+      // ArithmeticError: Bit shift by negative number
+
+* Left bitwise shifts by a number of bits beyond the bit width of an integer
+  will always result in 0:
+
+      var_dump(1 << 64); // int(0)
+
+  Previously the behavior of this code was dependent on the used CPU
+  architecture. For example on x86 (including x86-64) the result was int(1),
+  because the shift operand was wrapped.
+
+* Similarly right bitwise shifts by a number of bits beyond the bit width of an
+  integer will always result in 0 or -1 (depending on sign):
+
+      var_dump(1 >> 64);  // int(0)
+      var_dump(-1 >> 64); // int(-1)
+
+Relevant RFC: https://wiki.php.net/rfc/integer_semantics
+
+Changes to string handling
+--------------------------
+
+* Strings that contain hexadecimal numbers are no longer considered to be
+  numeric and don't receive special treatment anymore. Some examples of the
+  new behavior:
+
+      var_dump("0x123" == "291");     // bool(false)     (previously true)
+      var_dump(is_numeric("0x123"));  // bool(false)     (previously true)
+      var_dump("0xe" + "0x1");        // int(0)          (previously 16)
+
+      var_dump(substr("foo", "0x1")); // string(3) "foo" (previously "oo")
+      // Notice: A non well formed numeric value encountered
+
+  filter_var() can be used to check if a string contains a hexadecimal number
+  or convert such a string into an integer:
+
+    $str = "0xffff";
+    $int = filter_var($str, FILTER_VALIDATE_INT, FILTER_FLAG_ALLOW_HEX);
+    if (false === $int) {
+        throw new Exception("Invalid integer!");
+    }
+    var_dump($int); // int(65535)
+
+* Due to the addition of the Unicode Codepoint Escape Syntax for double-quoted
+  strings and heredocs, "\u{" followed by an invalid sequence will now result in
+  an error:
+
+      $str = "\u{xyz}"; // Fatal error: Invalid UTF-8 codepoint escape sequence
+
+  To avoid this the leading backslash should be escaped:
+
+      $str = "\\u{xyz}"; // Works fine
+
+  However, "\u" without a following { is unaffected. As such the following code
+  won't error and will work the same as before:
+
+      $str = "\u202e"; // Works fine
+
+Relevant RFCs:
+* https://wiki.php.net/rfc/remove_hex_support_in_numeric_strings
+* https://wiki.php.net/rfc/unicode_escape
+
+Changes to error handling
+-------------------------
+
+* There are now two exception classes: Exception and Error. Both classes
+  implement a new interface Throwable. Type hints in exception handling code
+  may need to be changed to account for this.
+
+* Some fatal errors and recoverable fatal errors now throw an Error instead.
+  As Error is a separate class from Exception, these exceptions will not be
+  caught by existing try/catch blocks.
+
+  For the recoverable fatal errors which have been converted into an exception,
+  it is no longer possible to silently ignore the error from an error handler.
+  In particular, it is no longer possible to ignore type hint failures.
+
+* Parser errors now generate a ParseError that extends Error. Error
+  handling for eval()s on potentially invalid code should be changed to catch
+  ParseError in addition to the previous return value / error_get_last()
+  based handling.
+
+* Constructors of internal classes will now always throw an exception on
+  failure. Previously some constructors returned NULL or an unusable object.
+
+* The error level of some E_STRICT notices has been changed.
+
+Relevant RFCs:
+* https://wiki.php.net/rfc/engine_exceptions_for_php7
+* https://wiki.php.net/rfc/throwable-interface
+* https://wiki.php.net/rfc/internal_constructor_behaviour
+* https://wiki.php.net/rfc/reclassify_e_strict
+
+Other language changes
+----------------------
+
+* Removed support for static calls to non-static calls form an incompatible
+  $this context. In this case $this will not be defined, but the call will be
+  allowed with a deprecation notice. An example:
+
+      class A {
+          public function test() { var_dump($this); }
+      }
+
+      // Note: Does NOT extend A
+      class B {
+          public function callNonStaticMethodOfA() { A::test(); }
+      }
+      
+      (new B)->callNonStaticMethodOfA();
+
+      // Deprecated: Non-static method A::test() should not be called statically
+      // Notice: Undefined variable $this
+      NULL
+
+  Note that this only applies to calls from an incompatible context. If class B
+  extended from A the call would be allowed without any notices.
+
+* It is no longer possible to use the following class, interface and trait names
+  (case-insensitive):
+
+      bool
+      int
+      float
+      string
+      null
+      false
+      true
+
+  This applies to class/interface/trait declarations, class_alias() and use
+  statements.
+
+  Furthermore the following class, interface and trait names are now reserved
+  for future use, but do not yet throw an error when used:
+
+      resource
+      object
+      mixed
+      numeric
+
+* The yield language construct no longer requires parentheses when used in an
+  expression context. It is now a right-associative operator with precedence
+  between the "print" and "=>" operators. This can result in different behavior
+  in some cases, for example:
+
+      echo yield -1;
+      // Was previously interpreted as
+      echo (yield) - 1;
+      // And is now interpreted as
+      echo yield (-1);
+
+      yield $foo or die;
+      // Was previously interpreted as
+      yield ($foo or die);
+      // And is now interpreted as
+      (yield $foo) or die;
+
+  Such cases can always be resolved by adding additional parentheses.
+
  . Removed ASP (<%) and script (<script language=php>) tags.
    (RFC: https://wiki.php.net/rfc/remove_alternative_php_tags)
+  . Removed support for assigning the result of new by reference.
+  . Removed support for scoped calls to non-static methods from an incompatible
+    $this context. See details in https://wiki.php.net/rfc/incompat_ctx.
+  . Removed support for #-style comments in ini files. Use ;-style comments
+    instead.
+  . $HTTP_RAW_POST_DATA is no longer available. Use the php://input stream instead.
+
+Standard library changes
+========================
+
  . call_user_method() and call_user_method_array() no longer exists.
-  . PHP 7 doesn't keep original values of arguments passed to user functions,
-    so func_get_arg() and func_get_args() will return current value of argument
-    instead of the actually passed. The following code is going to be affected:
-    function foo($x) { $x = 2; return func_get_arg(0);} var_dump(foo(1));
-    It will now produce 2, not 1.
-  . Function parameters with duplicate name are not allowed anymore. Definitions
-    like “function foo($x,$x) {}” will lead to compile time error.
-  . Indirect variable, property and method references are now interpreted with
-    left-to-right semantics. See details in:
-	https://wiki.php.net/rfc/uniform_variable_syntax#semantic_differences_in_existing_syntax 
-  . The global keyword now only accepts simple variables. See details in:
-    https://wiki.php.net/rfc/uniform_variable_syntax#global_keyword_takes_only_simple_variables
+  . ob_start() no longer issues an E_ERROR, but instead an E_RECOVERABLE_ERROR in case an 
+    output buffer is created in an output buffer handler.
+  . Improved zend_qsort(using hybrid sorting algo) for better performance,
+    and also renamed zend_qsort to zend_sort.
+  . Added stable sorting algo zend_insert_sort.
+  . Removed dl() function on fpm-fcgi.
+  . setcookie() with an empty cookie name now issues a WARNING and doesn't send an empty set-cookie header line anymore.
+
+Other
+=====
+
+- Curl:
+  . Removed support for disabling the CURLOPT_SAFE_UPLOAD option. All curl file
+    uploads must use the curl_file / CURLFile APIs.
+
+- Date:
+  . Removed $is_dst parameter from mktime() and gmmktime().

 - DBA
  . dba_delete() now returns false if the key was not found for the inifile
@@ -57,18 +457,125 @@ PHP X.Y UPGRADE NOTES
  . gmp_setbit() and gmp_clrbit() now return FALSE for negative indices, making
    them consistent with other GMP functions.

+- Intl:
+  . Removed deprecated aliases datefmt_set_timezone_id() and
+    IntlDateFormatter::setTimeZoneID(). Use datefmt_set_timezone() and
+    IntlDateFormatter::setTimeZone() instead.
+
+- libxml:
+  . Added LIBXML_BIGLINES parser option. It's available starting with libxml 2.9.0
+    and adds suppport for line numbers >16-bit in the error reporting.
+
+- Mcrypt
+  . Removed deprecated mcrypt_generic_end() alias in favor of
+    mcrypt_generic_deinit().
+  . Removed deprecated mcrypt_ecb(), mcrypt_cbc(), mcrypt_cfb() and mcrypt_ofb()
+    functions in favor of mcrypt_encrypt() and mcrypt_decrypt() with an
+    MCRYPT_MODE_* flag.
+
+- Session
+  . session_start() accepts all INI settings as array. e.g. ['cache_limiter'=>'private']
+    sets session.cache_limiter=private. It also supports 'read_and_close' which closes
+    session data immediately after read data.
+  . Save handler accepts validate_sid(), update_timestamp() which validates session
+    ID existence, updates timestamp of session data. Compatibility of old user defined
+    save handler is retained.
+  . SessionUpdateTimestampHandlerInterface is added. validateSid(), updateTimestamp()
+    is defined in the interface.
+  . session.lazy_write(default=On) INI setting enables only write session data when
+    session data is updated.
+
+- Opcache
+  . Removed opcache.load_comments configuration directive. Now doc comments
+    loading costs nothing and always enabled.
+
+- OpenSSL:
+  . Removed the "rsa_key_size" SSL context option in favor of automatically
+    setting the appropriate size given the negotiated crypto algorithm.
+  . Removed "CN_match" and "SNI_server_name" SSL context options. Use automatic
+    detection or the "peer_name" option instead.
+
+- PCRE:
+  . Removed support for /e (PREG_REPLACE_EVAL) modifier. Use
+    preg_replace_callback() instead.
+
+- PDO_pgsql:
+  . Removed PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT attribute in favor of
+    ATTR_EMULATE_PREPARES.
+
+- Standard:
+  . Removed string category support in setlocale(). Use the LC_* constants
+    instead.
+  . Removed set_magic_quotes_runtime() and its alias magic_quotes_runtime().
+
+- JSON:
+  . Rejected RFC 7159 incompatible number formats in json_decode string -
+        top level (07, 0xff, .1, -.1) and all levels ([1.], [1.e1])
+  . Calling json_decode with 1st argument equal to empty PHP string or value that 
+    after casting to string is empty string (NULL, FALSE) results in JSON syntax error.
+
+- Stream:
+  . Removed set_socket_blocking() in favor of its alias stream_set_blocking().
+
+- XSL:
+  . Removed xsl.security_prefs ini option. Use XsltProcessor::setSecurityPrefs()
+    instead.
+
 ========================================
 2. New Features
 ========================================

 - Core
+  . Added group use declarations.
+    (RFC: https://wiki.php.net/rfc/group_use_declarations)
  . Added null coalesce operator (??).
    (RFC: https://wiki.php.net/rfc/isset_ternary)
-  . Support for strings with length >= 2^31 bytes in 64 bit builds
-  . Closure::call() method added
+  . Support for strings with length >= 2^31 bytes in 64 bit builds.
+  . Closure::call() method added (works only with userland classes).
+  . Added \u{xxxxxx} Unicode Codepoint Escape Syntax for double-quoted strings
+    and heredocs.
+  . define() now supports arrays as constant values, fixing an oversight where define() did not support arrays yet const syntax did.
+  . Added the comparison operator (<=>), aka the spaceship operator.
+    (RFC: https://wiki.php.net/rfc/combined-comparison-operator)
+  . Added the yield from operator for delegating Generators like coroutines.
+    (RFC: https://wiki.php.net/rfc/generator-delegation)
+  . Reserved keywords can now be used in various new contexts.
+    (RFC: https://wiki.php.net/rfc/context_sensitive_lexer)
+  . Added support for scalar type declarations and strict mode using
+    declare(strict_types=1) (RFC: https://wiki.php.net/rfc/scalar_type_hints_v5)
+  . Added support for cryptographically secure user land RNG
+    (RFC: https://wiki.php.net/rfc/easy_userland_csprng)

- Standard
-  . intdiv() function for integer division added.
+- Opcache
+  . Added second level file based opcode cache (experimental - disabled by
+    default). To enable it, PHP should be configured and built with 
+    --enable-opcache-file, then opcache.file_cache=<DIR> configuration directive
+    should be set in php.ini. The second level cache may improve performance
+    at server restart or SHM reset. In addition, it's possibe to use file cache
+    without SHM at all, using opcache.file_cache_only=1 (this may be useful for
+    sharing hosting), and disable file cache consistency check, to speedup
+    loading at the cost of safety, using opcache.file_cache_consistency_checks=0.
+
+- OpenSSL
+  . Added "alpn_protocols" SSL context option allowing encrypted client/server
+    streams to negotiate alternative protocols using the ALPN TLS extension when
+    built against OpenSSL 1.0.2 or newer. Negotiated protocol information is
+    accessible through stream_get_meta_data() output.
+
+- Reflection
+  . Added a ReflectionGenerator class (yield from Traces, current file/line,
+    etc.)
+  . Added a ReflectionType class to better support the new return type and
+    scalar type declarations features. The new ReflectionParameter::getType()
+    and ReflectionFunctionAbstract::getReturnType() methods both return an
+    instance of ReflectionType.
+
+- Stream:
+  . New Windows only stream context options was added to allow blocking reads
+    on pipes. To enable it, pass array("pipe" => array("blocking" => true))
+    when creating the stream context. Be aware, that this option can under
+    circumstances cause dead locks on the pipe buffer. However it can be useful
+    in several CLI use case scenarios.

 ========================================
 3. Changes in SAPI modules
@@ -82,6 +589,15 @@ PHP X.Y UPGRADE NOTES
 4. Deprecated Functionality
 ========================================

+- Core
+  . PHP 4 style constructors, where the constructor name is the same as the
+    class name, are now deprecated.
+  . Static calls to non-static methods are now deprecated.
+
+- OpenSSL
+  . The "capture_session_meta" SSL context option is now deprecated. Meta
+    data concerning active crypto on a stream resource is now accessible
+    through the return result from stream_get_meta_data().

 ========================================
 5. Changed Functions
@@ -89,19 +605,50 @@ PHP X.Y UPGRADE NOTES

 - parse_ini_file():
 - parse_ini_string():
-  Added scanner mode INI_SCANNER_TYPED to yield typed .ini values.
+  . Added scanner mode INI_SCANNER_TYPED to yield typed .ini values.
 - unserialize():
-  Added second parameter for unserialize function 
-  (RFC: https://wiki.php.net/rfc/secure_unserialize) allowing to specify
-  acceptable classes: 
-  unserialize($foo, ["allowed_classes" => ["MyClass", "MyClass2"]);
+  . Added second parameter for unserialize function 
+    (RFC: https://wiki.php.net/rfc/secure_unserialize) allowing to specify
+    acceptable classes: 
+    unserialize($foo, ["allowed_classes" => ["MyClass", "MyClass2"]]);

+- proc_open():
+  . The maximum number of pipes used by proc_open() was previously limited by
+  hardcoded value of 16. This limit is now removed and the number of pipes is
+  effectively limited by the amount of memory available to PHP.
+  . New Windows only configuration option "blocking_pipes" can be used to
+  force blocking reads on child process pipes. This covers several
+  edge cases in CLI usage however can lead to dead locks. Also, this
+  correlates with the new stream context options for pipes.
+
+- array_column():
+  The function now supports an array of objects as well as two-dimensional
+  arrays. Only public properties are considered, and objects that make use of
+  __get() for dynamic properties must also implement __isset().
+
+- stream_context_create()
+  It accepts now a Windows only configuration 
+  array("pipe" => array("blocking" => <boolean>))  which forces blocking reads
+  on pipes. This option should be used carefully because due to the
+  platform restrictions dead locks on pipe buffers are possible.

 ========================================
 6. New Functions
 ========================================
 - GMP
-  Added gmp_random_seed()
+  . Added gmp_random_seed().
+
+- PCRE:
+  . Added preg_replace_callback_array function
+    (RFC: https://wiki.php.net/rfc/preg_replace_callback_array)
+
+- Standard
+  . Added intdiv() function for integer division.
+  . Added error_clear_last() function to reset error state.
+
+- Zlib:
+  . Added deflate_init(), deflate_add(), inflate_init(), inflate_add()
+    functions allowing incremental/streaming compression/decompression.

 ========================================
 7. New Classes and Interfaces
@@ -109,14 +656,44 @@ PHP X.Y UPGRADE NOTES


 ========================================
-8. Removed Extensions
+8. Removed Extensions and SAPIs
 ========================================

+- sapi/aolserver
+- sapi/apache
+- sapi/apache_hooks
+- sapi/apache2filter
+- sapi/caudium
+- sapi/continuity
+- sapi/isapi
+- sapi/milter
+- sapi/nsapi
+- sapi/phttpd
+- sapi/pi3web
+- sapi/roxen
+- sapi/thttpd
+- sapi/tux
+- sapi/webjames
+- ext/mssql
+- ext/mysql
+- ext/sybase_ct
+- ext/ereg
+
+For more details see 
+
+https://wiki.php.net/rfc/removal_of_dead_sapis_and_exts
+https://wiki.php.net/rfc/remove_deprecated_functionality_in_php7
+
+NOTE: NSAPI was not voted in the RFC, however it was removed afterwards. It turned
+out, that the corresponding SDK isn't available anymore.

 ========================================
 9. Other Changes to Extensions
 ========================================

+- Mhash
+  Mhash is not an extension anymore, use function_exists("mhash") to check whether
+  it is avaliable.

 ========================================
 10. New Global Constants
@@ -125,6 +702,33 @@ PHP X.Y UPGRADE NOTES
 - Core
  . PHP_INT_MIN added.

+- Zlib
+  . These constants are added to control flush behavior with the new
+    incremental deflate_add() and inflate_add() functions:
+  . ZLIB_NO_FLUSH
+  . ZLIB_PARTIAL_FLUSH
+  . ZLIB_SYNC_FLUSH
+  . ZLIB_FULL_FLUSH
+  . ZLIB_BLOCK
+  . ZLIB_FINISH
+
+- GD
+  . T1Lib support removed, thus lifting the optional dependency on T1Lib, the
+    following is therefore not available anymore:
+
+    Functions:
+      - imagepsbbox()
+      - imagepsencodefont()
+      - imagepsextendedfont()
+      - imagepsfreefont()
+      - imagepsloadfont()
+      - imagepsslantfont()
+      - imagepstext()
+
+    Resources:
+      - 'gd PS font'
+      - 'gd PS encoding'
+
 ========================================
 11. Changes to INI File Handling
 ========================================
@@ -132,14 +736,25 @@ PHP X.Y UPGRADE NOTES
 - Core
  . Removed asp_tags ini directive. Trying to enable it will result in a fatal
    error.
+  . Removed always_populate_raw_post_data ini directive.

 ========================================
 12. Windows Support
 ========================================

 - Core
-  . Support for native 64 bit integers in 64 bit builds
-  . Support for large files in 64 bit builds
+  . Support for native 64 bit integers in 64 bit builds.
+  . Support for large files in 64 bit builds.
+  . Support for getrusage()
+
+- ftp
+  . The ftp extension is always shipped shared
+  . For SSL support, the dependency on the openssl extension was abolished. Instead
+    it depends alone on the openssl library. If it's present at the compile time,
+    ftp_ssl_connect() is enabled automatically.
+
+- odbc
+  . The odbc extension is always shipped shared

 ========================================
 13. Other Changes
@@ -147,6 +762,10 @@ PHP X.Y UPGRADE NOTES

 - Core
  . Instead of being undefined and platform-dependent, NaN and Infinity will
-    always be zero when casted to integer.
-  . Calling a method on a non-object no longer raises a fatal error; see
-    also: https://wiki.php.net/rfc/catchable-call-to-member-of-non-object
+    always be zero when cast to integer.
+  . Calling a method on a non-object now raises a catchable error instead of a
+    fatal error; see: https://wiki.php.net/rfc/catchable-call-to-member-of-non-object
+  . Error messages for zend_parse_parameters, type hints and conversions now
+    always say "integer" and "float" instead of "long" and "double".
+  . Output buffering now continues to work for an aborted connection if
+    ignore_user_abort is set to true.
@@ -2,6 +2,7 @@ $Id$

 PHP 7.0 INTERNALS UPGRADE NOTES

+0. Wiki Examples
 1. Internal API changes
  e. New data types
  f. zend_parse_parameters() specs
@@ -15,17 +16,30 @@ PHP 7.0 INTERNALS UPGRADE NOTES
  n. ZEND_ENGINE_2 removal
  o. Updated final class modifier
  p. TSRM changes
+  q. gc_collect_cycles() is now hookable
+  r. PDO uses size_t for lengths
+  s. Resource API changes
+  t. Optimized strings concatenation.
+  u. Streams changes

 2. Build system changes
  a. Unix build system changes
  b. Windows build system changes

+3. Module changes
+
+================
+0. Wiki Examples
+================
+
+The wiki contains multiple examples and further explanations of the internal
+changes. See: https://wiki.php.net/phpng-upgrading
+

 ========================
 1. Internal API changes
 ========================

-  a. zend_set_memory_limit() now takes the TSRMLS_CC macro as its last argument
  e. New data types

     String
@@ -69,15 +83,15 @@ PHP 7.0 INTERNALS UPGRADE NOTES
  g. sprintf() formats

       New printf modifier 'p' was implemented to platform independently output zend_long,
-       zend_ulong and php_size_t datatypes. That modifier can be used with'd', 'u', 'x' and 'o'
+       zend_ulong and php_size_t datatypes. That modifier can be used with 'd', 'u', 'x' and 'o'
       printf format specs with spprintf, snprintf and the wrapping printf implementations.
       %pu is sufficient for both zend_ulong and php_size_t. the code using %p spec to output
       pointer address might need to be enclosed into #ifdef when it unlickily followed by 'd',
       'u', 'x' or 'o'.

       The only exceptions are the snprintf and zend_sprintf functions yet, because in some cases
-       they can use the implemenations available on the system, not the PHP one. Fro snprintf the
-       the macros ZEND_INT_FMT ZEND_UINT_FMT should be used.
+       they can use the implemenations available on the system, not the PHP one. With snprintf the
+       macros ZEND_INT_FMT and ZEND_UINT_FMT should be used.

  h. HashTable API

@@ -105,6 +119,10 @@ PHP 7.0 INTERNALS UPGRADE NOTES
      -                                                   ZEND_ULONG_MAX    replaces ULONG_MAX where appropriate
      -                                                   SIZEOF_ZEND_LONG  reworked SIZEOF_ZEND_LONG representing the size of zend_long datatype
      -                                                   ZEND_SIZE_MAX     Max value of size_t
+      -                                                   Z_L               casts an integral constant to zend_long
+      -                                                   Z_UL              casts an integral constant to zend_ulong
+
+      The macro ZEND_ENABLE_ZVAL_LONG64 reveals whether zval operates on 64 or 32 bit integer.

  k. The get_class_entry object handler is no longer available. Instead
     zend_object.ce is always used.
@@ -164,11 +182,42 @@ PHP 7.0 INTERNALS UPGRADE NOTES
     before any globals was accessed.

     Porting an extension or SAPI is usually as easy as removing all the TSRMLS_*
-     ocurrences and integrating the macros mentioned above. However if tsrm_ls
-     is used explicitly, its usage can considered obsolete in most cases.
+     occurrences and integrating the macros mentioned above. However if tsrm_ls
+     is used explicitly, its usage can be considered obsolete in most cases.
     Additionally, if an extension triggers its own threads, TSRMLS_CACHE shouldn't
     be passed to that threads directly.

+     When working with CTOR/DTOR for the extension globals, only the data passed
+     as parameters should be touched. For example, don't use code like
+     free(MYEXT_G(vars)); inside globals destructor, as it possibly can destroy
+     the data from a wrong thread. Instead use the pointer to the data delivered
+     into the destructor. So the previous example could look like
+     free(my_struct->vars); given the income was casted to (struct my_struct *).
+
+  q. gc_collect_cycles() is now a function pointer, and can be replaced in the
+     same manner as zend_execute_ex() if needed (for example, to include the
+     time spent in the garbage collector in a profiler). The default
+     implementation has been renamed to zend_gc_collect_cycles(), and is
+     exported with ZEND_API.
+
+  r. In accordance with general use of size_t as string length, all PDO API
+     functions now use size_t for string length.
+
+  s. Removed ZEND_REGISTER/FETCH_RESOURCE, use zend_fetch_resource and
+     and zend_register_resource instead, zend_fetch_resource accepts a zend_resource *
+     as first argument, if you still need to fetch a resource from zval, use 
+     zend_fetch_resource_ex. More details can be found in Zend/zend_list.c.
+
+  t. Optimized strings concatenation.
+     ZEND_ADD_STRING/VAR/CHAR are replaced with ZEND_ROPE_INIT, ZEND_ROPE_ADD,
+     ZEND_ROPE_END.
+     Instead of reallocation and copying string on each ZEND_ADD_STRING/VAR/CAHR,
+     collect all the strings and then allocate and construct the resulting string once.
+
+  u. Streams changes
+     - It is possible to do blocking reads on Windows pipes. It can be done either
+       using context stream option PHP_STREAM_OPTION_PIPE_BLOCKING or 
+       adding STREAM_USE_BLOCKING_PIPE when opening the stream.

 ========================
 2. Build system changes
@@ -193,3 +242,50 @@ PHP 7.0 INTERNALS UPGRADE NOTES
     - configure.js now produces response files which are passed to the linker
       and library manager. This solves the issues with the long command lines
       which can exceed the OS limit.
+
+     - with clang toolset, an option --with-uncritical-warn-choke is available,
+       which suppresses the most frequent false positive warnings
+
+     - the --with-mp option will by default utilize all the available cores. It's
+       enabled by default for release builds and can be disabled with the special
+       "disable" keyword.
+
+========================
+3. Module changes
+========================
+
+  Session:
+
+    - PS_MOD_UPDATE_TIMESTAMP() session save handler definition is added. New
+      save handler should use PS_MOD_UPDATE_TIMESTAMP() definition. Save handler
+      must not refer/change PS() variables directly from save handler. Use
+      parameters.
+    - PS_MOD()/PS_MOD_SID() macro exist only for transition. Beware these
+      save handlers are less secure and slower than PS_MOD_UPDATE_TIMESTAMP().
+    - PS(invalid_session_id) was removed. It was never worked as it supposed.
+      To report invalid session ID, use PS_VALIDATE_SID() handler.
+    - PS_VALIDATE_SID() defines session ID validation handler. This handler
+      must validate if requested session ID exists in session data storage or not.
+      Do not access PS(id) directly, but use this handler and it's parameter.
+    - PS_UPDATE_TIMESTAMP() defines timestamp updating handler. This handler
+      must update session data timestamp for GC if it is needed. e.g. Memcache
+      updates timestamp on read, so it does not need to update timestamp. Return
+      SUCCESS simply for this case.
+    - PS_CREATE_SID() should check session ID collision. Return NULL for failure.
+    - More documentation can be found in ext/session/mod_files.c as comments.
+      mod_files.c may be used as reference implementation.
+ 
+  Openssl:
+    - several ext/openssl functions require the inclusion of the applink shim
+      as documented in the OpenSSL FAQ https://www.openssl.org/support/faq.html#PROG2
+      to properly work on Windows. While this primarily affects the OpenSSL
+      functionality, the shim needs to be included into the executable file
+      which loads the extension DLL, not into the extension DLL itself. Alternatively
+      it can be compiled and linked with the main program as a separate object file.
+      More information and explanation in the linked OpenSSL FAQ.
+
+      Thus, this primarily affects any WAMP or other redistributions bundling the
+      official PHP release zipballs or building from sources. The applink shim is
+      already integrated with all the PHP executables from the official distribution
+      starting with 7.0.0beta1.
+
@@ -12,13 +12,13 @@ libZend_la_SOURCES=\
 	zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \
 	zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
 	zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
-	zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
-	zend_ini.c zend_qsort.c zend_objects.c zend_object_handlers.c \
+	zend_list.c zend_builtin_functions.c zend_sprintf.c \
+	zend_ini.c zend_sort.c zend_objects.c zend_object_handlers.c \
 	zend_objects_API.c zend_ts_hash.c zend_stream.c \
 	zend_default_classes.c \
 	zend_iterators.c zend_interfaces.c zend_exceptions.c \
 	zend_strtod.c zend_closures.c zend_float.c zend_string.c zend_signal.c \
-	zend_generators.c zend_virtual_cwd.c zend_ast.c
+	zend_generators.c zend_virtual_cwd.c zend_ast.c zend_smart_str.c

 libZend_la_CFLAGS = -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1
 libZend_la_LDFLAGS =
@@ -153,14 +153,6 @@ AC_ARG_ENABLE(debug,

 AC_DEFUN([LIBZEND_OTHER_CHECKS],[

-AC_ARG_WITH(zend-vm,
-[  --with-zend-vm=TYPE     Set virtual machine dispatch method. Type is
-                          one of "CALL", "SWITCH" or "GOTO" [TYPE=CALL]],[
-  PHP_ZEND_VM=$withval
-],[
-  PHP_ZEND_VM=CALL
-])
-
 AC_ARG_ENABLE(maintainer-zts,
 [  --enable-maintainer-zts Enable thread safety - for code maintainers only!!],[
  ZEND_MAINTAINER_ZTS=$enableval
@@ -176,9 +168,6 @@ AC_ARG_ENABLE(inline-optimization,
  ZEND_INLINE_OPTIMIZATION=yes
 ])

-AC_MSG_CHECKING([virtual machine dispatch method])
-AC_MSG_RESULT($PHP_ZEND_VM)
-
 AC_MSG_CHECKING(whether to enable thread-safety)
 AC_MSG_RESULT($ZEND_MAINTAINER_ZTS)

@@ -188,19 +177,6 @@ AC_MSG_RESULT($ZEND_INLINE_OPTIMIZATION)
 AC_MSG_CHECKING(whether to enable Zend debugging)
 AC_MSG_RESULT($ZEND_DEBUG)

-case $PHP_ZEND_VM in
-  SWITCH)
-    AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_SWITCH,[virtual machine dispatch method])
-    ;;
-  GOTO)
-    AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_GOTO,[virtual machine dispatch method])
-    ;;
-  *)
-    PHP_ZEND_VM=CALL
-    AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_CALL,[virtual machine dispatch method])
-    ;;
-esac
-
 if test "$ZEND_DEBUG" = "yes"; then
  AC_DEFINE(ZEND_DEBUG,1,[ ])
  echo " $CFLAGS" | grep ' -g' >/dev/null || DEBUG_CFLAGS="-g"
@@ -425,11 +401,65 @@ if test -r "/dev/urandom" && test -c "/dev/urandom"; then
  AC_MSG_RESULT(yes) 
 else 
  AC_MSG_RESULT(no) 
-  AC_MSG_CHECKING(whether /dev/arandom exists) 
-  if test -r "/dev/arandom" && test -c "/dev/arandom"; then 
-    AC_DEFINE([HAVE_DEV_ARANDOM], 1, [Define if the target system has /dev/arandom device])
-    AC_MSG_RESULT(yes) 
-  else 
-    AC_MSG_RESULT(no) 
-  fi 
+fi
+
+AC_MSG_CHECKING(whether /dev/arandom exists) 
+if test -r "/dev/arandom" && test -c "/dev/arandom"; then 
+  AC_DEFINE([HAVE_DEV_ARANDOM], 1, [Define if the target system has /dev/arandom device])
+  AC_MSG_RESULT(yes) 
+else 
+  AC_MSG_RESULT(no) 
 fi 
+
+AC_ARG_ENABLE(gcc-global-regs,
+[  --disable-gcc-global-regs 
+                          whether to enable GCC global register variables],[
+  ZEND_GCC_GLOBAL_REGS=$enableval
+],[
+  ZEND_GCC_GLOBAL_REGS=yes
+])
+AC_MSG_CHECKING(for global register variables support)
+if test "$ZEND_GCC_GLOBAL_REGS" != "no"; then
+  AC_TRY_COMPILE([
+  ],[
+#if defined(__GNUC__)
+# define ZEND_GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
+#else
+# define ZEND_GCC_VERSION 0
+#endif
+#if defined(__GNUC__) && ZEND_GCC_VERSION >= 4008 && defined(i386)
+# define ZEND_VM_FP_GLOBAL_REG "%esi"
+# define ZEND_VM_IP_GLOBAL_REG "%edi"
+#elif defined(__GNUC__) && ZEND_GCC_VERSION >= 4008 && defined(__x86_64__)
+# define ZEND_VM_FP_GLOBAL_REG "%r14"
+# define ZEND_VM_IP_GLOBAL_REG "%r15"
+#elif defined(__GNUC__) && ZEND_GCC_VERSION >= 4008 && defined(__powerpc64__)
+# define ZEND_VM_FP_GLOBAL_REG "r28"
+# define ZEND_VM_IP_GLOBAL_REG "r29"
+#else
+# error "global register variables are not supported"
+#endif
+typedef int (*opcode_handler_t)(void);
+register void *FP  __asm__(ZEND_VM_FP_GLOBAL_REG);
+register const opcode_handler_t *IP __asm__(ZEND_VM_IP_GLOBAL_REG);
+int emu(const opcode_handler_t *ip, void *fp) {
+	const opcode_handler_t *orig_ip = IP;
+	void *orig_fp = FP;
+	IP = ip;
+	FP = fp;
+	while ((*ip)());
+	FP = orig_fp;
+	IP = orig_ip;
+}
+  ], [
+    ZEND_GCC_GLOBAL_REGS=yes
+  ], [
+    ZEND_GCC_GLOBAL_REGS=no
+  ])
+fi
+if test "$ZEND_GCC_GLOBAL_REGS" = "yes"; then
+  AC_DEFINE([HAVE_GCC_GLOBAL_REGS], 1, [Define if the target system has support for global register variables])
+else
+  HAVE_GCC_GLOBAL_REGS=no
+fi
+AC_MSG_RESULT($ZEND_GCC_GLOBAL_REGS)
@@ -9,7 +9,7 @@ AC_DEFUN([LIBZEND_BISON_CHECK],[
  # non-working versions, e.g. "3.0 3.2";
  # remove "none" when introducing the first incompatible bison version an 
  # separate any following additions by spaces
-  bison_version_exclude="3.0"
+  bison_version_exclude=""

  # for standalone build of Zend Engine
  test -z "$SED" && SED=sed
@@ -90,10 +90,10 @@ int zend_sprintf(char *buffer, const char *format, ...);
 #define zend_isinf(a) 0
 #endif

-#ifdef HAVE_FINITE
-#define zend_finite(a) finite(a)
-#elif defined(HAVE_ISFINITE) || defined(isfinite)
+#if defined(HAVE_ISFINITE) || defined(isfinite)
 #define zend_finite(a) isfinite(a)
+#elif defined(HAVE_FINITE)
+#define zend_finite(a) finite(a)
 #elif defined(fpclassify)
 #define zend_finite(a) ((fpclassify((a))!=FP_INFINITE&&fpclassify((a))!=FP_NAN)?1:0)
 #else
@@ -41,11 +41,9 @@ bool(true)

 Notice: Constant test const already defined in %s on line %d
 bool(false)
+bool(true)

-Warning: Constants may only evaluate to scalar values in %s on line %d
-bool(false)
-
-Warning: Constants may only evaluate to scalar values in %s on line %d
+Warning: Constants may only evaluate to scalar values or arrays in %s on line %d
 bool(false)
 int(1)
 int(2)
@@ -30,10 +30,10 @@ var_dump(get_class($f2));
 echo "Done\n";
 ?>
 --EXPECTF--	
-Strict Standards: Non-static method foo::bar() should not be called statically in %s on line %d
+Deprecated: Non-static method foo::bar() should not be called statically in %s on line %d
 string(3) "foo"

-Strict Standards: Non-static method foo::bar() should not be called statically in %s on line %d
+Deprecated: Non-static method foo::bar() should not be called statically in %s on line %d
 string(3) "foo"
 string(3) "foo"
 string(3) "foo"
@@ -201,7 +201,7 @@ class Point
  var $y;
  var $lable;
  
-  function Point($x, $y) {
+  function __construct($x, $y) {
    $this->x = $x;
    $this->y = $y;
  }
@@ -1271,7 +1271,7 @@ bool(false)
 bool(true)
 array(3) {
  [0]=>
-  string(5) "Point"
+  string(11) "__construct"
  [1]=>
  string(8) "setLable"
  [2]=>
@@ -20,4 +20,7 @@ bool(true)

 Notice: Undefined offset: 2 in %s on line %d

-Fatal error: Function name must be a string in %s on line %d
+Fatal error: Uncaught Error: Function name must be a string in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
@@ -16,4 +16,7 @@ var_dump($x::$x);
 --EXPECTF--
 int(1)

-Fatal error: Access to undeclared static property: Closure::$x in %s on line %d
+Fatal error: Uncaught Error: Access to undeclared static property: Closure::$x in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
@@ -10,5 +10,4 @@ abstract class TestClass
 ===DONE===
 --EXPECTF--

-Strict Standards: Static function TestClass::getName() should not be abstract in %sabstract-static.php on line %d
 ===DONE===
@@ -10,4 +10,4 @@ final final class test {
 echo "Done\n";
 ?>
 --EXPECTF--	
-Parse error: %s error,%sexpecting %s in %s on line %d
+Fatal error: Multiple final modifiers are not allowed in %s on line %d
@@ -28,4 +28,9 @@ new c;

 ?>
 --EXPECTF--
-Fatal error: Call to private method d::test2() from context 'a' in %s on line %d
+Fatal error: Uncaught Error: Call to private method d::test2() from context 'a' in %s:%d
+Stack trace:
+#0 %s(%d): a->test()
+#1 %s(%d): c->__construct()
+#2 {main}
+  thrown in %s on line %d
@@ -0,0 +1,12 @@
+--TEST--
+Prevent abstract and final in the same class declaration
+--FILE--
+<?php
+
+final abstract class C {
+	private function priv() { }
+}
+
+?>
+--EXPECTF--
+Fatal error: Cannot use the final modifier on an abstract class in %s on line %d
@@ -8,12 +8,25 @@ $a = array(1,2,3);
 $o = new stdclass;
 $o->prop = "value";

+try {
+	var_dump($a + $o);
+} catch (Error $e) {
+	echo "\nException: " . $e->getMessage() . "\n";
+}
+
 $c = $a + $o;
 var_dump($c);

 echo "Done\n";
 ?>
 --EXPECTF--	
+Notice: Object of class stdClass could not be converted to int in %sadd_002.php on line %d
+
+Exception: Unsupported operand types
+
 Notice: Object of class stdClass could not be converted to int in %s on line %d

-Fatal error: Unsupported operand types in %s on line %d
+Fatal error: Uncaught Error: Unsupported operand types in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
@@ -8,12 +8,25 @@ $a = array(1,2,3);
 $o = new stdclass;
 $o->prop = "value";

+try {
+	var_dump($o + $a);
+} catch (Error $e) {
+	echo "\nException: " . $e->getMessage() . "\n";
+}
+
 $c = $o + $a;
 var_dump($c);

 echo "Done\n";
 ?>
 --EXPECTF--	
+Notice: Object of class stdClass could not be converted to int in %sadd_003.php on line %d
+
+Exception: Unsupported operand types
+
 Notice: Object of class stdClass could not be converted to int in %s on line %d

-Fatal error: Unsupported operand types in %s on line %d
+Fatal error: Uncaught Error: Unsupported operand types in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
@@ -5,10 +5,21 @@ adding numbers to arrays

 $a = array(1,2,3);

+try {
+	var_dump($a + 5);
+} catch (Error $e) {
+	echo "\nException: " . $e->getMessage() . "\n";
+}
+
 $c = $a + 5;
 var_dump($c);

 echo "Done\n";
 ?>
 --EXPECTF--	
-Fatal error: Unsupported operand types in %s on line %d
+Exception: Unsupported operand types
+
+Fatal error: Uncaught Error: Unsupported operand types in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
@@ -7,10 +7,21 @@ $a = array(1,2,3);

 $s1 = "some string";

+try {
+	var_dump($a + $s1);
+} catch (Error $e) {
+	echo "\nException: " . $e->getMessage() . "\n";
+}
+
 $c = $a + $s1;
 var_dump($c);

 echo "Done\n";
 ?>
 --EXPECTF--	
-Fatal error: Unsupported operand types in %s on line %d
+Exception: Unsupported operand types
+
+Fatal error: Uncaught Error: Unsupported operand types in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
@@ -0,0 +1,10 @@
+--TEST--
+declare bare anonymous class
+--FILE--
+<?php
+var_dump(new class{});
+--EXPECTF--
+object(class@%s)#%d (0) {
+}
+
+
@@ -0,0 +1,21 @@
+--TEST--
+declare anonymous class extending another
+--FILE--
+<?php
+class A{}
+
+interface B{
+    public function method();
+}
+
+$a = new class extends A implements B {
+    public function method(){
+        return true;
+    }
+};
+
+var_dump($a instanceof A, $a instanceof B);
+--EXPECTF--
+bool(true)
+bool(true)
+
@@ -0,0 +1,54 @@
+--TEST--
+reusing anonymous classes
+--FILE--
+<?php
+while (@$i++<10) {
+    var_dump(new class($i) {
+
+        public function __construct($i) {
+            $this->i = $i;
+        }
+    });
+}
+--EXPECTF--
+object(class@%s)#1 (1) {
+  ["i"]=>
+  int(1)
+}
+object(class@%s)#1 (1) {
+  ["i"]=>
+  int(2)
+}
+object(class@%s)#1 (1) {
+  ["i"]=>
+  int(3)
+}
+object(class@%s)#1 (1) {
+  ["i"]=>
+  int(4)
+}
+object(class@%s)#1 (1) {
+  ["i"]=>
+  int(5)
+}
+object(class@%s)#1 (1) {
+  ["i"]=>
+  int(6)
+}
+object(class@%s)#1 (1) {
+  ["i"]=>
+  int(7)
+}
+object(class@%s)#1 (1) {
+  ["i"]=>
+  int(8)
+}
+object(class@%s)#1 (1) {
+  ["i"]=>
+  int(9)
+}
+object(class@%s)#1 (1) {
+  ["i"]=>
+  int(10)
+}
+
@@ -0,0 +1,30 @@
+--TEST--
+testing anonymous inheritance
+--FILE--
+<?php
+class Outer {
+    protected $data;
+
+    public function __construct($data) {
+        $this->data = $data;
+    }
+
+    public function getArrayAccess() {
+        /* create a proxy object implementing array access */
+        return new class($this->data) extends Outer implements ArrayAccess {
+            public function offsetGet($offset)          { return $this->data[$offset]; }
+            public function offsetSet($offset, $data)   { return ($this->data[$offset] = $data); }
+            public function offsetUnset($offset)        { unset($this->data[$offset]); }
+            public function offsetExists($offset)       { return isset($this->data[$offset]); }
+        };
+    }
+}
+
+$outer = new Outer(array(
+    rand(1, 100)
+));
+
+/* not null because inheritance */
+var_dump($outer->getArrayAccess()[0]);
+--EXPECTF--
+int(%d)
@@ -0,0 +1,36 @@
+--TEST--
+testing reusing anons that implement an interface
+--FILE--
+<?php
+class Outer {
+    protected $data;
+
+    public function __construct(&$data) {
+        /* array access will be implemented by the time we get to here */
+        $this->data = &$data;
+    }
+
+    public function getArrayAccess() {
+        /* create a child object implementing array access */
+        /* this grants you access to protected methods and members */
+        return new class($this->data) implements ArrayAccess {
+            public function offsetGet($offset) { return $this->data[$offset]; }
+            public function offsetSet($offset, $data) { return ($this->data[$offset] = $data); }
+            public function offsetUnset($offset) { unset($this->data[$offset]); }
+            public function offsetExists($offset) { return isset($this->data[$offset]); }
+        };
+    }
+}
+
+$data = array(
+    rand(1, 100),
+    rand(2, 200)
+);
+
+$outer = new Outer($data);
+$proxy = $outer->getArrayAccess();
+
+/* null because no inheritance, so no access to protected member */
+var_dump(@$outer->getArrayAccess()[0]);
+--EXPECT--
+NULL
@@ -0,0 +1,15 @@
+--TEST--
+testing anon classes inside namespaces
+--FILE--
+<?php
+namespace lone {
+   $hello = new class{} ;
+}
+
+namespace {
+    var_dump ($hello);
+}
+--EXPECTF--
+object(class@%s)#1 (0) {
+}
+
@@ -0,0 +1,23 @@
+--TEST--
+testing anon classes in functions outside of classes in namespaces
+--FILE--
+<?php
+namespace lone {
+    function my_factory() {
+        return new class{};
+    }
+
+    class Outer {
+
+        public function __construct() {
+             var_dump(
+                my_factory());
+        }
+    }
+
+    new Outer();
+}
+--EXPECTF--
+object(class@%s)#2 (0) {
+}
+
@@ -0,0 +1,23 @@
+--TEST--
+testing static access for methods and properties in anon classes
+--FILE--
+<?php
+$anonClass = new class("cats", "dogs") {
+    public static $foo;
+    private static $bar;
+
+    public function __construct($foo, $bar) {
+        static::$foo = $foo;
+        static::$bar = $bar;
+    }
+
+    public static function getBar() {
+        return static::$bar;
+    }
+};
+
+var_dump($anonClass::$foo);
+var_dump($anonClass::getBar());
+--EXPECT--
+string(4) "cats"
+string(4) "dogs"
@@ -0,0 +1,18 @@
+--TEST--
+testing traits in anon classes
+--FILE--
+<?php
+
+trait Foo {
+    public function someMethod() {
+      return "bar";
+    }
+}
+
+$anonClass = new class {
+    use Foo;
+};
+
+var_dump($anonClass->someMethod());
+--EXPECT--
+string(3) "bar"
@@ -0,0 +1,23 @@
+--TEST--
+Trait binding after anon class
+--FILE--
+<?php
+
+trait T {
+    public function m1() { return 42; }
+}
+
+class C {
+    public function m2() {
+        return new class {};
+    }
+
+    use T;
+}
+
+$c = new C;
+var_dump($c->m1());
+
+?>
+--EXPECT--
+int(42)
@@ -7,14 +7,18 @@ set_error_handler(function($errno, $errstr) {
    var_dump($errstr);
 });

-var_dump(...[1, 2, "foo" => 3, 4]);
-var_dump(...new ArrayIterator([1, 2, "foo" => 3, 4]));
+try {
+	var_dump(...[1, 2, "foo" => 3, 4]);
+} catch (Error $ex) {
+	var_dump($ex->getMessage());
+}
+try {
+	var_dump(...new ArrayIterator([1, 2, "foo" => 3, 4]));
+} catch (Error $ex) {
+	var_dump($ex->getMessage());
+}

 ?>
 --EXPECTF--
 string(36) "Cannot unpack array with string keys"
-int(1)
-int(2)
 string(42) "Cannot unpack Traversable with string keys"
-int(1)
-int(2)
@@ -13,4 +13,4 @@ class Sub extends Base {
 }
 ?>
 --EXPECTF--
-Strict Standards: Declaration of Sub::test() should be compatible with & Base::test($foo, array $bar, $option = NULL, $extra = 'llllllllll...') in %sargument_restriction_001.php on line %d 
+Warning: Declaration of & Sub::test() should be compatible with & Base::test($foo, array $bar, $option = NULL, $extra = 'llllllllll...') in %sargument_restriction_001.php on line %d 
@@ -13,4 +13,4 @@ class Sub extends Base {
 }
 ?>
 --EXPECTF--
-Strict Standards: Declaration of Sub::test() should be compatible with Base::test($foo, array &$bar, $option = NULL, $extra = 3.1415926535898) in %sargument_restriction_002.php on line %d
+Warning: Declaration of Sub::test($foo, array &$bar) should be compatible with Base::test($foo, array &$bar, $option = NULL, $extra = 3.1415926535898) in %sargument_restriction_002.php on line %d
@@ -16,4 +16,4 @@ class Sub extends Base {
 }
 ?>
 --EXPECTF--
-Strict Standards: Declaration of Sub::test() should be compatible with Base::test(Foo $foo, array $bar, $option = NULL, $extra = 'llllllllll...') in %sargument_restriction_003.php on line %d
+Warning: Declaration of Sub::test() should be compatible with Base::test(Foo $foo, array $bar, $option = NULL, $extra = 'llllllllll...') in %sargument_restriction_003.php on line %d
@@ -13,4 +13,4 @@ class Sub extends Base {
 }
 ?>
 --EXPECTF--
-Strict Standards: Declaration of Sub::test() should be compatible with Base::test($foo, $extra = Array) in %sargument_restriction_006.php on line %d
+Warning: Declaration of Sub::test($foo, $extra) should be compatible with Base::test($foo, $extra = Array) in %sargument_restriction_006.php on line %d
@@ -0,0 +1,20 @@
+--TEST--
+Accept hashes being equal to zero
+--FILE--
+<?php
+
+$hashes = [
+	"\x8e\x1a\x63\x0f\x61" => 32,
+	"\xf7\x17\x7f\x7f\x7f\x7f\x7f\x7f\x7f\x6b\x03\x6a\x13\x63\x17\x6b\x1d\x67" => 64,
+];
+
+foreach ($hashes as $hash => $bits) {
+	var_dump($hashes[$hash], $bits);
+}
+
+?>
+--EXPECT--
+int(32)
+int(32)
+int(64)
+int(64)
@@ -0,0 +1,21 @@
+--TEST--
+Ensure "undefined offset" notice formats message corectly when undefined key is negative
+--FILE--
+<?php
+
+[][-1];
+[][-1.1];
+(new ArrayObject)[-1];
+(new ArrayObject)[-1.1];
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Notice: Undefined offset: -1 in %s on line 3
+
+Notice: Undefined offset: -1 in %s on line 4
+
+Notice: Undefined offset: -1 in %s on line 5
+
+Notice: Undefined offset: -1 in %s on line 6
+Done
@@ -12,4 +12,8 @@ foo(123);
 --EXPECTF--
 3

-Catchable fatal error: Argument 1 passed to foo() must be of the type array, integer given, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php on line 2
+Fatal error: Uncaught TypeError: Argument 1 passed to foo() must be of the type array, integer given, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php:2
+Stack trace:
+#0 %s(%d): foo(123)
+#1 {main}
+  thrown in %sarray_type_hint_001.php on line 2
@@ -0,0 +1,12 @@
+--TEST--
+test passing assertion
+--INI--
+zend.assertions=1
+assert.exception=1
+--FILE--
+<?php
+assert(true);
+var_dump(true);
+?>
+--EXPECTF--
+bool(true)
@@ -0,0 +1,16 @@
+--TEST--
+test failing assertion
+--INI--
+zend.assertions=1
+assert.exception=1
+--FILE--
+<?php
+assert(false);
+var_dump(true);
+?>
+--EXPECTF--
+Fatal error: Uncaught AssertionError: assert(false) in %sexpect_002.php:%d
+Stack trace:
+#0 %sexpect_002.php(%d): assert(false, 'assert(false)')
+#1 {main}
+  thrown in %sexpect_002.php on line %d
@@ -0,0 +1,15 @@
+--TEST--
+test catching failed assertion
+--INI--
+zend.assertions=1
+assert.exception=1
+--FILE--
+<?php
+try {
+    assert(false);
+} catch (AssertionError $ex) {
+    var_dump($ex->getMessage());
+}
+?>
+--EXPECT--
+string(13) "assert(false)"
@@ -0,0 +1,15 @@
+--TEST--
+test providing reason (fail)
+--INI--
+zend.assertions=1
+assert.exception=1
+--FILE--
+<?php
+try {
+    assert(false, "I require this to succeed");
+} catch (AssertionError $ex) {
+    var_dump($ex->getMessage());
+}
+?>
+--EXPECT--
+string(25) "I require this to succeed"
@@ -0,0 +1,17 @@
+--TEST--
+test providing reason (pass)
+--INI--
+zend.assertions=1
+assert.exception=1
+--FILE--
+<?php
+try {
+    /* by passing we test there are no leaks upon success */
+    assert(true, "I require this to succeed");
+} catch (AssertionError $ex) {
+    var_dump($ex->getMessage());
+}
+var_dump(true);
+?>
+--EXPECT--
+bool(true)
@@ -0,0 +1,14 @@
+--TEST--
+test looping assert (pass)
+--INI--
+zend.assertions=1
+assert.exception=1
+--FILE--
+<?php
+for($i=0; $i<100000; $i++) {
+    assert ($i < 100000, "The universe should make sense");
+}
+var_dump(true);
+?>
+--EXPECT--
+bool(true)
@@ -0,0 +1,22 @@
+--TEST--
+test compiled reason
+--INI--
+zend.assertions=1
+assert.exception=1
+--FILE--
+<?php
+$next = 1;
+$data = array(
+    "key" => "X-HTTP ",
+    "value" => "testing"
+);
+
+class HeaderMalfunctionError extends AssertionError {}
+
+assert (preg_match("~^([a-zA-Z0-9-]+)$~", $data["key"]), new HeaderMalfunctionError("malformed key found at {$next} \"{$data["key"]}\""));
+?>
+--EXPECTF--
+Fatal error: Uncaught HeaderMalfunctionError: malformed key found at 1 "X-HTTP " in %sexpect_007.php:10
+Stack trace:
+#0 {main}
+  thrown in %sexpect_007.php on line 10
@@ -0,0 +1,34 @@
+--TEST--
+test disabled expectations have no ill side effects
+--INI--
+zend.assertions=0
+assert.exception=1
+--FILE--
+<?php
+class One {
+    public function __construct() {
+        assert($this || 0);
+    }
+}
+class Two extends One {}
+
+class OdEar extends AssertionError {}
+
+function blah(){ return 1; }
+
+$variable = 1;
+assert(true, "constant message");
+assert(($variable && $variable) || php_sapi_name(), new OdEar("constant message"));
+assert(false);
+assert(blah(), blah());
+
+new Two();
+new Two();
+new Two();
+
+assert (blah() || blah() || blah(), blah() || blah() || blah() || blah());
+
+var_dump(true);
+?>
+--EXPECT--
+bool(true)
@@ -0,0 +1,25 @@
+--TEST--
+test stack trace is correct from failed exception in extended class
+--INI--
+zend.assertions=1
+assert.exception=1
+--FILE--
+<?php
+class One {
+    public function __construct() {
+    }
+}
+class Two extends One {
+    public function __construct() {
+        assert(false);
+    }
+}
+new Two();
+?>
+--EXPECTF--
+Fatal error: Uncaught AssertionError: assert(false) in %sexpect_009.php:%d
+Stack trace:
+#0 %sexpect_009.php(%d): assert(false, 'assert(false)')
+#1 %sexpect_009.php(%d): Two->__construct()
+#2 {main}
+  thrown in %sexpect_009.php on line %d
@@ -0,0 +1,23 @@
+--TEST--
+test stack trace is correct from failed exception in extended class (parent implementing constructor)
+--INI--
+zend.assertions=1
+assert.exception=1
+--FILE--
+<?php
+class One {
+    public function __construct() {
+        assert(false);
+    }
+}
+class Two extends One {}
+
+new Two();
+?>
+--EXPECTF--
+Fatal error: Uncaught AssertionError: assert(false) in %sexpect_010.php:%d
+Stack trace:
+#0 %sexpect_010.php(%d): assert(false, 'assert(false)')
+#1 %sexpect_010.php(%d): One->__construct()
+#2 {main}
+  thrown in %sexpect_010.php on line %d
@@ -0,0 +1,30 @@
+--TEST--
+test overloaded __toString on custom exception
+--INI--
+zend.assertions=1
+assert.exception=1
+--FILE--
+<?php
+class MyExpectations extends AssertionError {
+    public function __toString() {
+        return sprintf(
+            "[Message]: %s", __CLASS__);
+    }
+}
+
+class One {
+    public function __construct() {
+        assert(false, (string) new MyExpectations());
+    }
+}
+class Two extends One {}
+
+new Two();
+?>
+--EXPECTF--
+Fatal error: Uncaught AssertionError: [Message]: MyExpectations in %sexpect_011.php:%d
+Stack trace:
+#0 %sexpect_011.php(%d): assert(false, '[Message]: MyEx...')
+#1 %sexpect_011.php(%d): One->__construct()
+#2 {main}
+  thrown in %sexpect_011.php on line %d
@@ -0,0 +1,21 @@
+--TEST--
+test enable/disable assertions at runtime
+--INI--
+zend.assertions=1
+assert.exception=1
+--FILE--
+<?php
+var_dump((integer)ini_get("zend.assertions"));
+ini_set("zend.assertions", 0);
+var_dump((integer)ini_get("zend.assertions"));
+assert(false);
+ini_set("zend.assertions", 1);
+var_dump((integer)ini_get("zend.assertions"));
+assert(true);
+var_dump(true);
+?>
+--EXPECT--
+int(1)
+int(0)
+int(1)
+bool(true)
@@ -0,0 +1,11 @@
+--TEST--
+test failing assertion when disabled (with return value)
+--INI--
+zend.assertions=0
+assert.exception=1
+--FILE--
+<?php
+var_dump(assert(false));
+?>
+--EXPECT--
+bool(true)
@@ -0,0 +1,12 @@
+--TEST--
+test failing assertion when disabled
+--INI--
+zend.assertions=0
+assert.exception=1
+--FILE--
+<?php
+assert(false);
+var_dump(true);
+?>
+--EXPECT--
+bool(true)
@@ -0,0 +1,295 @@
+--TEST--
+AST pretty-peinter
+--INI--
+zend.assertions=1
+assert.exception=0
+--FILE--
+<?php
+assert(0 && ($a = function () {
+	global $a, $$b;
+	static $c, $d = 0;
+	unset($e);
+	$x = isset($a) && !empty($b) || eval($c);
+	$x = $a ? $b : $c;
+	$x = $a ?: $c;
+	$x = $a ?? $b;
+	list($a, $b, $c) = [1, 2=>'x', 'z'=>'c'];
+	@foo();
+	$y = clone $x;
+	yield 1 => 2;
+	yield from $x;
+}));
+
+assert(0 && ($a = function &(array &$a, X $b = null) use ($c,&$d) : X {
+	abstract class A extends B implements C, D {
+		const X = 12;
+		const Y = self::X, Z = "aaa";
+
+		public $a = 1, $b;
+		protected $c;
+		static private $d = null;
+
+		abstract function foo();
+
+		static private function f1() {
+			for ($i = 0, $j = 100; $i < $j; $i++, --$j) {
+				$s[$i] = $a[$j];
+			}
+			foreach ($a as $key => &$val) {
+				print "$key => $val\n";
+			}
+			while ($s[$i]) {
+				$i++;
+			}
+			do {
+				$i--;
+			} while ($s[$i]);
+			$x = foo($a + 1, 4, ...[1,2,3]);
+			$x = ${$a . "_1"}();
+			$x = A::foo();
+			$x = ${$a . "_1"}::foo();
+			$x = A::${$a . "_1"}();
+			$x = $x->foo();
+			$x = ${$a . "_1"}->foo();
+			$x = $x->{$a . "_1"}();
+			$x->a = C::C;
+			${$a . "_1"}->a = ${$a . "_1"}::C;
+			$x->{a . "_1"} = C::C;
+			$x = C::$z;
+			$x = ${$a . "_1"}::$z;
+			$x = C::${$z . "_1"};
+		}
+	}
+}));
+
+assert(0 && ($a = function &(array &$a, X $b = null) use ($c,&$d) : X {
+	final class A {
+		final protected function f2() {
+			if (!$x) {
+				return 0;
+			}
+			if ($x == 1) {
+				return 1;
+			} else if ($x == 2) {
+				return 2;
+			} else if ($x == 3) {
+				return 3;
+			} else {
+				if ($x == 9) {
+					return 9;
+				}
+L0:
+                do {
+					switch ($x) {
+						case 4: break;
+						case 5: continue;
+						case 6: break 2;
+						case 7: continue 2;
+						case 8: goto L0;
+						default: return;
+					}
+				} while (0);
+			}
+		}
+	}
+}));
+
+assert(0 && ($a = function &(array &$a, X $b = null) use ($c,&$d) : X {
+	class A {
+		use T1, T2 {
+			T1::foo insteadof foo;
+			T2::foo as bar;
+			baz as public;
+			ops as protected x;
+		}
+		use T3;
+	}
+}));
+
+assert(0 && ($a = function &(array &...$a) {
+	declare(A=1,B=2);
+	try {
+		$i++;
+	} catch (MyException $e) {
+		echo 1;
+	} catch (Exception $e) {
+		echo 2;
+	} finally {
+		echo 3;
+	}
+}));
+
+assert(0 && ($a = function () {
+	declare(C=1) { echo 1; }
+	$x = '\'"`$a';
+	$x = "'\"`$a";
+	$x = `'"\`$a`;
+	$x = "{$a}b";
+	$x = "${a}b";
+	$x = " {$foo->bar} ${$foo->bar} ";
+	$x = " ${'---'} ";
+	foo();
+	\foo();
+	namespace\foo();
+	$x = foo;
+	$x = \foo;
+	$x = namespace\foo;
+	$x = new foo();
+	$x = new \foo();
+	$x = new namespace\foo();
+    if ($a) {
+    } elseif ($b) {
+    }
+}));
+
+?>
+--EXPECTF--
+Warning: assert(): assert(0 && ($a = function () {
+    global $a;
+    global $$b;
+    static $c;
+    static $d = 0;
+    unset($e);
+    $x = isset($a) && !empty($b) || eval($c);
+    $x = $a ? $b : $c;
+    $x = $a ?: $c;
+    $x = $a ?? $b;
+    list($a, $b, $c) = [1, 2 => 'x', 'z' => 'c'];
+    @foo();
+    $y = clone $x;
+    yield 1 => 2;
+    yield from $x;
+})) failed in %sexpect_015.php on line %d
+
+Warning: assert(): assert(0 && ($a = function &(array &$a, X $b = null) use($c, &$d): X {
+    abstract class A extends B implements C, D {
+        const X = 12;
+        const Y = self::X, Z = 'aaa';
+        public $a = 1, $b;
+        protected $c;
+        private static $d = null;
+        public abstract function foo();
+
+        private static function f1() {
+            for ($i = 0, $j = 100; $i < $j; $i++, --$j) {
+                $s[$i] = $a[$j];
+            }
+            foreach ($a as $key => &$val) {
+                print "$key => $val\n";
+            }
+            while ($s[$i]) {
+                $i++;
+            }
+            do {
+                $i--;
+            } while ($s[$i]);
+            $x = foo($a + 1, 4, ...[1, 2, 3]);
+            $x = ${$a . '_1'}();
+            $x = A::foo();
+            $x = ${$a . '_1'}::foo();
+            $x = A::${$a . '_1'}();
+            $x = $x->foo();
+            $x = ${$a . '_1'}->foo();
+            $x = $x->{$a . '_1'}();
+            $x->a = C::C;
+            ${$a . '_1'}->a = ${$a . '_1'}::C;
+            $x->{a . '_1'} = C::C;
+            $x = C::$z;
+            $x = ${$a . '_1'}::$z;
+            $x = C::${$z . '_1'};
+        }
+
+    }
+
+})) failed in %sexpect_015.php on line %d
+
+Warning: assert(): assert(0 && ($a = function &(array &$a, X $b = null) use($c, &$d): X {
+    final class A {
+        protected final function f2() {
+            if (!$x) {
+                return 0;
+            }
+            if ($x == 1) {
+                return 1;
+            } else if ($x == 2) {
+                return 2;
+            } else if ($x == 3) {
+                return 3;
+            } else {
+                if ($x == 9) {
+                    return 9;
+                }
+                L0:
+                do {
+                    switch ($x) {
+                        case 4:
+                            break;
+                        case 5:
+                            continue;
+                        case 6:
+                            break 2;
+                        case 7:
+                            continue 2;
+                        case 8:
+                            goto L0;
+                        default:
+                            return;
+                    }
+                } while (0);
+            }
+        }
+
+    }
+
+})) failed in %sexpect_015.php on line %d
+
+Warning: assert(): assert(0 && ($a = function &(array &$a, X $b = null) use($c, &$d): X {
+    class A {
+        use T1, T2 {
+            T1::foo insteadof foo;
+            T2::foo as bar;
+            baz as public;
+            ops as protected x;
+        }
+        use T3;
+    }
+
+})) failed in %sexpect_015.php on line %d
+
+Warning: assert(): assert(0 && ($a = function &(array &...$a) {
+    declare(A = 1, B = 2);
+    try {
+        $i++;
+    } catch (MyException $e) {
+        echo 1;
+    } catch (Exception $e) {
+        echo 2;
+    } finally {
+        echo 3;
+    }
+})) failed in %sexpect_015.php on line %d
+
+Warning: assert(): assert(0 && ($a = function () {
+    declare(C = 1) {
+        echo 1;
+    }
+    $x = '\'"`$a';
+    $x = "'\"`$a";
+    $x = `'"\`$a`;
+    $x = "{$a}b";
+    $x = "{$a}b";
+    $x = " {$foo->bar} {${$foo->bar}} ";
+    $x = " ${---} ";
+    foo();
+    \foo();
+    namespace\foo();
+    $x = foo;
+    $x = \foo;
+    $x = namespace\foo;
+    $x = new foo();
+    $x = new \foo();
+    $x = new namespace\foo();
+    if ($a) {
+    } elseif ($b) {
+    }
+})) failed in %sexpect_015.php on line %d
@@ -0,0 +1,24 @@
+--TEST--
+test enable/disable assertions at runtime (assertions not completely disabled)
+--INI--
+zend.assertions=0
+assert.exception=0
+--FILE--
+<?php
+ini_set("zend.assertions", 0);
+var_dump(assert(false));
+var_dump(assert(true));
+ini_set("zend.assertions", 1);
+var_dump(assert(false));
+var_dump(assert(true));
+ini_set("zend.assertions", -1);
+?>
+--EXPECTF--
+bool(true)
+bool(true)
+
+Warning: assert(): assert(false) failed in %sexpect_016.php on line 6
+NULL
+bool(true)
+
+Warning: zend.assertions may be completely enabled or disabled only in php.ini in %sexpect_016.php on line 8
@@ -0,0 +1,19 @@
+--TEST--
+test enable/disable assertions at runtime (assertions completely disabled)
+--INI--
+zend.assertions=-1
+assert.exception=0
+--FILE--
+<?php
+var_dump(assert(false));
+var_dump(assert(true));
+ini_set("zend.assertions", 0);
+ini_set("zend.assertions", 1);
+?>
+--EXPECTF--
+bool(true)
+bool(true)
+
+Warning: zend.assertions may be completely enabled or disabled only in php.ini in %sexpect_017.php on line 4
+
+Warning: zend.assertions may be completely enabled or disabled only in php.ini in %sexpect_017.php on line 5
@@ -0,0 +1,33 @@
+--TEST--
+test assertions in namespace
+--INI--
+zend.assertions=1
+assert.exception=0
+--FILE--
+<?php
+namespace Foo;
+
+ini_set("zend.assertions", 0);
+var_dump(\assert(false));
+var_dump(\assert(true));
+var_dump(assert(false));
+var_dump(assert(true));
+ini_set("zend.assertions", 1);
+var_dump(\assert(false));
+var_dump(\assert(true));
+var_dump(assert(false));
+var_dump(assert(true));
+?>
+--EXPECTF--
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+
+Warning: assert(): assert(false) failed in %sexpect_018.php on line 10
+NULL
+bool(true)
+
+Warning: assert(): assert(false) failed in %sexpect_018.php on line 12
+NULL
+bool(true)
@@ -0,0 +1,19 @@
+--TEST--
+test assertions in namespace (assertions completely disabled)
+--INI--
+zend.assertions=-1
+assert.exception=0
+--FILE--
+<?php
+namespace Foo;
+
+var_dump(\assert(false));
+var_dump(\assert(true));
+var_dump(assert(false));
+var_dump(assert(true));
+?>
+--EXPECTF--
+bool(true)
+bool(true)
+bool(true)
+bool(true)
@@ -0,0 +1,24 @@
+--TEST--
+assgin to object leaks with ref
+--FILE--
+<?php
+function &a($i) {
+    $a = "str". $i ."ing";
+    return $a;
+}
+
+class A {
+    public function test() {
+        $this->a = a(1);
+        unset($this->a);
+    }
+}
+
+$a = new A;
+
+$a->test();
+$a->test();
+echo "okey";
+?>
+--EXPECT--	
+okey
@@ -8,7 +8,7 @@ setlocale(LC_ALL, $g_lang);

 class InfoBlob {
   var $foo;
-   function InfoBlob() {
+   function __construct() {
      $this->foo = "Foo";
   }
 }
@@ -9,7 +9,7 @@ class test
 {
    public $member;

-    function test() {
+    function __construct() {
        $this->member = 1;
        register_shutdown_function(array($this, 'destructor'));
    }
@@ -6,4 +6,7 @@ Bug #24773 (unset() of integers treated as arrays causes a crash)
 	unset($array["lvl1"]["lvl2"]["b"]);
 ?>
 --EXPECTF--
-Fatal error: Cannot use string offset as an array in %s on line %d
+Fatal error: Uncaught Error: Cannot use string offset as an array in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
@@ -37,25 +37,25 @@ function my_error_handler($errno, $errstr, $errfile, $errline) {

 set_error_handler('my_error_handler');

-class None
+class NoneTest
 {
 	function __toString() {
 	}
 }

-$o = new None;
+$o = new NoneTest;
 echo $o;

 echo "===THROW===\n";

-class Error 
+class ErrorTest
 {
 	function __toString() {
 		throw new Exception("This is an error!");
 	}
 }

-$o = new Error;
+$o = new ErrorTest;
 try {
 	echo $o;
 }
@@ -68,7 +68,7 @@ catch (Exception $e) {
 --EXPECTF--
 Hello World!
 ===NONE===
-string(52) "Method None::__toString() must return a string value"
+string(56) "Method NoneTest::__toString() must return a string value"
 ===THROW===

-Fatal error: Method Error::__toString() must not throw an exception in %sbug26166.php on line %d
+Fatal error: Method ErrorTest::__toString() must not throw an exception in %sbug26166.php on line %d
@@ -8,4 +8,7 @@ $a->$x = "string('')";
 var_dump($a);
 ?>
 --EXPECTF--
-Fatal error: Cannot access empty property in %sbug29015.php on line 4
+Fatal error: Uncaught Error: Cannot access empty property in %sbug29015.php:4
+Stack trace:
+#0 {main}
+  thrown in %sbug29015.php on line 4
@@ -38,4 +38,8 @@ NULL
 ===CHILD===
 string(4) "Base"

-Fatal error: Cannot access private property ChildClass::$private_child in %sbug29674.php on line %d
+Fatal error: Uncaught Error: Cannot access private property ChildClass::$private_child in %sbug29674.php:%d
+Stack trace:
+#0 %s(%d): BaseClass->printVars()
+#1 {main}
+  thrown in %sbug29674.php on line %d
@@ -2,7 +2,7 @@
 Bug #29890 (crash if error handler fails)
 --FILE--
 <?php
-function customErrorHandler($fErrNo,$fErrStr,$fErrFile,$fErrLine,&$fClass) {
+function customErrorHandler($fErrNo,$fErrStr,$fErrFile,$fErrLine,$fClass) {
 echo "error :".$fErrStr."\n";
 }

@@ -3,7 +3,7 @@ Bug #30080 (Passing array or non array of objects)
 --FILE--
 <?php
 class foo { 	
-  function foo($arrayobj) { 
+  function __construct($arrayobj) { 
    var_dump($arrayobj);
  } 
 } 
@@ -21,8 +21,8 @@ $b = new Blah();
 $b->show();
 ?>
 --EXPECTF--
-Strict Standards: Accessing static property Blah::$x as non static in %sbug30820.php on line 7
+Notice: Accessing static property Blah::$x as non static in %sbug30820.php on line 7
 Blah::$x = 1

-Strict Standards: Accessing static property Blah::$x as non static in %sbug30820.php on line 10
+Notice: Accessing static property Blah::$x as non static in %sbug30820.php on line 10
 $this->x = 5
@@ -45,4 +45,8 @@ __autoload(Test2,2)
 Caught: __autoload
 __autoload(Test3,3)

-Fatal error: Class 'Test3' not found in %sbug31102.php(%d) : eval()'d code on line 1
+Fatal error: Uncaught Error: Class 'Test3' not found in %sbug31102.php(%d) : eval()'d code:1
+Stack trace:
+#0 %s(%d): eval()
+#1 {main}
+  thrown in %sbug31102.php(%d) : eval()'d code on line 1
@@ -3,13 +3,13 @@ Bug #31177 (memory corruption because of incorrect refcounting)
 --FILE--
 <?php
 class foo {
-  function foo($n=0) {
+  function __construct($n=0) {
    if($n) throw new Exception("new");
  }
 }
 $x = new foo();
 try {
-  $y=$x->foo(1);
+  $y=$x->__construct(1);
 } catch (Exception $e) {
  var_dump($x);
 }
@@ -17,6 +17,6 @@ $bar->destroyThis();
 var_dump($bar);
 ?>
 --EXPECTF--
-Strict Standards: Only variables should be assigned by reference in %sbug31525.php on line 7
+Notice: Only variables should be assigned by reference in %sbug31525.php on line 7
 object(Foo)#1 (0) {
 }
@@ -5,7 +5,7 @@ Bug #32226 (SEGV with exception handler on non existing instance)

 class A
 {
-        public function A()
+        public function __construct()
        {
                set_exception_handler(array($this, 'EH'));

@@ -68,13 +68,13 @@ Try static instance inside class :
 New class Singleton1 created 
 Using old class Singleton1

-Strict Standards: Only variables should be assigned by reference in %sbug32322.php on line 49
+Notice: Only variables should be assigned by reference in %sbug32322.php on line 49
 Using old class Singleton1
 Try static instance inside function :
 New class Singleton2 created 
 Using old class Singleton2

-Strict Standards: Only variables should be assigned by reference in %sbug32322.php on line 55
+Notice: Only variables should be assigned by reference in %sbug32322.php on line 55
 Using old class Singleton2
 Class Singleton1 destroyed at script end
 Class Singleton2 destroyed at script end
@@ -36,4 +36,7 @@ A Object

 Notice: Indirect modification of overloaded property A::$whatever has no effect in %sbug32660.php on line 23

-Fatal error: Cannot assign by reference to overloaded object in %sbug32660.php on line 23
+Fatal error: Uncaught Error: Cannot assign by reference to overloaded object in %sbug32660.php:23
+Stack trace:
+#0 {main}
+  thrown in %sbug32660.php on line 23
@@ -16,7 +16,7 @@ array_splice(X::getArr(), 1, 1);
 print_r(X::getArr());
 ?>
 --EXPECTF--
-Strict Standards: Only variables should be passed by reference in %sbug33257.php on line 10
+Notice: Only variables should be passed by reference in %sbug33257.php on line 10
 Array
 (
    [0] => a
@@ -5,4 +5,7 @@ Bug #33318 (throw 1; results in Invalid opcode 108/1/8)
 throw 1;
 ?>
 --EXPECTF--
-Fatal error: Can only throw objects in %sbug33318.php on line 2
+Fatal error: Uncaught Error: Can only throw objects in %sbug33318.php:2
+Stack trace:
+#0 {main}
+  thrown in %sbug33318.php on line 2