This commit was manufactured by cvs2svn to create tag 'php_5_2_8'.

- Fixed memory leaks
- Added new tests (Coverage++)

.gdbinit

@@ -46,8 +46,8 @@ define ____printzv_contents
 	set $zvalue = $arg0
 	set $type = $zvalue->type
 
-	printf "(refcount=%d", $zvalue->refcount__gc
-	if $zvalue->is_ref__gc
+	printf "(refcount=%d", $zvalue->refcount
+	if $zvalue->is_ref
 		printf ",is_ref"
 	end
 	printf ") "

CODING_STANDARDS

@@ -1,6 +1,6 @@
-========================
-  PHP Coding Standards
-========================
+PHP Coding Standards
+====================
+
 
 This file lists several standards that any programmer, adding or changing
 code in PHP, should follow.  Since this file was added at a very late
@@ -9,38 +9,37 @@ follow it, but it's going in that general direction.  Since we are now
 well into the version 4 releases, many sections have been recoded to use
 these rules.
 
+
 Code Implementation
 -------------------
 
-0.  Document your code in source files and the manual. [tm]
+[0] Document your code in source files and the manual. [tm]
 
-1.  Functions that are given pointers to resources should not free them
+[1] Functions that are given pointers to resources should not free them
 
-For instance, ``function int mail(char *to, char *from)`` should NOT free
+For instance, function int mail(char *to, char *from) should NOT free
 to and/or from.
 Exceptions:
 
-- The function's designated behavior is freeing that resource.  E.g. efree()
-
-- The function is given a boolean argument, that controls whether or not
-  the function may free its arguments (if true - the function must free its
-  arguments, if false - it must not)
-
-- Low-level parser routines, that are tightly integrated with the token
-  cache and the bison code for minimum memory copying overhead.
-
-2.  Functions that are tightly integrated with other functions within the
+  - The function's designated behavior is freeing that resource.  E.g. efree()
+  - The function is given a boolean argument, that controls whether or not
+    the function may free its arguments (if true - the function must free its
+    arguments, if false - it must not)
+  - Low-level parser routines, that are tightly integrated with the token
+    cache and the bison code for minimum memory copying overhead.
+    
+[2] Functions that are tightly integrated with other functions within the
     same module, and rely on each other non-trivial behavior, should be
     documented as such and declared 'static'.  They should be avoided if
     possible.
 
-3.  Use definitions and macros whenever possible, so that constants have
+[3] Use definitions and macros whenever possible, so that constants have
     meaningful names and can be easily manipulated.  The only exceptions
     to this rule are 0 and 1, when used as false and true (respectively).
     Any other use of a numeric constant to specify different behavior
     or actions should be done through a #define.
 
-4.  When writing functions that deal with strings, be sure to remember
+[4] When writing functions that deal with strings, be sure to remember
     that PHP holds the length property of each string, and that it
     shouldn't be calculated with strlen().  Write your functions in a such
     a way so that they'll take advantage of the length property, both
@@ -49,47 +48,47 @@ Exceptions:
     doing so, should return that new length, so it doesn't have to be
     recalculated with strlen() (e.g. php_addslashes())
 
-5.  NEVER USE strncat().  If you're absolutely sure you know what you're doing,
+[5] NEVER USE strncat().  If you're absolutely sure you know what you're doing,
     check its man page again, and only then, consider using it, and even then,
     try avoiding it.
 
-6.  Use ``PHP_*`` macros in the PHP source, and ``ZEND_*`` macros in the Zend
-    part of the source. Although the ``PHP_*`` macro's are mostly aliased to the
-    ``ZEND_*`` macros it gives a better understanding on what kind of macro
-    you're calling.
+[6] Use PHP_* macros in the PHP source, and ZEND_* macros in the Zend
+    part of the source. Although the PHP_* macro's are mostly aliased to the
+    ZEND_* macros it gives a better understanding on what kind of macro you're
+    calling.
 
-7.  When commenting out code using a #if statement, do NOT use 0 only. Instead
+[7] When commenting out code using a #if statement, do NOT use 0 only. Instead
     use "<cvs username here>_0". For example, #if FOO_0, where FOO is your
-    cvs user foo.  This allows easier tracking of why code was commented out,
-    especially in bundled libraries.
+    cvs 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
-    library is missing a function, do not define the PHP version of the
-    function, and do not raise a run-time error about the function not
-    existing.  End users should use function_exists() to test for the
-    existence of a function
+[8] Do not define functions that are not available.  For instance, if a
+     library is missing a function, do not define the PHP version of the
+     function, and do not raise a run-time error about the function not
+     existing.  End users should use function_exists() to test for the
+     existence of a function
 
-9.  Prefer emalloc(), efree(), estrdup(), etc. to their standard C library
-    counterparts.  These functions implement an internal "safety-net"
-    mechanism that ensures the deallocation of any unfreed memory at the
-    end of a request.  They also provide useful allocation and overflow
-    information while running in debug mode.
+[9] Prefer emalloc(), efree(), estrdup(), etc. to their standard C library
+     counterparts.  These functions implement an internal "safety-net"
+     mechanism that ensures the deallocation of any unfreed memory at the
+     end of a request.  They also provide useful allocation and overflow
+     information while running in debug mode.
 
-    In almost all cases, memory returned to the engine must be allocated
-    using emalloc().
+     In almost all cases, memory returned to the engine must be allocated
+     using emalloc().
 
-    The use of malloc() should be limited to cases where a third-party
-    library may need to control or free the memory, or when the memory in
-    question needs to survive between multiple requests.
+     The use of malloc() should be limited to cases where a third-party
+     library may need to control or free the memory, or when the memory in
+     question needs to survive between multiple requests.
 
 Naming Conventions
 ------------------
 
-1.  Function names for user-level functions should be enclosed with in
+[1] Function names for user-level functions should be enclosed with in
     the PHP_FUNCTION() macro. They should be in lowercase, with words
     underscore delimited, with care taken to minimize the letter count.
     Abbreviations should not be used when they greatly decrease the
-    readability of the function name itself::
+    readability of the function name itself.
 
     Good:
     'mcrypt_enc_self_test'
@@ -99,18 +98,18 @@ Naming Conventions
     'mcrypt_module_get_algo_supported_key_sizes'
     (could be 'mcrypt_mod_get_algo_sup_key_sizes'?)
     'get_html_translation_table'
-    (could be 'html_get_trans_table'?)
+    (could be 'html_get_trans_table'?) 
 
     Bad:
     'hw_GetObjectByQueryCollObj'
     'pg_setclientencoding'
     'jf_n_s_i'
 
-2.  If they are part of a "parent set" of functions, that parent should
+[2] If they are part of a "parent set" of functions, that parent should
     be included in the user function name, and should be clearly related
     to the parent program or function family. This should be in the form
-    of ``parent_*``::
-
+    of parent_*.
+    
     A family of 'foo' functions, for example:
     Good:
     'foo_select_bar'
@@ -122,22 +121,22 @@ Naming Conventions
     'fooinsertbaz'
     'delete_foo_baz'
 
-3.  Function names used by user functions should be prefixed
-    with ``_php_``, and followed by a word or an underscore-delimited list of
+[3] Function names used by user functions should be prefixed
+    with "_php_", and followed by a word or an underscore-delimited list of
     words, in lowercase letters, that describes the function.  If applicable,
     they should be declared 'static'.
 
-4.  Variable names must be meaningful.  One letter variable names must be
+[4] Variable names must be meaningful.  One letter variable names must be
     avoided, except for places where the variable has no real meaning or
     a trivial meaning (e.g. for (i=0; i<100; i++) ...).
 
-5.  Variable names should be in lowercase.  Use underscores to separate
+[5] Variable names should be in lowercase.  Use underscores to separate
     between words.
 
-6.  Method names follow the 'studlyCaps' (also referred to as 'bumpy case'
+[6] Method names follow the 'studlyCaps' (also referred to as 'bumpy case'
     or 'camel caps') naming convention, with care taken to minimize the
     letter count. The initial letter of the name is lowercase, and each
-    letter that starts a new 'word' is capitalized::
+    letter that starts a new 'word' is capitalized.
 
     Good:
     'connect()'
@@ -149,11 +148,11 @@ Naming Conventions
     'buildsomewidget'
     'getI()'
 
-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).
-    The class name should be prefixed with the name of the 'parent set' (e.g.
-    the name of the extension)::
+[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). 
+    The class name should be prefixed with the name of the 'parent set' (e.g. 
+    the name of the extension).
 
     Good:
     'Curl'
@@ -166,7 +165,7 @@ Naming Conventions
 Syntax and indentation
 ----------------------
 
-1.  Never use C++ style comments (i.e. // comment).  Always use C-style
+[1] Never use C++ style comments (i.e. // comment).  Always use C-style
     comments instead.  PHP is written in C, and is aimed at compiling
     under any ANSI-C compliant compiler.  Even though many compilers
     accept C++-style comments in C code, you have to ensure that your
@@ -175,20 +174,17 @@ Syntax and indentation
     because the Win32 port is MS-Visual C++ specific, and this compiler
     is known to accept C++-style comments in C code.
 
-2.  Use K&R-style.  Of course, we can't and don't want to
+[2] Use K&R-style.  Of course, we can't and don't want to
     force anybody to use a style he or she is not used to, but,
     at the very least, when you write code that goes into the core
     of PHP or one of its standard modules, please maintain the K&R
     style.  This applies to just about everything, starting with
     indentation and comment styles and up to function declaration
-    syntax. Also see Indentstyle_.
+    syntax.
 
-.. _Indentstyle: http://www.catb.org/~esr/jargon/html/I/indent-style.html
-
-3.  Be generous with whitespace and braces.  Keep one empty line between the
-    variable declaration section and the statements in a block, as well as
-    between logical statement groups in a block.  Maintain at least one empty
-    line between two functions, preferably two.  Always prefer::
+    (see also http://www.catb.org/~esr/jargon/html/I/indent-style.html)
+    
+[3] Be generous with whitespace and braces.  Always prefer:
 
     if (foo) {
         bar;
@@ -198,18 +194,23 @@ Syntax and indentation
 
     if(foo)bar;
 
-4.  When indenting, use the tab character.  A tab is expected to represent
+    Keep one empty line between the variable declaration section and
+    the statements in a block, as well as between logical statement
+    groups in a block.  Maintain at least one empty line between
+    two functions, preferably two.
+
+[4] When indenting, use the tab character.  A tab is expected to represent
     four spaces.  It is important to maintain consistency in indenture so
     that definitions, comments, and control structures line up correctly.
 
-5.  Preprocessor statements (#if and such) MUST start at column one. To
+[5] Preprocessor statements (#if and such) MUST start at column one. To
     indent preprocessor directives you should put the # at the beginning
     of a line, followed by any number of whitespace.
 
 Testing
 -------
 
-1.  Extensions should be well tested using *.phpt tests. Read about that
+[1] Extensions should be well tested using *.phpt tests. Read about that
     in README.TESTING.
 
 Documentation and Folding Hooks
@@ -218,20 +219,20 @@ Documentation and Folding Hooks
 In order to make sure that the online documentation stays in line with
 the code, each user-level function should have its user-level function
 prototype before it along with a brief one-line description of what the
-function does.  It would look like this::
+function does.  It would look like this:
 
-  /* {{{ proto int abs(int number)
-     Returns the absolute value of the number */
-  PHP_FUNCTION(abs)
-  {
-     ...
-  }
-  /* }}} */
+/* {{{ proto int abs(int number)
+   Returns the absolute value of the number */
+PHP_FUNCTION(abs)
+{
+   ...
+}
+/* }}} */
 
 The {{{ symbols are the default folding symbols for the folding mode in
-Emacs and vim (set fdm=marker).  Folding is very useful when dealing with
-large files because you can scroll through the file quickly and just unfold
-the function you wish to work on.  The }}} at the end of each function marks
+Emacs and vim (set fdm=marker).  Folding is very useful when dealing with 
+large files because you can scroll through the file quickly and just unfold 
+the function you wish to work on.  The }}} at the end of each function marks 
 the end of the fold, and should be on a separate line.
 
 The "proto" keyword there is just a helper for the doc/genfuncsummary script
@@ -239,10 +240,10 @@ which generates a full function summary.  Having this keyword in front of the
 function prototypes allows us to put folds elsewhere in the code without
 messing up the function summary.
 
-Optional arguments are written like this::
+Optional arguments are written like this:
 
-  /* {{{ proto object imap_header(int stream_id, int msg_no [, int from_length [, int subject_length [, string default_host]]])
-     Returns a header object with the defined parameters */
+/* {{{ proto object imap_header(int stream_id, int msg_no [, int from_length [, int subject_length [, string default_host]]])
+   Returns a header object with the defined parameters */
 
 And yes, please keep the prototype on a single line, even if that line
 is massive.
@@ -255,11 +256,10 @@ that the first implementation include a file labeled 'EXPERIMENTAL'
 in the function directory, and that the functions follow the
 standard prefixing conventions during their initial implementation.
 
-The file labelled 'EXPERIMENTAL' should include the following
-information::
-
-  Any authoring information (known bugs, future directions of the module).
-  Ongoing status notes which may not be appropriate for CVS comments.
+The file labeled 'EXPERIMENTAL' should include the following
+information:
+   Any authoring information (known bugs, future directions of the module).
+   Ongoing status notes which may not be appropriate for CVS comments.
 
 Aliases & Legacy Documentation
 -----------------------------------

EXTENSIONS

@@ -118,7 +118,7 @@ STATUS:              Experimental
 
 -------------------------------------------------------------------------------
 EXTENSION:           dba
-PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>,Christopher Jones <sixd@php.net>, Pierre-Alain Joye <pajoye@php.net>
+PRIMARY MAINTAINER:  Marcus Börger <helly@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 COMMENT:             DBM abstraction for db2, db3, db4, dbm, ndbm, gdbm, ini
@@ -148,22 +148,16 @@ STATUS:              Working
 COMMENT:             Tested on phpts and isapi versions
 -------------------------------------------------------------------------------
 EXTENSION:           mysql
-PRIMARY MAINTAINER:  Zak Greant <zak@mysql.com>, Georg Richter <georg@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>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mysqli
-PRIMARY MAINTAINER:  Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>,  Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>      
+PRIMARY MAINTAINER:  Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0
 -------------------------------------------------------------------------------
-EXTENSION:           mysqlnd
-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
--------------------------------------------------------------------------------
 EXTENSION:           oci8
 PRIMARY MAINTAINER:  Christopher Jones <sixd@php.net>, Antony Dovgal <tony2001@php.net>
 MAINTENANCE:         Maintained
@@ -188,13 +182,13 @@ STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_firebird
-PRIMARY MAINTAINER:  Lars Westermann <lwe@php.net>
-MAINTENANCE:         Maintained
+PRIMARY MAINTAINER:  Unknown
+MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_mysql
-PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>, Johannes Schlüter <johannes@php.net>, Andrey Hristov <andrey@php.net>,  Ulf Wendel <uw@php.net>
+PRIMARY MAINTAINER:  Unknown
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
@@ -212,7 +206,7 @@ STATUS:              Working
 SINCE:               5.1
 -------------------------------------------------------------------------------
 EXTENSION:           pdo_pgsql
-PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>
+PRIMARY MAINTAINER:  Unknown
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 SINCE:               5.1
@@ -236,9 +230,12 @@ STATUS:              Working
 SINCE:               5.0 (Since 4.3.2 in PECL)
 COMMENT:             Integrates SQLite embeddable SQL database engine.
 -------------------------------------------------------------------------------
+EXTENSION:           sybase
+MAINTENANCE:         Unknown
+STATUS:              Not Working
+-------------------------------------------------------------------------------
 EXTENSION:           sybase_ct
-PRIMARY MAINTAINER:   Timm Friebe <thekid@thekid.de>
-MAINTENANCE:        Maintained
+MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 
@@ -269,12 +266,7 @@ MAINTENANCE:         Orphaned
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           xml
-PRIMARY MAINTAINER:  Thies C. Arntzen <thies@thieso.net>,  Rob Richards <rrichards@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           libxml
-PRIMARY MAINTAINER:   Rob Richards <rrichards@php.net>, Christian Stocker <chregu@php.net> 
+PRIMARY MAINTAINER:  Thies C. Arntzen <thies@thieso.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -289,7 +281,7 @@ MAINTENANCE:         Orphaned
 STATUS:              Experimental
 -------------------------------------------------------------------------------
 EXTENSION:           xmlwriter
-PRIMARY MAINTAINER:  Rob Richards <rrichards@php.net>, Pierre-Alain Joye <pajoye@php.net>
+PRIMARY MAINTAINER:  Rob Richards <rrichards@php.net>, Pierre-Alain Joye <pajoye@php.net> 
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -305,7 +297,7 @@ SINCE:               5.0
 
 -------------------------------------------------------------------------------
 EXTENSION:           bcmath
-MAINTENANCE:         Andi Gutmans <andi@zend.com>
+MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           bz2
@@ -378,14 +370,8 @@ PRIMARY MAINTAINER:  Moriyoshi Koizumi <moriyoshi@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           intl
-PRIMARY MAINTAINER:  Stanislav Malyshev <stas@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               5.3
--------------------------------------------------------------------------------
 EXTENSION:           imap
-PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org>, Ilia Alshanetsky <iliaa@php.net>, Pierre-Alain Joye <pajoye@php.net>
+PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org>, Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -396,7 +382,7 @@ STATUS:              Working
 SINCE:               5.2
 -------------------------------------------------------------------------------
 EXTENSION:           ldap
-PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net>, Douglas Goldstein <cardoe@php.net>, Pierre-Alain Joye <pajoye@php.net>
+PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net>, Douglas Goldstein <cardoe@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -411,7 +397,7 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mhash
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>, Scott MacVicar <scottmac@php.net>
+PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -426,6 +412,11 @@ PRIMARY MAINTAINER:  Frank M. Kromann
 MAINTENANCE:         Unknown
 STATUS:              Experimental
 -------------------------------------------------------------------------------
+EXTENSION:           ncurses
+PRIMARY MAINTAINER   Ilia Alshanetsky <iliaa@php.net>, Wez Furlong <wez@php.net>, Hartmut Holzgraefe <hholzgra@php.net>, Georg Richter <georg@php.net>
+MAINTENANCE:         Unknown
+STATUS:              Experimental
+-------------------------------------------------------------------------------
 EXTENSION:           openssl
 PRIMARY MAINTAINER:  Wez Furlong <wez@php.net>, Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
@@ -441,11 +432,6 @@ PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>, Nuno Lopes <nlopess@php.n
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           phar
-PRIMARY MAINTAINER:  Greg Beaver <cellog@php.net>, Marcus Börger <helly@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
 EXTENSION:           posix
 PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de>
 MAINTENANCE:         Maintained
@@ -459,7 +445,7 @@ SINCE:               4.0.2
 -------------------------------------------------------------------------------
 EXTENSION:           readline
 MAINTENANCE:         Unknown
-STATUS:              Working
+STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           recode
 PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de>
@@ -483,7 +469,7 @@ STATUS:              Working
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
 EXTENSION:           snmp
-PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>, Pierre-Alain Joye <pajoye@php.net>
+PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
 MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -494,7 +480,7 @@ STATUS:              Working
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
 EXTENSION:           spl
-PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>, Etienne Kneuss <colder@php.net>
+PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.0.0

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) --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l)
+	@$(LEX) -Pzend -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/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) --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l)
+	@$(LEX) -Pini_ -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_ini_scanner.l
 
 $(builddir)/zend_indent.lo $(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h

Makefile.gcov

@@ -61,9 +61,6 @@ php_lcov.info: lcov-test
 		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/date/lib ext/fileinfo/libmagic ext/gd/libgd ext/mbstring/libmbfl ext/mbstring/oniguruma ext/pcre/pcrelib ext/pdo_sqlite/libsqlite ext/sqlite/libsqlite ext/xmlrpc/libxmlrpc ext/zip/lib; do \
-		test -d lcov_data/$$dir && rm -rf lcov_data/$$dir ; \
-	done
 	@echo 
 	@echo "Generating $@"
 	@$(LTP) --directory lcov_data/ --capture --base-directory=lcov_data --output-file $@

Makefile.global

@@ -87,16 +87,21 @@ test: all
 		CC="$(CC)" \
 			$(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -d extension_dir=modules/ $(PHP_TEST_SHARED_EXTENSIONS) tests/; \
 	elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
-		INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`; \
+		INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
 		if test "$$INI_FILE"; then \
 			$(EGREP) -v '^(zend_)?extension(_debug)?(_ts)?[\t\ ]*=' "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
 		else \
 			echo > $(top_builddir)/tmp-php.ini; \
 		fi; \
+		INI_SCANNED_PATH=`$(top_builddir)/$(SAPI_CLI_PATH) -d 'display_errors=stderr' -r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \
+		if test "$$INI_SCANNED_PATH"; then \
+			INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH`; \
+			$(EGREP) -h -v '^(zend_)?extension(_debug)?(_ts)?[\t\ ]*=' "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
+		fi; \
 		TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
 		TEST_PHP_SRCDIR=$(top_srcdir) \
 		CC="$(CC)" \
-			$(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
+			$(top_builddir)/$(SAPI_CLI_PATH) -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); \
 	else \
 		echo "ERROR: Cannot run tests without CLI sapi."; \
 	fi

README.CVS-RULES

@@ -1,31 +1,24 @@
-====================
-  CVS Commit Rules
-====================
-
 This is the first file you should be reading after you get your CVS account.
 We'll assume you're basically familiar with CVS, but feel free to post
-your questions on the mailing list. Please have a look at
+your questions on the mailing list. Please have a look at 
 http://cvsbook.red-bean.com/ for more detailed information on CVS.
 
 PHP is developed through the efforts of a large number of people.
 Collaboration is a Good Thing(tm), and CVS lets us do this. Thus, following
-some basic rules with regards to CVS usage will::
+some basic rules with regards to CVS usage will:
 
    a. Make everybody happier, especially those responsible for maintaining
       the CVS itself.
-
    b. Keep the changes consistently well documented and easily trackable.
-
    c. Prevent some of those 'Oops' moments.
-
    d. Increase the general level of good will on planet Earth.
 
-Having said that, here are the organizational rules::
+
+Having said that, here are the organizational rules:
 
    1. Respect other people working on the project.
 
-   2. Discuss any significant changes on the list before committing and get
-      confirmation from the release manager for the given branch.
+   2. Discuss any significant changes on the list before committing. 
 
    3. Look at EXTENSIONS file to see who is the primary maintainer of
       the code you want to contribute to.
@@ -37,37 +30,30 @@ Having said that, here are the organizational rules::
 
    6. Test your changes before committing them. We mean it. Really.
       To do so use "make test".
-
+   
    7. For development use the --enable-maintainer-zts switch to ensure your
       code handles TSRM correctly and doesn't break for thos who need that.
 
-Currently we have the following branches in use::
+Currently we have the following branches in use:
+HEAD     Will become PHP 6.0. This CVS branch is for active development.
+PHP_5_2  Is used to release the PHP 5.2.x series. Only minor feature
+         enhancements may go in here, but please keep that as infrequent as
+         possible.
+PHP_5_1  This branch is closed.
+PHP_4_4  Is used to release the PHP 4.4.x series. Only bugfixes are permitted
+         on this branch (Consult the releasemaster prior to commit).
+PHP_4_3  This branch is closed.
 
-  HEAD     Will become PHP 6.0. This CVS branch is for active development.
-
-  PHP_5_3  Is used to release the PHP 5.3.x series. It still allows for
-           larger enhancements.
-
-  PHP_5_2  Is used to release the PHP 5.2.x series. Only bugfixes are permitted
-           on this branch (Consult the releasemaster prior to commit).
-
-  PHP_5_1  This branch is closed.
-
-  PHP_4_4  Is used to release the PHP 4.4.x series. Only bugfixes are permitted
-           on this branch (Consult the releasemaster prior to commit).
-
-  PHP_4_3  This branch is closed.
-
-The next few rules are more of a technical nature::
+The next few rules are more of a technical nature.
 
    1. DO NOT TOUCH ChangeLog! It is automagically updated from the commit
       messages every day. Woe be to those who attempt to mess with it.
 
    2. All news updates intended for public viewing, such as new features,
-      bug fixes, improvements, etc., should go into the NEWS file.
-
+      bug fixes, improvements, etc., should go into the NEWS file. 
+	  
       NB! Lines, starting with @ will go automagically into NEWS file, but
-      this is NOT recommended, though. Please, add news entries directly to
+      this is NOT recommended, though. Please, add news entries directly to 
       NEWS file and don't forget to keep them adjusted and sorted.
 
    3. Do not commit multiple file and dump all messages in one commit. If you
@@ -94,7 +80,7 @@ If a line begins with #, it is taken to be a comment and will not appear
 in the ChangeLog. Everything else goes into the ChangeLog.
 
 It is important to note that if your comment or news logline spans multiple
-lines, you have to put # at the beginning of **every** such line.
+lines, you have to put # at the beginning of _every_ such line. 
 
 Example. Say you modified two files, datetime.c and string.c. In datetime.c you
 added a new format option for the date() function, and in string.c you fixed a
@@ -102,15 +88,13 @@ memory leak in php_trim(). Don't commit both of these at once. Commit them
 separately and try to make sure your commit messages look something like the
 following.
 
-For datetime.c::
+For datetime.c:
+- Added new 'K' format modifier to date() for printing out number of days until
+  New Year's Eve.
 
-  - Added new 'K' format modifier to date() for printing out number of days
-    until New Year's Eve.
-
-For string.c::
-
-  - Fixed a memory leak in php_trim() resulting from improper use of zval_dtor().
-  #- Man, that thing was leaking all over the place!
+For string.c:
+- Fixed a memory leak in php_trim() resulting from improper use of zval_dtor().
+#- Man, that thing was leaking all over the place!
 
 The # lines will be omitted from the ChangeLog automagically.
 
@@ -122,13 +106,13 @@ If you fix some bugs, you should note the bug ID numbers in your
 commit message. Bug ID should be prefixed by "#" for easier access to
 bug report when developers are browsing CVS via LXR or Bonsai.
 
-Example::
+Example:
 
-  Fixed bug #14016 (pgsql notice handler double free crash bug.)
+Fixed bug #14016 (pgsql notice handler double free crash bug.)
 
 If you don't see your messages in ChangeLog right away, don't worry!
 These files are updated once a day, so your stuff will not show up until
-somewhat later.
+somewhat later. 
 
 You can use LXR (http://lxr.php.net/) and Bonsai (http://bonsai.php.net/)
 to look at PHP CVS repository in various ways.

README.EXT_SKEL

@@ -96,7 +96,29 @@ OTHER OPTIONS
   function entries and definitions at the end of the file, for copying and
   pasting into an already existing module.
 
-    --xml[=file]
+    --assign-params
+    --string-lens
+
+  By default, function proto 'void foo(string bar)' creates the following:
+     ...
+     zval **bar;
+     ... (zend_get_parameters_ex() called in the middle...)
+     convert_to_string_ex(bar);
+
+  Specifying both of these options changes the generated code to:
+     ...
+     zval **bar_arg;
+     int bar_len;
+     char *bar = NULL;
+     ... (zend_get_parameters_ex() called in the middle...)
+     convert_to_string_ex(bar_arg);
+     bar = Z_STRVAL_PP(bar_arg);
+     bar_len = Z_STRLEN_PP(bar_arg);
+
+  You shouldn't have to ask what happens if you leave --string-lens out. If you
+  have to, it's questionable whether you should be reading this document.
+
+    --with-xml[=file]
 
   Creates the basics for phpdoc .xml file.
 
@@ -134,32 +156,39 @@ EXAMPLE
   question marks to be replaced by you, and you must of course add your own
   value definitions too):
 
-/* {{{ proto bool my_drawtext(resource image, string text, resource font, int x, int y [, int color])
+/* {{{ proto bool my_drawtext(resource image, string text, resource font, int x, int y[, int color])
     */
 PHP_FUNCTION(my_drawtext)
 {
-    char *text = NULL;
-    int argc = ZEND_NUM_ARGS();
-    int image_id = -1;
-    int text_len;
-    int font_id = -1;
-    long x;
-    long y;
-    long color;
-    zval *image = NULL;
-    zval *font = NULL;
+	zval **image, **text, **font, **x, **y, **color;
+	int argc;
+	int image_id = -1;
+	int font_id = -1;
 
-    if (zend_parse_parameters(argc TSRMLS_CC, "rsrll|l", &image, &text, &text_len, &font, &x, &y, &color) == FAILURE)
-        return;
+	argc = ZEND_NUM_ARGS();
+	if (argc < 5 || argc > 6 || zend_get_parameters_ex(argc, &image, &text, &font, &x, &y, &color) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
 
-    if (image) {
-        ZEND_FETCH_RESOURCE(???, ???, image, image_id, "???", ???_rsrc_id);
-    }
-    if (font) {
-        ZEND_FETCH_RESOURCE(???, ???, font, font_id, "???", ???_rsrc_id);
-    }
+	ZEND_FETCH_RESOURCE(???, ???, image, image_id, "???", ???_rsrc_id);
+	ZEND_FETCH_RESOURCE(???, ???, font, font_id, "???", ???_rsrc_id);
 
-    php_error(E_WARNING, "my_drawtext: not yet implemented");
+	switch (argc) {
+		case 6:
+			convert_to_long_ex(color);
+			/* Fall-through. */
+		case 5:
+			convert_to_long_ex(y);
+			convert_to_long_ex(x);
+			/* font: fetching resources already handled. */
+			convert_to_string_ex(text);
+			/* image: fetching resources already handled. */
+			break;
+		default:
+			WRONG_PARAM_COUNT;
+	}
+
+	php_error(E_WARNING, "my_drawtext: not yet implemented");
 }
 /* }}} */
 

README.MAILINGLIST_RULES

@@ -1,79 +0,0 @@
-====================
-  Mailinglist Rules
-====================
-
-This is the first file you should be reading before doing any posts on PHP
-mailinglists. Following these rules is considered imperative to the success of
-the PHP project. Therefore expect your contributions to be of much less positive
-impact if you do not follow these rules. More importantly you can actually
-assume that not following these rules will hurt the PHP project.
-
-PHP is developed through the efforts of a large number of people.
-Collaboration is a Good Thing(tm), and mailinglists lets us do this. Thus,
-following some basic rules with regards to mailinglist usage will:
-
-   a. Make everybody happier, especially those responsible for developing PHP
-      itself.
-
-   b. Help in making sure we all use our time more efficiently.
-
-   c. Prevent you from making a fool of yourself in public.
-
-   d. Increase the general level of good will on planet Earth.
-
-
-Having said that, here are the organizational rules:
-
-   1. Respect other people working on the project.
-
-   2. Do not post when you are angry. Any post can wait a few hours. Review
-      your post after a good breather or a good nights sleep.
-
-   3. Make sure you pick the right mailinglist for your posting. Please review
-      the descriptions on the mailinglist overview page
-      (http://www.php.net/mailing-lists.php). When in doubt ask a friend or
-      someone you trust on IRC.
-
-   4. Make sure you know what you are talking about. PHP is a very large project
-      that strives to be very open. The flip side is that the core developers
-      are faced with a lot of requests. Make sure that you have done your
-      research before posting to the entire developer community.
-
-   5. Patches have a much greater chance of acceptance than just asking the
-      PHP developers to implement a feature for you. For one it makes the
-      discussion more concrete and it shows that the poster put thought and time
-      into the request.
-
-   6. If you are posting to an existing thread, make sure that you know what
-      previous posters have said. This is even more important the longer the
-      thread is already.
-
-   7. Please configure your email client to use a real name and keep message
-      signatures to a maximum of 2 lines if at all necessary.
-
-The next few rules are more some general hints:
-
-   1. If you notice that your posting ratio is much higher than that of other
-      people, double check the above rules. Try to wait a bit longer before
-      sending your replies to give other people more time to digest your answers
-      and more importantly give you the opportunity to make sure that you
-      aggregate your current position into a single mail instead of multiple
-      ones.
-
-   2. Consider taking a step back from a very active thread now and then. Maybe
-      talking to some friends and fellow developers will help in understanding
-      the other opinions better.
-
-   3. Do not top post. Place your answer underneath anyone you wish to quote
-      and remove any previous comment that is not relevant to your post.
-
-   4. Do not high-jack threads, by bringing up entirely new topics. Please
-      create an entirely new thread copying anything you wish to quote into the
-      new thread.
-
-Finally, additional hints on how to behave inside the virtual community can be
-found in RFC 1855 (http://www.faqs.org/rfcs/rfc1855.html).
-
-Happy hacking,
-
-PHP Team

README.PARAMETER_PARSING_API

@@ -31,39 +31,28 @@ resources cannot be auto-converted.
 
 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
- 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 
- instance of that class.
-
- a  - array (zval*)
- b  - boolean (zend_bool)
- C  - class (zend_class_entry*)
- d  - double (double)
- f  - function or array containing php method call info (returned as 
-      zend_fcall_info and zend_fcall_info_cache)
- h  - array (returned as HashTable*)
- l  - long (long)
- o  - object of any type (zval*)
- O  - object of specific type given by class entry (zval*, zend_class_entry)
- r  - resource (zval*)
- s  - string (with possible null bytes) and its length (char*, int)
- z  - the actual zval (zval*)
- Z  - the actual zval (zval**)
- *  - variable arguments list (0 or more)
- +  - variable arguments list (1 or more)
+ a	- array
+ b	- boolean, stored in zend_bool
+ d	- double
+ f	- function or array containing php method call info (returned as 
+	  zend_fcall_info* and zend_fcall_info_cache*)
+ h	- array (returned as HashTable*)
+ l	- long
+ o	- object (of any type)
+ O	- object (of specific type, specified by class entry)
+ r	- resource (stored in zval)
+ s	- string (with possible null bytes) and its length
+ z	- the actual zval
 
  The following characters also have a meaning in the specifier string:
-    | - indicates that the remaining parameters are optional, they
-        should be initialized to default values by the extension since they
-        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 (applies
-		to all specifiers except for 'b', 'l', and 'd'). If NULL is passed, the
-		results pointer is set to NULL as well.
+	| - indicates that the remaining parameters are optional, they
+	    should be initialized to default values by the extension since they
+	    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 (only applies
+		to 's', 'a', 'o', 'O', 'r', 'h', 'C', 'z', and 'Z'). If NULL is passed,
+	 	the results pointer is set to NULL as well.
 
 Examples
 --------
@@ -73,8 +62,8 @@ char *s;
 int s_len;
 zval *param;
 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lsz",
-                          &l, &s, &s_len, &param) == FAILURE) {
-    return;
+						  &l, &s, &s_len, &param) == FAILURE) {
+	return;
 }
 
 
@@ -83,8 +72,8 @@ zval *obj;
 double d = 0.5;
 zend_class_entry *my_ce;
 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|d",
-                          &obj, my_ce, &d) == FAILURE) {
-    return;
+						  &obj, my_ce, &d) == FAILURE) {
+	return;
 }
 
 
@@ -93,18 +82,29 @@ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|d",
 zval *obj;
 zval *arr;
 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o!a",
-                          &obj, &arr) == FAILURE) {
-    return;
+						  &obj, &arr) == FAILURE) {
+	return;
 }
 
 
 /* Gets a separated array which can also be null. */
 zval *arr;
 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!",
-                          &arr) == FAILURE) {
-    return;
+						  &arr) == FAILURE) {
+	return;
 }
 
+
+/* Get only the first three parameters (useful for varargs functions). */
+zval *z;
+zend_bool b;
+zval *r;
+if (zend_parse_parameters(3 TSRMLS_CC, "zbr!",
+						  &z, &b, &r) == FAILURE) {
+	return;
+}
+
+
 /* Get either a set of 3 longs or a string. */
 long l1, l2, l3;
 char *s;
@@ -118,72 +118,13 @@ char *s;
 int length;
 
 if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
-                             "lll", &l1, &l2, &l3) == SUCCESS) {
-    /* manipulate longs */
+							 "lll", &l1, &l2, &l3) == SUCCESS) {
+	/* manipulate longs */
 } else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
-                                    "s", &s, &length) == SUCCESS) {
-    /* manipulate string */
+									"s", &s, &length) == SUCCESS) {
+	/* manipulate string */
 } else {
-    /* output error */
+	/* output error */
 
-    return;
+	return;
 }
-
-
-/* Function that accepts only varargs (0 or more) */
-
-int i, num_varargs;
-zval ***varargs = NULL;
-
-
-if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "*", &varargs, &num_varargs) == FAILURE) {
-    return;
-}
-
-for (i = 0; i < num_varargs; i++) {
-    /* do something with varargs[i] */
-}
-
-if (varargs) {
-    efree(varargs);
-}
-
-
-/* Function that accepts a string, followed by varargs (1 or more) */
-
-char *str;
-int str_len;
-int i, num_varargs;
-zval ***varargs = NULL;
-
-if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s+", &str, &str_len, &varargs, &num_varargs) == FAILURE) {
-    return;
-}
-
-for (i = 0; i < num_varargs; i++) {
-    /* do something with varargs[i] */
-}
-
-if (varargs) {
-    efree(varargs);
-}
-
-
-/* Function that takes an array, followed by varargs, and ending with a long */
-long num;
-zval *array;
-int i, num_varargs;
-zval ***varargs = NULL;
-
-if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a*l", &array, &varargs, &num_varargs, &num) == FAILURE) {
-    return;
-}
-
-for (i = 0; i < num_varargs; i++) {
-    /* do something with varargs[i] */
-}
-
-if (varargs) {
-    efree(varargs);
-}
-

README.RELEASE_PROCESS

@@ -1,208 +0,0 @@
-=======================
-  PHP Release Process
-=======================
-
-Rolling a release candidate
----------------------------
-
-1. Check windows snapshot builder logs (http://snaps.php.net/win32/snapshot-STABLE.log f.e.)
-
-2. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
-
-3. Commit those changes
-
-4. tag the repository with "``cvs tag php_4_4_1RC1``" (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. 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 "4.4.1RC1" then the new one should be "4.4.1RC2-dev" - regardless
-if we get a new RC or not. This is to make sure ``version_compare()`` can
-correctly work.
-
-6. Commit those changes
-
-7. Log in onto the snaps box and go into the correct tree (f.e. the PHP_4_4
-branch if you're rolling 4.4.x releases).
-
-8. You do not have to update the tree, but ofcourse you can with "``cvs up -dP``".
-
-9. run: ``./makedist php 4.4.1RC1``, this will export the tree, create configure
-and build two tarballs (one gz and one bz2).
-
-10. Copy those two tarballs to www.php.net, in your homedir their 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.
-
-11. Now the RC can be found on http://downloads.php.net/yourname,
-f.e. http://downloads.php.net/derick/
-
-12. Once the release has been tagged, contact Edin Kadribasic (edink @ usual
-php e-mail) so that Windows binaries can be created. Once those are made, they
-should be placed into the same directory as the source snapshots.
-
-Getting the Release Candidate out there
----------------------------------------
-
-1. Send an email (see example here: http://news.php.net/php.internals/19486)
-**To** ``internals@lists.php.net`` and ``php-general@lists.php.net`` lists
-pointing out "the location of the release" and "the possible release date of
-either the next RC, or the final release".
-
-2. Send an email (see example here http://news.php.net/php.qa/26069) **To**
-``php-qa@lists.php.net`` and **CC** ``primary-qa-tester@lists.php.net``.
-This email is to notify the selected projects about a new RC so that they can
-make sure their projects keep working. Make sure that you have been setup
-as a moderator for ``primary-qa-tester@lists.php.net`` by having someone (Wez,
-Derick etc.) run the following commands for you:
-
-``ssh lists.php.net``
-
-``sudo -u ezmlm ezmlm-sub ~ezmlm/primary-qa-tester/mod moderator-email-address``
-
-3. Update the MD5 sums in ``qaweb/include/rc-md5sums.txt``.
-
-4. Update in ``qaweb/include/release-qa.php`` constants with the new RC and
-commit this.
-
- a. ``$BUILD_TEST_RELEASES`` = array("4.4.7RC1", "5.2.2RC1")
-
- b. ``$CURRENT_QA_RELEASE_4`` = "4.4.7RC1" (``$CURRENT_QA_RELEASE_5`` for PHP5)
-
- c. ``$RELEASE_PROCESS`` = array(4 => true, 5 => true)
-
-1. Update in ``php-bugs-web/include/functions.inc`` the ``show_version_option``
-function to include the new RC and commit.
-
-2. Run the bumpRelease script for phpweb
-
- a. ``php bin/bumpRelease 5`` (or ``php bin/bumpRelease 4`` for PHP4)
-
-3. Update ``phpweb/include/version.inc`` (x=major version number)
-
- a. ``$PHP_x_RC`` = "5.3.0RC1"
-
- b. ``$PHP_x_RC_DATE`` = "06 September 2007"
-
-4. Commit those changes:
-
- a. ``cvs commit include/version.inc include/releases.inc``
-
-Rolling a release
------------------
-
-1. Check windows snapshot builder logs (http://snaps.php.net/win32/snapshot-STABLE.log f.e.)
-
-2. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
-
-3. **Merge** all related sections in NEWS (f.e. merge the 4.4.1RC1 and 4.4.0 sections)
-
-4. Commit those changes
-
-5. tag the repository with "``cvs tag php_4_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!!
-
-6. 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 "4.4.1RC1" then the new one should be "4.4.1RC2-dev" - regardless if we get
-a new RC or not. This is to make sure ``version_compare()`` can correctly work.
-
-7. Commit those changes
-
-8. Log in onto the snaps box and go into the correct tree (f.e. the PHP_4_4
-branch if you're rolling 4.4.x releases).
-
-9. You do not have to update the tree, but ofcourse you can with "``cvs up -dP``".
-
-10. run: ``./makedist php 4.4.1``, this will export the tree, create configure
-and build two tarballs (one gz and one bz2).
-
-11. Commit those two tarballs to CVS (phpweb/distributions)
-
-12. Once the release has been tagged, contact Edin Kadribasic (edink @ usual
-php e-mail) so that Windows binaries can be created. Once those are made, they
-should be committed to CVS too.
-
-13. Check if the pear files are updated (phar for 5.1+ or run pear/make-pear-bundle.php with 4.4)
-
-14. When making a final release, also remind Edin to ask John to prepare the
-installer packages for Win32.
-
-Getting the Release out there
------------------------------
-
-1. Run the bumpRelease script for phpweb
-
- a. ``php bin/bumpRelease 5`` (or ``php bin/bumpRelease 4`` for PHP4)
-
-2. Edit ``phpweb/include/version.inc`` and change (X=major release number):
-
- a. ``$PHP_X_VERSION`` to the correct version
-
- b. ``$PHP_X_DATE`` to the release date
-
- c. ``$PHP_X_MD5`` array and update all the md5 sums
-
- d. set ``$PHP_X_RC`` to false!
-
- e. Make sure there are no outdated "notes" or edited "date" keys in the
- ``$RELEASES[X][$PHP_X_VERSION]["source"]`` array
-
- f. if the windows builds aren't ready yet prefix the "windows" key with a dot (".windows")
-
-3. Update the ChangeLog file ``ChangeLog-4.php`` from the NEWS file
-
- a. go over the list and put every element on one line
-
- b. check for &, < and > and escape them if necessary
-
- c. remove all the names at the ends of lines
-
- d. for marking up, you can do the following (with VI):
-
-  I. ``s/^- /<li>/``
-
-  II. ``s/$/<\/li>/``
-
-  III. ``s/Fixed bug #\([0-9]\+\)/<?php bugfix(\1); ?>/``
-
-4. ``cp releases/4_4_0.php releases/4_4_1.php``
-
-5. ``cvs add releases/4_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 behaviour (whether due to a bug fix or not)
-
-7. 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.
-
- a. php bin/createNewsEntry
-
-8. Commit all the changes, do not release on Fridays, Saturdays or Sundays
-because the sysadmins can not upgrade stuff then.
-
-9. Wait an hour or two, then send a mail to php-announce@lists.php.net,
-php-general@lists.php.net and internals@lists.php.net with a text similar to
-http://news.php.net/php.internals/17222.
-
-10. Update ``php-bugs-web/include/functions.php`` to include the new version
-number, and remove the RC from there.
-
-11. Update ``qaweb/include/release-qa.php``
-
- a. Update the $BUILD_TEST_RELEASES array with the release name
-
- b. Update $RELEASE_PROCESS array (set to false)
-
-  I. For PHP4: Set $CURRENT_QA_RELEASE_4 to false
-
-  II. For PHP5: Set $CURRENT_QA_RELEASE_5 to false
-
-12. Rebuild the English and Japanese docs (ask Derick)

README.TESTING2

@@ -1,11 +1,11 @@
 [IMPORTANT NOTICE]
 ------------------
 This is an addendum to README.TESTING with additional information 
-specific to run-tests2.php.
+specific to server-tests.php.
 
-run-tests2.php is backward compatible with tests developed for
-the original run-tests.php script.  run-tests2 is *not* used by
-'make test'.  run-tests2 was developed to provide support for
+server-tests.php is backward compatible with tests developed for
+the original run-tests.php script.  server-tests is *not* used by
+'make test'.  server-tests was developed to provide support for
 testing PHP under it's primary environment, HTTP, and can run the
 PHP tests under any of the SAPI modules that are direct executables, 
 or are accessable via HTTP.
@@ -13,12 +13,12 @@ or are accessable via HTTP.
 [New features]
 ----------------
 * Command line interface:
-  You can run 'php run-tests2.php -h' to get all the possible options.
+  You can run 'php server-tests.php -h' to get all the possible options.
 * Configuration file:
   the -c argument will allow you to use a configuration file.  This is
   handy if you are testing multiple environments and need various options
   depending on the environment.
-  see run-tests-config.php for details.
+  see server-tests-config.php for details.
 * CGI Emulation:
   Will emulate a CGI environment when testing with the cgi sapi executable.
 * HTTP testing:
@@ -39,23 +39,23 @@ make testing work.
 Some (but not all!) examples of usage:
 
 1. run tests from the php source directory
-    php run-tests2.php -p /path/to/php-cli
+    php server-tests.php -p /path/to/php-cli
 
 2. run tests using cgi emulation
-    php run-tests2.php -p /path/to/php-cgi
+    php server-tests.php -p /path/to/php-cgi
 
 3. run tests over http, copying test files into document root
-    php run-tests2.php -w -u http://localhost/test -m /path/to/htdocs/test
+    php server-tests.php -w -u http://localhost/test -m /path/to/htdocs/test
 
 4. run tests over http, php sources have been aliased in web server
-    php run-tests2.php -w -u http://localhost/test
+    php server-tests.php -w -u http://localhost/test
     
 5. run tests using configuration file
-    php run-tests2.php -c /path/to/run-tests-config.php
+    php server-tests.php -c /path/to/server-tests-config.php
 
 6. run tests using configuration file, but overriding some settings:
    (config file must be first)
-    php run-tests2.php -c /path/to/run-tests-config.php -w -t 3 -d /path/to/testdir
+    php server-tests.php -c /path/to/server-tests-config.php -w -t 3 -d /path/to/testdir
 
 NOTE: configuration as described in README.TESTING still works.
 
@@ -63,7 +63,7 @@ NOTE: configuration as described in README.TESTING still works.
 ----------------
 In addition to the traditional test sections 
 (see http://qa.php.net/write-test.php), several new sections are available 
-under run-tests2.
+under server-tests.
 
 --POST--
 This is not a new section, but not multipart posts are supported for testing
@@ -97,7 +97,7 @@ include:
   $scriptname   this is what will become SCRIPT_NAME unless you override it
   $docroot      the equivelant of DOCUMENT_ROOT under Apache
   $cwd          the directory that the test is being initiated from
-  $this->conf   all run-tests2 configuration vars
+  $this->conf   all server-tests configuration vars
   $this->env    all environment variables that will get passed to the test
 
 

README.UPDATE_5_2

@@ -172,6 +172,21 @@ Items from the NEWS file explained
   from your error handler in order to populate $php_errormsg. This allows
   you to fine-grain the levels of the messages stored.
 
+==============================
+Regressions introduced/fixed
+==============================
+
+- In version 5.2.4 a security fix caused a regression for patterns of
+  the form "/foo/*/bar/*". Since version 5.2.5 instead of raising a warning the
+  glob() function will return false when openbase_dir restrictions are violated.
+
+  #See http://bugs.php.net/bug.php?id=41655
+
+  The warning that used to be raised looked like something as follows:
+  Warning: glob() [function.glob]: Unable to access /foo/*/bar/* in /foo.php on line xxx
+  #See http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.169&r2=1.170
+
+  The patch can safely be applied to PHP 5.2.4 as well.
 
 ==============================
 Backwards incompatible changes

README.namespaces

@@ -1,174 +0,0 @@
-Design
-======
-
-Main assumption of the model is that the problem that we are to solve is the
-problem of the very long class names in PHP libraries. We would not attempt
-to take autoloader's job or create packaging model - only make names
-manageable.
-
-Namespaces are defined the following way:
-
-Zend/DB/Connection.php:
-<?php
-namespace Zend::DB;
-
-class Connection {
-}
-
-function connect() {
-}
-?>
-
-Namespace definition does the following:
-All class and function names inside are automatically prefixed with
-namespace name. Inside namespace, local name always takes precedence over
-global name. Several files may be using the same namespace.
-The namespace declaration statement must be the very first statement in
-the file. The only exception is "declare" statement that can be used before.
-
-Every class and function in a namespace can be referred to by the full name
-- e.g. Zend::DB::Connection or Zend::DB::connect - at any time.
-
-<?php
-require 'Zend/Db/Connection.php';
-$x = new Zend::DB::Connection;
-Zend::DB::connect();
-?>
-
-Namespace or class name can be imported:
-
-<?php
-require 'Zend/Db/Connection.php';
-use Zend::DB;
-use Zend::DB::Connection as DbConnection;
-
-$x = new Zend::DB::Connection();
-$y = new DB::connection();
-$z = new DbConnection();
-DB::connect();
-?>
-
-The use statement only defines name aliasing. It may create name alias for
-namespace or class. The simple form of statement "use A::B::C::D;" is
-equivalent to "use A::B::C::D as D;". The use statement can be used at any
-time in the global scope (not inside function/class) and takes effect from 
-the point of definition down to the end of file. It is recommended however to
-place the use statements at the beginning of the file. The use statements have
-effect only on the file where they appear.
-
-The special "empty" namespace (:: prefix) is useful as explicit global
-namespace qualification. All class and function names started from ::
-interpreted as global.
-
-<?php 
-namespace A::B::C;
-
-$con = ::mysql_connect(...);
-?>
-
-A special constant __NAMESPACE__ contains the name of the current namespace. 
-It can be used to construct fully-qualified names to pass them as callbacks.
-
-<?php
-namespace A::B::C;
-
-function foo() {
-}
-
-set_error_handler(__NAMESPACE__ . "::foo");
-?>
-
-In global namespace __NAMESPACE__ constant has the value of empty string.
-
-Names inside namespace are resolved according to the following rules:
-
-1) all qualified names are translated during compilation according to
-current import rules. So if we have "use A::B::C" and then "C::D::e()"
-it is translated to "A::B::C::D::e()".
-2) unqualified class names translated during compilation according to
-current import rules. So if we have "use A::B::C" and then "new C()" it
-is translated to "new A::B::C()".
-3) inside namespace, calls to unqualified functions that are defined in 
-current namespace (and are known at the time the call is parsed) are 
-interpreted as calls to these namespace functions.
-4) inside namespace, calls to unqualified functions that are not defined 
-in current namespace are resolved at run-time. The call to function foo() 
-inside namespace (A::B) first tries to find and call function from current 
-namespace A::B::foo() and if it doesn't exist PHP tries to call internal
-function foo(). Note that using foo() inside namespace you can call only 
-internal PHP functions, however using ::foo() you are able to call any
-function from the global namespace.
-5) unqualified class names are resolved at run-time. E.q. "new Exception()"
-first tries to use (and autoload) class from current namespace and in case 
-of failure uses internal PHP class. Note that using "new A" in namespace 
-you can only create class from this namespace or internal PHP class, however
-using "new ::A" you are able to create any class from the global namespace.
-6) Calls to qualified functions are resolved at run-time. Call to
-A::B::foo() first tries to call function foo() from namespace A::B, then
-it tries to find class A::B (__autoload() it if necessary) and call its
-static method foo()
-7) qualified class names are interpreted as class from corresponding
-namespace. So "new A::B::C()" refers to class C from namespace A::B.
-
-Examples
---------
-<?php
-namespace A;
-foo();   // first tries to call "foo" defined in namespace "A"
-         // then calls internal function "foo"
-::foo(); // calls function "foo" defined in global scope
-?>
-
-<?php
-namespace A;
-new B();   // first tries to create object of class "B" defined in namespace "A"
-           // then creates object of internal class "B"
-new ::B(); // creates object of class "B" defined in global scope
-?>
-
-<?php
-namespace A;
-new A(); // first tries to create object of class "A" from namespace "A" (A::A)
-         // then creates object of internal class "A"
-?>
-
-<?php
-namespace A;
-B::foo();   // first tries to call function "foo" from namespace "A::B"
-            // then calls method "foo" of internal class "B"
-::B::foo(); // first tries to call function "foo" from namespace "B"
-            // then calls method "foo" of class "B" from global scope
-?>
-
-The worst case if class name conflicts with namespace name
-<?php
-namespace A;
-A::foo();   // first tries to call function "foo" from namespace "A::A"
-            // then tries to call method "foo" of class "A" from namespace "A"
-            // then tries to call function "foo" from namespace "A"
-            // then calls method "foo" of internal class "A"
-::A::foo(); // first tries to call function "foo" from namespace "A"
-            // then calls method "foo" of class "A" from global scope
-?>
-
-TODO
-====
-
-* Support for namespace constants?
-
-* performance problems
-  - calls to internal functions in namespaces are slower, because PHP first
-    looks for such function in current namespace
-  - calls to static methods are slower, because PHP first tries to look
-    for corresponding function in namespace
-
-* Extend the Reflection API?
-  * Add ReflectionNamespace class
-    + getName()
-    + getClasses()
-    + getFunctions()
-    + getFiles()
-  * Add getNamespace() methods to ReflectionClass and ReflectionFunction
-
-* Rename namespaces to packages?
-

TSRM/TSRM.c

@@ -647,26 +647,19 @@ TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
 }
 
 
-/*
-  Lock a mutex.
-  A return value of 0 indicates success
-*/
+/* Lock a mutex */
 TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
 {
 	TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Mutex locked thread: %ld", tsrm_thread_id()));
 #ifdef TSRM_WIN32
 	EnterCriticalSection(mutexp);
-	return 0;
+	return 1;
 #elif defined(GNUPTH)
-	if (pth_mutex_acquire(mutexp, 0, NULL)) {
-		return 0;
-	}
-	return -1;
+	return pth_mutex_acquire(mutexp, 0, NULL);
 #elif defined(PTHREADS)
 	return pthread_mutex_lock(mutexp);
 #elif defined(NSAPI)
-	crit_enter(mutexp);
-	return 0;
+	return crit_enter(mutexp);
 #elif defined(PI3WEB)
 	return PISync_lock(mutexp);
 #elif defined(TSRM_ST)
@@ -679,26 +672,19 @@ TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
 }
 
 
-/*
-  Unlock a mutex.
-  A return value of 0 indicates success
-*/
+/* Unlock a mutex */
 TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
 {
 	TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Mutex unlocked thread: %ld", tsrm_thread_id()));
 #ifdef TSRM_WIN32
 	LeaveCriticalSection(mutexp);
-	return 0;
+	return 1;
 #elif defined(GNUPTH)
-	if (pth_mutex_release(mutexp)) {
-		return 0;
-	}
-	return -1;
+	return pth_mutex_release(mutexp);
 #elif defined(PTHREADS)
 	return pthread_mutex_unlock(mutexp);
 #elif defined(NSAPI)
-	crit_exit(mutexp);
-	return 0;
+	return crit_exit(mutexp);
 #elif defined(PI3WEB)
 	return PISync_unlock(mutexp);
 #elif defined(TSRM_ST)

TSRM/TSRM.h

@@ -22,12 +22,10 @@
 
 #ifdef TSRM_WIN32
 #	ifdef TSRM_EXPORTS
-#		define TSRM_API __declspec(dllexport)
+#	define TSRM_API __declspec(dllexport)
 #	else
-#		define TSRM_API __declspec(dllimport)
+#	define TSRM_API __declspec(dllimport)
 #	endif
-#elif defined(__GNUC__) && __GNUC__ >= 4
-#	define TSRM_API __attribute__ ((visibility("default")))
 #else
 #	define TSRM_API
 #endif

TSRM/readdir.h

@@ -7,6 +7,8 @@
  * on Windows 95/NT.
  */
 
+#define _WIN32_WINNT 0x0400
+
 #include <windows.h>
 
 #include <io.h>

TSRM/tsrm_config.w32.h

@@ -1,8 +1,6 @@
 #ifndef TSRM_CONFIG_W32_H
 #define TSRM_CONFIG_W32_H
 
-#include <../main/config.w32.h>
-
 #define HAVE_UTIME 1
 #define HAVE_ALLOCA 1
 #define HAVE_REALPATH 1

TSRM/tsrm_config_common.h

@@ -52,19 +52,11 @@ char *alloca ();
 #endif
 
 #if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2))
-# define TSRM_ALLOCA_MAX_SIZE 4096
-# define TSRM_ALLOCA_FLAG(name) \
-	int name;
-# define tsrm_do_alloca_ex(size, limit, use_heap) \
-	((use_heap = ((size) > (limit))) ? malloc(size) : alloca(size))
-# define tsrm_do_alloca(size, use_heap) \
-	tsrm_do_alloca_ex(size, TSRM_ALLOCA_MAX_SIZE, use_heap)
-# define tsrm_free_alloca(p, use_heap) \
-	do { if (use_heap) free(p); } while (0)
+# define tsrm_do_alloca(p) alloca(p)
+# define tsrm_free_alloca(p)
 #else
-# define TSRM_ALLOCA_FLAG(name)
-# define tsrm_do_alloca(p, use_heap)	malloc(p)
-# define tsrm_free_alloca(p, use_heap)	free(p)
+# define tsrm_do_alloca(p)   malloc(p)
+# define tsrm_free_alloca(p) free(p)
 #endif
 
 #endif /* TSRM_CONFIG_COMMON_H */

TSRM/tsrm_virtual_cwd.c

@@ -717,7 +717,6 @@ no_realpath:
 			}
 			ptr = tsrm_strtok_r(NULL, TOKENIZER_STRING, &tok);
 		}
-
 		free(free_path);
 
 		if (use_realpath == CWD_REALPATH) {
@@ -782,7 +781,6 @@ CWD_API int virtual_chdir_file(const char *path, int (*p_chdir)(const char *path
 	int length = strlen(path);
 	char *temp;
 	int retval;
-	TSRM_ALLOCA_FLAG(use_heap)
 
 	if (length == 0) {
 		return 1; /* Can't cd to empty string */
@@ -799,14 +797,14 @@ CWD_API int virtual_chdir_file(const char *path, int (*p_chdir)(const char *path
 	if (length == COPY_WHEN_ABSOLUTE(path) && IS_ABSOLUTE_PATH(path, length+1)) { /* Also use trailing slash if this is absolute */
 		length++;
 	}
-	temp = (char *) tsrm_do_alloca(length+1, use_heap);
+	temp = (char *) tsrm_do_alloca(length+1);
 	memcpy(temp, path, length);
 	temp[length] = 0;
 #if VIRTUAL_CWD_DEBUG
 	fprintf (stderr, "Changing directory to %s\n", temp);
 #endif
 	retval = p_chdir(temp TSRMLS_CC);
-	tsrm_free_alloca(temp, use_heap);
+	tsrm_free_alloca(temp);
 	return retval;
 }
 /* }}} */
@@ -1047,14 +1045,8 @@ CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC) /* {{{ */
 		return -1;
 	}
 	newname = new_state.cwd;
-
-	/* rename on windows will fail if newname already exists.
-	   MoveFileEx has to be used */
-#ifdef TSRM_WIN32
-	retval = (MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING) == 0) ? -1 : 0;
-#else
+ 
 	retval = rename(oldname, newname);
-#endif
 
 	CWD_STATE_FREE(&old_state);
 	CWD_STATE_FREE(&new_state);

TSRM/tsrm_virtual_cwd.h

@@ -117,15 +117,13 @@ typedef unsigned short mode_t;
 #endif
 
 #ifdef TSRM_WIN32
-#	ifdef CWD_EXPORTS
-#		define CWD_API __declspec(dllexport)
-#	else
-#		define CWD_API __declspec(dllimport)
-#	endif
-#elif defined(__GNUC__) && __GNUC__ >= 4
-#	define CWD_API __attribute__ ((visibility("default")))
+#       ifdef CWD_EXPORTS
+#       define CWD_API __declspec(dllexport)
+#       else
+#       define CWD_API __declspec(dllimport)
+#       endif
 #else
-#	define CWD_API
+#define CWD_API
 #endif
 
 #ifdef TSRM_WIN32
@@ -251,7 +249,7 @@ CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC);
 #define VCWD_RENAME(oldname, newname) virtual_rename(oldname, newname TSRMLS_CC)
 #define VCWD_STAT(path, buff) virtual_stat(path, buff TSRMLS_CC)
 #if !defined(TSRM_WIN32)
-# define VCWD_LSTAT(path, buff) virtual_lstat(path, buff TSRMLS_CC)
+#define VCWD_LSTAT(path, buff) virtual_lstat(path, buff TSRMLS_CC)
 #endif
 #define VCWD_UNLINK(path) virtual_unlink(path TSRMLS_CC)
 #define VCWD_MKDIR(pathname, mode) virtual_mkdir(pathname, mode TSRMLS_CC)
@@ -277,13 +275,7 @@ CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC);
 #define VCWD_OPEN(path, flags) open(path, flags)
 #define VCWD_OPEN_MODE(path, flags, mode)	open(path, flags, mode)
 #define VCWD_CREAT(path, mode) creat(path, mode)
-/* rename on windows will fail if newname already exists.
-   MoveFileEx has to be used */
-#if defined(TSRM_WIN32)
-# define VCWD_RENAME(oldname, newname) (MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING) == 0 ? -1 : 0)
-#else
-# define VCWD_RENAME(oldname, newname) rename(oldname, newname)
-#endif
+#define VCWD_RENAME(oldname, newname) rename(oldname, newname)
 #define VCWD_CHDIR(path) chdir(path)
 #define VCWD_CHDIR_FILE(path) virtual_chdir_file(path, chdir)
 #define VCWD_GETWD(buf) getwd(buf)

TSRM/tsrm_win32.c

@@ -217,8 +217,8 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 		startup.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
 	}
 
-	cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c ")+2);
-	sprintf(cmd, "%s /c \"%s\"", TWG(comspec), command);
+	cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c "));
+	sprintf(cmd, "%s /c %s", TWG(comspec), command);
 	if (!CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, NORMAL_PRIORITY_CLASS|CREATE_NO_WINDOW, env, cwd, &startup, &process)) {
 		return NULL;
 	}

Zend/FlexLexer.h

@@ -0,0 +1,186 @@
+// $Header$
+
+// FlexLexer.h -- define interfaces for lexical analyzer classes generated
+//		  by flex
+
+// Copyright (c) 1993 The Regents of the University of California.
+// All rights reserved.
+//
+// This code is derived from software contributed to Berkeley by
+// Kent Williams and Tom Epperly.
+//
+// Redistribution and use in source and binary forms with or without
+// modification are permitted provided that: (1) source distributions retain
+// this entire copyright notice and comment, and (2) distributions including
+// binaries display the following acknowledgement:  ``This product includes
+// software developed by the University of California, Berkeley and its
+// contributors'' in the documentation or other materials provided with the
+// distribution and in all advertising materials mentioning features or use
+// of this software.  Neither the name of the University nor the names of
+// its contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+
+// THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+// This file defines FlexLexer, an abstract class which specifies the
+// external interface provided to flex C++ lexer objects, and yyFlexLexer,
+// which defines a particular lexer class.
+//
+// If you want to create multiple lexer classes, you use the -P flag
+// to rename each yyFlexLexer to some other xxFlexLexer.  You then
+// include <FlexLexer.h> in your other sources once per lexer class:
+//
+//	#undef yyFlexLexer
+//	#define yyFlexLexer xxFlexLexer
+//	#include <FlexLexer.h>
+//
+//	#undef yyFlexLexer
+//	#define yyFlexLexer zzFlexLexer
+//	#include <FlexLexer.h>
+//	...
+
+#ifndef FLEXLEXER_H
+// Never included before - need to define base class.
+#define FLEXLEXER_H
+#include <iostream.h>
+
+extern "C++" {
+
+struct yy_buffer_state;
+typedef int yy_state_type;
+
+class FlexLexer {
+public:
+	virtual ~FlexLexer()	{ }
+
+	const char* YYText()	{ return yytext; }
+	int YYLeng()		{ return yyleng; }
+
+	virtual void
+		yy_switch_to_buffer( struct yy_buffer_state* new_buffer ) = 0;
+	virtual struct yy_buffer_state*
+		yy_create_buffer( istream* s, int size ) = 0;
+	virtual void yy_delete_buffer( struct yy_buffer_state* b ) = 0;
+	virtual void yyrestart( istream* s ) = 0;
+
+	virtual int yylex() = 0;
+
+	// Call yylex with new input/output sources.
+	int yylex( istream* new_in, ostream* new_out = 0 )
+		{
+		switch_streams( new_in, new_out );
+		return yylex();
+		}
+
+	// Switch to new input/output streams.  A nil stream pointer
+	// indicates "keep the current one".
+	virtual void switch_streams( istream* new_in = 0,
+					ostream* new_out = 0 ) = 0;
+
+	int lineno() const		{ return yylineno; }
+
+	int debug() const		{ return yy_flex_debug; }
+	void set_debug( int flag )	{ yy_flex_debug = flag; }
+
+protected:
+	char* yytext;
+	int yyleng;
+	int yylineno;		// only maintained if you use %option yylineno
+	int yy_flex_debug;	// only has effect with -d or "%option debug"
+};
+
+}
+#endif
+
+#if defined(yyFlexLexer) || ! defined(yyFlexLexerOnce)
+// Either this is the first time through (yyFlexLexerOnce not defined),
+// or this is a repeated include to define a different flavor of
+// yyFlexLexer, as discussed in the flex man page.
+#define yyFlexLexerOnce
+
+class yyFlexLexer : public FlexLexer {
+public:
+	// arg_yyin and arg_yyout default to the cin and cout, but we
+	// only make that assignment when initializing in yylex().
+	yyFlexLexer( istream* arg_yyin = 0, ostream* arg_yyout = 0 );
+
+	virtual ~yyFlexLexer();
+
+	void yy_switch_to_buffer( struct yy_buffer_state* new_buffer );
+	struct yy_buffer_state* yy_create_buffer( istream* s, int size );
+	void yy_delete_buffer( struct yy_buffer_state* b );
+	void yyrestart( istream* s );
+
+	virtual int yylex();
+	virtual void switch_streams( istream* new_in, ostream* new_out );
+
+protected:
+	virtual int LexerInput( char* buf, int max_size );
+	virtual void LexerOutput( const char* buf, int size );
+	virtual void LexerError( const char* msg );
+
+	void yyunput( int c, char* buf_ptr );
+	int yyinput();
+
+	void yy_load_buffer_state();
+	void yy_init_buffer( struct yy_buffer_state* b, istream* s );
+	void yy_flush_buffer( struct yy_buffer_state* b );
+
+	int yy_start_stack_ptr;
+	int yy_start_stack_depth;
+	int* yy_start_stack;
+
+	void yy_push_state( int new_state );
+	void yy_pop_state();
+	int yy_top_state();
+
+	yy_state_type yy_get_previous_state();
+	yy_state_type yy_try_NUL_trans( yy_state_type current_state );
+	int yy_get_next_buffer();
+
+	istream* yyin;	// input source for default LexerInput
+	ostream* yyout;	// output sink for default LexerOutput
+
+	struct yy_buffer_state* yy_current_buffer;
+
+	// yy_hold_char holds the character lost when yytext is formed.
+	char yy_hold_char;
+
+	// Number of characters read into yy_ch_buf.
+	int yy_n_chars;
+
+	// Points to current character in buffer.
+	char* yy_c_buf_p;
+
+	int yy_init;		// whether we need to initialize
+	int yy_start;		// start state number
+
+	// Flag which is used to allow yywrap()'s to do buffer switches
+	// instead of setting up a fresh yyin.  A bit of a hack ...
+	int yy_did_buffer_switch_on_eof;
+
+	// The following are not always needed, but may be depending
+	// on use of certain flex features (like REJECT or yymore()).
+
+	yy_state_type yy_last_accepting_state;
+	char* yy_last_accepting_cpos;
+
+	yy_state_type* yy_state_buf;
+	yy_state_type* yy_state_ptr;
+
+	char* yy_full_match;
+	int* yy_full_state;
+	int yy_full_lp;
+
+	int yy_lp;
+	int yy_looking_for_trail_begin;
+
+	int yy_more_flag;
+	int yy_more_len;
+	int yy_more_offset;
+	int yy_prev_more_offset;
+};
+
+#endif

Zend/Makefile.am

@@ -17,7 +17,7 @@ libZend_la_SOURCES=\
 	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_strtod.c zend_multibyte.c
 
 libZend_la_LDFLAGS =
 libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
@@ -31,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) --case-inverted -cbdFt $(srcdir)/zend_language_scanner_defs.h -o$@ $(srcdir)/zend_language_scanner.l
+	$(LEX) -Pzend -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_language_scanner.l
 
 zend_language_parser.h: zend_language_parser.c
 zend_language_parser.c: $(srcdir)/zend_language_parser.y
@@ -43,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) --case-inverted -cbdFt $(srcdir)/zend_ini_scanner_defs.h -o$@ $(srcdir)/zend_ini_scanner.l
+	$(LEX) -Pini_ -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_ini_scanner.l
 
 zend_ini_parser.h: zend_ini_parser.c
 

Zend/Zend.dsp

@@ -123,10 +123,6 @@ SOURCE=.\zend_builtin_functions.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_closures.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_compile.c
 # End Source File
 # Begin Source File

Zend/Zend.m4

@@ -31,6 +31,7 @@ AC_DEFUN([LIBZEND_BASIC_CHECKS],[
 AC_REQUIRE([AC_PROG_YACC])
 AC_REQUIRE([AC_PROG_CC])
 AC_REQUIRE([AC_PROG_CC_C_O])
+AC_REQUIRE([AC_PROG_LEX])
 AC_REQUIRE([AC_HEADER_STDC])
 
 LIBZEND_BISON_CHECK
@@ -60,20 +61,9 @@ sys/time.h \
 signal.h \
 unix.h \
 stdlib.h \
+mach-o/dyld.h \
 dlfcn.h)
 
-dnl Don't use mach-o/dyld.h on Darwin 8+, dl* is recommended by Apple from there on
-dnl See http://developer.apple.com/documentation/DeveloperTools/Conceptual/MachOTopics/Articles/loading_code.html
-case $host_alias in
-*darwin[[89]]*)
-    ;;
-*)
-    AC_CHECK_HEADERS([  \
-mach-o/dyld.h
-],[],[][])
-    ;;
-esac
-
 AC_TYPE_SIZE_T
 AC_TYPE_SIGNAL
 
@@ -109,7 +99,7 @@ dnl Checks for library functions.
 AC_FUNC_VPRINTF
 AC_FUNC_MEMCMP
 AC_FUNC_ALLOCA
-AC_CHECK_FUNCS(memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp)
+AC_CHECK_FUNCS(memcpy strdup getpid kill strtod strtol finite fpclass)
 AC_ZEND_BROKEN_SPRINTF
 
 AC_CHECK_FUNCS(finite isfinite isinf isnan)
@@ -175,7 +165,7 @@ AC_MSG_RESULT($ZEND_DEBUG)
 
 AC_MSG_CHECKING(whether to enable Zend multibyte)
 AC_MSG_RESULT($ZEND_MULTIBYTE)
-
+	
 case $PHP_ZEND_VM in
   SWITCH)
     AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_SWITCH,[virtual machine dispatch method])

Zend/ZendTS.dsp

@@ -148,10 +148,6 @@ SOURCE=.\zend_builtin_functions.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_closures.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_compile.c
 # End Source File
 # Begin Source File

Zend/acconfig.h

@@ -19,14 +19,8 @@
 
 /* $Id$ */
 
-#if defined(__GNUC__) && __GNUC__ >= 4
-# define ZEND_API __attribute__ ((visibility("default")))
-# define ZEND_DLEXPORT __attribute__ ((visibility("default")))
-#else
-# define ZEND_API
-# define ZEND_DLEXPORT
-#endif
-
+#define ZEND_API
+#define ZEND_DLEXPORT
 #define ZEND_DLIMPORT
 
 @TOP@

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="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3"
+  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4"
 
   # for standalone build of Zend Engine
   test -z "$SED" && SED=sed

Zend/bench.php

@@ -1,7 +1,5 @@
 <?php
-if (function_exists("date_default_timezone_set")) {
-	date_default_timezone_set("UTC");
-}
+date_default_timezone_set("UTC");
 
 function simple() {
   $a = 0;

Zend/configure.in

@@ -7,6 +7,7 @@ AM_CONFIG_HEADER(zend_config.h)
 AM_SANITY_CHECK
 AM_MAINTAINER_MODE
 AC_PROG_CC
+AM_PROG_LEX
 AM_PROG_CC_STDC
 ZEND_VERSION=$VERSION
 AC_ZEND_C_BIGENDIAN

Zend/tests/004.phpt

@@ -13,7 +13,7 @@ var_dump(strncmp("qwerty", "qwerty123", 7));
 echo "Done\n";
 ?>
 --EXPECTF--	
-Warning: strncmp() expects exactly 3 parameters, 2 given in %s on line %d
+Warning: Wrong parameter count for strncmp() in %s on line %d
 NULL
 int(0)
 

Zend/tests/005.phpt

@@ -15,7 +15,7 @@ var_dump(strcasecmp("01", "01"));
 echo "Done\n";
 ?>
 --EXPECTF--	
-Warning: strcasecmp() expects exactly 2 parameters, 1 given in %s on line %d
+Warning: Wrong parameter count for strcasecmp() in %s on line %d
 NULL
 int(0)
 int(-3)

Zend/tests/006.phpt

@@ -16,7 +16,7 @@ var_dump(strncasecmp("01", "01", 1000));
 echo "Done\n";
 ?>
 --EXPECTF--	
-Warning: strncasecmp() expects exactly 3 parameters, 1 given in %s on line %d
+Warning: Wrong parameter count for strncasecmp() in %s on line %d
 NULL
 
 Warning: Length must be greater than or equal to 0 in %s on line %d

Zend/tests/007.phpt

@@ -22,7 +22,7 @@ var_dump(each($a));
 echo "Done\n";
 ?>
 --EXPECTF--	
-Warning: each() expects exactly 1 parameter, 0 given in %s on line %d
+Warning: Wrong parameter count for each() in %s on line %d
 NULL
 
 Warning: Variable passed to each() is not an array or object in %s on line %d

Zend/tests/009.phpt

@@ -40,9 +40,7 @@ string(3) "foo"
 
 Warning: get_class() called without object from outside a class in %s on line %d
 bool(false)
-
-Warning: get_class() expects parameter 1 to be object, string given in %s on line %d
-NULL
+bool(false)
 string(3) "foo"
 string(4) "foo2"
 Done

Zend/tests/011.phpt

@@ -53,10 +53,10 @@ $bar->test();
 echo "Done\n";
 ?>
 --EXPECTF--	
-Warning: property_exists() expects exactly 2 parameters, 0 given in %s on line %d
+Warning: Wrong parameter count for property_exists() in %s on line %d
 NULL
 
-Warning: property_exists() expects exactly 2 parameters, 1 given in %s on line %d
+Warning: Wrong parameter count for property_exists() in %s on line %d
 NULL
 bool(true)
 bool(false)

Zend/tests/014.phpt

@@ -32,7 +32,7 @@ array(2) {
   string(%d) "%s"
 }
 
-Warning: get_included_files() expects exactly 0 parameters, 2 given in %s on line %d
+Warning: Wrong parameter count for get_included_files() in %s on line %d
 NULL
 array(2) {
   [0]=>
@@ -41,7 +41,7 @@ array(2) {
   string(%d) "%s"
 }
 
-Warning: get_included_files() expects exactly 0 parameters, 1 given in %s on line %d
+Warning: Wrong parameter count for get_included_files() in %s on line %d
 NULL
 array(2) {
   [0]=>

Zend/tests/015.phpt

@@ -9,19 +9,20 @@ var_dump(trigger_error(array()));
 var_dump(trigger_error("error", -1));
 var_dump(trigger_error("error", 0));
 var_dump(trigger_error("error", E_USER_WARNING));
-var_dump(trigger_error("error", E_USER_DEPRECATED));
 
 echo "Done\n";
 ?>
 --EXPECTF--	
-Warning: trigger_error() expects at least 1 parameter, 0 given in %s on line %d
+Warning: Wrong parameter count for trigger_error() in %s on line %d
 NULL
 
 Notice: error in %s on line %d
 bool(true)
 
-Warning: trigger_error() expects parameter 1 to be string, array given in %s on line %d
-NULL
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array in %s on line %d
+bool(true)
 
 Warning: Invalid error type specified in %s on line %d
 bool(false)
@@ -31,7 +32,4 @@ bool(false)
 
 Warning: error in %s on line %d
 bool(true)
-
-Deprecated: error in %s on line %d
-bool(true)
 Done

Zend/tests/017.phpt

@@ -45,11 +45,11 @@ var_dump(count(get_extension_funcs("zend")));
 echo "Done\n";
 ?>
 --EXPECTF--	
-Warning: get_resource_type() expects exactly 1 parameter, 0 given in %s on line %d
+Warning: Wrong parameter count for get_resource_type() in %s on line %d
 NULL
 
-Warning: get_resource_type() expects parameter 1 to be resource, string given in %s on line %d
-NULL
+Warning: Supplied argument is not a valid resource handle in %s on line %d
+bool(false)
 string(6) "stream"
 string(7) "Unknown"
 string(5) "array"
@@ -66,17 +66,17 @@ string(5) "array"
 string(5) "array"
 int(%d)
 
-Warning: get_defined_functions() expects exactly 0 parameters, 1 given in %s on line %d
+Warning: Wrong parameter count for get_defined_functions() in %s on line %d
 NULL
 string(5) "array"
 int(%d)
 
-Warning: get_declared_interfaces() expects exactly 0 parameters, 1 given in %s on line %d
+Warning: Wrong parameter count for get_declared_interfaces() in %s on line %d
 NULL
 string(5) "array"
 int(%d)
 
-Warning: get_extension_funcs() expects exactly 1 parameter, 0 given in %s on line %d
+Warning: Wrong parameter count for get_extension_funcs() in %s on line %d
 NULL
 bool(false)
 string(5) "array"

Zend/tests/018.phpt

@@ -18,16 +18,18 @@ var_dump(constant("TEST_CONST2"));
 echo "Done\n";
 ?>
 --EXPECTF--	
-Warning: constant() expects exactly 1 parameter, 0 given in %s on line %d
+Warning: Wrong parameter count for constant() in %s on line %d
 NULL
 
-Warning: constant() expects exactly 1 parameter, 2 given in %s on line %d
+Warning: Wrong parameter count for constant() in %s on line %d
 NULL
 
 Warning: constant(): Couldn't find constant  in %s on line %d
 NULL
 
-Warning: constant() expects parameter 1 to be string, array given in %s on line %d
+Notice: Array to string conversion in %s on line %d
+
+Warning: constant(): Couldn't find constant Array in %s on line %d
 NULL
 int(1)
 string(4) "test"

Zend/tests/020.phpt

@@ -20,14 +20,11 @@ foo(1,2);
 echo "Done\n";
 ?>
 --EXPECTF--	
-Warning: func_get_arg() expects exactly 1 parameter, 3 given in %s on line %d
-NULL
+bool(false)
 
 Warning: func_get_arg():  Called from the global scope - no function context in %s on line %d
 bool(false)
-
-Warning: func_get_arg() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
+bool(false)
 
 Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
 bool(false)

Zend/tests/021.phpt

@@ -1,37 +0,0 @@
---TEST--
-?: operator
---FILE--
-<?php
-var_dump(true ?: false);
-var_dump(false ?: true);
-var_dump(23 ?: 42);
-var_dump(0 ?: "bar");
-
-$a = 23;
-$b = 0;
-$c = "";
-$d = 23.5;
-
-var_dump($a ?: $b);
-var_dump($c ?: $d);
-
-var_dump(1 ?: print(2));
-
-$e = array();
-
-$e['e'] = 'e';
-$e['e'] = $e['e'] ?: 'e';
-print_r($e);
-?>
---EXPECT--
-bool(true)
-bool(true)
-int(23)
-string(3) "bar"
-int(23)
-float(23.5)
-int(1)
-Array
-(
-    [e] => e
-)

Zend/tests/022.phpt

@@ -1,24 +0,0 @@
---TEST--
-Implementating abstracting methods and optional parameters
---FILE--
-<?php
-
-abstract class Base
-{
-	abstract function someMethod($param);
-}
-
-class Ext extends Base
-{
-	function someMethod($param = "default")
-	{
-		echo $param, "\n";
-	}
-}
-
-$a = new Ext();
-$a->someMethod("foo");
-$a->someMethod();
---EXPECT--
-foo
-default

Zend/tests/023.phpt

@@ -1,45 +0,0 @@
---TEST--
-Testing variable variables as function name
---FILE--
-<?php
-
-$a = 'ucfirst';
-$b = 'a';
-print $$b('test');
-print "\n";
-
-
-class bar {
-	public function a() {
-		return "bar!";
-	}
-}
-
-class foo {
-	public function test() {
-		print "foo!\n";
-		return new bar;
-	}
-}
-
-function test() {
-	return new foo;
-}
-
-$a = 'test';
-$b = 'a';
-var_dump($$b()->$$b()->$b());
-
-
-$a = 'strtoupper';
-$b = 'a';
-$c = 'b';
-$d = 'c';
-var_dump($$$$d('foo'));
-
-?>
---EXPECT--
-Test
-foo!
-string(4) "bar!"
-string(3) "FOO"

Zend/tests/024.phpt

@@ -1,51 +0,0 @@
---TEST--
-Testing operations with undefined variable
---FILE--
-<?php
-
-var_dump($a[1]);
-var_dump($a[$c]);
-var_dump($a + 1);
-var_dump($a + $b);
-var_dump($a++);
-var_dump(++$b);
-var_dump($a->$b);
-var_dump($a->$b);
-var_dump($a->$b->$c[1]);
-
-?>
---EXPECTF--
-Notice: Undefined variable: a in %s on line %d
-NULL
-
-Notice: Undefined variable: c in %s on line %d
-
-Notice: Undefined variable: a in %s on line %d
-NULL
-
-Notice: Undefined variable: a in %s on line %d
-int(1)
-
-Notice: Undefined variable: b in %s on line %d
-
-Notice: Undefined variable: a in %s on line %d
-int(0)
-
-Notice: Undefined variable: a in %s on line %d
-NULL
-
-Notice: Undefined variable: b in %s on line %d
-int(1)
-
-Notice: Trying to get property of non-object in %s on line %d
-NULL
-
-Notice: Trying to get property of non-object in %s on line %d
-NULL
-
-Notice: Undefined variable: c in %s on line %d
-
-Notice: Trying to get property of non-object in %s on line %d
-
-Notice: Trying to get property of non-object in %s on line %d
-NULL

Zend/tests/025.phpt

@@ -1,32 +0,0 @@
---TEST--
-Testing dynamic calls
---FILE--
-<?php
-
-class foo {
-	static public function a() {
-		print "ok\n";
-	}
-}
-
-$a = 'a';
-$b = 'a';
-
-$class = 'foo';
-
-foo::a();
-foo::$a();
-foo::$$b();
-
-$class::a();
-$class::$a();
-$class::$$b();
-
-?>
---EXPECT--
-ok
-ok
-ok
-ok
-ok
-ok

Zend/tests/026.phpt

@@ -1,25 +0,0 @@
---TEST--
-Trying assign value to property when an object is not returned in a function
---FILE--
-<?php
-
-class foo {
-	public function a() {
-	}
-}
-
-$test = new foo;
-
-$test->a()->a;
-print "ok\n";
-
-$test->a()->a = 1;
-print "ok\n";
-
-?>
---EXPECTF--
-Notice: Trying to get property of non-object in %s on line %d
-ok
-
-Strict Standards: Creating default object from empty value in %s on line %d
-ok

Zend/tests/027.phpt

@@ -1,22 +0,0 @@
---TEST--
-Testing dynamic calls using variable variables with curly syntax
---FILE--
-<?php
-
-$a = 'b';
-$b = 'c';
-$c = 'strtoupper';
-
-var_dump(${${$a}}('foo') == 'FOO');
-
-$a = 'b';
-$b = 'c';
-$c = 'strtoupper';
-$strtoupper = 'strtolower';
-
-var_dump(${${++$a}}('FOO') == 'foo');
-
-?>
---EXPECT--
-bool(true)
-bool(true)

Zend/tests/028.phpt

@@ -1,23 +0,0 @@
---TEST--
-Testing function call through of array item
---FILE--
-<?php
-
-$arr = array('strtoupper', 'strtolower');
-
-$k = 0;
-
-var_dump($arr[0]('foo') == 'FOO');
-var_dump($arr[$k]('foo') == 'FOO');
-var_dump($arr[++$k]('FOO') == 'foo');
-var_dump($arr[++$k]('FOO') == 'foo');
-
-?>
---EXPECTF--
-bool(true)
-bool(true)
-bool(true)
-
-Notice: Undefined offset: 2 in %s on line %d
-
-Fatal error: Function name must be a string in %s on line %d

Zend/tests/029.phpt

@@ -1,85 +0,0 @@
---TEST--
-Testing assign to property of an object in an array
---FILE--
-<?php
-
-$arr = array(new stdClass);
-
-$arr[0]->a = clone $arr[0];
-var_dump($arr);
-
-$arr[0]->b = new $arr[0];
-var_dump($arr);
-
-$arr[0]->c = $arr[0]->a;
-var_dump($arr);
-
-?>
---EXPECT--
-array(1) {
-  [0]=>
-  object(stdClass)#1 (1) {
-    ["a"]=>
-    object(stdClass)#2 (0) {
-    }
-  }
-}
-array(1) {
-  [0]=>
-  object(stdClass)#1 (2) {
-    ["a"]=>
-    object(stdClass)#2 (0) {
-    }
-    ["b"]=>
-    object(stdClass)#3 (0) {
-    }
-  }
-}
-array(1) {
-  [0]=>
-  object(stdClass)#1 (3) {
-    ["a"]=>
-    object(stdClass)#2 (0) {
-    }
-    ["b"]=>
-    object(stdClass)#3 (0) {
-    }
-    ["c"]=>
-    object(stdClass)#2 (0) {
-    }
-  }
-}
---UEXPECT--
-array(1) {
-  [0]=>
-  object(stdClass)#1 (1) {
-    [u"a"]=>
-    object(stdClass)#2 (0) {
-    }
-  }
-}
-array(1) {
-  [0]=>
-  object(stdClass)#1 (2) {
-    [u"a"]=>
-    object(stdClass)#2 (0) {
-    }
-    [u"b"]=>
-    object(stdClass)#3 (0) {
-    }
-  }
-}
-array(1) {
-  [0]=>
-  object(stdClass)#1 (3) {
-    [u"a"]=>
-    object(stdClass)#2 (0) {
-    }
-    [u"b"]=>
-    object(stdClass)#3 (0) {
-    }
-    [u"c"]=>
-    object(stdClass)#2 (0) {
-    }
-  }
-}

Zend/tests/030.phpt

@@ -1,70 +0,0 @@
---TEST--
-Overriding $this in catch and checking the object properties later.
---FILE--
-<?php
-
-class foo {
-	public $test = 0;
-	private $test_2 = 1;
-	protected $test_3 = 2;
-	
-	public function bar() {
-		try {
-			throw new Exception('foo');
-		} catch (Exception $this) {
-			var_dump($this);
-		}
-
-		$this->baz();		
-	}
-	
-	public function baz() {
-		foreach ($this as $k => $v) {
-			printf("'%s' => '%s'\n", $k, $v);
-		}		
-		print "ok\n";
-	}
-}
-
-$test = new foo;
-$test->bar();
-
-?>
---EXPECTF--
-object(Exception)#%d (7) {
-  ["message":protected]=>
-  string(3) "foo"
-  ["string":"Exception":private]=>
-  string(0) ""
-  ["code":protected]=>
-  int(0)
-  ["file":protected]=>
-  string(%d) "%s030.php"
-  ["line":protected]=>
-  int(%d)
-  ["trace":"Exception":private]=>
-  array(1) {
-    [0]=>
-    array(6) {
-      ["file"]=>
-      string(%d) "%s030.php"
-      ["line"]=>
-      int(%d)
-      ["function"]=>
-      string(3) "bar"
-      ["class"]=>
-      string(3) "foo"
-      ["type"]=>
-      string(2) "->"
-      ["args"]=>
-      array(0) {
-      }
-    }
-  }
-  ["previous":"Exception":private]=>
-  NULL
-}
-'test' => '0'
-'test_2' => '1'
-'test_3' => '2'
-ok

Zend/tests/031.phpt

@@ -1,11 +0,0 @@
---TEST--
-Testing array with '[]' passed as argument by value
---FILE--
-<?php 
-
-function test($var) { }
-test($arr[]);
-
-?>
---EXPECTF--
-Fatal error: Cannot use [] for reading in %s on line %d

Zend/tests/032.phpt

@@ -1,13 +0,0 @@
---TEST--
-Testing array with '[]' passed as argument by reference
---FILE--
-<?php 
-
-function test(&$var) { }
-test($arr[]);
-
-print "ok!\n";
-
-?>
---EXPECT--
-ok!

Zend/tests/033.phpt

@@ -1,31 +0,0 @@
---TEST--
-Using undefined multidimensional array
---FILE--
-<?php 
-
-$arr[1][2][3][4][5];
-
-echo $arr[1][2][3][4][5];
-
-$arr[1][2][3][4][5]->foo;
-
-$arr[1][2][3][4][5]->foo = 1;
-
-$arr[][] = 2;
-
-$arr[][]->bar = 2;
-
-?>
---EXPECTF--
-
-Notice: Undefined variable: arr in %s on line %d
-
-Notice: Undefined variable: arr in %s on line %d
-
-Notice: Undefined variable: arr in %s on line %d
-
-Notice: Trying to get property of non-object in %s on line %d
-
-Strict Standards: Creating default object from empty value in %s on line %d
-
-Strict Standards: Creating default object from empty value in %s on line %d

Zend/tests/034.phpt

@@ -1,26 +0,0 @@
---TEST--
-Testing multiples 'default:' in switch
---FILE--
-<?php 
-
-switch (1) {
-	case 2:
-		print 'foo';
-		break;
-	case 3:
-		print 'bar';
-		break;
-	default:
-		print 1;
-		break;
-	default:
-		print 2;
-		break;
-	default:
-		print 3;
-		break;
-}
-
-?>
---EXPECT--
-3

Zend/tests/035.phpt

@@ -1,18 +0,0 @@
---TEST--
-Using 'static' and 'global' in global scope
---FILE--
-<?php
-
-static $var, $var, $var = -1;
-var_dump($var);
-
-global $var, $var, $var;
-var_dump($var);
-
-var_dump($GLOBALS['var']);
-
-?>
---EXPECT--
-int(-1)
-int(-1)
-int(-1)

Zend/tests/036.phpt

@@ -1,13 +0,0 @@
---TEST--
-Trying to use lambda in array offset
---FILE--
-<?php
-
-$test[function(){}] = 1;
-$a{function() { }} = 1;
-
-?>
---EXPECTF--
-Warning: Illegal offset type in %s on line %d
-
-Warning: Illegal offset type in %s on line %d

Zend/tests/037.phpt

@@ -1,19 +0,0 @@
---TEST--
-Trying to access inexistent static property of Closure
---FILE--
-<?php
-
-namespace closure;
-
-class closure { static $x = 1;}
-
-$x = __NAMESPACE__;
-var_dump(closure::$x);
-
-var_dump($x::$x);
-
-?>
---EXPECTF--
-int(1)
-
-Fatal error: Access to undeclared static property: Closure::$x in %s on line %d

Zend/tests/038.phpt

@@ -1,12 +0,0 @@
---TEST--
-Trying to use lambda as array key
---FILE--
-<?php
-
-var_dump(array(function() { } => 1));
-
-?>
---EXPECTF--
-Warning: Illegal offset type in %s on line %d
-array(0) {
-}

Zend/tests/access_modifiers_001.phpt

@@ -1,14 +0,0 @@
---TEST--
-using multiple access modifiers (methods)
---FILE--
-<?php
-
-class test {
-	static public public static final public final function foo() {
-	}
-}
-
-echo "Done\n";
-?>
---EXPECTF--	
-Fatal error: Multiple access type modifiers are not allowed in %s on line %d

Zend/tests/access_modifiers_002.phpt

@@ -1,13 +0,0 @@
---TEST--
-using multiple access modifiers (attributes)
---FILE--
-<?php
-
-class test {
-	static public public static final public final $var;
-}
-
-echo "Done\n";
-?>
---EXPECTF--	
-Fatal error: Multiple access type modifiers are not allowed in %s on line %d

Zend/tests/access_modifiers_003.phpt

@@ -1,13 +0,0 @@
---TEST--
-using multiple access modifiers (classes)
---FILE--
-<?php
-
-final final class test {
-	function foo() {}
-}
-
-echo "Done\n";
-?>
---EXPECTF--	
-Parse error: %s error,%sexpecting %s in %s on line %d

Zend/tests/access_modifiers_004.phpt

@@ -1,14 +0,0 @@
---TEST--
-using multiple access modifiers (abstract methods)
---FILE--
-<?php
-
-class test {
-	abstract abstract function foo() {
-	}
-}
-
-echo "Done\n";
-?>
---EXPECTF--	
-Fatal error: Multiple abstract modifiers are not allowed in %s on line %d

Zend/tests/access_modifiers_005.phpt

@@ -1,14 +0,0 @@
---TEST--
-using multiple access modifiers (final methods)
---FILE--
-<?php
-
-class test {
-	final final function foo() {
-	}
-}
-
-echo "Done\n";
-?>
---EXPECTF--	
-Fatal error: Multiple final modifiers are not allowed in %s on line %d

Zend/tests/access_modifiers_006.phpt

@@ -1,14 +0,0 @@
---TEST--
-using multiple access modifiers (static methods)
---FILE--
-<?php
-
-class test {
-	static static function foo() {
-	}
-}
-
-echo "Done\n";
-?>
---EXPECTF--	
-Fatal error: Multiple static modifiers are not allowed in %s on line %d

Zend/tests/access_modifiers_007.phpt

@@ -1,13 +0,0 @@
---TEST--
-abstract final methods errmsg
---FILE--
-<?php
-
-class test {
-	final abstract function foo();
-}
-
-echo "Done\n";
-?>
---EXPECTF--	
-Fatal error: Cannot use the final modifier on an abstract class member in %s on line %d

Zend/tests/access_modifiers_008.phpt

@@ -1,21 +0,0 @@
---TEST--
-Inconsistencies when accessing protected members
---XFAIL--
-Discussion: http://marc.info/?l=php-internals&m=120221184420957&w=2
---FILE--
-<?php
-
-class A {
-	static protected function f() {return 'A::f()';}
-}
-class B1 extends A {
-	static protected function f() {return 'B1::f()';}
-}
-class B2 extends A {
-	static public function test() {echo B1::f();}
-}
-B2::test();
-
-?>
---EXPECTF--
-Fatal error: Call to protected method B1::f() from context 'B2' in %s on line %d

Zend/tests/access_modifiers_009.phpt

@@ -1,26 +0,0 @@
---TEST--
-Inconsistencies when accessing protected members - 2
---XFAIL--
-Discussion: http://marc.info/?l=php-internals&m=120221184420957&w=2
---FILE--
-<?php
-
-class A {
-	static protected function f() {return 'A::f()';}
-}
-class B1 extends A {
-	static protected function f() {return 'B1::f()';}
-}
-class B2 extends A {
-	static public function test() {
-		var_dump(is_callable('B1::f'));
-		B1::f();
-	}
-}
-B2::test();
-
-?>
---EXPECTF--
-bool(false)
-
-Fatal error: Call to protected method B1::f() from context 'B2' in %s on line %d

Zend/tests/access_modifiers_010.phpt

@@ -1,31 +0,0 @@
---TEST--
-Testing visibility of methods
---FILE--
-<?php
-
-class d {
-	private function test2() {
-		print "Bar\n";
-	}
-}
-
-abstract class a extends d {
-	public function test() {
-		$this->test2();
-	}
-}
-
-abstract class b extends a {
-}
-
-class c extends b {
-	public function __construct() {
-		$this->test();
-	}	
-}
-
-new c;
-
-?>
---EXPECTF--
-Fatal error: Call to private method d::test2() from context 'a' in %s on line %d

Zend/tests/anonymous_func_001.phpt

@@ -1,35 +0,0 @@
---TEST--
-Testing calls to anonymous function
---FILE--
-<?php 
-
-for ($i = 0; $i < 10; $i++) {
-	$a = create_function('', 'return '. $i .';');
-	var_dump($a());
-	
-	$b = "\0lambda_". ($i + 1);
-	var_dump($b());
-}
-
-?>
---EXPECT--
-int(0)
-int(0)
-int(1)
-int(1)
-int(2)
-int(2)
-int(3)
-int(3)
-int(4)
-int(4)
-int(5)
-int(5)
-int(6)
-int(6)
-int(7)
-int(7)
-int(8)
-int(8)
-int(9)
-int(9)

Zend/tests/anonymous_func_002.phpt

@@ -1,16 +0,0 @@
---TEST--
-Testing anonymous function return as array key and accessing $GLOBALS
---FILE--
-<?php 
-
-$test = create_function('$v', 'return $v;');
-
-$arr = array(create_function('', 'return $GLOBALS["arr"];'), 2);
-
-var_dump($arr[$test(1)]);
-var_dump($arr[$test(0)]() == $arr);
-
-?>
---EXPECT--
-int(2)
-bool(true)

Zend/tests/anonymous_func_003.phpt

@@ -1,15 +0,0 @@
---TEST--
-Using throw $var with anonymous function return
---FILE--
-<?php 
-
-try {
-	$a = create_function('', 'return new Exception("test");');
-	throw $a();
-} catch (Exception $e) {
-	var_dump($e->getMessage() == 'test');
-}
-
-?>
---EXPECT--
-bool(true)

Zend/tests/assign_to_var_001.phpt

@@ -1,18 +0,0 @@
---TEST--
-complex cases of variable assignment - 001
---FILE--
-<?php
-
-$var = array(1,2,3);
-$var1 = &$var;
-$var = $var[1];
-
-var_dump($var);
-var_dump($var1);
-
-echo "Done\n";
-?>
---EXPECTF--	
-int(2)
-int(2)
-Done

Zend/tests/assign_to_var_002.phpt

@@ -1,18 +0,0 @@
---TEST--
-complex cases of variable assignment - 002
---FILE--
-<?php
-
-$var = "intergalactic";
-$var1 = &$var;
-$var = $var[5];
-
-var_dump($var);
-var_dump($var1);
-
-echo "Done\n";
-?>
---EXPECTF--	
-string(1) "g"
-string(1) "g"
-Done

Zend/tests/assign_to_var_003.phpt

@@ -1,18 +0,0 @@
---TEST--
-complex cases of variable assignment - 003
---FILE--
-<?php
-
-$var = 0.213123123;
-$var1 = &$var;
-$var = $var[1];
-
-var_dump($var);
-var_dump($var1);
-
-echo "Done\n";
-?>
---EXPECTF--	
-NULL
-NULL
-Done

Zend/tests/assign_to_var_004.phpt

@@ -1,22 +0,0 @@
---TEST--
-complex cases of variable assignment - 004
---FILE--
-<?php
-
-$var = "intergalactic";
-$var1 = "space";
-$var2 = &$var1;
-
-$var = $var2;
-
-var_dump($var);
-var_dump($var1);
-var_dump($var2);
-
-echo "Done\n";
-?>
---EXPECTF--	
-string(5) "space"
-string(5) "space"
-string(5) "space"
-Done

Zend/tests/bug20242.phpt

@@ -1,7 +1,12 @@
 --TEST--
 Bug #20242 (Method call in front of class definition)
+--SKIPIF--
+<?php if (version_compare(zend_version(), '2.0.0-dev', '>=')) die('skip ZendEngine 2 does not support this'); ?>
 --FILE--
 <?php
+
+// THIS IS A WON'T FIX FOR ZE2
+
 test::show_static();
 
 $t = new test;

Zend/tests/bug30332.phpt

@@ -0,0 +1,40 @@
+--TEST--
+Bug #30332 (zend.ze1_compatibility_mode isnt fully compatable with array_push())
+--INI--
+zend.ze1_compatibility_mode=on
+error_reporting=4095
+--FILE--
+<?php
+class x { };
+
+$first = new x;
+$second = $first;
+$container = array();
+array_push($container, $first);
+
+$first->first = " im in the first";
+
+print_r($first);
+print_r($second);
+print_r($container);
+?>
+--EXPECTF--
+Strict Standards: Implicit cloning object of class 'x' because of 'zend.ze1_compatibility_mode' in %sbug30332.php on line 4
+
+Strict Standards: Implicit cloning object of class 'x' because of 'zend.ze1_compatibility_mode' in %sbug30332.php on line 5
+
+Strict Standards: Implicit cloning object of class 'x' because of 'zend.ze1_compatibility_mode' in %sbug30332.php on line 7
+x Object
+(
+    [first] =>  im in the first
+)
+x Object
+(
+)
+Array
+(
+    [0] => x Object
+        (
+        )
+
+)

Zend/tests/bug31720.phpt

@@ -10,5 +10,7 @@ array_walk($array, array($nonesuchvar,'show'));
 --EXPECTF--
 Notice: Undefined variable: nonesuchvar in %s on line %d
 
-Warning: array_walk() expects parameter 2 to be a valid callback, first array member is not a valid class name or object in %s on line %d
+Notice: Non-callable array passed to zend_call_function() in %s on line %d
+
+Warning: array_walk(): Unable to call Array() - function does not exist in %s on line %d
 ===DONE===

Zend/tests/bug31828.phpt

@@ -0,0 +1,25 @@
+--TEST--
+Bug #31828 (Crash with zend.ze1_compatibility_mode=On)
+--INI--
+zend.ze1_compatibility_mode=on
+error_reporting=4095
+--FILE--
+<?php
+$o = new stdClass();
+$o->id = 77;
+$o->name = "Aerospace";
+$a[] = $o;
+$a = $a[0];
+print_r($a);
+?>
+--EXPECTF--
+Strict Standards: Implicit cloning object of class 'stdClass' because of 'zend.ze1_compatibility_mode' in %sbug31828.php on line 2
+
+Strict Standards: Implicit cloning object of class 'stdClass' because of 'zend.ze1_compatibility_mode' in %sbug31828.php on line 5
+
+Strict Standards: Implicit cloning object of class 'stdClass' because of 'zend.ze1_compatibility_mode' in %sbug31828.php on line 6
+stdClass Object
+(
+    [id] => 77
+    [name] => Aerospace
+)

Zend/tests/bug32080.phpt

@@ -0,0 +1,18 @@
+--TEST--
+Bug #32080 (segfault when assigning object to itself with zend.ze1_compatibility_mode=On)
+--INI--
+zend.ze1_compatibility_mode=on
+error_reporting=4095
+--FILE--
+<?php
+class test { }
+$t = new test;
+$t = $t; // gives segfault
+var_dump($t);
+?>
+--EXPECTF--
+Strict Standards: Implicit cloning object of class 'test' because of 'zend.ze1_compatibility_mode' in %sbug32080.php on line 3
+
+Strict Standards: Implicit cloning object of class 'test' because of 'zend.ze1_compatibility_mode' in %sbug32080.php on line 5
+object(test)#%d (0) {
+}

Zend/tests/bug32290.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Bug #32290 (calling call_user_func_array() ends in infinite loop within child class)
---INI--
-error_reporting=8191
 --FILE--
 <?php
 
@@ -99,6 +97,8 @@ var_dump($x->doSomethingStatic(1));
 --EXPECTF--
 ===A===
 TestB::doSomething(1)
+
+Strict Standards: Non-static method TestA::doSomething() cannot be called statically, assuming $this from compatible context TestB in %sbug32290.php on line %d
 TestA::doSomething(2)
 int(1)
 
@@ -109,6 +109,8 @@ int(1)
 
 ===C===
 TestB::doSomethingParent(1)
+
+Strict Standards: Non-static method TestA::doSomethingParent() cannot be called statically, assuming $this from compatible context TestB in %sbug32290.php on line %d
 TestA::doSomethingParent(2)
 int(1)
 

Zend/tests/bug32799.phpt

@@ -5,17 +5,17 @@ Bug #32799 (crash: calling the corresponding global var during the destruct)
 class test{
   public $c=1;
   function __destruct (){
-  	if (!isset($GLOBALS['p'])) {
-  		echo "NULL\n";
-  	} else {
-	    $GLOBALS['p']->c++; // no warning
-	    print $GLOBALS['p']->c."\n"; // segfault
-	  	var_dump($GLOBALS['p']);
-	}
+    $GLOBALS['p']->c++; // no warning
+    print $GLOBALS['p']->c."\n"; // segfault
+  	var_dump($GLOBALS['p']);
   }
 }
 $p=new test;
 $p=null; //destroy the object by a new assignment (segfault)
 ?>
 --EXPECT--
-NULL
+2
+object(test)#1 (1) {
+  ["c"]=>
+  int(2)
+}

Zend/tests/bug32852.phpt

@@ -0,0 +1,38 @@
+--TEST--
+Bug #32852 (Crash with singleton and __destruct when zend.ze1_compatibility_mode = On)
+--INI--
+zend.ze1_compatibility_mode=on
+error_reporting=4095
+--FILE--
+<?php
+class crashme {
+    private static $instance = null;
+
+    public function __construct() {
+        self::$instance = $this;
+    }
+
+    public function __destruct() {
+        echo "i'm called\n";
+    }
+
+    public static function singleton() {
+        if (!isset(self::$instance)) {
+            self::$instance = new crashme();
+        }
+        return self::$instance;
+    }
+}
+
+crashme::singleton();
+?>
+--EXPECTF--
+Strict Standards: Implicit cloning object of class 'crashme' because of 'zend.ze1_compatibility_mode' in %sbug32852.php on line 6
+i'm called
+
+Strict Standards: Implicit cloning object of class 'crashme' because of 'zend.ze1_compatibility_mode' in %sbug32852.php on line 15
+i'm called
+
+Strict Standards: Implicit cloning object of class 'crashme' because of 'zend.ze1_compatibility_mode' in %sbug32852.php on line 17
+i'm called
+i'm called

Zend/tests/bug33243.phpt

@@ -0,0 +1,25 @@
+--TEST--
+Bug #33243 (ze1_compatibility_mode does not work as expected)
+--INI--
+zend.ze1_compatibility_mode=1
+error_reporting=4095
+--FILE--
+<?php
+$a->y->z = 0;
+$b = $a;      // should perform deep copy of $a
+$b->y->z = 1; // hence this should have no effect on $a
+var_dump($a);
+?>
+--EXPECTF--
+Strict Standards: Creating default object from empty value in %sbug33243.php on line 2
+
+Strict Standards: Implicit cloning object of class 'stdClass' because of 'zend.ze1_compatibility_mode' in %sbug33243.php on line 3
+
+Strict Standards: Implicit cloning object of class 'stdClass' because of 'zend.ze1_compatibility_mode' in %sbug33243.php on line 5
+object(stdClass)#%d (1) {
+  ["y"]=>
+  object(stdClass)#%d (1) {
+    ["z"]=>
+    int(0)
+  }
+}

Zend/tests/bug33771.phpt

@@ -34,7 +34,7 @@ var_dump(error_reporting());
 echo "Done\n";
 ?>
 --EXPECTF--	
-int(32767)
-int(32767)
-int(30719)
+int(8191)
+int(8191)
+int(6143)
 Done

Zend/tests/bug34712.phpt

@@ -0,0 +1,28 @@
+--TEST--
+Bug #34712 (zend.ze1_compatibility_mode = on segfault)
+--INI--
+zend.ze1_compatibility_mode=1
+error_reporting=4095
+--FILE--
+<?php
+class foo {
+	function foo(&$obj_ref) {
+		$this->bar = &$obj_ref;
+	}
+}		
+
+
+class bar {
+	function bar() {
+		$this->foo = new foo($this);
+	}
+}
+
+$test = new bar;
+echo "ok\n";
+?>
+--EXPECTF--
+Strict Standards: Implicit cloning object of class 'foo' because of 'zend.ze1_compatibility_mode' in %sbug34712.php on line 11
+
+Strict Standards: Implicit cloning object of class 'bar' because of 'zend.ze1_compatibility_mode' in %sbug34712.php on line 15
+ok

Zend/tests/bug34767.phpt

@@ -0,0 +1,33 @@
+--TEST--
+Bug #34767 (Zend Engine 1 Compatibility not copying objects correctly)
+--INI--
+zend.ze1_compatibility_mode=1
+error_reporting=4095
+--FILE--
+<?php
+$a->y = &new stdClass();
+print_r($a);
+$b = $a;
+$a->y->z = 1;
+print_r($b);
+?>
+--EXPECTF--
+
+Strict Standards: Assigning the return value of new by reference is deprecated in %sbug34767.php on line 2
+stdClass Object
+(
+    [y] => stdClass Object
+        (
+        )
+
+)
+
+Strict Standards: Implicit cloning object of class 'stdClass' because of 'zend.ze1_compatibility_mode' in %sbug34767.php on line 4
+stdClass Object
+(
+    [y] => stdClass Object
+        (
+            [z] => 1
+        )
+
+)

Zend/tests/bug35163.phpt

@@ -1,38 +0,0 @@
---TEST--
-Bug #35163 (Array elements can lose references)
---FILE--
-<?php
-$a = array(array(1));
-$a[0][] =& $a[0];
-$a[0][] =& $a[0];
-$a[0][0] = 2;
-var_dump($a);
-$a[0] = null;
-$a = null;
-?>
---EXPECT--
-array(1) {
-  [0]=>
-  &array(3) {
-    [0]=>
-    int(2)
-    [1]=>
-    &array(3) {
-      [0]=>
-      int(2)
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
-    [2]=>
-    &array(3) {
-      [0]=>
-      int(2)
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
-  }
-}

Zend/tests/bug35163_2.phpt

@@ -1,65 +0,0 @@
---TEST--
-Bug #35163.2 (Array elements can lose references)
---FILE--
-<?php
-$a = array(1);
-$b = 'a';
-${$b}[] =& $$b;
-${$b}[] =& $$b;
-${$b}[0] = 2;
-var_dump($a);
-$a[0] = null;
-$a = null;
-?>
---EXPECT--
-array(3) {
-  [0]=>
-  int(2)
-  [1]=>
-  &array(3) {
-    [0]=>
-    int(2)
-    [1]=>
-    &array(3) {
-      [0]=>
-      int(2)
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
-    [2]=>
-    &array(3) {
-      [0]=>
-      int(2)
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
-  }
-  [2]=>
-  &array(3) {
-    [0]=>
-    int(2)
-    [1]=>
-    &array(3) {
-      [0]=>
-      int(2)
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
-    [2]=>
-    &array(3) {
-      [0]=>
-      int(2)
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
-  }
-}
-

Zend/tests/bug35163_3.phpt

@@ -1,39 +0,0 @@
---TEST--
-Bug #35163.3 (Array elements can lose references)
---FILE--
-<?php
-$a = new stdClass;
-$a->b = array(1);
-$a->b[] =& $a->b;
-$a->b[] =& $a->b;
-$a->b[0] = 2;
-var_dump($a);
-$a->b = null;
-$a = null;
-?>
---EXPECT--
-object(stdClass)#1 (1) {
-  ["b"]=>
-  &array(3) {
-    [0]=>
-    int(2)
-    [1]=>
-    &array(3) {
-      [0]=>
-      int(2)
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
-    [2]=>
-    &array(3) {
-      [0]=>
-      int(2)
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
-  }
-}

Zend/tests/bug35655.phpt

@@ -20,6 +20,6 @@ highlight_string($code);
 ?>
 --EXPECT--
 <code><span style="color: #000000">
-<br /><span style="color: #0000BB">&lt;?php<br />&nbsp;&nbsp;$x&nbsp;</span><span style="color: #007700">=&nbsp;&lt;&lt;&lt;EOT<br /></span><span style="color: #DD0000">some&nbsp;string&nbsp;&nbsp;&nbsp;&nbsp;<br /></span><span style="color: #007700">EOT<br />&nbsp;&nbsp;</span><span style="color: #0000BB">$y&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #0000BB">2</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">?&gt;</span>
+<br /><span style="color: #0000BB">&lt;?php<br />&nbsp;&nbsp;$x&nbsp;</span><span style="color: #007700">=&nbsp;&lt;&lt;&lt;EOT<br /></span><span style="color: #0000BB">some&nbsp;string&nbsp;&nbsp;&nbsp;&nbsp;<br /></span><span style="color: #007700">EOT<br />&nbsp;&nbsp;</span><span style="color: #0000BB">$y&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #0000BB">2</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">?&gt;</span>
 </span>
 </code>

Zend/tests/bug36214.phpt

@@ -33,7 +33,7 @@ $ctx->comment_preview[0] = 1;
 $ctx->comment_preview[1] = 2;
 var_dump($ctx->comment_preview);
 ?>
---EXPECTF--
+--EXPECT--
 array(2) {
   [0]=>
   int(1)
@@ -46,12 +46,9 @@ array(2) {
   [1]=>
   int(2)
 }
-object(ArrayObject)#%d (1) {
-  ["storage":"ArrayObject":private]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
+object(ArrayObject)#2 (2) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
 }

Zend/tests/bug36303.phpt

@@ -8,7 +8,5 @@ foreach($x->a->b as &$v) {
 echo "ok\n";
 ?>
 --EXPECTF--
-Warning: Attempt to modify property of non-object in %sbug36303.php on line 3
-
 Warning: Invalid argument supplied for foreach() in %sbug36303.php on line 3
 ok

Zend/tests/bug37212.phpt

@@ -41,15 +41,15 @@ var_dump($B);
 ===DONE===
 --EXPECTF--
 object(B)#%d (1) {
-  ["value":protected]=>
+  ["value:protected"]=>
   string(1) "B"
 }
 object(C)#%d (1) {
-  ["value":protected]=>
+  ["value:protected"]=>
   string(1) "C"
 }
 object(B)#%d (1) {
-  ["value":protected]=>
+  ["value:protected"]=>
   string(1) "C"
 }
 ===DONE===

Zend/tests/bug37251.phpt

@@ -1,19 +0,0 @@
---TEST--
-Bug #37251 (deadlock when custom error handler is to catch array type hint error) 
---FILE--
-<?php
-function error_handler($errno, $errstr, $errfile, $errline, $context) {
-	echo 'OK';
-}
-
-set_error_handler('error_handler');
-
-class Foo {	
-	function bar(array $foo) {
-	}
-}
-
-$foo = new Foo();
-$foo->bar();
---EXPECT--
-OK

Zend/tests/bug37667.phpt

@@ -30,10 +30,10 @@ var_dump($obj);
 --EXPECTF--
 string(3) "bar"
 
-Notice: Undefined offset: 2 in %sbug37667.php on line 16
+Notice: Undefined offset:  2 in %sbug37667.php on line 16
 NULL
 object(Test)#%d (1) {
-  ["property":protected]=>
+  ["property:protected"]=>
   array(1) {
     ["foo"]=>
     string(3) "bar"
@@ -44,7 +44,7 @@ Notice: Indirect modification of overloaded property Test::$property has no effe
 
 Notice: Indirect modification of overloaded property Test::$property has no effect in %sbug37667.php on line 21
 object(Test)#%d (1) {
-  ["property":protected]=>
+  ["property:protected"]=>
   array(1) {
     ["foo"]=>
     string(3) "bar"