Merge mainstream 'master' branch into refactoring

During merge I had to revert:
	Nikita's patch for php_splice() (it probably needs to be applyed again)
	Bob Weinand's patches related to constant expression handling (we need to review them carefully)
	I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)

Conflicts:
	Zend/zend.h
	Zend/zend_API.c
	Zend/zend_ast.c
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_constants.c
	Zend/zend_exceptions.c
	Zend/zend_execute.c
	Zend/zend_execute.h
	Zend/zend_execute_API.c
	Zend/zend_hash.c
	Zend/zend_highlight.c
	Zend/zend_language_parser.y
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_variables.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/date/php_date.c
	ext/dom/documenttype.c
	ext/hash/hash.c
	ext/iconv/iconv.c
	ext/mbstring/tests/zend_multibyte-10.phpt
	ext/mbstring/tests/zend_multibyte-11.phpt
	ext/mbstring/tests/zend_multibyte-12.phpt
	ext/mysql/php_mysql.c
	ext/mysqli/mysqli.c
	ext/mysqlnd/mysqlnd_reverse_api.c
	ext/mysqlnd/php_mysqlnd.c
	ext/opcache/ZendAccelerator.c
	ext/opcache/zend_accelerator_util_funcs.c
	ext/opcache/zend_persist.c
	ext/opcache/zend_persist_calc.c
	ext/pcre/php_pcre.c
	ext/pdo/pdo_dbh.c
	ext/pdo/pdo_stmt.c
	ext/pdo_pgsql/pgsql_driver.c
	ext/pgsql/pgsql.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
	ext/standard/array.c
	ext/standard/basic_functions.c
	ext/standard/html.c
	ext/standard/mail.c
	ext/standard/php_array.h
	ext/standard/proc_open.c
	ext/standard/streamsfuncs.c
	ext/standard/user_filters.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_variables.c
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_bp.c
	sapi/phpdbg/phpdbg_frame.c
	sapi/phpdbg/phpdbg_help.c
	sapi/phpdbg/phpdbg_list.c
	sapi/phpdbg/phpdbg_print.c
	sapi/phpdbg/phpdbg_prompt.c

2 files changed, 11 insertions, 11 deletions

diff --git a/ext/tokenizer/tests/bug60097.phpt b/ext/tokenizer/tests/bug60097.phpt
index 2116866c93..c3f417a7d5 100644
--- a/ext/tokenizer/tests/bug60097.phpt
+++ b/ext/tokenizer/tests/bug60097.phpt
@@ -17,7 +17,7 @@ array(14) {
   [0]=>
   array(3) {
     [0]=>
-    int(374)
+    int(376)
     [1]=>
     string(6) "<?php
 "
@@ -27,7 +27,7 @@ array(14) {
   [1]=>
   array(3) {
     [0]=>
-    int(378)
+    int(380)
     [1]=>
     string(8) "<<<DOC1
 "
@@ -37,7 +37,7 @@ array(14) {
   [2]=>
   array(3) {
     [0]=>
-    int(381)
+    int(383)
     [1]=>
     string(1) "{"
     [2]=>
@@ -46,7 +46,7 @@ array(14) {
   [3]=>
   array(3) {
     [0]=>
-    int(310)
+    int(312)
     [1]=>
     string(2) "$s"
     [2]=>
@@ -57,7 +57,7 @@ array(14) {
   [5]=>
   array(3) {
     [0]=>
-    int(378)
+    int(380)
     [1]=>
     string(8) "<<<DOC2
 "
@@ -67,7 +67,7 @@ array(14) {
   [6]=>
   array(3) {
     [0]=>
-    int(379)
+    int(381)
     [1]=>
     string(4) "DOC2"
     [2]=>
@@ -76,7 +76,7 @@ array(14) {
   [7]=>
   array(3) {
     [0]=>
-    int(377)
+    int(379)
     [1]=>
     string(1) "
 "
@@ -90,7 +90,7 @@ array(14) {
   [10]=>
   array(3) {
     [0]=>
-    int(315)
+    int(317)
     [1]=>
     string(1) "
 "
@@ -100,7 +100,7 @@ array(14) {
   [11]=>
   array(3) {
     [0]=>
-    int(379)
+    int(381)
     [1]=>
     string(4) "DOC1"
     [2]=>
@@ -111,7 +111,7 @@ array(14) {
   [13]=>
   array(3) {
     [0]=>
-    int(377)
+    int(379)
     [1]=>
     string(1) "
 "
diff --git a/ext/tokenizer/tests/token_get_all_variation14.phpt b/ext/tokenizer/tests/token_get_all_variation14.phpt
index 5fc390e36c..52d29198c7 100644
--- a/ext/tokenizer/tests/token_get_all_variation14.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation14.phpt
@@ -26,7 +26,7 @@ struct myStruct {
 ?>';
 var_dump( token_get_all($source));
 
-// with invalid open tag for testing entire source to be unkown token
+// with invalid open tag for testing entire source to be unknown token
 echo "-- with invlalid PHP open tag & valid tokens --\n";
 $source = '<pli 
 echo "hello world"; ?>';