diff options
| author | Anatol Belski <ab@php.net> | 2015-04-14 15:21:47 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-04-14 15:21:47 +0200 |
| commit | bc63491da852dbaa9c49406c3a5d92fd31e238fe (patch) | |
| tree | d16bbed6f113000f7efc476d601e278cd9fbbb13 | |
| parent | e1821090efe8eeabed392ae6bbbcddbc24b2a2b3 (diff) | |
| parent | 3803bbde244e8221a20319b3961bbb73ab85ad4b (diff) | |
| download | php-git-bc63491da852dbaa9c49406c3a5d92fd31e238fe.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix test
| -rw-r--r-- | ext/fileinfo/tests/finfo_file_basic.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/fileinfo/tests/finfo_file_basic.phpt b/ext/fileinfo/tests/finfo_file_basic.phpt index ee70e2e253..84cf80d6d5 100644 --- a/ext/fileinfo/tests/finfo_file_basic.phpt +++ b/ext/fileinfo/tests/finfo_file_basic.phpt @@ -29,6 +29,6 @@ string(28) "text/x-php; charset=us-ascii" string(22) "PHP script, ASCII text" string(25) "text/plain; charset=utf-8" -Warning: finfo_file(): Invalid path in %s/finfo_file_basic.php on line %d +Warning: finfo_file(): Invalid path in %s%efinfo_file_basic.php on line %d bool(false) ===DONE=== |