diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-26 12:32:22 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-26 12:32:22 +0200 |
| commit | ebbe333ede58aef60740bd297327188513814f1b (patch) | |
| tree | ddad8f661cd9a9984928e2ce34d63108d280158c | |
| parent | 795ad1e354e363d6a4e8af1ac022db1d8e9893cd (diff) | |
| parent | 358721bcf75be6bd2020f8d65c19887823b49377 (diff) | |
| download | php-git-ebbe333ede58aef60740bd297327188513814f1b.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix file name clash in test
| -rw-r--r-- | ext/standard/tests/file/stream_copy_to_stream.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/tests/file/stream_copy_to_stream.phpt b/ext/standard/tests/file/stream_copy_to_stream.phpt index b0c2d13846..1f34b84334 100644 --- a/ext/standard/tests/file/stream_copy_to_stream.phpt +++ b/ext/standard/tests/file/stream_copy_to_stream.phpt @@ -5,7 +5,7 @@ stream_copy_to_stream() tests define('WIN', substr(PHP_OS, 0, 3) == 'WIN'); $initial_file = __DIR__.'/bug38086.txt'; -$new_file = __DIR__.'/bug38086_1.txt'; +$new_file = __DIR__.'/stream_copy_to_stream.txt'; $src = fopen($initial_file, 'r'); stream_filter_append($src, "string.rot13", STREAM_FILTER_READ); |