From 7252a26f7f740b1dc77148b0fd75c699554305c5 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 31 Jan 2019 12:25:51 +0100 Subject: [PATCH] Fix tests bareword fallback with error suppression Re-merge commit a369326003995c137046c908e79b6ab482d34cec into PHP-7.4 (cherry picked from commit aad39879f2d2e89de105c4f87d334ee129b4321c) (cherry picked from commit 76f8a908bb18aee92b8f3d523b74b06c9d12cb6b) --- ext/standard/tests/file/bug22414.phpt | 4 +- .../general_functions/debug_zval_dump_v.phpt | 2 +- .../serialization_miscTypes_001.phpt | Bin 7605 -> 7606 bytes ext/standard/tests/strings/explode.phpt | 2 +- .../bitwiseShiftLeft_variationStr.phpt | 112 +++++++++--------- 5 files changed, 60 insertions(+), 60 deletions(-) diff --git a/ext/standard/tests/file/bug22414.phpt b/ext/standard/tests/file/bug22414.phpt index abc6e4758563b..c6e993ac9f982 100644 --- a/ext/standard/tests/file/bug22414.phpt +++ b/ext/standard/tests/file/bug22414.phpt @@ -7,7 +7,7 @@ output_handler= $php = getenv('TEST_PHP_EXECUTABLE'); $tmpfile = tempnam(__DIR__, 'phpt'); - $args = ' -n -dsafe_mode=off '; + $args = ' -n '; /* Regular Data Test */ passthru($php . $args . ' -r " echo \"HELLO\"; "'); @@ -17,7 +17,7 @@ output_handler= /* Binary Data Test */ if (substr(PHP_OS, 0, 3) != 'WIN') { - $cmd = $php . $args . ' -r \"readfile(@getenv(\'TEST_PHP_EXECUTABLE\')); \"'; + $cmd = $php . $args . ' -r \"readfile(@getenv(\'\\\'\'TEST_PHP_EXECUTABLE\'\\\'\')); \"'; $cmd = $php . $args . ' -r \' passthru("'.$cmd.'"); \' > '.$tmpfile ; } else { $cmd = $php . $args . ' -r \"readfile(@getenv(\\\\\\"TEST_PHP_EXECUTABLE\\\\\\")); \"'; diff --git a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt index b1dce294ab1e0..6cb413dc2614c 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt @@ -102,7 +102,7 @@ $misc_values = array ( @$undef_var, /* mixed types */ - @TRUE123, + "TRUE123", "123string", "string123", "NULLstring" diff --git a/ext/standard/tests/serialize/serialization_miscTypes_001.phpt b/ext/standard/tests/serialize/serialization_miscTypes_001.phpt index 3617458125f01dd3ccb4cf2dd1b2276ec8b5e5eb..e9215cf5619a5349ed1c413680508b2a13696fcf 100644 GIT binary patch delta 22 dcmdmLz0G=q2OFnSNKmM&p^>rD<^Z--aR5}H28aLv delta 21 ccmdmHz14by2OEb&NKmM&p^@?CK(getMessage() . "\n"; } @@ -53,17 +53,17 @@ int(0) --- testing: '0' << 'a5.9' --- int(0) --- testing: '65' << '0' --- -int(0) +int(65) --- testing: '65' << '65' --- int(0) --- testing: '65' << '-44' --- Exception: Bit shift by negative number --- testing: '65' << '1.2' --- -int(0) +int(130) --- testing: '65' << '-7.7' --- Exception: Bit shift by negative number --- testing: '65' << 'abc' --- -int(0) +int(65) --- testing: '65' << '123abc' --- int(0) --- testing: '65' << '123e5' --- @@ -77,21 +77,21 @@ int(0) --- testing: '65' << '123abc ' --- int(0) --- testing: '65' << '3.4a' --- -int(0) +int(520) --- testing: '65' << 'a5.9' --- -int(0) +int(65) --- testing: '-44' << '0' --- -int(0) +int(-44) --- testing: '-44' << '65' --- int(0) --- testing: '-44' << '-44' --- Exception: Bit shift by negative number --- testing: '-44' << '1.2' --- -int(0) +int(-88) --- testing: '-44' << '-7.7' --- Exception: Bit shift by negative number --- testing: '-44' << 'abc' --- -int(0) +int(-44) --- testing: '-44' << '123abc' --- int(0) --- testing: '-44' << '123e5' --- @@ -105,21 +105,21 @@ int(0) --- testing: '-44' << '123abc ' --- int(0) --- testing: '-44' << '3.4a' --- -int(0) +int(-352) --- testing: '-44' << 'a5.9' --- -int(0) +int(-44) --- testing: '1.2' << '0' --- -int(0) +int(1) --- testing: '1.2' << '65' --- int(0) --- testing: '1.2' << '-44' --- Exception: Bit shift by negative number --- testing: '1.2' << '1.2' --- -int(0) +int(2) --- testing: '1.2' << '-7.7' --- Exception: Bit shift by negative number --- testing: '1.2' << 'abc' --- -int(0) +int(1) --- testing: '1.2' << '123abc' --- int(0) --- testing: '1.2' << '123e5' --- @@ -133,21 +133,21 @@ int(0) --- testing: '1.2' << '123abc ' --- int(0) --- testing: '1.2' << '3.4a' --- -int(0) +int(8) --- testing: '1.2' << 'a5.9' --- -int(0) +int(1) --- testing: '-7.7' << '0' --- -int(0) +int(-7) --- testing: '-7.7' << '65' --- int(0) --- testing: '-7.7' << '-44' --- Exception: Bit shift by negative number --- testing: '-7.7' << '1.2' --- -int(0) +int(-14) --- testing: '-7.7' << '-7.7' --- Exception: Bit shift by negative number --- testing: '-7.7' << 'abc' --- -int(0) +int(-7) --- testing: '-7.7' << '123abc' --- int(0) --- testing: '-7.7' << '123e5' --- @@ -161,9 +161,9 @@ int(0) --- testing: '-7.7' << '123abc ' --- int(0) --- testing: '-7.7' << '3.4a' --- -int(0) +int(-56) --- testing: '-7.7' << 'a5.9' --- -int(0) +int(-7) --- testing: 'abc' << '0' --- int(0) --- testing: 'abc' << '65' --- @@ -193,17 +193,17 @@ int(0) --- testing: 'abc' << 'a5.9' --- int(0) --- testing: '123abc' << '0' --- -int(0) +int(123) --- testing: '123abc' << '65' --- int(0) --- testing: '123abc' << '-44' --- Exception: Bit shift by negative number --- testing: '123abc' << '1.2' --- -int(0) +int(246) --- testing: '123abc' << '-7.7' --- Exception: Bit shift by negative number --- testing: '123abc' << 'abc' --- -int(0) +int(123) --- testing: '123abc' << '123abc' --- int(0) --- testing: '123abc' << '123e5' --- @@ -217,21 +217,21 @@ int(0) --- testing: '123abc' << '123abc ' --- int(0) --- testing: '123abc' << '3.4a' --- -int(0) +int(984) --- testing: '123abc' << 'a5.9' --- -int(0) +int(123) --- testing: '123e5' << '0' --- -int(0) +int(12300000) --- testing: '123e5' << '65' --- int(0) --- testing: '123e5' << '-44' --- Exception: Bit shift by negative number --- testing: '123e5' << '1.2' --- -int(0) +int(24600000) --- testing: '123e5' << '-7.7' --- Exception: Bit shift by negative number --- testing: '123e5' << 'abc' --- -int(0) +int(12300000) --- testing: '123e5' << '123abc' --- int(0) --- testing: '123e5' << '123e5' --- @@ -245,21 +245,21 @@ int(0) --- testing: '123e5' << '123abc ' --- int(0) --- testing: '123e5' << '3.4a' --- -int(0) +int(98400000) --- testing: '123e5' << 'a5.9' --- -int(0) +int(12300000) --- testing: '123e5xyz' << '0' --- -int(0) +int(12300000) --- testing: '123e5xyz' << '65' --- int(0) --- testing: '123e5xyz' << '-44' --- Exception: Bit shift by negative number --- testing: '123e5xyz' << '1.2' --- -int(0) +int(24600000) --- testing: '123e5xyz' << '-7.7' --- Exception: Bit shift by negative number --- testing: '123e5xyz' << 'abc' --- -int(0) +int(12300000) --- testing: '123e5xyz' << '123abc' --- int(0) --- testing: '123e5xyz' << '123e5' --- @@ -273,21 +273,21 @@ int(0) --- testing: '123e5xyz' << '123abc ' --- int(0) --- testing: '123e5xyz' << '3.4a' --- -int(0) +int(98400000) --- testing: '123e5xyz' << 'a5.9' --- -int(0) +int(12300000) --- testing: ' 123abc' << '0' --- -int(0) +int(123) --- testing: ' 123abc' << '65' --- int(0) --- testing: ' 123abc' << '-44' --- Exception: Bit shift by negative number --- testing: ' 123abc' << '1.2' --- -int(0) +int(246) --- testing: ' 123abc' << '-7.7' --- Exception: Bit shift by negative number --- testing: ' 123abc' << 'abc' --- -int(0) +int(123) --- testing: ' 123abc' << '123abc' --- int(0) --- testing: ' 123abc' << '123e5' --- @@ -301,21 +301,21 @@ int(0) --- testing: ' 123abc' << '123abc ' --- int(0) --- testing: ' 123abc' << '3.4a' --- -int(0) +int(984) --- testing: ' 123abc' << 'a5.9' --- -int(0) +int(123) --- testing: '123 abc' << '0' --- -int(0) +int(123) --- testing: '123 abc' << '65' --- int(0) --- testing: '123 abc' << '-44' --- Exception: Bit shift by negative number --- testing: '123 abc' << '1.2' --- -int(0) +int(246) --- testing: '123 abc' << '-7.7' --- Exception: Bit shift by negative number --- testing: '123 abc' << 'abc' --- -int(0) +int(123) --- testing: '123 abc' << '123abc' --- int(0) --- testing: '123 abc' << '123e5' --- @@ -329,21 +329,21 @@ int(0) --- testing: '123 abc' << '123abc ' --- int(0) --- testing: '123 abc' << '3.4a' --- -int(0) +int(984) --- testing: '123 abc' << 'a5.9' --- -int(0) +int(123) --- testing: '123abc ' << '0' --- -int(0) +int(123) --- testing: '123abc ' << '65' --- int(0) --- testing: '123abc ' << '-44' --- Exception: Bit shift by negative number --- testing: '123abc ' << '1.2' --- -int(0) +int(246) --- testing: '123abc ' << '-7.7' --- Exception: Bit shift by negative number --- testing: '123abc ' << 'abc' --- -int(0) +int(123) --- testing: '123abc ' << '123abc' --- int(0) --- testing: '123abc ' << '123e5' --- @@ -357,21 +357,21 @@ int(0) --- testing: '123abc ' << '123abc ' --- int(0) --- testing: '123abc ' << '3.4a' --- -int(0) +int(984) --- testing: '123abc ' << 'a5.9' --- -int(0) +int(123) --- testing: '3.4a' << '0' --- -int(0) +int(3) --- testing: '3.4a' << '65' --- int(0) --- testing: '3.4a' << '-44' --- Exception: Bit shift by negative number --- testing: '3.4a' << '1.2' --- -int(0) +int(6) --- testing: '3.4a' << '-7.7' --- Exception: Bit shift by negative number --- testing: '3.4a' << 'abc' --- -int(0) +int(3) --- testing: '3.4a' << '123abc' --- int(0) --- testing: '3.4a' << '123e5' --- @@ -385,9 +385,9 @@ int(0) --- testing: '3.4a' << '123abc ' --- int(0) --- testing: '3.4a' << '3.4a' --- -int(0) +int(24) --- testing: '3.4a' << 'a5.9' --- -int(0) +int(3) --- testing: 'a5.9' << '0' --- int(0) --- testing: 'a5.9' << '65' ---