Update versions/dates for PHP 7.1.0beta2

This reverts commit 050a5d5662.

.appveyor.yml

@@ -1,56 +0,0 @@
-
-version: "{branch}.build.{build}"
-
-image: Visual Studio 2015
-
-branches:
-        except:
-                - PHP-5.6
-                - PHP-7.0
-
-skip_commits:
-        files:
-                - NEWS
-                - UPGRADING*
-                - README.*
-
-clone_depth: 64
-
-cache:
-        - c:\build-cache
-
-environment:
-        PHP_BUILD_CACHE_BASE_DIR: c:\build-cache  
-        PHP_BUILD_OBJ_DIR: c:\obj
-        PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
-        PHP_BUILD_SDK_BRANCH: php-sdk-2.0.13
-        # ext and env setup for tests
-        #MYSQL_TEST_PASSWD: Password12!
-        #MYSQL_TEST_USER: root
-        #PDO_MYSQL_TEST_DSN: "pgsql:host=127.0.0.1 port=5432 dbname=test user=root password=Password12!"
-        #PDO_MYSQL_TEST_USER: root
-        #PDO_MYSQL_TEST_PASS: Password12!
-        #PGSQL_TEST_CONNSTR: "host=127.0.0.1 dbname=test port=5432 user=postgres password=Password12!"
-        #PDO_PGSQL_TEST_DSN: "pgsql:host=127.0.0.1 port=5432 dbname=test user=postgres password=Password12!"
-        #build permutations
-        matrix:
-                - THREAD_SAFE: 0
-                  OPCACHE: 0
-                - THREAD_SAFE: 1
-                  OPCACHE: 1
-
-services:
-        # the setup scripts have to be touched, once some other db version is used
-        - mysql
-        - postgresql96
-
-platform:
-        - x64
-          #        - x86
-
-build_script:
-        - appveyor\build.bat
-
-test_script:
-        - appveyor\test.bat
-

.editorconfig

@@ -1,35 +0,0 @@
-# http://editorconfig.org/
-
-root = true
-
-[*.{c,h,awk,w32,bat,mk,frag}]
-charset                  = utf-8
-end_of_line              = lf
-indent_size              = 4
-indent_style             = tab
-tab_width                = 4
-trim_trailing_whitespace = true
-insert_final_newline     = true
-
-[*.{php,phpt}]
-charset                  = utf-8
-end_of_line              = lf
-indent_size              = 4
-indent_style             = space
-trim_trailing_whitespace = true
-insert_final_newline     = true
-
-[*.{yml,m4,sh}]
-charset                  = utf-8
-end_of_line              = lf
-indent_size              = 2
-indent_style             = space
-trim_trailing_whitespace = true
-insert_final_newline     = true
-
-[*.md]
-charset                  = utf-8
-end_of_line              = lf
-indent_style             = space
-trim_trailing_whitespace = false
-insert_final_newline     = true

.gdbinit

@@ -29,33 +29,22 @@ document ____executor_globals
 end
 
 define print_cvs
-	if $argc == 0
-		____executor_globals
-		set $cv_ex_ptr = $eg.current_execute_data
-	else
-		set $cv_ex_ptr = (zend_execute_data *)$arg0
+	____executor_globals
+	set $p = $eg.current_execute_data.CVs
+	set $c = $eg.current_execute_data.op_array.last_var
+	set $v = $eg.current_execute_data.op_array.vars
+	set $i = 0
+
+	printf "Compiled variables count: %d\n", $c
+	while $i < $c
+		printf "%d = %s\n", $i, $v[$i].name
+		if $p[$i] != 0
+			printzv *$p[$i]
+		else
+			printf "*uninitialized*\n"
+		end
+		set $i = $i + 1
 	end
-	set $cv_count = $cv_ex_ptr.func.op_array.last_var
-	set $cv = $cv_ex_ptr.func.op_array.vars
-	set $cv_idx = 0
-	set $callFrameSize = (sizeof(zend_execute_data) + sizeof(zval) - 1) / sizeof(zval)
-
-	printf "Compiled variables count: %d\n\n", $cv_count
-	while $cv_idx < $cv_count
-		printf "[%d] '%s'\n", $cv_idx, $cv[$cv_idx].val
-		set $zvalue = ((zval *) $cv_ex_ptr) + $callFrameSize + $cv_idx
-		printzv $zvalue
-		set $cv_idx = $cv_idx + 1
-	end
-end
-
-document print_cvs
-	Prints the compiled variables and their values.
-	If a zend_execute_data pointer is set this will print the compiled
-	variables of that scope. If no parameter is used it will use
-	current_execute_data for scope.
-
-	usage: print_cvs [zend_execute_data *]
 end
 
 define dump_bt
@@ -207,17 +196,12 @@ define ____printzv_contents
 		____executor_globals
 		set $handle = $zvalue->value.obj.handle
 		set $handlers = $zvalue->value.obj.handlers
-		set $zobj = $zvalue->value.obj
-		set $cname = $zobj->ce->name->val
+        set $zobj = $zvalue->value.obj
+        set $cname = $zobj->ce->name->val
 		printf "(%s) #%d", $cname, $handle
 		if ! $arg1
 			if $handlers->get_properties == &zend_std_get_properties
-				if $zobj->properties
-					set $ht = $zobj->properties
-				else
-					set $ht = &$zobj->ce->properties_info
-				end
-				printf "\nProperties "
+				set $ht = $zobj->properties
 				if $ht
 					set $ind = $ind + 1
 					____print_ht $ht 1
@@ -228,7 +212,7 @@ define ____printzv_contents
 						set $i = $i - 1
 					end
 				else
-					echo "not found"
+					echo "no properties found"
 				end
 			end
 		end
@@ -471,9 +455,9 @@ define print_inh
 end
 
 define print_pi
-	set $pi = (zend_property_info *)$arg0
+	set $pi = $arg0
 	printf "[%p] {\n", $pi
-	printf "    ce = [%p] %s\n", $pi->ce, $pi->ce->name->val
+	printf "    h     = %lu\n", $pi->h
 	printf "    flags = %d (", $pi->flags
 	if $pi->flags & 0x100
 		printf "ZEND_ACC_PUBLIC"
@@ -492,27 +476,16 @@ define print_pi
 	end
 	printf ")\n"
 	printf "    name  = "
-	print_zstr $pi->name
-	printf "}\n"
-end
-
-document print_pi
-	Takes a pointer to an object's property and prints the property information
-	usage: print_pi <ptr>
+	____print_str $pi->name $pi->name_length
+	printf "\n}\n"
 end
 
 define ____print_str
 	set $tmp = 0
 	set $str = $arg0
-	if $argc > 2
-		set $maxlen = $arg2
-	else
-		set $maxlen = 256
-	end
-
 	printf "\""
-	while $tmp < $arg1 && $tmp < $maxlen
-		if $str[$tmp] > 31 && $str[$tmp] < 127
+	while $tmp < $arg1 && $tmp < 256
+		if $str[$tmp] > 32 && $str[$tmp] < 127
 			printf "%c", $str[$tmp]
 		else
 			printf "\\%o", $str[$tmp]
@@ -581,23 +554,6 @@ document printzops
 	dump operands of the current opline
 end
 
-define print_zstr
-	set $zstr = (zend_string *)$arg0
-	if $argc == 2
-		set $maxlen = $arg1
-	else
-		set $maxlen = $zstr->len
-	end
-	printf "string(%d) ", $zstr->len
-	____print_str $zstr->val $zstr->len $maxlen
-	printf "\n"
-end
-
-document print_zstr
-	print the length and contents of a zend string
-	usage: print_zstr <ptr> [max length]
-end
-
 define zbacktrace
 	____executor_globals
 	dump_bt $eg.current_execute_data
@@ -610,6 +566,79 @@ document zbacktrace
 	> (gdb) dump_bt $eg.current_execute_data
 end
 
+define zmemcheck
+	set $p = alloc_globals.head
+	set $stat = "?"
+	set $total_size = 0
+	if $arg0 != 0
+		set $not_found = 1
+	else
+		set $not_found = 0
+	end
+	printf " block      size      status file:line\n"
+	printf "-------------------------------------------------------------------------------\n"
+	while $p
+		set $aptr = $p + sizeof(struct _zend_mem_header) + sizeof(align_test)
+		if $arg0 == 0 || (void *)$aptr == (void *)$arg0
+			if $p->magic == 0x7312f8dc 
+				set $stat = "OK"
+			end
+			if $p->magic == 0x99954317
+				set $stat = "FREED"
+			end
+			if $p->magic == 0xfb8277dc
+				set $stat = "CACHED"
+			end
+			set $filename = strrchr($p->filename->val, '/')
+			if !$filename
+				set $filename = $p->filename->val
+			else
+				set $filename = $filename + 1
+			end
+			printf " %p ", $aptr
+			if $p->size == sizeof(struct _zval_struct) && ((struct _zval_struct *)$aptr)->type >= 0 && ((struct _zval_struct *)$aptr)->type < 10
+				printf "ZVAL?(%-2d) ", $p->size
+			else
+				printf "%-9d ", $p->size
+			end
+			set $total_size = $total_size + $p->size
+			printf "%-06s %s:%d", $stat, $filename, $p->lineno
+			if $p->orig_filename
+				set $orig_filename = strrchr($p->orig_filename, '/')
+				if !$orig_filename
+					set $orig_filename = $p->orig_filename
+				else
+					set $orig_filename = $orig_filename + 1
+				end
+				printf " <= %s:%d\n", $orig_filename, $p->orig_lineno
+			else
+				printf "\n"
+			end
+			if $arg0 != 0
+				set $p = 0
+				set $not_found = 0
+			else
+				set $p = $p->pNext
+			end
+		else
+			set $p = $p->pNext
+		end
+	end
+	if $not_found
+		printf "no such block that begins at %p.\n", $aptr
+	end
+	if $arg0 == 0
+		printf "-------------------------------------------------------------------------------\n"
+		printf "     total: %d bytes\n", $total_size
+	end
+end
+
+document zmemcheck
+	show status of a memory block.
+	usage: zmemcheck [ptr].
+	if ptr is 0, all blocks will be listed.
+end
+
 define lookup_root
 	set $found = 0
 	if gc_globals->roots

.gitattributes

@@ -15,8 +15,11 @@ ext/dba/libflatfile/flatfile.c  ident
 ext/dba/libcdb/cdb_make.c       ident
 ext/dba/libcdb/cdb.c            ident
 ext/filter/filter.c             ident
+ext/zip/php_zip.c               ident
 README.input_filter             ident
 run-tests.php                   ident
+sapi/nsapi/nsapi.c              ident
+sapi/continuity/capi.c          ident
 Zend/RFCs/002.txt               ident
 Zend/RFCs/003.txt               ident
 ext/exif/exif.c                 ident
@@ -29,6 +32,7 @@ UPGRADING.INTERNALS             merge=NEWS
 /ext/bz2/tests/with_strings.phpt	-crlf
 /ext/dom/tests/bug40836.phpt	-crlf
 /ext/dom/tests/domelement.phpt	-crlf
+/ext/ereg/tests/eregi_basic_002.phpt	-crlf
 /ext/iconv/tests/iconv004.phpt	-crlf
 /ext/iconv/tests/iconv_basic.phpt	-crlf
 /ext/iconv/tests/iconv_strpos.phpt	-crlf

.gitignore

@@ -148,7 +148,6 @@ tests/*/*/*.sh
 */tests/*/*/*.sh
 */*/tests/*.diff
 */*/tests/*.out
-*/*/tests/*.out.png
 */*/tests/*.php
 */*/tests/*.exp
 */*/tests/*.log
@@ -262,7 +261,9 @@ pear/phpize
 pear/run-tests
 pear/php-config
 pear/scripts
+sapi/apache/libphp7.module
 sapi/apache2handler/libphp7.module
+sapi/apache_hooks/libphp7.module
 sapi/cgi/php-cgi
 sapi/cgi/php-cgi.1
 sapi/cli/php.1

.travis.yml

@@ -1,4 +1,3 @@
-dist: trusty
 language: c
 sudo: false
 addons:
@@ -58,4 +57,4 @@ before_script:
 
 # Run PHPs run-tests.php 
 script:
-    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 0 ]; 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 $(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

EXTENSIONS

@@ -108,8 +108,8 @@ STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_dblib
-PRIMARY MAINTAINER:  Adam Baratz <adambaratz@php.net>
-MAINTENANCE:         Maintained
+PRIMARY MAINTAINER:  Unknown
+MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
@@ -132,7 +132,7 @@ STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_oci
-PRIMARY MAINTAINER:  Christopher Jones <sixd@php.net>
+PRIMARY MAINTAINER:  Unknown
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
@@ -286,7 +286,7 @@ MAINTENANCE:         Odd fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           gd
-PRIMARY MAINTAINER:  Pierre-Alain Joye <pajoye@php.net>, Christoph M. Becker <cmb@php.net>
+PRIMARY MAINTAINER:  Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------

LICENSE

@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
                   The PHP License, version 3.01
-Copyright (c) 1999 - 2017 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2016 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 
 
 Redistribution and use in source and binary forms, with or without

Makefile.global

@@ -5,7 +5,7 @@ INSTALL_DATA = $(INSTALL) -m 644
 DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
 COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)
 
-all: $(all_targets)
+all: $(all_targets) 
 	@echo
 	@echo "Build complete."
 	@echo "Don't forget to run 'make test'."
@@ -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"`; \
@@ -112,13 +112,13 @@ test: all
 clean:
 	find . -name \*.gcno -o -name \*.gcda | xargs rm -f
 	find . -name \*.lo -o -name \*.o | xargs rm -f
-	find . -name \*.la -o -name \*.a | xargs rm -f
+	find . -name \*.la -o -name \*.a | xargs rm -f 
 	find . -name \*.so | xargs rm -f
 	find . -name .libs -a -type d|xargs rm -rf
 	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
 
 distclean: clean
-	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
+	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module sapi/apache_hooks/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
 	rm -f php7.spec main/build-defs.h scripts/phpize
 	rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak
 	rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 ext/phar/phar.1 ext/phar/phar.phar.1
@@ -135,7 +135,7 @@ prof-gen:
 
 prof-clean:
 	find . -name \*.lo -o -name \*.o | xargs rm -f
-	find . -name \*.la -o -name \*.a | xargs rm -f
+	find . -name \*.la -o -name \*.a | xargs rm -f 
 	find . -name \*.so | xargs rm -f
 	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
 

README.RELEASE_PROCESS

@@ -93,27 +93,24 @@ Commit the changes to the main branch.
 12. run: ``PHPROOT=. ./makedist 5.4.2RC2``, this will export the tree, create configure
 and build three tarballs (gz, bz2 and xz).
 
-13. run ``scripts/dev/gen_verify_stub <version> [identity]``, this will sign the tarballs
-and output verification information to be included in announcement email
-
-14. Copy those tarballs (scp, rsync) to downloads.php.net, in your homedir there should be a
+13. Copy those tarballs (scp, rsync) to downloads.php.net, in your homedir there should be a
 directory "downloads/". Copy them into there, so that the system can generate
 MD5 sums. If you do not have this directory, talk to Derick or Dan.
 
-15. Now the RC can be found on http://downloads.php.net/yourname,
+14. Now the RC can be found on http://downloads.php.net/yourname,
 f.e. http://downloads.php.net/derick/
 
-16. Once the release has been tagged, contact the PHP Windows development team
+15. Once the release has been tagged, contact the PHP Windows development team
 (internals-win@lists.php.net) so that Windows binaries can be created. Once
 those are made, they should be placed into the same directory as the source snapshots.
 
 Getting the non stable release (alpha/beta/RC) announced
 --------------------------------------------------------
 
-1. Send an email **To** ``internals@lists.php.net`` and ``php-general@lists.php.net`` 
-lists pointing out "the location of the release" and "the possible release date of
-either the next RC, or the final release". Include in this information the verification
-information output by ``gen_verify_stub``.
+1. Send an email (see example here: http://news.php.net/php.internals/19486)
+**To** ``internals@lists.php.net`` and ``php-general@lists.php.net`` lists
+pointing out "the location of the release" and "the possible release date of
+either the next RC, or the final release".
 
 2. Send an email (see example here http://news.php.net/php.pear.qa/5201) **To**
 ``php-qa@lists.php.net`` and ``primary-qa-tester@lists.php.net``.
@@ -193,8 +190,8 @@ Check if the pear files are updated (phar).
 This is to fetch the last commit id from php-distributions.git and commit this
 last commit id to web/php.git, then, mirrors will now sync
 
-12. Once the release has been tagged, contact release managers, windows builders, and package maintainers
-so that they can build releases. Do not send this announcement to any public lists.
+12. Once the release has been tagged, contact the PHP Windows development team
+(internals-win@lists.php.net) so that Windows binaries can be created.
 
 Getting the stable release announced
 ------------------------------------

README.md

@@ -5,7 +5,6 @@ This is the github mirror of the official PHP repository located at
 http://git.php.net.
 
 [![Build Status](https://secure.travis-ci.org/php/php-src.svg?branch=master)](http://travis-ci.org/php/php-src)
-[![Build status](https://ci.appveyor.com/api/projects/status/meyur6fviaxgdwdy?svg=true)](https://ci.appveyor.com/project/php/php-src)
 
 Pull Requests
 =============

TSRM/threads.m4

@@ -66,7 +66,7 @@ dnl
 dnl Check whether the current setup can use POSIX threads calls
 dnl
 AC_DEFUN([PTHREADS_CHECK_COMPILE], [
-AC_LINK_IFELSE([ AC_LANG_SOURCE([
+AC_TRY_RUN( [
 #include <pthread.h>
 #include <stddef.h>
 
@@ -80,11 +80,18 @@ int main() {
     int data = 1;
     pthread_mutexattr_init(&mattr);
     return pthread_create(&thd, NULL, thread_routine, &data);
-} ]) ], [
-  pthreads_checked=yes
+} ], [
+  pthreads_working=yes
   ], [
-  pthreads_checked=no
-  ]
+  pthreads_working=no
+  ], [
+  dnl For cross compiling running this test is of no use. NetWare supports pthreads
+  pthreads_working=no
+  case $host_alias in
+  *netware*)
+    pthreads_working=yes
+  esac
+]
 ) ] )dnl
 dnl
 dnl PTHREADS_CHECK()
@@ -122,34 +129,30 @@ else
       CFLAGS="$CFLAGS $flag"
       PTHREADS_CHECK_COMPILE
       CFLAGS=$ac_save
-      if test "$pthreads_checked" = "yes"; then
+      if test "$pthreads_working" = "yes"; then
         ac_cv_pthreads_cflags=$flag
         break
       fi
     done
   fi
-  ])
-
-  AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[
-  ac_cv_pthreads_lib=
-  if test "$pthreads_working" != "yes"; then
-   for lib in pthread pthreads c_r; do
-      ac_save=$LIBS
-      LIBS="$LIBS -l$lib"
-      PTHREADS_CHECK_COMPILE
-      LIBS=$ac_save
-      if test "$pthreads_checked" = "yes"; then
-        ac_cv_pthreads_lib=$lib
-        break
-      fi
-    done
-  fi
-  ])
-
-  if test "x$ac_cv_pthreads_cflags" != "x" -o "x$ac_cv_pthreads_lib" != "x"; then
-    pthreads_working="yes"
-  fi
 fi
+])
+
+AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[
+ac_cv_pthreads_lib=
+if test "$pthreads_working" != "yes"; then
+  for lib in pthread pthreads c_r; do
+    ac_save=$LIBS
+    LIBS="$LIBS -l$lib"
+    PTHREADS_CHECK_COMPILE
+    LIBS=$ac_save
+    if test "$pthreads_working" = "yes"; then
+      ac_cv_pthreads_lib=$lib
+      break
+    fi
+  done
+fi
+])
 
 if test "$pthreads_working" = "yes"; then
   threads_result="POSIX-Threads found"

TSRM/tsrm_nw.c

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2017 The PHP Group                                |
+   | Copyright (c) 1997-2016 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        |

TSRM/tsrm_nw.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2017 The PHP Group                                |
+   | Copyright (c) 1997-2016 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        |

TSRM/tsrm_win32.c

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2017 The PHP Group                                |
+   | Copyright (c) 1997-2016 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        |
@@ -208,14 +208,15 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 	DWORD sec_desc_length = 0, desired_access = 0, granted_access = 0;
 	BYTE * psec_desc = NULL;
 	BOOL fAccess = FALSE;
-	realpath_cache_bucket * bucket = NULL;
-	char * real_path = NULL;
 
 	PHP_WIN32_IOUTIL_INIT_W(pathname)
 	if (!pathw) {
 		return -1;
 	}
 
+	realpath_cache_bucket * bucket = NULL;
+	char * real_path = NULL;
+
 	if (mode == 1 /*X_OK*/) {
 		DWORD type;
 		int ret;
@@ -672,12 +673,6 @@ TSRM_API int shmget(int key, int size, int flags)
 		}
 	} else {
 		if (flags & IPC_EXCL) {
-			if (shm_handle) {
-				CloseHandle(shm_handle);
-			}
-			if (info_handle) {
-				CloseHandle(info_handle);
-			}
 			return -1;
 		}
 	}
@@ -726,18 +721,12 @@ TSRM_API void *shmat(int key, const void *shmaddr, int flags)
 		return (void*)-1;
 	}
 
-	shm->addr = MapViewOfFileEx(shm->segment, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
-
-	if (NULL == shm->addr) {
-		int err = GetLastError();
-		SET_ERRNO_FROM_WIN32_CODE(err);
-		return (void*)-1;
-	}
-
 	shm->descriptor->shm_atime = time(NULL);
 	shm->descriptor->shm_lpid  = getpid();
 	shm->descriptor->shm_nattch++;
 
+	shm->addr = MapViewOfFileEx(shm->segment, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
+
 	return shm->addr;
 }
 

TSRM/tsrm_win32.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2017 The PHP Group                                |
+   | Copyright (c) 1997-2016 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        |

UPGRADING

@@ -49,9 +49,9 @@ PHP 7.1 UPGRADE NOTES
     the notice level only.
   . Don't call destructors of incompletely constructed objects, even if they
     are kept referenced. See bug #29368 and Zend/tests/bug29368_1.phpt.
-  . call_user_func() will now consistently throw a warning if a function with
-    reference arguments is called. However, call_user_func() will no longer
-    abort the call in this case.
+  . call_user_func() will now consistently fail to perform calls to functions
+    that accept reference arguments. Previously this sometimes worked if
+    call_user_func() was used outside a namespace.
   . rand() and srand() are now aliases of mt_rand() and mt_srand().
     Consequently the output of the following functions has changed:
      . rand()
@@ -61,40 +61,7 @@ PHP 7.1 UPGRADE NOTES
   . Fixes to random number generators mean that mt_rand() now produces a
     different sequence of outputs to previous versions. If you relied on
     mt_srand() to produce a deterministic sequence, it can be called using
-    mt_srand($seed, MT_RAND_PHP) to produce the old sequences.
-  . URL rewriter has been improved.
-     . Use dedicated buffer for Session module rewrite and User rewrite.
-     . Full path URL rewrite is supported. Allowed domain can be specified.
-       $_SERVER['HTTP_HOST'] is allowed by default when host whitelist is empty.
-     . Use session.trans_sid_tags and session.trans_sid_hosts to control
-       session rewrite.
-     . Use url_rewriter.tags and url_rewriter.hosts to control user rewrite.
-     . <form>'s "action" attribute is used to check if URL rewrite is allowed
-       and listed under hosts whitelist.
-     . <fieldset> is no longer considered as a special tag. <form> is the
-       only tag considered special.
-  . Calling a function with less arguments than mandatory declared ones in
-    signature now issues a Fatal Error (Error Exception) instead of a Warning.
-    (RFC https://wiki.php.net/rfc/too_few_args).
-  . The error message for E_RECOVERABLE errors has been changed from "Catchable
-    fatal error" to "Recoverable fatal error".
-  . The empty index operator (e.g. $str[] = $x) is not supported for strings
-    anymore, and throws a fatal error instead of silently converting to array.
-  . 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 ["b" => 1, "a" => 1], while for PHP 7.0 the result
-    was ["a" => 1, "b" => 1].
-  . The allowed_classes element of the $options parameter of unserialize() is
-    now strictly typed, i.e. if anything other than an array or a boolean is
-    given, unserialize() returns FALSE and issues an E_WARNING.
-  . $this, autoglobals, and variables with the same name as a parameter can no
-    longer be bound to a closure via the use construct.
+    mt_srand($seed, MT_RAND_PHP) to produce old the sequences.
 
 - JSON:
   . The serialize_precision is used instead of precision when encoding double
@@ -104,48 +71,9 @@ PHP 7.1 UPGRADE NOTES
   . When calling json_encode with JSON_UNESCAPED_UNICODE option, U+2028 and
     U+2029 are escaped.
 
-- mbstring:
-  . mb_ereg() and mb_eregi() will now set the $regs argument to an empty array,
-    if nothing matched. Formerly, $regs was not modified in that case.
-
 - OpenSSL:
   . Dropped sslv2 stream.
 
-- Session:
-  . Session ID is generated from CSPRNG directly. As a result, Session ID length
-    could be any length between 22 and 256. Note: Max size of session ID depends
-    on save handler you are using.
-  . Following INIs are removed
-     . session.hash_function
-     . session.hash_bits_per_character
-     . session.entropy_file
-     . session.entropy_length
-  . New INIs and defaults
-     . session.sid_length (Number of session ID characters - 22 to 256.
-       php.ini-* default: 26 Compiled default: 32)
-     . session.sid_bits_per_character (Bits used per character - 4 to 6.
-       php.ini-* default: 5 Compiled default: 4)
-  . Length of old session ID string is determined as follows
-     . Used hash function's bits.
-        . session.hash_function=0 - MD5 128 bits (This was default)
-        . session.hash_function=1 - SHA1 160 bits
-     . Bits per character. (4, 5 or 6 bits per character)
-     . Examples
-         MD5 and 4 bits = 32 chars,  ceil(128/4)=32
-         MD5 and 5 bits = 26 chars,  ceil(128/5)=26
-         MD5 and 6 bits = 22 chars,  ceil(128/6)=22
-         SHA1 and 4 bits = 40 chars, ceil(160/4)=40
-         SHA1 and 5 bits = 32 chars, ceil(160/5)=32
-         SHA1 and 6 bits = 27 chars, ceil(160/6)=27
-         and so on.
-  . session_start() returns FALSE and no longer initializes $_SESSION when
-    it failed to start session.
-
-- Reflection:
-  . The behavior of ReflectionMethod::invoke() and ::invokeArgs() has been
-    aligned, which causes slightly different behavior than before for some
-    pathological cases.
-
 ========================================
 2. New Features
 ========================================
@@ -174,16 +102,6 @@ PHP 7.1 UPGRADE NOTES
     ++ and --, which have a unique approach to handling numeric strings.
     (RFC: https://wiki.php.net/rfc/invalid_strings_in_arithmetic)
   . Closure::fromCallable (RFC: https://wiki.php.net/rfc/closurefromcallable)
-  . Added support for class constant visibility modifiers.
-    (RFC: https://wiki.php.net/rfc/class_const_visibility)
-  . TypeError messages for arg_info type checks will now say "must be ...
-    or null", or "must ... or be null" where the parameter or return type
-    accepts null. arg_info type checks are used by all userland functions with
-    type declarations, and some internal functions. Both nullable type
-    declarations (?int) and parameters with default values of null
-    (int $foo = NULL) are considered to "accept null" for this purpose.
-  . The simple syntax for variable parsing inside of string literals now
-    supports negative offsets.
 
 ========================================
 3. Changes in SAPI modules
@@ -211,8 +129,6 @@ PHP 7.1 UPGRADE NOTES
   disables escaping of U+2028 and U+2029 characters when
   JSON_UNESCAPED_UNICODE is supplied.
 - long2ip() accepts integer as parameter now
-- openssl_encrypt and openssl_decrypt have extra parameters for handling
-  authenticated encryption (tag, aad, tag_length) and decryption (tag, aad).
 - pg_last_notice() accepts optional long parameter to specify operation.
   PGSQL_NOTICE_LAST - Get last notice (Default)
   PGSQL_NOTICE_ALL - Get all stored notices
@@ -236,14 +152,6 @@ PHP 7.1 UPGRADE NOTES
 - mb_ereg() and mb_ereg_replace() reject illegal byte sequences.
 - FILTER_FLAG_EMAIL_UNICODE can be used with filter_var() for email validation
   according to RFC 6531.
-- output_reset_rewrite_vars() no longer reset session URL rewrite vars.
-- the lasinsertid() in pdo_pgsql extension triggers an error, when no nextval()
-  were called in in the current session.
-- fopen()
-  Since 7.1.2, mode 'e' was added, which sets the close-on-exec flag
-  on the opened file descriptor. This mode is only available in PHP compiled on
-  POSIX.1-2008 conform systems.
-
 
 ========================================
 6. New Functions
@@ -258,21 +166,10 @@ PHP 7.1 UPGRADE NOTES
   . Added curl_share_strerror() to convert error code to error message text
     describing the error.
 
-- Hash:
-  . In PHP 7.1.2: Added hash_hkdf() function, which implements the HMAC-based
-    Key Derivation Function (HKDF) algorithm according to RFC 5869. The
-    implementation combines the Extract and Expand steps.
-
 - pcntl:
   . Added pcntl_signal_get_handler() that returns the current signal handler
     for a particular signal.
 
-- Session:
-  . Added session_gc() that performs session data garbage collection.
-    https://wiki.php.net/rfc/session-gc
-  . Added session_create_id() for creating custom session ID.
-    https://wiki.php.net/rfc/session-create-id
-
 - Standard:
   . Added is_iterable() that determines if a value will be accepted by the new
     iterable pseudo-type.
@@ -296,16 +193,10 @@ PHP 7.1 UPGRADE NOTES
   . Timezone initialization failure from serialized data will now throw an
     instance of Error from __wakeup() or __set_state() instead of resulting in
     a fatal error.
-  . DateTime and DateTimeImmutable now properly incorporate microseconds when
-    constructed from the current time, either explicitly or with a relative
-    string (e.g. "first day of next month"). This means that naive comparisons
-    of two newly created instances will now more likely return FALSE instead of
-    TRUE:
-      new DateTime() == new DateTime();
 
 - DBA:
   . Data modification functions (e.g.: dba_insert()) now throw an instance of
-    Error instead of triggering a catchable fatal error if the key does not
+    Error instead of triggering a catchable fatal error if the key is does not
     contain exactly two elements.
 
 - DOM:
@@ -348,13 +239,6 @@ PHP 7.1 UPGRADE NOTES
   . Attempting to read an invalid or write to a readonly property will throw
     an instance of Error instead of resulting in a fatal error.
 
-- PDO_Firebird
-  As of PHP 7.1.2, the fetched data for integer fields is aware of the Firebird
-  datatypes. Previously all integers was fetched as strings, starting with
-  aforementioned PHP version integer fields are translated to the PHP integer
-  datatype. The 64-bit integers are still fetched as strings in 32-bit PHP
-  builds.
-
 - Reflection:
   . Failure to retrieve a reflection object or retrieve an object property
     will now throw an instance of Error instead of resulting in a fatal error.
@@ -363,7 +247,8 @@ PHP 7.1 UPGRADE NOTES
   . Custom session handlers that do not return strings for session IDs will 
     now throw an instance of Error instead of resulting in a fatal error
     when a function is called that must generate a session ID.
-  . Only CSPRNG is used to generate session ID.
+  . An invalid setting for session.hash_function will throw an instance of
+    Error instead of resulting in a fatal error when a session ID is created.
 
 - SimpleXML:
   . Creating an unnamed or duplicate attribute will throw an instance of Error
@@ -416,9 +301,6 @@ PHP 7.1 UPGRADE NOTES
   PGSQL_NOTICE_ALL
   PGSQL_NOTICE_CLEAR
 
-- Standard:
-  . IMAGETYPE_WEBP
-
 ========================================
 11. Changes to INI File Handling
 ========================================
@@ -431,9 +313,6 @@ PHP 7.1 UPGRADE NOTES
   . If the value is set to -1, then the dtoa mode 0 is used. No changes
     in default value which is still 14.
 
-- realpath_cache_size
-  . Set to 4096k by default
-
 ========================================
 12. Windows Support
 ========================================
@@ -441,7 +320,7 @@ PHP 7.1 UPGRADE NOTES
 - Core:
   . Support for long and UTF-8 path;
 
-    If a web application is UTF-8 conform, no further action is required. For
+    If an application is UTF-8 conform, no further action is required. For
     applications depending on paths in non UTF-8 encodings for I/O, an explicit
     INI directive has to be set. The encoding INI settings check relies on the
     order in the core:
@@ -467,26 +346,8 @@ PHP 7.1 UPGRADE NOTES
     particular console program used. PHP automatically sets the console codepage
     according to the encoding rules from php.ini. Using alternative consoles
     instead of cmd.exe directly might bring better experience in some cases.
-
     Nevertheless be aware, runtime codepage switch after the request start
-    might bring unexpected side effects on CLI. The preferrable way is php.ini,
-    When PHP CLI is used in a console emulator, that doesn't support Unicode,
-    it might possibly be required, to avoid changing the console codepage. The
-    best way to achieve it is by setting the default or internal encoding to
-    correspond the ANSI codepage. Another method is to set the INI directives
-    output_encoding and input_encoding to the required codepage, in which case
-    however the difference between internal and I/O codepage is likely to cause
-    mojibake. In rare cases, if PHP happens to crash gracefully, the original
-    console codepage might be not restored. In this case, the chcp command
-    can be used, to restore it manually.
-
-    Special awareness for the DBCS systems - the codepage switch on runtime
-    using ini_set() is likely to cause display issues. The difference to the
-    non DBCS systems is, that the extended characters require two console cells
-    to be displayed. In certain case, only the mapping of the characters into
-    the glyph set of the font could happen, no actual font change. This is the
-    nature of DBCS systems, the most simple way to prevent display issues is
-    to avoid usage of ini_set() for the codepage change.
+    might bring unexpected side effects on CLI. The preferrable way is php.ini.
 
     As a result of UTF-8 support in the streams, PHP scripts are not limited
     to ASCII or ANSI filenames anymore. This is supported out of the box on
@@ -498,10 +359,8 @@ PHP 7.1 UPGRADE NOTES
     2048 bytes. Be aware, that the path segment limit (basename length) still
     persists.
 
-    For the best portability, it is strongely recommended to handle filenames,
-    I/O and other related topics UTF-8. Additionally, for the console applications,
-    the usage of a TrueType font is preferrable and the usage of ini_set() for
-    the codepage change is discouraged.
+    The recommended way to handle file paths, I/O and other related topics is
+    by utilizing UTF-8.
 
   . Support for ftok()
 

UPGRADING.INTERNALS

@@ -82,8 +82,6 @@ changes. See: https://wiki.php.net/phpng-upgrading
   a. Unix build system changes
 
   b. Windows build system changes
-    Static analysis with clang and Cppcheck is supported by passing "clang" or
-    "cppcheck" keyword to the --with-analyzer configure option.
 
 ========================
 3. Module changes

Zend/Zend.m4

@@ -100,7 +100,7 @@ AC_FUNC_ALLOCA
 AC_CHECK_FUNCS(memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp)
 AC_ZEND_BROKEN_SPRINTF
 
-AC_CHECK_DECLS([isfinite, isnan, isinf], [], [], [[#include <math.h>]])
+AC_CHECK_FUNCS(finite isfinite isinf isnan)
 
 ZEND_FP_EXCEPT
 

Zend/configure.in

@@ -64,33 +64,33 @@ int zend_sprintf(char *buffer, const char *format, ...);
 
 /* To enable the is_nan, is_infinite and is_finite PHP functions */
 #ifdef NETWARE
-	#define HAVE_DECL_ISNAN 1
-	#define HAVE_DECL_ISINF 1
-	#define HAVE_DECL_ISFINITE 1
+	#define HAVE_ISNAN 1
+	#define HAVE_ISINF 1
+	#define HAVE_ISFINITE 1
 #endif
 
 #ifndef zend_isnan
-#if HAVE_DECL_ISNAN
+#ifdef HAVE_ISNAN
 #define zend_isnan(a) isnan(a)
 #elif defined(HAVE_FPCLASS)
 #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
 #else
-#define zend_isnan(a) ((a) != (a))
+#define zend_isnan(a) 0
 #endif
 #endif
 
-#if HAVE_DECL_ISINF
+#ifdef HAVE_ISINF
 #define zend_isinf(a) isinf(a)
 #elif defined(INFINITY)
 /* Might not work, but is required by ISO C99 */
-#define zend_isinf(a) (((a)==INFINITY || (a)==-INFINITY)?1:0)
+#define zend_isinf(a) (((a)==INFINITY)?1:0)
 #elif defined(HAVE_FPCLASS)
 #define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
 #else
 #define zend_isinf(a) 0
 #endif
 
-#if HAVE_DECL_ISFINITE
+#if defined(HAVE_ISFINITE) || defined(isfinite)
 #define zend_finite(a) isfinite(a)
 #elif defined(HAVE_FINITE)
 #define zend_finite(a) finite(a)

Zend/tests/017.phpt

@@ -26,6 +26,7 @@ var_dump(count(get_defined_constants()));
 function test () {
 }
 
+var_dump(get_defined_functions(true));
 var_dump(gettype(get_defined_functions()));
 var_dump(count(get_defined_functions()));
 
@@ -64,6 +65,9 @@ NULL
 string(5) "array"
 string(5) "array"
 int(%d)
+
+Warning: get_defined_functions() expects exactly 0 parameters, 1 given in %s on line %d
+NULL
 string(5) "array"
 int(%d)
 

Zend/tests/array_literal_next_element_error.phpt

@@ -1,25 +0,0 @@
---TEST--
-Next free element may overflow in array literals
---FILE--
-<?php
-
-$i = PHP_INT_MAX;
-$array = [$i => 42, new stdClass];
-var_dump($array);
-
-const FOO = [PHP_INT_MAX => 42, "foo"];
-var_dump(FOO);
-
-?>
---EXPECTF--
-Warning: Cannot add element to the array as the next element is already occupied in %s on line %d
-array(1) {
-  [%d]=>
-  int(42)
-}
-
-Warning: Cannot add element to the array as the next element is already occupied in %s on line %d
-array(1) {
-  [%d]=>
-  int(42)
-}

Zend/tests/assign_dim_obj_null_return.phpt

@@ -1,56 +0,0 @@
---TEST--
-Various null return conditions of dim/obj assignments
---FILE--
-<?php
-
-function test() {
-    $array = [PHP_INT_MAX => 42];
-    $true = true;
-
-    var_dump($array[] = 123);
-    var_dump($array[[]] = 123);
-    var_dump($array[new stdClass] = 123);
-    var_dump($true[123] = 456);
-
-    var_dump($array[] += 123);
-    var_dump($array[[]] += 123);
-    var_dump($array[new stdClass] += 123);
-    var_dump($true[123] += 456);
-
-    var_dump($true->foo = 123);
-    var_dump($true->foo += 123);
-}
-
-test();
-
-?>
---EXPECTF--
-Warning: Cannot add element to the array as the next element is already occupied in %s on line %d
-NULL
-
-Warning: Illegal offset type in %s on line %d
-NULL
-
-Warning: Illegal offset type in %s on line %d
-NULL
-
-Warning: Cannot use a scalar value as an array in %s on line %d
-NULL
-
-Warning: Cannot add element to the array as the next element is already occupied in %s on line %d
-NULL
-
-Warning: Illegal offset type in %s on line %d
-NULL
-
-Warning: Illegal offset type in %s on line %d
-NULL
-
-Warning: Cannot use a scalar value as an array in %s on line %d
-NULL
-
-Warning: Attempt to assign property of non-object in %s on line %d
-NULL
-
-Warning: Attempt to assign property of non-object in %s on line %d
-NULL

Zend/tests/assign_to_obj_002.phpt

@@ -1,12 +0,0 @@
---TEST--
-Assign to $this leaks when $this not defined
---FILE--
-<?php
-
-try {
-	$this->a = new stdClass;
-} catch (Error $e) { echo $e->getMessage(), "\n"; }
-
-?>
---EXPECT--
-Using $this when not in object context

Zend/tests/ast/zend-pow-assign.phpt

@@ -1,11 +0,0 @@
---TEST--
-ZEND_POW_ASSIGN
---INI--
-zend.assertions=1
---FILE--
-<?php
-
-assert_options(ASSERT_WARNING);
-assert(false && ($a **= 2));
---EXPECTF--
-Warning: assert(): assert(false && ($a **= 2)) failed in %s%ezend-pow-assign.php on line %d

Zend/tests/bug38047.phpt

@@ -44,7 +44,7 @@ Non-static method A::A_ftk() should not be called statically
 2 %sbug38047.php:36 kalus_error_handler()
 
 
-Fatal error: Uncaught ArgumentCountError: Too few arguments to function A::A_ftk(), 0 passed in %sbug38047.php on line 36 and exactly 1 expected in %sbug38047.php:7
+Fatal error: Uncaught Error: Too few arguments to function A::A_ftk(), 0 passed in %sbug38047.php on line 36 and exactly 1 expected in %sbug38047.php:7
 Stack trace:
 #0 %sbug38047.php(36): A::A_ftk()
 #1 {main}

Zend/tests/bug55705.phpt

@@ -6,7 +6,7 @@ function f(callable $c) {}
 f();
 ?>
 --EXPECTF--
-Fatal error: Uncaught ArgumentCountError: Too few arguments to function f(), 0 passed in %s on line 3 and exactly 1 expected in %s:2
+Fatal error: Uncaught Error: Too few arguments to function f(), 0 passed in %s on line 3 and exactly 1 expected in %s:2
 Stack trace:
 #0 %s(%d): f()
 #1 {main}

Zend/tests/bug63734.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Bug #63734 (Garbage collector can free zvals that are still referenced)
---INI--
-zend.enable_gc = 1
 --FILE--
 <?php
 class C {

Zend/tests/bug69446.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Bug #69446 (GC leak relating to removal of nested data after dtors run)
---INI--
-zend.enable_gc = 1
 --FILE--
 <?php
 $bar = NULL;

Zend/tests/bug69446_2.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Bug #69446 (GC leak relating to removal of nested data after dtors run)
---INI--
-zend.enable_gc = 1
 --FILE--
 <?php
 $bar = NULL;

Zend/tests/bug69534.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Bug #69534 (Cycle leaks through declared properties on internal classes)
---INI--
-zend.enable_gc = 1
 --FILE--
 <?php
 class Node extends SplObjectStorage {

Zend/tests/bug69676_2.phpt

@@ -1,22 +0,0 @@
---TEST--
-Bug #69676: Resolution of self::FOO in class constants not correct (variation)
---FILE--
-<?php
-
-class Foo {
-    const A = 'Foo::A';
-    const B = self::A . ' and ' . self::C;
-    const C = 'Foo::C';
-    
-}
-
-class Bar extends Foo {
-    const A = 'Bar::A';
-    const C = 'Bar::C';
-}
-
-var_dump(Bar::B);
-
-?>
---EXPECT--
-string(17) "Foo::A and Foo::C"

Zend/tests/bug69676_3.phpt

@@ -1,69 +0,0 @@
---TEST--
-Bug #69676: Resolution of self::FOO in class constants not correct (variation)
---FILE--
-<?php
-
-class P {
-    const N = 'P';
-}
-class A extends P {
-    const selfN = self::N;
-    const parentN = parent::N;
-    const N = 'A';
-}
-class B extends A {
-    const N = 'B';
-}
-
-var_dump(B::selfN); // A
-var_dump(B::parentN); // P
-
-class A2 {
-    const selfN = self::N;
-    const N = 'A2';
-}
-class B2 extends A2 {
-    const indSelfN = self::selfN;
-    const N = 'B2';
-}
-class C2 extends B2 {
-    const N = 'C2';
-}
-
-var_dump(C2::indSelfN); // A2
-
-class A3 {
-    const selfN = self::N;
-    const N = 'A3';
-}
-class B3 extends A3 {
-    const exprSelfN = "expr" . self::selfN;
-    const N = 'B3';
-}
-class C3 extends B3 {
-    const N = 'C3';
-}
-
-var_dump(C3::exprSelfN); // exprA3
-
-class A4 {
-    const selfN = self::N;
-    const N = 'A4';
-}
-class B4 extends A4 {
-    const N = 'B4';
-    public $prop = self::selfN;
-}
-class C4 extends B4 {
-    const N = 'C4';
-}
-
-var_dump((new C4)->prop); // A4
-
-?>
---EXPECT--
-string(1) "A"
-string(1) "P"
-string(2) "A2"
-string(6) "exprA3"
-string(2) "A4"

Zend/tests/bug69802.phpt

@@ -7,7 +7,7 @@ $r = new ReflectionMethod($f, '__invoke');
 var_dump($r->getParameters()[0]->getName());
 var_dump($r->getParameters()[0]->getClass());
 echo $r->getParameters()[0], "\n";
-echo $r->getReturnType()->getName(), "\n";
+echo $r->getReturnType(),"\n";
 echo $r,"\n";
 ?>
 --EXPECT--
@@ -18,7 +18,7 @@ object(ReflectionClass)#4 (1) {
 }
 Parameter #0 [ <required> stdClass $x ]
 stdClass
-Method [ <internal> public method __invoke ] {
+Method [ <internal, prototype Closure> public method __invoke ] {
 
   - Parameters [1] {
     Parameter #0 [ <required> stdClass $x ]

Zend/tests/bug70547.phpt

@@ -53,43 +53,27 @@ string(3) "1st"
 string(3) "2nd"
 NULL
 string(3) "4th"
-array(4) {
+array(3) {
   [0]=>
   string(3) "1st"
   [1]=>
   &string(3) "2nd"
-  [2]=>
-  NULL
   [3]=>
   string(3) "4th"
 }
-array(4) {
-  [0]=>
-  NULL
+array(2) {
   [1]=>
   string(3) "2nd"
-  [2]=>
-  NULL
   [3]=>
   string(3) "4th"
 }
-array(4) {
-  [0]=>
-  NULL
+array(2) {
   [1]=>
   &string(3) "2nd"
-  [2]=>
-  NULL
   [3]=>
   string(3) "4th"
 }
-array(4) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-  [2]=>
-  NULL
+array(1) {
   [3]=>
   string(3) "4th"
 }

Zend/tests/bug70689.phpt

@@ -19,7 +19,7 @@ try {
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught ArgumentCountError: Too few arguments to function foo(), 0 passed in %sbug70689.php on line 12 and exactly 1 expected in %sbug70689.php:3
+Fatal error: Uncaught Error: Too few arguments to function foo(), 0 passed in %sbug70689.php on line 12 and exactly 1 expected in %sbug70689.php:3
 Stack trace:
 #0 %sbug70689.php(12): foo()
 #1 {main}

Zend/tests/bug70805_1.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Bug #70805 (Segmentation faults whilst running Drupal 8 test suite) (Crash)
---INI--
-zend.enable_gc = 1
 --FILE--
 <?php
 class A {

Zend/tests/bug70805_2.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Bug #70805 (Segmentation faults whilst running Drupal 8 test suite) (Memleak)
---INI--
-zend.enable_gc = 1
 --FILE--
 <?php
 class A {

Zend/tests/bug71818.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Bug #71818 (Memory leak when array altered in destructor)
---INI--
-zend.enable_gc = 1
 --FILE--
 <?php
 class MemoryLeak

Zend/tests/bug72101.phpt

@@ -79,7 +79,7 @@ Stack trace:
 #0 %sbug72101.php(8): {closure}(2, 'Parameter 1 to ...', '%s', 8, Array)
 #1 %sbug72101.php(27): PHPUnit_Framework_MockObject_Stub_ReturnCallback->invoke(Object(PHPUnit_Framework_MockObject_Invocation_Static))
 #2 %sbug72101.php(19): PHPUnit_Framework_MockObject_Matcher->invoked(Object(PHPUnit_Framework_MockObject_Invocation_Static))
-#3 %sbug72101.php(52): PHPUnit_Framework_MockObject_InvocationMocker->invoke(Object(PHPUnit_Framework_MockObject_Invocation_Static))
+#3 %sbug72101.php(51): PHPUnit_Framework_MockObject_InvocationMocker->invoke(Object(PHPUnit_Framework_MockObject_Invocation_Static))
 #4 %sbug72101.php(72): Mock_MethodCallbackByReference_7b180d26->bar(0, 0, 0)
 #5 {main}
   thrown in %sbug72101.php on line 61

Zend/tests/bug72162.phpt

@@ -7,4 +7,4 @@ $var11 = new StdClass();
 $var16 = error_reporting($var11);
 ?>
 --EXPECTF--
-Recoverable fatal error: Object of class stdClass could not be converted to string in %sbug72162.php on line %d
+Catchable fatal error: Object of class stdClass could not be converted to string in %sbug72162.php on line %d

Zend/tests/bug72598.phpt

@@ -1,26 +0,0 @@
---TEST--
-Bug #72598 (Reference is lost after array_slice())
---FILE--
-<?php
-function ref(&$ref) {
-	var_dump($ref);
-}
-
-new class {
-        function __construct() {
-                $args = [&$this];
-                for ($i = 0; $i < 2; $i++) {
-                        $a = array_slice($args, 0, 1);
-                        call_user_func_array('ref', $a);
-                }
-        }
-};
-?>
---EXPECTF--
-Warning: Parameter 1 to ref() expected to be a reference, value given in %sbug72598.php on line 11
-object(class@anonymous)#1 (0) {
-}
-
-Warning: Parameter 1 to ref() expected to be a reference, value given in %sbug72598.php on line 11
-object(class@anonymous)#1 (0) {
-}

Zend/tests/bug72598_2.phpt

@@ -1,27 +0,0 @@
---TEST--
-Bug #72598.2 (Reference is lost after array_slice())
---FILE--
-<?php
-function ref(&$ref) {
-	var_dump($ref);
-	$ref = 1;
-}
-
-new class {
-        function __construct() {
-		$b = 0;
-                $args = [&$b];
-		unset($b);
-                for ($i = 0; $i < 2; $i++) {
-                        $a = array_slice($args, 0, 1);
-                        call_user_func_array('ref', $a);
-                }
-        }
-};
-?>
---EXPECTF--
-Warning: Parameter 1 to ref() expected to be a reference, value given in %sbug72598_2.php on line 14
-int(0)
-
-Warning: Parameter 1 to ref() expected to be a reference, value given in %sbug72598_2.php on line 14
-int(0)

Zend/tests/bug72767.phpt

@@ -1,16 +0,0 @@
---TEST--
-Bug #72767: PHP Segfaults when trying to expand an infinite operator
---FILE--
-<?php
-
-function test() {}
-$iterator = new LimitIterator(
-    new InfiniteIterator(new ArrayIterator([42])),
-    0, 17000
-);
-test(...$iterator);
-
-?>
-===DONE===
---EXPECT--
-===DONE===

Zend/tests/bug72813.phpt

@@ -1,43 +0,0 @@
---TEST--
-Bug #72813 (Segfault with __get returned by ref)
---FILE--
-<?php
-class Test
-{
-    private $props = ['a' => 'text', 'b' => 1];
-
-    public function &__get($prop)
-    {
-        return $this->props[$prop];
-    }
-    
-    public function __set($prop, $value)
-    {
-        if ($prop === 'b') $value = [$value];
-        $this->props[$prop] = $value;
-    }
-    
-    public function getProperties()
-    {
-        return [$this->props];
-    }
-}
-
-$obj = new Test;
-$obj->b = $obj->b;
-print_r($obj->getProperties());
-?>
---EXPECT--
-Array
-(
-    [0] => Array
-        (
-            [a] => text
-            [b] => Array
-                (
-                    [0] => 1
-                )
-
-        )
-
-)

Zend/tests/bug72854.phpt

@@ -1,18 +0,0 @@
---TEST--
-Bug #72854: PHP Crashes on duplicate destructor call
---FILE--
-<?php
-
-function get() {
-    $t = new stdClass;
-    $t->prop = $t;
-    return $t;
-}
-
-$i = 42;
-get()->prop =& $i;
-
-?>
-===DONE===
---EXPECT--
-===DONE===

Zend/tests/bug72911.phpt

@@ -1,17 +0,0 @@
---TEST--
-Bug #72911 (Memleak in zend_binary_assign_op_obj_helper)
---FILE--
-<?php
-
-$a = 0;
-
-$b = $a->b->i -= 0;
-
-var_dump($b);
-
-?>
---EXPECTF--
-Warning: Attempt to modify property of non-object in %sbug72911.php on line %d
-
-Warning: Attempt to assign property of non-object in %sbug72911.php on line %d
-NULL

Zend/tests/bug72918.phpt

@@ -1,22 +0,0 @@
---TEST--
-Bug #72918 (negative offset inside a quoted string leads to parse error)
---FILE--
-<?php
-$array = [-3 => 'foo'];
-$string = 'abcde';
-
-echo "$array[-3]\n";
-echo "$string[-3]\n";
-echo <<<EOT
-$array[-3]
-$string[-3]
-
-EOT;
-?>
-===DONE===
---EXPECT--
-foo
-c
-foo
-c
-===DONE===

Zend/tests/bug72943.phpt

@@ -1,20 +0,0 @@
---TEST--
-Bug #72943 (assign_dim on string doesn't reset hval)
---FILE--
-<?php
-$array = array("test" => 1);
-
-$a = "lest";
-var_dump($array[$a]);
-$a[0] = "f";
-var_dump($array[$a]);
-$a[0] = "t";
-var_dump($array[$a]);
-?>
---EXPECTF--
-Notice: Undefined index: lest in %sbug72943.php on line %d
-NULL
-
-Notice: Undefined index: fest in %sbug72943.php on line %d
-NULL
-int(1)

Zend/tests/bug72944.phpt

@@ -1,12 +0,0 @@
---TEST--
-Bug #72944 (Null pointer deref in zval_delref_p).
---FILE--
-<?php
-"a"== e & $A = $A? 0 : 0 ?:0;
-echo "OK\n";
-?>
---EXPECTF--
-Notice: Use of undefined constant e - assumed 'e' in %sbug72944.php on line 2
-
-Notice: Undefined variable: A in %sbug72944.php on line 2
-OK

Zend/tests/bug73156.phpt

@@ -1,50 +0,0 @@
---TEST--
-Bug #73156 (segfault on undefined function)
---FILE--
-<?php
-class A {
-    public function __call($name, $args) {
-        eval('$args = array(); var_dump(debug_backtrace());');
-    }
-}
-
-$a = new A();
-
-$a->test("test");
-?>
---EXPECTF--
-array(2) {
-  [0]=>
-  array(3) {
-    ["file"]=>
-    string(%d) "%sbug73156.php"
-    ["line"]=>
-    int(4)
-    ["function"]=>
-    string(4) "eval"
-  }
-  [1]=>
-  array(7) {
-    ["file"]=>
-    string(%d) "%sbug73156.php"
-    ["line"]=>
-    int(10)
-    ["function"]=>
-    string(6) "__call"
-    ["class"]=>
-    string(1) "A"
-    ["object"]=>
-    object(A)#%d (0) {
-    }
-    ["type"]=>
-    string(2) "->"
-    ["args"]=>
-    array(2) {
-      [0]=>
-      string(4) "test"
-      [1]=>
-      array(0) {
-      }
-    }
-  }
-}

Zend/tests/bug73163.phpt

@@ -1,22 +0,0 @@
---TEST--
-Bug #73163 (PHP hangs if error handler throws while accessing undef const in default value)
---FILE--
-<?php
-
-function doSomething(string $value = UNDEFINED) {
-}
-
-set_error_handler(function($errno, $errstr) {
-    throw new Exception($errstr);
-});
-
-doSomething();
-
-?>
---EXPECTF--
-Fatal error: Uncaught Exception: Use of undefined constant UNDEFINED - assumed 'UNDEFINED' in %s:%d
-Stack trace:
-#0 %s(%d): {closure}(%s)
-#1 %s(%d): doSomething()
-#2 {main}
-  thrown in %s on line %d

Zend/tests/bug73181.phpt

@@ -1,20 +0,0 @@
---TEST--
-Bug #73181: parse_str() without a second argument leads to crash
---FILE--
-<?php
-
-function x() {
-    parse_str("1&x");
-    var_dump(get_defined_vars());
-}
-
-x();
-
-?>
---EXPECT--
-array(2) {
-  [1]=>
-  string(0) ""
-  ["x"]=>
-  string(0) ""
-}

Zend/tests/bug73288.phpt

@@ -1,34 +0,0 @@
---TEST--
-Bug #73288 (Segfault in __clone > Exception.toString > __get)
---INI--
-opcache.enable=1
-opcache.enable_cli=1
---FILE--
-<?php
-
-class NoClone {
-	public function __clone() {
-		throw new Exception("No Cloneable");
-	}
-}
-
-class C {
-	public function __get($name) {
-		return new NoClone;
-	}
-}
-
-function test_clone() {
-	$c = new C;
-	$b = clone $c->x;
-}
-
-test_clone();
-?>
---EXPECTF--
-Fatal error: Uncaught Exception: No Cloneable in %sbug73288.php:%d
-Stack trace:
-#0 %s(%d): NoClone->__clone()
-#1 %s(%d): test_clone()
-#2 {main}
-  thrown in %sbug73288.php on line %d

Zend/tests/bug73337.phpt

@@ -1,12 +0,0 @@
---TEST--
-Bug #73337 (try/catch not working with two exceptions inside a same operation)
---FILE--
-<?php
-class d { function __destruct() { throw new Exception; } }
-try { new d + new d; } catch (Exception $e) { print "Exception properly caught\n"; }
-?>
---EXPECTF--
-Notice: Object of class d could not be converted to int in %sbug73337.php on line 3
-
-Notice: Object of class d could not be converted to int in %sbug73337.php on line 3
-Exception properly caught

Zend/tests/bug73338.phpt

@@ -1,18 +0,0 @@
---TEST--
-Bug #73338: Ensure exceptions in function init opcodes are cleaned properly
---FILE--
-<?php
-
-try { call_user_func(new class { function __destruct () { throw new Error; } }); } catch (Error $e) {}
-
-set_error_handler(function() { throw new Error; });
-
-try { var_dump(new stdClass, call_user_func("fail")); } catch (Error $e) {}
-
-try { (function() { call_user_func("fail"); })(); } catch (Error $e) {}
-
-try { [new class { static function foo() {} function __destruct () { throw new Error; } }, "foo"](); } catch (Error $e) {}
-
-?>
---EXPECTF--
-Warning: call_user_func() expects parameter 1 to be a valid callback, no array or string given in %s on line %d

Zend/tests/bug73350.phpt

@@ -1,27 +0,0 @@
---TEST--
-Bug #73350 (Exception::__toString() cause circular references)
---FILE--
-<?php
-$e = new Exception();
-
-// This line cause problem :(
-// Comment it to see the difference.
-(string) $e;
-
-// This line show the clue (PHP Warning: ...).
-var_export($e);
-?>
---EXPECTF--
-Exception::__set_state(array(
-   'message' => '',
-   'string' => 'Exception in %sbug73350.php:%d
-Stack trace:
-#0 {main}',
-   'code' => 0,
-   'file' => '%sbug73350.php',
-   'line' => %d,
-   'trace' => 
-  array (
-  ),
-   'previous' => NULL,
-))

Zend/tests/bug73663.phpt

@@ -1,73 +0,0 @@
---TEST--
-Bug #73663 ("Invalid opcode 65/16/8" occurs with a variable created with list())
---FILE--
-<?php
-function change(&$ref) {
-	$ref = range(1, 10);
-	return;
-}
-
-$func = function (&$ref) {
-	return change($ref);
-};
-
-$array = [1];
-var_dump(list($val) = $array); // NG: Invalid opcode
-
-change(list($val) = $array);
-var_dump($array);
-
-$array = [1];
-
-$func(list($val) = $array);
-var_dump($array);
-?>
---EXPECT--
-array(1) {
-  [0]=>
-  int(1)
-}
-array(10) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-  [5]=>
-  int(6)
-  [6]=>
-  int(7)
-  [7]=>
-  int(8)
-  [8]=>
-  int(9)
-  [9]=>
-  int(10)
-}
-array(10) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-  [5]=>
-  int(6)
-  [6]=>
-  int(7)
-  [7]=>
-  int(8)
-  [8]=>
-  int(9)
-  [9]=>
-  int(10)
-}

Zend/tests/bug73753.phpt

@@ -1,29 +0,0 @@
---TEST--
-Bug #73753 Non packed arrays and duplication
---FILE--
-<?php
-function iterate($current, $a, $result = null) {
-    if (!$current) {
-        return $result;
-    }
-
-    return iterate(getNext($a), $a, $current);
-}
-
-function getNext(&$a) {
-    return next($a);
-}
-
-function getCurrent($a) {
-    return current($a);
-}
-
-function traverse($a) {
-    return iterate(getCurrent($a), $a);
-}
-
-$arr = array(1 => 'foo', 'b' => 'bar', 'baz');
-var_dump(traverse($arr));
-?>
---EXPECTF--
-string(3) "baz"

Zend/tests/bug73792.phpt

@@ -1,20 +0,0 @@
---TEST--
-Bug #73792 (invalid foreach loop hangs script)
---FILE--
-<?php
-$a = 'aaa';
-
-foreach ($a['bbb'] as &$value) {
-	echo 'loop';
-}
-
-unset($value);
-echo 'done';
-?>
---EXPECTF--
-Warning: Illegal string offset 'bbb' in %sbug73792.php on line 4
-
-Fatal error: Uncaught Error: Cannot iterate on string offsets by reference in %sbug73792.php:4
-Stack trace:
-#0 {main}
-  thrown in %sbug73792.php on line 4

Zend/tests/bug73900.phpt

@@ -1,15 +0,0 @@
---TEST--
-Bug #73900: Use After Free in unserialize() SplFixedArray
---FILE--
-<?php
-
-$a = new stdClass;
-$b = new SplFixedArray(1);
-$b[0] = $a;
-$c = &$b[0];
-var_dump($c);
-
-?>
---EXPECT--
-object(stdClass)#1 (0) {
-}

Zend/tests/bug73916.phpt

@@ -1,16 +0,0 @@
---TEST--
-Bug #73916 (zend_print_flat_zval_r doesn't consider reference)
---FILE--
-<?php
-$a = array('a');
-class b{};
-$b = new b;
-$test[] =& $a;
-$test[] =& $b;
-test($test);
-function test() {
-	debug_print_backtrace();
-}
-?>
---EXPECTF--
-#0  test(Array ([0] => Array ([0] => a),[1] => b Object ())) called at [%sbug73916.php:%d]

Zend/tests/bug73954.phpt

@@ -1,23 +0,0 @@
---TEST--
-Bug #73954 (NAN check fails on Alpine Linux with musl)
---FILE--
-<?php
-
-var_dump(NAN);
-var_dump(is_nan(NAN));
-
-function takes_int(int $int) {
-}
-
-takes_int(log(tan(3.14)));
-
-?>
---EXPECTF--
-float(NAN)
-bool(true)
-
-Fatal error: Uncaught TypeError: Argument 1 passed to takes_int() must be of the type integer, float given, called in %s on line 9 and defined in %s:6
-Stack trace:
-#0 %s(9): takes_int(NAN)
-#1 {main}
-  thrown in %s on line 6

Zend/tests/bug73960.phpt

@@ -1,16 +0,0 @@
---TEST--
-Bug #73960: Leak with instance method calling static method with referenced return
---FILE--
-<?php
-
-$value = 'one';
-$array = array($value);
-$array = $ref =& $array;
-var_dump($array);
-
-?>
---EXPECT--
-array(1) {
-  [0]=>
-  string(3) "one"
-}

Zend/tests/bug73989.phpt

@@ -1,28 +0,0 @@
---TEST--
-Bug #73989 (PHP 7.1 Segfaults within Symfony test suite)
---FILE--
-<?php
-class Cycle
-{
-    private $thing;
-
-    public function __construct()
-    {
-		$obj = $this;
-        $this->thing = function() use($obj) {};
-    }
-
-    public function __destruct()
-    {
-		($this->thing)();
-    }
-
-}
-
-for ($i = 0; $i < 10000; ++$i) {
-    $obj = new Cycle();
-}
-echo "OK\n";
-?>
---EXPECT--
-OK

Zend/tests/bug73998.phpt

@@ -1,19 +0,0 @@
---TEST--
-Bug #73998 (array_key_exists fails on arrays created by get_object_vars)
---DESCRIPTION--
-Properties of objects with numeric names should be accessible
---FILE--
-<?php
-$a = new stdClass;
-$a->{1234} = "Numeric";
-$a->a1234 = "String";
-
-$properties = get_object_vars($a);
-var_dump(array_key_exists(1234, $properties));
-echo "Value: {$properties[1234]}\n";
-
-?>
---EXPECT--
-bool(true)
-Value: Numeric
-

Zend/tests/bug74084.phpt

@@ -1,19 +0,0 @@
---TEST--
-Bug #74084 (Out of bound read - zend_mm_alloc_small)
---INI--
-error_reporting=0
---FILE--
-<?php
-$$A += $$B->a = &$$C; 
-unset($$A);
-$$A -= $$B->a = &$$C; 
-unset($$A);
-$$A *= $$B->a = &$$C; 
-unset($$A);
-$$A /= $$B->a = &$$C; 
-unset($$A);
-$$A **= $$B->a = &$$C; 
-var_dump($$A);
-?>
---EXPECT--
-int(1)

Zend/tests/bug74093.phpt

@@ -1,20 +0,0 @@
---TEST--
-Bug #74093 (Maximum execution time of n+2 seconds exceed not written in error_log)
---SKIPIF--
-<?php
-if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-if (PHP_ZTS) die("skip only for no-zts build");
-if (substr(PHP_OS, 0, 3) == 'WIN') die("skip not for Windows");
-?>
---INI--
-memory_limit=1G
-max_execution_time=1
-hard_timeout=1
---FILE--
-<?php
-$a1 = range(1, 1000000);
-$a2 = range(100000, 1999999);
-array_intersect($a1, $a2);
-?>
---EXPECTF--
-Fatal error: Maximum execution time of 1+1 seconds exceeded %s

Zend/tests/bug74164.phpt

@@ -1,20 +0,0 @@
---TEST--
-Bug #74164 (PHP hangs when an invalid value is dynamically passed to typehinted by-ref arg)
---FILE--
-<?php
-
-namespace Foo;
-
-set_error_handler(function ($type, $msg) {
-	throw new \Exception($msg);
-});
-
-call_user_func(function (array &$ref) {var_dump("xxx");}, 'not_an_array_variable');
-?>
---EXPECTF--
-Fatal error: Uncaught Exception: Parameter 1 to Foo\{closure}() expected to be a reference, value given in %sbug74164.php:%d
-Stack trace:
-#0 [internal function]: Foo\{closure}(%s)
-#1 %sbug74164.php(%d): call_user_func(%s)
-#2 {main}
-  thrown in %sbug74164.php on line %d

Zend/tests/bug74188.phpt

@@ -1,14 +0,0 @@
---TEST--
-Fixes bug 74188 (undeclared static variables emit a warning with ?? operator)
---FILE--
-<?php
-abstract class Test
-{
-	public static function get()
-	{
-		static::$a ?? true;
-	}
-}
-Test::get();
-?>
---EXPECT--

Zend/tests/bug74340.phpt

@@ -1,30 +0,0 @@
---TEST--
-Bug #74340: Magic function __get has different behavior in php 7.1.x
---FILE--
-<?php
-class Test
-{
-    public function __get($var)
-    {
-        static $first = true;
-        echo '__get '.$var.PHP_EOL;
-        if ($first) {
-            $first = false;
-            $this->$var;
-            $this->{$var.'2'};
-            $this->$var;
-        }
-    }
-}
-
-$test = new Test;
-$test->test;
-
-?>
---EXPECTF--
-__get test
-
-Notice: Undefined property: Test::$test in %s on line %d
-__get test2
-
-Notice: Undefined property: Test::$test in %s on line %d

Zend/tests/bug74408.phpt

@@ -1,38 +0,0 @@
---TEST--
-Bug #74408 (Endless loop bypassing execution time limit)
---INI--
-error_reporting = E_ALL | E_DEPRECATED | E_STRICT
---FILE--
-<?php
-
- //php.ini: error_reporting = E_ALL | E_DEPRECATED | E_STRICT
-
- class ErrorHandling {
-
-  public  function error_handler($errno, $errstr, $errfile, $errline) {
-	  $bla = new NonExistingClass2();
-  }
-
-  public function exception_handler(Error $e) { 
-	  echo "Caught, exception: " . $e->getMessage();
-  }
- }
-
- set_error_handler('ErrorHandling::error_handler');
- set_exception_handler('ErrorHandling::exception_handler');
-
- $blubb = new NonExistingClass();
-?>
---EXPECTF--
-Deprecated: Non-static method ErrorHandling::error_handler() should not be called statically in %sbug74408.php on line %d
-
-Deprecated: Non-static method ErrorHandling::error_handler() should not be called statically in %sbug74408.php on line %d
-
-Deprecated: Non-static method ErrorHandling::error_handler() should not be called statically in Unknown on line 0
-
-Fatal error: Uncaught Error: Class 'NonExistingClass2' not found in %sbug74408.php:%d
-Stack trace:
-#0 [internal function]: ErrorHandling::error_handler(8192, 'Non-static meth...', '%s', %d, Array)
-#1 %sbug74408.php(%d): set_exception_handler('ErrorHandling::...')
-#2 {main}
-  thrown in %sbug74408.php on line %d

Zend/tests/bug74546.phpt

@@ -1,11 +0,0 @@
---TEST--
-Bug #74546 (SIGILL in ZEND_FETCH_CLASS_CONSTANT_SPEC_CONST_CONST_HANDLER())
---FILE--
-<?php 
-"000000"[0]::d;
-?>
---EXPECTF--
-Fatal error: Uncaught Error: Class '0' not found in %sbug74546.php:%d
-Stack trace:
-#0 {main}
-  thrown in %sbug74546.php on line %d

Zend/tests/bug74603.ini

@@ -1 +0,0 @@
-0=0&~2000000000

Zend/tests/bug74603.phpt

@@ -1,15 +0,0 @@
---TEST--
-Bug #74603 (PHP INI Parsing Stack Buffer Overflow Vulnerability)
---SKIPIF--
-<?php
-if (PHP_INT_MAX !== 2147483647)
-        die('skip for 32-bit only');
---FILE--
-<?php
-var_dump(parse_ini_file(__DIR__ . "/bug74603.ini", true, INI_SCANNER_NORMAL));
-?>
---EXPECT--
-array(1) {
-  [0]=>
-  string(1) "0"
-}

Zend/tests/bug74657.phpt

@@ -1,26 +0,0 @@
---TEST--
-Bug #74657 (Undefined constants in array properties result in broken properties)
---FILE--
-<?php
-
-interface I {
-}
-
-class C {
-	const FOO = I::FOO;
-
-	public $options = [self::FOO => "bar"];
-}
-
-try {
-	var_dump((new C)->options);
-} catch (Throwable $e) {}
-
-var_dump((new C)->options);
-?>
---EXPECTF--
-Fatal error: Uncaught Error: Undefined class constant 'I::FOO' in %sbug74657.php:%d
-Stack trace:
-#0 {main}
-  thrown in %sbug74657.php on line %d
-

Zend/tests/bug74840.phpt

@@ -1,21 +0,0 @@
---TEST--
-Bug #74840: Opcache overwrites argument of GENERATOR_RETURN within finally
---FILE--
-<?php
-
-$g = (function($a) {
-	try {
-		return $a + 1;
-	} finally {
-		$b = $a + 2;
-		var_dump($b);
-	}
-	yield; // Generator
-})(1);
-$g->next();
-var_dump($g->getReturn());
-
-?>
---EXPECT--
-int(3)
-int(2)

Zend/tests/bug74862.phpt

@@ -1,43 +0,0 @@
---TEST--
-Bug #74862 (Unable to clone instance when private __clone defined)
---FILE--
-<?php
-
-class a {
-    private function __clone()
-    {
-
-    }
-
-    private function __construct()
-    {
-
-    }
-
-    public static function getInstance()
-    {
-        return new static();
-    }
-
-    public function cloneIt()
-    {
-        $a = clone $this;
-
-        return $a;
-    }
-}
-
-class c extends a {
-
-}
-
-// private constructor
-$d = c::getInstance();
-
-// private clone
-$e = $d->cloneIt();
-var_dump($e);
-?>
---EXPECT--
-object(c)#2 (0) {
-}

Zend/tests/bug74862_2.phpt

@@ -1,46 +0,0 @@
---TEST--
-Bug #74862 (Unable to clone instance when private __clone defined in a child class)
---FILE--
-<?php
-
-class main {
-}
-
-class a extends main {
-    private function __clone()
-    {
-
-    }
-
-    private function __construct()
-    {
-
-    }
-
-    public static function getInstance()
-    {
-        return new static();
-    }
-
-    public function cloneIt()
-    {
-        $a = clone $this;
-
-        return $a;
-    }
-}
-
-class c extends a {
-
-}
-
-// private constructor
-$d = c::getInstance();
-
-// private clone
-$e = $d->cloneIt();
-var_dump($e);
-?>
---EXPECT--
-object(c)#2 (0) {
-}

Zend/tests/bug74947.phpt

@@ -1,12 +0,0 @@
---TEST--
-Bug #74947 (Segfault in scanner on INF number)
---FILE--
-<?php 
-
-echo 200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000;
-
-echo -200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000;
-
-?>
---EXPECTF--
-INF-INF

Zend/tests/bug75241.phpt

@@ -1,13 +0,0 @@
---TEST--
-Bug #75241 (Null pointer dereference in zend_mm_alloc_small())
---FILE--
-<?php
-function eh(){}
-
-set_error_handler('eh');
-
-$d->d = &$d + $d->d/=0;
-var_dump($d);
-?>
---EXPECT--
-float(INF)

Zend/tests/bug75252.phpt

@@ -1,28 +0,0 @@
---TEST--
-Bug #75252: Incorrect token formatting on two parse errors in one request
---FILE--
-<?php
-
-$code = <<<'CODE'
-function test_missing_semicolon() : string {
-     $x = []
-     FOO
-}
-CODE;
-
-try {
-    eval($code);
-} catch (ParseError $e) {
-    var_dump($e->getMessage());
-}
-
-try {
-    eval($code);
-} catch (ParseError $e) {
-    var_dump($e->getMessage());
-}
-
-?>
---EXPECT--
-string(41) "syntax error, unexpected 'FOO' (T_STRING)"
-string(41) "syntax error, unexpected 'FOO' (T_STRING)"

Zend/tests/bug75290.phpt

@@ -1,26 +0,0 @@
---TEST--
-Bug #75290 (debug info of Closures of internal functions contain garbage argument names)
---FILE--
-<?php
-
-var_dump((new ReflectionFunction('sin'))->getClosure());
-
-var_dump(function ($someThing) {});
-
-?>
---EXPECT--
-object(Closure)#2 (1) {
-  ["parameter"]=>
-  array(1) {
-    ["$number"]=>
-    string(10) "<required>"
-  }
-}
-object(Closure)#2 (1) {
-  ["parameter"]=>
-  array(1) {
-    ["$someThing"]=>
-    string(10) "<required>"
-  }
-}
-

Zend/tests/bug75420.1.phpt

@@ -1,18 +0,0 @@
---TEST--
-Bug #75420.1 (Indirect modification of magic method argument)
---FILE--
-<?php
-class Test {
-	public function __isset($x) { $GLOBALS["name"] = 24; return true; }
-	public function __get($x) { var_dump($x); return 42; }
-}
-
-$obj = new Test;
-$name = "foo";
-var_dump($obj->$name ?? 12);
-var_dump($name);
-?>
---EXPECT--
-string(3) "foo"
-int(42)
-int(24)

Zend/tests/bug75420.10.phpt

@@ -1,21 +0,0 @@
---TEST--
-Bug #75420.10 (Indirect modification of magic method argument)
---FILE--
-<?php
-class Test implements ArrayAccess {
-	public function offsetExists($x) { $GLOBALS["name"] = 24; return true; }
-	public function offsetGet($x) { var_dump($x); return 42; }
-	public function offsetSet($x, $y) { }
-	public function offsetUnset($x) { }
-}
-
-$obj = new Test;
-$name = "foo";
-$name = str_repeat($name, 2);
-var_dump($obj[$name] ?? 12);
-var_dump($name);
-?>
---EXPECT--
-string(6) "foofoo"
-int(42)
-int(24)

Zend/tests/bug75420.11.phpt

@@ -1,20 +0,0 @@
---TEST--
-Bug #75420.11 (Indirect modification of magic method argument)
---FILE--
-<?php
-class Test implements ArrayAccess {
-	public function offsetExists($x) { $GLOBALS["name"] = 24; return true; }
-	public function offsetGet($x) { var_dump($x); return 42; }
-	public function offsetSet($x, $y) { }
-	public function offsetUnset($x) { }
-}
-
-$obj = new Test;
-$name = "foo";
-var_dump(empty($obj[$name]));
-var_dump($name);
-?>
---EXPECT--
-string(3) "foo"
-bool(false)
-int(24)

Zend/tests/bug75420.12.phpt

@@ -1,21 +0,0 @@
---TEST--
-Bug #75420.12 (Indirect modification of magic method argument)
---FILE--
-<?php
-class Test implements ArrayAccess {
-	public function offsetExists($x) { $GLOBALS["name"] = 24; return true; }
-	public function offsetGet($x) { var_dump($x); return 42; }
-	public function offsetSet($x, $y) { }
-	public function offsetUnset($x) { }
-}
-
-$obj = new Test;
-$name = "foo";
-$name = str_repeat($name, 2);
-var_dump(empty($obj[$name]));
-var_dump($name);
-?>
---EXPECT--
-string(6) "foofoo"
-bool(false)
-int(24)

Zend/tests/bug75420.13.phpt

@@ -1,20 +0,0 @@
---TEST--
-Bug #75420.13 (Indirect modification of magic method argument)
---FILE--
-<?php
-class Test implements ArrayAccess {
-	public function offsetExists($x) { $GLOBALS["obj"] = 24; return true; }
-	public function offsetGet($x) { var_dump($x); return 42; }
-	public function offsetSet($x, $y) { }
-	public function offsetUnset($x) { }
-}
-
-$obj = new Test;
-$name = "foo";
-var_dump($obj[$name] ?? 12);
-var_dump($obj);
-?>
---EXPECT--
-string(3) "foo"
-int(42)
-int(24)

Zend/tests/bug75420.14.phpt

@@ -1,20 +0,0 @@
---TEST--
-Bug #75420.14 (Indirect modification of magic method argument)
---FILE--
-<?php
-class Test implements ArrayAccess {
-	public function offsetExists($x) { $GLOBALS["obj"] = 24; return true; }
-	public function offsetGet($x) { var_dump($x); return 42; }
-	public function offsetSet($x, $y) { }
-	public function offsetUnset($x) { }
-}
-
-$obj = new Test;
-$name = "foo";
-var_dump(empty($obj[$name]));
-var_dump($obj);
-?>
---EXPECT--
-string(3) "foo"
-bool(false)
-int(24)

Zend/tests/bug75420.15.phpt

@@ -1,20 +0,0 @@
---TEST--
-Bug #75420.15 (Indirect modification of magic method argument)
---FILE--
-<?php
-class Test implements ArrayAccess {
-	public function offsetExists($x) { }
-	public function offsetGet($x) { }
-	public function offsetSet($x, $y) { $GLOBALS["name"] = 24; var_dump($x); }
-	public function offsetUnset($x) { }
-}
-
-$obj = new Test;
-$name = "foo";
-$name = str_repeat($name, 2);
-$obj[$name] = 1;
-var_dump($name);
-?>
---EXPECT--
-string(6) "foofoo"
-int(24)

Zend/tests/bug75420.16.phpt

@@ -1,20 +0,0 @@
---TEST--
-Bug #75420.16 (Indirect modification of magic method argument)
---FILE--
-<?php
-class Test implements ArrayAccess {
-	public function offsetExists($x) { }
-	public function offsetGet($x) { }
-	public function offsetSet($x, $y) { $GLOBALS["obj"] = 24; var_dump($this); }
-	public function offsetUnset($x) { }
-}
-
-$obj = new Test;
-$name = "foo";
-$obj[$name] = 1;
-var_dump($obj);
-?>
---EXPECT--
-object(Test)#1 (0) {
-}
-int(24)

Zend/tests/bug75420.2.phpt

@@ -1,20 +0,0 @@
---TEST--
-Bug #75420.2 (Indirect modification of magic method argument)
---FILE--
-<?php
-class Test {
-	public function __isset($x) { $GLOBALS["name"] = 24; return true; }
-	public function __get($x) { var_dump($x); return 42; }
-}
-
-$obj = new Test;
-$name = "foo";
-$name = str_repeat($name, 2);
-var_dump($obj->$name ?? 12);
-var_dump($name);
-?>
---EXPECT--
-string(6) "foofoo"
-int(42)
-int(24)
-

Zend/tests/bug75420.3.phpt

@@ -1,18 +0,0 @@
---TEST--
-Bug #75420.3 (Indirect modification of magic method argument)
---FILE--
-<?php
-class Test {
-	public function __isset($x) { $GLOBALS["name"] = 24; return true; }
-	public function __get($x) { var_dump($x); return 42; }
-}
-
-$obj = new Test;
-$name = "foo";
-var_dump(empty($obj->$name));
-var_dump($name);
-?>
---EXPECT--
-string(3) "foo"
-bool(false)
-int(24)

Zend/tests/bug75420.4.phpt

@@ -1,17 +0,0 @@
---TEST--
-Bug #75420.4 (Indirect modification of magic method argument)
---FILE--
-<?php
-class Test {
-	public function __isset($x) { $GLOBALS["name"] = 24; return true; }
-	public function __get($x) { var_dump($x); return 42; }
-}
-
-$obj = new Test;
-$name = "foo";
-$name = str_repeat($name, 2);
-var_dump(empty($obj->$name));
-?>
---EXPECT--
-string(6) "foofoo"
-bool(false)

Zend/tests/bug75420.5.phpt

@@ -1,19 +0,0 @@
---TEST--
-Bug #75420.5 (Indirect modification of magic method argument)
---FILE--
-<?php
-class Test {
-	public function __isset($x) { $GLOBALS["obj"] = 24; return true; }
-	public function __get($x) { var_dump($this); return 42; }
-}
-
-$obj = new Test;
-$name = "foo";
-var_dump($obj->$name ?? 12);
-var_dump($obj);
-?>
---EXPECT--
-object(Test)#1 (0) {
-}
-int(42)
-int(24)

Zend/tests/bug75420.6.phpt

@@ -1,19 +0,0 @@
---TEST--
-Bug #75420.6 (Indirect modification of magic method argument)
---FILE--
-<?php
-class Test {
-	public function __isset($x) { $GLOBALS["obj"] = 24; return true; }
-	public function __get($x) { var_dump($this); return 42; }
-}
-
-$obj = new Test;
-$name = "foo";
-var_dump(empty($obj->$name));
-var_dump($obj);
-?>
---EXPECT--
-object(Test)#1 (0) {
-}
-bool(false)
-int(24)

Zend/tests/bug75420.7.phpt

@@ -1,17 +0,0 @@
---TEST--
-Bug #75420.7 (Indirect modification of magic method argument)
---FILE--
-<?php
-class Test {
-	public function __set($x,$v) { $GLOBALS["name"] = 24; var_dump($x); }
-}
-
-$obj = new Test;
-$name = "foo";
-$name = str_repeat($name, 2);
-$obj->$name = 1;
-var_dump($name);
-?>
---EXPECT--
-string(6) "foofoo"
-int(24)

Zend/tests/bug75420.8.phpt

@@ -1,17 +0,0 @@
---TEST--
-Bug #75420.8 (Indirect modification of magic method argument)
---FILE--
-<?php
-class Test {
-	public function __set($x,$v) { $GLOBALS["obj"] = 24; var_dump($this); }
-}
-
-$obj = new Test;
-$name = "foo";
-$obj->$name = 1;
-var_dump($obj);
-?>
---EXPECT--
-object(Test)#1 (0) {
-}
-int(24)

Zend/tests/bug75420.9.phpt

@@ -1,20 +0,0 @@
---TEST--
-Bug #75420.9 (Indirect modification of magic method argument)
---FILE--
-<?php
-class Test implements ArrayAccess {
-	public function offsetExists($x) { $GLOBALS["name"] = 24; return true; }
-	public function offsetGet($x) { var_dump($x); return 42; }
-	public function offsetSet($x, $y) { }
-	public function offsetUnset($x) { }
-}
-
-$obj = new Test;
-$name = "foo";
-var_dump($obj[$name] ?? 12);
-var_dump($name);
-?>
---EXPECT--
-string(3) "foo"
-int(42)
-int(24)