diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-20 12:07:59 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-20 12:07:59 +0200 |
| commit | 283d37ad8f0e439cc6a454811946d9f7ccd25eb7 (patch) | |
| tree | c1cd5af7624310763600e713f3195f01f7785e90 | |
| parent | 3d5db42ca529412a75867c028eac9e334c841802 (diff) | |
| parent | 5c404915679015b828c036e22db5de096d1cff50 (diff) | |
| download | php-git-283d37ad8f0e439cc6a454811946d9f7ccd25eb7.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix file name clash in touch_variation1.phpt
| -rw-r--r-- | ext/standard/tests/file/touch_variation1.phpt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/standard/tests/file/touch_variation1.phpt b/ext/standard/tests/file/touch_variation1.phpt index 01599cfcf6..2169141c58 100644 --- a/ext/standard/tests/file/touch_variation1.phpt +++ b/ext/standard/tests/file/touch_variation1.phpt @@ -11,8 +11,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php -$filename = __DIR__."/touch.dat"; - +$filename = __DIR__."/touch_variation1.dat"; var_dump(touch($filename, 101)); var_dump(filemtime($filename)); |