5.4.25

There are situations where mysqlnd dupliates zvals while freeing result
sets. If the memory_limit is reached during this operation the engine
will bailout. This patch makes sure that a later attempt (during
RSHIUTDOWN) won't cause a double free, instead we rely on the engine to
free emalloc()ed memory after bailout.

.gitattributes

@@ -23,8 +23,6 @@ sapi/continuity/capi.c          ident
 Zend/RFCs/002.txt               ident
 Zend/RFCs/003.txt               ident
 NEWS                            merge=NEWS
-UPGRADING                       merge=NEWS
-UPGRADING.INTERNALS             merge=NEWS
 /ext/bz2/tests/with_strings.phpt	-crlf
 /ext/dom/tests/bug40836.phpt	-crlf
 /ext/dom/tests/domelement.phpt	-crlf

.gitignore

@@ -96,8 +96,6 @@ stamp-h.in
 scan_makefile_in.awk
 TSRM/tsrm_config.h
 Zend/zend_config.h
-Zend/zend_dtrace_gen.h
-Zend/zend_dtrace_gen.hbak
 Zend/zend_ini_parser.c
 Zend/zend_ini_parser.h
 Zend/zend_ini_parser.output

.travis.yml

@@ -1,24 +1,9 @@
 language: php
 
-php:
-    # We only specify one version so we only get one worker
-    - 5.4
+branches:
+    except:
+        - /^PHP-5\.3.*/
+        - /^PHP-5\.4.*/
 
 notifications:
     email: false
-
-env:
-    - REPORT_EXIT_STATUS=1
-
-before_script:
-    # Compile PHP
-    - ./travis/compile.sh
-    # Setup Extensions 
-    - . ./travis/ext/mysql/setup.sh
-    - . ./travis/ext/mysqli/setup.sh
-    - . ./travis/ext/pdo_mysql/setup.sh
-    - . ./travis/ext/pgsql/setup.sh
-    - . ./travis/ext/pdo_pgsql/setup.sh
-
-# Run PHPs run-tests.php 
-script: ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff

CODING_STANDARDS

@@ -59,8 +59,8 @@ Exceptions:
     you're calling.
 
 7.  When commenting out code using a #if statement, do NOT use 0 only. Instead
-    use "<svn username here>_0". For example, #if FOO_0, where FOO is your
-    svn user foo.  This allows easier tracking of why code was commented out,
+    use "<git username here>_0". For example, #if FOO_0, where FOO is your
+    git user foo.  This allows easier tracking of why code was commented out,
     especially in bundled libraries.
 
 8.  Do not define functions that are not available.  For instance, if a
@@ -151,7 +151,7 @@ Naming Conventions
 
 7.  Classes should be given descriptive names. Avoid using abbreviations where
     possible. Each word in the class name should start with a capital letter,
-    without underscore delimiters (CampelCaps starting with a capital letter).
+    without underscore delimiters (CamelCaps starting with a capital letter).
     The class name should be prefixed with the name of the 'parent set' (e.g.
     the name of the extension)::
 

EXTENSIONS

@@ -147,7 +147,7 @@ STATUS:              Working
 COMMENT:             Tested on phpts and isapi versions
 -------------------------------------------------------------------------------
 EXTENSION:           mysql
-PRIMARY MAINTAINER:  Zak Greant <zak@mysql.com>, Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>, Johannes Schlüter <johannes@php.net>,  Ulf Wendel <uw@php.net>
+PRIMARY MAINTAINER:  Zak Greant <zak@mysql.com>, Georg Richter <georg@php.net>,  Johannes Schlüter <johannes@php.net>,  Ulf Wendel <uw@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -158,7 +158,7 @@ STATUS:              Working
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           mysqlnd
-PRIMARY MAINTAINER:  Andrey Hristov <andrey@php.net>, Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>      
+PRIMARY MAINTAINER:  Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>,  Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>      
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3

LICENSE

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

Makefile.frag

@@ -7,7 +7,7 @@ $(builddir)/zend_language_scanner.lo: $(srcdir)/zend_language_parser.h
 $(builddir)/zend_ini_scanner.lo: $(srcdir)/zend_ini_parser.h
 
 $(srcdir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
-	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l)
+	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l)
 
 $(srcdir)/zend_language_parser.h: $(srcdir)/zend_language_parser.c
 $(srcdir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y
@@ -18,6 +18,6 @@ $(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
 	@$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@
 
 $(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
-	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l)
+	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l)
 
 $(builddir)/zend_indent.lo $(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h

Makefile.gcov

@@ -3,8 +3,6 @@
 # LCOV
 #
 
-LCOV_INCLUDE="."
-
 lcov: lcov-html
 
 lcov-test: lcov-clean-data test
@@ -14,7 +12,7 @@ php_lcov.info: lcov-test
 	@rm -rf lcov_data/
 	@$(mkinstalldirs) lcov_data/
 	@echo
-	-@files=`find . -name \*.gcda -o -name \*.gcno -o -name \*.da -o -name \*.c -o -name \*.h | sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | $(EGREP) $(LCOV_INCLUDE) | uniq` ;\
+	-@files=`find . -name \*.gcda -o -name \*.gcno -o -name \*.da -o -name \*.h | sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | uniq` ;\
 	for x in $$files; do \
 		echo -n . ;\
 		y=`echo $$x | sed -e 's!\.libs/!!'`; \
@@ -41,26 +39,14 @@ php_lcov.info: lcov-test
 		if test -f "$(top_builddir)/$$y.c"; then \
 			ln -f -s $(top_builddir)/$$y.c lcov_data/$$y.c; \
 		fi; \
-		if test -f "$$x.gcno"; then \
-			cp $$x.gcno lcov_data/$$y.gcno ; \
-		fi; \
-		if test -f "$$x.gcda"; then \
-			cp $$x.gcda lcov_data/$$y.gcda ; \
-		fi; \
-		if test -f "$$x.da"; then \
-			cp $$x.da   lcov_data/$$y.da ; \
-		fi; \
-		if test -f "$$x.bb"; then \
-			cp $$x.bb   lcov_data/$$y.bb ; \
-		fi; \
-		if test -f "$$x.bbg"; then \
-			cp $$x.bbg  lcov_data/$$y.bbg ; \
-		fi; \
-	done; \
+		test -f "$$x.gcno" && cp $$x.gcno lcov_data/$$y.gcno ; \
+		test -f "$$x.gcda" && cp $$x.gcda lcov_data/$$y.gcda ; \
+		test -f "$$x.da"   && cp $$x.da   lcov_data/$$y.da ; \
+		test -f "$$x.bb"   && cp $$x.bb   lcov_data/$$y.bb ; \
+		test -f "$$x.bbg"  && cp $$x.bbg  lcov_data/$$y.bbg ; \
+	done
 	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; \
+		test -d lcov_data/$$dir && rm -rf lcov_data/$$dir ; \
 	done
 	@echo 
 	@echo "Generating $@"

Makefile.global

@@ -10,7 +10,7 @@ all: $(all_targets)
 	@echo "Build complete."
 	@echo "Don't forget to run 'make test'."
 	@echo
-	
+
 build-modules: $(PHP_MODULES) $(PHP_ZEND_EX)
 
 build-binaries: $(PHP_BINARIES)
@@ -86,7 +86,7 @@ PHP_TEST_SHARED_EXTENSIONS =  ` \
 PHP_DEPRECATED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
 
 test: all
-	@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
+	-@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
 		INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
 		if test "$$INI_FILE"; then \
 			$(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
@@ -102,9 +102,7 @@ test: all
 		TEST_PHP_SRCDIR=$(top_srcdir) \
 		CC="$(CC)" \
 			$(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
-		TEST_RESULT_EXIT_CODE=$$?; \
 		rm $(top_builddir)/tmp-php.ini; \
-		exit $$TEST_RESULT_EXIT_CODE; \
 	else \
 		echo "ERROR: Cannot run tests without CLI sapi."; \
 	fi
@@ -118,7 +116,7 @@ clean:
 	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_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 stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
+	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak
 	$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f
 
 .PHONY: all clean install distclean test

README.EXTENSIONS

@@ -30,7 +30,7 @@ zend_module_entry foo_module_entry = {
     PHP_RSHUTDOWN(foo),   /* per-request shutdown function */
     PHP_MINFO(foo),       /* information function */
 #if ZEND_MODULE_API_NO >= 20010901
-    FOO_VERSION,          /* extension version number (string) */
+    PHP_FOO_VERSION,      /* extension version number (string) */
 #endif
     STANDARD_MODULE_PROPERTIES
 };

README.EXT_SKEL

@@ -31,6 +31,11 @@ HOW TO USE IT
 
     ./buildconf; ./configure --enable-module_name; make
 
+  The definition of PHP_MODULE_NAME_VERSION will be present in the
+  php_module_name.h and injected into the zend_module_entry definition. This
+  is required by the PECL website for the version string conformity checks
+  against package.xml
+
   But if you already have planned the overall scheme of your module, what
   functions it will contain, their return types and the arguments they take
   (a very good idea) and don't want to bother yourself with creating function

README.GIT-RULES

@@ -45,15 +45,16 @@ Currently we have the following branches in use::
 
   master    The active development branch. 
 
-  PHP-5.5   Is used to release the PHP 5.5.x series. It allows for larger
-            enhancements.
-
-  PHP-5.4   Is used to release the PHP 5.4.x series. This is current
+  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.3   Is used to release the PHP 5.3.x series. This is current 
+  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   Is used to release the PHP 5.3.x series. This is currently 
+            in extended support and open forsecurity fixes only. Triaged
+            via security@php.net
+
   PHP-5.2   This branch is closed.
 
   PHP-5.1   This branch is closed.
@@ -68,9 +69,11 @@ The next few rules are more of a technical nature::
       branches) an empty merge should be done.
 
    2. All news updates intended for public viewing, such as new features,
-      bug fixes, improvements, etc., should go into the NEWS file of the
-      *first* to be released version with the given change. In other words
-      any NEWS file change only needs to done in one branch.
+      bug fixes, improvements, etc., should go into the NEWS file of *any
+      stable release* version with the given change. In other words,
+      news about a bug fix which went into PHP-5.4, PHP-5.5 and master
+      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 file and dump all messages in one commit. If you
       modified several unrelated files, commit each group separately and

README.PARAMETER_PARSING_API

@@ -28,22 +28,11 @@ Both functions return SUCCESS or FAILURE depending on the result.
 The auto-conversions are performed as necessary. Arrays, objects, and
 resources cannot be auto-converted.
 
-PHP 5.5 includes a new function:
-
-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
-(passed with double indirection). The passed zval may be changed in place as
-part of the conversion process.
-
-See also https://wiki.php.net/rfc/zpp_improv#expose_zend_parse_arg_as_zend_parse_parameter
-
 
 Type specifiers
 ---------------
  The following list shows the type specifier, its meaning and the parameter 
- types that need to be passed by address. All passed paramaters are set
+ types that need to be passed by address. All passed parameters are set
  if the PHP parameter is non optional and untouched if optional and the 
  parameter is not present. The only exception is O where the zend_class_entry*
  has to be provided on input and is used to verify the PHP parameter is an 
@@ -76,13 +65,9 @@ Type specifiers
         will not be touched by the parsing function if they are not
         passed to it.
     / - use SEPARATE_ZVAL_IF_NOT_REF() on the parameter it follows
-    ! - the parameter it follows can be of specified type or NULL. If NULL is
-		passed and the output for such type is a pointer, then the output
-		pointer is set to a native NULL pointer.
-		For 'b', 'l' and 'd', an extra argument of type zend_bool* must be
-		passed after the corresponding bool*, long* or double* arguments,
-		respectively. A non-zero value will be written to the zend_bool iif a
-		PHP NULL is passed.
+    ! - the parameter it follows can be of specified type or NULL (applies
+		to all specifiers except for 'b', 'l', and 'd'). If NULL is passed, the
+		results pointer is set to NULL as well.
 
 
 Note on 64bit compatibility

README.RELEASE_PROCESS

@@ -8,15 +8,16 @@ General notes and tips
 1. Do not release on Fridays, Saturdays or Sundays
 because the sysadmins can not upgrade stuff then.
 
-2. Package the day before a release. So if the release is to be on Thursday,
-package on Wednesday.
+2. Package two days before a release. So if the release is to be on Thursday,
+package on Tuesday. Think about timezones as well.
 
 3. Ensure that Windows builds will work before packaging
 
-4. Follow all steps to the letter. When unclear ask previous RM's (Derick/Ilia)
-before proceeding. Ideally make sure that for the first releases one of the
-previous RM's is around to answer questions. For the steps related to the
-php/QA/bug websites try to have someone from the webmaster team (Bjori) on hand.
+4. Follow all steps to the letter. When unclear ask previous RM's (David/Julien/
+Johannes/Stas/Derick/Ilia) before proceeding. Ideally make sure that for the
+first releases one of the previous RM's is around to answer questions. For the
+steps related to the php/QA/bug websites try to have someone from the webmaster
+team (Bjori) on hand.
 
 5. Verify the tags to be extra sure everything was tagged properly.
 
@@ -50,31 +51,44 @@ Rolling a non stable release (alpha/beta/RC)
 2. run the "scripts/dev/credits" script in php-src and commit the changes in the
 credits files in ext/standard.
 
-3. Checkout the release branch for this release (e.g., PHP-5.4.2).
+3. Checkout the release branch for this release (e.g., PHP-5.4.2) from the main branch.
 
 4. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
-Do not use abbreviations for alpha and beta.
+Do not use abbreviations for alpha and beta. Do not use dashes, you should
+``#define PHP_VERSION "5.4.22RC1"`` and not ``#define PHP_VERSION "5.4.22-RC1"``
 
-5. Commit these changes to the branch with ``git commit -a``.
+5. Compile and make test, with and without ZTS, using the right Bison version
+(for example, for 5.5, Bison 2.4.1 is used)
 
-6. Tag the repository with the version, e.g.: 
+6. Check ./sapi/cli/php -v output for version matching.
+
+7. If all is right, commit the changes to the release branch with ``git commit -a``.
+
+8. Tag the repository release branch with the version, e.g.: 
 ``git tag -u YOURKEYID php-5.4.2RC2``
 
-7. Push the changes to the main repo:
+9. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and ``NEWS``
+in the *main* branch (PHP-5.4 for example) to prepare for the **next** version.
+F.e. if the RC is "5.4.1RC1" then the new one should be "5.4.2-dev" - regardless if we get
+a new RC or not. This is to make sure ``version_compare()`` can correctly work.
+Commit the changes to the main branch.
+
+10. Push the changes to the main repo, the tag, the main branch and the release branch :
 ``git push --tags origin HEAD``
+``git push origin {main branch}``
+``git push origin {release branch}``
 
-8. run: ``./makedist 5.4.2RC2``, this will export the tree, create configure
-and build three tarballs (gz,bz2 and xz). Make sure you use the same GNU Bison
-version as snaps. Recent bison version are known to break ZTS.
+11. run: ``PHPROOT=. ./makedist 5.4.2RC2``, this will export the tree, create configure
+and build three tarballs (gz, bz2 and xz).
 
-9. Copy those three tarballs to www.php.net, in your homedir there should be a
+12. 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.
+MD5 sums. If you do not have this directory, talk to Derick or Dan.
 
-10. Now the RC can be found on http://downloads.php.net/yourname,
+13. Now the RC can be found on http://downloads.php.net/yourname,
 f.e. http://downloads.php.net/derick/
 
-11. Once the release has been tagged, contact the PHP Windows development team
+14. 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.
 
@@ -106,9 +120,9 @@ Derick) run the following commands for you:
 
    Note: Remember to update the MD5 checksum information.
 
-4. Update ``php.git/include/version.inc`` (x=major version number)
+4. Update ``web/php.git/include/version.inc`` (x=major version number)
 
- a. ``$PHP_x_RC`` = "5.4.0RC1"
+ a. ``$PHP_x_RC`` = "5.4.0RC1"  (should be set to "false" before)
 
  b. ``$PHP_x_RC_DATE`` = "06 September 2007"
 
@@ -119,67 +133,61 @@ Derick) run the following commands for you:
 6. For the first RC, write the doc team (phpdoc@lists.php.net) about updating the
 INSTALL and win32/install.txt files which are generated from the PHP manual sources.
 
-7. Publish the announce on www.php.net as well (for all releases, alpha, RCs or other)
-
 Rolling a stable release
 ------------------------
 
-1. Check windows snapshot builder logs (http://snaps.php.net/win32/snapshot-STABLE.log f.e.)
+1. Checkout your release branch, you should have created when releasing previous RC
+and bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
 
-2. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
+2. If a CVE commit needs to be merged to the release, then have it commited to
+the base branches and merged upwards as usual (f.e commit the CVE fix to 5.3,
+merge to 5.4, 5.5 etc...). Then you can cherry-pick it in your release branch.
+Don't forget to update NEWS manually in an extra commit then.
 
-3. **Merge** all related sections in NEWS (f.e. merge the 5.4.1RC1 and 5.4.0 sections)
+3. Commit those changes
 
-4. Commit those changes
-
-5. run the "scripts/dev/credits" script in php-src and commit the changes in the
+4. run the "scripts/dev/credits" script in php-src and commit the changes in the
 credits files in ext/standard.
 
-6. tag the repository with the version f.e. "``git tag -s php-5.4.1``"
-(of course, you need to change that to the version you're rolling an RC for).
-When making 5.X release, you need to tag the Zend directory separately!!
+5. Compile and make test, with and without ZTS, using the right Bison version
+(for example, for 5.5, Bison 2.4.1 is used)
 
-7. Bump up the version numbers in ``main/php_version.h``, ``configure.in`` and
-possibly ``NEWS`` again, to the **next** version. F.e. if the release candidate
-was "5.4.1RC1" then the new one should be "5.4.1RC2-dev" - regardless if we get
-a new RC or not. This is to make sure ``version_compare()`` can correctly work.
+6. Check ./sapi/cli/php -v output for version matching.
 
-8. Commit those changes
+7. tag the repository with the version f.e. "``git tag -s php-5.4.1``"
 
-9. Log in onto the snaps box and go into the correct tree (f.e. the PHP-5.4
-branch if you're rolling 5.5.x releases).
+8. Push the tag f.e. "``git push origin php-5.4.1``"
 
-10. You do not have to update the tree, but of course you can with "``git pull
-origin <branch>``".
+9. run: ``PHPROOT=. ./makedist php 5.4.1``, this will export the tag, create configure
+and build three tarballs (gz, bz2 and xz).
+Check if the pear files are updated (phar).
 
-11. run: ``./makedist php 5.4.1``, this will export the tree, create configure
-and build two tarballs (one gz and one bz2).
+10. Generate the GPG signature files for the archives.
+  ``gpg -u YOUREMAIL --armor --detach-sign php-X.Y.Z.tar.xxx``
 
-12. Commit those two tarballs to web/php-distributions.git, then update the git
-    submodule reference in web/php.git: 
-    git submodule init;
+11. Commit and push all the tarballs and signature files to web/php-distributions.git,
+    then update the git submodule reference in web/php.git: 
+    ``git submodule init;
     git submodule update;
     cd distributions;
     git pull origin master;
     cd ..;
     git commit distributions;
-    git push;
+    git push;``
+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
 
-13. 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 committed to SVN too.
-
-14. Check if the pear files are updated (phar for 5.1+ or run pear/make-pear-bundle.php with 4.4)
-
-15. When making a final release, also remind the PHP Windows development team
-(internals-win@lists.php.net) to prepare the installer packages for Win32.
+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
 ------------------------------------
 
 1. Run the bumpRelease script for phpweb on your local checkout
 
- a. ``php bin/bumpRelease 5`` (or ``php bin/bumpRelease 4`` for PHP4)
+ a. ``php bin/bumpRelease 5`` to create the release file (releases/x_y_z.php)
+    The release announcement file should list in detail security fixes and
+    changes in behavior (whether due to a bug fix or not).
 
  b. In case multiple PHP minor versions are in active development you have
     to manually copy the old information to include/releases.inc
@@ -199,7 +207,13 @@ Getting the stable release announced
 
  f. if the windows builds aren't ready yet prefix the "windows" key with a dot (".windows")
 
-3. Update the ChangeLog file for the given major version
+3. Update phpweb/include/releases.php with the old release info
+  (updates the download archives)
+
+4. Update php-qa/include/release-qa.php and add the next version as an QARELEASE
+   (prepare for next RC)
+
+5. Update the ChangeLog file for the given major version
 f.e. ``ChangeLog-5.php`` from the NEWS file
 
  a. go over the list and put every element on one line
@@ -219,19 +233,10 @@ f.e. ``ChangeLog-5.php`` from the NEWS file
   IV. ``s/Fixed PECL bug #\([0-9]\+\)/<?php peclbugfix(\1); ?>/``
 
   V. ``s/FR #\([0-9]\+\)/FR <?php bugl(\1); ?>/``
+  
+  e. You may want to try php-web/bin/news2html to automate this task
 
-4. ``cp releases/5_4_0.php releases/5_4_1.php``
-
-5. ``git add releases/5_4_1.php``
-
-6. Update the ``releases/*.php`` file with relevant data. The release
-announcement file should list in detail:
-
- a. security fixes,
-
- b. changes in behavior (whether due to a bug fix or not)
-
-7. Add a short notice to phpweb stating that there is a new release, and
+6. Add a short notice to phpweb stating that there is a new release, and
 highlight the major important things (security fixes) and when it is important
 to upgrade.
 
@@ -239,7 +244,11 @@ to upgrade.
 
  b. Add the content for the news entry
 
-8. Commit all the changes.
+7. **Check mirrors have been synced before announcing or pushing news**
+  Try, f.e. http://www.php.net/get/php-5.5.1.tar.bz2/from/a/mirror
+  Try several mirrors, mirrors may update slowly (may take an hour)
+
+8. Commit all the changes to their respective git repos
 
 9. Wait an hour or two, then send a mail to php-announce@lists.php.net,
 php-general@lists.php.net and internals@lists.php.net with a text similar to

README.SELF-CONTAINED-EXTENSIONS

@@ -153,3 +153,18 @@ ADDING SHARED MODULE SUPPORT TO A MODULE
         #ifdef COMPILE_DL_FOO
         ZEND_GET_MODULE(foo)
         #endif
+
+PECL SITE CONFORMITY
+
+  If you plan to release an extension to the PECL website, there are several
+  points to be regarded.
+
+ 1. Add LICENSE or COPYING to the package.xml
+
+ 2. The following should be defined in one of the extension header files
+
+        #define PHP_FOO_VERSION "1.2.3"
+
+    This macros has to be used within your foo_module_entry to indicate the
+    extension version.
+

README.TESTING

@@ -1,6 +1,6 @@
 [IMPORTANT NOTICE]
 ------------------
- Failed tests usualy indicate a problem with your local system setup
+ Failed tests usually indicate a problem with your local system setup
 and not within PHP itself (at least for official PHP release versions).
 You may decide to automaticaly submit a test summary to our QA workflow
 at the end of a test run.

README.md

@@ -1,30 +0,0 @@
-The PHP Interpreter
-===================
-
-This is the github mirror of the official PHP repository located at
-http://git.php.net.
-
-[![Build Status](https://secure.travis-ci.org/php/php-src.png?branch=master)](http://travis-ci.org/php/php-src)
-
-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
-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
-information on the process.
-
-Bug fixes **do not** require an RFC, but require a bugtracker ticket. Always
-open a ticket at http://bugs.php.net and reference the bug id using #NNNNNN.
-
-    Fix #55371: get_magic_quotes_gpc() throws deprecation warning
-
-    After removing magic quotes, the get_magic_quotes_gpc function caused
-    a deprecate warning. get_magic_quotes_gpc can be used to detected
-    the magic_quotes behavior and therefore should not raise a warning at any
-    time. The patch removes this warning
-
-We do not merge pull requests directly on github. All PRs will be
-pulled and pushed through http://git.php.net.

TSRM/tsrm_nw.c

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2014 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 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2014 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_virtual_cwd.c

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2014 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_virtual_cwd.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2014 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 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2014 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        |
@@ -625,7 +625,7 @@ TSRM_API int shmget(int key, int size, int flags)
 	shm->info	 = info_handle;
 	shm->descriptor = MapViewOfFileEx(shm->info, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
 
-	if (created) {
+	if (NULL != shm->descriptor && created) {
 		shm->descriptor->shm_perm.key	= key;
 		shm->descriptor->shm_segsz		= size;
 		shm->descriptor->shm_ctime		= time(NULL);
@@ -639,8 +639,10 @@ TSRM_API int shmget(int key, int size, int flags)
 		shm->descriptor->shm_perm.mode	= shm->descriptor->shm_perm.seq	= 0;
 	}
 
-	if (shm->descriptor->shm_perm.key != key || size > shm->descriptor->shm_segsz ) {
-		CloseHandle(shm->segment);
+	if (NULL != shm->descriptor && (shm->descriptor->shm_perm.key != key || size > shm->descriptor->shm_segsz)) {
+		if (NULL != shm->segment) {
+			CloseHandle(shm->segment);
+		}
 		UnmapViewOfFile(shm->descriptor);
 		CloseHandle(shm->info);
 		return -1;

TSRM/tsrm_win32.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2014 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.INTERNALS

@@ -3,11 +3,15 @@ $Id$
 UPGRADE NOTES - PHP X.Y
 
 1. Internal API changes
-  a. Executor changes
-  b. Streams pooling API
-  c. Lowercasing and locales
-  d. zend_qsort_r
-  e. get_current_key
+  a. virtual_file_ex
+  b. stat/lstat support
+  c. readlink support
+  d. layout of some core ZE structures (zend_op_array, zend_class_entry, ...)
+  e. Zend\zend_fast_cache.h has been removed
+  f. streams that enclose private streams
+  g. leak_variable
+  h. API Signature changes
+  i. new TSRM function expand_filepath_with_mode
 
 2. Build system changes
   a. Unix build system changes
@@ -18,103 +22,186 @@ UPGRADE NOTES - PHP X.Y
 1. Internal API changes
 ========================
 
-	a. Executor changes
+	a. virtual_file_ex
 
- * extensions can't override zend_execute() any more, they should override
-   zend_execute_ex() instead. The EG(current_execute_data) is already
-   initialized in zend_execute_ex(), so for compatibility extensions
-   may need to use EG(current_execute_data)->prev_execute_data instead.
- * removed EG(arg_types_stack), EX(fbc), EX(called_scope), EX(current_object)
- * added op_array->nested_calls. It's calculated at compile time.
- * added EX(call_slots). It is an array to store information about syntaticaly
-   nested calls (e.g. foo(bar())). It's preallocated together with execute_data.
- * added EX(call) - pointer to a current calling function. Actually an
-   element of EX(call_slots)
- * opcodes INIT_METHOD_CALL, ZEND_INIT_STATIC_METHOD_CALL,
-   ZEND_INIT_FCALL_BY_NAME, ZEND_INIT_NS_FCALL_BY_NAME use result.num as
-   an index in EX(call_slots)
- * opcode ZEND_NEW uses extended_vallue as an index in EX(call_slots)
- * opcoes ZEND_DO_FCALL and ZEND_DO_FCALL_BY_NAME use op2.num as
-   an index in EX(call_slots)
- * added op_array->used_stack. It's calculated at compile time and the
-   corresponding stack space is preallocated together with execute_data.
-   ZEND_SEND* and ZEND_DO_FCALL* don't need to check for stack overflow
-   anymore.
- * Removed execute_data->Ts field. The VM temporary variables always allocated
-   immediately before execute_data structure. Now they are accessed by offset
-   from the execute_data base pointer (instead of execute_data->Ts). Compiler
-   stores new offsets in op_array->opcodes[*].op?.num. You can use macros
-   EX_TMP_VAR() and EX_TMP_VAR_NUM() to access temp_variable by offset or
-   number. You can convert number to offset using EX_TMP_VAR_NUM(0, num) or
-   offset to number (EX_TMP_VAR_NUM(0,0)-EX_TMP_VAR(0,offset)).
- * Removed execute_data->CVs field. The VM compiled variables always allocated
-   immediately after execute_data structure. Now they are accessed by offset
-   from the execute_data base pointer (instead of execute_data->CVs). You can
-   use macros EX_CV_NUM() to access compiled variables by number.
+virtual_file_ex takes now a TSRM context as last parameter:
+CWD_API int virtual_file_ex(cwd_state *state, const char *path, 
+ verify_path_func verify_path, int use_realpath TSRLS_DC);
 
-	b. Streams pooling API
 
-The streams pooling API has been removed. The following functions no longer
-exist:
+	b. stat/lstat support
 
-PHPAPI int php_stream_context_get_link(php_stream_context *context,
-		const char *hostent, php_stream **stream);
-PHPAPI int php_stream_context_set_link(php_stream_context *context,
-		const char *hostent, php_stream *stream);
-PHPAPI int php_stream_context_del_link(php_stream_context *context,
-		php_stream *stream);
+lstat is now available on all platforms. On unix-like platform
+php_sys_lstat is an alias to lstat (when avaible). On Windows it is now 
+available using php_sys_lstat. php_sys_stat and php_sys_lstat usage is recommended 
+instead of calling lstat directly, to ensure portability.
 
-	c. Lowercasing and locales
 
-The lowercasing functions in zend_operators.c were split into those that do 
-lowercasing according to locale rules and those that do ASCII lowercasing.
-ASCII:
+	c. readlink support
 
-                zend_str_tolower_copy
-                zend_str_tolower_dup
-                zend_str_tolower
-                zend_binary_strcasecmp
-                zend_binary_strncasecmp
+readlink is now available on all platforms. On unix-like platform
+php_sys_readlink is an alias to readlink (when avaible). On Windows it is now 
+available using php_sys_readlink. php_sys_readlink usage is recommended 
+instead of calling readlink directly, to ensure portability.
 
-Locale-based:
-                zend_binary_strncasecmp_l
-                zend_binary_strcasecmp_l
-                zend_binary_zval_strcasecmp
-                zend_binary_zval_strncasecmp
-                string_compare_function_ex
-                string_case_compare_function
 
-Internal engine lowercasing will be using ASCII-only rules. User-facing functions,
-such as strcasecmp, will be using locale rules. 
+	d. layout of some core ZE structures (zend_op_array, zend_class_entry, ...)
 
-Two new functions - zend_binary_strncasecmp_l and zend_binary_strcasecmp_l - added as 
-locale-based counterparts to zend_binary_strcasecmp and zend_binary_strncasecmp.
+. zend_function.pass_rest_by_reference is replaced by
+  ZEND_ACC_PASS_REST_BY_REFERENCE in zend_function.fn_flags
+. zend_function.return_reference is replaced by ZEND_ACC_RETURN_REFERENCE
+  in zend_function.fn_flags
+. zend_arg_info.required_num_args removed. it was needed only for internal
+  functions. Now the first arg_info for internal function (which has special
+  meaning) is represented by zend_internal_function_info structure.
+. zend_op_array.size, size_var, size_literal, current_brk_cont,
+  backpatch_count moved into CG(context), because they are used only during
+  compilation.
+. zend_op_array.start_op is moved into EG(start_op), because it's used
+  only for 'interactive' execution of single top-level op-array.
+. zend_op_array.done_pass_two is replaced by ZEND_ACC_DONE_PASS_TWO in
+  zend_op_array.fn_flags.
+. op_array.vars array is trimmed (reallocated) during pass_two.
+. zend_class_entry.constants_updated is replaced by
+  ZEND_ACC_CONSTANTS_UPDATED in zend_class_entry.ce_flags
+. the size of zend_class_entry is reduced by sharing the same memory space
+  by different information for internal and user classes.
+  See zend_class_inttry.info union. 
+  
 
-	d. zend_qsort_r
+	e. Zend\zend_fast_cache.h 
 
-Added the function zend_qsort_r():
+It should not have been used anymore since php5, but now this header has
+been removed. The following macros are not available anymore:
 
-typedef int  (*compare_r_func_t)(const void *, const void * TSRMLS_DC, void *);
-void zend_qsort_r(void *base, size_t nmemb, size_t siz, compare_r_func_t compare, void *arg TSRMLS_DC);
+ZEND_FAST_ALLOC(p, type, fc_type)
+ZEND_FAST_FREE(p, fc_type)
+ZEND_FAST_ALLOC_REL(p, type, fc_type)
+ZEND_FAST_FREE_REL(p, fc_type)
 
-The extra argument it has (relatively to zend_qsort()) is passed to the
-comparison function.
+Use emalloc, emalloc_rel, efree or efree_rel instead.
 
-	e. get_current_key
 
-The signature of the get_current_key iteration handler has been changed to:
+	f. Streams that enclose private streams
 
-void (*get_current_key)(zend_object_iterator *iter, zval *key TSRMLS_DC);
+Some streams, like the temp:// stream, may enclose private streams. If the
+outer stream leaks due to a programming error or is not exposed through a
+zval (and therefore is not deleted when all the zvals are gone), it will
+be destroyed on shutdown.
+The problem is that the outer usually wants itself to close the inner stream,
+so that it may do any other shutdown action that requires the inner stream to
+be live (e.g. commit data to it). If the outer stream is exposed through a
+zval and the inner one isn't, this is not a problem because the outer stream
+will be freed when the zval is destroyed, which happens before the resources
+are destroyed on shutdown.
+On resource list shutdown, the cleanup happens in reverse order of resource
+creation, so if the inner stream was created in the opener of the outer stream,
+it will be destroyed first.
+The following functions were added to the streams API to force a predictable
+destruction order:
 
-The key should be written into the zval* using the ZVAL_* macros.
+PHPAPI php_stream *php_stream_encloses(php_stream *enclosing, php_stream *enclosed);
+#define php_stream_free_enclosed(stream_enclosed, close_options)
+PHPAPI int _php_stream_free_enclosed(php_stream *stream_enclosed, int close_options TSRMLS_DC);
+
+Additionally, the following member was added to php_stream:
+
+	struct _php_stream *enclosing_stream;
+    
+and the following macro was added:
+
+#define PHP_STREAM_FREE_IGNORE_ENCLOSING	32
+
+The function php_stream_encloses declares the first stream encloses the second.
+This has the effect that, when the inner stream is closed from a resource
+destructor it will abort and try to free its enclosing stream instead.
+To prevent this from happening when the inner stream is freed from the outer
+stream, the macro php_stream_free_enclosed should be used instead of
+php_stream_free/php_stream_close/php_stream_pclose, or the flag
+PHP_STREAM_FREE_IGNORE_ENCLOSING should be directly passed to php_stream_free.
+The outer stream cannot abstain, in its close callback, from closing the inner
+stream or clear the enclosing_stream pointer in its enclosed stream by calling
+php_stream_encloses with the 2nd argument NULL. If this is not done, there will
+be problems, so observe this requirement when using php_stream_encloses.
+
+
+	g. leak_variable
+
+The function leak_variable(variable [, leak_data]) was added. It is only
+available on debug builds. It increments the refcount of a zval or, if the
+second argument is true and the variable is either an object or a resource
+it increments the refcounts of those objects instead.
+
+
+	h. API Signature changes
+
+. zend_list_insert
+  ZEND_API int zend_list_insert(void *ptr, int type TSRMLS_DC);
+  call: zend_list_insert(a, SOMETYPE TSRMLS_CC);
+  NB: If zend_list_insert is used to register a resource, 
+  ZEND_REGISTER_RESOURCE could be used instead.
+
+. php_le_stream_context(TSRMLS_C)
+  PHPAPI php_stream_context *php_stream_context_alloc(TSRMLS_D)
+  call: context  = php_stream_context_alloc(TSRMLS_C);
+
+. php_stream_context_alloc
+  PHPAPI php_stream_context *php_stream_context_alloc(TSRMLS_D);
+  call: context  = php_stream_context_alloc(TSRMLS_C);
+
+. sapi_get_request_time(TSRMLS_D);
+  SAPI_API double sapi_get_request_time(TSRMLS_D);
+
+. sapi_register_default_post_reader
+  SAPI_API int sapi_register_default_post_reader(void (*default_post_reader)(TSRMLS_D) TSRMLS_DC);
+
+. sapi_register_treat_data
+  SAPI_API int sapi_register_treat_data(void (*treat_data)(int arg, char *str, zval *destArray TSRMLS_DC) TSRMLS_DC);
+
+. sapi_register_input_filter
+  SAPI_API int sapi_register_input_filter(unsigned int (*input_filter)(int arg, char *var, char **val, unsigned int val_len, unsigned int *new_val_len TSRMLS_DC), unsigned int (*input_filter_init)(TSRMLS_D) TSRMLS_DC);
+ 
+. tsrm_win32_access
+  TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC);
+
+. popen_ex (win32)
+  TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env TSRMLS_DC);
+
+. php_get_current_user
+  PHPAPI php_get_current_user(TSRMLS_D)
+  Call: char *user = php_get_current_user(TSRMLS_C);
+
+. php_idate
+  PHPAPI php_idate(char format, time_t ts, int localtime TSRMLS_DC)
+  Call: int ret = php_idate(format, ts, localtime TSRMLS_CC)
+
+. php_escape_html_entities
+  (size_t parameters were ints, previous "quote_style" (now flags) has expanded meaning)
+  PHPAPI char *php_escape_html_entities(unsigned char *old, size_t oldlen, size_t *newlen, int all, int flags, char *hint_charset TSRMLS_DC);
+
+. php_escape_html_entities_ex
+  PHPAPI char *php_escape_html_entities_ex(unsigned char *old, size_t oldlen, size_t *newlen, int all, int flags, char *hint_charset, zend_bool double_encode TSRMLS_DC);
+
+. php_unescape_html_entities
+  PHPAPI char *php_unescape_html_entities(unsigned char *old, size_t oldlen, size_t *newlen, int all, int flags, char *hint_charset TSRMLS_DC);
+
+  i. 
+  PHPAPI char *expand_filepath_with_mode(const char *filepath, char *real_path, const char *relative_to, size_t relative_to_len, int realpath_mode TSRMLS_DC);
+  expand_filepath_with_mode lets define how realpath will behave, using one of the existing mode: CWD_EXPAND , CWD_FILEPATH or CWD_REALPATH.
 
 ========================
 2. Build system changes
 ========================
 
   a. Unix build system changes
-    - 
+
+    - Changes in SAPI module build:
+      . When adding new binary SAPI (executable, like CLI/CGI/FPM) use CLI config.m4 and Makefile.frag files as templates and replace CLI/cli with your SAPI name.
+
+    - New macros:
+      . PHP_INIT_DTRACE(providerdesc, header-file, sources [, module])
+
 
   b. Windows build system changes
-    - Drop Windows XP and 2003 support.
+    -
   

Zend/Makefile.am

@@ -10,15 +10,14 @@ libZend_la_SOURCES=\
 	zend_ini_parser.y zend_ini_scanner.l \
 	zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \
 	zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \
-	zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
+	zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
 	zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
 	zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
 	zend_ini.c zend_qsort.c zend_objects.c zend_object_handlers.c \
 	zend_objects_API.c zend_ts_hash.c zend_stream.c \
 	zend_default_classes.c \
 	zend_iterators.c zend_interfaces.c zend_exceptions.c \
-	zend_strtod.c zend_closures.c zend_float.c zend_string.c zend_signal.c \
-	zend_generators.c
+	zend_strtod.c zend_closures.c zend_float.c zend_string.c zend_signal.c
 
 libZend_la_LDFLAGS =
 libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
@@ -32,7 +31,7 @@ zend_ini_scanner.lo: zend_ini_parser.h
 # Language parser/scanner rules
 
 zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
-	$(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt $(srcdir)/zend_language_scanner_defs.h -o$@ $(srcdir)/zend_language_scanner.l
+	$(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt $(srcdir)/zend_language_scanner_defs.h -o$@ $(srcdir)/zend_language_scanner.l
 
 zend_language_parser.h: zend_language_parser.c
 zend_language_parser.c: $(srcdir)/zend_language_parser.y
@@ -44,7 +43,7 @@ zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
 	$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o zend_ini_parser.c
 
 zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
-	$(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt $(srcdir)/zend_ini_scanner_defs.h -o$@ $(srcdir)/zend_ini_scanner.l
+	$(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt $(srcdir)/zend_ini_scanner_defs.h -o$@ $(srcdir)/zend_ini_scanner.l
 
 zend_ini_parser.h: zend_ini_parser.c
 

Zend/README.ZEND_VM

@@ -6,7 +6,7 @@ fields and using different execution methods (call threading, switch threading
 and direct threading). As a result ZE2 got more than 20% speedup on raw PHP
 code execution (with specialized executor and direct threading execution
 method). As in most PHP applications raw execution speed isn't the limiting
-factor but system calls and database callls are, your mileage with this patch
+factor but system calls and database calls are, your mileage with this patch
 will vary.
 
 Most parts of the old zend_execute.c go into zend_vm_def.h. Here you can

Zend/ZEND_CHANGES

@@ -435,7 +435,7 @@ Changes in the Zend Engine 2.0
       that of other object-oriented languages, such as Java: When the
       last reference to an object is destroyed the object's
       destructor, which is a class method name __destruct() that
-      recieves no parameters, is called before the object is freed
+      receives no parameters, is called before the object is freed
       from memory.
 
       Example:
@@ -1136,7 +1136,7 @@ Changes in the Zend Engine 1.0
       (supports breakpoints, expression evaluation, step-in/over,
       function call backtrace, and more).
 
-  The Zend Engine claims 100% compatability with the engine of PHP
+  The Zend Engine claims 100% compatibility with the engine of PHP
   3.0, and is shamelessly lying about it. Here's why:
 
     * Static variable initializers only accept scalar values
@@ -1161,6 +1161,6 @@ Changes in the Zend Engine 1.0
       printed the letter { and the contents of the variable $somevar in
       PHP 3.0), it will result in a parse error with the Zend Engine.
       In this case, you would have to change the code to print
-      "\{$somevar"; This incompatability is due to the full variable
+      "\{$somevar"; This incompatibility is due to the full variable
       reference within quoted strings feature added in the Zend
       Engine.

Zend/Zend.dsp

@@ -159,10 +159,6 @@ SOURCE=.\zend_float.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_generators.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_hash.c
 # End Source File
 # Begin Source File
@@ -261,6 +257,10 @@ SOURCE=.\zend_ts_hash.c
 
 SOURCE=.\zend_variables.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\zend_vm_opcodes.c
+# End Source File
 # End Group
 # Begin Group "Header Files"
 

Zend/ZendTS.dsp

@@ -185,10 +185,6 @@ SOURCE=.\zend_extensions.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_generators.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_hash.c
 # End Source File
 # Begin Source File
@@ -291,6 +287,10 @@ SOURCE=.\zend_ts_hash.c
 
 SOURCE=.\zend_variables.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\zend_vm_opcodes.c
+# End Source File
 # End Group
 # Begin Group "Header Files"
 

Zend/acinclude.m4

@@ -4,7 +4,7 @@ dnl This file contains local autoconf functions.
 
 AC_DEFUN([LIBZEND_BISON_CHECK],[
   # we only support certain bison versions
-  bison_version_list="2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2 2.6.3 2.6.4 2.6.5 2.7"
+  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2 2.6.4"
 
   # for standalone build of Zend Engine
   test -z "$SED" && SED=sed
@@ -12,7 +12,7 @@ AC_DEFUN([LIBZEND_BISON_CHECK],[
   bison_version=none
   if test "$YACC"; then
     AC_CACHE_CHECK([for bison version], php_cv_bison_version, [
-      bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
+      bison_version_vars=`$YACC --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /g' | tr -d a-z`
       php_cv_bison_version=invalid
       if test -n "$bison_version_vars"; then
         set $bison_version_vars

Zend/tests/019.phpt

@@ -357,7 +357,7 @@ var_dump($global_var);
 test_unset3();
 var_dump($global_var);
 
-//Note: No error conditions relating to passing arugments can be tested
+//Note: No error conditions relating to passing arguments can be tested
 // because these are not functions but statements, it will result in syntax error.
 ?>
 ===DONE===

Zend/tests/bug18556.phpt

@@ -1,37 +0,0 @@
---TEST--
-Bug #18556 (Setting locale to 'tr_TR' lowercases class names)
---FILE--
-<?php
-$g_lang = 'tr_TR';
-putenv("LANG=$g_lang"); 
-setlocale(LC_ALL, $g_lang);
-
-class InfoBlob {
-   var $foo;
-   function InfoBlob() {
-      $this->foo = "Foo";
-   }
-}
-
-echo "Instantiating an infoBlob with a lowercase i\n";
-$foobar = new infoBlob();
-echo $foobar->foo;
-echo "\nInstantiating an InfoBlob with an uppercase I\n";
-$foobar = new InfoBlob();
-echo $foobar->foo;
-echo "\n";
-setlocale(LC_ALL, "tr_TR.utf8");
-foreach(get_declared_classes() as $class)
-{
-	if(!class_exists($class))
-		echo "$class No Longer Exists!\n";
-
-}
-echo "Done.\n";
-?>
---EXPECT--
-Instantiating an infoBlob with a lowercase i
-Foo
-Instantiating an InfoBlob with an uppercase I
-Foo
-Done.

Zend/tests/bug32428.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Bug #32428 (The @ warning error supression operator is broken)
+Bug #32428 (The @ warning error suppression operator is broken)
 --FILE--
 <?php 
   $data = @$not_exists; 

Zend/tests/bug39018.phpt

@@ -64,8 +64,6 @@ print "\nDone\n";
 --EXPECTF--
 Notice: String offset cast occurred in %s on line %d
 
-Notice: Uninitialized string offset: %s in %s on line 6
-
 Notice: Uninitialized string offset: 0 in %s on line %d
 
 Notice: Uninitialized string offset: 0 in %s on line %d

Zend/tests/bug43450.phpt

@@ -2,8 +2,6 @@
 Bug #43450 (Memory leak on some functions with implicit object __toString() call)
 --SKIPIF--
 <?php if (!function_exists('memory_get_usage')) die('memory_get_usage() not installed'); ?>
---INI--
-opcache.enable_cli=0
 --FILE--
 <?php
 error_reporting(E_ALL|E_STRICT);

Zend/tests/bug51394.phpt

@@ -13,8 +13,10 @@ function eh()
 set_error_handler("eh");
 $a = $empty($b);
 --EXPECTF--
-Fatal error: Uncaught exception 'Exception' with message 'error!' in %sbug51394.php:%d
+Warning: Uncaught exception 'Exception' with message 'error!' in %sbug51394.php:4
 Stack trace:
-#0 %sbug51394.php(%d): eh(8, 'Undefined varia%s', '%s', %d, Array)
+#0 %sbug51394.php(9): eh(8, 'Undefined varia...', '%s', 9, Array)
 #1 {main}
-  thrown in %sbug51394.php on line %d
+  thrown in %sbug51394.php on line 4
+
+Fatal error: Function name must be a string in %sbug51394.php on line 9

Zend/tests/bug52041.phpt

@@ -35,30 +35,18 @@ Notice: Undefined variable: x in %sbug52041.php on line 3
 
 Warning: Creating default object from empty value in %sbug52041.php on line 8
 
-Notice: Undefined property: stdClass::$a in %sbug52041.php on line 8
-
 Notice: Undefined variable: x in %sbug52041.php on line 3
 
-Notice: Undefined property: stdClass::$a in %sbug52041.php on line 9
-
 Warning: Creating default object from empty value in %sbug52041.php on line 9
 
-Notice: Undefined property: stdClass::$b in %sbug52041.php on line 9
-
 Notice: Undefined variable: x in %sbug52041.php on line 3
 
 Warning: Creating default object from empty value in %sbug52041.php on line 10
 
-Notice: Undefined property: stdClass::$a in %sbug52041.php on line 10
-
 Notice: Undefined variable: x in %sbug52041.php on line 3
 
-Notice: Undefined property: stdClass::$a in %sbug52041.php on line 11
-
 Warning: Creating default object from empty value in %sbug52041.php on line 11
 
-Notice: Undefined property: stdClass::$b in %sbug52041.php on line 11
-
 Notice: Undefined variable: x in %sbug52041.php on line 3
 
 Notice: Undefined variable: x in %sbug52041.php on line 3

Zend/tests/bug55156.phpt

@@ -1,8 +1,5 @@
 --TEST--
 Bug #55156 (ReflectionClass::getDocComment() returns comment even though the class has none)
---INI--
-opcache.save_comments=1
-opcache.load_comments=1
 --FILE--
 <?php
 

Zend/tests/bug60536_001.phpt

@@ -3,18 +3,18 @@ Bug #60536 (Traits Segfault)
 --FILE--
 <?php
 trait T { private $x = 0; }
-class X {
+class X { 
 	use T;
 }
 class Y extends X {
 	  use T;
 	  function x() {
-	      return ++$this->x;
+	      return ++$this->x; 
       }
 }
 class Z extends Y {
 	  function z() {
-		  return ++$this->x;
+		  return ++$this->x; 
       }
 }
 $a = new Z();
@@ -22,6 +22,4 @@ $a->x();
 echo "DONE";
 ?>
 --EXPECTF--
-
-Notice: Undefined property: Z::$x in %s on line 14
 DONE

Zend/tests/bug60598.phpt

@@ -0,0 +1,30 @@
+--TEST--
+Bug #60598 (cli/apache sapi segfault on objects manipulation)
+--FILE--
+<?php
+define('OBJECT_COUNT', 10000);
+
+$containers = array();
+
+class Object {
+    protected $_guid = 0;
+    public function __construct() {
+		global $containers;
+		$this->guid = 1;
+        $containers[spl_object_hash($this)] = $this;
+    }
+    public function __destruct() {
+		global $containers;
+        $containers[spl_object_hash($this)] = NULL;
+    }
+}
+
+for ($i = 0; $i < OBJECT_COUNT; ++$i) {
+    new Object();
+}
+
+// You probably won't see this because of the "zend_mm_heap corrupted"
+?>
+If you see this, try to increase OBJECT_COUNT to 100,000
+--EXPECT--
+If you see this, try to increase OBJECT_COUNT to 100,000

Zend/tests/bug60738.phpt

@@ -1,22 +0,0 @@
---TEST--
-Bug #60738 Allow 'set_error_handler' to handle NULL
---FILE--
-<?php
-
-var_dump(set_error_handler(
-    function() { echo 'Intercepted error!', "\n"; }
-));
-
-trigger_error('Error!');
-
-var_dump(set_error_handler(null));
-
-trigger_error('Error!');
-?>
---EXPECTF--
-NULL
-Intercepted error!
-object(Closure)#1 (0) {
-}
-
-Notice: Error! in %s on line %d

Zend/tests/bug60738_variation.phpt

@@ -1,23 +0,0 @@
---TEST--
-Bug #60738 Allow 'set_error_handler' to handle NULL
---FILE--
-<?php
-
-var_dump(set_exception_handler(
-    function() { echo 'Intercepted exception!', "\n"; }
-));
-
-var_dump(set_exception_handler(null));
-
-throw new Exception('Exception!');
-?>
---EXPECTF--
-NULL
-object(Closure)#1 (0) {
-}
-
-Fatal error: Uncaught exception 'Exception' with message 'Exception!' in %s:%d
-Stack trace:
-#0 {main}
-  thrown in %s on line %d
-

Zend/tests/bug60771.phpt

@@ -1,10 +1,10 @@
---TEST--
-test of larger than 8kb text file being parsed by require statement
---FILE--
-<?php
- file_put_contents('test.php',str_repeat('passed, ',1024));
- require('test.php');
- unlink('test.php');
-?>
---EXPECT--
-passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed,Line truncated
+--TEST--
+test of larger than 8kb text file being parsed by require statement
+--FILE--
+<?php
+ file_put_contents('test.php',str_repeat('passed, ',1024));
+ require('./test.php');
+ unlink('test.php');
+?>
+--EXPECT--
+passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed,Line truncated

Zend/tests/bug60833.phpt

@@ -1,40 +0,0 @@
---TEST--
-Bug #60833 (self, parent, static behave inconsistently case-sensitive)
---FILE--
-<?php
-class A {
-	static $x = "A";
-	function testit() {
-		$this->v1 = new sELF;
-		$this->v2 = new SELF;
-	}
-}
-
-class B extends A {
-	static $x = "B";
-	function testit() {
-		PARENT::testit();
-		$this->v3 = new sELF;
-		$this->v4 = new PARENT;
-		$this->v4 = STATIC::$x;
-	}
-}
-$t = new B();
-$t->testit();
-var_dump($t);
-?>
---EXPECTF--
-object(B)#%d (4) {
-  ["v1"]=>
-  object(A)#%d (0) {
-  }
-  ["v2"]=>
-  object(A)#%d (0) {
-  }
-  ["v3"]=>
-  object(B)#%d (0) {
-  }
-  ["v4"]=>
-  string(1) "B"
-}
-

Zend/tests/bug61025.phpt

@@ -1,27 +0,0 @@
---TEST--
-Bug #61025 (__invoke() visibility not honored)
---FILE--
-<?php
-
-Interface InvokeAble {
-    static function __invoke();
-}
-
-class Bar {
-    private function __invoke() {
-        return __CLASS__;
-    }
-}
-
-$b = new Bar;
-echo $b();
-
-echo $b->__invoke();
-
-?>
---EXPECTF--
-Warning: The magic method __invoke() must have public visibility and cannot be static in %sbug61025.php on line %d
-
-Warning: The magic method __invoke() must have public visibility and cannot be static in %sbug61025.php on line %d
-Bar
-Fatal error: Call to private method Bar::__invoke() from context '' in %sbug61025.php on line %d

Zend/tests/bug61681.phpt

@@ -1,11 +0,0 @@
---TEST--
-Bug #61681: Malformed grammar
---FILE--
-<?php
-$la = "ooxx";
-
-echo "${substr('laruence', 0, 2)}"; 
-
-?>
---EXPECT--
-ooxx

Zend/tests/bug61767.phpt

@@ -17,16 +17,18 @@ $undefined->foo();
 --EXPECTF--
 Error handler called (Undefined variable: undefined)
 
-Fatal error: Uncaught exception 'ErrorException' with message 'Undefined variable: undefined' in %sbug61767.php:%d
+Warning: Uncaught exception 'ErrorException' with message 'Undefined variable: undefined' in %sbug61767.php:13
 Stack trace:
-#0 %sbug61767.php(%d): {closure}(%s, 'Undefined varia...', '%s', %d, Array)
+#0 %sbug61767.php(13): {closure}(8, 'Undefined varia...', '%s', 13, Array)
 #1 {main}
-  thrown in %sbug61767.php on line %d
+  thrown in %sbug61767.php on line 13
+
+Fatal error: Call to a member function foo() on a non-object in %sbug61767.php on line 13
 Shutting down
 Array
 (
     [type] => 1
-    [message] => %a
+    [message] => Call to a member function foo() on a non-object
     [file] => %sbug61767.php
-    [line] => %d
+    [line] => 13
 )

Zend/tests/bug62005.phpt

@@ -9,8 +9,6 @@ function add_points($player, $points) {
 add_points(NULL, 2);
 --EXPECTF--
 Warning: Creating default object from empty value in %sbug62005.php on line %d
-
-Notice: Undefined property: stdClass::$energy in %sbug62005.php on line 3
 stdClass Object
 (
     [energy] => 2

Zend/tests/bug62991.phpt

@@ -1,50 +0,0 @@
---TEST--
-Bug #62991 (Segfault with generator and closure)
---FILE--
-<?php
-
-function test( array $array )
-{
-    $closure = function() use ( $array ) {
-        print_r( $array );
-        yield "hi";
-    };
-    return $closure();
-}
-
-function test2( array $array )
-{
-    $closure = function() use ( $array ) {
-        print_r( $array );
-        yield "hi";
-    };
-    return $closure; // if you return the $closure and call it outside this function it works.
-}
-
-$generator = test(array( 1, 2, 3 ) );
-foreach($generator as $something) {
-}
-
-$generator = test2(array( 1, 2, 3 ) );
-foreach($generator() as $something) {
-}
-
-
-$generator = test2(array( 1, 2, 3 ) );
-
-echo "okey\n";
-?>
---EXPECT--
-Array
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-)
-Array
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-)
-okey

Zend/tests/bug63741.phpt

@@ -1,50 +0,0 @@
---TEST--
-Bug #63741 (Crash when autoloading from spl)
---FILE--
-<?php
-file_put_contents(dirname(__FILE__)."/bug63741.tmp.php",
-<<<'EOT'
-<?php
-if (isset($autoloading))
-{
-    class ClassToLoad
-    {
-        static function func ()
-        {
-            print "OK!\n";
-        }
-    }
-    return;
-}
-else
-{
-    class autoloader
-    {
-        static function autoload($classname)
-        {
-            print "autoloading...\n";
-            $autoloading = true;
-            include __FILE__;
-        }
-    }
-
-    spl_autoload_register(["autoloader", "autoload"]);
-
-    function start()
-    {
-        ClassToLoad::func();
-    }
-
-    start();
-}
-?>
-EOT
-);
-
-include dirname(__FILE__)."/bug63741.tmp.php";
-?>
---CLEAN--
-<?php unlink(dirname(__FILE__)."/bug63741.tmp.php"); ?>
---EXPECT--
-autoloading...
-OK!

Zend/tests/bug64135.phpt

@@ -1,17 +0,0 @@
---TEST--
-Bug #64135 (Exceptions from set_error_handler are not always propagated)
---FILE--
-<?php
-
-function exception_error_handler() {
-        throw new Exception();
-}
-
-set_error_handler("exception_error_handler");
-try {
-   $undefined->undefined();
-} catch(Exception $e) {
-    echo "Exception is thrown";
-}
---EXPECT--
-Exception is thrown

Zend/tests/bug64555.phpt

@@ -1,42 +0,0 @@
---TEST--
-Bug #64555: Array key within interned string gets wrong hash value
---FILE--
-<?php
- 
-class Foo {
-    protected $unsetme = 1;
-    protected $keepme = 2;
-     
-    public function test() {
-        $a = get_object_vars($this);
-         
-        foreach ($a as $k => $v) {
-            if ($k == 'unsetme') {
-                echo "Unsetting: $k\n";
-                unset($a[$k]);
-            } else if ($k == 'keepme') {
-                echo "Changing: $k\n";
-                $a[$k] = 42;
-                $a['keepme'] = 43;
-            }
-        }
-         
-        var_dump($a, array_keys($a));
-    }
-}
- 
-$f = new Foo;
-$f->test();
- 
-?>
---EXPECT--
-Unsetting: unsetme
-Changing: keepme
-array(1) {
-  ["keepme"]=>
-  int(43)
-}
-array(1) {
-  [0]=>
-  string(6) "keepme"
-}

Zend/tests/bug64677.phpt

@@ -1,21 +0,0 @@
---TEST--
-Bug #64677 (execution operator `` stealing surrounding arguments)
---FILE--
-<?PHP
-class cat {
-	public function show_output($prepend, $output = '') {
-	}
-}
-$cat = new cat();
-$cat->show_output('Files: ', trim(`cd .`)); // this gives invalid args to shell_exec
-$cat->show_output('Files: ', `cd .`); // this causes a segmentation fault
-$cat->show_output(`cd .`); // this causes a segmentation fault
-
-function show_outputa($prepend, $output) {
-	echo "Okey";
-}
-show_outputa('Files: ', `cd .`); // this works as expected
-
-?>
---EXPECT--
-Okey

Zend/tests/bug64896.phpt

@@ -0,0 +1,47 @@
+--TEST--
+Bug #64896 (Segfault with gc_collect_cycles using unserialize on certain objects)
+--XFAIL--
+We can not fix this bug without a significant (performace slow down) change to gc
+--FILE--
+<?php
+$bar = NULL;
+class bad
+{
+	private $_private = array();
+
+	public function __construct()
+	{
+		$this->_private[] = 'php';
+	}
+
+	public function __destruct()
+	{
+		global $bar;
+		$bar = $this;
+	}
+}
+
+$foo = new stdclass;
+$foo->foo = $foo;
+$foo->bad = new bad;
+
+gc_disable();
+
+unserialize(serialize($foo));
+gc_collect_cycles();
+var_dump($bar); 
+/*  will output:
+object(bad)#4 (1) {
+  ["_private":"bad":private]=>
+  &UNKNOWN:0
+}
+*/
+?>
+--EXPECTF--
+bject(bad)#%d (1) {
+  ["_private":"bad":private]=>
+  array(1) {
+    [0]=>
+    string(3) "php"
+  }
+}

Zend/tests/bug64960.phpt

@@ -0,0 +1,40 @@
+--TEST--
+Bug #64960 (Segfault in gc_zval_possible_root)
+--FILE--
+<?php
+// this makes ob_end_clean raise an error
+ob_end_flush();
+
+class ExceptionHandler {
+	public function __invoke (Exception $e)
+	{
+		// this triggers the custom error handler
+		ob_end_clean();
+	}
+}
+
+// this must be a class, closure does not trigger segfault
+set_exception_handler(new ExceptionHandler());
+
+// exception must be throwed from error handler.
+set_error_handler(function()
+{
+	$e = new Exception;
+	$e->_trace = debug_backtrace();
+	
+	throw $e;
+});
+
+// trigger error handler
+$a['waa'];
+?>
+--EXPECTF--
+Notice: ob_end_flush(): failed to delete and flush buffer. No buffer to delete or flush in %sbug64960.php on line 3
+
+Fatal error: Uncaught exception 'Exception' in %sbug64960.php:19
+Stack trace:
+#0 [internal function]: {closure}(8, 'ob_end_clean():...', '%s', 9, Array)
+#1 %sbug64960.php(9): ob_end_clean()
+#2 [internal function]: ExceptionHandler->__invoke(Object(Exception))
+#3 {main}
+  thrown in %sbug64960.php on line 19

Zend/tests/bug64966.phpt

@@ -0,0 +1,30 @@
+--TEST--
+Bug #64966 (segfault in zend_do_fcall_common_helper_SPEC)
+--FILE--
+<?php
+error_reporting(E_ALL);
+set_error_handler(function($error) { throw new Exception(); }, E_RECOVERABLE_ERROR);
+
+function test($func) {
+	$a = $func("");
+	return true;
+}
+class A {
+	public function b() {
+		test("strlen");
+		test("iterator_apply");
+	}
+}
+
+$a = new A();
+$a->b();
+?>
+--EXPECTF--
+Fatal error: Uncaught exception 'Exception' in %sbug64966.php:3
+Stack trace:
+#0 [internal function]: {closure}(4096, 'Argument 1 pass...', '%s', 6, Array)
+#1 %sbug64966.php(6): iterator_apply('')
+#2 %sbug64966.php(12): test('iterator_apply')
+#3 %sbug64966.php(17): A->b()
+#4 {main}
+  thrown in %sbug64966.php on line 3

Zend/tests/bug64988.phpt

@@ -0,0 +1,30 @@
+--TEST--
+Bug #64988 (Class loading order affects E_STRICT warning)
+--FILE--
+<?php
+abstract class Base1 {
+	public function insert(array $data){
+		return array_reverse($data);
+	}
+}
+
+class Noisy1 extends Base1 {
+	public function insert(array $data, $option1 = Null) {
+		if (!empty($option1)) {
+			$data['option1'] = $option1;
+		}
+		return parent::insert($data);
+	}
+}
+class Smooth1 extends Noisy1 {
+	public function insert(array $data) {
+		return parent::insert($data, count($data));
+	}
+}
+
+$o = new Smooth1();
+echo "okey";
+?>
+--EXPECTF--
+Strict Standards: Declaration of Smooth1::insert() should be compatible with Noisy1::insert(array $data, $option1 = NULL) in %sbug64988.php on line 20
+okey

Zend/tests/bug65108.phpt

@@ -0,0 +1,27 @@
+--TEST--
+Bug #65108 (is_callable() triggers Fatal Error)
+--FILE--
+<?php
+class C {
+	private function f() {}
+	static function __callStatic($name, $args) {}
+}
+
+class B {
+	public function B() {
+		$isCallable = is_callable(array(new C, 'f'));
+		var_dump($isCallable);
+	}
+}
+
+new B();
+
+Class E {
+   private function f() {}
+   function __call($name, $args) {}
+}
+$isCallable = is_callable(array('E', 'f'));
+var_dump($isCallable);
+--EXPECT--
+bool(false)
+bool(false)

Zend/tests/bug65254.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Bug #65254 (Exception not catchable when exception thrown in autoload with a namespace)
+--FILE--
+<?php
+function __autoload($class)
+{
+    eval("namespace ns_test; class test {}");
+
+    throw new \Exception('abcd');
+}
+
+try
+{
+    \ns_test\test::go();
+}
+catch (Exception $e)
+{
+    echo 'caught';
+}
+--EXPECT--
+caught

Zend/tests/bug65291.phpt

@@ -0,0 +1,25 @@
+--TEST--
+Bug #65291 - get_defined_constants() causes PHP to crash in a very limited case.
+--FILE--
+<?php
+
+trait TestTrait
+{
+	public static function testStaticFunction()
+	{
+		return __CLASS__;
+	}
+}
+class Tester
+{
+	use TestTrait;
+}
+
+$foo = Tester::testStaticFunction();
+get_defined_constants();
+get_defined_constants(true);
+
+echo $foo;
+?>
+--EXPECT--
+Tester

Zend/tests/bug65322.phpt

@@ -0,0 +1,22 @@
+--TEST--
+Bug #65322: compile time errors won't trigger auto loading
+--FILE--
+<?php
+
+spl_autoload_register(function($class) {
+    var_dump($class);
+    class B {}
+});
+
+set_error_handler(function($_, $msg, $file) {
+    var_dump($msg, $file);
+    new B;
+});
+
+eval('class A { function a() {} function __construct() {} }');
+
+?>
+--EXPECTF--
+string(50) "Redefining already defined constructor for class A"
+string(%d) "%s(%d) : eval()'d code"
+string(1) "B"

Zend/tests/bug65372.phpt

@@ -0,0 +1,40 @@
+--TEST--
+Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
+--FILE--
+<?php
+
+class ParentClass
+{
+    private static $_OBJECTS;
+
+    public static function Get()
+    {
+        self::$_OBJECTS[1] = new ChildClass();
+        return self::$_OBJECTS[1];    
+    }
+}
+
+class ChildClass extends ParentClass
+{
+    public $Manager;
+
+    function __construct()
+    {
+        $this->Manager = $this;
+    }
+
+    public static function &GetCurrent()
+    {
+        return ChildClass::Get();
+    }
+
+    public static function &Get()
+    {
+        return parent::Get();
+    }
+}
+
+$staff = ChildClass::GetCurrent();
+?>
+--EXPECTF--
+Notice: Only variable references should be returned by reference in %sbug65372.php on line 30

Zend/tests/bug65579.phpt

@@ -0,0 +1,29 @@
+--TEST--
+Bug #65579 (Using traits with get_class_methods causes segfault)
+--FILE--
+<?php
+trait ParentTrait {
+    public function testMethod() { }
+}
+
+trait ChildTrait {
+    use ParentTrait {
+        testMethod as testMethodFromParentTrait;
+    }
+    public function testMethod() { }
+}
+
+class TestClass {
+    use ChildTrait;
+}
+
+$obj = new TestClass();
+var_dump(get_class_methods($obj));
+?>
+--EXPECT--
+array(2) {
+  [0]=>
+  string(10) "testMethod"
+  [1]=>
+  string(25) "testmethodfromparenttrait"
+}

Zend/tests/bug65911.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Bug #65911 (scope resolution operator - strange behavior with $this)
+--FILE--
+<?php
+class A {}
+
+class B
+{
+	public function go()
+	{
+		$this->foo = 'bar';
+		echo A::$this->foo; // should not output 'bar'
+	}
+}
+
+$obj = new B();
+$obj->go();
+?>
+--EXPECTF--
+Fatal error: Access to undeclared static property: A::$this in %s on line %d

Zend/tests/bug65969.phpt

@@ -0,0 +1,10 @@
+--TEST--
+Bug #65969 (Chain assignment with T_LIST failure)
+--FILE--
+<?php
+$obj = new stdClass;
+list($a,$b) = $obj->prop = [1,2];
+var_dump($a,$b);
+--EXPECT--
+int(1)
+int(2)

Zend/tests/bug66218.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Bug #66218 zend_register_functions breaks reflection
+--SKIPIF--
+<?php
+if (PHP_SAPI != "cli") die("skip CLI only test");
+if (!function_exists("dl")) die("skip need dl");
+?>
+--FILE--
+<?php
+$tab = get_extension_funcs("standard");
+$fcts = array("dl");
+foreach ($fcts as $fct) {
+	if (in_array($fct, $tab)) {
+		echo "$fct Ok\n";
+	}
+}
+?>
+Done
+--EXPECTF--
+dl Ok
+Done

Zend/tests/bug66286.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Bug #66286: Incorrect object comparison with inheritance
+--FILE--
+<?php
+
+abstract class first {
+    protected $someArray = array();
+}     
+
+class second extends first {    
+    protected $someArray = array();        
+    protected $someValue = null;
+
+    public function __construct($someValue) {
+        $this->someValue = $someValue;
+    }
+}
+
+$objFirst = new second('123');       
+$objSecond = new second('321');       
+
+var_dump ($objFirst == $objSecond);    
+
+?>
+--EXPECT--
+bool(false)

Zend/tests/catch_finally_001.phpt

@@ -1,32 +0,0 @@
---TEST--
-Try catch finally (basic test)
---FILE--
-<?php
-function foo ($throw = FALSE) {
-   try {
-     echo "try\n";
-     if ($throw) {
-        throw new Exception("ex");
-     }
-   } catch (Exception $e) {
-     echo "catch\n"; 
-   } finally {
-     echo "finally\n";
-   }
-
-   echo "end\n";
-}
-
-foo();
-echo "\n";
-foo(true);
-?>
---EXPECTF--
-try
-finally
-end
-
-try
-catch
-finally
-end

Zend/tests/catch_finally_002.phpt

@@ -1,21 +0,0 @@
---TEST--
-Try catch finally (basic test with return)
---FILE--
-<?php
-function foo () {
-   try {
-     echo "try\n";
-     return 1;
-   } catch (Exception $e) {
-   } finally {
-     echo "finally\n";
-   }
-   return 2;
-}
-
-var_dump(foo());
-?>
---EXPECTF--
-try
-finally
-int(1)

Zend/tests/catch_finally_003.phpt

@@ -1,40 +0,0 @@
---TEST--
-Try catch finally (with multi-returns)
---FILE--
-<?php
-function dummy($msg) {
-   var_dump($msg);
-}
-
-function foo ($a) {
-   try {
-       dummy("try");
-       return $a;
-   } catch (Exception $e) {
-       throw $e;
-   } finally {
-       dummy("finally");
-       return "finally";
-   }
-   return "end";
-}
-
-function &bar($a) {
-   try {
-     echo "try\n";
-     throw new Exception("ex");
-   } catch (Exception $e) {
-   } finally {
-     return $a;
-   }
-   return ($c = "end");
-}
-var_dump(foo("para"));
-var_dump(bar("para"));
-?>
---EXPECTF--
-string(3) "try"
-string(7) "finally"
-string(7) "finally"
-try
-string(4) "para"

Zend/tests/catch_finally_004.phpt

@@ -1,41 +0,0 @@
---TEST--
-Try catch finally (nesting try-catch-finally)
---FILE--
-<?php
-
-function throw_exception($msg) {
-    throw new Exception($msg);
-}
-
-function foo (&$ex) {
-   try {
-      echo "1";
-      try {
-        echo "2";
-        throw_exception("try");
-      } catch (Exception $e) {
-        echo "3";
-        throw_exception("catch");
-      } finally {
-        echo "4";
-        throw_exception("finally");
-      } 
-   } catch (Exception $e) {
-      $ex = $e;
-      echo "3";
-   } finally {
-      echo "2";
-   }
-   return 1;
-}
-
-var_dump(foo($ex));
-
-do {
-  var_dump($ex->getMessage());
-} while ($ex = $ex->getPrevious());
-?>
---EXPECT--
-123432int(1)
-string(7) "finally"
-string(5) "catch"

Zend/tests/catch_finally_005.phpt

@@ -1,21 +0,0 @@
---TEST--
-Try catch finally (with multi-returns and exception)
---FILE--
-<?php
-function foo ($a) {
-   try {
-     throw new Exception("ex");
-   } catch (PdoException $e) {
-     die("error");
-   } catch (Exception $e) {
-     return 2;
-   } finally {
-     return 3;
-   }
-   return 1;
-}
-
-var_dump(foo("para"));
-?>
---EXPECTF--
-int(3)

Zend/tests/catch_finally_006.phpt

@@ -1,28 +0,0 @@
---TEST--
-Try catch finally (re-throw exception in catch block)
---FILE--
-<?php
-function foo ($a) {
-   try {
-     throw new Exception("ex");
-   } catch (Exception $e) {
-     var_dump($a);
-     throw $e;
-   } finally {
-     var_dump("finally");
-     return "return";
-   }
-   return 1;
-}
-
-try {
-   var_dump(foo("para"));
-} catch (Exception $e) {
-    "caught exception" . PHP_EOL;
-    var_dump($e->getMessage());
-}
-?>
---EXPECT--
-string(4) "para"
-string(7) "finally"
-string(6) "return"

Zend/tests/class_name_as_scalar.phpt

@@ -1,77 +0,0 @@
---TEST--
-class name as scalar from ::class keyword
---FILE--
-<?php
-
-namespace Foo\Bar {
-    class One {
-        // compile time constants
-        const A = self::class;
-        const B = Two::class;
-    }
-    class Two extends One {
-        public static function run() {
-            var_dump(self::class); // self compile time lookup
-            var_dump(static::class); // runtime lookup
-            var_dump(parent::class); // runtime lookup
-            var_dump(Baz::class); // default compile time lookup
-        }
-    }
-    class Three extends Two {
-        // compile time static lookups
-        public static function checkCompileTime(
-            $one = self::class,
-            $two = Baz::class,
-            $three = One::A,
-            $four = self::B
-        ) {
-            var_dump($one, $two, $three, $four);
-        }
-    }
-    echo "In NS\n";
-    var_dump(Moo::CLASS); // resolve in namespace
-}
-
-namespace {
-    use Bee\Bop as Moo,
-        Foo\Bar\One;
-    echo "Top\n";
-    var_dump(One::class); // resolve from use
-    var_dump(Boo::class); // resolve in global namespace
-    var_dump(Moo::CLASS); // resolve from use as
-    var_dump(\Moo::Class); // resolve fully qualified
-    $class = One::class; // assign class as scalar to var
-    $x = new $class; // create new class from original scalar assignment
-    var_dump($x);
-    Foo\Bar\Two::run(); // resolve runtime lookups
-    echo "Parent\n";
-    Foo\Bar\Three::run(); // resolve runtime lookups with inheritance
-    echo "Compile Check\n";
-    Foo\Bar\Three::checkCompileTime();
-}
-
-?>
---EXPECTF--
-In NS
-string(11) "Foo\Bar\Moo"
-Top
-string(11) "Foo\Bar\One"
-string(3) "Boo"
-string(7) "Bee\Bop"
-string(3) "Moo"
-object(Foo\Bar\One)#1 (0) {
-}
-string(11) "Foo\Bar\Two"
-string(11) "Foo\Bar\Two"
-string(11) "Foo\Bar\One"
-string(11) "Foo\Bar\Baz"
-Parent
-string(11) "Foo\Bar\Two"
-string(13) "Foo\Bar\Three"
-string(11) "Foo\Bar\One"
-string(11) "Foo\Bar\Baz"
-Compile Check
-string(13) "Foo\Bar\Three"
-string(11) "Foo\Bar\Baz"
-string(11) "Foo\Bar\One"
-string(11) "Foo\Bar\Two"

Zend/tests/class_name_as_scalar_error_001.phpt

@@ -1,13 +0,0 @@
---TEST--
-class name as scalar from ::class keyword error using static in class constant
---FILE--
-<?php
-
-namespace Foo\Bar {
-    class One {
-        const Baz = static::class;
-    }
-}
-?>
---EXPECTF--
-Fatal error: static::class cannot be used for compile-time class name resolution in %s on line %d

Zend/tests/class_name_as_scalar_error_002.phpt

@@ -1,13 +0,0 @@
---TEST--
-class name as scalar from ::class keyword error using parent in class constant
---FILE--
-<?php
-
-namespace Foo\Bar {
-    class One {
-        const Baz = parent::class;
-    }
-}
-?>
---EXPECTF--
-Fatal error: parent::class cannot be used for compile-time class name resolution in %s on line %d

Zend/tests/class_name_as_scalar_error_003.phpt

@@ -1,13 +0,0 @@
---TEST--
-class name as scalar from ::class keyword error using static in method signature
---FILE--
-<?php
-
-namespace Foo\Bar {
-    class One {
-        public function baz($x = static::class) {}
-    }
-}
-?>
---EXPECTF--
-Fatal error: static::class cannot be used for compile-time class name resolution in %s on line %d

Zend/tests/class_name_as_scalar_error_004.phpt

@@ -1,13 +0,0 @@
---TEST--
-class name as scalar from ::class keyword error using parent in method signature
---FILE--
-<?php
-
-namespace Foo\Bar {
-    class One {
-        public function baz($x = parent::class) {}
-    }
-}
-?>
---EXPECTF--
-Fatal error: parent::class cannot be used for compile-time class name resolution in %s on line %d

Zend/tests/class_name_as_scalar_error_005.phpt

@@ -1,10 +0,0 @@
---TEST--
-class name as scalar from ::class keyword error using static non class context
---FILE--
-<?php
-
-$x = static::class;
-
-?>
---EXPECTF--
-Fatal error: Cannot access static::class when no class scope is active in %s on line %d

Zend/tests/class_name_as_scalar_error_006.phpt

@@ -1,10 +0,0 @@
---TEST--
-class name as scalar from ::class keyword error using parent in non class context
---FILE--
-<?php
-
-$x = parent::class;
-
-?>
---EXPECTF--
-Fatal error: Cannot access parent::class when no class scope is active in %s on line %d

Zend/tests/closure_044.phpt

@@ -3,7 +3,7 @@ Closure 044: Scope/bounding combination invariants; non static closures
 --FILE--
 <?php
 /* A non-static closure has a bound instance if it has a scope
- * and does't have an instance if it has no scope */
+ * and doesn't have an instance if it has no scope */
 
 $nonstaticUnscoped = function () { var_dump(isset(A::$priv)); var_dump(isset($this)); };
 

Zend/tests/const_dereference_001.phpt

@@ -1,21 +0,0 @@
---TEST--
-Const array deference
---FILE--
-<?php
-error_reporting(E_ALL);
-
-var_dump(array(1, 2, 3, 4,) [3]);
-var_dump(array(1, 2, 3, 4,) ['foo']);
-var_dump(array(array(1,2,3), array(4, 5, 6))[1][2]);
-
-foreach (array(array(1, 2, 3))[0] as $var) {
-     echo $var;
-}
-?>
---EXPECTF--
-int(4)
-
-Notice: Undefined index: foo in %sconst_dereference_001.php on line %d
-NULL
-int(6)
-123

Zend/tests/const_dereference_002.phpt

@@ -1,18 +0,0 @@
---TEST--
-Const string dereference
---FILE--
-<?php
-error_reporting(E_ALL);
-
-var_dump("foobar"[3]);
-var_dump("foobar"[2][0]);
-var_dump("foobar"["foo"]["bar"]);
-
---EXPECTF--
-string(1) "b"
-string(1) "o"
-
-Warning: Illegal string offset 'foo' in %sconst_dereference_002.php on line %d
-
-Warning: Illegal string offset 'bar' in %sconst_dereference_002.php on line %d
-string(1) "f"

Zend/tests/const_dereference_003.phpt

@@ -1,21 +0,0 @@
---TEST--
-Const array deference
---FILE--
-<?php
-error_reporting(E_ALL);
-
-var_dump([1, 2, 3, 4,][3]);
-var_dump([1, 2, 3, 4]['foo']);
-var_dump([array(1,2,3), [4, 5, 6]][1][2]);
-
-foreach (array([1, 2, 3])[0] as $var) {
-     echo $var;
-}
-?>
---EXPECTF--
-int(4)
-
-Notice: Undefined index: foo in %sconst_dereference_003.php on line %d
-NULL
-int(6)
-123

Zend/tests/dval_to_lval_32.phpt

@@ -1,32 +0,0 @@
---TEST--
-zend_dval_to_lval preserves low bits  (32 bit long)
---SKIPIF--
-<?php
-if (PHP_INT_SIZE != 4)
-	 die("skip for machines with 32-bit longs");
-?>
---FILE--
-<?php
-	/* test doubles around -4e21 */
-	$values = [
-		-4000000000000001048576.,
-		-4000000000000000524288.,
-		-4000000000000000000000.,
-		-3999999999999999475712.,
-		-3999999999999998951424.,
-	];
-	/* see if we're rounding negative numbers right */
-	$values[] = -2147483649.8;
-
-	foreach ($values as $v) {
-		var_dump((int)$v);
-	}
-
-?>
---EXPECT--
-int(-2056257536)
-int(-2055733248)
-int(-2055208960)
-int(-2054684672)
-int(-2054160384)
-int(2147483647)

Zend/tests/dval_to_lval_64.phpt

@@ -1,29 +0,0 @@
---TEST--
-zend_dval_to_lval preserves low bits  (64 bit long)
---SKIPIF--
-<?php
-if (PHP_INT_SIZE != 8)
-	 die("skip for machines with 64-bit longs");
-?>
---FILE--
-<?php
-	/* test doubles around -4e21 */
-	$values = [
-		-4000000000000001048576.,
-		-4000000000000000524288.,
-		-4000000000000000000000.,
-		-3999999999999999475712.,
-		-3999999999999998951424.,
-	];
-
-	foreach ($values as $v) {
-		var_dump((int)$v);
-	}
-
-?>
---EXPECT--
-int(2943463994971652096)
-int(2943463994972176384)
-int(2943463994972700672)
-int(2943463994973224960)
-int(2943463994973749248)

Zend/tests/empty_with_expr.phpt

@@ -1,32 +0,0 @@
---TEST--
-empty() with arbitrary expressions
---FILE--
-<?php
-
-function getEmptyArray() { return []; }
-function getNonEmptyArray() { return [1, 2, 3]; }
-
-var_dump(empty([]));
-var_dump(empty([1, 2, 3]));
-
-var_dump(empty(getEmptyArray()));
-var_dump(empty(getNonEmptyArray()));
-
-var_dump(empty([] + []));
-var_dump(empty([1, 2, 3] + []));
-
-var_dump(empty("string"));
-var_dump(empty(""));
-var_dump(empty(true));
-var_dump(empty(false));
---EXPECT--
-bool(true)
-bool(false)
-bool(true)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(true)

Zend/tests/errmsg_043.phpt

@@ -0,0 +1,12 @@
+--TEST--
+errmsg: cannot create references to temp array
+--FILE--
+<?php
+
+foreach (array(1,2,3) as $k=>&$v) {
+}
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Fatal error: Cannot create references to elements of a temporary array expression in %s on line %d

Zend/tests/errmsg_045.phpt

@@ -0,0 +1,18 @@
+--TEST--
+Error message in error handler during compilation
+--FILE--
+<?php
+
+set_error_handler(function($_, $msg, $file) {
+	var_dump($msg, $file);
+	echo $undefined;
+});
+
+eval('class A { function a() {} function __construct() {} }');
+
+?>
+--EXPECTF--
+string(50) "Redefining already defined constructor for class A"
+string(%d) "%s(%d) : eval()'d code"
+
+Notice: Undefined variable: undefined in %s on line %d

Zend/tests/exception_before_fatal.phpt

@@ -1,64 +0,0 @@
---TEST--
-Exceptions before fatal error
---FILE--
-<?php
-function exception_error_handler($code, $msg) {
-    throw new Exception($msg);
-}
-
-set_error_handler("exception_error_handler");
-
-try {
-    $foo->a();
-} catch(Exception $e) {
-    var_dump($e->getMessage());
-}
-
-try {
-    new $foo();
-} catch(Exception $e) {
-    var_dump($e->getMessage());
-}
-
-try {
-    throw $foo;
-} catch(Exception $e) {
-    var_dump($e->getMessage());
-}
-
-try {
-    $foo();
-} catch(Exception $e) {
-    var_dump($e->getMessage());
-}
-
-try {
-    $foo::b();
-} catch(Exception $e) {
-    var_dump($e->getMessage());
-}
-
-
-try {
-    $b = clone $foo;
-} catch(Exception $e) {
-    var_dump($e->getMessage());
-}
-
-class b {
-}
-
-try {
-    b::$foo();
-} catch(Exception $e) {
-    var_dump($e->getMessage());
-}
-?>
---EXPECT--
-string(23) "Undefined variable: foo"
-string(23) "Undefined variable: foo"
-string(23) "Undefined variable: foo"
-string(23) "Undefined variable: foo"
-string(23) "Undefined variable: foo"
-string(23) "Undefined variable: foo"
-string(23) "Undefined variable: foo"

Zend/tests/foreach_list_001.phpt

@@ -1,43 +0,0 @@
---TEST--
-foreach with list syntax
---FILE--
-<?php
-
-foreach(array(array(1,2), array(3,4)) as list($a, $b)) {
-    var_dump($a . $b);
-}
-
-$array = array(
-    array('a', 'b'),
-    array('c', 'd'),
-);
-
-foreach ($array as list($a, $b)) {
-    var_dump($a . $b);
-}
-
-
-$multi = array(
-    array(array(1,2), array(3,4)),
-    array(array(5,6), array(7,8)),
-);
-
-foreach ($multi as list(list($a, $b), list($c, $d))) {
-    var_dump($a . $b . $c . $d);
-}
-
-foreach ($multi as $key => list(list($a, $b), list($c, $d))) {
-    var_dump($key . $a . $b . $c . $d);
-}
-
-
-?>
---EXPECT--
-string(2) "12"
-string(2) "34"
-string(2) "ab"
-string(2) "cd"
-string(4) "1234"
-string(4) "5678"
-string(5) "01234"
-string(5) "15678"

Zend/tests/foreach_list_002.phpt

@@ -1,26 +0,0 @@
---TEST--
-foreach with freak lists
---FILE--
-<?php
-
-foreach (array(array(1,2), array(3,4)) as list($a, )) {
-    var_dump($a);
-}
-
-$array = [['a', 'b'], 'c', 'd'];
-
-foreach($array as list(list(), $a)) {
-   var_dump($a); 
-}
-
-?>
---EXPECTF--
-int(1)
-int(3)
-string(1) "b"
-
-Notice: Uninitialized string offset: 1 in %sforeach_list_002.php on line %d
-string(0) ""
-
-Notice: Uninitialized string offset: 1 in %sforeach_list_002.php on line %d
-string(0) ""

Zend/tests/foreach_list_003.phpt

@@ -1,13 +0,0 @@
---TEST--
-foreach with list key
---FILE--
-<?php
-
-$array = [['a', 'b'], 'c', 'd'];
-
-foreach($array as list($key) => list(list(), $a)) {
-}
-
-?>
---EXPECTF--
-Fatal error: Cannot use list as key element in %sforeach_list_003.php on line %d

Zend/tests/foreach_list_004.phpt

@@ -1,13 +0,0 @@
---TEST--
-foreach with empty list
---FILE--
-<?php
-
-$array = [['a', 'b'], 'c', 'd'];
-
-foreach($array as $key => list()) {
-}
-
-?>
---EXPECTF--
-Fatal error: Cannot use empty list in %sforeach_list_004.php on line %d

Zend/tests/foreach_temp_array_expr_with_refs.phpt

@@ -1,18 +0,0 @@
---TEST--
-Temporary array expressions can be iterated by reference
---FILE--
-<?php
-
-$a = 'a';
-$b = 'b';
-
-foreach ([&$a, &$b] as &$value) {
-    $value .= '-foo';
-}
-
-var_dump($a, $b);
-
-?>
---EXPECT--
-string(5) "a-foo"
-string(5) "b-foo"

Zend/tests/gc_007.phpt

@@ -1,5 +1,5 @@
 --TEST--
-GC 007: Unreferensed array cycle
+GC 007: Unreferenced array cycle
 --INI--
 zend.enable_gc=1
 --FILE--

Zend/tests/gc_008.phpt

@@ -1,5 +1,5 @@
 --TEST--
-GC 008: Unreferensed object cycle
+GC 008: Unreferenced object cycle
 --INI--
 zend.enable_gc=1
 --FILE--

Zend/tests/gc_009.phpt

@@ -1,5 +1,5 @@
 --TEST--
-GC 009: Unreferensed array-object cycle
+GC 009: Unreferenced array-object cycle
 --INI--
 zend.enable_gc=1
 --FILE--