5.4.10 rc1

2026-11-11 19:20:50 +00:00 · 2012-12-04 21:36:09 -08:00
1755 changed files with 72644 additions and 113833 deletions
@@ -1,9 +1,10 @@
 language: php

-branches:
-    except:
-        - /^PHP-5\.3.*/
-        - /^PHP-5\.4.*/
+php:
+    # We only specify one version so we only get one worker
+    - 5.4

 notifications:
    email: false
+
+script: exit 0
@@ -59,8 +59,8 @@ Exceptions:
    you're calling.

 7.  When commenting out code using a #if statement, do NOT use 0 only. Instead
-    use "<git username here>_0". For example, #if FOO_0, where FOO is your
-    git user foo.  This allows easier tracking of why code was commented out,
+    use "<svn username here>_0". For example, #if FOO_0, where FOO is your
+    svn user foo.  This allows easier tracking of why code was commented out,
    especially in bundled libraries.

 8.  Do not define functions that are not available.  For instance, if a
@@ -151,7 +151,7 @@ Naming Conventions

 7.  Classes should be given descriptive names. Avoid using abbreviations where
    possible. Each word in the class name should start with a capital letter,
-    without underscore delimiters (CamelCaps starting 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)::

@@ -10,7 +10,7 @@ all: $(all_targets)
 	@echo "Build complete."
 	@echo "Don't forget to run 'make test'."
 	@echo
-
+	
 build-modules: $(PHP_MODULES) $(PHP_ZEND_EX)

 build-binaries: $(PHP_BINARIES)
@@ -116,7 +116,7 @@ clean:
 	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*

 distclean: clean
-	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak
+	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
 	$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f

 .PHONY: all clean install distclean test
@@ -30,7 +30,7 @@ zend_module_entry foo_module_entry = {
    PHP_RSHUTDOWN(foo),   /* per-request shutdown function */
    PHP_MINFO(foo),       /* information function */
 #if ZEND_MODULE_API_NO >= 20010901
-    PHP_FOO_VERSION,      /* extension version number (string) */
+    FOO_VERSION,          /* extension version number (string) */
 #endif
    STANDARD_MODULE_PROPERTIES
 };
@@ -31,11 +31,6 @@ HOW TO USE IT

    ./buildconf; ./configure --enable-module_name; make

-  The definition of PHP_MODULE_NAME_VERSION will be present in the
-  php_module_name.h and injected into the zend_module_entry definition. This
-  is required by the PECL website for the version string conformity checks
-  against package.xml
-
  But if you already have planned the overall scheme of your module, what
  functions it will contain, their return types and the arguments they take
  (a very good idea) and don't want to bother yourself with creating function
@@ -45,17 +45,14 @@ Currently we have the following branches in use::

  master    The active development branch. 

-  PHP-5.5   Is used to release the PHP 5.5.x series. This is a current
+  PHP-5.4   Is used to release the PHP 5.4.x series. It still allows for
+            larger enhancements.
+
+  PHP-5.3   Is used to release the PHP 5.3.x series. This is current 
            stable version and is open for bugfixes only.

-  PHP-5.4   Is used to release the PHP 5.4.x series. This is a current
-            stable version and is open for bugfixes only.
-
-  PHP-5.3   Is used to release the PHP 5.3.x series. This is currently 
-            in extended support and open forsecurity fixes only. Triaged
-            via security@php.net
-
-  PHP-5.2   This branch is closed.
+  PHP-5.2   Is used to release the PHP 5.2.x series. It is closed for 
+            changes now.

  PHP-5.1   This branch is closed.

@@ -69,11 +66,9 @@ The next few rules are more of a technical nature::
      branches) an empty merge should be done.

   2. All news updates intended for public viewing, such as new features,
-      bug fixes, improvements, etc., should go into the NEWS file of *any
-      stable release* version with the given change. In other words,
-      news about a bug fix which went into PHP-5.4, PHP-5.5 and master
-      should be noted in both PHP-5.4/NEWS and PHP-5.5/NEWS but
-      not master, which is not a public released version yet.
+      bug fixes, improvements, etc., should go into the NEWS file of the
+      *first* to be released version with the given change. In other words
+      any NEWS file change only needs to done in one branch.

   3. Do not commit multiple file and dump all messages in one commit. If you
      modified several unrelated files, commit each group separately and
@@ -32,7 +32,7 @@ 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 parameters are set
+ 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 
@@ -8,16 +8,15 @@ General notes and tips
 1. Do not release on Fridays, Saturdays or Sundays
 because the sysadmins can not upgrade stuff then.

-2. Package two days before a release. So if the release is to be on Thursday,
-package on Tuesday. Think about timezones as well.
+2. Package the day before a release. So if the release is to be on Thursday,
+package on Wednesday.

 3. Ensure that Windows builds will work before packaging

-4. Follow all steps to the letter. When unclear ask previous RM's (David/Julien/
-Johannes/Stas/Derick/Ilia) before proceeding. Ideally make sure that for the
-first releases one of the previous RM's is around to answer questions. For the
-steps related to the php/QA/bug websites try to have someone from the webmaster
-team (Bjori) on hand.
+4. Follow all steps to the letter. When unclear ask previous RM's (Derick/Ilia)
+before proceeding. Ideally make sure that for the first releases one of the
+previous RM's is around to answer questions. For the steps related to the
+php/QA/bug websites try to have someone from the webmaster team (Bjori) on hand.

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

@@ -51,44 +50,30 @@ Rolling a non stable release (alpha/beta/RC)
 2. run the "scripts/dev/credits" script in php-src and commit the changes in the
 credits files in ext/standard.

-3. Checkout the release branch for this release (e.g., PHP-5.4.2) from the main branch.
+3. Checkout the release branch for this release (e.g., PHP-5.4.2).

 4. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
-Do not use abbreviations for alpha and beta. Do not use dashes, you should
-``#define PHP_VERSION "5.4.22RC1"`` and not ``#define PHP_VERSION "5.4.22-RC1"``
+Do not use abbreviations for alpha and beta.

-5. Compile and make test, with and without ZTS, using the right Bison version
-(for example, for 5.5, Bison 2.4.1 is used)
+5. Commit these changes to the branch with ``git commit -a``.

-6. Check ./sapi/cli/php -v output for version matching.
-
-7. If all is right, commit the changes to the release branch with ``git commit -a``.
-
-8. Tag the repository release branch with the version, e.g.: 
+6. Tag the repository with the version, e.g.: 
 ``git tag -u YOURKEYID php-5.4.2RC2``

-9. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and ``NEWS``
-in the *main* branch (PHP-5.4 for example) to prepare for the **next** version.
-F.e. if the RC is "5.4.1RC1" then the new one should be "5.4.2-dev" - regardless if we get
-a new RC or not. This is to make sure ``version_compare()`` can correctly work.
-Commit the changes to the main branch.
-
-10. Push the changes to the main repo, the tag, the main branch and the release branch :
+7. Push the changes to the main repo:
 ``git push --tags origin HEAD``
-``git push origin {main branch}``
-``git push origin {release branch}``

-11. run: ``PHPROOT=. ./makedist 5.4.2RC2``, this will export the tree, create configure
-and build three tarballs (gz, bz2 and xz).
+8. run: ``./makedist 5.4.2RC2``, this will export the tree, create configure
+and build two tarballs (one gz and one bz2).

-12. Copy those tarballs (scp, rsync) to downloads.php.net, in your homedir there should be a
+9. Copy those two tarballs to www.php.net, in your homedir there should be a
 directory "downloads/". Copy them into there, so that the system can generate
-MD5 sums. If you do not have this directory, talk to Derick or Dan.
+MD5 sums. If you do not have this directory, talk to Derick.

-13. Now the RC can be found on http://downloads.php.net/yourname,
+10. Now the RC can be found on http://downloads.php.net/yourname,
 f.e. http://downloads.php.net/derick/

-14. Once the release has been tagged, contact the PHP Windows development team
+11. Once the release has been tagged, contact the PHP Windows development team
 (internals-win@lists.php.net) so that Windows binaries can be created. Once
 those are made, they should be placed into the same directory as the source snapshots.

@@ -120,9 +105,9 @@ Derick) run the following commands for you:

   Note: Remember to update the MD5 checksum information.

-4. Update ``web/php.git/include/version.inc`` (x=major version number)
+4. Update ``php.git/include/version.inc`` (x=major version number)

- a. ``$PHP_x_RC`` = "5.4.0RC1"  (should be set to "false" before)
+ a. ``$PHP_x_RC`` = "5.4.0RC1"

 b. ``$PHP_x_RC_DATE`` = "06 September 2007"

@@ -133,61 +118,59 @@ Derick) run the following commands for you:
 6. For the first RC, write the doc team (phpdoc@lists.php.net) about updating the
 INSTALL and win32/install.txt files which are generated from the PHP manual sources.

+7. Publish the announce on www.php.net as well (for all releases, alpha, RCs or other)
+
 Rolling a stable release
 ------------------------

-1. Checkout your release branch, you should have created when releasing previous RC
-and bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
+1. Check windows snapshot builder logs (http://snaps.php.net/win32/snapshot-STABLE.log f.e.)

-2. If a CVE commit needs to be merged to the release, then have it commited to
-the base branches and merged upwards as usual (f.e commit the CVE fix to 5.3,
-merge to 5.4, 5.5 etc...). Then you can cherry-pick it in your release branch.
-Don't forget to update NEWS manually in an extra commit then.
+2. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.

-3. Commit those changes
+3. **Merge** all related sections in NEWS (f.e. merge the 5.4.1RC1 and 5.4.0 sections)

-4. run the "scripts/dev/credits" script in php-src and commit the changes in the
+4. Commit those changes
+
+5. run the "scripts/dev/credits" script in php-src and commit the changes in the
 credits files in ext/standard.

-5. Compile and make test, with and without ZTS, using the right Bison version
-(for example, for 5.5, Bison 2.4.1 is used)
+6. tag the repository with the version f.e. "``git tag -s php-5.4.1``"
+(of course, you need to change that to the version you're rolling an RC for).
+When making 5.X release, you need to tag the Zend directory separately!!

-6. Check ./sapi/cli/php -v output for version matching.
+7. Bump up the version numbers in ``main/php_version.h``, ``configure.in`` and
+possibly ``NEWS`` again, to the **next** version. F.e. if the release candidate
+was "5.4.1RC1" then the new one should be "5.4.1RC2-dev" - regardless if we get
+a new RC or not. This is to make sure ``version_compare()`` can correctly work.

-7. tag the repository with the version f.e. "``git tag -s php-5.4.1``"
+8. Commit those changes

-8. Push the tag f.e. "``git push origin php-5.4.1``"
+9. Log in onto the snaps box and go into the correct tree (f.e. the PHP-5.4
+branch if you're rolling 5.5.x releases).

-9. run: ``PHPROOT=. ./makedist php 5.4.1``, this will export the tag, create configure
-and build three tarballs (gz, bz2 and xz).
-Check if the pear files are updated (phar).
+10. You do not have to update the tree, but of course you can with "``git pull
+origin <branch>``".

-10. Generate the GPG signature files for the archives.
-  ``gpg -u YOUREMAIL --armor --detach-sign php-X.Y.Z.tar.xxx``
+11. run: ``./makedist php 5.4.1``, this will export the tree, create configure
+and build two tarballs (one gz and one bz2).

-11. Commit and push all the tarballs and signature files to web/php-distributions.git,
-    then update the git submodule reference in web/php.git: 
-    ``git submodule init;
-    git submodule update;
-    cd distributions;
-    git pull origin master;
-    cd ..;
-    git commit distributions;
-    git push;``
-This is to fetch the last commit id from php-distributions.git and commit this
-last commit id to web/php.git, then, mirrors will now sync
+12. Commit those two tarballs to Git (php-distributions.git)

-12. Once the release has been tagged, contact the PHP Windows development team
-(internals-win@lists.php.net) so that Windows binaries can be created.
+13. Once the release has been tagged, contact the PHP Windows development team
+(internals-win@lists.php.net) so that Windows binaries can be created. Once
+those are made, they should be committed to SVN too.
+
+14. Check if the pear files are updated (phar for 5.1+ or run pear/make-pear-bundle.php with 4.4)
+
+15. When making a final release, also remind the PHP Windows development team
+(internals-win@lists.php.net) to prepare the installer packages for Win32.

 Getting the stable release announced
 ------------------------------------

 1. Run the bumpRelease script for phpweb on your local checkout

- a. ``php bin/bumpRelease 5`` to create the release file (releases/x_y_z.php)
-    The release announcement file should list in detail security fixes and
-    changes in behavior (whether due to a bug fix or not).
+ a. ``php bin/bumpRelease 5`` (or ``php bin/bumpRelease 4`` for PHP4)

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

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

-3. Update phpweb/include/releases.php with the old release info
-  (updates the download archives)
-
-4. Update php-qa/include/release-qa.php and add the next version as an QARELEASE
-   (prepare for next RC)
-
-5. Update the ChangeLog file for the given major version
+3. Update the ChangeLog file for the given major version
 f.e. ``ChangeLog-5.php`` from the NEWS file

 a. go over the list and put every element on one line
@@ -233,10 +210,19 @@ f.e. ``ChangeLog-5.php`` from the NEWS file
  IV. ``s/Fixed PECL bug #\([0-9]\+\)/<?php peclbugfix(\1); ?>/``

  V. ``s/FR #\([0-9]\+\)/FR <?php bugl(\1); ?>/``
-  
-  e. You may want to try php-web/bin/news2html to automate this task

-6. Add a short notice to phpweb stating that there is a new release, and
+4. ``cp releases/5_4_0.php releases/5_4_1.php``
+
+5. ``git add releases/5_4_1.php``
+
+6. Update the ``releases/*.php`` file with relevant data. The release
+announcement file should list in detail:
+
+ a. security fixes,
+
+ b. changes in behavior (whether due to a bug fix or not)
+
+7. Add a short notice to phpweb stating that there is a new release, and
 highlight the major important things (security fixes) and when it is important
 to upgrade.

@@ -244,11 +230,7 @@ to upgrade.

 b. Add the content for the news entry

-7. **Check mirrors have been synced before announcing or pushing news**
-  Try, f.e. http://www.php.net/get/php-5.5.1.tar.bz2/from/a/mirror
-  Try several mirrors, mirrors may update slowly (may take an hour)
-
-8. Commit all the changes to their respective git repos
+8. Commit all the changes.

 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
@@ -153,18 +153,3 @@ ADDING SHARED MODULE SUPPORT TO A MODULE
        #ifdef COMPILE_DL_FOO
        ZEND_GET_MODULE(foo)
        #endif
-
-PECL SITE CONFORMITY
-
-  If you plan to release an extension to the PECL website, there are several
-  points to be regarded.
-
- 1. Add LICENSE or COPYING to the package.xml
-
- 2. The following should be defined in one of the extension header files
-
-        #define PHP_FOO_VERSION "1.2.3"
-
-    This macros has to be used within your foo_module_entry to indicate the
-    extension version.
-
@@ -1,6 +1,6 @@
 [IMPORTANT NOTICE]
 ------------------
- Failed tests usually indicate a problem with your local system setup
+ Failed tests usualy indicate a problem with your local system setup
 and not within PHP itself (at least for official PHP release versions).
 You may decide to automaticaly submit a test summary to our QA workflow
 at the end of a test run.
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2014 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2014 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2014 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2014 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2014 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -625,7 +625,7 @@ TSRM_API int shmget(int key, int size, int flags)
 	shm->info	 = info_handle;
 	shm->descriptor = MapViewOfFileEx(shm->info, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);

-	if (NULL != shm->descriptor && created) {
+	if (created) {
 		shm->descriptor->shm_perm.key	= key;
 		shm->descriptor->shm_segsz		= size;
 		shm->descriptor->shm_ctime		= time(NULL);
@@ -639,10 +639,8 @@ TSRM_API int shmget(int key, int size, int flags)
 		shm->descriptor->shm_perm.mode	= shm->descriptor->shm_perm.seq	= 0;
 	}

-	if (NULL != shm->descriptor && (shm->descriptor->shm_perm.key != key || size > shm->descriptor->shm_segsz)) {
-		if (NULL != shm->segment) {
-			CloseHandle(shm->segment);
-		}
+	if (shm->descriptor->shm_perm.key != key || size > shm->descriptor->shm_segsz ) {
+		CloseHandle(shm->segment);
 		UnmapViewOfFile(shm->descriptor);
 		CloseHandle(shm->info);
 		return -1;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2014 The PHP Group                                |
+   | Copyright (c) 1997-2012 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -640,9 +640,6 @@ c. New functions
  - SPL
    - class_uses()

-  - SplFixedArray
-    - SplFixedArray::__wakeup() (5.4.18)
-
 d. New global constants

  - CURLOPT_MAX_RECV_SPEED_LARGE
@@ -10,7 +10,7 @@ libZend_la_SOURCES=\
 	zend_ini_parser.y zend_ini_scanner.l \
 	zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \
 	zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \
-	zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
+	zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
 	zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
 	zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
 	zend_ini.c zend_qsort.c zend_objects.c zend_object_handlers.c \
@@ -6,7 +6,7 @@ fields and using different execution methods (call threading, switch threading
 and direct threading). As a result ZE2 got more than 20% speedup on raw PHP
 code execution (with specialized executor and direct threading execution
 method). As in most PHP applications raw execution speed isn't the limiting
-factor but system calls and database calls are, your mileage with this patch
+factor but system calls and database callls are, your mileage with this patch
 will vary.

 Most parts of the old zend_execute.c go into zend_vm_def.h. Here you can
@@ -435,7 +435,7 @@ Changes in the Zend Engine 2.0
      that of other object-oriented languages, such as Java: When the
      last reference to an object is destroyed the object's
      destructor, which is a class method name __destruct() that
-      receives no parameters, is called before the object is freed
+      recieves no parameters, is called before the object is freed
      from memory.

      Example:
@@ -1136,7 +1136,7 @@ Changes in the Zend Engine 1.0
      (supports breakpoints, expression evaluation, step-in/over,
      function call backtrace, and more).

-  The Zend Engine claims 100% compatibility with the engine of PHP
+  The Zend Engine claims 100% compatability with the engine of PHP
  3.0, and is shamelessly lying about it. Here's why:

    * Static variable initializers only accept scalar values
@@ -1161,6 +1161,6 @@ Changes in the Zend Engine 1.0
      printed the letter { and the contents of the variable $somevar in
      PHP 3.0), it will result in a parse error with the Zend Engine.
      In this case, you would have to change the code to print
-      "\{$somevar"; This incompatibility is due to the full variable
+      "\{$somevar"; This incompatability is due to the full variable
      reference within quoted strings feature added in the Zend
      Engine.
@@ -257,10 +257,6 @@ SOURCE=.\zend_ts_hash.c

 SOURCE=.\zend_variables.c
 # End Source File
-# Begin Source File
-
-SOURCE=.\zend_vm_opcodes.c
-# End Source File
 # End Group
 # Begin Group "Header Files"

@@ -287,10 +287,6 @@ SOURCE=.\zend_ts_hash.c

 SOURCE=.\zend_variables.c
 # End Source File
-# Begin Source File
-
-SOURCE=.\zend_vm_opcodes.c
-# End Source File
 # End Group
 # Begin Group "Header Files"

@@ -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 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2 2.6.4"
+  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2"

  # for standalone build of Zend Engine
  test -z "$SED" && SED=sed
@@ -12,7 +12,7 @@ AC_DEFUN([LIBZEND_BISON_CHECK],[
  bison_version=none
  if test "$YACC"; then
    AC_CACHE_CHECK([for bison version], php_cv_bison_version, [
-      bison_version_vars=`$YACC --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /g' | tr -d a-z`
+      bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
      php_cv_bison_version=invalid
      if test -n "$bison_version_vars"; then
        set $bison_version_vars
@@ -357,7 +357,7 @@ var_dump($global_var);
 test_unset3();
 var_dump($global_var);

-//Note: No error conditions relating to passing arguments can be tested
+//Note: No error conditions relating to passing arugments can be tested
 // because these are not functions but statements, it will result in syntax error.
 ?>
 ===DONE===
@@ -15,7 +15,7 @@ $f = fopen("/tmp/blah", "r");
 ?>
 ===DONE===
 --EXPECTF--
-fopen(/tmp/blah): failed to open stream: %s (2) in %s:%d
+fopen(/tmp/blah): failed to open stream: No such file or directory (2) in %s:%d

-Warning: fopen(/tmp/blah): failed to open stream: %s in %s on line %d
+Warning: fopen(/tmp/blah): failed to open stream: No such file or directory in %s on line %d
 ===DONE===
@@ -1,5 +1,5 @@
 --TEST--
-Bug #32428 (The @ warning error suppression operator is broken)
+Bug #32428 (The @ warning error supression operator is broken)
 --FILE--
 <?php 
  $data = @$not_exists; 
@@ -1,30 +0,0 @@
--TEST--
-Bug #60598 (cli/apache sapi segfault on objects manipulation)
--FILE--
-<?php
-define('OBJECT_COUNT', 10000);
-
-$containers = array();
-
-class Object {
-    protected $_guid = 0;
-    public function __construct() {
-		global $containers;
-		$this->guid = 1;
-        $containers[spl_object_hash($this)] = $this;
-    }
-    public function __destruct() {
-		global $containers;
-        $containers[spl_object_hash($this)] = NULL;
-    }
-}
-
-for ($i = 0; $i < OBJECT_COUNT; ++$i) {
-    new Object();
-}
-
-// You probably won't see this because of the "zend_mm_heap corrupted"
-?>
-If you see this, try to increase OBJECT_COUNT to 100,000
--EXPECT--
-If you see this, try to increase OBJECT_COUNT to 100,000
@@ -1,10 +1,9 @@
--TEST--
-test of larger than 8kb text file being parsed by require statement
--FILE--
-<?php
- file_put_contents('test.php',str_repeat('passed, ',1024));
- require('./test.php');
- unlink('test.php');
-?>
--EXPECT--
-passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed,Line truncated
+--TEST--
+test of larger than 8kb text file being parsed by require statement
+--FILE--
+<?php
+ file_put_contents('test.php',str_repeat('passed, ',1024));
+ require('test.php');
+?>
+--EXPECT--
+passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed,Line truncated
@@ -10,7 +10,7 @@ set_error_handler(function($errno, $errstr, $errfile, $errline){

 require 'notfound.php';
 --EXPECTF--
-error(require(notfound.php): failed to open stream: %s)
+error(require(notfound.php): failed to open stream: No such file or directory)
 Warning: Uncaught exception 'Exception' with message 'Foo' in %sbug60909_1.php:5
 Stack trace:
 #0 %sbug60909_1.php(8): {closure}(2, 'require(notfoun...', '%s', 8, Array)
@@ -1,13 +0,0 @@
--TEST--
-Bug #62343 (Show class_alias In get_declared_classes())
--FILE--
-<?php
-class a { }
-class_alias("a", "b");
-$c = get_declared_classes();
-var_dump(end($c));
-var_dump(prev($c));
-?>
--EXPECT--
-string(1) "b"
-string(1) "a"
@@ -1,74 +0,0 @@
--TEST--
-Test script to verify that magic methods should be called only once when accessing an unset property.
--CREDITS--
-Marco Pivetta <ocramius@gmail.com>
--FILE--
-<?php
-class Test {
-	public    $publicProperty;
-	protected $protectedProperty;
-	private   $privateProperty;
-
-	public function __construct() {
-		unset(
-			$this->publicProperty, 
-			$this->protectedProperty, 
-			$this->privateProperty
-		);
-	}
-
-	function __get($name) {
-		echo '__get ' . $name . "\n";
-		return $this->$name;
-	}
-
-	function __set($name, $value) {
-		echo '__set ' . $name . "\n";
-		$this->$name = $value;
-	}
-
-	function __isset($name) {
-		echo '__isset ' . $name . "\n";
-		return isset($this->$name);
-	}
-}
-
-$test = new Test();
-
-$test->nonExisting;
-$test->publicProperty;
-$test->protectedProperty;
-$test->privateProperty;
-isset($test->nonExisting);
-isset($test->publicProperty);
-isset($test->protectedProperty);
-isset($test->privateProperty);
-$test->nonExisting       = 'value';
-$test->publicProperty	 = 'value';
-$test->protectedProperty = 'value';
-$test->privateProperty   = 'value';
-
-?>
-
--EXPECTF--
-__get nonExisting
-
-Notice: Undefined property: Test::$nonExisting in %s on line %d
-__get publicProperty
-
-Notice: Undefined property: Test::$publicProperty in %s on line %d
-__get protectedProperty
-
-Notice: Undefined property: Test::$protectedProperty in %s on line %d
-__get privateProperty
-
-Notice: Undefined property: Test::$privateProperty in %s on line %d
-__isset nonExisting
-__isset publicProperty
-__isset protectedProperty
-__isset privateProperty
-__set nonExisting
-__set publicProperty
-__set protectedProperty
-__set privateProperty
-
@@ -1,53 +0,0 @@
--TEST--
-Bug #63762 - Sigsegv when Exception::$trace is changed by user
--FILE--
-<?php
-$e = new Exception();
-
-$ref = new ReflectionProperty($e, 'trace');
-$ref->setAccessible(TRUE);
-
-echo "Array of NULL:\n";
-$ref->setValue($e, array(NULL));
-
-var_dump($e->getTraceAsString());
-
-echo "\nArray of empty array:\n";
-$ref->setValue($e, array(array()));
-var_dump($e->getTraceAsString());
-
-echo "\nArray of array of NULL values:\n";
-$ref->setValue($e, array(array(
-    'file'  => NULL,
-    'line'  => NULL,
-    'class' => NULL,
-    'type'  => NULL,
-    'function' => NULL,
-    'args'  => NULL
-)));
-var_dump($e->getTraceAsString());
-?>
--EXPECTF--
-Array of NULL:
-
-Warning: Expected array for frame 0 in %s on line %d
-string(9) "#0 {main}"
-
-Array of empty array:
-string(36) "#0 [internal function]: ()
-#1 {main}"
-
-Array of array of NULL values:
-
-Warning: Function name is no string in %s on line %d
-
-Warning: Value for class is no string in %s on line %d
-
-Warning: Value for type is no string in %s on line %d
-
-Warning: Value for function is no string in %s on line %d
-
-Warning: args element is no array in %s on line %d
-string(60) "#0 [unknown function][unknown][unknown][unknown]()
-#1 {main}"
-
@@ -1,15 +0,0 @@
--TEST--
-Bug #63882 (zend_std_compare_objects crash on recursion)
--FILE--
-<?php
-class Test { public $x = 5; }
-
-$testobj1 = new Test;
-$testobj2 = new Test;
-$testobj1->x = $testobj1;
-$testobj2->x = $testobj2;
-
-var_dump($testobj1 == $testobj2);
-?>
--EXPECTF--
-Fatal error: Nesting level too deep - recursive dependency? in %sbug63882.php on line 9
@@ -1,20 +0,0 @@
--TEST--
-Bug #63976 (Parent class incorrectly using child constant in class property)
--FILE--
-<?php
-if (1) {
-  class Foo {
-    const TABLE = "foo";
-    public $table = self::TABLE;
-  }
-}
-if (1) {
-  class Bar extends Foo {
-    const TABLE = "bar";
-  }
-}
-$bar = new Bar();
-var_dump($bar->table);
-?>
--EXPECT--
-string(3) "foo"
@@ -1,15 +0,0 @@
--TEST--
-Bug #63982 (isset() inconsistently produces a fatal error on protected property)
--FILE--
-<?php
-class Test {
-        protected $protectedProperty;
-}
-
-$test = new Test();
-
-var_dump(isset($test->protectedProperty));
-var_dump(isset($test->protectedProperty->foo));
--EXPECTF--
-bool(false)
-bool(false)
@@ -1,28 +0,0 @@
--TEST--
-Bug #64239 (get_class_methods() changed behavior)
--FILE--
-<?php
-class A {
-	use T2 { t2method as Bmethod; }
-}
-
-class B extends A {
-}
-
-trait T2 {
-	public function t2method() {
-	}
-}
-print_r(get_class_methods("A"));
-print_r(get_class_methods("B"));
--EXPECT--
-Array
-(
-    [0] => Bmethod
-    [1] => t2method
-)
-Array
-(
-    [0] => Bmethod
-    [1] => t2method
-)
@@ -1,58 +0,0 @@
--TEST--
-Bug #64239 (debug_backtrace() changed behavior)
--FILE--
-<?php
-class A {
-	use T1;
-	public function test() { $this->backtrace(); }
-}
-
-class B {
-	use T2 { t2method as Bmethod; }
-}
-
-class C extends A {
-}
-
-trait T1 {
-	protected function backtrace() {
-		$b = new B();
-		$b->Bmethod();
-	}
-}
-trait T2 {
-	public function t2method() {
-		print_r(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1));
-	}
-}
-$a = new A();
-$a->test();
-
-$c = new C();
-$c->test();
-?>
--EXPECTF--
-Array
-(
-    [0] => Array
-        (
-            [file] => %sbug64239_2.php
-            [line] => %d
-            [function] => Bmethod
-            [class] => B
-            [type] => ->
-        )
-
-)
-Array
-(
-    [0] => Array
-        (
-            [file] => %sbug64239_2.php
-            [line] => %d
-            [function] => Bmethod
-            [class] => B
-            [type] => ->
-        )
-
-)
@@ -1,33 +0,0 @@
--TEST--
-Bug #64239 (debug_print_backtrace() changed behavior)
--FILE--
-<?php
-class A {
-	use T2 { t2method as Bmethod; }
-}
-
-class C extends A {
-	public function Bmethod() {
-		debug_print_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-    }
-}
-
-trait T2 {
-	public function t2method() {
-		debug_print_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-	}
-}
-
-$a = new A();
-$a->Bmethod();
-$a->t2method();
-
-$c = new C();
-$c->Bmethod();
-$c->t2method();
-?>
--EXPECTF--
-#0  A->Bmethod() called at [%sbug64239_3.php:%d]
-#0  A->t2method() called at [%sbug64239_3.php:%d]
-#0  C->Bmethod() called at [%sbug64239_3.php:%d]
-#0  A->t2method() called at [%sbug64239_3.php:%d]
@@ -1,31 +0,0 @@
--TEST--
-Bug #64239 (debug_print_backtrace() changed behavior)
--FILE--
-<?php
-class A {
-	use T2 { t2method as Bmethod; }
-}
-
-class C extends A {
-	public static function Bmethod() {
-		debug_print_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-    }
-}
-
-trait T2 {
-	public static function t2method() {
-		debug_print_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-	}
-}
-
-A::Bmethod();
-A::t2method();
-
-C::Bmethod();
-C::t2method();
-?>
--EXPECTF--
-#0  A::Bmethod() called at [%sbug64239_4.php:%d]
-#0  A::t2method() called at [%sbug64239_4.php:%d]
-#0  C::Bmethod() called at [%sbug64239_4.php:%d]
-#0  A::t2method() called at [%sbug64239_4.php:%d]
@@ -1,24 +0,0 @@
--TEST--
-Bug #64354 (Unserialize array of objects whose class can't be autoloaded fail)
--FILE--
-<?php
-class B implements Serializable {
-    public function serialize() {
-        throw new Exception("serialize");
-        return NULL;
-    }
-
-    public function unserialize($data) {
-    }
-}
-
-$data = array(new B);
-
-try {
-    serialize($data);
-} catch (Exception $e) { 
-    var_dump($e->getMessage());
-}
-?>
--EXPECTF--
-string(9) "serialize"
@@ -1,39 +0,0 @@
--TEST--
-Bug #64417 (BC break: ArrayAccess::&offsetGet() in a trait causes fatal error)
--FILE--
-<?php
-trait aa {
-    private $container = array();
-    public function offsetSet($offset, $value) {
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $this->container[$offset] = $value;
-        }
-    }
-    public function offsetExists($offset) {
-        return isset($this->container[$offset]);
-    }
-    public function offsetUnset($offset) {
-        unset($this->container[$offset]);
-    }
-    public function &offsetGet($offset) {
-	$result = null;
-        if (isset($this->container[$offset])) {
-            $result = &$this->container[$offset];
-        }
-        return $result;
-    }
-}
-
-class obj implements ArrayAccess {
-    use aa;
-}
-
-$o = new obj;
-$o['x'] = 1;
-++$o['x'];
-echo $o['x'], "\n";
--EXPECT--
-2
-
@@ -1,12 +0,0 @@
--TEST--
-Bug #64515 (Memoryleak when using the same variablename 2times in function declaration)
--FILE--
-<?php
-function foo($unused = null, $unused = null, $arg = array()) {
-	    return 1;
-}
-foo();
-echo "okey";
-?>
--EXPECT--
-okey
@@ -1,14 +0,0 @@
--TEST--
-Bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: segfault)
--FILE--
-<?php
-
-set_error_handler(function($no, $err) { var_dump($err); });
-
-function x($s) { $s['a'] = 1; };
-$y = '1';
-x($y);
-print_r($y);
--EXPECTF--
-string(25) "Illegal string offset 'a'"
-1
@@ -1,11 +0,0 @@
--TEST--
-Bug #64660 (Segfault on memory exhaustion within function definition)
--FILE--
-<?php
-function a() {
-        [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[Line truncated
-}
-echo "Done\n";
--EXPECTF--
-
-Parse error: memory exhausted in %s on line %d 
@@ -1,48 +0,0 @@
--TEST--
-Bug #64720 (SegFault on zend_deactivate)
--FILE--
-<?php
-class Stat {
-    private static $requests;
-    public static function getInstance() {
-        if (!isset(self::$requests[1])) {
-            self::$requests[1] = new self();
-        }
-        return self::$requests[1];
-    }
-    
-    public function __destruct() {
-        unset(self::$requests[1]);
-    }
-}
-
-class Foo {
-    public function __construct() {
-        Stat::getInstance();
-    }
-}
-
-class Error {
-    private $trace;
-    public function __construct() {
-        $this->trace = debug_backtrace(1);
-    }
-}
-
-class Bar {
-    public function __destruct() {
-        Stat::getInstance();
-        new Error();
-    }
-
-    public function test() {
-        new Error();
-    }
-}
-
-$foo = new Foo();
-$bar = new Bar();
-$bar->test();
-?>
--EXPECTF--
-Fatal error: Access to undeclared static property: Stat::$requests in %sbug64720.php on line 12
@@ -1,22 +0,0 @@
--TEST--
-Bug #64821 Custom Exceptions crash when internal properties overridden (variation 1)
--FILE--
-<?php
-
-class a extends exception {
-	public function __construct() {
-		$this->message = NULL;
-		$this->string  = NULL;
-		$this->code    = array();
-		$this->line = "hello";
-	}
-}
-
-throw new a;
-
-?>
--EXPECTF--
-Fatal error: Uncaught exception 'a' in %s:0
-Stack trace:
-#0 {main}
-  thrown in %s on line %d
@@ -1,19 +0,0 @@
--TEST--
-Bug #64821 Custom Exceptions crash when internal properties overridden (variation 2)
--FILE--
-<?php
-
-class a extends exception {
-	public function __construct() {
-		$this->line = array();
-	}
-}
-
-throw new a;
-
-?>
--EXPECTF--
-Fatal error: Uncaught exception 'a' in %s:0
-Stack trace:
-#0 {main}
-  thrown in %s on line %d
@@ -1,20 +0,0 @@
--TEST--
-Bug #64821 Custom Exceptions crash when internal properties overridden (variation 3)
--FILE--
-<?php
-
-class a extends exception {
-	public function __construct() {
-		$this->line = array();
-		$this->file = NULL;
-	}
-}
-
-throw new a;
-
-?>
--EXPECTF--
-Fatal error: Uncaught exception 'a' in :0
-Stack trace:
-#0 {main}
-  thrown in Unknown on line %d
@@ -1,47 +0,0 @@
--TEST--
-Bug #64896 (Segfault with gc_collect_cycles using unserialize on certain objects)
--XFAIL--
-We can not fix this bug without a significant (performace slow down) change to gc
--FILE--
-<?php
-$bar = NULL;
-class bad
-{
-	private $_private = array();
-
-	public function __construct()
-	{
-		$this->_private[] = 'php';
-	}
-
-	public function __destruct()
-	{
-		global $bar;
-		$bar = $this;
-	}
-}
-
-$foo = new stdclass;
-$foo->foo = $foo;
-$foo->bad = new bad;
-
-gc_disable();
-
-unserialize(serialize($foo));
-gc_collect_cycles();
-var_dump($bar); 
-/*  will output:
-object(bad)#4 (1) {
-  ["_private":"bad":private]=>
-  &UNKNOWN:0
-}
-*/
-?>
--EXPECTF--
-bject(bad)#%d (1) {
-  ["_private":"bad":private]=>
-  array(1) {
-    [0]=>
-    string(3) "php"
-  }
-}
@@ -1,40 +0,0 @@
--TEST--
-Bug #64960 (Segfault in gc_zval_possible_root)
--FILE--
-<?php
-// this makes ob_end_clean raise an error
-ob_end_flush();
-
-class ExceptionHandler {
-	public function __invoke (Exception $e)
-	{
-		// this triggers the custom error handler
-		ob_end_clean();
-	}
-}
-
-// this must be a class, closure does not trigger segfault
-set_exception_handler(new ExceptionHandler());
-
-// exception must be throwed from error handler.
-set_error_handler(function()
-{
-	$e = new Exception;
-	$e->_trace = debug_backtrace();
-	
-	throw $e;
-});
-
-// trigger error handler
-$a['waa'];
-?>
--EXPECTF--
-Notice: ob_end_flush(): failed to delete and flush buffer. No buffer to delete or flush in %sbug64960.php on line 3
-
-Fatal error: Uncaught exception 'Exception' in %sbug64960.php:19
-Stack trace:
-#0 [internal function]: {closure}(8, 'ob_end_clean():...', '%s', 9, Array)
-#1 %sbug64960.php(9): ob_end_clean()
-#2 [internal function]: ExceptionHandler->__invoke(Object(Exception))
-#3 {main}
-  thrown in %sbug64960.php on line 19
@@ -1,30 +0,0 @@
--TEST--
-Bug #64966 (segfault in zend_do_fcall_common_helper_SPEC)
--FILE--
-<?php
-error_reporting(E_ALL);
-set_error_handler(function($error) { throw new Exception(); }, E_RECOVERABLE_ERROR);
-
-function test($func) {
-	$a = $func("");
-	return true;
-}
-class A {
-	public function b() {
-		test("strlen");
-		test("iterator_apply");
-	}
-}
-
-$a = new A();
-$a->b();
-?>
--EXPECTF--
-Fatal error: Uncaught exception 'Exception' in %sbug64966.php:3
-Stack trace:
-#0 [internal function]: {closure}(4096, 'Argument 1 pass...', '%s', 6, Array)
-#1 %sbug64966.php(6): iterator_apply('')
-#2 %sbug64966.php(12): test('iterator_apply')
-#3 %sbug64966.php(17): A->b()
-#4 {main}
-  thrown in %sbug64966.php on line 3
@@ -1,30 +0,0 @@
--TEST--
-Bug #64988 (Class loading order affects E_STRICT warning)
--FILE--
-<?php
-abstract class Base1 {
-	public function insert(array $data){
-		return array_reverse($data);
-	}
-}
-
-class Noisy1 extends Base1 {
-	public function insert(array $data, $option1 = Null) {
-		if (!empty($option1)) {
-			$data['option1'] = $option1;
-		}
-		return parent::insert($data);
-	}
-}
-class Smooth1 extends Noisy1 {
-	public function insert(array $data) {
-		return parent::insert($data, count($data));
-	}
-}
-
-$o = new Smooth1();
-echo "okey";
-?>
--EXPECTF--
-Strict Standards: Declaration of Smooth1::insert() should be compatible with Noisy1::insert(array $data, $option1 = NULL) in %sbug64988.php on line 20
-okey
@@ -1,27 +0,0 @@
--TEST--
-Bug #65108 (is_callable() triggers Fatal Error)
--FILE--
-<?php
-class C {
-	private function f() {}
-	static function __callStatic($name, $args) {}
-}
-
-class B {
-	public function B() {
-		$isCallable = is_callable(array(new C, 'f'));
-		var_dump($isCallable);
-	}
-}
-
-new B();
-
-Class E {
-   private function f() {}
-   function __call($name, $args) {}
-}
-$isCallable = is_callable(array('E', 'f'));
-var_dump($isCallable);
--EXPECT--
-bool(false)
-bool(false)
@@ -1,21 +0,0 @@
--TEST--
-Bug #65254 (Exception not catchable when exception thrown in autoload with a namespace)
--FILE--
-<?php
-function __autoload($class)
-{
-    eval("namespace ns_test; class test {}");
-
-    throw new \Exception('abcd');
-}
-
-try
-{
-    \ns_test\test::go();
-}
-catch (Exception $e)
-{
-    echo 'caught';
-}
--EXPECT--
-caught
@@ -1,25 +0,0 @@
--TEST--
-Bug #65291 - get_defined_constants() causes PHP to crash in a very limited case.
--FILE--
-<?php
-
-trait TestTrait
-{
-	public static function testStaticFunction()
-	{
-		return __CLASS__;
-	}
-}
-class Tester
-{
-	use TestTrait;
-}
-
-$foo = Tester::testStaticFunction();
-get_defined_constants();
-get_defined_constants(true);
-
-echo $foo;
-?>
--EXPECT--
-Tester
@@ -1,22 +0,0 @@
--TEST--
-Bug #65322: compile time errors won't trigger auto loading
--FILE--
-<?php
-
-spl_autoload_register(function($class) {
-    var_dump($class);
-    class B {}
-});
-
-set_error_handler(function($_, $msg, $file) {
-    var_dump($msg, $file);
-    new B;
-});
-
-eval('class A { function a() {} function __construct() {} }');
-
-?>
--EXPECTF--
-string(50) "Redefining already defined constructor for class A"
-string(%d) "%s(%d) : eval()'d code"
-string(1) "B"
@@ -1,40 +0,0 @@
--TEST--
-Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
--FILE--
-<?php
-
-class ParentClass
-{
-    private static $_OBJECTS;
-
-    public static function Get()
-    {
-        self::$_OBJECTS[1] = new ChildClass();
-        return self::$_OBJECTS[1];    
-    }
-}
-
-class ChildClass extends ParentClass
-{
-    public $Manager;
-
-    function __construct()
-    {
-        $this->Manager = $this;
-    }
-
-    public static function &GetCurrent()
-    {
-        return ChildClass::Get();
-    }
-
-    public static function &Get()
-    {
-        return parent::Get();
-    }
-}
-
-$staff = ChildClass::GetCurrent();
-?>
--EXPECTF--
-Notice: Only variable references should be returned by reference in %sbug65372.php on line 30
@@ -1,29 +0,0 @@
--TEST--
-Bug #65579 (Using traits with get_class_methods causes segfault)
--FILE--
-<?php
-trait ParentTrait {
-    public function testMethod() { }
-}
-
-trait ChildTrait {
-    use ParentTrait {
-        testMethod as testMethodFromParentTrait;
-    }
-    public function testMethod() { }
-}
-
-class TestClass {
-    use ChildTrait;
-}
-
-$obj = new TestClass();
-var_dump(get_class_methods($obj));
-?>
--EXPECT--
-array(2) {
-  [0]=>
-  string(10) "testMethod"
-  [1]=>
-  string(25) "testmethodfromparenttrait"
-}
@@ -1,20 +0,0 @@
--TEST--
-Bug #65911 (scope resolution operator - strange behavior with $this)
--FILE--
-<?php
-class A {}
-
-class B
-{
-	public function go()
-	{
-		$this->foo = 'bar';
-		echo A::$this->foo; // should not output 'bar'
-	}
-}
-
-$obj = new B();
-$obj->go();
-?>
--EXPECTF--
-Fatal error: Access to undeclared static property: A::$this in %s on line %d
@@ -1,10 +0,0 @@
--TEST--
-Bug #65969 (Chain assignment with T_LIST failure)
--FILE--
-<?php
-$obj = new stdClass;
-list($a,$b) = $obj->prop = [1,2];
-var_dump($a,$b);
--EXPECT--
-int(1)
-int(2)
@@ -1,21 +0,0 @@
--TEST--
-Bug #66218 zend_register_functions breaks reflection
--SKIPIF--
-<?php
-if (PHP_SAPI != "cli") die("skip CLI only test");
-if (!function_exists("dl")) die("skip need dl");
-?>
--FILE--
-<?php
-$tab = get_extension_funcs("standard");
-$fcts = array("dl");
-foreach ($fcts as $fct) {
-	if (in_array($fct, $tab)) {
-		echo "$fct Ok\n";
-	}
-}
-?>
-Done
--EXPECTF--
-dl Ok
-Done
@@ -1,26 +0,0 @@
--TEST--
-Bug #66286: Incorrect object comparison with inheritance
--FILE--
-<?php
-
-abstract class first {
-    protected $someArray = array();
-}     
-
-class second extends first {    
-    protected $someArray = array();        
-    protected $someValue = null;
-
-    public function __construct($someValue) {
-        $this->someValue = $someValue;
-    }
-}
-
-$objFirst = new second('123');       
-$objSecond = new second('321');       
-
-var_dump ($objFirst == $objSecond);    
-
-?>
--EXPECT--
-bool(false)
@@ -3,7 +3,7 @@ Closure 044: Scope/bounding combination invariants; non static closures
 --FILE--
 <?php
 /* A non-static closure has a bound instance if it has a scope
- * and doesn't have an instance if it has no scope */
+ * and does't have an instance if it has no scope */

 $nonstaticUnscoped = function () { var_dump(isset(A::$priv)); var_dump(isset($this)); };

@@ -1,18 +0,0 @@
--TEST--
-Error message in error handler during compilation
--FILE--
-<?php
-
-set_error_handler(function($_, $msg, $file) {
-	var_dump($msg, $file);
-	echo $undefined;
-});
-
-eval('class A { function a() {} function __construct() {} }');
-
-?>
--EXPECTF--
-string(50) "Redefining already defined constructor for class A"
-string(%d) "%s(%d) : eval()'d code"
-
-Notice: Undefined variable: undefined in %s on line %d
@@ -1,5 +1,5 @@
 --TEST--
-GC 007: Unreferenced array cycle
+GC 007: Unreferensed array cycle
 --INI--
 zend.enable_gc=1
 --FILE--
@@ -1,5 +1,5 @@
 --TEST--
-GC 008: Unreferenced object cycle
+GC 008: Unreferensed object cycle
 --INI--
 zend.enable_gc=1
 --FILE--
@@ -1,5 +1,5 @@
 --TEST--
-GC 009: Unreferenced array-object cycle
+GC 009: Unreferensed array-object cycle
 --INI--
 zend.enable_gc=1
 --FILE--
@@ -16,4 +16,4 @@ class C implements IFoo {
 }

 --EXPECTF--
-Fatal error: Declaration of TFoo::oneArgument() must be compatible with IFoo::oneArgument($a) in %s on line %d
+Fatal error: Declaration of C::oneArgument() must be compatible with IFoo::oneArgument($a) in %s on line %d
@@ -23,4 +23,4 @@ $o = new CBroken;
 $o->foo(1);

 --EXPECTF--
-Fatal error: Declaration of TBroken2::foo($a, $b = 0) must be compatible with TBroken1::foo($a) in %s on line %d
+Fatal error: Declaration of TBroken1::foo($a) must be compatible with TBroken2::foo($a, $b = 0) in %s on line %d
@@ -23,4 +23,4 @@ $o = new CBroken;
 $o->foo(1);

 --EXPECTF--
-Fatal error: Declaration of TBroken2::foo($a) must be compatible with TBroken1::foo($a, $b = 0) in %s on line %d
+Fatal error: Declaration of TBroken1::foo($a, $b = 0) must be compatible with TBroken2::foo($a) in %s on line %d
@@ -1,36 +0,0 @@
--TEST--
-Bug #64070 (Inheritance with Traits failed with error)
--FILE--
-<?php
-trait first_trait
-{
-    function first_function()
-    {
-        echo "From First Trait\n";
-    }
-}
-
-trait second_trait
-{
-    use first_trait {
-        first_trait::first_function as second_function;
-    }
-
-    function first_function()
-    {
-        echo "From Second Trait\n";
-    }
-}
-
-class first_class
-{
-    use second_trait;
-}
-
-$obj = new first_class();
-$obj->first_function();
-$obj->second_function();
-?>
--EXPECT--
-From Second Trait
-From First Trait
@@ -1,34 +0,0 @@
--TEST--
-Bug #64235 (Insteadof not work for class method in 5.4.11)
--FILE--
-<?php
-
-class TestParentClass
-{
-    public function method()
-    {
-        print_r('Parent method');
-        print "\n";
-    }
-}
-
-trait TestTrait
-{
-    public function method()
-    {
-        print_r('Trait method');
-        print "\n";
-    }
-}
-
-class TestChildClass extends TestParentClass
-{
-    use TestTrait
-    {
-        TestTrait::method as methodAlias;
-        TestParentClass::method insteadof TestTrait;
-    }
-}
-?>
--EXPECTF--
-Fatal error: Class TestParentClass is not a trait, Only traits may be used in 'as' and 'insteadof' statements in %sbug64235.php on line %d
@@ -1,35 +0,0 @@
--TEST--
-Bug #64235 (Insteadof not work for class method in 5.4.11)
--FILE--
-<?php
-
-class TestParentClass
-{
-    public function method()
-    {
-        print_r('Parent method');
-        print "\n";
-    }
-}
-
-trait TestTrait
-{
-    public function method()
-    {
-        print_r('Trait method');
-        print "\n";
-    }
-}
-
-class TestChildClass extends TestParentClass
-{
-    use TestTrait
-    {
-        TestTrait::method as methodAlias;
-        TestParentClass::method as TestParent;
-    }
-}
-
-?>
--EXPECTF--
-Fatal error: Class TestParentClass is not a trait, Only traits may be used in 'as' and 'insteadof' statements in %sbug64235b.php on line %d
@@ -22,4 +22,4 @@ class TraitsTest1 {

 ?>
 --EXPECTF--	
-Fatal error: Declaration of THelloA::hello($a) must be compatible with THelloB::hello() in %s on line %d
+Fatal error: Declaration of THelloB::hello() must be compatible with THelloA::hello($a) in %s on line %d
@@ -23,4 +23,4 @@ class TraitsTest1 {

 ?>
 --EXPECTF--	
-Fatal error: Declaration of THelloB::hello() must be compatible with THelloA::hello($a) in %s on line %d
+Fatal error: Declaration of THelloA::hello($a) must be compatible with THelloB::hello() in %s on line %d
@@ -1,5 +1,5 @@
 --TEST--
-Overriding Conflicting Methods should not result in a notice/warning about collisions
+Overridding Conflicting Methods should not result in a notice/warning about collisions
 --FILE--
 <?php
 error_reporting(E_ALL);
@@ -10,9 +10,13 @@ trait c {
 	public function test() { return 2; }
 }

+trait b {
+	public function test() { return 1; }
+}
+
 class bar {
-	use foo, c { c::test insteadof foo; }
-	use foo, c { c::test insteadof foo; }
+	use foo, c { c::test insteadof foo, b; }
+	use foo, c { c::test insteadof foo, b; }
 }

 $x = new bar;
@@ -35,4 +35,4 @@ $o->sayHello(array());
 --EXPECTF--	
 World!

-Fatal error: Declaration of SayWorld::sayHello(Base $d) must be compatible with Base::sayHello(array $a) in %s on line %d
+Fatal error: Declaration of MyHelloWorld::sayHello() must be compatible with Base::sayHello(array $a) in %s on line %d
@@ -1,30 +0,0 @@
--TEST--
-Aliasing leading to conflict should result in error message
--FILE--
-<?php
-error_reporting(E_ALL);
-
-trait Hello {
-   public function hello() {
-     echo 'Hello';
-   }
-}
-
-trait World {
-   public function world() {
-     echo ' World!';
-   }
-}
-
-
-class MyClass {
-   use Hello, World { world as hello; }
-}
-
-$o = new MyClass();
-$o->hello();
-$o->world();
-
-?>
--EXPECTF--	
-Fatal error: Trait method hello has not been applied, because there are collisions with other trait methods on MyClass in %s on line %d
@@ -1,17 +0,0 @@
--TEST--
-Invalid conflict resolution (unused trait as lhs of "insteadof")
--FILE--
-<?php
-trait T1 {
-	function foo() {echo "T1\n";}
-}
-trait T2 {
-        function foo() {echo "T2\n";}
-}
-class C {
-	use T1 {
-		T2::foo insteadof T1;
-	}
-}
--EXPECTF--
-Fatal error: Required Trait T2 wasn't added to C in %slanguage015.php on line %d
@@ -1,17 +0,0 @@
--TEST--
-Invalid conflict resolution (unused trait as rhs of "insteadof")
--FILE--
-<?php
-trait T1 {
-	function foo() {echo "T1\n";}
-}
-trait T2 {
-        function foo() {echo "T2\n";}
-}
-class C {
-	use T1 {
-		T1::foo insteadof T2;
-	}
-}
--EXPECTF--
-Fatal error: Required Trait T2 wasn't added to C in %slanguage016.php on line %d
@@ -1,17 +0,0 @@
--TEST--
-Invalid conflict resolution (unused trait as lhs of "as")
--FILE--
-<?php
-trait T1 {
-	function foo() {echo "T1\n";}
-}
-trait T2 {
-        function foo() {echo "T2\n";}
-}
-class C {
-	use T1 {
-		T2::foo as private;
-	}
-}
--EXPECTF--
-Fatal error: Required Trait T2 wasn't added to C in %slanguage017.php on line %d
@@ -1,15 +0,0 @@
--TEST--
-abstract alias
--FILE--
-<?php
-trait T1 {
-	function foo() {}
-}
-class C1 {
-	use T1 {
-		T1::foo as abstract;
-	}
-}
-?>
--EXPECTF--
-Fatal error: Cannot use 'abstract' as method modifier in %s on line %d
@@ -1,15 +0,0 @@
--TEST--
-final alias
--FILE--
-<?php
-trait T1 {
-	function foo() {}
-}
-class C1 {
-	use T1 {
-		T1::foo as final;
-	}
-}
-?>
--EXPECTF--
-Fatal error: Cannot use 'final' as method modifier in %s on line %d
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -43,6 +43,10 @@
 # define GLOBAL_CONSTANTS_TABLE		EG(zend_constants)
 #endif

+#if defined(ZEND_WIN32) && ZEND_DEBUG
+BOOL WINAPI IsDebuggerPresent(VOID);
+#endif
+
 /* true multithread-shared globals */
 ZEND_API zend_class_entry *zend_standard_class_def = NULL;
 ZEND_API int (*zend_printf)(const char *format, ...);
@@ -127,7 +131,7 @@ ZEND_API zval zval_used_for_init; /* True global variable */
 /* version information */
 static char *zend_version_info;
 static uint zend_version_info_length;
-#define ZEND_CORE_VERSION_INFO	"Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2014 Zend Technologies\n"
+#define ZEND_CORE_VERSION_INFO	"Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2012 Zend Technologies\n"
 #define PRINT_ZVAL_INDENT 4

 static void print_hash(zend_write_func_t write_func, HashTable *ht, int indent, zend_bool is_object TSRMLS_DC) /* {{{ */
@@ -1087,19 +1091,17 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
 		error_filename = "Unknown";
 	}

+	va_start(args, format);
+
 #ifdef HAVE_DTRACE
 	if(DTRACE_ERROR_ENABLED()) {
 		char *dtrace_error_buffer;
-		va_start(args, format);
 		zend_vspprintf(&dtrace_error_buffer, 0, format, args);
-		DTRACE_ERROR(dtrace_error_buffer, (char *)error_filename, error_lineno);
+		DTRACE_ERROR(dtrace_error_buffer, error_filename, error_lineno);
 		efree(dtrace_error_buffer);
-		va_end(args);
 	}
 #endif /* HAVE_DTRACE */

-	va_start(args, format);
-
 	/* if we don't have a user defined error handler */
 	if (!EG(user_error_handler)
 		|| !(EG(user_error_handler_error_reporting) & type)
@@ -1179,7 +1181,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
 			 * such scripts recursivly, but some CG() variables may be
 			 * inconsistent. */

-			in_compilation = CG(in_compilation);
+			in_compilation = zend_is_compiling(TSRMLS_C);
 			if (in_compilation) {
 				saved_class_entry = CG(active_class_entry);
 				CG(active_class_entry) = NULL;
@@ -1191,7 +1193,6 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
 				SAVE_STACK(declare_stack);
 				SAVE_STACK(list_stack);
 				SAVE_STACK(context_stack);
-				CG(in_compilation) = 0;
 			}

 			if (call_user_function_ex(CG(function_table), NULL, orig_user_error_handler, &retval, 5, params, 1, NULL TSRMLS_CC) == SUCCESS) {
@@ -1216,7 +1217,6 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
 				RESTORE_STACK(declare_stack);
 				RESTORE_STACK(list_stack);
 				RESTORE_STACK(context_stack);
-				CG(in_compilation) = 1;
 			}

 			if (!EG(user_error_handler)) {
@@ -1238,13 +1238,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
 	va_end(args);

 	if (type == E_PARSE) {
-		/* eval() errors do not affect exit_status */
-		if (!(EG(current_execute_data) &&
-			EG(current_execute_data)->opline &&
-			EG(current_execute_data)->opline->opcode == ZEND_INCLUDE_OR_EVAL &&
-			EG(current_execute_data)->opline->extended_value == ZEND_EVAL)) {
-			EG(exit_status) = 255;
-		}
+		EG(exit_status) = 255;
 		zend_init_compiler_data_structures(TSRMLS_C);
 	}
 }
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -350,10 +350,6 @@ struct _zval_struct {
 #define Z_UNSET_ISREF(z)		Z_UNSET_ISREF_P(&(z))
 #define Z_SET_ISREF_TO(z, isref)	Z_SET_ISREF_TO_P(&(z), isref)

-#if ZEND_DEBUG
-#define zend_always_inline inline
-#define zend_never_inline
-#else
 #if defined(__GNUC__)
 #if __GNUC__ >= 3
 #define zend_always_inline inline __attribute__((always_inline))
@@ -362,6 +358,7 @@ struct _zval_struct {
 #define zend_always_inline inline
 #define zend_never_inline
 #endif
+
 #elif defined(_MSC_VER)
 #define zend_always_inline __forceinline
 #define zend_never_inline
@@ -369,7 +366,6 @@ struct _zval_struct {
 #define zend_always_inline inline
 #define zend_never_inline
 #endif
-#endif /* ZEND_DEBUG */

 #if (defined (__GNUC__) && __GNUC__ > 2 ) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX)
 # define EXPECTED(condition)   __builtin_expect(condition, 1)
@@ -441,7 +437,7 @@ struct _zend_trait_precedence {
 	
 	zend_class_entry** exclude_from_classes;
 	
-	union _zend_function* function; /* FIXME: kept in 5.4 for BC, not used */
+	union _zend_function* function;
 };
 typedef struct _zend_trait_precedence zend_trait_precedence;

@@ -459,7 +455,7 @@ struct _zend_trait_alias {
 	*/
 	zend_uint modifiers;
 	
-	union _zend_function* function; /* FIXME: kept in 5.4 for BC, not used */
+	union _zend_function* function;
 };
 typedef struct _zend_trait_alias zend_trait_alias;

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -1022,41 +1022,6 @@ ZEND_API void zend_merge_properties(zval *obj, HashTable *properties, int destro
 }
 /* }}} */

-static int zval_update_class_constant(zval **pp, int is_static, int offset TSRMLS_DC) /* {{{ */
-{
-	if ((Z_TYPE_PP(pp) & IS_CONSTANT_TYPE_MASK) == IS_CONSTANT ||
-	    (Z_TYPE_PP(pp) & IS_CONSTANT_TYPE_MASK) == IS_CONSTANT_ARRAY) {	    
-		zend_class_entry **scope = EG(in_execution)?&EG(scope):&CG(active_class_entry);
-
-		if ((*scope)->parent) {
-			zend_class_entry *ce = *scope;
-			HashPosition pos;
-			zend_property_info *prop_info;
-
-			do {
-				for (zend_hash_internal_pointer_reset_ex(&ce->properties_info, &pos);
-				     zend_hash_get_current_data_ex(&ce->properties_info, (void **) &prop_info, &pos) == SUCCESS;
-				     zend_hash_move_forward_ex(&ce->properties_info, &pos)) {
-					if (is_static == ((prop_info->flags & ZEND_ACC_STATIC) != 0) &&
-					    offset == prop_info->offset) {
-						int ret;
-						zend_class_entry *old_scope = *scope;
-						*scope = prop_info->ce;
-						ret = zval_update_constant(pp, (void*)1 TSRMLS_CC);
-						*scope = old_scope;
-						return ret;
-					}
-				}				
-				ce = ce->parent;
-			} while (ce);
-			
-		}
-		return zval_update_constant(pp, (void*)1 TSRMLS_CC);
-	}
-	return 0;
-}
-/* }}} */
-
 ZEND_API void zend_update_class_constants(zend_class_entry *class_type TSRMLS_DC) /* {{{ */
 {
 	if ((class_type->ce_flags & ZEND_ACC_CONSTANTS_UPDATED) == 0 || (!CE_STATIC_MEMBERS(class_type) && class_type->default_static_members_count)) {
@@ -1069,7 +1034,7 @@ ZEND_API void zend_update_class_constants(zend_class_entry *class_type TSRMLS_DC

 		for (i = 0; i < class_type->default_properties_count; i++) {
 			if (class_type->default_properties_table[i]) {
-				zval_update_class_constant(&class_type->default_properties_table[i], 0, i TSRMLS_CC);
+				zval_update_constant(&class_type->default_properties_table[i], (void**)1 TSRMLS_CC);
 			}
 		}

@@ -1110,7 +1075,7 @@ ZEND_API void zend_update_class_constants(zend_class_entry *class_type TSRMLS_DC
 		}

 		for (i = 0; i < class_type->default_static_members_count; i++) {
-			zval_update_class_constant(&CE_STATIC_MEMBERS(class_type)[i], 1, i TSRMLS_CC);
+			zval_update_constant(&CE_STATIC_MEMBERS(class_type)[i], (void**)1 TSRMLS_CC);
 		}

 		*scope = old_scope;
@@ -1143,7 +1108,7 @@ ZEND_API void object_properties_init(zend_object *object, zend_class_entry *clas

 /* This function requires 'properties' to contain all props declared in the
 * class and all props being public. If only a subset is given or the class
- * has protected members then you need to merge the properties separately by
+ * has protected members then you need to merge the properties seperately by
 * calling zend_merge_properties(). */
 ZEND_API int _object_and_properties_init(zval *arg, zend_class_entry *class_type, HashTable *properties ZEND_FILE_LINE_DC TSRMLS_DC) /* {{{ */
 {
@@ -2514,12 +2479,7 @@ ZEND_API int zend_register_class_alias_ex(const char *name, int name_len, zend_c
 	char *lcname = zend_str_tolower_dup(name, name_len);
 	int ret;

-	if (lcname[0] == '\\') {
-		ret = zend_hash_add(CG(class_table), lcname+1, name_len, &ce, sizeof(zend_class_entry *), NULL);
-	} else {
-		ret = zend_hash_add(CG(class_table), lcname, name_len+1, &ce, sizeof(zend_class_entry *), NULL);
-	}
-
+	ret = zend_hash_add(CG(class_table), lcname, name_len+1, &ce, sizeof(zend_class_entry *), NULL);
 	efree(lcname);
 	if (ret == SUCCESS) {
 		ce->refcount++;
@@ -2784,8 +2744,8 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca
 		}
 		if ((check_flags & IS_CALLABLE_CHECK_NO_ACCESS) == 0 &&
 		    (fcc->calling_scope &&
-		     ((fcc->object_ptr && fcc->calling_scope->__call) ||
-		      (!fcc->object_ptr && fcc->calling_scope->__callstatic)))) {
+		     (fcc->calling_scope->__call ||
+		      fcc->calling_scope->__callstatic))) {
 			if (fcc->function_handler->op_array.fn_flags & ZEND_ACC_PRIVATE) {
 				if (!zend_check_private(fcc->function_handler, fcc->object_ptr ? Z_OBJCE_P(fcc->object_ptr) : EG(scope), lmname, mlen TSRMLS_CC)) {
 					retval = 0;
@@ -3748,8 +3708,6 @@ ZEND_API int zend_update_static_property(zend_class_entry *scope, const char *na
 				(*property)->value = value->value;
 				if (Z_REFCOUNT_P(value) > 0) {
 					zval_copy_ctor(*property);
-				} else {
-					efree(value);
 				}
 			} else {
 				zval *garbage = *property;
@@ -3918,63 +3876,6 @@ ZEND_API void zend_restore_error_handling(zend_error_handling *saved TSRMLS_DC)
 }
 /* }}} */

-ZEND_API const char* zend_find_alias_name(zend_class_entry *ce, const char *name, zend_uint len) /* {{{ */
-{
-	zend_trait_alias *alias, **alias_ptr;
-
-	if ((alias_ptr = ce->trait_aliases)) {
-		alias = *alias_ptr;
-		while (alias) {
-			if (alias->alias_len == len &&
-				!strncasecmp(name, alias->alias, alias->alias_len)) {
-				return alias->alias;
-			}
-			alias_ptr++;
-			alias = *alias_ptr;
-		}
-	}
-
-	return name;
-}
-/* }}} */
-
-ZEND_API const char* zend_resolve_method_name(zend_class_entry *ce, zend_function *f) /* {{{ */
-{
-	zend_function *func;
-	HashPosition iterator;
-	HashTable *function_table;
-
-	if (f->common.type != ZEND_USER_FUNCTION ||
-	    *(f->op_array.refcount) < 2 ||
-	    !f->common.scope ||
-	    !f->common.scope->trait_aliases) {
-		return f->common.function_name;
-	}
-
-	function_table = &ce->function_table;
-	zend_hash_internal_pointer_reset_ex(function_table, &iterator);
-	while (zend_hash_get_current_data_ex(function_table, (void **)&func, &iterator) == SUCCESS) {
-		if (func == f) {
-			char *name;
-			uint len;
-			ulong idx;
-
-			if (zend_hash_get_current_key_ex(function_table, &name, &len, &idx, 0, &iterator) != HASH_KEY_IS_STRING) {
-				return f->common.function_name;
-			}
-			--len;
-			if (len == strlen(f->common.function_name) &&
-			    !strncasecmp(name, f->common.function_name, len)) {
-				return f->common.function_name;
-			}
-			return zend_find_alias_name(f->common.scope, name, len);
-		}
-		zend_hash_move_forward_ex(function_table, &iterator);
-	}
-	return f->common.function_name;
-}
-/* }}} */
-
 /*
 * Local variables:
 * tab-width: 4
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -60,7 +60,7 @@ typedef struct _zend_fcall_info_cache {
 	zval *object_ptr;
 } zend_fcall_info_cache;

-#define ZEND_NS_NAME(ns, name)			ns "\\" name
+#define ZEND_NS_NAME(ns, name)			ns"\\"name

 #define ZEND_FN(name) zif_##name
 #define ZEND_MN(name) zim_##name
@@ -90,7 +90,7 @@ typedef struct _zend_fcall_info_cache {
 #define ZEND_NS_RAW_FENTRY(ns, zend_name, name, arg_info, flags)	ZEND_RAW_FENTRY(ZEND_NS_NAME(ns, zend_name), name, arg_info, flags)
 #define ZEND_NS_RAW_NAMED_FE(ns, zend_name, name, arg_info)			ZEND_NS_RAW_FENTRY(ns, #zend_name, name, arg_info, 0)

-#define ZEND_NS_NAMED_FE(ns, zend_name, name, arg_info)	ZEND_NS_FENTRY(ns, zend_name, name, arg_info, 0)
+#define ZEND_NS_NAMED_FE(ns, zend_name, name, arg_info)	ZEND_NS_FENTRY(ns, #zend_name, name, arg_info, 0)
 #define ZEND_NS_FE(ns, name, arg_info)					ZEND_NS_FENTRY(ns, name, ZEND_FN(name), arg_info, 0)
 #define ZEND_NS_DEP_FE(ns, name, arg_info)				ZEND_NS_FENTRY(ns, name, ZEND_FN(name), arg_info, ZEND_ACC_DEPRECATED)
 #define ZEND_NS_FALIAS(ns, name, alias, arg_info)		ZEND_NS_FENTRY(ns, name, ZEND_FN(alias), arg_info, 0)
@@ -279,9 +279,9 @@ ZEND_API void zend_class_implements(zend_class_entry *class_entry TSRMLS_DC, int
 ZEND_API int zend_register_class_alias_ex(const char *name, int name_len, zend_class_entry *ce TSRMLS_DC);

 #define zend_register_class_alias(name, ce) \
-	zend_register_class_alias_ex(name, sizeof(name)-1, ce TSRMLS_CC)
+	zend_register_class_alias_ex(name, sizeof(name)-1, ce TSRMLS_DC)
 #define zend_register_ns_class_alias(ns, name, ce) \
-	zend_register_class_alias_ex(ZEND_NS_NAME(ns, name), sizeof(ZEND_NS_NAME(ns, name))-1, ce TSRMLS_CC)
+	zend_register_class_alias_ex(ZEND_NS_NAME(ns, name), sizeof(ZEND_NS_NAME(ns, name))-1, ce TSRMLS_DC)

 ZEND_API int zend_disable_function(char *function_name, uint function_name_length TSRMLS_DC);
 ZEND_API int zend_disable_class(char *class_name, uint class_name_length TSRMLS_DC);
@@ -461,7 +461,7 @@ ZEND_API extern const zend_fcall_info_cache empty_fcall_info_cache;
 */
 ZEND_API int zend_fcall_info_init(zval *callable, uint check_flags, zend_fcall_info *fci, zend_fcall_info_cache *fcc, char **callable_name, char **error TSRMLS_DC);

-/** Clear arguments connected with zend_fcall_info *fci
+/** Clear argumens connected with zend_fcall_info *fci
 * If free_mem is not zero then the params array gets free'd as well
 */
 ZEND_API void zend_fcall_info_args_clear(zend_fcall_info *fci, int free_mem);
@@ -499,7 +499,7 @@ ZEND_API int zend_fcall_info_argv(zend_fcall_info *fci TSRMLS_DC, int argc, va_l
 ZEND_API int zend_fcall_info_argn(zend_fcall_info *fci TSRMLS_DC, int argc, ...);

 /** Call a function using information created by zend_fcall_info_init()/args().
- * If args is given then those replace the argument info in fci is temporarily.
+ * If args is given then those replace the arguement info in fci is temporarily.
 */
 ZEND_API int zend_fcall_info_call(zend_fcall_info *fci, zend_fcall_info_cache *fcc, zval **retval, zval *args TSRMLS_DC);

@@ -517,9 +517,6 @@ ZEND_API void zend_reset_all_cv(HashTable *symbol_table TSRMLS_DC);

 ZEND_API void zend_rebuild_symbol_table(TSRMLS_D);

-ZEND_API const char* zend_find_alias_name(zend_class_entry *ce, const char *name, zend_uint len);
-ZEND_API const char* zend_resolve_method_name(zend_class_entry *ce, zend_function *f);
-
 #define add_method(arg, key, method)	add_assoc_function((arg), (key), (method))

 ZEND_API ZEND_FUNCTION(display_disabled_function);
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -672,7 +672,7 @@ static inline unsigned int zend_mm_high_bit(size_t _size)
 #elif defined(__GNUC__) && defined(__x86_64__)
 	unsigned long n;

-        __asm__("bsr %1,%0\n\t" : "=r" (n) : "rm"  (_size));
+        __asm__("bsrq %1,%0\n\t" : "=r" (n) : "rm"  (_size));
        return (unsigned int)n;
 #elif defined(_MSC_VER) && defined(_M_IX86)
 	__asm {
@@ -698,12 +698,12 @@ static inline unsigned int zend_mm_low_bit(size_t _size)
 #elif defined(__GNUC__) && defined(__x86_64__)
        unsigned long n;

-        __asm__("bsf %1,%0\n\t" : "=r" (n) : "rm"  (_size));
+        __asm__("bsfq %1,%0\n\t" : "=r" (n) : "rm"  (_size));
        return (unsigned int)n;
 #elif defined(_MSC_VER) && defined(_M_IX86)
 	__asm {
 		bsf eax, _size
-	}
+   }
 #else
 	static const int offset[16] = {4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0};
 	unsigned int n;
@@ -2461,7 +2461,7 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
 	size_t res = nmemb;
 	unsigned long overflow = 0;

-	__asm__ ("mull %3\n\taddl %4,%0\n\tadcl $0,%1"
+	__asm__ ("mull %3\n\taddl %4,%0\n\tadcl %1,%1"
 	     : "=&a"(res), "=&d" (overflow)
 	     : "%0"(res),
 	       "rm"(size),
@@ -2481,22 +2481,12 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
        size_t res = nmemb;
        unsigned long overflow = 0;

-#ifdef __ILP32__ /* x32 */
-# define LP_SUFF "l"
-#else /* amd64 */
-# define LP_SUFF "q"
-#endif
-
-        __asm__ ("mul" LP_SUFF  " %3\n\t"
-                 "add %4,%0\n\t"
-                 "adc $0,%1"
+        __asm__ ("mulq %3\n\taddq %4,%0\n\tadcq %1,%1"
             : "=&a"(res), "=&d" (overflow)
             : "%0"(res),
               "rm"(size),
               "rm"(offset));

-#undef LP_SUFF
-
        if (UNEXPECTED(overflow)) {
                zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset);
                return 0;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -1025,13 +1025,6 @@ ZEND_FUNCTION(get_object_vars)
 }
 /* }}} */

-static int same_name(const char *key, const char *name, zend_uint name_len)
-{
-	char *lcname = zend_str_tolower_dup(name, name_len);
-	int ret = memcmp(lcname, key, name_len) == 0;
-	efree(lcname);
-	return ret;
-}

 /* {{{ proto array get_class_methods(mixed class)
   Returns an array of method names for class or class instance. */
@@ -1079,26 +1072,14 @@ ZEND_FUNCTION(get_class_methods)
 			uint len = strlen(mptr->common.function_name);

 			/* Do not display old-style inherited constructors */
-			if (zend_hash_get_current_key_ex(&ce->function_table, &key, &key_len, &num_index, 0, &pos) != HASH_KEY_IS_STRING) {
+			if ((mptr->common.fn_flags & ZEND_ACC_CTOR) == 0 ||
+			    mptr->common.scope == ce ||
+			    zend_hash_get_current_key_ex(&ce->function_table, &key, &key_len, &num_index, 0, &pos) != HASH_KEY_IS_STRING ||
+			    zend_binary_strcasecmp(key, key_len-1, mptr->common.function_name, len) == 0) {
+
 				MAKE_STD_ZVAL(method_name);
 				ZVAL_STRINGL(method_name, mptr->common.function_name, len, 1);
 				zend_hash_next_index_insert(return_value->value.ht, &method_name, sizeof(zval *), NULL);
-			} else if ((mptr->common.fn_flags & ZEND_ACC_CTOR) == 0 ||
-			    mptr->common.scope == ce ||
-			    zend_binary_strcasecmp(key, key_len-1, mptr->common.function_name, len) == 0) {
-
-				if (mptr->type == ZEND_USER_FUNCTION &&
-				    *mptr->op_array.refcount > 1 &&
-			    	(len != key_len - 1 ||
-			    	 !same_name(key, mptr->common.function_name, len))) {
-					MAKE_STD_ZVAL(method_name);
-					ZVAL_STRINGL(method_name, zend_find_alias_name(mptr->common.scope, key, key_len - 1), key_len - 1, 1);
-					zend_hash_next_index_insert(return_value->value.ht, &method_name, sizeof(zval *), NULL);
-				} else {
-					MAKE_STD_ZVAL(method_name);
-					ZVAL_STRINGL(method_name, mptr->common.function_name, len, 1);
-					zend_hash_next_index_insert(return_value->value.ht, &method_name, sizeof(zval *), NULL);
-				}
 			}
 		}
 		zend_hash_move_forward_ex(&ce->function_table, &pos);
@@ -1399,8 +1380,15 @@ ZEND_FUNCTION(class_alias)
 		return;
 	}

-	found = zend_lookup_class_ex(class_name, class_name_len, NULL, autoload, &ce TSRMLS_CC);
+	if (!autoload) {
+		lc_name = do_alloca(class_name_len + 1, use_heap);
+		zend_str_tolower_copy(lc_name, class_name, class_name_len);
 	
+		found = zend_hash_find(EG(class_table), lc_name, class_name_len+1, (void **) &ce);
+		free_alloca(lc_name, use_heap);
+	} else {
+		found = zend_lookup_class(class_name, class_name_len, &ce TSRMLS_CC);
+	}
 	if (found == SUCCESS) {
 		if ((*ce)->type == ZEND_USER_CLASS) { 
 			if (zend_register_class_alias_ex(alias_name, alias_name_len, *ce TSRMLS_CC) == SUCCESS) {
@@ -1652,6 +1640,7 @@ ZEND_FUNCTION(restore_exception_handler)
 }
 /* }}} */

+
 static int copy_class_or_interface_name(zend_class_entry **pce TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
 {
 	zval *array = va_arg(args, zval *);
@@ -1662,13 +1651,7 @@ static int copy_class_or_interface_name(zend_class_entry **pce TSRMLS_DC, int nu

 	if ((hash_key->nKeyLength==0 || hash_key->arKey[0]!=0)
 		&& (comply_mask == (ce->ce_flags & mask))) {
-		if (ce->refcount > 1 && 
-		    (ce->name_length != hash_key->nKeyLength - 1 || 
-		     !same_name(hash_key->arKey, ce->name, ce->name_length))) {
-			add_next_index_stringl(array, hash_key->arKey, hash_key->nKeyLength - 1, 1);
-		} else {
-			add_next_index_stringl(array, ce->name, ce->name_length, 1);
-		}
+		add_next_index_stringl(array, ce->name, ce->name_length, 1);
 	}
 	return ZEND_HASH_APPLY_KEEP;
 }
@@ -1919,11 +1902,6 @@ static int add_constant_info(zend_constant *constant, void *arg TSRMLS_DC)
 	zval *name_array = (zval *)arg;
 	zval *const_val;

-	if (!constant->name) {
-		/* skip special constants */
-		return 0;
-	}
-
 	MAKE_STD_ZVAL(const_val);
 	*const_val = constant->value;
 	zval_copy_ctor(const_val);
@@ -1991,16 +1969,11 @@ ZEND_FUNCTION(get_defined_constants)
 		while (zend_hash_get_current_data_ex(EG(zend_constants), (void **) &val, &pos) != FAILURE) {
 			zval *const_val;

-			if (!val->name) {
-				/* skip special constants */
-				goto next_constant;
-			}
-
 			if (val->module_number == PHP_USER_CONSTANT) {
 				module_number = i;
 			} else if (val->module_number > i || val->module_number < 0) {
 				/* should not happen */
-				goto next_constant;
+				goto bad_module_id;
 			} else {
 				module_number = val->module_number;
 			}
@@ -2017,7 +1990,7 @@ ZEND_FUNCTION(get_defined_constants)
 			INIT_PZVAL(const_val);

 			add_assoc_zval_ex(modules[module_number], val->name, val->name_len, const_val);
-next_constant:
+bad_module_id:
 			zend_hash_move_forward_ex(EG(zend_constants), &pos);
 		}
 		efree(module_names);
@@ -2121,14 +2094,7 @@ ZEND_FUNCTION(debug_print_backtrace)
 			lineno = 0;
 		}

-		function_name = (ptr->function_state.function->common.scope &&
-			ptr->function_state.function->common.scope->trait_aliases) ?
-				zend_resolve_method_name(
-					ptr->object ?
-						Z_OBJCE_P(ptr->object) : 
-						ptr->function_state.function->common.scope,
-					ptr->function_state.function) :
-				ptr->function_state.function->common.function_name;
+		function_name = ptr->function_state.function->common.function_name;

 		if (function_name) {
 			if (ptr->object) {
@@ -2309,14 +2275,7 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int
 			filename = NULL;
 		}

-		function_name = (ptr->function_state.function->common.scope &&
-			ptr->function_state.function->common.scope->trait_aliases) ?
-				zend_resolve_method_name(
-					ptr->object ?
-						Z_OBJCE_P(ptr->object) : 
-						ptr->function_state.function->common.scope,
-					ptr->function_state.function) :
-				ptr->function_state.function->common.function_name;
+		function_name = ptr->function_state.function->common.function_name;

 		if (function_name) {
 			add_assoc_string_ex(stack_frame, "function", sizeof("function"), (char*)function_name, 1);
@@ -2389,7 +2348,7 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int
 				MAKE_STD_ZVAL(arg_array);
 				array_init(arg_array);

-				/* include_filename always points to the last filename of the last last called-function.
+				/* include_filename always points to the last filename of the last last called-fuction.
 				   if we have called include in the frame above - this is the file we have included.
 				 */

@@ -2452,49 +2411,36 @@ ZEND_FUNCTION(extension_loaded)
   Returns an array with the names of functions belonging to the named extension */
 ZEND_FUNCTION(get_extension_funcs)
 {
-	char *extension_name, *lcname;
-	int extension_name_len, array;
+	char *extension_name;
+	int extension_name_len;
 	zend_module_entry *module;
-	HashPosition iterator;
-	zend_function *zif;
+	const zend_function_entry *func;
+
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &extension_name, &extension_name_len) == FAILURE) {
 		return;
 	}
+
 	if (strncasecmp(extension_name, "zend", sizeof("zend"))) {
-		lcname = zend_str_tolower_dup(extension_name, extension_name_len);
-	} else {
-		lcname = estrdup("core");
-	}
-	if (zend_hash_find(&module_registry, lcname,
-		extension_name_len+1, (void**)&module) == FAILURE) {
-		efree(lcname);
-		RETURN_FALSE;
-	}
-
-	zend_hash_internal_pointer_reset_ex(CG(function_table), &iterator);
-	if (module->functions) {
-		/* avoid BC break, if functions list is empty, will return an empty array */
-		array_init(return_value);
-		array = 1;
-	} else {
-		array = 0;
-	}
-	while (zend_hash_get_current_data_ex(CG(function_table), (void **) &zif, &iterator) == SUCCESS) {
-		if (zif->common.type==ZEND_INTERNAL_FUNCTION
-			&& zif->internal_function.module == module) {
-			if (!array) {
-				array_init(return_value);
-				array = 1;
-			}
-			add_next_index_string(return_value, zif->common.function_name, 1);
+		char *lcname = zend_str_tolower_dup(extension_name, extension_name_len);
+		if (zend_hash_find(&module_registry, lcname,
+			extension_name_len+1, (void**)&module) == FAILURE) {
+			efree(lcname);
+			RETURN_FALSE;
 		}
-		zend_hash_move_forward_ex(CG(function_table), &iterator);
+		efree(lcname);
+
+		if (!(func = module->functions)) {
+			RETURN_FALSE;
+		}
+	} else {
+		func = builtin_functions;
 	}

-	efree(lcname);
+	array_init(return_value);

-	if (!array) {
-		RETURN_FALSE;
+	while (func->fname) {
+		add_next_index_string(return_value, func->fname, 1);
+		func++;
 	}
 }
 /* }}} */
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -905,7 +905,6 @@ static zend_bool opline_is_fetch_this(const zend_op *opline TSRMLS_DC) /* {{{ */
 {
 	if ((opline->opcode == ZEND_FETCH_W) && (opline->op1_type == IS_CONST)
 		&& (Z_TYPE(CONSTANT(opline->op1.constant)) == IS_STRING)
-		&& ((opline->extended_value & ZEND_FETCH_STATIC_MEMBER) != ZEND_FETCH_STATIC_MEMBER)
 		&& (Z_HASH_P(&CONSTANT(opline->op1.constant)) == THIS_HASHVAL)
 		&& (Z_STRLEN(CONSTANT(opline->op1.constant)) == (sizeof("this")-1))
 		&& !memcmp(Z_STRVAL(CONSTANT(opline->op1.constant)), "this", sizeof("this"))) {
@@ -1724,7 +1723,7 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
 	}

 	{
-		/* Push a separator to the switch and foreach stacks */
+		/* Push a seperator to the switch and foreach stacks */
 		zend_switch_entry switch_entry;

 		switch_entry.cond.op_type = IS_UNUSED;
@@ -1799,7 +1798,7 @@ void zend_do_end_function_declaration(const znode *function_token TSRMLS_DC) /*
 	zend_do_return(NULL, 0 TSRMLS_CC);

 	pass_two(CG(active_op_array) TSRMLS_CC);
-	zend_release_labels(0 TSRMLS_CC);
+	zend_release_labels(TSRMLS_C);

 	if (CG(active_class_entry)) {
 		zend_check_magic_method_implementation(CG(active_class_entry), (zend_function*)CG(active_op_array), E_COMPILE_ERROR TSRMLS_CC);
@@ -1818,7 +1817,7 @@ void zend_do_end_function_declaration(const znode *function_token TSRMLS_DC) /*
 	CG(active_op_array) = function_token->u.op_array;


-	/* Pop the switch and foreach separators */
+	/* Pop the switch and foreach seperators */
 	zend_stack_del_top(&CG(switch_cond_stack));
 	zend_stack_del_top(&CG(foreach_copy_stack));
 }
@@ -2321,14 +2320,13 @@ void zend_do_goto(const znode *label TSRMLS_DC) /* {{{ */
 }
 /* }}} */

-void zend_release_labels(int temporary TSRMLS_DC) /* {{{ */
+void zend_release_labels(TSRMLS_D) /* {{{ */
 {
 	if (CG(context).labels) {
 		zend_hash_destroy(CG(context).labels);
 		FREE_HASHTABLE(CG(context).labels);
-		CG(context).labels = NULL;
 	}
-	if (!temporary && !zend_stack_is_empty(&CG(context_stack))) {
+	if (!zend_stack_is_empty(&CG(context_stack))) {
 		zend_compiler_context *ctx;

 		zend_stack_top(&CG(context_stack), (void**)&ctx);
@@ -2585,7 +2583,7 @@ static int generate_free_foreach_copy(const zend_op *foreach_copy TSRMLS_DC) /*
 {
 	zend_op *opline;

-	/* If we reach the separator then stop applying the stack */
+	/* If we reach the seperator then stop applying the stack */
 	if (foreach_copy->result_type == IS_UNUSED && foreach_copy->op1_type == IS_UNUSED) {
 		return 1;
 	}
@@ -3268,11 +3266,11 @@ static void do_inheritance_check_on_method(zend_function *child, zend_function *

 	if (child->common.prototype && (child->common.prototype->common.fn_flags & ZEND_ACC_ABSTRACT)) {
 		if (!zend_do_perform_implementation_check(child, child->common.prototype TSRMLS_CC)) {
-			zend_error(E_COMPILE_ERROR, "Declaration of %s::%s() must be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, zend_get_function_declaration(child->common.prototype TSRMLS_CC)); 
+			zend_error(E_COMPILE_ERROR, "Declaration of %s::%s() must be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, zend_get_function_declaration(child->common.prototype? child->common.prototype : parent TSRMLS_CC)); 
 		}
 	} else if (EG(error_reporting) & E_STRICT || EG(user_error_handler)) { /* Check E_STRICT (or custom error handler) before the check so that we save some time */
 		if (!zend_do_perform_implementation_check(child, parent TSRMLS_CC)) {
-			char *method_prototype = zend_get_function_declaration(parent TSRMLS_CC);
+			char *method_prototype = zend_get_function_declaration(child->common.prototype? child->common.prototype : parent TSRMLS_CC);
 			zend_error(E_STRICT, "Declaration of %s::%s() should be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, method_prototype); 
 			efree(method_prototype);
 		}
@@ -3335,7 +3333,7 @@ static zend_bool do_inherit_property_access_check(HashTable *target_ht, zend_pro
 		if ((child_info->flags & ZEND_ACC_PPP_MASK) > (parent_info->flags & ZEND_ACC_PPP_MASK)) {
 			zend_error(E_COMPILE_ERROR, "Access level to %s::$%s must be %s (as in class %s)%s", ce->name, hash_key->arKey, zend_visibility_string(parent_info->flags), parent_ce->name, (parent_info->flags&ZEND_ACC_PUBLIC) ? "" : " or weaker");
 		} else if ((child_info->flags & ZEND_ACC_STATIC) == 0) {
-			zval_ptr_dtor(&(ce->default_properties_table[parent_info->offset]));
+			Z_DELREF_P(ce->default_properties_table[parent_info->offset]);
 			ce->default_properties_table[parent_info->offset] = ce->default_properties_table[child_info->offset];
 			ce->default_properties_table[child_info->offset] = NULL;
 			child_info->offset = parent_info->offset;
@@ -3529,7 +3527,8 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent

 	if (ce->ce_flags & ZEND_ACC_IMPLICIT_ABSTRACT_CLASS && ce->type == ZEND_INTERNAL_CLASS) {
 		ce->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;
-	} else if (!(ce->ce_flags & (ZEND_ACC_IMPLEMENT_INTERFACES|ZEND_ACC_IMPLEMENT_TRAITS))) {
+	} else if (!(ce->ce_flags & ZEND_ACC_IMPLEMENT_INTERFACES)
+				&& !(ce->ce_flags & ZEND_ACC_IMPLEMENT_TRAITS)) {
 		/* The verification will be done in runtime by ZEND_VERIFY_ABSTRACT_CLASS */
 		zend_verify_abstract_class(ce TSRMLS_CC);
 	}
@@ -3626,6 +3625,7 @@ ZEND_API void zend_do_implement_trait(zend_class_entry *ce, zend_class_entry *tr
 			}
 		}
 		ce->traits[ce->num_traits++] = trait;
+		trait->refcount++;
 	}
 }
 /* }}} */
@@ -3636,9 +3636,93 @@ static zend_bool zend_traits_method_compatibility_check(zend_function *fn, zend_
 	zend_uint other_flags = other_fn->common.scope->ce_flags;
 	
 	return zend_do_perform_implementation_check(fn, other_fn TSRMLS_CC)
-		&& ((other_fn->common.scope->ce_flags & ZEND_ACC_INTERFACE) || zend_do_perform_implementation_check(other_fn, fn TSRMLS_CC))
-		&& ((fn_flags & (ZEND_ACC_FINAL|ZEND_ACC_STATIC)) == 
-		    (other_flags & (ZEND_ACC_FINAL|ZEND_ACC_STATIC))); /* equal final and static qualifier */
+		&& zend_do_perform_implementation_check(other_fn, fn TSRMLS_CC)
+		&& ((fn_flags & ZEND_ACC_FINAL) == (other_flags & ZEND_ACC_FINAL))   /* equal final qualifier */
+		&& ((fn_flags & ZEND_ACC_STATIC)== (other_flags & ZEND_ACC_STATIC)); /* equal static qualifier */
+}
+/* }}} */
+
+static int zend_traits_merge_functions(zend_function *fn TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */
+{
+	size_t current;
+	size_t i;
+	size_t count;
+	HashTable* resulting_table;
+	HashTable** function_tables;
+	zend_class_entry *ce;
+	size_t collision = 0;
+	size_t abstract_solved = 0;
+	zend_function* other_trait_fn;
+
+	current			= va_arg(args, size_t);  /* index of current trait */
+	count			= va_arg(args, size_t);
+	resulting_table = va_arg(args, HashTable*);
+	function_tables = va_arg(args, HashTable**);
+	ce				= va_arg(args, zend_class_entry*);
+
+	for (i = 0; i < count; i++) {
+		if (i == current) {
+			continue; /* just skip this, cause its the table this function is applied on */
+		}
+		
+		if (zend_hash_quick_find(function_tables[i], hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void **)&other_trait_fn) == SUCCESS) {
+			/* if it is an abstract method, there is no collision */
+			if (other_trait_fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
+				/* Make sure they are compatible */
+				/* In case both are abstract, just check prototype, but need to do that in both directions */
+				if (!zend_traits_method_compatibility_check(fn, other_trait_fn TSRMLS_CC)) {
+					zend_error(E_COMPILE_ERROR, "Declaration of %s must be compatible with %s",
+												zend_get_function_declaration(fn TSRMLS_CC),
+												zend_get_function_declaration(other_trait_fn TSRMLS_CC));
+				}
+				
+				/* we can savely free and remove it from other table */
+				zend_function_dtor(other_trait_fn);
+				zend_hash_quick_del(function_tables[i], hash_key->arKey, hash_key->nKeyLength, hash_key->h);
+			} else {
+				/* if it is not an abstract method, there is still no collision */
+				/* if fn is an abstract method */
+				if (fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
+					/* Make sure they are compatible.
+					   Here, we already know other_trait_fn cannot be abstract, full check ok. */
+					if (!zend_traits_method_compatibility_check(fn, other_trait_fn TSRMLS_CC)) {
+						zend_error(E_COMPILE_ERROR, "Declaration of %s must be compatible with %s",
+													zend_get_function_declaration(fn TSRMLS_CC),
+													zend_get_function_declaration(other_trait_fn TSRMLS_CC));
+					}
+					
+					/* just mark as solved, will be added if its own trait is processed */
+					abstract_solved = 1;
+				} else {
+					/* but else, we have a collision of non-abstract methods */
+					collision++;
+					zend_function_dtor(other_trait_fn);
+					zend_hash_quick_del(function_tables[i], hash_key->arKey, hash_key->nKeyLength, hash_key->h);
+				}
+			}
+		}
+	}
+
+	if (collision) {
+		zend_function* class_fn;
+
+		/* make sure method is not already overridden in class */
+		if (zend_hash_quick_find(&ce->function_table, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void **)&class_fn) == FAILURE
+			|| class_fn->common.scope != ce) {
+			zend_error(E_COMPILE_ERROR, "Trait method %s has not been applied, because there are collisions with other trait methods on %s", fn->common.function_name, ce->name);
+		}
+
+		zend_function_dtor(fn);
+	} else if (abstract_solved) {
+		zend_function_dtor(fn);
+	} else {
+		/* Add it to result function table */
+		if (zend_hash_quick_add(resulting_table, hash_key->arKey, hash_key->nKeyLength, hash_key->h, fn, sizeof(zend_function), NULL)==FAILURE) {
+			zend_error(E_COMPILE_ERROR, "Trait method %s has not been applied, because failure occurred during updating resulting trait method table", fn->common.function_name);
+		}
+	}
+
+	return ZEND_HASH_APPLY_REMOVE;
 }
 /* }}} */

@@ -3683,84 +3767,66 @@ static void zend_add_magic_methods(zend_class_entry* ce, const char* mname, uint
 }
 /* }}} */

-static void zend_add_trait_method(zend_class_entry *ce, const char *name, const char *arKey, uint nKeyLength, zend_function *fn, HashTable **overriden TSRMLS_DC) /* {{{ */
+static int zend_traits_merge_functions_to_class(zend_function *fn TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */
 {
-	zend_function *existing_fn = NULL;
-	ulong h = zend_hash_func(arKey, nKeyLength);
+	zend_class_entry *ce = va_arg(args, zend_class_entry*);
+	zend_function* existing_fn = NULL;
+	zend_function fn_copy, *fn_copy_p;
+	zend_function* prototype = NULL;  /* is used to determine the prototype according to the inheritance chain */

-	if (zend_hash_quick_find(&ce->function_table, arKey, nKeyLength, h, (void**) &existing_fn) == SUCCESS) {
-		if (existing_fn->common.scope == ce) {
-			/* members from the current class override trait methods */
-			/* use temporary *overriden HashTable to detect hidden conflict */
-			if (*overriden) {
-				if (zend_hash_quick_find(*overriden, arKey, nKeyLength, h, (void**) &existing_fn) == SUCCESS) {
-					if (existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
-						/* Make sure the trait method is compatible with previosly declared abstract method */
-						if (!zend_traits_method_compatibility_check(fn, existing_fn TSRMLS_CC)) {
-							zend_error(E_COMPILE_ERROR, "Declaration of %s must be compatible with %s",
-								zend_get_function_declaration(fn TSRMLS_CC),
-								zend_get_function_declaration(existing_fn TSRMLS_CC));
-						}
-					} else if (fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
-						/* Make sure the abstract declaration is compatible with previous declaration */
-						if (!zend_traits_method_compatibility_check(existing_fn, fn TSRMLS_CC)) {
-							zend_error(E_COMPILE_ERROR, "Declaration of %s must be compatible with %s",
-								zend_get_function_declaration(fn TSRMLS_CC),
-								zend_get_function_declaration(existing_fn TSRMLS_CC));
-						}
-						return;
-					}
-				}
-			} else {
-				ALLOC_HASHTABLE(*overriden);
-				zend_hash_init_ex(*overriden, 2, NULL, NULL, 0, 0);
+	if (zend_hash_quick_find(&ce->function_table, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void**) &existing_fn) == FAILURE ||
+	    existing_fn->common.scope != ce) {
+		/* not found or inherited from other class or interface */
+		zend_function* parent_function;
+
+		if (ce->parent && zend_hash_quick_find(&ce->parent->function_table, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void**) &parent_function) != FAILURE) {
+			prototype = parent_function; /* ->common.fn_flags |= ZEND_ACC_ABSTRACT; */
+			
+			/* we got that method in the parent class, and are going to override it,
+			  except, if the trait is just asking to have an abstract method implemented. */
+			if (fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
+				/* then we clean up an skip this method */
+				zend_function_dtor(fn);
+				return ZEND_HASH_APPLY_REMOVE;
 			}
-			zend_hash_quick_update(*overriden, arKey, nKeyLength, h, fn, sizeof(zend_function), (void**)&fn);
-			return;
-		} else if (existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
-			/* Make sure the trait method is compatible with previosly declared abstract method */
-			if (!zend_traits_method_compatibility_check(fn, existing_fn TSRMLS_CC)) {
-				zend_error(E_COMPILE_ERROR, "Declaration of %s must be compatible with %s",
-					zend_get_function_declaration(fn TSRMLS_CC),
-					zend_get_function_declaration(existing_fn TSRMLS_CC));
-			}
-		} else if (fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
-			/* Make sure the abstract declaration is compatible with previous declaration */
-			if (!zend_traits_method_compatibility_check(existing_fn, fn TSRMLS_CC)) {
-				zend_error(E_COMPILE_ERROR, "Declaration of %s must be compatible with %s",
-					zend_get_function_declaration(fn TSRMLS_CC),
-					zend_get_function_declaration(existing_fn TSRMLS_CC));
-			}
-			return;
-		} else if ((existing_fn->common.scope->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) {
-			/* two trais can't define the same non-abstract method */
-#if 1
-			zend_error(E_COMPILE_ERROR, "Trait method %s has not been applied, because there are collisions with other trait methods on %s",
-				name, ce->name);
-#else		/* TODO: better errot message */
-			zend_error(E_COMPILE_ERROR, "Trait method %s::%s has not been applied as %s::%s, because of collision with %s::%s",
-				fn->common.scope->name, fn->common.function_name,
-				ce->name, name,
-				existing_fn->common.scope->name, existing_fn->common.function_name);
-#endif
-		} else {
-			/* inherited members are overridden by members inserted by traits */
-			/* check whether the trait method fulfills the inheritance requirements */
-			do_inheritance_check_on_method(fn, existing_fn TSRMLS_CC);
 		}
-	}
-
-	function_add_ref(fn);
-	zend_hash_quick_update(&ce->function_table, arKey, nKeyLength, h, fn, sizeof(zend_function), (void**)&fn);
-	zend_add_magic_methods(ce, arKey, nKeyLength, fn TSRMLS_CC);
-}
-/* }}} */
-
-static int zend_fixup_trait_method(zend_function *fn, zend_class_entry *ce TSRMLS_DC) /* {{{ */
-{
-	if ((fn->common.scope->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) {

 		fn->common.scope = ce;
+		fn->common.prototype = prototype;
+
+		if (prototype
+			&& (prototype->common.fn_flags & ZEND_ACC_IMPLEMENTED_ABSTRACT
+			|| prototype->common.fn_flags & ZEND_ACC_ABSTRACT)) {
+			fn->common.fn_flags |= ZEND_ACC_IMPLEMENTED_ABSTRACT;
+		} else if (fn->common.fn_flags & ZEND_ACC_IMPLEMENTED_ABSTRACT) {
+			/* remove ZEND_ACC_IMPLEMENTED_ABSTRACT flag, think it shouldn't be copied to class */
+			fn->common.fn_flags = fn->common.fn_flags - ZEND_ACC_IMPLEMENTED_ABSTRACT;
+		}
+
+		/* check whether the trait method fullfills the inheritance requirements */
+		if (prototype) {
+			do_inheritance_check_on_method(fn, prototype TSRMLS_CC);
+		}
+
+		/* one more thing: make sure we properly implement an abstract method */
+		if (existing_fn && existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
+			prototype = fn->common.prototype;
+			do_inheritance_check_on_method(fn, existing_fn TSRMLS_CC);
+			fn->common.prototype = prototype;
+		}
+
+		/* delete inherited fn if the function to be added is not abstract */
+		if (existing_fn
+			&& existing_fn->common.scope != ce
+			&& (fn->common.fn_flags & ZEND_ACC_ABSTRACT) == 0) {
+			/* it is just a reference which was added to the subclass while doing
+			   the inheritance, so we can deleted now, and will add the overriding 
+			   method afterwards.
+			   Except, if we try to add an abstract function, then we should not
+			   delete the inherited one */
+			zend_hash_quick_del(&ce->function_table, hash_key->arKey, hash_key->nKeyLength, hash_key->h);
+		}
+

 		if (fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
 			ce->ce_flags |= ZEND_ACC_IMPLICIT_ABSTRACT_CLASS;
@@ -3768,109 +3834,130 @@ static int zend_fixup_trait_method(zend_function *fn, zend_class_entry *ce TSRML
 		if (fn->op_array.static_variables) {
 			ce->ce_flags |= ZEND_HAS_STATIC_IN_METHODS;
 		}
+		fn_copy = *fn;
+		function_add_ref(&fn_copy);
+
+		if (zend_hash_quick_update(&ce->function_table, hash_key->arKey, hash_key->nKeyLength, hash_key->h, &fn_copy, sizeof(zend_function), (void**)&fn_copy_p)==FAILURE) {
+			zend_error(E_COMPILE_ERROR, "Trait method %s has not been applied, because failure occurred during updating class method table", hash_key->arKey);
+		}
+
+		zend_add_magic_methods(ce, hash_key->arKey, hash_key->nKeyLength, fn_copy_p TSRMLS_CC);
+
+		zend_function_dtor(fn);
+	} else {
+		zend_function_dtor(fn);
 	}
-	return ZEND_HASH_APPLY_KEEP;
+
+	return ZEND_HASH_APPLY_REMOVE;
 }
 /* }}} */

 static int zend_traits_copy_functions(zend_function *fn TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */
 {
-	zend_class_entry  *ce;
-	HashTable         **overriden;
-	zend_trait_alias  *alias, **alias_ptr;
-	HashTable         *exclude_table;
-	char              *lcname;
-	unsigned int       fnname_len;
-	zend_function      fn_copy;
-	void              *dummy;
+	HashTable* target;
+	zend_trait_alias** aliases;
+	HashTable* exclude_table;
+	char* lcname;
+	unsigned int fnname_len;
+	zend_function fn_copy;
+	void* dummy;
+	size_t i = 0;

-	ce            = va_arg(args, zend_class_entry*);
-	overriden     = va_arg(args, HashTable**);
+	target        = va_arg(args, HashTable*);
+	aliases       = va_arg(args, zend_trait_alias**);
 	exclude_table = va_arg(args, HashTable*);
-	
-	fnname_len = hash_key->nKeyLength - 1;
+
+	fnname_len = strlen(fn->common.function_name);

 	/* apply aliases which are qualified with a class name, there should not be any ambiguity */
-	if (ce->trait_aliases) {
-		alias_ptr = ce->trait_aliases;
-		alias = *alias_ptr;
-		while (alias) {
+	if (aliases) {
+		while (aliases[i]) {
 			/* Scope unset or equal to the function we compare to, and the alias applies to fn */
-			if (alias->alias != NULL
-				&& (!alias->trait_method->ce || fn->common.scope == alias->trait_method->ce)
-				&& alias->trait_method->mname_len == fnname_len
-				&& (zend_binary_strcasecmp(alias->trait_method->method_name, alias->trait_method->mname_len, hash_key->arKey, fnname_len) == 0)) {
+			if (aliases[i]->alias != NULL
+				&& (!aliases[i]->trait_method->ce || fn->common.scope == aliases[i]->trait_method->ce)
+				&& aliases[i]->trait_method->mname_len == fnname_len
+				&& (zend_binary_strcasecmp(aliases[i]->trait_method->method_name, aliases[i]->trait_method->mname_len, fn->common.function_name, fnname_len) == 0)) {
 				fn_copy = *fn;
+				function_add_ref(&fn_copy);
+				/* this function_name is never destroyed, because ZEND_ACC_ALIAS
+				   flag is set */
+				fn_copy.common.function_name = aliases[i]->alias;
+				fn_copy.common.fn_flags |= ZEND_ACC_ALIAS;
 					
 				/* if it is 0, no modifieres has been changed */
-				if (alias->modifiers) { 
-					fn_copy.common.fn_flags = alias->modifiers | (fn->common.fn_flags ^ (fn->common.fn_flags & ZEND_ACC_PPP_MASK));
+				if (aliases[i]->modifiers) { 
+					fn_copy.common.fn_flags = aliases[i]->modifiers | ZEND_ACC_ALIAS;
+					if (!(aliases[i]->modifiers & ZEND_ACC_PPP_MASK)) {
+						fn_copy.common.fn_flags |= ZEND_ACC_PUBLIC;
+					}
+					fn_copy.common.fn_flags |= fn->common.fn_flags ^ (fn->common.fn_flags & ZEND_ACC_PPP_MASK);
 				}

-				lcname = zend_str_tolower_dup(alias->alias, alias->alias_len);
-				zend_add_trait_method(ce, alias->alias, lcname, alias->alias_len+1, &fn_copy, overriden TSRMLS_CC);
+				lcname = zend_str_tolower_dup(aliases[i]->alias, aliases[i]->alias_len);
+
+				if (zend_hash_add(target, lcname, aliases[i]->alias_len+1, &fn_copy, sizeof(zend_function), NULL)==FAILURE) {
+					zend_error(E_COMPILE_ERROR, "Failed to add aliased trait method (%s) to the trait table. There is probably already a trait method with the same name", fn_copy.common.function_name);
+				}
 				efree(lcname);

-				/* Record the trait from which this alias was resolved. */
-				if (!alias->trait_method->ce) {
-					alias->trait_method->ce = fn->common.scope;
+				/** Record the trait from which this alias was resolved. */
+				if (!aliases[i]->trait_method->ce) {
+					aliases[i]->trait_method->ce = fn->common.scope;
 				}
 			}
-			alias_ptr++;
-			alias = *alias_ptr;
+			i++;
 		}
 	}

-	lcname = hash_key->arKey;
+	lcname = zend_str_tolower_dup(fn->common.function_name, fnname_len);

 	if (exclude_table == NULL || zend_hash_find(exclude_table, lcname, fnname_len, &dummy) == FAILURE) {
 		/* is not in hashtable, thus, function is not to be excluded */
 		fn_copy = *fn;
+		function_add_ref(&fn_copy);
+		fn_copy.common.fn_flags |= ZEND_ACC_ALIAS;

-		/* apply aliases which have not alias name, just setting visibility */
-		if (ce->trait_aliases) {
-			alias_ptr = ce->trait_aliases;
-			alias = *alias_ptr;
-			while (alias) {
+		/* apply aliases which are not qualified by a class name, or which have not
+		 * alias name, just setting visibility */
+		if (aliases) {
+			i = 0;
+			while (aliases[i]) {
 				/* Scope unset or equal to the function we compare to, and the alias applies to fn */
-				if (alias->alias == NULL && alias->modifiers != 0
-					&& (!alias->trait_method->ce || fn->common.scope == alias->trait_method->ce)
-					&& (alias->trait_method->mname_len == fnname_len)
-					&& (zend_binary_strcasecmp(alias->trait_method->method_name, alias->trait_method->mname_len, lcname, fnname_len) == 0)) {
+				if (aliases[i]->alias == NULL && aliases[i]->modifiers != 0
+					&& (!aliases[i]->trait_method->ce || fn->common.scope == aliases[i]->trait_method->ce)
+					&& (aliases[i]->trait_method->mname_len == fnname_len)
+					&& (zend_binary_strcasecmp(aliases[i]->trait_method->method_name, aliases[i]->trait_method->mname_len, fn->common.function_name, fnname_len) == 0)) {
+					fn_copy.common.fn_flags = aliases[i]->modifiers | ZEND_ACC_ALIAS;

-					fn_copy.common.fn_flags = alias->modifiers | (fn->common.fn_flags ^ (fn->common.fn_flags & ZEND_ACC_PPP_MASK));
+					if (!(aliases[i]->modifiers & ZEND_ACC_PPP_MASK)) {
+						fn_copy.common.fn_flags |= ZEND_ACC_PUBLIC;
+					}
+					fn_copy.common.fn_flags |= fn->common.fn_flags ^ (fn->common.fn_flags & ZEND_ACC_PPP_MASK);

 					/** Record the trait from which this alias was resolved. */
-					if (!alias->trait_method->ce) {
-						alias->trait_method->ce = fn->common.scope;
+					if (!aliases[i]->trait_method->ce) {
+						aliases[i]->trait_method->ce = fn->common.scope;
 					}
 				}
-				alias_ptr++;
-				alias = *alias_ptr;
+				i++;
 			}
 		}

-		zend_add_trait_method(ce, fn->common.function_name, lcname, fnname_len+1, &fn_copy, overriden TSRMLS_CC);
+		if (zend_hash_add(target, lcname, fnname_len+1, &fn_copy, sizeof(zend_function), NULL)==FAILURE) {
+			zend_error(E_COMPILE_ERROR, "Failed to add trait method (%s) to the trait table. There is probably already a trait method with the same name", fn_copy.common.function_name);
+		}
 	}

+	efree(lcname);
+
 	return ZEND_HASH_APPLY_KEEP;
 }
 /* }}} */

-static void zend_check_trait_usage(zend_class_entry *ce, zend_class_entry *trait TSRMLS_DC) /* {{{ */
+/* Copies function table entries to target function table with applied aliasing */
+static void zend_traits_copy_trait_function_table(HashTable *target, HashTable *source, zend_trait_alias** aliases, HashTable* exclude_table TSRMLS_DC) /* {{{ */
 {
-	zend_uint i;
-
-	if ((trait->ce_flags & ZEND_ACC_TRAIT) != ZEND_ACC_TRAIT) {
-		zend_error(E_COMPILE_ERROR, "Class %s is not a trait, Only traits may be used in 'as' and 'insteadof' statements", trait->name);
-	}
-
-	for (i = 0; i < ce->num_traits; i++) {
-		if (ce->traits[i] == trait) {
-			return;
-		}
-	}
-	zend_error(E_COMPILE_ERROR, "Required Trait %s wasn't added to %s", trait->name, ce->name);
+	zend_hash_apply_with_arguments(source TSRMLS_CC, (apply_func_args_t)zend_traits_copy_functions, 3, target, aliases, exclude_table);
 }
 /* }}} */

@@ -3893,7 +3980,6 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*
 								ZEND_FETCH_CLASS_TRAIT|ZEND_FETCH_CLASS_NO_AUTOLOAD TSRMLS_CC))) {
 					zend_error(E_COMPILE_ERROR, "Could not find trait %s", cur_method_ref->class_name);
 				}
-				zend_check_trait_usage(ce, cur_precedence->trait_method->ce TSRMLS_CC);

 				/** Ensure that the prefered method is actually available. */
 				lcname = zend_str_tolower_dup(cur_method_ref->method_name,
@@ -3912,7 +3998,7 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*
 				/** With the other traits, we are more permissive.
 					We do not give errors for those. This allows to be more
 					defensive in such definitions.
-					However, we want to make sure that the insteadof declaration
+					However, we want to make sure that the insteadof declartion
 					is consistent in itself.
 				 */
 				j = 0;
@@ -3922,9 +4008,8 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*

 					if (!(cur_precedence->exclude_from_classes[j] = zend_fetch_class(class_name, name_length, ZEND_FETCH_CLASS_TRAIT |ZEND_FETCH_CLASS_NO_AUTOLOAD TSRMLS_CC))) {
 						zend_error(E_COMPILE_ERROR, "Could not find trait %s", class_name);
-					}					
-					zend_check_trait_usage(ce, cur_precedence->exclude_from_classes[j] TSRMLS_CC);
-
+					}
+					
 					/* make sure that the trait method is not from a class mentioned in
 					 exclude_from_classes, for consistency */
 					if (cur_precedence->trait_method->ce == cur_precedence->exclude_from_classes[i]) {
@@ -3953,7 +4038,6 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*
 				if (!(cur_method_ref->ce = zend_fetch_class(cur_method_ref->class_name, cur_method_ref->cname_len, ZEND_FETCH_CLASS_TRAIT|ZEND_FETCH_CLASS_NO_AUTOLOAD TSRMLS_CC))) {
 					zend_error(E_COMPILE_ERROR, "Could not find trait %s", cur_method_ref->class_name);
 				}
-				zend_check_trait_usage(ce, cur_method_ref->ce TSRMLS_CC);

 				/** And, ensure that the referenced method is resolvable, too. */
 				lcname = zend_str_tolower_dup(cur_method_ref->method_name,
@@ -4003,45 +4087,70 @@ static void zend_traits_compile_exclude_table(HashTable* exclude_table, zend_tra

 static void zend_do_traits_method_binding(zend_class_entry *ce TSRMLS_DC) /* {{{ */
 {
-	zend_uint i;
-	HashTable *overriden = NULL;
+	HashTable** function_tables;
+	HashTable* resulting_table;
+	HashTable exclude_table;
+	size_t i;

+	/* prepare copies of trait function tables for combination */
+	function_tables = emalloc(sizeof(HashTable*) * ce->num_traits);
+	resulting_table = (HashTable *)emalloc(sizeof(HashTable));
+	
+	/* TODO: revisit this start size, may be its not optimal */
+	zend_hash_init_ex(resulting_table, 10, NULL, NULL, 0, 0);
+  
 	for (i = 0; i < ce->num_traits; i++) {
-		if (ce->trait_precedences) {
-			HashTable exclude_table;
+		function_tables[i] = (HashTable *)emalloc(sizeof(HashTable));
+		zend_hash_init_ex(function_tables[i], ce->traits[i]->function_table.nNumOfElements, NULL, NULL, 1, 0);

+		if (ce->trait_precedences) {
 			/* TODO: revisit this start size, may be its not optimal */
 			zend_hash_init_ex(&exclude_table, 2, NULL, NULL, 0, 0);

 			zend_traits_compile_exclude_table(&exclude_table, ce->trait_precedences, ce->traits[i]);

 			/* copies functions, applies defined aliasing, and excludes unused trait methods */
-			zend_hash_apply_with_arguments(&ce->traits[i]->function_table TSRMLS_CC, (apply_func_args_t)zend_traits_copy_functions, 3, ce, &overriden, &exclude_table);
-
+			zend_traits_copy_trait_function_table(function_tables[i], &ce->traits[i]->function_table, ce->trait_aliases, &exclude_table TSRMLS_CC);
 			zend_hash_destroy(&exclude_table);
 		} else {
-			zend_hash_apply_with_arguments(&ce->traits[i]->function_table TSRMLS_CC, (apply_func_args_t)zend_traits_copy_functions, 3, ce, &overriden, NULL);
+			zend_traits_copy_trait_function_table(function_tables[i], &ce->traits[i]->function_table, ce->trait_aliases, NULL TSRMLS_CC);
 		}
 	}
  
-    zend_hash_apply_with_argument(&ce->function_table, (apply_func_arg_t)zend_fixup_trait_method, ce TSRMLS_CC);
-
-	if (overriden) {
-		zend_hash_destroy(overriden);
-		FREE_HASHTABLE(overriden);
+	/* now merge trait methods */
+	for (i = 0; i < ce->num_traits; i++) {
+		zend_hash_apply_with_arguments(function_tables[i] TSRMLS_CC, (apply_func_args_t)zend_traits_merge_functions, 5, i, ce->num_traits, resulting_table, function_tables, ce);
 	}
+  
+	/* Now the resulting_table contains all trait methods we would have to
+	 * add to the class in the following step the methods are inserted into the method table
+	 * if there is already a method with the same name it is replaced iff ce != fn.scope
+	 * --> all inherited methods are overridden, methods defined in the class are left untouched
+	 */
+	zend_hash_apply_with_arguments(resulting_table TSRMLS_CC, (apply_func_args_t)zend_traits_merge_functions_to_class, 1, ce);
+  
+	/* free temporary function tables */
+	for (i = 0; i < ce->num_traits; i++) {
+		/* zend_hash_destroy(function_tables[i]); */
+		zend_hash_graceful_destroy(function_tables[i]);
+		efree(function_tables[i]);
+	}
+	efree(function_tables);
+
+	/* free temporary resulting table */
+	/* zend_hash_destroy(resulting_table); */
+	zend_hash_graceful_destroy(resulting_table);
+	efree(resulting_table);
 }
 /* }}} */

 static zend_class_entry* find_first_definition(zend_class_entry *ce, size_t current_trait, const char* prop_name, int prop_name_length, ulong prop_hash, zend_class_entry *coliding_ce) /* {{{ */
 {
 	size_t i;
-
-	if (coliding_ce == ce) {
-		for (i = 0; i < current_trait; i++) {
-			if (zend_hash_quick_exists(&ce->traits[i]->properties_info, prop_name, prop_name_length+1, prop_hash)) {
-				return ce->traits[i];
-			}
+	zend_property_info *coliding_prop;
+	for (i = 0; (i < current_trait) && (i < ce->num_traits); i++) {
+		if (zend_hash_quick_find(&ce->traits[i]->properties_info, prop_name, prop_name_length+1, prop_hash, (void **) &coliding_prop) == SUCCESS) {
+			return ce->traits[i];
 		}
 	}

@@ -4049,6 +4158,54 @@ static zend_class_entry* find_first_definition(zend_class_entry *ce, size_t curr
 }
 /* }}} */

+static void zend_traits_register_private_property(zend_class_entry *ce, const char *name, int name_len, zend_property_info *old_info, zval *property TSRMLS_DC) /* {{{ */
+{
+	char *priv_name;
+	int priv_name_length;
+	const char *interned_name;
+	zend_property_info property_info;
+	ulong h = zend_get_hash_value(name, name_len+1);
+	property_info = *old_info;
+
+	if (old_info->flags & ZEND_ACC_STATIC) {
+		property_info.offset = ce->default_static_members_count++;
+		ce->default_static_members_table = perealloc(ce->default_static_members_table, sizeof(zval*) * ce->default_static_members_count, ce->type == ZEND_INTERNAL_CLASS);
+		ce->default_static_members_table[property_info.offset] = property;
+		if (ce->type == ZEND_USER_CLASS) {
+			ce->static_members_table = ce->default_static_members_table;
+		}
+	} else {
+		property_info.offset = ce->default_properties_count++;
+		ce->default_properties_table = perealloc(ce->default_properties_table, sizeof(zval*) * ce->default_properties_count, ce->type == ZEND_INTERNAL_CLASS);
+		ce->default_properties_table[property_info.offset] = property;
+	}
+
+	zend_mangle_property_name(&priv_name, &priv_name_length, ce->name, ce->name_length, name, name_len, ce->type & ZEND_INTERNAL_CLASS);
+	property_info.name = priv_name;
+	property_info.name_length = priv_name_length;
+
+	interned_name = zend_new_interned_string(property_info.name, property_info.name_length+1, 0 TSRMLS_CC);
+	if (interned_name != property_info.name) {
+		if (ce->type == ZEND_USER_CLASS) {
+			efree((char*)property_info.name);
+		} else {
+			free((char*)property_info.name);
+		}
+		property_info.name = interned_name;
+	}
+
+	property_info.h = zend_get_hash_value(property_info.name, property_info.name_length+1);
+
+	property_info.ce = ce;
+
+	if (property_info.doc_comment) {
+		property_info.doc_comment = estrndup(property_info.doc_comment, property_info.doc_comment_len);
+	}
+
+	zend_hash_quick_update(&ce->properties_info, name, name_len+1, h, &property_info, sizeof(zend_property_info), NULL);
+}
+/* }}} */
+
 static void zend_do_traits_property_binding(zend_class_entry *ce TSRMLS_DC) /* {{{ */
 {
 	size_t i;
@@ -4062,8 +4219,7 @@ static void zend_do_traits_property_binding(zend_class_entry *ce TSRMLS_DC) /* {
 	zend_bool not_compatible;
 	zval* prop_value;
 	char* doc_comment;  
-	zend_uint flags;
-
+  
 	/* In the following steps the properties are inserted into the property table
 	 * for that, a very strict approach is applied:
 	 * - check for compatibility, if not compatible with any property in class -> fatal
@@ -4076,8 +4232,7 @@ static void zend_do_traits_property_binding(zend_class_entry *ce TSRMLS_DC) /* {
 			/* first get the unmangeld name if necessary,
 			 * then check whether the property is already there
 			 */
-			flags = property_info->flags;
-			if ((flags & ZEND_ACC_PPP_MASK) == ZEND_ACC_PUBLIC) {
+			if ((property_info->flags & ZEND_ACC_PPP_MASK) == ZEND_ACC_PUBLIC) {
 				prop_hash = property_info->h;
 				prop_name = property_info->name;
 				prop_name_length = property_info->name_length;
@@ -4091,50 +4246,61 @@ static void zend_do_traits_property_binding(zend_class_entry *ce TSRMLS_DC) /* {

 			/* next: check for conflicts with current class */
 			if (zend_hash_quick_find(&ce->properties_info, prop_name, prop_name_length+1, prop_hash, (void **) &coliding_prop) == SUCCESS) {
-				if (coliding_prop->flags & ZEND_ACC_SHADOW) {					
-					zend_hash_quick_del(&ce->properties_info, prop_name, prop_name_length+1, prop_hash);
-					flags |= ZEND_ACC_CHANGED;
-				} else {				
-					if ((coliding_prop->flags & (ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC))
-						== (flags & (ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC))) {
-						/* flags are identical, now the value needs to be checked */
-						if (flags & ZEND_ACC_STATIC) {
-							not_compatible = (FAILURE == compare_function(&compare_result,
-											  ce->default_static_members_table[coliding_prop->offset],
-											  ce->traits[i]->default_static_members_table[property_info->offset] TSRMLS_CC))
-								  || (Z_LVAL(compare_result) != 0);
+				if (coliding_prop->flags & ZEND_ACC_SHADOW) {
+					/* this one is inherited, lets look it up in its own class */
+					zend_hash_quick_find(&coliding_prop->ce->properties_info, prop_name, prop_name_length+1, prop_hash, (void **) &coliding_prop);
+					if (coliding_prop->flags & ZEND_ACC_PRIVATE) {
+						/* private property, make the property_info.offset indenpended */
+						if (property_info->flags & ZEND_ACC_STATIC) {
+							prop_value = ce->traits[i]->default_static_members_table[property_info->offset];
 						} else {
-							not_compatible = (FAILURE == compare_function(&compare_result,
-											  ce->default_properties_table[coliding_prop->offset],
-											  ce->traits[i]->default_properties_table[property_info->offset] TSRMLS_CC))
-								  || (Z_LVAL(compare_result) != 0);
+							prop_value = ce->traits[i]->default_properties_table[property_info->offset];
 						}
-					} else {
-						/* the flags are not identical, thus, we assume properties are not compatible */
-						not_compatible = 1;
-					}
+						Z_ADDREF_P(prop_value);

-					if (not_compatible) {
-						zend_error(E_COMPILE_ERROR, 
+						zend_traits_register_private_property(ce, prop_name, prop_name_length, property_info, prop_value TSRMLS_CC);
+						continue;
+					}
+				}
+				
+				if ((coliding_prop->flags & (ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC))
+					== (property_info->flags & (ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC))) {
+					/* flags are identical, now the value needs to be checked */
+					if (property_info->flags & ZEND_ACC_STATIC) {
+						not_compatible = (FAILURE == compare_function(&compare_result,
+										  ce->default_static_members_table[coliding_prop->offset],
+										  ce->traits[i]->default_static_members_table[property_info->offset] TSRMLS_CC))
+							  || (Z_LVAL(compare_result) != 0);
+					} else {
+						not_compatible = (FAILURE == compare_function(&compare_result,
+										  ce->default_properties_table[coliding_prop->offset],
+										  ce->traits[i]->default_properties_table[property_info->offset] TSRMLS_CC))
+							  || (Z_LVAL(compare_result) != 0);
+					}
+				} else {
+					/* the flags are not identical, thus, we assume properties are not compatible */
+					not_compatible = 1;
+				}
+
+				if (not_compatible) {
+					zend_error(E_COMPILE_ERROR, 
 							   "%s and %s define the same property ($%s) in the composition of %s. However, the definition differs and is considered incompatible. Class was composed",
 								find_first_definition(ce, i, prop_name, prop_name_length, prop_hash, coliding_prop->ce)->name,
 								property_info->ce->name,
 								prop_name,
 								ce->name);
-					} else {
-						zend_error(E_STRICT, 
+				} else {
+					zend_error(E_STRICT, 
 							   "%s and %s define the same property ($%s) in the composition of %s. This might be incompatible, to improve maintainability consider using accessor methods in traits instead. Class was composed",
 								find_first_definition(ce, i, prop_name, prop_name_length, prop_hash, coliding_prop->ce)->name,
 								property_info->ce->name,
 								prop_name,
 								ce->name);
-						continue;
-					}
 				}
 			}

 			/* property not found, so lets add it */
-			if (flags & ZEND_ACC_STATIC) {
+			if (property_info->flags & ZEND_ACC_STATIC) {
 				prop_value = ce->traits[i]->default_static_members_table[property_info->offset];
 			} else {
 				prop_value = ce->traits[i]->default_properties_table[property_info->offset];
@@ -4143,7 +4309,7 @@ static void zend_do_traits_property_binding(zend_class_entry *ce TSRMLS_DC) /* {

 			doc_comment = property_info->doc_comment ? estrndup(property_info->doc_comment, property_info->doc_comment_len) : NULL;
 			zend_declare_property_ex(ce, prop_name, prop_name_length, 
-									 prop_value, flags, 
+									 prop_value, property_info->flags, 
 								     doc_comment, property_info->doc_comment_len TSRMLS_CC);
 		}
 	}
@@ -4267,6 +4433,20 @@ ZEND_API int do_bind_function(const zend_op_array *op_array, zend_op *opline, Ha
 }
 /* }}} */

+void zend_add_trait_precedence(znode *precedence_znode TSRMLS_DC) /* {{{ */
+{
+	zend_class_entry *ce = CG(active_class_entry);
+	zend_add_to_list(&ce->trait_precedences, precedence_znode->u.op.ptr TSRMLS_CC);
+}
+/* }}} */
+
+void zend_add_trait_alias(znode *alias_znode TSRMLS_DC) /* {{{ */
+{
+	zend_class_entry *ce = CG(active_class_entry);
+	zend_add_to_list(&ce->trait_aliases, alias_znode->u.op.ptr TSRMLS_CC);
+}
+/* }}} */
+
 void zend_prepare_reference(znode *result, znode *class_name, znode *method_name TSRMLS_DC) /* {{{ */
 {
 	zend_trait_method_reference *method_ref = emalloc(sizeof(zend_trait_method_reference));
@@ -4291,25 +4471,18 @@ void zend_prepare_reference(znode *result, znode *class_name, znode *method_name
 }
 /* }}} */

-void zend_add_trait_alias(znode *method_reference, znode *modifiers, znode *alias TSRMLS_DC) /* {{{ */
+void zend_prepare_trait_alias(znode *result, znode *method_reference, znode *modifiers, znode *alias TSRMLS_DC) /* {{{ */
 {
-	zend_class_entry *ce = CG(active_class_entry);
-	zend_trait_alias *trait_alias;
+	zend_trait_alias *trait_alias = emalloc(sizeof(zend_trait_alias));

+	trait_alias->trait_method = (zend_trait_method_reference*)method_reference->u.op.ptr;
+	trait_alias->modifiers = Z_LVAL(modifiers->u.constant);
+	
 	if (Z_LVAL(modifiers->u.constant) == ZEND_ACC_STATIC) {
 		zend_error(E_COMPILE_ERROR, "Cannot use 'static' as method modifier");
 		return;
-	} else if (Z_LVAL(modifiers->u.constant) == ZEND_ACC_ABSTRACT) {
-		zend_error(E_COMPILE_ERROR, "Cannot use 'abstract' as method modifier");
-		return;
-	} else if (Z_LVAL(modifiers->u.constant) == ZEND_ACC_FINAL) {
-		zend_error(E_COMPILE_ERROR, "Cannot use 'final' as method modifier");
-		return;
 	}

-	trait_alias = emalloc(sizeof(zend_trait_alias));
-	trait_alias->trait_method = (zend_trait_method_reference*)method_reference->u.op.ptr;
-	trait_alias->modifiers = Z_LVAL(modifiers->u.constant);
 	if (alias) {
 		trait_alias->alias = Z_STRVAL(alias->u.constant);
 		trait_alias->alias_len = Z_STRLEN(alias->u.constant);
@@ -4318,13 +4491,12 @@ void zend_add_trait_alias(znode *method_reference, znode *modifiers, znode *alia
 	}
 	trait_alias->function = NULL;

-	zend_add_to_list(&ce->trait_aliases, trait_alias TSRMLS_CC);
+	result->u.op.ptr = trait_alias;
 }
 /* }}} */

-void zend_add_trait_precedence(znode *method_reference, znode *trait_list TSRMLS_DC) /* {{{ */
+void zend_prepare_trait_precedence(znode *result, znode *method_reference, znode *trait_list TSRMLS_DC) /* {{{ */
 {
-	zend_class_entry *ce = CG(active_class_entry);
 	zend_trait_precedence *trait_precedence = emalloc(sizeof(zend_trait_precedence));

 	trait_precedence->trait_method = (zend_trait_method_reference*)method_reference->u.op.ptr;
@@ -4332,7 +4504,7 @@ void zend_add_trait_precedence(znode *method_reference, znode *trait_list TSRMLS

 	trait_precedence->function = NULL;

-	zend_add_to_list(&ce->trait_precedences, trait_precedence TSRMLS_CC);
+	result->u.op.ptr = trait_precedence;
 }
 /* }}} */

@@ -4367,7 +4539,7 @@ ZEND_API zend_class_entry *do_bind_class(const zend_op_array* op_array, const ze
 		}
 		return NULL;
 	} else {
-		if (!(ce->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_IMPLEMENT_INTERFACES|ZEND_ACC_IMPLEMENT_TRAITS))) {
+		if (!(ce->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_IMPLEMENT_INTERFACES))) {
 			zend_verify_abstract_class(ce TSRMLS_CC);
 		}
 		return ce;
@@ -4799,11 +4971,10 @@ void zend_do_begin_class_declaration(const znode *class_token, znode *class_name
 		/* Prefix class name with name of current namespace */
 		znode tmp;

-		tmp.op_type = IS_CONST;
 		tmp.u.constant = *CG(current_namespace);
 		zval_copy_ctor(&tmp.u.constant);
 		zend_do_build_namespace_name(&tmp, &tmp, class_name TSRMLS_CC);
-		*class_name = tmp;
+		class_name = &tmp;
 		efree(lcname);
 		lcname = zend_str_tolower_dup(Z_STRVAL(class_name->u.constant), Z_STRLEN(class_name->u.constant));
 	}
@@ -4936,9 +5107,9 @@ void zend_do_end_class_declaration(const znode *class_token, const znode *parent
 	}

 	if (!(ce->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS))
-		&& (parent_token || (ce->num_interfaces > 0))) {
+		&& ((parent_token->op_type != IS_UNUSED) || (ce->num_interfaces > 0))) {
 		zend_verify_abstract_class(ce TSRMLS_CC);
-		if (ce->num_interfaces && !(ce->ce_flags & ZEND_ACC_IMPLEMENT_TRAITS)) {
+		if (ce->num_interfaces) {
 			do_verify_abstract_class(TSRMLS_C);
 		}
 	}
@@ -4988,10 +5159,9 @@ void zend_do_implements_interface(znode *interface_name TSRMLS_DC) /* {{{ */
 }
 /* }}} */

-void zend_do_use_trait(znode *trait_name TSRMLS_DC) /* {{{ */
+void zend_do_implements_trait(znode *trait_name TSRMLS_DC) /* {{{ */
 {
 	zend_op *opline;
-
 	if ((CG(active_class_entry)->ce_flags & ZEND_ACC_INTERFACE)) {
 		zend_error(E_COMPILE_ERROR,
 				"Cannot use traits inside of interfaces. %s is used in %s",
@@ -5480,7 +5650,7 @@ void zend_do_shell_exec(znode *result, const znode *cmd TSRMLS_DC) /* {{{ */
 			break;
 	}
 	SET_NODE(opline->op1, cmd);
-	opline->op2.opline_num = 1;
+	opline->op2.opline_num = 0;
 	opline->extended_value = ZEND_DO_FCALL;
 	SET_UNUSED(opline->op2);

@@ -5721,11 +5891,7 @@ void zend_add_to_list(void *result, void *item TSRMLS_DC) /* {{{ */
 	void** list = *(void**)result;
 	size_t n = 0;

-	if (list) {
-		while (list[n]) {
-			n++;
-		}
-	}
+	while (list && list[n]) { n++; }

 	list = erealloc(list, sizeof(void*) * (n+2));

@@ -6944,7 +7110,7 @@ ZEND_API size_t zend_dirname(char *path, size_t len)
 	}
 #elif defined(NETWARE)
 	/*
-	 * Find the first occurrence of : from the left
+	 * Find the first occurence of : from the left 
 	 * move the path pointer to the position just after :
 	 * increment the len_adjust to the length of path till colon character(inclusive)
 	 * If there is no character beyond : simple return len
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -207,6 +207,8 @@ typedef struct _zend_try_catch_element {
 #define ZEND_ACC_RETURN_REFERENCE		0x4000000
 #define ZEND_ACC_DONE_PASS_TWO			0x8000000

+#define ZEND_ACC_ALIAS					0x10000000
+
 char *zend_visibility_string(zend_uint fn_flags);


@@ -507,13 +509,16 @@ ZEND_API void zend_do_implement_interface(zend_class_entry *ce, zend_class_entry
 void zend_do_implements_interface(znode *interface_znode TSRMLS_DC);

 /* Trait related functions */
-void zend_do_use_trait(znode *trait_znode TSRMLS_DC);
-void zend_prepare_reference(znode *result, znode *class_name, znode *method_name TSRMLS_DC);
-void zend_add_trait_precedence(znode *method_reference, znode *trait_list TSRMLS_DC);
-void zend_add_trait_alias(znode *method_reference, znode *modifiers, znode *alias TSRMLS_DC);
+void zend_add_trait_precedence(znode *precedence_znode TSRMLS_DC);
+void zend_add_trait_alias(znode *alias_znode TSRMLS_DC);

+
+void zend_do_implements_trait(znode *interface_znode /*, znode* aliases */ TSRMLS_DC);
 ZEND_API void zend_do_implement_trait(zend_class_entry *ce, zend_class_entry *trait TSRMLS_DC);
 ZEND_API void zend_do_bind_traits(zend_class_entry *ce TSRMLS_DC);
+void zend_prepare_trait_precedence(znode *result, znode *method_reference, znode *trait_list TSRMLS_DC);
+void zend_prepare_reference(znode *result, znode *class_name, znode *method_name TSRMLS_DC);
+void zend_prepare_trait_alias(znode *result, znode *method_reference, znode *modifiers, znode *alias TSRMLS_DC);

 ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent_ce TSRMLS_DC);
 void zend_do_early_binding(TSRMLS_D);
@@ -616,7 +621,7 @@ void zend_do_end_compilation(TSRMLS_D);
 void zend_do_label(znode *label TSRMLS_DC);
 void zend_do_goto(const znode *label TSRMLS_DC);
 void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline, int pass2 TSRMLS_DC);
-void zend_release_labels(int temporary TSRMLS_DC);
+void zend_release_labels(TSRMLS_D);

 ZEND_API void function_add_ref(zend_function *function);

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |