Skip to content

Fix failed merge after #3815 #3876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix failed merge after #3815 #3876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ext/standard/tests/file/bug22414.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\"; "');
Expand All @@ -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\\\\\\")); \"';
Expand Down
2 changes: 1 addition & 1 deletion ext/standard/tests/general_functions/debug_zval_dump_v.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ $misc_values = array (
@$undef_var,

/* mixed types */
@TRUE123,
"TRUE123",
"123string",
"string123",
"NULLstring"
Expand Down
Binary file modified ext/standard/tests/serialize/serialization_miscTypes_001.phpt
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ext/standard/tests/strings/explode.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var_dump(@explode(NULL, ""));
var_dump(@explode("a", ""));
var_dump(@explode("a", "a"));
var_dump(@explode("a", NULL));
var_dump(@explode(NULL, a));
var_dump(@explode(NULL, "a"));
var_dump(@explode("abc", "acb"));
var_dump(@explode("somestring", "otherstring"));
var_dump(@explode("somestring", "otherstring", -1));
Expand Down
112 changes: 56 additions & 56 deletions tests/lang/operators/bitwiseShiftLeft_variationStr.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ foreach ($strVals as $strVal) {
foreach($strVals as $otherVal) {
echo "--- testing: '$strVal' << '$otherVal' ---\n";
try {
var_dump(strVal<<$otherVal);
var_dump($strVal<<$otherVal);
} catch (Throwable $e) {
echo "Exception: " . $e->getMessage() . "\n";
}
Expand Down Expand Up @@ -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' ---
Expand All @@ -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' ---
Expand All @@ -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' ---
Expand All @@ -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' ---
Expand All @@ -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' ---
Expand Down Expand Up @@ -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' ---
Expand All @@ -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' ---
Expand All @@ -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' ---
Expand All @@ -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' ---
Expand All @@ -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' ---
Expand All @@ -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' ---
Expand All @@ -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' ---
Expand All @@ -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' ---
Expand Down