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

8 files changed, 528 insertions, 447 deletions

diff --git a/tests/basic/encoding.phpt b/tests/basic/encoding.phpt
new file mode 100644
index 0000000000..b2ee5f3ca2
--- /dev/null
+++ b/tests/basic/encoding.phpt
@@ -0,0 +1,39 @@
+--TEST--
+PHP encoding setting test
+--INI--
+--FILE--
+<?php
+var_dump(ini_get('default_charset'));
+var_dump(ini_get('input_encoding'));
+var_dump(ini_get('internal_encoding'));
+var_dump(ini_get('output_encoding'));
+
+var_dump(ini_set('default_charset', 'ISO-8859-1'));
+var_dump(ini_get('default_charset'));
+var_dump(ini_get('input_encoding'));
+var_dump(ini_get('internal_encoding'));
+var_dump(ini_get('output_encoding'));
+
+var_dump(ini_set('input_encoding', 'ISO-8859-1'));
+var_dump(ini_set('internal_encoding', 'ISO-8859-1'));
+var_dump(ini_set('output_encoding', 'ISO-8859-1'));
+var_dump(ini_get('input_encoding'));
+var_dump(ini_get('internal_encoding'));
+var_dump(ini_get('output_encoding'));
+
+--EXPECTF--
+string(5) "UTF-8"
+string(0) ""
+string(0) ""
+string(0) ""
+string(5) "UTF-8"
+string(10) "ISO-8859-1"
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(10) "ISO-8859-1"
+string(10) "ISO-8859-1"
+string(10) "ISO-8859-1"
\ No newline at end of file
diff --git a/tests/func/010.phpt b/tests/func/010.phpt
index f970283dc4..6d5c30c9ee 100644
--- a/tests/func/010.phpt
+++ b/tests/func/010.phpt
@@ -8,7 +8,7 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 <?php
 
 // the stack size + some random constant
-$boundary = 64*1024;
+$boundary = 16*1024-16;
 $limit    = $boundary+42;
 
 
diff --git a/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt b/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt
index b1bc437b0f..e13fc3bc1b 100644
--- a/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt
+++ b/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt
@@ -1,421 +1,421 @@
---TEST--

-Test << operator : various numbers as strings

---SKIPIF--

-<?php

-if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");

-?>

---FILE--

-<?php

-

-$strVals = array(

-   "0","65","-44", "1.2", "-7.7", "abc", "123abc", "123e5", "123e5xyz", " 123abc", "123 abc", "123abc ", "3.4a",

-   "a5.9"

-);

-

-error_reporting(E_ERROR);

-

-foreach ($strVals as $strVal) {

-   foreach($strVals as $otherVal) {

-	   echo "--- testing: '$strVal' << '$otherVal' ---\n";   

-      var_dump(bin2hex($strVal<<$otherVal));

-   }

-}

-

-   

-?>

-===DONE===

---EXPECT--

---- testing: '0' << '0' ---

-string(2) "30"

---- testing: '0' << '65' ---

-string(2) "30"

---- testing: '0' << '-44' ---

-string(2) "30"

---- testing: '0' << '1.2' ---

-string(2) "30"

---- testing: '0' << '-7.7' ---

-string(2) "30"

---- testing: '0' << 'abc' ---

-string(2) "30"

---- testing: '0' << '123abc' ---

-string(2) "30"

---- testing: '0' << '123e5' ---

-string(2) "30"

---- testing: '0' << '123e5xyz' ---

-string(2) "30"

---- testing: '0' << ' 123abc' ---

-string(2) "30"

---- testing: '0' << '123 abc' ---

-string(2) "30"

---- testing: '0' << '123abc ' ---

-string(2) "30"

---- testing: '0' << '3.4a' ---

-string(2) "30"

---- testing: '0' << 'a5.9' ---

-string(2) "30"

---- testing: '65' << '0' ---

-string(4) "3635"

---- testing: '65' << '65' ---

-string(6) "313330"

---- testing: '65' << '-44' ---

-string(16) "3638313537343430"

---- testing: '65' << '1.2' ---

-string(6) "313330"

---- testing: '65' << '-7.7' ---

-string(22) "2d32313133393239323136"

---- testing: '65' << 'abc' ---

-string(4) "3635"

---- testing: '65' << '123abc' ---

-string(18) "313334323137373238"

---- testing: '65' << '123e5' ---

-string(18) "313334323137373238"

---- testing: '65' << '123e5xyz' ---

-string(18) "313334323137373238"

---- testing: '65' << ' 123abc' ---

-string(18) "313334323137373238"

---- testing: '65' << '123 abc' ---

-string(18) "313334323137373238"

---- testing: '65' << '123abc ' ---

-string(18) "313334323137373238"

---- testing: '65' << '3.4a' ---

-string(6) "353230"

---- testing: '65' << 'a5.9' ---

-string(4) "3635"

---- testing: '-44' << '0' ---

-string(6) "2d3434"

---- testing: '-44' << '65' ---

-string(6) "2d3838"

---- testing: '-44' << '-44' ---

-string(18) "2d3436313337333434"

---- testing: '-44' << '1.2' ---

-string(6) "2d3838"

---- testing: '-44' << '-7.7' ---

-string(22) "2d31343736333935303038"

---- testing: '-44' << 'abc' ---

-string(6) "2d3434"

---- testing: '-44' << '123abc' ---

-string(22) "2d31363130363132373336"

---- testing: '-44' << '123e5' ---

-string(22) "2d31363130363132373336"

---- testing: '-44' << '123e5xyz' ---

-string(22) "2d31363130363132373336"

---- testing: '-44' << ' 123abc' ---

-string(22) "2d31363130363132373336"

---- testing: '-44' << '123 abc' ---

-string(22) "2d31363130363132373336"

---- testing: '-44' << '123abc ' ---

-string(22) "2d31363130363132373336"

---- testing: '-44' << '3.4a' ---

-string(8) "2d333532"

---- testing: '-44' << 'a5.9' ---

-string(6) "2d3434"

---- testing: '1.2' << '0' ---

-string(2) "31"

---- testing: '1.2' << '65' ---

-string(2) "32"

---- testing: '1.2' << '-44' ---

-string(14) "31303438353736"

---- testing: '1.2' << '1.2' ---

-string(2) "32"

---- testing: '1.2' << '-7.7' ---

-string(16) "3333353534343332"

---- testing: '1.2' << 'abc' ---

-string(2) "31"

---- testing: '1.2' << '123abc' ---

-string(18) "313334323137373238"

---- testing: '1.2' << '123e5' ---

-string(18) "313334323137373238"

---- testing: '1.2' << '123e5xyz' ---

-string(18) "313334323137373238"

---- testing: '1.2' << ' 123abc' ---

-string(18) "313334323137373238"

---- testing: '1.2' << '123 abc' ---

-string(18) "313334323137373238"

---- testing: '1.2' << '123abc ' ---

-string(18) "313334323137373238"

---- testing: '1.2' << '3.4a' ---

-string(2) "38"

---- testing: '1.2' << 'a5.9' ---

-string(2) "31"

---- testing: '-7.7' << '0' ---

-string(4) "2d37"

---- testing: '-7.7' << '65' ---

-string(6) "2d3134"

---- testing: '-7.7' << '-44' ---

-string(16) "2d37333430303332"

---- testing: '-7.7' << '1.2' ---

-string(6) "2d3134"

---- testing: '-7.7' << '-7.7' ---

-string(20) "2d323334383831303234"

---- testing: '-7.7' << 'abc' ---

-string(4) "2d37"

---- testing: '-7.7' << '123abc' ---

-string(20) "2d393339353234303936"

---- testing: '-7.7' << '123e5' ---

-string(20) "2d393339353234303936"

---- testing: '-7.7' << '123e5xyz' ---

-string(20) "2d393339353234303936"

---- testing: '-7.7' << ' 123abc' ---

-string(20) "2d393339353234303936"

---- testing: '-7.7' << '123 abc' ---

-string(20) "2d393339353234303936"

---- testing: '-7.7' << '123abc ' ---

-string(20) "2d393339353234303936"

---- testing: '-7.7' << '3.4a' ---

-string(6) "2d3536"

---- testing: '-7.7' << 'a5.9' ---

-string(4) "2d37"

---- testing: 'abc' << '0' ---

-string(2) "30"

---- testing: 'abc' << '65' ---

-string(2) "30"

---- testing: 'abc' << '-44' ---

-string(2) "30"

---- testing: 'abc' << '1.2' ---

-string(2) "30"

---- testing: 'abc' << '-7.7' ---

-string(2) "30"

---- testing: 'abc' << 'abc' ---

-string(2) "30"

---- testing: 'abc' << '123abc' ---

-string(2) "30"

---- testing: 'abc' << '123e5' ---

-string(2) "30"

---- testing: 'abc' << '123e5xyz' ---

-string(2) "30"

---- testing: 'abc' << ' 123abc' ---

-string(2) "30"

---- testing: 'abc' << '123 abc' ---

-string(2) "30"

---- testing: 'abc' << '123abc ' ---

-string(2) "30"

---- testing: 'abc' << '3.4a' ---

-string(2) "30"

---- testing: 'abc' << 'a5.9' ---

-string(2) "30"

---- testing: '123abc' << '0' ---

-string(6) "313233"

---- testing: '123abc' << '65' ---

-string(6) "323436"

---- testing: '123abc' << '-44' ---

-string(18) "313238393734383438"

---- testing: '123abc' << '1.2' ---

-string(6) "323436"

---- testing: '123abc' << '-7.7' ---

-string(20) "2d313637373732313630"

---- testing: '123abc' << 'abc' ---

-string(6) "313233"

---- testing: '123abc' << '123abc' ---

-string(20) "2d363731303838363430"

---- testing: '123abc' << '123e5' ---

-string(20) "2d363731303838363430"

---- testing: '123abc' << '123e5xyz' ---

-string(20) "2d363731303838363430"

---- testing: '123abc' << ' 123abc' ---

-string(20) "2d363731303838363430"

---- testing: '123abc' << '123 abc' ---

-string(20) "2d363731303838363430"

---- testing: '123abc' << '123abc ' ---

-string(20) "2d363731303838363430"

---- testing: '123abc' << '3.4a' ---

-string(6) "393834"

---- testing: '123abc' << 'a5.9' ---

-string(6) "313233"

---- testing: '123e5' << '0' ---

-string(6) "313233"

---- testing: '123e5' << '65' ---

-string(6) "323436"

---- testing: '123e5' << '-44' ---

-string(18) "313238393734383438"

---- testing: '123e5' << '1.2' ---

-string(6) "323436"

---- testing: '123e5' << '-7.7' ---

-string(20) "2d313637373732313630"

---- testing: '123e5' << 'abc' ---

-string(6) "313233"

---- testing: '123e5' << '123abc' ---

-string(20) "2d363731303838363430"

---- testing: '123e5' << '123e5' ---

-string(20) "2d363731303838363430"

---- testing: '123e5' << '123e5xyz' ---

-string(20) "2d363731303838363430"

---- testing: '123e5' << ' 123abc' ---

-string(20) "2d363731303838363430"

---- testing: '123e5' << '123 abc' ---

-string(20) "2d363731303838363430"

---- testing: '123e5' << '123abc ' ---

-string(20) "2d363731303838363430"

---- testing: '123e5' << '3.4a' ---

-string(6) "393834"

---- testing: '123e5' << 'a5.9' ---

-string(6) "313233"

---- testing: '123e5xyz' << '0' ---

-string(6) "313233"

---- testing: '123e5xyz' << '65' ---

-string(6) "323436"

---- testing: '123e5xyz' << '-44' ---

-string(18) "313238393734383438"

---- testing: '123e5xyz' << '1.2' ---

-string(6) "323436"

---- testing: '123e5xyz' << '-7.7' ---

-string(20) "2d313637373732313630"

---- testing: '123e5xyz' << 'abc' ---

-string(6) "313233"

---- testing: '123e5xyz' << '123abc' ---

-string(20) "2d363731303838363430"

---- testing: '123e5xyz' << '123e5' ---

-string(20) "2d363731303838363430"

---- testing: '123e5xyz' << '123e5xyz' ---

-string(20) "2d363731303838363430"

---- testing: '123e5xyz' << ' 123abc' ---

-string(20) "2d363731303838363430"

---- testing: '123e5xyz' << '123 abc' ---

-string(20) "2d363731303838363430"

---- testing: '123e5xyz' << '123abc ' ---

-string(20) "2d363731303838363430"

---- testing: '123e5xyz' << '3.4a' ---

-string(6) "393834"

---- testing: '123e5xyz' << 'a5.9' ---

-string(6) "313233"

---- testing: ' 123abc' << '0' ---

-string(6) "313233"

---- testing: ' 123abc' << '65' ---

-string(6) "323436"

---- testing: ' 123abc' << '-44' ---

-string(18) "313238393734383438"

---- testing: ' 123abc' << '1.2' ---

-string(6) "323436"

---- testing: ' 123abc' << '-7.7' ---

-string(20) "2d313637373732313630"

---- testing: ' 123abc' << 'abc' ---

-string(6) "313233"

---- testing: ' 123abc' << '123abc' ---

-string(20) "2d363731303838363430"

---- testing: ' 123abc' << '123e5' ---

-string(20) "2d363731303838363430"

---- testing: ' 123abc' << '123e5xyz' ---

-string(20) "2d363731303838363430"

---- testing: ' 123abc' << ' 123abc' ---

-string(20) "2d363731303838363430"

---- testing: ' 123abc' << '123 abc' ---

-string(20) "2d363731303838363430"

---- testing: ' 123abc' << '123abc ' ---

-string(20) "2d363731303838363430"

---- testing: ' 123abc' << '3.4a' ---

-string(6) "393834"

---- testing: ' 123abc' << 'a5.9' ---

-string(6) "313233"

---- testing: '123 abc' << '0' ---

-string(6) "313233"

---- testing: '123 abc' << '65' ---

-string(6) "323436"

---- testing: '123 abc' << '-44' ---

-string(18) "313238393734383438"

---- testing: '123 abc' << '1.2' ---

-string(6) "323436"

---- testing: '123 abc' << '-7.7' ---

-string(20) "2d313637373732313630"

---- testing: '123 abc' << 'abc' ---

-string(6) "313233"

---- testing: '123 abc' << '123abc' ---

-string(20) "2d363731303838363430"

---- testing: '123 abc' << '123e5' ---

-string(20) "2d363731303838363430"

---- testing: '123 abc' << '123e5xyz' ---

-string(20) "2d363731303838363430"

---- testing: '123 abc' << ' 123abc' ---

-string(20) "2d363731303838363430"

---- testing: '123 abc' << '123 abc' ---

-string(20) "2d363731303838363430"

---- testing: '123 abc' << '123abc ' ---

-string(20) "2d363731303838363430"

---- testing: '123 abc' << '3.4a' ---

-string(6) "393834"

---- testing: '123 abc' << 'a5.9' ---

-string(6) "313233"

---- testing: '123abc ' << '0' ---

-string(6) "313233"

---- testing: '123abc ' << '65' ---

-string(6) "323436"

---- testing: '123abc ' << '-44' ---

-string(18) "313238393734383438"

---- testing: '123abc ' << '1.2' ---

-string(6) "323436"

---- testing: '123abc ' << '-7.7' ---

-string(20) "2d313637373732313630"

---- testing: '123abc ' << 'abc' ---

-string(6) "313233"

---- testing: '123abc ' << '123abc' ---

-string(20) "2d363731303838363430"

---- testing: '123abc ' << '123e5' ---

-string(20) "2d363731303838363430"

---- testing: '123abc ' << '123e5xyz' ---

-string(20) "2d363731303838363430"

---- testing: '123abc ' << ' 123abc' ---

-string(20) "2d363731303838363430"

---- testing: '123abc ' << '123 abc' ---

-string(20) "2d363731303838363430"

---- testing: '123abc ' << '123abc ' ---

-string(20) "2d363731303838363430"

---- testing: '123abc ' << '3.4a' ---

-string(6) "393834"

---- testing: '123abc ' << 'a5.9' ---

-string(6) "313233"

---- testing: '3.4a' << '0' ---

-string(2) "33"

---- testing: '3.4a' << '65' ---

-string(2) "36"

---- testing: '3.4a' << '-44' ---

-string(14) "33313435373238"

---- testing: '3.4a' << '1.2' ---

-string(2) "36"

---- testing: '3.4a' << '-7.7' ---

-string(18) "313030363633323936"

---- testing: '3.4a' << 'abc' ---

-string(2) "33"

---- testing: '3.4a' << '123abc' ---

-string(18) "343032363533313834"

---- testing: '3.4a' << '123e5' ---

-string(18) "343032363533313834"

---- testing: '3.4a' << '123e5xyz' ---

-string(18) "343032363533313834"

---- testing: '3.4a' << ' 123abc' ---

-string(18) "343032363533313834"

---- testing: '3.4a' << '123 abc' ---

-string(18) "343032363533313834"

---- testing: '3.4a' << '123abc ' ---

-string(18) "343032363533313834"

---- testing: '3.4a' << '3.4a' ---

-string(4) "3234"

---- testing: '3.4a' << 'a5.9' ---

-string(2) "33"

---- testing: 'a5.9' << '0' ---

-string(2) "30"

---- testing: 'a5.9' << '65' ---

-string(2) "30"

---- testing: 'a5.9' << '-44' ---

-string(2) "30"

---- testing: 'a5.9' << '1.2' ---

-string(2) "30"

---- testing: 'a5.9' << '-7.7' ---

-string(2) "30"

---- testing: 'a5.9' << 'abc' ---

-string(2) "30"

---- testing: 'a5.9' << '123abc' ---

-string(2) "30"

---- testing: 'a5.9' << '123e5' ---

-string(2) "30"

---- testing: 'a5.9' << '123e5xyz' ---

-string(2) "30"

---- testing: 'a5.9' << ' 123abc' ---

-string(2) "30"

---- testing: 'a5.9' << '123 abc' ---

-string(2) "30"

---- testing: 'a5.9' << '123abc ' ---

-string(2) "30"

---- testing: 'a5.9' << '3.4a' ---

-string(2) "30"

---- testing: 'a5.9' << 'a5.9' ---

-string(2) "30"

-===DONE===

-

+--TEST--
+Test << operator : various numbers as strings
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
+if ((65<<65)==0) die("skip this test is for Intel only");
+?>
+--FILE--
+<?php
+
+$strVals = array(
+   "0","65","-44", "1.2", "-7.7", "abc", "123abc", "123e5", "123e5xyz", " 123abc", "123 abc", "123abc ", "3.4a",
+   "a5.9"
+);
+
+error_reporting(E_ERROR);
+
+foreach ($strVals as $strVal) {
+   foreach($strVals as $otherVal) {
+	   echo "--- testing: '$strVal' << '$otherVal' ---\n";   
+      var_dump(bin2hex($strVal<<$otherVal));
+   }
+}
+   
+?>
+===DONE===
+--EXPECT--
+--- testing: '0' << '0' ---
+string(2) "30"
+--- testing: '0' << '65' ---
+string(2) "30"
+--- testing: '0' << '-44' ---
+string(2) "30"
+--- testing: '0' << '1.2' ---
+string(2) "30"
+--- testing: '0' << '-7.7' ---
+string(2) "30"
+--- testing: '0' << 'abc' ---
+string(2) "30"
+--- testing: '0' << '123abc' ---
+string(2) "30"
+--- testing: '0' << '123e5' ---
+string(2) "30"
+--- testing: '0' << '123e5xyz' ---
+string(2) "30"
+--- testing: '0' << ' 123abc' ---
+string(2) "30"
+--- testing: '0' << '123 abc' ---
+string(2) "30"
+--- testing: '0' << '123abc ' ---
+string(2) "30"
+--- testing: '0' << '3.4a' ---
+string(2) "30"
+--- testing: '0' << 'a5.9' ---
+string(2) "30"
+--- testing: '65' << '0' ---
+string(4) "3635"
+--- testing: '65' << '65' ---
+string(6) "313330"
+--- testing: '65' << '-44' ---
+string(16) "3638313537343430"
+--- testing: '65' << '1.2' ---
+string(6) "313330"
+--- testing: '65' << '-7.7' ---
+string(22) "2d32313133393239323136"
+--- testing: '65' << 'abc' ---
+string(4) "3635"
+--- testing: '65' << '123abc' ---
+string(18) "313334323137373238"
+--- testing: '65' << '123e5' ---
+string(18) "313334323137373238"
+--- testing: '65' << '123e5xyz' ---
+string(18) "313334323137373238"
+--- testing: '65' << ' 123abc' ---
+string(18) "313334323137373238"
+--- testing: '65' << '123 abc' ---
+string(18) "313334323137373238"
+--- testing: '65' << '123abc ' ---
+string(18) "313334323137373238"
+--- testing: '65' << '3.4a' ---
+string(6) "353230"
+--- testing: '65' << 'a5.9' ---
+string(4) "3635"
+--- testing: '-44' << '0' ---
+string(6) "2d3434"
+--- testing: '-44' << '65' ---
+string(6) "2d3838"
+--- testing: '-44' << '-44' ---
+string(18) "2d3436313337333434"
+--- testing: '-44' << '1.2' ---
+string(6) "2d3838"
+--- testing: '-44' << '-7.7' ---
+string(22) "2d31343736333935303038"
+--- testing: '-44' << 'abc' ---
+string(6) "2d3434"
+--- testing: '-44' << '123abc' ---
+string(22) "2d31363130363132373336"
+--- testing: '-44' << '123e5' ---
+string(22) "2d31363130363132373336"
+--- testing: '-44' << '123e5xyz' ---
+string(22) "2d31363130363132373336"
+--- testing: '-44' << ' 123abc' ---
+string(22) "2d31363130363132373336"
+--- testing: '-44' << '123 abc' ---
+string(22) "2d31363130363132373336"
+--- testing: '-44' << '123abc ' ---
+string(22) "2d31363130363132373336"
+--- testing: '-44' << '3.4a' ---
+string(8) "2d333532"
+--- testing: '-44' << 'a5.9' ---
+string(6) "2d3434"
+--- testing: '1.2' << '0' ---
+string(2) "31"
+--- testing: '1.2' << '65' ---
+string(2) "32"
+--- testing: '1.2' << '-44' ---
+string(14) "31303438353736"
+--- testing: '1.2' << '1.2' ---
+string(2) "32"
+--- testing: '1.2' << '-7.7' ---
+string(16) "3333353534343332"
+--- testing: '1.2' << 'abc' ---
+string(2) "31"
+--- testing: '1.2' << '123abc' ---
+string(18) "313334323137373238"
+--- testing: '1.2' << '123e5' ---
+string(18) "313334323137373238"
+--- testing: '1.2' << '123e5xyz' ---
+string(18) "313334323137373238"
+--- testing: '1.2' << ' 123abc' ---
+string(18) "313334323137373238"
+--- testing: '1.2' << '123 abc' ---
+string(18) "313334323137373238"
+--- testing: '1.2' << '123abc ' ---
+string(18) "313334323137373238"
+--- testing: '1.2' << '3.4a' ---
+string(2) "38"
+--- testing: '1.2' << 'a5.9' ---
+string(2) "31"
+--- testing: '-7.7' << '0' ---
+string(4) "2d37"
+--- testing: '-7.7' << '65' ---
+string(6) "2d3134"
+--- testing: '-7.7' << '-44' ---
+string(16) "2d37333430303332"
+--- testing: '-7.7' << '1.2' ---
+string(6) "2d3134"
+--- testing: '-7.7' << '-7.7' ---
+string(20) "2d323334383831303234"
+--- testing: '-7.7' << 'abc' ---
+string(4) "2d37"
+--- testing: '-7.7' << '123abc' ---
+string(20) "2d393339353234303936"
+--- testing: '-7.7' << '123e5' ---
+string(20) "2d393339353234303936"
+--- testing: '-7.7' << '123e5xyz' ---
+string(20) "2d393339353234303936"
+--- testing: '-7.7' << ' 123abc' ---
+string(20) "2d393339353234303936"
+--- testing: '-7.7' << '123 abc' ---
+string(20) "2d393339353234303936"
+--- testing: '-7.7' << '123abc ' ---
+string(20) "2d393339353234303936"
+--- testing: '-7.7' << '3.4a' ---
+string(6) "2d3536"
+--- testing: '-7.7' << 'a5.9' ---
+string(4) "2d37"
+--- testing: 'abc' << '0' ---
+string(2) "30"
+--- testing: 'abc' << '65' ---
+string(2) "30"
+--- testing: 'abc' << '-44' ---
+string(2) "30"
+--- testing: 'abc' << '1.2' ---
+string(2) "30"
+--- testing: 'abc' << '-7.7' ---
+string(2) "30"
+--- testing: 'abc' << 'abc' ---
+string(2) "30"
+--- testing: 'abc' << '123abc' ---
+string(2) "30"
+--- testing: 'abc' << '123e5' ---
+string(2) "30"
+--- testing: 'abc' << '123e5xyz' ---
+string(2) "30"
+--- testing: 'abc' << ' 123abc' ---
+string(2) "30"
+--- testing: 'abc' << '123 abc' ---
+string(2) "30"
+--- testing: 'abc' << '123abc ' ---
+string(2) "30"
+--- testing: 'abc' << '3.4a' ---
+string(2) "30"
+--- testing: 'abc' << 'a5.9' ---
+string(2) "30"
+--- testing: '123abc' << '0' ---
+string(6) "313233"
+--- testing: '123abc' << '65' ---
+string(6) "323436"
+--- testing: '123abc' << '-44' ---
+string(18) "313238393734383438"
+--- testing: '123abc' << '1.2' ---
+string(6) "323436"
+--- testing: '123abc' << '-7.7' ---
+string(20) "2d313637373732313630"
+--- testing: '123abc' << 'abc' ---
+string(6) "313233"
+--- testing: '123abc' << '123abc' ---
+string(20) "2d363731303838363430"
+--- testing: '123abc' << '123e5' ---
+string(20) "2d363731303838363430"
+--- testing: '123abc' << '123e5xyz' ---
+string(20) "2d363731303838363430"
+--- testing: '123abc' << ' 123abc' ---
+string(20) "2d363731303838363430"
+--- testing: '123abc' << '123 abc' ---
+string(20) "2d363731303838363430"
+--- testing: '123abc' << '123abc ' ---
+string(20) "2d363731303838363430"
+--- testing: '123abc' << '3.4a' ---
+string(6) "393834"
+--- testing: '123abc' << 'a5.9' ---
+string(6) "313233"
+--- testing: '123e5' << '0' ---
+string(6) "313233"
+--- testing: '123e5' << '65' ---
+string(6) "323436"
+--- testing: '123e5' << '-44' ---
+string(18) "313238393734383438"
+--- testing: '123e5' << '1.2' ---
+string(6) "323436"
+--- testing: '123e5' << '-7.7' ---
+string(20) "2d313637373732313630"
+--- testing: '123e5' << 'abc' ---
+string(6) "313233"
+--- testing: '123e5' << '123abc' ---
+string(20) "2d363731303838363430"
+--- testing: '123e5' << '123e5' ---
+string(20) "2d363731303838363430"
+--- testing: '123e5' << '123e5xyz' ---
+string(20) "2d363731303838363430"
+--- testing: '123e5' << ' 123abc' ---
+string(20) "2d363731303838363430"
+--- testing: '123e5' << '123 abc' ---
+string(20) "2d363731303838363430"
+--- testing: '123e5' << '123abc ' ---
+string(20) "2d363731303838363430"
+--- testing: '123e5' << '3.4a' ---
+string(6) "393834"
+--- testing: '123e5' << 'a5.9' ---
+string(6) "313233"
+--- testing: '123e5xyz' << '0' ---
+string(6) "313233"
+--- testing: '123e5xyz' << '65' ---
+string(6) "323436"
+--- testing: '123e5xyz' << '-44' ---
+string(18) "313238393734383438"
+--- testing: '123e5xyz' << '1.2' ---
+string(6) "323436"
+--- testing: '123e5xyz' << '-7.7' ---
+string(20) "2d313637373732313630"
+--- testing: '123e5xyz' << 'abc' ---
+string(6) "313233"
+--- testing: '123e5xyz' << '123abc' ---
+string(20) "2d363731303838363430"
+--- testing: '123e5xyz' << '123e5' ---
+string(20) "2d363731303838363430"
+--- testing: '123e5xyz' << '123e5xyz' ---
+string(20) "2d363731303838363430"
+--- testing: '123e5xyz' << ' 123abc' ---
+string(20) "2d363731303838363430"
+--- testing: '123e5xyz' << '123 abc' ---
+string(20) "2d363731303838363430"
+--- testing: '123e5xyz' << '123abc ' ---
+string(20) "2d363731303838363430"
+--- testing: '123e5xyz' << '3.4a' ---
+string(6) "393834"
+--- testing: '123e5xyz' << 'a5.9' ---
+string(6) "313233"
+--- testing: ' 123abc' << '0' ---
+string(6) "313233"
+--- testing: ' 123abc' << '65' ---
+string(6) "323436"
+--- testing: ' 123abc' << '-44' ---
+string(18) "313238393734383438"
+--- testing: ' 123abc' << '1.2' ---
+string(6) "323436"
+--- testing: ' 123abc' << '-7.7' ---
+string(20) "2d313637373732313630"
+--- testing: ' 123abc' << 'abc' ---
+string(6) "313233"
+--- testing: ' 123abc' << '123abc' ---
+string(20) "2d363731303838363430"
+--- testing: ' 123abc' << '123e5' ---
+string(20) "2d363731303838363430"
+--- testing: ' 123abc' << '123e5xyz' ---
+string(20) "2d363731303838363430"
+--- testing: ' 123abc' << ' 123abc' ---
+string(20) "2d363731303838363430"
+--- testing: ' 123abc' << '123 abc' ---
+string(20) "2d363731303838363430"
+--- testing: ' 123abc' << '123abc ' ---
+string(20) "2d363731303838363430"
+--- testing: ' 123abc' << '3.4a' ---
+string(6) "393834"
+--- testing: ' 123abc' << 'a5.9' ---
+string(6) "313233"
+--- testing: '123 abc' << '0' ---
+string(6) "313233"
+--- testing: '123 abc' << '65' ---
+string(6) "323436"
+--- testing: '123 abc' << '-44' ---
+string(18) "313238393734383438"
+--- testing: '123 abc' << '1.2' ---
+string(6) "323436"
+--- testing: '123 abc' << '-7.7' ---
+string(20) "2d313637373732313630"
+--- testing: '123 abc' << 'abc' ---
+string(6) "313233"
+--- testing: '123 abc' << '123abc' ---
+string(20) "2d363731303838363430"
+--- testing: '123 abc' << '123e5' ---
+string(20) "2d363731303838363430"
+--- testing: '123 abc' << '123e5xyz' ---
+string(20) "2d363731303838363430"
+--- testing: '123 abc' << ' 123abc' ---
+string(20) "2d363731303838363430"
+--- testing: '123 abc' << '123 abc' ---
+string(20) "2d363731303838363430"
+--- testing: '123 abc' << '123abc ' ---
+string(20) "2d363731303838363430"
+--- testing: '123 abc' << '3.4a' ---
+string(6) "393834"
+--- testing: '123 abc' << 'a5.9' ---
+string(6) "313233"
+--- testing: '123abc ' << '0' ---
+string(6) "313233"
+--- testing: '123abc ' << '65' ---
+string(6) "323436"
+--- testing: '123abc ' << '-44' ---
+string(18) "313238393734383438"
+--- testing: '123abc ' << '1.2' ---
+string(6) "323436"
+--- testing: '123abc ' << '-7.7' ---
+string(20) "2d313637373732313630"
+--- testing: '123abc ' << 'abc' ---
+string(6) "313233"
+--- testing: '123abc ' << '123abc' ---
+string(20) "2d363731303838363430"
+--- testing: '123abc ' << '123e5' ---
+string(20) "2d363731303838363430"
+--- testing: '123abc ' << '123e5xyz' ---
+string(20) "2d363731303838363430"
+--- testing: '123abc ' << ' 123abc' ---
+string(20) "2d363731303838363430"
+--- testing: '123abc ' << '123 abc' ---
+string(20) "2d363731303838363430"
+--- testing: '123abc ' << '123abc ' ---
+string(20) "2d363731303838363430"
+--- testing: '123abc ' << '3.4a' ---
+string(6) "393834"
+--- testing: '123abc ' << 'a5.9' ---
+string(6) "313233"
+--- testing: '3.4a' << '0' ---
+string(2) "33"
+--- testing: '3.4a' << '65' ---
+string(2) "36"
+--- testing: '3.4a' << '-44' ---
+string(14) "33313435373238"
+--- testing: '3.4a' << '1.2' ---
+string(2) "36"
+--- testing: '3.4a' << '-7.7' ---
+string(18) "313030363633323936"
+--- testing: '3.4a' << 'abc' ---
+string(2) "33"
+--- testing: '3.4a' << '123abc' ---
+string(18) "343032363533313834"
+--- testing: '3.4a' << '123e5' ---
+string(18) "343032363533313834"
+--- testing: '3.4a' << '123e5xyz' ---
+string(18) "343032363533313834"
+--- testing: '3.4a' << ' 123abc' ---
+string(18) "343032363533313834"
+--- testing: '3.4a' << '123 abc' ---
+string(18) "343032363533313834"
+--- testing: '3.4a' << '123abc ' ---
+string(18) "343032363533313834"
+--- testing: '3.4a' << '3.4a' ---
+string(4) "3234"
+--- testing: '3.4a' << 'a5.9' ---
+string(2) "33"
+--- testing: 'a5.9' << '0' ---
+string(2) "30"
+--- testing: 'a5.9' << '65' ---
+string(2) "30"
+--- testing: 'a5.9' << '-44' ---
+string(2) "30"
+--- testing: 'a5.9' << '1.2' ---
+string(2) "30"
+--- testing: 'a5.9' << '-7.7' ---
+string(2) "30"
+--- testing: 'a5.9' << 'abc' ---
+string(2) "30"
+--- testing: 'a5.9' << '123abc' ---
+string(2) "30"
+--- testing: 'a5.9' << '123e5' ---
+string(2) "30"
+--- testing: 'a5.9' << '123e5xyz' ---
+string(2) "30"
+--- testing: 'a5.9' << ' 123abc' ---
+string(2) "30"
+--- testing: 'a5.9' << '123 abc' ---
+string(2) "30"
+--- testing: 'a5.9' << '123abc ' ---
+string(2) "30"
+--- testing: 'a5.9' << '3.4a' ---
+string(2) "30"
+--- testing: 'a5.9' << 'a5.9' ---
+string(2) "30"
+===DONE===
+
diff --git a/tests/lang/operators/bitwiseShiftLeft_variationStr2.phpt b/tests/lang/operators/bitwiseShiftLeft_variationStr2.phpt
new file mode 100644
index 0000000000..09949c56b0
--- /dev/null
+++ b/tests/lang/operators/bitwiseShiftLeft_variationStr2.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Test << operator : numbers as strings, simple
+--FILE--
+<?php
+
+error_reporting(E_ERROR);
+
+var_dump("12" << "0");
+var_dump("34" << "1");
+var_dump("56" << "2");
+
+?>
+===DONE===
+--EXPECT--
+int(12)
+int(68)
+int(224)
+===DONE===
diff --git a/tests/lang/operators/bitwiseShiftRight_variationStr.phpt b/tests/lang/operators/bitwiseShiftRight_variationStr.phpt
index 9518d42cdc..ad53fea9d1 100644
--- a/tests/lang/operators/bitwiseShiftRight_variationStr.phpt
+++ b/tests/lang/operators/bitwiseShiftRight_variationStr.phpt
@@ -1,26 +1,30 @@
---TEST--

-Test >> operator : various numbers as strings

---FILE--

-<?php

-

-$strVals = array(

-   "0","65","-44", "1.2", "-7.7", "abc", "123abc", "123e5", "123e5xyz", " 123abc", "123 abc", "123abc ", "3.4a",

-   "a5.9"

-);

-

-error_reporting(E_ERROR);

-

-foreach ($strVals as $strVal) {

-   foreach($strVals as $otherVal) {

-	   echo "--- testing: '$strVal' >> '$otherVal' ---\n";   

-      var_dump(bin2hex($strVal>>$otherVal));

-   }

-}

-

-   

-?>

-===DONE===

---EXPECT--

+--TEST--
+Test >> operator : various numbers as strings
+--SKIPIF--
+<?php
+if ((65<<65)==0) die("skip this test is for Intel only");
+?>
+--FILE--
+<?php
+
+$strVals = array(
+   "0","65","-44", "1.2", "-7.7", "abc", "123abc", "123e5", "123e5xyz", " 123abc", "123 abc", "123abc ", "3.4a",
+   "a5.9"
+);
+
+error_reporting(E_ERROR);
+
+foreach ($strVals as $strVal) {
+   foreach($strVals as $otherVal) {
+	   echo "--- testing: '$strVal' >> '$otherVal' ---\n";   
+      var_dump(bin2hex($strVal>>$otherVal));
+   }
+}
+
+   
+?>
+===DONE===
+--EXPECT--
 --- testing: '0' >> '0' ---
 string(2) "30"
 --- testing: '0' >> '65' ---
@@ -412,5 +416,5 @@ string(2) "30"
 --- testing: 'a5.9' >> '3.4a' ---
 string(2) "30"
 --- testing: 'a5.9' >> 'a5.9' ---
-string(2) "30"

-===DONE===

+string(2) "30"
+===DONE===
diff --git a/tests/lang/operators/bitwiseShiftRight_variationStr2.phpt b/tests/lang/operators/bitwiseShiftRight_variationStr2.phpt
new file mode 100644
index 0000000000..db90e1b338
--- /dev/null
+++ b/tests/lang/operators/bitwiseShiftRight_variationStr2.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Test >> operator : numbers as strings, simple
+--FILE--
+<?php
+
+error_reporting(E_ERROR);
+
+var_dump("12" >> "0");
+var_dump("34" >> "1");
+var_dump("56" >> "2");
+
+?>
+===DONE===
+--EXPECT--
+int(12)
+int(17)
+int(14)
+===DONE===
diff --git a/tests/security/open_basedir_linkinfo.phpt b/tests/security/open_basedir_linkinfo.phpt
index f8be45305e..55cf2c2f4b 100644
--- a/tests/security/open_basedir_linkinfo.phpt
+++ b/tests/security/open_basedir_linkinfo.phpt
@@ -41,6 +41,7 @@ test_open_basedir_after("linkinfo");
 ?>
 --CLEAN--
 <?php
+chdir(__DIR__);
 require_once "open_basedir.inc";
 delete_directories();
 ?>
diff --git a/tests/security/open_basedir_readlink.phpt b/tests/security/open_basedir_readlink.phpt
index b102ee9d9c..33720bbf1b 100644
--- a/tests/security/open_basedir_readlink.phpt
+++ b/tests/security/open_basedir_readlink.phpt
@@ -37,6 +37,7 @@ test_open_basedir_after("readlink");
 ?>
 --CLEAN--
 <?php
+chdir(__DIR__);
 require_once "open_basedir.inc";
 delete_directories();
 ?>