sync NEWS

bump version
Merge branch 'master' into PHP-7.0.0
2026-11-10 02:30:50 +00:00 · 2015-06-23 19:33:33 +02:00 · 2015-06-23 19:32:58 +02:00 · 2015-06-23 18:49:42 +02:00 · 2015-06-10 10:49:51 +02:00 · 2015-06-09 16:42:24 +02:00
2747 changed files with 189213 additions and 190207 deletions
@@ -101,7 +101,7 @@ define dump_bt
 					____print_str $zvalue->value.str->val $zvalue->value.str->len
 				end
 				if $type == 7
-					printf "array(%d)[%p]", $zvalue->value.arr->nNumOfElements, $zvalue
+					printf "array(%d)[%p]", $zvalue->value.arr->ht->nNumOfElements, $zvalue
 				end
 				if $type == 8
 					printf "object[%p]", $zvalue
@@ -152,8 +152,8 @@ define ____printzv_contents
 	set $type = $zvalue->u1.v.type

 	# 15 == IS_INDIRECT
-	if $type > 5 && $type != 15
-		printf "(refcount=%d) ", $zvalue->value.counted->gc.refcount
+	if $type >= 5 && $type != 15
+		printf "(refcount=%d) ", $zvalue->value.counted->refcount
 	end

 	if $type == 0
@@ -181,7 +181,7 @@ define ____printzv_contents
 		printf "array: "
 		if ! $arg1
 			set $ind = $ind + 1
-			____print_ht $zvalue->value.arr 1
+			____print_ht $zvalue->value.arr
 			set $ind = $ind - 1
 			set $i = $ind
 			while $i > 0
@@ -21,9 +21,6 @@
 *.tar.gz
 *.tar.bz2
 *.tar.xz
-*.tar.gz.asc
-*.tar.bz2.asc
-*.tar.xz.asc
 .FBCIndex
 .FBCLockFolder
 .deps
@@ -245,6 +242,10 @@ ext/reflection/spl.chm
 ext/simplexml/examples/security.new.xml
 ext/spl/examples/.htaccess
 ext/spl/examples/*.phps
+ext/sqlite/weztest.sqlite
+ext/sqlite/libsqlite/src/sqlite.h
+ext/sqlite/libsqlite/src/parse.out
+ext/sqlite/libsqlite/src/libsqlite.dsw
 ext/sqlite3/tests/phpsql*
 ext/sqlite3/tests/*.db
 ext/sqlite3/tests/*.tmp
@@ -1,29 +1,13 @@
 language: c
-sudo: false
-addons:
-  apt:
-    packages:
-      - locales
-      - language-pack-de
-      - re2c
-      - libgmp-dev
-      - libicu-dev
-      - libmcrypt-dev
-      - libtidy-dev
-      - libenchant-dev
-      - libaspell-dev
-      - libpspell-dev
-      - librecode-dev
-      - libsasl2-dev
-      - libxpm-dev
-      - libt1-dev
+
+branches:
+    except:
+        - phpng

 notifications:
    email: 
       on_failure: change
    irc:
-      template:
-        - "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message} -  Change view : %{compare_url} - Build details : %{build_url}"
      channels:
        - "irc.efnet.org#php.pecl"
      on_success: change
@@ -45,6 +29,13 @@ env:
      - ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0
      - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1

+before_install:
+    - sudo apt-get update -qq
+    - 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
+
 before_script:
    # Compile PHP
    - ./travis/compile.sh
@@ -54,7 +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 $(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 run-tests.php -p `pwd`/sapi/cli/php -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
@@ -178,7 +178,7 @@ Internal Function Naming Convensions
    Unexposed module function should be static and should not be defined in
    'php_modulename.h'.

-    static int php_session_destroy()
+    static int php_session_destroy(TSRMLS_D)

 2.  Main module source file must be named 'modulename.c'.

@@ -5,6 +5,7 @@ Installing PHP

     * General Installation Considerations
     * Installation on Unix systems
+          + Apache 1.3.x on Unix systems
          + Apache 2.x on Unix systems
          + Lighttpd 1.4 on Unix systems
          + Sun, iPlanet and Netscape servers on Sun Solaris
@@ -102,6 +103,7 @@ Installation on Unix systems

 Table of Contents

+     * Apache 1.3.x on Unix systems
     * Apache 2.x on Unix systems
     * Lighttpd 1.4 on Unix systems
     * Sun, iPlanet and Netscape servers on Sun Solaris
@@ -161,6 +163,208 @@ Table of Contents
   you can't figure out why, see the Problems section.
     __________________________________________________________________

+Apache 1.3.x on Unix systems
+
+   This  section  contains  notes and hints specific to Apache installs of
+   PHP on Unix platforms. We also have instructions and notes for Apache 2
+   on a separate page.
+
+   You  can select arguments to add to the configure on line 10 below from
+   the  list of core configure options and from extension specific options
+   described  at  the respective places in the manual. The version numbers
+   have  been  omitted here, to ensure the instructions are not incorrect.
+   You  will  need  to replace the 'xxx' here with the correct values from
+   your files.
+
+   Example #1 Installation Instructions (Apache Shared Module Version) for
+   PHP
+1.  gunzip apache_xxx.tar.gz
+2.  tar -xvf apache_xxx.tar
+3.  gunzip php-xxx.tar.gz
+4.  tar -xvf php-xxx.tar
+5.  cd apache_xxx
+6.  ./configure --prefix=/www --enable-module=so
+7.  make
+8.  make install
+9.  cd ../php-xxx
+
+10. Now, configure your PHP.  This is where you customize your PHP
+    with various options, like which extensions will be enabled.  Do a
+    ./configure --help for a list of available options.  In our example
+    we'll do a simple configure with Apache 1 and MySQL support.  Your
+    path to apxs may differ from our example.
+
+      ./configure --with-mysql --with-apxs=/www/bin/apxs
+
+11. make
+12. make install
+
+    If you decide to change your configure options after installation,
+    you only need to repeat the last three steps. You only need to
+    restart apache for the new module to take effect. A recompile of
+    Apache is not needed.
+
+    Note that unless told otherwise, 'make install' will also install PEAR,
+    various PHP tools such as phpize, install the PHP CLI, and more.
+
+13. Setup your php.ini file:
+
+      cp php.ini-development /usr/local/lib/php.ini
+
+    You may edit your .ini file to set PHP options.  If you prefer your
+    php.ini in another location, use --with-config-file-path=/some/path in
+    step 10.
+
+    If you instead choose php.ini-production, be certain to read the list
+    of changes within, as they affect how PHP behaves.
+
+14. Edit your httpd.conf to load the PHP module.  The path on the right hand
+    side of the LoadModule statement must point to the path of the PHP
+    module on your system.  The make install from above may have already
+    added this for you, but be sure to check.
+
+      LoadModule php7_module libexec/libphp7.so
+
+15. And in the AddModule section of httpd.conf, somewhere under the
+    ClearModuleList, add this:
+
+      AddModule mod_php7.c
+
+16. Tell Apache to parse certain extensions as PHP.  For example,
+    let's have Apache parse the .php extension as PHP.  You could
+    have any extension(s) parse as PHP by simply adding more, with
+    each separated by a space.  We'll add .phtml to demonstrate.
+
+      AddType application/x-httpd-php .php .phtml
+
+    It's also common to setup the .phps extension to show highlighted PHP
+    source, this can be done with:
+
+      AddType application/x-httpd-php-source .phps
+
+17. Use your normal procedure for starting the Apache server. (You must
+    stop and restart the server, not just cause the server to reload by
+    using a HUP or USR1 signal.)
+
+   Alternatively, to install PHP as a static object:
+
+   Example  #2  Installation  Instructions (Static Module Installation for
+   Apache) for PHP
+1.  gunzip -c apache_1.3.x.tar.gz | tar xf -
+2.  cd apache_1.3.x
+3.  ./configure
+4.  cd ..
+
+5.  gunzip -c php-5.x.y.tar.gz | tar xf -
+6.  cd php-5.x.y
+7.  ./configure --with-mysql --with-apache=../apache_1.3.x
+8.  make
+9.  make install
+
+10. cd ../apache_1.3.x
+
+11. ./configure --prefix=/www --activate-module=src/modules/php7/libphp7.a
+    (The above line is correct! Yes, we know libphp7.a does not exist at this
+    stage. It isn't supposed to. It will be created.)
+
+12. make
+    (you should now have an httpd binary which you can copy to your Apache bin d
+ir if
+    it is your first install then you need to "make install" as well)
+
+13. cd ../php-5.x.y
+14. cp php.ini-development /usr/local/lib/php.ini
+
+15. You can edit /usr/local/lib/php.ini file to set PHP options.
+    Edit your httpd.conf or srm.conf file and add:
+    AddType application/x-httpd-php .php
+
+   Depending  on  your  Apache  install  and  Unix variant, there are many
+   possible  ways  to  stop and restart the server. Below are some typical
+   lines   used  in  restarting  the  server,  for  different  apache/unix
+   installations.  You  should  replace  /path/to/  with the path to these
+   applications on your systems.
+
+   Example #3 Example commands for restarting Apache
+1. Several Linux and SysV variants:
+/etc/rc.d/init.d/httpd restart
+
+2. Using apachectl scripts:
+/path/to/apachectl stop
+/path/to/apachectl start
+
+3. httpdctl and httpsdctl (Using OpenSSL), similar to apachectl:
+/path/to/httpsdctl stop
+/path/to/httpsdctl start
+
+4. Using mod_ssl, or another SSL server, you may want to manually
+stop and start:
+/path/to/apachectl stop
+/path/to/apachectl startssl
+
+   The  locations of the apachectl and http(s)dctl binaries often vary. If
+   your  system  has locate or whereis or which commands, these can assist
+   you in finding your server control programs.
+
+   Different examples of compiling PHP for apache are as follows:
+./configure --with-apxs --with-pgsql
+
+   This will create a libphp7.so shared library that is loaded into Apache
+   using  a  LoadModule  line  in Apache's httpd.conf file. The PostgreSQL
+   support is embedded into this library.
+
+./configure --with-apxs --with-pgsql=shared
+
+   This  will  create  a libphp7.so shared library for Apache, but it will
+   also create a pgsql.so shared library that is loaded into PHP either by
+   using  the  extension  directive  in  php.ini  file  or  by  loading it
+   explicitly in a script using the dl() function.
+
+./configure --with-apache=/path/to/apache_source --with-pgsql
+
+   This  will  create  a  libmodphp7.a  library,  a  mod_php7.c  and  some
+   accompanying files and copy this into the src/modules/php7 directory in
+   the    Apache    source   tree.   Then   you   compile   Apache   using
+   --activate-module=src/modules/php7/libphp7.a   and   the  Apache  build
+   system  will  create  libphp7.a  and  link it statically into the httpd
+   binary.  The  PostgreSQL  support  is included directly into this httpd
+   binary, so the final result here is a single httpd binary that includes
+   all of Apache and all of PHP.
+
+./configure --with-apache=/path/to/apache_source --with-pgsql=shared
+
+   Same as before, except instead of including PostgreSQL support directly
+   into  the  final  httpd you will get a pgsql.so shared library that you
+   can load into PHP from either the php.ini file or directly using dl().
+
+   When  choosing  to build PHP in different ways, you should consider the
+   advantages  and  drawbacks  of each method. Building as a shared object
+   will  mean  that  you  can compile apache separately, and don't have to
+   recompile  everything  as you add to, or change, PHP. Building PHP into
+   apache  (static  method)  means  that PHP will load and run faster. For
+   more information, see the Apache » web page on DSO support.
+
+     Note:
+
+     Apache's  default  httpd.conf  currently  ships  with a section that
+     looks like this:
+
+User nobody
+Group "#-1"
+
+     Unless  you  change  that  to "Group nogroup" or something like that
+     ("Group  daemon"  is  also very common) PHP will not be able to open
+     files.
+
+     Note:
+
+     Make  sure  you  specify  the  installed  version of apxs when using
+     --with-apxs=/path/to/apxs  .  You must NOT use the apxs version that
+     is  in  the apache sources but the one that is actually installed on
+     your system.
+     __________________________________________________________________
+     __________________________________________________________________
+
 Apache 2.x on Unix systems

   This  section  contains notes and hints specific to Apache 2.x installs
@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
                  The PHP License, version 3.01
-Copyright (c) 1999 - 2016 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
@@ -57,7 +57,7 @@ php_lcov.info: lcov-test
 			cp $$x.bbg  lcov_data/$$y.bbg ; \
 		fi; \
 	done; \
-	for dir in ext/bcmath/libbcmath ext/date/lib ext/fileinfo/libmagic ext/gd/libgd ext/mbstring/libmbfl ext/mbstring/oniguruma ext/pcre/pcrelib ext/pdo_sqlite/libsqlite ext/sqlite3/libsqlite ext/xmlrpc/libxmlrpc ext/zip/lib; do \
+	for dir in ext/bcmath/libbcmath ext/fileinfo/libmagic ext/gd/libgd ext/mbstring/libmbfl ext/mbstring/oniguruma ext/pcre/pcrelib ext/pdo_sqlite/libsqlite ext/sqlite/libsqlite ext/sqlite3/libsqlite ext/xmlrpc/libxmlrpc ext/zip/lib; do \
 		if test -d lcov_data/$$dir; then \
 			rm -rf lcov_data/$$dir ; \
 		fi; \
@@ -53,7 +53,7 @@ install-headers:
 			paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \
 		done; \
 		$(mkinstalldirs) $$paths && \
-		echo "Installing header files:           $(INSTALL_ROOT)$(phpincludedir)/" && \
+		echo "Installing header files:          $(INSTALL_ROOT)$(phpincludedir)/" && \
 		for i in `echo $(INSTALL_HEADERS)`; do \
 			if test "$(PHP_PECL_EXTENSION)"; then \
 				src=`echo $$i | $(SED) -e "s#ext/$(PHP_PECL_EXTENSION)/##g"`; \
@@ -1,112 +1,338 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-09 Jun 2016, PHP 7.1.0alpha1
+25 Jun 2015, PHP 7.0.0 Alpha 2

 - Core:
-  . Added nullable types. (Levi, Dmitry)
-  . Added DFA optimization framework based on e-SSA form. (Dmitry, Nikita)
-  . Added specialized opcode handlers (e.g. ZEND_ADD_LONG_NO_OVERFLOW).
-    (Dmitry)
-  . Change statement and fcall extension handlers to accept frame. (Joe)
-  . Implemented safe execution timeout handling, that prevents random crashes
-    after "Maximum execution time exceeded" error. (Dmitry)
-  . Fixed bug #53432 (Assignment via string index access on an empty string
-    converts to array). (Nikita)
-  . Fixed bug #62210 (Exceptions can leak temporary variables). (Dmitry, Bob)
-  . Fixed bug #62814 (It is possible to stiffen child class members visibility).
+  . 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 #69989 (Generators don't participate in cycle GC). (Nikita)
-  . Fixed bug #71604 (Aborted Generators continue after nested finally).
+  . 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)
+
+- 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)
-  . Fixed bug #71572 (String offset assignment from an empty string inserts
-    null byte). (Francois)
-  . Fixed bug #71897 (ASCII 0x7F Delete control character permitted in
-    identifiers). (Andrea)
-  . Fixed bug #72188 (Nested try/finally blocks losing return value). (Dmitry)
-  . Fixed bug #72213 (Finally leaks on nested exceptions). (Dmitry, Nikita)
-  . Implemented the RFC `Support Class Constant Visibility`. (Sean DuBois,
-    Reeze Xia, Dmitry)
-  . Added void return type. (Andrea)
-  . Added support for negative string offsets in string offset syntax and
-    various string functions. (Francois)
-  . Added a form of the list() construct where keys can be specified. (Andrea)
-  . Number operators taking numeric strings now emit E_NOTICEs or E_WARNINGs
-    when given malformed numeric strings. (Andrea)
-  . (int), intval() where $base is 10 or unspecified, settype(), decbin(),
-    decoct(), dechex(), integer operators and other conversions now always
-    respect scientific notation in numeric strings. (Andrea)
-  . Implemented the RFC `Catching multiple exception types`. (Bronislaw Bialek,
-    Pierrick)
-  . Raise a compile-time warning on octal escape sequence overflow. (Sara)
-  . Added [] = as alternative construct to list() =. (Bob)
-  . Implemented logging to syslog with dynamic error levels. (Jani Ollikainen)
-  . Fixed bug #47517 (php-cgi.exe missing UAC manifest).
-    (maxdax15801 at users noreply github com)

- Apache2handler:
-  . Enable per-module logging in Apache 2.4+. (Martin Vobruba)
+11 Jun 2015, PHP 7.0.0 Alpha 1

- CLI Server:
-  . Fixed bug #71276 (Built-in webserver does not send Date header).
-    (see at seos fr)
+- 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)
+
+- 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)
+
+- Filter:
+  . 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:
-  . Implemented FR #55651 (Option to ignore the returned FTP PASV address).
-    (abrender at elitehosts dot com)
+  . Fixed bug #69082 (FTPS support on Windows). (Anatol) 

 - Intl:
-  . Added IntlTimeZone::getWindowsID() and
-    IntlTimeZone::getIDForWindowsID(). (Sara)
-  . Fixed bug #69374 (IntlDateFormatter formatObject returns wrong utf8 value).
-    (lenhatanh86 at gmail com)
-  . Fixed bug #69398 (IntlDateFormatter formatObject returns wrong value when
-    time style is NONE). (lenhatanh86 at gmail com)
+  . Removed deprecated aliases datefmt_set_timezone_id() and
+    IntlDateFormatter::setTimeZoneID(). (Nikita)

- Hash:
-  . Added SHA3 fixed mode algorithms (224, 256, 384, and 512 bit). (Sara)
-  . Added SHA512/256 and SHA512/224 algorithms. (Sara)
+- 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)

- JSON:
-  . Exported JSON parser API including json_parser_method that can be used
-    for implementing custom logic when parsing JSON. (Jakub Zelenka)
-  . Escaped U+2028 and U+2029 when JSON_UNESCAPED_UNICODE is supplied as
-    json_encode options and added JSON_UNESCAPED_LINE_TERMINATORS to restore
-    the previous behaviour. (Eddie Kohler)
+- LDAP
+  . Fixed bug #47222 (Implement LDAP_OPT_DIAGNOSTIC_MESSAGE). (Andreas Heigl)

- PDO_Firebird:
-  . Fixed bug #60052 (Integer returned as a 64bit integer on X86_64). (Mariuz)
+- LiteSpeed:
+  . Updated LiteSpeed SAPI code from V5.5 to V6.6. (George Wang)

- Pgsql:
-  . Implemented FR #31021 (pg_last_notice() is needed to get all notice
-    messages). (Yasuo)
-  . Implemented FR #48532 (Allow pg_fetch_all() to index numerically). (Yasuo)
+- libxml:
+  . Fixed handling of big lines in error messages with libxml >= 2.9.0.
+    (Christoph M. Becker)

- Reflection:
-  . Fix #72209 (ReflectionProperty::getValue() doesn't fail if object doesn't match type). (Joe)
+- 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)
+  . Added ReflectionGenerator class. (Bob)
+  . Added reflection support for return types and type declarations. (Sara,
+    Matteo)

 - Session:
-  . Improved fix for bug #68063 (Empty session IDs do still start sessions).
-    (Yasuo)
-  . Fixed bug #71038 (session_start() returns TRUE on failure).
-    Session save handlers must return 'string' always for successful read.
-    i.e. Non-existing session read must return empty string. PHP 7.0 is made
-    not to tolerate buggy return value. (Yasuo)
-  . Fixed bug #71394 (session_regenerate_id() must close opened session on
-    errors). (Yasuo)
+  . Fixed bug #67694 (Regression in session_regenerate_id()). (Tjerk)
+  . Fixed bug #68941 (mod_files.sh is a bash-script). (bugzilla at ii.nl, Yasuo)

- SQLite3:
-  . Implemented FR #71159 (Upgraded bundled SQLite lib to 3.9.2). (Laruence)
+- SOAP:
+  . 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)
+
+- Sqlite3:
+  . Fixed bug #68260 (SQLite3Result::fetchArray declares wrong
+    required_num_args). (Julien)

 - Standard:
-  . Fixed bug #71100 (long2ip() doesn't accept integers in strict mode).
+  . Fixed bug #69723 (Passing parameters by reference and array_column).
    (Laruence)
-  . Implemented FR #55716 (Add an option to pass a custom stream context to
-    get_headers()). (Ferenc)
-  . Additional validation for parse_url() for login/pass components).
-    (Ilia) (Julien)
-  . Implemented FR #69359 (Provide a way to fetch the current environment
-    variables). (Ferenc)
-  . unpack() function accepts an additional optional argument $offset. (Dmitry)
-  . Implemented #51879 stream context socket option tcp_nodelay (Joe)
+  . 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)
+  . 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! >>>
@@ -172,7 +172,7 @@ PHP_FUNCTION(module_name_drawtext)
    zval *image = NULL;
    zval *font = NULL;

-    if (zend_parse_parameters(argc, "rsrll|l", &image, &text, &text_len, &font, &x, &y, &color) == FAILURE)
+    if (zend_parse_parameters(argc TSRMLS_CC, "rsrll|l", &image, &text, &text_len, &font, &x, &y, &color) == FAILURE)
        return;

    if (image) {
@@ -12,7 +12,7 @@ Collaboration is a Good Thing(tm), and Git lets us do this. Thus, following
 some basic rules with regards to Git usage will::

   a. Make everybody happier, especially those responsible for maintaining
-      PHP itself.
+      Git itself.

   b. Keep the changes consistently well documented and easily trackable.

@@ -48,11 +48,11 @@ Currently we have the following branches in use::
  PHP-5.6   Is used to release the PHP 5.6.x series. This is a current
            stable version and is open for bugfixes only.

-  PHP-5.5   Is used to release the PHP 5.5.x series. This is an old
-            stable version and is open for security fixes only.
+  PHP-5.5   Is used to release the PHP 5.5.x series. This is a current
+            stable version and is open for bugfixes only.

-  PHP-5.4   Is used to release the PHP 5.4.x series. This is an old
-            stable version and is open for security fixes only.
+  PHP-5.4   Is used to release the PHP 5.4.x series. This is a current
+            stable version and is open for bugfixes only.

  PHP-5.3   This branch is closed.

@@ -67,7 +67,7 @@ Currently we have the following branches in use::

 The next few rules are more of a technical nature::

-   1. All changes should first go to the lowest branch (i.e. 5.6) and then
+   1. All changes should first go to the lowest branch (i.e. 5.4) and then
      get merged up to all other branches. If a change is not needed for
      later branches (i.e. fixes for features which where dropped from later
      branches) an empty merge should be done.
@@ -79,7 +79,7 @@ The next few rules are more of a technical nature::
      should be noted in both PHP-5.4/NEWS and PHP-5.5/NEWS but
      not master, which is not a public released version yet.

-   3. Do not commit multiple files and dump all messages in one commit. If you
+   3. Do not commit multiple file and dump all messages in one commit. If you
      modified several unrelated files, commit each group separately and
      provide a nice commit message for each one. See example below.

@@ -8,98 +8,98 @@ API adjustment to the old output control code:

 	Checking output control layers status:
 		// Using OG()
-		php_output_get_status();
+		php_output_get_status(TSRMLS_C);

 	Starting the default output handler:
-		// php_start_ob_buffer(NULL, 0, 1);
-		php_output_start_default();
+		// php_start_ob_buffer(NULL, 0, 1 TSRMLS_CC);
+		php_output_start_default(TSRMLS_C);

 	Starting an user handler by zval:
-		// php_start_ob_buffer(zhandler, chunk_size, erase);
-		php_output_start_user(zhandler, chunk_size, flags);
+		// php_start_ob_buffer(zhandler, chunk_size, erase TSRMLS_CC);
+		php_output_start_user(zhandler, chunk_size, flags TSRMLS_CC);

 	Starting an internal handler whithout context:
-		// php_ob_set_internal_handler(my_php_output_handler_func_t, buffer_size, "output handler name", erase);
-		php_output_start_internal(handler_name, handler_name_len, my_php_output_handler_func_t, chunk_size, flags);
+		// php_ob_set_internal_handler(my_php_output_handler_func_t, buffer_size, "output handler name", erase TSRMLS_CC);
+		php_output_start_internal(handler_name, handler_name_len, my_php_output_handler_func_t, chunk_size, flags TSRMLS_CC);

 	Starting an internal handler with context:
 		// not possible with old API
 		php_output_handler *h;
-		h = php_output_handler_create_internal(handler_name, handler_name_len, my_php_output_handler_context_func_t, chunk_size, flags);
+		h = php_output_handler_create_internal(handler_name, handler_name_len, my_php_output_handler_context_func_t, chunk_size, flags TSRMLS_CC);
 		php_output_handler_set_context(h, my_context, my_context_dtor);
-		php_output_handler_start(h);
+		php_output_handler_start(h TSRMLS_CC);

 	Testing whether a certain output handler has already been started:
-		// php_ob_handler_used("output handler name");
-		php_output_handler_started(handler_name, handler_name_len);
+		// php_ob_handler_used("output handler name" TSRMLS_CC);
+		php_output_handler_started(handler_name, handler_name_len TSRMLS_CC);

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

 	Flushing all output buffers:
 		// not possible with old API
-		php_output_flush_all();
+		php_output_flush_all(TSRMLS_C);

 	Cleaning one output buffer:
-		// php_ob_end_buffer(0, 1);
-		php_output_clean();
+		// php_ob_end_buffer(0, 1 TSRMLS_CC);
+		php_output_clean(TSRMLS_C);

 	Cleaning all output buffers:
 		// not possible with old API
-		php_output_clean_all();
+		php_output_clean_all(TSRMLS_C);

 	Discarding one output buffer:
-		// php_ob_end_buffer(0, 0);
-		php_output_discard();
+		// php_ob_end_buffer(0, 0 TSRMLS_CC);
+		php_output_discard(TSRMLS_C);

 	Discarding all output buffers:
-		// php_ob_end_buffers(0);
-		php_output_discard_all();
+		// php_ob_end_buffers(0 TSRMLS_CC);
+		php_output_discard_all(TSRMLS_C);

 	Stopping (and dropping) one output buffer:
-		// php_ob_end_buffer(1, 0)
-		php_output_end();
+		// php_ob_end_buffer(1, 0 TSRMLS_CC)
+		php_output_end(TSRMLS_C);

 	Stopping (and dropping) all output buffers:
-		// php_ob_end_buffers(1, 0);
-		php_output_end_all();
+		// php_ob_end_buffers(1, 0 TSRMLS_CC);
+		php_output_end_all(TSRMLS_C);

 	Retrieving output buffers contents:
-		// php_ob_get_buffer(zstring);
-		php_output_get_contents(zstring);
+		// php_ob_get_buffer(zstring TSRMLS_CC);
+		php_output_get_contents(zstring TSRMLS_CC);

 	Retrieving output buffers length:
-		// php_ob_get_length(zlength);
-		php_output_get_length(zlength);
+		// php_ob_get_length(zlength TSRMLS_CC);
+		php_output_get_length(zlength TSRMLS_CC);

 	Retrieving output buffering level:
 		// OG(nesting_level);
-		php_output_get_level();
+		php_output_get_level(TSRMLS_C);

 	Issue a warning because of an output handler conflict:
-		// php_ob_init_conflict("to be started handler name", "to be tested if already started handler name");
-		php_output_handler_conflict(new_handler_name, new_handler_name_len, set_handler_name, set_handler_name_len);
+		// php_ob_init_conflict("to be started handler name", "to be tested if already started handler name" TSRMLS_CC);
+		php_output_handler_conflict(new_handler_name, new_handler_name_len, set_handler_name, set_handler_name_len TSRMLS_CC);

 	Registering a conflict checking function, which will be checked prior starting the handler:
 		// not possible with old API, unless hardcoding into output.c
-		php_output_handler_conflict_register(handler_name, handler_name_len, my_php_output_handler_conflict_check_t);
+		php_output_handler_conflict_register(handler_name, handler_name_len, my_php_output_handler_conflict_check_t TSRMLS_CC);

 	Registering a reverse conflict checking function, which will be checked prior starting the specified foreign handler:
 		// not possible with old API
-		php_output_handler_reverse_conflict_register(foreign_handler_name, foreign_handler_name_len, my_php_output_handler_conflict_check_t);
+		php_output_handler_reverse_conflict_register(foreign_handler_name, foreign_handler_name_len, my_php_output_handler_conflict_check_t TSRMLS_CC);

 	Facilitating a context from within an output handler callable with ob_start():
 		// not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_OPAQ, (void *) &custom_ctx_ptr_ptr);
+		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_OPAQ, (void *) &custom_ctx_ptr_ptr TSRMLS_CC);

 	Disabling of the output handler by itself:
 		//not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_DISABLE, NULL);
+		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_DISABLE, NULL TSRMLS_CC);

 	Marking an output handler immutable by itself because of irreversibility of its operation:
 		// not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE, NULL);
+		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE, NULL TSRMLS_CC);

 	Restarting the output handler because of a CLEAN operation:
 		// not possible with old API
@@ -13,8 +13,8 @@ meaningful error messages.
 Prototypes
 ----------
 /* Implemented. */
-int zend_parse_parameters(int num_args, char *type_spec, ...);
-int zend_parse_parameters_ex(int flags, int num_args, char *type_spec, ...);
+int zend_parse_parameters(int num_args TSRMLS_DC, char *type_spec, ...);
+int zend_parse_parameters_ex(int flags, int num_args TSRMLS_DC, char *type_spec, ...);

 The zend_parse_parameters() function takes the number of parameters
 passed to the extension function, the type specifier string, and the
@@ -30,7 +30,7 @@ resources cannot be auto-converted.

 PHP 5.5 includes a new function:

-int zend_parse_parameter(int flags, int arg_num, zval **arg, const char *spec, ...);
+int zend_parse_parameter(int flags, int arg_num TSRMLS_DC, zval **arg, const char *spec, ...);

 This function behaves like zend_parse_parameters_ex() except that instead of
 reading the arguments from the stack, it receives a single zval to convert
@@ -63,10 +63,10 @@ Type specifiers
 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)
- P  - valid path (string without null bytes in the middle) as zend_string (zend_string*)
+ P  - valid path (string without null bytes in the middle) as zend_string (zend_string)
 r  - resource (zval*)
 s  - string (with possible null bytes) and its length (char*, size_t)
- S  - string (with possible null bytes) as zend_string (zend_string*)
+ S  - string (with possible null bytes) as zend_string (zend_string)
 z  - the actual zval (zval*)
 *  - variable arguments list (0 or more)
 +  - variable arguments list (1 or more)
@@ -97,11 +97,11 @@ Both mistakes might cause memory corruptions and segfaults:
 1)
  char *str;
  long str_len; /* XXX THIS IS WRONG!! Use size_t instead. */
-  zend_parse_parameters(ZEND_NUM_ARGS(), "s", &str, &str_len)
+  zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len)

 2)
  int num; /* XXX THIS IS WRONG!! Use zend_long instead. */
-  zend_parse_parameters(ZEND_NUM_ARGS(), "l", &num)
+  zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &num)

 If you're in doubt, use check_parameters.php script to the parameters 
 and their types (it can be found in ./scripts/dev/ directory of PHP sources):
@@ -116,7 +116,7 @@ zend_long l;
 char *s;
 size_t s_len;
 zval *param;
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "lsz",
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lsz",
                          &l, &s, &s_len, &param) == FAILURE) {
    return;
 }
@@ -126,7 +126,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "lsz",
 zval *obj;
 double d = 0.5;
 zend_class_entry *my_ce;
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|d",
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|d",
                          &obj, my_ce, &d) == FAILURE) {
    return;
 }
@@ -136,7 +136,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|d",
   If null is passed for object, obj will be set to NULL. */
 zval *obj;
 zval *arr;
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "o!a",
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o!a",
                          &obj, &arr) == FAILURE) {
    return;
 }
@@ -144,7 +144,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "o!a",

 /* Gets a separated array which can also be null. */
 zval *arr;
-if (zend_parse_parameters(ZEND_NUM_ARGS(), "a/!",
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!",
                          &arr) == FAILURE) {
    return;
 }
@@ -161,10 +161,10 @@ char *s;
 */
 size_t length;

-if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(),
+if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
                             "lll", &l1, &l2, &l3) == SUCCESS) {
    /* manipulate longs */
-} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(),
+} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
                                    "s", &s, &length) == SUCCESS) {
    /* manipulate string */
 } else {
@@ -180,7 +180,7 @@ int i, num_varargs;
 zval *varargs = NULL;


-if (zend_parse_parameters(ZEND_NUM_ARGS(), "*", &varargs, &num_varargs) == FAILURE) {
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "*", &varargs, &num_varargs) == FAILURE) {
    return;
 }

@@ -200,7 +200,7 @@ size_t str_len;
 int i, num_varargs;
 zval *varargs = NULL;

-if (zend_parse_parameters(ZEND_NUM_ARGS(), "s+", &str, &str_len, &varargs, &num_varargs) == FAILURE) {
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s+", &str, &str_len, &varargs, &num_varargs) == FAILURE) {
    return;
 }

@@ -214,7 +214,7 @@ zval *array;
 int i, num_varargs;
 zval *varargs = NULL;

-if (zend_parse_parameters(ZEND_NUM_ARGS(), "a*l", &array, &varargs, &num_varargs, &num) == FAILURE) {
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a*l", &array, &varargs, &num_varargs, &num) == FAILURE) {
    return;
 }

@@ -5,16 +5,17 @@
 5. ext/standard crypt
 6. ext/standard crypt's blowfish implementation
 7. Sqlite/Sqlite3 ext/sqlite3 ext/sqlite
-8. ext/standard/rand
-9. ext/standard/scanf
-10. ext/standard/strnatcmp.c
-11. ext/standard/uuencode
-12. libxmlrpc ext/xmlrpc
-13. libzip ext/zip
-14. main/snprintf.c
-15. main/strlcat
-16. main/strlcpy
-17. libgd see ext/gd/libgd/COPYING
+8. ext/json/json_parser
+9. ext/standard/rand
+10. ext/standard/scanf
+11. ext/standard/strnatcmp.c
+12. ext/standard/uuencode
+13. libxmlrpc ext/xmlrpc
+14. libzip ext/zip
+15. main/snprintf.c
+16. main/strlcat
+17. main/strlcpy
+18. libgd see ext/gd/libgd/COPYING

 5. ext/standard crypt

@@ -103,7 +104,31 @@ a legal notice, here is a blessing:
  May you share freely, never taking more than you give.


-8. ext/standard/rand
+8. ext/json/json_parser
+Copyright (c) 2005 JSON.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+9. ext/standard/rand
 The following php_mt_...() functions are based on a C++ class MTRand by
 Richard J. Wagner. For more information see the web page at
 http://www-personal.engin.umich.edu/~wagnerr/MersenneTwister.html
@@ -156,7 +181,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


-9. ext/standard/scanf
+10. ext/standard/scanf
 scanf.c --

 This file contains the base code which implements sscanf and by extension
@@ -202,7 +227,7 @@ authors grant the U.S. Government and others acting in its behalf
 permission to use and distribute the software in accordance with the
 terms specified in this license.

-10. ext/standard/strnatcmp.c
+11. ext/standard/strnatcmp.c

 strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
 Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au>
@@ -223,7 +248,7 @@ freely, subject to the following restrictions:
 	 misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.

-11. ext/standard/uuencode
+12. ext/standard/uuencode
 Portions of this code are based on Berkeley's uuencode/uudecode
 implementation.

@@ -259,7 +284,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.


-12. libxmlrpc ext/xmlrpc
+13. libxmlrpc ext/xmlrpc

 Copyright 2000 Epinions, Inc. 

@@ -283,7 +308,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE (HOWEVER ARISING, INCLUDING
 NEGLIGENCE), EVEN IF EPINIONS, INC.  IS AWARE OF THE POSSIBILITY OF SUCH 
 DAMAGES.

-13. libzip ext/zip
+14. libzip ext/zip
 zip.h -- exported declarations.
 Copyright (C) 1999-2009 Dieter Baron and Thomas Klausner

@@ -315,7 +340,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-14. main/snprintf.c
+15. main/snprintf.c
 Copyright (c) 2002, 2006 Todd C. Miller <Todd.Miller@courtesan.com>

 Permission to use, copy, modify, and distribute this software for any
@@ -388,8 +413,8 @@ This code is based on, and used with the permission of, the
 SIO stdio-replacement strx_* functions by Panos Tsirigotis
 <panos@alumni.cs.colorado.edu> for xinetd.

-15. main/strlcat
-16. main/strlcpy
+16. main/strlcat
+17. main/strlcpy
 Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
 All rights reserved.

@@ -17,7 +17,7 @@ It is recommended to do so a couple of days before the packaging day, to
 have enough time to investigate failures, communicate with the authors and
 commit the fixes.
 The RM for the branch is also responsible for keeping the CI green on
-ongoing basis between the releases. Check the CI status for your branch
+ongoing bases between the releases. Check the CI status for your branch
 periodically and resolve the failures ASAP. See more in:
 https://wiki.php.net/rfc/travis_ci

@@ -31,7 +31,7 @@ team (Bjori) on hand.

 6. Verify the tags to be extra sure everything was tagged properly.

-7. Moving extensions from/to PECL requires write access to the destination.
+7. Moving extensions from/to PECL requires write acces to the destination.
 Most developers should have this. 

 Moving extensions from php-src to PECL
@@ -266,13 +266,11 @@ to upgrade.

 8. Commit all the changes to their respective git repos

-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,
+9. 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 separate email.
-This is to make sure that replies to the announcement on php-general@ or internals@
+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)
@@ -309,6 +307,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 separate email.
-This is to make sure that replies to the announcement on php-general@ or internals@
+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.
@@ -28,7 +28,7 @@ The main functions are:
 PHPAPI size_t php_stream_read(php_stream * stream, char * buf, size_t count);
 PHPAPI size_t php_stream_write(php_stream * stream, const char * buf, size_t
        count);
-PHPAPI size_t php_stream_printf(php_stream * stream, 
+PHPAPI size_t php_stream_printf(php_stream * stream TSRMLS_DC, 
        const char * fmt, ...);
 PHPAPI int php_stream_eof(php_stream * stream);
 PHPAPI int php_stream_getc(php_stream * stream);
@@ -47,7 +47,7 @@ Opening Streams
 In most cases, you should use this API:

 PHPAPI php_stream *php_stream_open_wrapper(const char *path, const char *mode,
-    int options, char **opened_path);
+    int options, char **opened_path TSRMLS_DC);

 Where:
    path is the file or resource to open.
@@ -80,7 +80,7 @@ PHPAPI php_stream *php_stream_fopen_tmpfile(void);
    Open a FILE * with tmpfile() and convert into a stream.

 PHPAPI php_stream *php_stream_fopen_temporary_file(const char *dir,
-    const char *pfx, char **opened_path);
+    const char *pfx, char **opened_path TSRMLS_DC);
    Generate a temporary file name and open it.

 There are some network enabled relatives in php_network.h:
@@ -138,7 +138,7 @@ SAPI_INPUT_FILTER_FUNC(my_sapi_input_filter)
    strcpy(raw_var, "RAW_");
    strlcat(raw_var,var,var_len+5);

-    php_register_variable_ex(raw_var, &new_var, array_ptr);
+    php_register_variable_ex(raw_var, &new_var, array_ptr TSRMLS_DC);

    php_strip_tags(*val, val_len, NULL, NULL, 0);

@@ -154,7 +154,7 @@ PHP_FUNCTION(my_get_raw)
    zval **tmp;
    zval *array_ptr = NULL;

-    if(zend_parse_parameters(2, "ls", &arg, &var, &var_len) == FAILURE) {
+    if(zend_parse_parameters(2 TSRMLS_CC, "ls", &arg, &var, &var_len) == FAILURE) {
        return;
    }

@@ -10,7 +10,7 @@ Pull Requests
 =============
 PHP accepts pull requests via github. Discussions are done on github, but
 depending on the topic can also be relayed to the official PHP developer
-mailing list internals@lists.php.net.
+mailinglist internals@lists.php.net.

 New features require an RFC and must be accepted by the developers.
 See https://wiki.php.net/rfc and https://wiki.php.net/rfc/voting for more
@@ -165,13 +165,11 @@ TSRM_API void *tsrm_get_ls_cache(void);

 #define TSRMLS_FETCH_FROM_CTX(ctx)	void ***tsrm_ls = (void ***) ctx
 #define TSRMLS_SET_CTX(ctx)		ctx = (void ***) tsrm_get_ls_cache()
-#define TSRMG(id, type, element)	(TSRMG_BULK(id, type)->element)
-#define TSRMG_BULK(id, type)	((type) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(id)])
+#define TSRMG(id, type, element)	(((type) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element)

-#define TSRMG_STATIC(id, type, element)	(TSRMG_BULK_STATIC(id, type)->element)
-#define TSRMG_BULK_STATIC(id, type)	((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)])
-#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE;
-#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL;
+#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
 #if ZEND_DEBUG
 #define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache()
 #else
@@ -202,8 +200,6 @@ TSRM_API void *tsrm_get_ls_cache(void);
 #define TSRMLS_CACHE_UPDATE()
 #define TSRMLS_CACHE

-#define TSRM_TLS
-
 /* BC only */
 #define TSRMLS_D	void
 #define TSRMLS_DC
@@ -1,197 +0,0 @@
-# =================================================================================
-#  http://www.gnu.org/software/autoconf-archive/ax_func_which_gethostbyname_r.html
-# =================================================================================
-#
-# SYNOPSIS
-#
-#   AX_FUNC_WHICH_GETHOSTBYNAME_R
-#
-# DESCRIPTION
-#
-#   Determines which historical variant of the gethostbyname_r() call
-#   (taking three, five, or six arguments) is available on the system and
-#   defines one of the following macros accordingly:
-#
-#     HAVE_FUNC_GETHOSTBYNAME_R_6
-#     HAVE_FUNC_GETHOSTBYNAME_R_5
-#     HAVE_FUNC_GETHOSTBYNAME_R_3
-#
-#   as well as
-#
-#     HAVE_GETHOSTBYNAME_R
-#
-#   If used in conjunction with gethostname.c, the API demonstrated in
-#   test.c can be used regardless of which gethostbyname_r() is available.
-#   These example files can be found at
-#   http://www.csn.ul.ie/~caolan/publink/gethostbyname_r
-#
-#   based on David Arnold's autoconf suggestion in the threads faq
-#
-#   Originally named "AC_caolan_FUNC_WHICH_GETHOSTBYNAME_R". Rewritten for
-#   Autoconf 2.5x, and updated for 2.68 by Daniel Richard G.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Caolan McNamara <caolan@skynet.ie>
-#   Copyright (c) 2008 Daniel Richard G. <skunk@iskunk.org>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 7
-
-AC_DEFUN([AX_FUNC_WHICH_GETHOSTBYNAME_R], [
-
-    AC_LANG_PUSH([C])
-    AC_MSG_CHECKING([how many arguments gethostbyname_r() takes])
-
-    AC_CACHE_VAL([ac_cv_func_which_gethostbyname_r], [
-
-################################################################
-
-ac_cv_func_which_gethostbyname_r=unknown
-
-#
-# ONE ARGUMENT (sanity check)
-#
-
-# This should fail, as there is no variant of gethostbyname_r() that takes
-# a single argument. If it actually compiles, then we can assume that
-# netdb.h is not declaring the function, and the compiler is thereby
-# assuming an implicit prototype. In which case, we're out of luck.
-#
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>],
-        [
-            char *name = "www.gnu.org";
-            (void)gethostbyname_r(name) /* ; */
-        ])],
-    [ac_cv_func_which_gethostbyname_r=no])
-
-#
-# SIX ARGUMENTS
-# (e.g. Linux)
-#
-
-if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
-
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>],
-        [
-            char *name = "www.gnu.org";
-            struct hostent ret, *retp;
-            char buf@<:@1024@:>@;
-            int buflen = 1024;
-            int my_h_errno;
-            (void)gethostbyname_r(name, &ret, buf, buflen, &retp, &my_h_errno) /* ; */
-        ])],
-    [ac_cv_func_which_gethostbyname_r=six])
-
-fi
-
-#
-# FIVE ARGUMENTS
-# (e.g. Solaris)
-#
-
-if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
-
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>],
-        [
-            char *name = "www.gnu.org";
-            struct hostent ret;
-            char buf@<:@1024@:>@;
-            int buflen = 1024;
-            int my_h_errno;
-            (void)gethostbyname_r(name, &ret, buf, buflen, &my_h_errno) /* ; */
-        ])],
-    [ac_cv_func_which_gethostbyname_r=five])
-
-fi
-
-#
-# THREE ARGUMENTS
-# (e.g. AIX, HP-UX, Tru64)
-#
-
-if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
-
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>],
-        [
-            char *name = "www.gnu.org";
-            struct hostent ret;
-            struct hostent_data data;
-            (void)gethostbyname_r(name, &ret, &data) /* ; */
-        ])],
-    [ac_cv_func_which_gethostbyname_r=three])
-
-fi
-
-################################################################
-
-]) dnl end AC_CACHE_VAL
-
-case "$ac_cv_func_which_gethostbyname_r" in
-    three|five|six)
-    AC_DEFINE([HAVE_GETHOSTBYNAME_R], [1],
-              [Define to 1 if you have some form of gethostbyname_r().])
-    ;;
-esac
-
-case "$ac_cv_func_which_gethostbyname_r" in
-    three)
-    AC_MSG_RESULT([three])
-    AC_DEFINE([HAVE_FUNC_GETHOSTBYNAME_R_3], [1],
-              [Define to 1 if you have the three-argument form of gethostbyname_r().])
-    ;;
-
-    five)
-    AC_MSG_RESULT([five])
-    AC_DEFINE([HAVE_FUNC_GETHOSTBYNAME_R_5], [1],
-              [Define to 1 if you have the five-argument form of gethostbyname_r().])
-    ;;
-
-    six)
-    AC_MSG_RESULT([six])
-    AC_DEFINE([HAVE_FUNC_GETHOSTBYNAME_R_6], [1],
-              [Define to 1 if you have the six-argument form of gethostbyname_r().])
-    ;;
-
-    no)
-    AC_MSG_RESULT([cannot find function declaration in netdb.h])
-    ;;
-
-    unknown)
-    AC_MSG_RESULT([can't tell])
-    ;;
-
-    *)
-    AC_MSG_ERROR([internal error])
-    ;;
-esac
-
-AC_LANG_POP
-
-]) dnl end AC_DEFUN
-
@@ -1,4 +1,3 @@
-m4_include([TSRM/m4/gethostbyname.m4])

 dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND)	
 AC_DEFUN([TSRM_CHECK_GCC_ARG],[
@@ -33,8 +32,6 @@ AC_CHECK_HEADERS(stdarg.h)

 AC_CHECK_FUNCS(sigprocmask)

-AX_FUNC_WHICH_GETHOSTBYNAME_R()
-
 ])


@@ -92,6 +89,7 @@ else
 fi
 ])

+
 AC_DEFUN([TSRM_THREADS_CHECKS],[

 dnl For the thread implementations, we always use --with-*
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2016 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-2016 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-2016 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        |
@@ -49,7 +49,7 @@ TSRMLS_CACHE_UPDATE();
 	globals->shm	 = NULL;
 	globals->process_size = 0;
 	globals->shm_size	  = 0;
-	globals->comspec = _strdup("cmd.exe");
+	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
@@ -437,7 +437,6 @@ static shm_pair *shm_get(int key, void *addr)
 	TWG(shm) = newptr;
 	ptr = newptr + TWG(shm_size);
 	TWG(shm_size)++;
-	memset(ptr, 0, sizeof(*ptr));
 	return ptr;
 }

@@ -599,8 +598,8 @@ TSRM_API int shmget(int key, int size, int flags)
 		return -1;
 	}

-	snprintf(shm_segment, sizeof(shm_segment), "TSRM_SHM_SEGMENT:%d", key);
-	snprintf(shm_info, sizeof(shm_info), "TSRM_SHM_DESCRIPTOR:%d", key);
+	sprintf(shm_segment, "TSRM_SHM_SEGMENT:%d", key);
+	sprintf(shm_info, "TSRM_SHM_DESCRIPTOR:%d", key);

 	shm_handle  = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_segment);
 	info_handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_info);
@@ -612,12 +611,6 @@ TSRM_API int shmget(int key, int size, int flags)
 			created		= TRUE;
 		}
 		if (!shm_handle || !info_handle) {
-			if (shm_handle) {
-				CloseHandle(shm_handle);
-			}
-			if (info_handle) {
-				CloseHandle(info_handle);
-			}
 			return -1;
 		}
 	} else {
@@ -627,11 +620,6 @@ TSRM_API int shmget(int key, int size, int flags)
 	}

 	shm = shm_get(key, NULL);
-	if (!shm) {
-		CloseHandle(shm_handle);
-		CloseHandle(info_handle);
-		return -1;
-	}
 	shm->segment = shm_handle;
 	shm->info	 = info_handle;
 	shm->descriptor = MapViewOfFileEx(shm->info, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2016 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,6 @@
-PHP 7.1 UPGRADE NOTES
+$Id$
+
+PHP X.Y UPGRADE NOTES

 1. Backward Incompatible Changes
 2. New Features
@@ -19,157 +21,729 @@ PHP 7.1 UPGRADE NOTES
 1. Backward Incompatible Changes
 ========================================

- Core:
-  . 'void' can no longer be used as the name of a class, interface, or trait.
-    This applies to declarations, class_alias() and use statements.
-  . (int), intval() where $base is 10 or unspecified, settype(), decbin(),
-    decoct(), dechex(), integer operators and other conversions now always
-    respect scientific notation in numeric strings.
-    (RFC: https://wiki.php.net/rfc/invalid_strings_in_arithmetic)
-  . The ASCII 0x7F Delete control character is no longer permitted in unquoted
-    identifiers in source code.
-  . The following functions may no longer be called dynamically using $func(),
-    call_user_func(), array_map() or similar:
-     . extract()
-     . compact()
-     . get_defined_vars()
-     . func_get_args()
-     . func_get_arg()
-     . func_num_args()
-     . parse_str() with one argument
-     . mb_parse_str() with one argument
-     . assert() with a string argument
-    (RFC: https://wiki.php.net/rfc/forbid_dynamic_scope_introspection)
-  . If the error_log is set to syslog, the PHP error levels are mapped to the
-    syslog error levels. This brings finer differentiation in the error logs
-    in contrary to the previous approach where all the errors are loggged with
-    the notice level only.
+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 a warning and return false:
+
+      var_dump(1 >> -1); // bool(false)
+      // Warning: 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.
+  . 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
+    handler, too.
+
+- GMP
+  . Requires libgmp version 4.2 or newer now.
+  . 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:
-  . When calling json_encode with JSON_UNESCAPED_UNICODE option, U+2028 and
-    U+2029 are escaped.
+  . 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 void return type, which requires that a function not return a value.
-    (RFC: https://wiki.php.net/rfc/void_return_type)
-  . String offset access now supports negative references, which will be
-    counted from the end of the string.
-    (RFC: https://wiki.php.net/rfc/negative-string-offsets)
-  . Added a form of the list() construct where keys can be specified.
-    (RFC: https://wiki.php.net/rfc/list_keys)
-  . Added [] = as alternative construct to list() =.
-    (RFC: https://wiki.php.net/rfc/short_list_syntax)
-  . Number operators taking numeric strings now emit "A non well formed numeric
-    value encountered" E_NOTICEs for leading-numeric strings, and "A
-    non-numeric value encountered" E_WARNINGs for non-numeric strings.
-    This always applies to the +, -, *, /, **, %, << and >> operators, and
-    their assignment counterparts +=, -=, *=, /=, **=, %=, <<= and >>=.
-    For the bitwise operators |, & and ^, and their assignment counterparts
-    |=, &= and ^=, this only applies where only one operand is a string.
-    Note that this never applies to the bitwise NOT operator, ~, which does not
-    handle numeric strings, nor to the increment and decrement operators
-    ++ and --, which have a unique approach to handling numeric strings.
-    (RFC: https://wiki.php.net/rfc/invalid_strings_in_arithmetic)
+  . 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 (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 declatarations 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)
+
+- 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 in 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.

 ========================================
 3. Changes in SAPI modules
 ========================================

+- FPM
+  . Fixed bug #65933 (Cannot specify config lines longer than 1024 bytes).
+  . Listen = port now listen on all addresses (IPv6 and IPv4-mapped).
+
 ========================================
 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
 ========================================
- get_headers() has an extra parameter which allows passing a custom stream
-  context.
- The first $varname argument for getenv() is no longer mandatory, the
-  current environment variables will be returned as an associative array
-  when omitted.
- json_encode() accepts new option JSON_UNESCAPED_LINE_TERMINATORS that
-  disables escaping of U+2028 and U+2029 characters when
-  JSON_UNESCAPED_UNICODE is supplied.
- long2ip() accepts integer as parameter now
- pg_last_notice() accepts optional long parameter to specify operation.
-  PGSQL_NOTICE_LAST - Get last notice (Default)
-  PGSQL_NOTICE_ALL - Get all stored notices
-  PGSQL_NOTICE_CLEAR - Remove all stored notices
-  It returns empty string or array on successful PGSQL_NOTICE_LAST/ALL calls.
-  It returned FALSE for empty notice previously.
- pg_fetch_all() accepts 2nd optional result type parameter like
-  pg_fetch_row().
- pg_select() accepts 4th optional result type parameter like pg_fetch_row().
- parse_url() is more restrictive now and supports RFC3986.
- unpack() accepts an additional optional $offset argument. '@' format code
-  (that specifes an absolute position) is applyed to input data after
-  the $offset argument.
- strpos(), stripos(), substr_count(), grapheme_strpos(), grapheme_stripos(),
-  grapheme_extract(), iconv_strpos(), mb_strimwidth(), mb_ereg_search_setpos(),
-  mb_strpos() and mb_stripos() now accept negative string offsets.
- substr_count() and mb_strimwidth() additionally also accept negative length.
- file_get_contents() accepts a negative seek offset if the stream is seekable.
+
+- parse_ini_file():
+- parse_ini_string():
+  . 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"]);
+
+- 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.

 ========================================
 6. New Functions
 ========================================
+- GMP
+  . 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
 ========================================

+
 ========================================
 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
 ========================================
- SQLite3:
-  . Upgraded bundled SQLite lib to 3.9.2
+
+- Mhash
+  Mhash is not an extension anymore, use function_exists("mhash") to check whether
+  it is avaliable.

 ========================================
 10. New Global Constants
 ========================================

- JSON:
-  . JSON_UNESCAPED_LINE_TERMINATORS
+- Core
+  . PHP_INT_MIN added.

- Pgsql:
-  PGSQL_NOTICE_LAST
-  PGSQL_NOTICE_ALL
-  PGSQL_NOTICE_CLEAR
+- 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
 ========================================

+- 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 ftok()
+- Core
+  . Support for native 64 bit integers in 64 bit builds.
+  . Support for large files in 64 bit builds.
+  . Support for getrusage()

- FCGI
-  . PHP_FCGI_CHILDREN is respected. If this environment variable is defined,
-    the first php-fcgi.exe process will exec the specified number of children.
-    Those will share the same TCP socket. 
+- 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.

- readline:
-  . The readline extension is supported through the WinEditLine library
-    (http://mingweditline.sourceforge.net/). Thereby, the interactive CLI
-    shell is supported as well (php.exe -a).
-
-    It is well known, but nevertheless is worth mentioning again, that
-    the readline extension is not thread safe and will never be. Thus,
-    the usage of it with any true thread safe SAPI (like Apache mod_winnt) is
-    strongely discouraged.
+- odbc
+  . The odbc extension is always shipped shared

 ========================================
 13. Other Changes
 ========================================

+- 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.
+  . 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.
@@ -1,13 +1,28 @@
-PHP 7.1 INTERNALS UPGRADE NOTES
+$Id$
+
+PHP 7.0 INTERNALS UPGRADE NOTES

 0. Wiki Examples
 1. Internal API changes
+  e. New data types
+  f. zend_parse_parameters() specs
+  g. sprintf() formats
+  h. HashTable API
+  i. New portable macros for large file support
+  j. New portable macros for integers
+  k. get_class_entry object handler info
+  l. get_class_name object handler info
+  m. Other portable macros info
+  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

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

-3. Module changes

 ================
 0. Wiki Examples
@@ -21,6 +36,181 @@ changes. See: https://wiki.php.net/phpng-upgrading
 1. Internal API changes
 ========================

+  e. New data types
+
+     String
+
+        Besides the old way of accepting the strings with 's', the new 'S' ZPP spec
+	was introduced. It expects an argument of the type zend_string *. String lengths
+	in it are bound to the size_t datatype.
+
+     Integer types
+
+	Integers do no more depend on the firm 'long' type. Instead a platform
+	dependent integer type is used, it is called zend_long. That datatype is
+	defined dynamically to guarantee the consistent 64 bit support. The zval 
+	field representing user land integer it bound to zend_long.
+
+	Signed integer is defined as zend_long, unsigned integer as zend_ulong
+	inside Zend. 
+
+     Other datatypes
+
+	zend_off_t  - portable off_t analogue
+	zend_stat_t - portable 'struct stat' analogue
+
+	These datatypes are declared to be portable across platforms. Thus, direct
+	usage of the functions like fseek, stat, etc. as well as direct usage of
+	off_t and struct stat is strongly not recommended. Instead the portable
+	macros should be used.
+
+	zend_fseek - portable fseek equivalent
+	zend_ftell - portable ftell equivalent
+	zend_lseek - portable lseek equivalent
+	zend_fstat - portable fstat equivalent
+	zend_stat  - portable stat equivalent
+
+  f. zend_parse_parameters() specs
+
+       The new spec 'S' introduced, which expects an argument of type zend_string *.
+       The 'l' spec expects a parameter of the type zend_long, not long anymore.
+       The 's' spec expects parameters of the type char * and size_t, no int anymore.
+
+  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'
+       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. With snprintf the
+       macros ZEND_INT_FMT and ZEND_UINT_FMT should be used.
+
+  h. HashTable API
+
+       Datatype for array indexes was changed to zend_ulong, for string keys to zend_string *.
+
+  i. New portable macros for large file support
+
+      Function(s)       Alias           Comment
+      stat, _stat64     zend_stat   for use with zend_stat_t
+      fstat, _fstat64   zend_fstat  for use with zend_stat_t
+      lseek, _lseeki64  zend_lseek  for use with zend_off_t
+      ftell, _ftelli64  zend_ftell  for use with zend_off_t
+      fseek, _fseeki64  zend_fseek  for use with zend_off_t
+
+  j. New portable macros for integers
+
+      Function(s)                                         Alias             Comment
+      snprintf with "%ld" or "%lld", _ltoa_s, _i64toa_s   ZEND_LTOA         for use with zend_long
+      atol, atoll, _atoi64                                ZEND_ATOL         for use with zend_long
+      strtol, strtoll, _strtoi64                          ZEND_STRTOL       for use with zend_long
+      strtoul, strtoull, _strtoui64                       ZEND_STRTOUL      for use with zend_long
+      abs, llabs, _abs64                                  ZEND_ABS          for use with zend_long
+      -                                                   ZEND_LONG_MAX     replaces LONG_MAX where appropriate
+      -                                                   ZEND_LONG_MIN     replaces LONG_MIN where appropriate
+      -                                                   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.
+
+  l. The get_class_name object handler is now only used for displaying class
+     names in debugging functions like var_dump(). It is no longer used in
+     get_class(), get_parent_class() or similar.
+
+     The handler is now obligatory, no longer accepts a `parent` argument and
+     must return a non-NULL zend_string*, which will be released by the caller.
+
+  m. Other portable macros info
+
+     ZEND_SECURE_ZERO     - zeroes chunk of memory
+     ZEND_VALID_SOCKET    - validates a php_socket_t variable 
+
+     ZEND_FASTCALL is defined to use __vectorcall convention on VS2013 and above
+     ZEND_NORETURN is defined as __declspec(noreturn) on VS
+
+  n. The ZEND_ENGINE_2 macro has been removed. A ZEND_ENGINE_3 macro has been added.
+  
+  o. Removed ZEND_ACC_FINAL_CLASS in favour of ZEND_ACC_FINAL, turning final class
+     modifier now a different class entry flag. Update your extensions.
+
+  p. TSRM changes
+
+     The TSRM layer undergone significant changes. It is not necessary anymore to 
+     pass the tsrm_ls pointer explicitly. The TSRMLS_* macros should not be used
+     in any new developments.
+
+     The recommended way accessing globals in TS builds is by implementing it
+     to use a local thread unique pointer to the corresponding data pool. These
+     are the new macros that serve to achieve this goal:
+
+     - ZEND_TSRMG - based on TSRMG and if static pointer for data pool access is
+       implemented, will use it
+     - ZEND_TSRMLS_CACHE_EXTERN - to be used in a header shared across multiple
+       C/C++ files
+     - ZEND_TSRMLS_CACHE_DEFINE - to be used in the main extension C/C++ file
+     - ZEND_TSRMLS_CACHE_UPDATE - to be integrated at the top of the globals
+       ctor or RINIT function
+     - ZEND_ENABLE_STATIC_TSRMLS_CACHE - to be used in the config.[m4|w32] for
+       enabling the globals access per thread unique pointer
+     - TSRMLS_CACHE - expands to the variable name which links to the thread
+       unique data pool
+
+     Note that usually it will work without implementing the globals access per
+     a thread unique pointer, however it might cause a slowdown. The reason is
+     that the access model to the extension/SAPI own globals as well as the
+     access to the core globals is determined in the compilation phase depending
+     on whether ZEND_ENABLE_STATIC_TSRMLS_CACHE macro is defined. 
+
+     Due to the current compiler evolution state, the TSRMLS_CACHE pointer
+     (when implemented) has to be present and updated in every binary unit which
+     is not compiled statically into PHP. So any DLL, DSO, EXE, etc. has to take
+     care about defining and updating it's TSRMLS cache. An update should happen
+     before any globals was accessed.
+
+     Porting an extension or SAPI is usually as easy as removing all the TSRMLS_*
+     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.
+
+
 ========================
 2. Build system changes
 ========================
@@ -29,7 +219,51 @@ changes. See: https://wiki.php.net/phpng-upgrading

  b. Windows build system changes

+     - Besides Visual Studio, building with Clang or Intel Composer is now
+       possible. To enable an alternative toolset, add the option
+       --with-toolset=[vs,clang,icc] to the configure line. The default
+       toolset is vs. Still clang or icc need the correct environment
+       which involves many tools from the vs toolset.
+
+       The toolset option is supported by phpize as well.
+
+       AWARENESS The only recommended and supported toolset to produce production
+       ready binaries is Visual Studio. Still other compilers can be used now for
+       testing and analyzing purposes.
+
+     - 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.
+ 
@@ -421,6 +421,7 @@ AC_ARG_ENABLE(gcc-global-regs,
 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
@@ -435,9 +436,6 @@ if test "$ZEND_GCC_GLOBAL_REGS" != "no"; then
 #elif defined(__GNUC__) && ZEND_GCC_VERSION >= 4008 && defined(__powerpc64__)
 # define ZEND_VM_FP_GLOBAL_REG "r28"
 # define ZEND_VM_IP_GLOBAL_REG "r29"
-#elif defined(__IBMC__) && ZEND_GCC_VERSION >= 4002 && 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
@@ -453,7 +451,6 @@ int emu(const opcode_handler_t *ip, void *fp) {
 	FP = orig_fp;
 	IP = orig_ip;
 }
-  ], [
  ], [
    ZEND_GCC_GLOBAL_REGS=yes
  ], [
@@ -1,43 +0,0 @@
--TEST--
-Using indirect append on ArrayAccess object
--FILE--
-<?php
-
-class AA implements ArrayAccess {
-    private $data = [];
-    public function &offsetGet($name) {
-        if (null === $name) {
-            return $this->data[];
-        } else {
-            return $this->data[$name];
-        }
-    }
-    public function offsetSet($name, $value) {
-        $this->data[$name] = $value;
-    }
-    public function offsetUnset($name) {}
-    public function offsetExists($name) {}
-}
-
-$aa = new AA;
-$aa[3] = 1;
-$aa[][][0] = 2;
-var_dump($aa);
-
-?>
--EXPECT--
-object(AA)#1 (1) {
-  ["data":"AA":private]=>
-  array(2) {
-    [3]=>
-    int(1)
-    [4]=>
-    array(1) {
-      [0]=>
-      array(1) {
-        [0]=>
-        int(2)
-      }
-    }
-  }
-}
@@ -38,19 +38,11 @@ var_dump($c);
 echo "Done\n";
 ?>
 --EXPECTF--	
-
-Warning: A non-numeric value encountered in %s on line %d
 int(75636)
-
-Notice: A non well formed numeric value encountered in %s on line %d
 int(951858)
 int(48550510)
 float(75661.68)
-
-Warning: A non-numeric value encountered in %s on line %d
 int(75636)
-
-Notice: A non well formed numeric value encountered in %s on line %d
 int(951858)
 int(48550510)
 float(75661.68)
@@ -19,13 +19,8 @@ var_dump($c);
 echo "Done\n";
 ?>
 --EXPECTF--	
-
-Warning: A non-numeric value encountered in %s on line %d
-
 Exception: Unsupported operand types

-Warning: A non-numeric value encountered in %s on line %d
-
 Fatal error: Uncaught Error: Unsupported operand types in %s:%d
 Stack trace:
 #0 {main}
@@ -1,14 +0,0 @@
--TEST--
-Ensure proper inheritance with get_class(anon class instance) used via class_alias (see also bug #70106)
--FILE--
-<?php
-
-class_alias(get_class(new class { protected $foo = 1; }), "AnonBase");
-var_dump((new class extends AnonBase {
-	function getFoo() {
-		return $this->foo;
-	}
-})->getFoo());
-?>
--EXPECT--
-int(1)
@@ -1,11 +0,0 @@
--TEST--
-Ensure correct unmangling of private property names for anonymous class instances
--FILE--
-<?php
-var_dump(new class { private $foo; });
-?>
--EXPECT--
-object(class@anonymous)#1 (1) {
-  ["foo":"class@anonymous":private]=>
-  NULL
-}
@@ -1,15 +0,0 @@
--TEST--
-closure binding to anonymous class
--FILE--
-<?php
-$class = new class {};
-$foo = function() {
-    return $this;
-};
-
-$closure = Closure::bind($foo, $class, $class);
-var_dump($closure());
-?>
--EXPECTF--
-object(class@anonymous)#1 (0) {
-}
@@ -1,16 +0,0 @@
--TEST--
-anonymous class trait binding
--FILE--
-<?php
-trait TaskTrait {
-    function run() {
-        return 'Running...';
-    }
-}
-$class = new class() {
-  use TaskTrait;
-};
-var_dump($class->run());
-?>
--EXPECTF--
-string(10) "Running..."
@@ -1,36 +0,0 @@
--TEST--
-Array must be separated if unpacking by reference
--FILE--
-<?php
-
-function inc(&... $args) {
-    foreach ($args as &$arg) {
-        $arg++;
-    }
-}
-
-$arr = [1, 2];
-$arr[] = 3;
-$arr2 = $arr;
-inc(...$arr);
-var_dump($arr);
-var_dump($arr2);
-
-?>
--EXPECT--
-array(3) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-  [2]=>
-  int(4)
-}
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
@@ -13,4 +13,4 @@ class Sub extends Base {
 }
 ?>
 --EXPECTF--
-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 
+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--
-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
+Warning: 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
@@ -13,4 +13,4 @@ class Sub extends Base {
 }
 ?>
 --EXPECTF--
-Warning: Declaration of Sub::test($foo, $extra) should be compatible with Base::test($foo, $extra = Array) in %sargument_restriction_006.php on line %d
+Warning: Declaration of Sub::test() should be compatible with Base::test($foo, $extra = Array) in %sargument_restriction_006.php on line %d
@@ -1,19 +0,0 @@
--TEST--
-Array addition is not commutative -- do not swap operands
--FILE--
-<?php
-
-$array = [1, 2, 3];
-$array = [4, 5, 6] + $array;
-var_dump($array);
-
-?>
--EXPECT--
-array(3) {
-  [0]=>
-  int(4)
-  [1]=>
-  int(5)
-  [2]=>
-  int(6)
-}
@@ -1,5 +1,5 @@
 --TEST--
-Array type declaration
+Array type hint
 --FILE--
 <?php
 function foo(array $a) {
@@ -12,8 +12,8 @@ foo(123);
 --EXPECTF--
 3

-Fatal error: Uncaught TypeError: Argument 1 passed to foo() must be of the type array, integer given, called in %s on line 7 and defined in %s: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 %s on line 2
+  thrown in %sarray_type_hint_001.php on line 2
@@ -1,23 +0,0 @@
--TEST--
-Bug #70208 (scope information must be preserved with assert())
--FILE--
-<?php
-
-function non_class_scope() {
-	return true;
-}
-
-class test {
-	protected $prop = 1;
-
-	public function __construct() {
-		assert('non_class_scope();');
-		var_dump($this->prop);
-	}
-}
-
-new test;
-
-?>
--EXPECT--
-int(1)
@@ -1,23 +0,0 @@
--TEST--
-Bug #70528 (assert() with instanceof adds apostrophes around class name)
--INI--
-zend.assertions=1
-assert.exception=0
-assert.warning=1
--FILE--
-<?php
-
-namespace Foo;
-class Bar {}
-
-$bar = "Bar";
-assert(new \stdClass instanceof $bar);
-assert(new \stdClass instanceof Bar);
-assert(new \stdClass instanceof \Foo\Bar);
-?>
--EXPECTF--
-Warning: assert(): assert(new \stdClass() instanceof $bar) failed in %sbug70528.php on line %d
-
-Warning: assert(): assert(new \stdClass() instanceof Bar) failed in %sbug70528.php on line %d
-
-Warning: assert(): assert(new \stdClass() instanceof \Foo\Bar) failed in %sbug70528.php on line %d
@@ -154,7 +154,7 @@ Warning: assert(): assert(0 && ($a = function () {
    $x = $a ? $b : $c;
    $x = $a ?: $c;
    $x = $a ?? $b;
-    [$a, $b, $c] = [1, 2 => 'x', 'z' => 'c'];
+    list($a, $b, $c) = [1, 2 => 'x', 'z' => 'c'];
    @foo();
    $y = clone $x;
    yield 1 => 2;
@@ -18,7 +18,7 @@ bool(true)
 bool(true)

 Warning: assert(): assert(false) failed in %sexpect_016.php on line 6
-bool(false)
+NULL
 bool(true)

 Warning: zend.assertions may be completely enabled or disabled only in php.ini in %sexpect_016.php on line 8
@@ -25,9 +25,9 @@ bool(true)
 bool(true)

 Warning: assert(): assert(false) failed in %sexpect_018.php on line 10
-bool(false)
+NULL
 bool(true)

 Warning: assert(): assert(false) failed in %sexpect_018.php on line 12
-bool(false)
+NULL
 bool(true)
@@ -1,11 +0,0 @@
--TEST--
-Empty statement in assert() shouldn't segfault
--FILE--
-<?php
-
-assert((function () { return true;; })());
-echo "ok";
-
-?>
--EXPECT--
-ok
@@ -1,19 +0,0 @@
--TEST--
-Misoptimization when variable is modified by assert()
--INI--
-zend.assertions=1
--FILE--
-<?php
-
-function test() {
-    $i = 0;
-    assert('$i = new stdClass');
-    $i += 1;
-    var_dump($i);
-}
-test();
-
-?>
--EXPECTF--
-Notice: Object of class stdClass could not be converted to int in %s on line %d
-int(2)
@@ -1,11 +0,0 @@
--TEST--
-Serialization of backtick literal is incorrect
--INI--
-zend.assertions=1
--FILE--
-<?php
-
-assert_options(ASSERT_WARNING);
-assert(false && `echo -n ""`);
--EXPECTF--
-Warning: assert(): assert(false && `echo -n ""`) failed in %s%east_serialize_backtick_literal.php on line %d
@@ -1,10 +0,0 @@
--TEST--
-'break' error (non positive numbers)
--FILE--
-<?php
-function foo () {
-	break 0;
-}
-?>
--EXPECTF--
-Fatal error: 'break' operator accepts only positive numbers in %sbreak_error_001.php on line 3
@@ -1,10 +0,0 @@
--TEST--
-'break' error (operator with non-constant operand)
--FILE--
-<?php
-function foo () {
-	break $x;
-}
-?>
--EXPECTF--
-Fatal error: 'break' operator with non-constant operand is no longer supported in %sbreak_error_002.php on line 3
@@ -1,10 +0,0 @@
--TEST--
-'break' error (not in the loop context)
--FILE--
-<?php
-function foo () {
-	break;
-}
-?>
--EXPECTF--
-Fatal error: 'break' not in the 'loop' or 'switch' context in %sbreak_error_003.php on line 3
@@ -1,12 +0,0 @@
--TEST--
-'break' error (wrong level)
--FILE--
-<?php
-function foo () {
-	while (1) {
-		break 2;
-	}
-}
-?>
--EXPECTF--
-Fatal error: Cannot 'break' 2 levels in %sbreak_error_004.php on line 4
@@ -68,7 +68,7 @@ catch (Exception $e) {
 --EXPECTF--
 Hello World!
 ===NONE===
-string(%d) "Method NoneTest::__toString() must return a string value"
+string(56) "Method NoneTest::__toString() must return a string value"
 ===THROW===

-Fatal error: Method ErrorTest::__toString() must not throw an exception, caught Exception: This is an error! in %sbug26166.php on line %d
+Fatal error: Method ErrorTest::__toString() must not throw an exception in %sbug26166.php on line %d
@@ -6,16 +6,9 @@ $a = new stdClass();
 $x = "";
 $a->$x = "string('')";
 var_dump($a);
-$a->{"\0"} = 42;
-var_dump($a);
 ?>
 --EXPECTF--
-object(stdClass)#1 (1) {
-  [""]=>
-  string(10) "string('')"
-}
-
-Fatal error: Uncaught Error: Cannot access property started with '\0' in %s:%d
+Fatal error: Uncaught Error: Cannot access empty property in %sbug29015.php:4
 Stack trace:
 #0 {main}
-  thrown in %s on line %d
+  thrown in %sbug29015.php on line 4
@@ -3,7 +3,7 @@ Bug #29883 (isset gives invalid values on strings)
 --FILE--
 <?php
 $x = "bug";
-var_dump(isset($x[-10]));
+var_dump(isset($x[-1]));
 var_dump(isset($x["1"]));
 echo $x["1"]."\n";
 ?>
@@ -18,7 +18,7 @@ var_dump(isset($a['b']));
 $simpleString = "Bogus String Text";
 echo isset($simpleString->wrong)?"bug\n":"ok\n";
 echo isset($simpleString["wrong"])?"bug\n":"ok\n";
-echo isset($simpleString[-20])?"bug\n":"ok\n";
+echo isset($simpleString[-1])?"bug\n":"ok\n";
 echo isset($simpleString[0])?"ok\n":"bug\n";
 echo isset($simpleString["0"])?"ok\n":"bug\n";
 echo isset($simpleString["16"])?"ok\n":"bug\n";
@@ -8,8 +8,7 @@ class Thing {}
 function boom()
 {
    $reader = xml_parser_create();
-    $thing = new Thing();
-    xml_set_object($reader, $thing);
+    xml_set_object($reader, new Thing());
    die("ok\n");
    xml_parser_free($reader);
 }
@@ -20,10 +20,10 @@ class Loader {
 		return $this->position >= strlen($this->data);
 	}
 	function stream_flush() {
+		@unlink(dirname(__FILE__)."/bug38779.txt");
 		var_dump("flush!");
 	}
 	function stream_close() {
-		@unlink(dirname(__FILE__)."/bug38779.txt");
 		var_dump("close!");
 	}
 }
@@ -49,4 +49,5 @@ if (file_exists($filename)) {
 ?>
 --EXPECTF--	
 Parse error: %s error%sin %s on line %d
+string(6) "flush!"
 string(6) "close!"
@@ -10,4 +10,5 @@ class foo {
 $obj = new foo("Hello world");
 ?>
 --EXPECTF--
-Fatal error: Cannot use $this as parameter in %s on line %d
+Fatal error: Cannot re-assign $this in %sbug41117_1.php on line 3
+
@@ -9,7 +9,7 @@ $foo[0]->bar = "xyz";
 echo "Done\n";
 ?>
 --EXPECTF--	
-Fatal error: Uncaught Error: Cannot use string offset as an object in %s:%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
@@ -1,5 +1,5 @@
 --TEST--
-Bug #42802 (Namespace not supported in types)
+Bug #42802 (Namespace not supported in typehints)
 --FILE--
 <?php
 namespace foo;
@@ -7,7 +7,7 @@ $b = &$a[1];
 $b = "f";
 echo $a;
 --EXPECTF--
-Fatal error: Uncaught Error: Cannot create references to/from string offsets in %sbug49866.php:3
+Fatal error: Uncaught Error: Cannot create references to/from string offsets nor overloaded objects in %sbug49866.php:3
 Stack trace:
 #0 {main}
  thrown in %sbug49866.php on line 3
@@ -1,20 +0,0 @@
--TEST--
-Bug #52355 (Negating zero does not produce negative zero)
--FILE--
-<?php
-
-var_dump(-0.0);
-var_dump(-(float)"0");
-
-$foo = -sin(0);
-
-var_dump($foo);
-
-var_dump(@(1.0 / -0.0));
-
-?>
--EXPECT--
-float(-0)
-float(-0)
-float(-0)
-float(-INF)
@@ -10,14 +10,14 @@ class A {
 }

 $a = new A();
-$prop = "\0";
+$prop = null;

 unset($a->$prop);

 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Cannot access property started with '\0' in %s:%d
+Fatal error: Uncaught Error: Cannot access empty property in %s:%d
 Stack trace:
-#0 %s(%d): A->__unset('\x00')
+#0 %s(%d): A->__unset('')
 #1 {main}
  thrown in %s on line %d
@@ -10,14 +10,14 @@ class A {
 }

 $a = new A();
-$prop = "\0";
+$prop = null;

 $a->$prop = 2;

 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Cannot access property started with '\0' in %s:%d
+Fatal error: Uncaught Error: Cannot access empty property in %s:%d
 Stack trace:
-#0 %s(%d): A->__set('\x00', 2)
+#0 %s(%d): A->__set('', 2)
 #1 {main}
  thrown in %s on line %d
@@ -10,14 +10,14 @@ class A {
 }

 $a = new A();
-$prop = "\0";
+$prop = null;

 var_dump($a->$prop);

 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Cannot access property started with '\0' in %s:%d
+Fatal error: Uncaught Error: Cannot access empty property in %s:%d
 Stack trace:
-#0 %s(%d): A->__get('\x00')
+#0 %s(%d): A->__get('')
 #1 {main}
  thrown in %s on line %d
@@ -8,7 +8,7 @@ class MyClass {
 		$this->myRef = $value;
 	}
 }
-$myGlobal=new MyClass();
+$myGlobal=new MyClass($myGlobal);
 $myGlobal->myRef=&$myGlobal;
 $myGlobal->myNonExistentProperty="ok\n";
 echo $myGlobal;
@@ -1,45 +0,0 @@
--TEST--
-Bug #53432: Assignment via string index access on an empty string converts to array
--FILE--
-<?php
-
-$str = '';
-var_dump($str[0] = 'a');
-var_dump($str);
-
-$str = '';
-var_dump($str[5] = 'a');
-var_dump($str);
-
-$str = '';
-var_dump($str[-1] = 'a');
-var_dump($str);
-
-$str = '';
-var_dump($str['foo'] = 'a');
-var_dump($str);
-
-$str = '';
-try {
-    var_dump($str[] = 'a');
-} catch (Error $e) {
-    echo "Error: {$e->getMessage()}\n";
-}
-var_dump($str);
-
-?>
--EXPECTF--
-string(1) "a"
-string(1) "a"
-string(1) "a"
-string(6) "     a"
-
-Warning: Illegal string offset:  -1 in %s on line %d
-NULL
-string(0) ""
-
-Warning: Illegal string offset 'foo' in %s on line %d
-string(1) "a"
-string(1) "a"
-Error: [] operator not supported for strings
-string(0) ""
@@ -77,8 +77,8 @@ public function setSelf(Foo6 $s) { }

 }
 --EXPECTF--
-Warning: Declaration of Bar4::setSelf(Bar4 $s) should be compatible with Foo4::setSelf(Foo4 $s) in %sbug60573.php on line %d
+Warning: Declaration of Bar4::setSelf() should be compatible with Foo4::setSelf(Foo4 $s) in %sbug60573.php on line %d

-Warning: Declaration of Bar5::setSelf(Foo5 $s) should be compatible with Foo5::setSelf(Base $s) in %sbug60573.php on line %d
+Warning: Declaration of Bar5::setSelf() should be compatible with Foo5::setSelf(Base $s) in %sbug60573.php on line %d

-Fatal error: Declaration of Bar6::setSelf(Foo6 $s) must be compatible with Foo6::setSelf(Base $s) in %sbug60573.php on line %d
+Fatal error: Declaration of Bar6::setSelf() must be compatible with Foo6::setSelf(Base $s) in %sbug60573.php on line %d
@@ -14,7 +14,7 @@ class Bad {
 $bad = new Bad();
 echo "$bad";
 --EXPECTF--
-Fatal error: Method Bad::__toString() must not throw an exception, caught Exception: Oops, I cannot do this in %sbug60909_2.php on line %d
+Fatal error: Method Bad::__toString() must not throw an exception in %sbug60909_2.php on line 0


 !!!shutdown!!!
@@ -1,5 +1,11 @@
 --TEST--
 Bug #62358 (Segfault when using traits a lot)
+--SKIPIF--
+<?php
+if (getenv("USE_ZEND_ALLOC") !== "0") {
+    die("skip Need Zend MM enabled");
+}
+?>
 --FILE--
 <?php 

@@ -23,4 +29,4 @@ class B extends A {
 }
 ?>
 --EXPECTF--
-Fatal error: Declaration of B::foo($var) must be compatible with I::foo() in %sbug62358.php on line 17
+Warning: Declaration of B::foo() should be compatible with A::foo() in %sbug62358.php on line %d
@@ -1,20 +0,0 @@
--TEST--
-Bug #62441: Incorrect strong typing in namespaced child classes
--FILE--
-<?php
-namespace {
-    interface Iface {
-        function method(stdClass $o);
-    }
-}
-namespace ns {
-    class Foo implements \Iface {
-        function method(stdClass $o) { }
-    }
-    
-    (new Foo)->method(new \stdClass);
-}
-?>
--EXPECTF--
-Fatal error: Declaration of ns\Foo::method(ns\stdClass $o) must be compatible with Iface::method(stdClass $o) in %s on line %d
-
@@ -1,20 +0,0 @@
--TEST--
-Bug #62814: It is possible to stiffen child class members visibility
--FILE--
-<?php
-
-class A {
-    private function test() { }
-}
-
-class B extends A {
-    protected function test() { }
-}
-
-class C extends B {
-    private function test() { }
-}
-
-?>
--EXPECTF--
-Fatal error: Access level to C::test() must be protected (as in class B) or weaker in %s on line %d
@@ -2,7 +2,7 @@
 Bug #63336 (invalid E_NOTICE error occur)
 --FILE--
 <?php
-error_reporting(E_ALL & ~E_WARNING);
+error_reporting(E_ALL & ~E_WARNING );
 define("TEST", "123");
 class Base {
    const DUMMY = "XXX";
@@ -17,6 +17,6 @@ class Child extends Base {
 }
 ?>
 --EXPECTF--
-Warning: Declaration of Child::foo($var = TEST, array $more = Array) should be compatible with Base::foo($var = TEST, $more = NULL) in %sbug63336.php on line %d
+Warning: Declaration of Child::foo() should be compatible with Base::foo($var = TEST, $more = NULL) in %sbug63336.php on line %d

-Warning: Declaration of Child::bar($var, $more = self::DUMMY) should be compatible with Base::bar($more = self::DUMMY) in %sbug63336.php on line %d
+Warning: Declaration of Child::bar() should be compatible with Base::bar($more = self::DUMMY) in %sbug63336.php on line %d
@@ -26,5 +26,5 @@ $o = new Smooth1();
 echo "okey";
 ?>
 --EXPECTF--
-Warning: Declaration of Smooth1::insert(array $data) should be compatible with Noisy1::insert(array $data, $option1 = NULL) in %sbug64988.php on line 20
+Warning: Declaration of Smooth1::insert() should be compatible with Noisy1::insert(array $data, $option1 = NULL) in %sbug64988.php on line 20
 okey
@@ -19,6 +19,6 @@ eval('class A { function test() { } } class B extends A { function test($a) { }

 ?>
 --EXPECTF--
-string(62) "Declaration of B::test($a) should be compatible with A::test()"
+string(60) "Declaration of B::test() should be compatible with A::test()"
 string(%d) "%s(%d) : eval()'d code"
 string(1) "X"
@@ -57,13 +57,8 @@ $bar = foo3();
 string(9) "not catch"
 NULL

-Fatal error: Uncaught Exception: not catched in %sbug65784.php:42
+Fatal error: Uncaught Error: Class 'NotExists' not found in %sbug65784.php:%d
 Stack trace:
-#0 %sbug65784.php(52): foo3()
+#0 %s(%d): foo3()
 #1 {main}
-
-Next Error: Class 'NotExists' not found in %sbug65784.php:46
-Stack trace:
-#0 %sbug65784.php(52): foo3()
-#1 {main}
-  thrown in %sbug65784.php on line 46
+  thrown in %sbug65784.php on line %d
@@ -1,11 +1,5 @@
 --TEST--
 Bug #68412 (Infinite recursion with __call can make the program crash/segfault)
--SKIPIF--
-<?php
-if (getenv("USE_ZEND_ALLOC") !== "1") {
-    die("skip Need Zend MM enabled");
-}
-?>
 --FILE--
 <?php
 class C {
@@ -28,7 +28,6 @@ class Bar {
    }

    public function __destruct() {
-        if (!isset(self::$instance)) return;
        Foo::getInstance();
    }
 }
@@ -18,4 +18,4 @@ $test = new Foo();
 var_dump($test instanceof Baz);
 ?>
 --EXPECTF--
-Fatal error: Access level to Foo::bad() must be public (as in class Baz) in %sbug69467.php on line %d
+Fatal error: Access level to Bar::bad() must be public (as in class Baz) in %sbug69467.php on line %d
@@ -1,19 +0,0 @@
--TEST--
-Bug #69537 (__debugInfo with empty string for key gives error)
--FILE--
-<?php
-class Foo {
-
-    public function __debugInfo(){
-        return ['' => 1];
-    }
-}
-
-var_dump(new Foo);
-?>
--EXPECTF--
-object(Foo)#%d (%d) {
-  [""]=>
-  int(1)
-}
-
@@ -5,4 +5,4 @@ Bug #69640 Unhandled Error thrown from userland do not produce any output
 throw new \ParseError('I mess everything up! :trollface:');
 ?>
 --EXPECTF--
-Parse error: I mess everything up! :trollface: in %sbug69640.php on line 2
+Fatal error: I mess everything up! :trollface: in %sbug69640.php on line 2
@@ -24,8 +24,7 @@ Notice: Undefined property: wpq::$interesting in %sbug69732.php on line 6

 Notice: Indirect modification of overloaded property wpq::$interesting has no effect in %sbug69732.php on line 16

-Fatal error: Uncaught Error: Cannot assign by reference to overloaded object in %s:%d
-Stack trace:
-#0 {main}
-  thrown in %s on line %d
+Notice: Only variables should be assigned by reference in %sbug69732.php on line 16

+Notice: Undefined property: wpq::$interesting in %sbug69732.php on line 6
+XXX
@@ -11,6 +11,5 @@ var_dump(serialize($instance));
 --EXPECTF--
 Fatal error: Uncaught Exception: Serialization of 'class@%s' is not allowed in %sbug69761.php:%d
 Stack trace:
-#0 %sbug69761.php(%d): serialize(Object(class@anonymous))
-#1 {main}
+#0 %sbug69761.php(%d): serialize(Object(class@%s
  thrown in %sbug69761.php on line %d
@@ -5,4 +5,4 @@ Bug #69767 (Default parameter value with wrong type segfaults)
 function foo(String $bar = 0) {}
 ?>
 --EXPECTF--
-Fatal error: Default value for parameters with a string type can only be string or NULL in %sbug69767.php on line %d
+Fatal error: Default value for parameters with a string type hint can only be string or NULL in %sbug69767.php on line %d
@@ -1,35 +0,0 @@
--TEST--
-Bug #69955 (Segfault when trying to combine [] and assign-op on ArrayAccess object).
--FILE--
-<?php
-class C10 implements ArrayAccess
-{
-        function offsetExists($offset)
-        {
-                echo "\nInside " . __METHOD__ . "\n"; var_dump($offset);
-        }
-        function offsetGet($offset)
-        {
-                echo "\nInside " . __METHOD__ . "\n"; var_dump($offset); return 100;
-        }
-        function offsetSet($offset, $value)
-        {
-                echo "\nInside " . __METHOD__ . "\n"; var_dump($offset); var_dump($value);
-        }
-        function offsetUnset($offset)
-        {
-                echo "\nInside " . __METHOD__ . "\n"; var_dump($offset);
-        }
-}
-
-$c10 = new C10;
-
-var_dump($c10[] += 5);
--EXPECTF--
-Inside C10::offsetGet
-NULL
-
-Inside C10::offsetSet
-NULL
-int(105)
-int(105)
@@ -1,84 +0,0 @@
--TEST--
-Bug #69957 (Different ways of handling div/mod by zero)
--FILE--
-<?php
-
-try {
-	$divisor = 0;
-	$result = 1 / $divisor;
-	var_dump($result);
-} catch (DivisionByZeroError $t){
-	echo "Variable div\n";
-	printf("Type: %s\n", get_class($t));
-	printf("Message: %s\n", $t->getMessage());
-}
-
-try {
-	$divisor = 0;
-	$result = 1 % $divisor;
-	var_dump($result);
-} catch (DivisionByZeroError $t){
-	echo "\nVariable mod\n";
-	printf("Type: %s\n", get_class($t));
-	printf("Message: %s\n", $t->getMessage());
-}
-
-try {
-	$result = 1 / 0;
-	var_dump($result);
-} catch (DivisionByZeroError $t){
-	echo "\nLiteral div\n";
-	printf("Type: %s\n", get_class($t));
-	printf("Message: %s\n", $t->getMessage());
-}
-
-try {
-	$result = 1 % 0;
-	var_dump($result);
-} catch (DivisionByZeroError $t){
-	echo "\nLiteral mod\n";
-	printf("Type: %s\n", get_class($t));
-	printf("Message: %s\n", $t->getMessage());
-}
-
-try {
-	$result = 1 / 0.0;
-	var_dump($result);
-} catch (DivisionByZeroError $t){
-	echo "\nDouble div\n";
-	printf("Type: %s\n", get_class($t));
-	printf("Message: %s\n", $t->getMessage());
-}
-
-try {
-	$result = 1 % 0.0;
-	var_dump($result);
-} catch (DivisionByZeroError $t){
-	echo "\nDouble mod\n";
-	printf("Type: %s\n", get_class($t));
-	printf("Message: %s\n", $t->getMessage());
-}
-
-?>
--EXPECTF--
-Warning: Division by zero in %sbug69957.php on line %d
-float(INF)
-
-Variable mod
-Type: DivisionByZeroError
-Message: Modulo by zero
-
-Warning: Division by zero in %sbug69957.php on line %d
-float(INF)
-
-Literal mod
-Type: DivisionByZeroError
-Message: Modulo by zero
-
-Warning: Division by zero in %sbug69957.php on line %d
-float(INF)
-
-Double mod
-Type: DivisionByZeroError
-Message: Modulo by zero
-
@@ -1,15 +0,0 @@
--TEST--
-Bug #69989: Cycle collection for yielded values
--FILE--
-<?php
-
-function gen() {
-    yield yield;
-}
-$gen = gen();
-$gen->send($gen);
-
-?>
-===DONE===
--EXPECT--
-===DONE===
@@ -1,42 +0,0 @@
--TEST--
-Collection of some cycles on unfinished generators
--FILE--
-<?php
-
-// CV
-function gen1() {
-    $gen = yield;
-    yield;
-}
-
-$gen = gen1();
-$gen->send($gen);
-
-// This
-class Test {
-    public $gen;
-    public function gen2() {
-        yield;
-    }
-}
-
-$test = new Test;
-$test->gen = $test->gen2();
-
-// Closure object
-$gen3 = (function() use (&$gen3) {
-    yield;
-})();
-
-// Yield from array
-function gen4() {
-    yield from [yield];
-}
-
-$gen = gen4();
-$gen->send($gen);
-
-?>
-===DONE===
--EXPECT--
-===DONE===
@@ -1,44 +0,0 @@
--TEST--
-Generator cycle collection edge cases
--FILE--
-<?php
-
-// Extra args
-function gen1() {
-    yield;
-}
-$obj = new stdClass;
-$obj->gen = gen1($obj);
-
-// Symtable
-function gen2() {
-    $varName = 'a';
-    $$varName = yield;
-    yield;
-}
-$gen = gen2();
-$gen->send($gen);
-
-// Symtable indirect
-function gen3() {
-    $varName = 'a';
-    $$varName = 42;
-    $var = yield;
-    yield;
-}
-$gen = gen3();
-$gen->send($gen);
-
-// Yield from root
-function gen4() {
-    yield from yield;
-}
-$gen = gen4();
-$gen2 = gen4($gen);
-$gen2->send([1, 2, 3]);
-$gen->send($gen2);
-
-?>
-===DONE===
--EXPECT--
-===DONE===
@@ -1,25 +0,0 @@
--TEST--
-Bug #69996 (Changing the property of a cloned object affects the original)
--FILE--
-<?php
-
-function method($cache) {
-	  $prepared = clone $cache;
-	  var_dump($prepared->data);
-	  $prepared->data = "bad";
-	  return $prepared;
-}
-
-$cache = new stdClass();
-$cache->data = "good";
-
-for ($i = 0; $i < 5; ++$i) {
-	   method($cache);
-}
-?>
--EXPECT--
-string(4) "good"
-string(4) "good"
-string(4) "good"
-string(4) "good"
-string(4) "good"
@@ -1,32 +0,0 @@
--TEST--
-Bug #70012 (Exception lost with nested finally block)
--FILE--
-<?php
-try {
-	echo "Outer try\n";
-	try {
-		echo "  Middle try\n";
-		throw new Exception();
-	} finally {
-		echo "  Middle finally\n";
-		try {
-			echo "    Inner try\n";
-		} finally {
-			echo "    Inner finally\n";
-		}
-	}
-	echo "Outer shouldnt get here\n";
-} catch (Exception $e) {
-	echo "Outer catch\n";
-} finally {
-	echo "Outer finally\n";
-}
-?>
--EXPECT--
-Outer try
-  Middle try
-  Middle finally
-    Inner try
-    Inner finally
-Outer catch
-Outer finally
@@ -1,26 +0,0 @@
--TEST--
-Bug #70083 (Use after free with assign by ref to overloaded objects)
--FILE--
-<?php
-
-class foo {
-	private $var;
-	function __get($e) {
-		return $this;
-	}
-}
-
-function &noref() { $foo = 1; return $foo; }
-
-$foo = new foo;
-$foo->i = &noref();
-var_dump($foo);
-
-?>
--EXPECTF--
-
-Fatal error: Uncaught Error: Cannot assign by reference to overloaded object in %s:%d
-Stack trace:
-#0 {main}
-  thrown in %s on line %d
-
@@ -1,37 +0,0 @@
--TEST--
-Bug #70089 (segfault in PHP 7 at ZEND_FETCH_DIM_W_SPEC_VAR_CONST_HANDLER ())
--INI--
-opcache.enable=0
--FILE--
-<?php
-function dummy($a) {
-}
-
-try {
-	chr(0)[0][] = 1;
-} catch (Error $e) {
-	var_dump($e->getMessage());
-}
-try {
-	unset(chr(0)[0][0]);
-} catch (Error $e) {
-	var_dump($e->getMessage());
-}
-eval("function runtimetest(&\$a) {} ");
-try {
-	runtimetest(chr(0)[0]);
-} catch (Error $e) {
-	var_dump($e->getMessage());
-}
-
-try {
-	++chr(0)[0];
-} catch (Error $e) {
-	var_dump($e->getMessage());
-}
-?>
--EXPECTF--
-string(36) "Cannot use string offset as an array"
-string(27) "Cannot unset string offsets"
-string(41) "Only variables can be passed by reference"
-string(41) "Cannot increment/decrement string offsets"
@@ -1,21 +0,0 @@
--TEST--
-Bug #70117 (Unexpected return type error)
--FILE--
-<?php
-
-function &foo() :string {
-	$a = array(1);
-	$b = &$a[0];
-	return $b;
-}
-
-function &foo1() :string {
-	$a = array("ref");
-	return $a[0];
-}
-
-var_dump(foo());
-var_dump(foo1());
--EXPECT--
-string(1) "1"
-string(3) "ref"
@@ -1,9 +0,0 @@
--TEST--
-Bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
--FILE--
-<?php
-unserialize('O:12:"DateInterval":1:{s:4:"days";O:9:"Exception":7:{s:10:"'."\0".'*'."\0".'message";s:1:"x";s:17:"'."\0".'Exception'."\0".'string";s:1:"A";s:7:"'."\0".'*'."\0".'code";i:0;s:7:"'."\0".'*'."\0".'file";s:1:"a";s:7:"'."\0".'*'."\0".'line";i:1337;s:16:"'."\0".'Exception'."\0".'trace";a:0:{}s:19:"'."\0".'Exception'."\0".'previous";O:8:"stdClass":0:{}}}');
-?>
-OK
--EXPECT--
-OK
@@ -1,47 +0,0 @@
--TEST--
-Bug #70124 (null ptr deref / seg fault in ZEND_HANDLE_EXCEPTION_SPEC_HANDLER)
--FILE--
-<?php 
-
-try  {
-	echo base_convert([array_search(chr(48),chr(48),chr(48),chr(48),chr(48),$f("test"))],chr(48));
-} catch (Error $e) {
-	var_dump($e->getMessage());
-}
-
-class A {
-}
-
-try  {
-	echo base_convert([array_search(chr(48),chr(48),chr(48),chr(48),chr(48),a::y("test"))],chr(48));
-} catch (Error $e) {
-	var_dump($e->getMessage());
-}
-
-$a = new A;
-
-try  {
-	echo base_convert([array_search(chr(48),chr(48),chr(48),chr(48),chr(48),$a->y("test"))],chr(48));
-} catch (Error $e) {
-	var_dump($e->getMessage());
-}
-
-try  {
-	echo base_convert([array_search(chr(48),chr(48),chr(48),chr(48),chr(48),\bar\y("test"))],chr(48));
-} catch (Error $e) {
-	var_dump($e->getMessage());
-}
-
-try  {
-	echo base_convert([array_search(chr(48),chr(48),chr(48),chr(48),chr(48),y("test"))],chr(48));
-} catch (Error $e) {
-	var_dump($e->getMessage());
-}
-?>
--EXPECTF--
-Notice: Undefined variable: f in %sbug70124.php on line %d
-string(30) "Function name must be a string"
-string(31) "Call to undefined method A::y()"
-string(31) "Call to undefined method A::y()"
-string(34) "Call to undefined function bar\y()"
-string(30) "Call to undefined function y()"
@@ -1,37 +0,0 @@
--TEST--
-Bug #70156 (Segfault in zend_find_alias_name)
--FILE--
-<?php
-trait T1 {
-	protected function foo1()
-	{
-		$this->bar();
-	}
-}
-
-trait T2 {
-	protected function foo2()
-	{
-		debug_print_backtrace();
-	}
-}
-
-class dummy {
-	use T1 {
-		foo1 as private;
-	}
-	use T2 {
-		foo2 as bar;
-	}
-	public function __construct()
-	{
-		$this->foo1();
-	}
-}
-
-new dummy();
-?>
--EXPECTF--
-#0  dummy->bar() called at [%sbug70156.php:%d]
-#1  dummy->foo1() called at [%sbug70156.php:%d]
-#2  dummy->__construct() called at [%sbug70156.php:%d]
Author	SHA1	Message	Date
Anatol Belski	9876b2c2cf	sync NEWS	2015-06-23 19:33:33 +02:00
Anatol Belski	5ea2b70645	bump version	2015-06-23 19:32:58 +02:00
Anatol Belski	29711264a8	Merge branch 'master' into PHP-7.0.0 * master: (239 commits) Moved NEWS entry for bug #69864 to proper category Moved NEWS entry for bug #69864 to proper category Moved NEWS entry for bug #69864 to proper category updated NEWS updated NEWS Fixed two errors in LDAP tests Fixed two errors in LDAP tests Revert "Simplify php_implode(). Fill the resulting string in direct order." The patch slightly improved performance of string imploding, but reduced speed of integers imploding. Encapsulate FastCGI implementation details. Previously fcgi_request defined in main/fastcgi.h might be treated differently in different files, because of different behavior of #ifdef TCP_NODELAY. This leaded to stack memory corruption and unpredictable crashes. Fixed bug #69905 (null ptr deref and segfault in ZEND_FETCH_DIM_RW_SPEC_VAR_UNUSED_HANDLER) updated NEWS Fixed bug #69864 (Segfault in preg_replace_callback) Simplify php_implode(). Fill the resulting string in direct order. bump API version to 6.8 bump API version to 6.8 bump API version to 6.8 Drop duplicate object-to-type notices Added comments Drop superfluous __toString handling code This macro is defined in zend_virtual_cwd.h, avoid redef ...	2015-06-23 18:49:42 +02:00
Ferenc Kovacs	dbf30365aa	Merge remote-tracking branch 'origin/master' into PHP-7.0.0 * origin/master: add missing NEWS entries add missing NEWS entries Fixed bug #69646 (OS command injection vulnerability in escapeshellarg) add NEWS Fixed bug #68776 fix test update NEWS fix typo Fix bug #69646 OS command injection vulnerability in escapeshellarg Fix #69719 - more checks for nulls in paths fix test description Fixed Buf #68812 Unchecked return value.	2015-06-10 10:49:51 +02:00
Ferenc Kovacs	9cb8cb4797	Merge branch 'master' into PHP-7.0.0 * master: fix hard-coded path in test	2015-06-09 16:42:24 +02:00
Ferenc Kovacs	8a884d628b	7.0.0alpha1	2015-06-09 14:24:39 +02:00