diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-21 11:39:20 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-21 11:39:20 +0100 |
| commit | 26a9045bb6193365e81f1ff638361a783d1930bd (patch) | |
| tree | 46be9719849904c2882e7eaa5ff4d8bb94c8986b | |
| parent | fcdb610a0ccfdc597b1124da002f72ad0bbe82d7 (diff) | |
| parent | f5c5f7c05b949053f32ea08f42a11ffc93efeda1 (diff) | |
| download | php-git-26a9045bb6193365e81f1ff638361a783d1930bd.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix file clash in bug54446.phpt tests
| -rw-r--r-- | ext/xsl/tests/bug54446_with_ini.phpt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/xsl/tests/bug54446_with_ini.phpt b/ext/xsl/tests/bug54446_with_ini.phpt index 9769d1fd29..5327d6d397 100644 --- a/ext/xsl/tests/bug54446_with_ini.phpt +++ b/ext/xsl/tests/bug54446_with_ini.phpt @@ -8,7 +8,7 @@ if (!extension_loaded('xsl')) die("skip Extension XSL is required\n"); <?php include("prepare.inc"); -$outputfile = __DIR__."/bug54446test.txt"; +$outputfile = __DIR__."/bug54446test_with_ini.txt"; if (file_exists($outputfile)) { unlink($outputfile); } @@ -74,21 +74,21 @@ if (file_exists($outputfile)) { --EXPECTF-- Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %s element output in %s on line %d -Warning: XSLTProcessor::transformToXml(): File write for %s/bug54446test.txt refused in %s on line %d +Warning: XSLTProcessor::transformToXml(): File write for %s/bug54446test_with_ini.txt refused in %s on line %d Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element output in %s on line %d -Warning: XSLTProcessor::transformToXml(): xsltDocumentElem: write rights for %s/bug54446test.txt denied in %s on line %d +Warning: XSLTProcessor::transformToXml(): xsltDocumentElem: write rights for %s/bug54446test_with_ini.txt denied in %s on line %d OK, no file created OK, file exists Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %s element output in %s on line %d -Warning: XSLTProcessor::transformToXml(): File write for %s/bug54446test.txt refused in %s on line %d +Warning: XSLTProcessor::transformToXml(): File write for %s/bug54446test_with_ini.txt refused in %s on line %d Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element output in %s on line %d -Warning: XSLTProcessor::transformToXml(): xsltDocumentElem: write rights for %s/bug54446test.txt denied in %s on line %d +Warning: XSLTProcessor::transformToXml(): xsltDocumentElem: write rights for %s/bug54446test_with_ini.txt denied in %s on line %d OK, no file created --CREDITS-- Christian Stocker, chregu@php.net |