From: Christoph M. Becker Date: Fri, 10 Jul 2020 11:42:13 +0000 (+0200) Subject: Merge branch 'PHP-7.4' X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a5695bfc30103a306a1b0677c526a44b3db100c;p=php Merge branch 'PHP-7.4' * PHP-7.4: Enable further ext/standard/tests/file tests on Windows --- 9a5695bfc30103a306a1b0677c526a44b3db100c diff --cc ext/standard/tests/file/fopen_variation10-win32.phpt index e4a2029c55,8041c59c84..61a0bec5f4 --- a/ext/standard/tests/file/fopen_variation10-win32.phpt +++ b/ext/standard/tests/file/fopen_variation10-win32.phpt @@@ -95,17 -102,17 +95,17 @@@ Warning: fclose(): Argument #1 must be --\-- - Warning: fopen(\\fopen_variation10.tmp): Failed to open stream: Invalid argument in %s on line %d -Warning: fopen(\\fopen_variation10.tmp): failed to open stream: No such file or directory in %s on line %d ++Warning: fopen(\\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d file not opened for read -Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d +Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d --/-- - Warning: fopen(/\fopen_variation10.tmp): Failed to open stream: Invalid argument in %s on line %d -Warning: fopen(/\fopen_variation10.tmp): failed to open stream: No such file or directory in %s on line %d ++Warning: fopen(/\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d file not opened for read -Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d +Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d --c:fopen10.tmpdirTwo-- file in fopen10.tmpdirTwo diff --cc ext/standard/tests/file/fopen_variation11-win32.phpt index a200d65a44,e40c48841d..64fb48632f --- a/ext/standard/tests/file/fopen_variation11-win32.phpt +++ b/ext/standard/tests/file/fopen_variation11-win32.phpt @@@ -93,17 -100,17 +93,17 @@@ Warning: fclose(): Argument #1 must be --\-- - Warning: fopen(\\FOPEN_VARIATION11.TMP): Failed to open stream: Invalid argument in %s on line %d -Warning: fopen(\\FOPEN_VARIATION11.TMP): failed to open stream: No such file or directory in %s on line %d ++Warning: fopen(\\FOPEN_VARIATION11.TMP): Failed to open stream: No such file or directory in %s on line %d file not opened for read -Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d +Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d --/-- - Warning: fopen(\\FOPEN_VARIATION11.TMP): Failed to open stream: Invalid argument in %s on line %d -Warning: fopen(\\FOPEN_VARIATION11.TMP): failed to open stream: No such file or directory in %s on line %d ++Warning: fopen(\\FOPEN_VARIATION11.TMP): Failed to open stream: No such file or directory in %s on line %d file not opened for read -Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d +Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d --c:fopen11.tmpdirTwo-- file in fopen11.tmpdirTwo