diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2021-02-24 21:30:44 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-02-24 21:30:44 +0100 |
| commit | 44ef32ff2cc01d67fefb4e52c5bd29ed5ae3f858 (patch) | |
| tree | ff87f4d30100ac9236f5451bb0616f82d050f9ee | |
| parent | aaea81de7cd9e5c3c4fd5620cf6d1e5b6195ef32 (diff) | |
| parent | 766f827e26d76c17945ed1fd36f65eaa57419607 (diff) | |
| download | php-git-44ef32ff2cc01d67fefb4e52c5bd29ed5ae3f858.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix potential file collision in dom tests
| -rw-r--r-- | ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt | 2 | ||||
| -rw-r--r-- | ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt b/ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt index 30c090679c..f71db0c32a 100644 --- a/ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt +++ b/ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt @@ -9,7 +9,7 @@ require_once __DIR__ .'/skipif.inc'; ?> --FILE-- <?php -$filename = __DIR__."/tmp_savehtmlfile".time().".html"; +$filename = __DIR__."/DOMDocument_saveHTMLFile_basic.html"; $doc = new DOMDocument('1.0'); $root = $doc->createElement('html'); $root = $doc->appendChild($root); diff --git a/ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt b/ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt index 02ced08282..376c9a8e32 100644 --- a/ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt +++ b/ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt @@ -9,7 +9,7 @@ require_once __DIR__ .'/skipif.inc'; ?> --FILE-- <?php -$filename = __DIR__."/tmp_savehtmlfile".time().".html"; +$filename = __DIR__."/DOMDocument_saveHTMLFile_formatOutput.html"; $doc = new DOMDocument('1.0'); $doc->formatOutput = true; $root = $doc->createElement('html'); |