Skip to content

Commit 4a8b934

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Fix potential file collision in dom tests Fix bug #80757 (Exit code is 0 when could not open file) Update NEWS
2 parents 5caf29a + 44ef32f commit 4a8b934

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require_once __DIR__ .'/skipif.inc';
99
?>
1010
--FILE--
1111
<?php
12-
$filename = __DIR__."/tmp_savehtmlfile".time().".html";
12+
$filename = __DIR__."/DOMDocument_saveHTMLFile_basic.html";
1313
$doc = new DOMDocument('1.0');
1414
$root = $doc->createElement('html');
1515
$root = $doc->appendChild($root);

ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require_once __DIR__ .'/skipif.inc';
99
?>
1010
--FILE--
1111
<?php
12-
$filename = __DIR__."/tmp_savehtmlfile".time().".html";
12+
$filename = __DIR__."/DOMDocument_saveHTMLFile_formatOutput.html";
1313
$doc = new DOMDocument('1.0');
1414
$doc->formatOutput = true;
1515
$root = $doc->createElement('html');

sapi/phpdbg/phpdbg_prompt.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,7 @@ PHPDBG_COMMAND(run) /* {{{ */
764764
if (!PHPDBG_G(ops)) {
765765
if (phpdbg_compile() == FAILURE) {
766766
phpdbg_error("compile", "type=\"compilefailure\" context=\"%s\"", "Failed to compile %s, cannot run", PHPDBG_G(exec));
767+
EG(exit_status) = FAILURE;
767768
goto out;
768769
}
769770
}

0 commit comments

Comments
 (0)