diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-07-12 18:30:09 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-07-12 18:30:09 +0200 |
| commit | 9cfb17611691fa1dad2c57ad1d57d92eff196315 (patch) | |
| tree | 7b3de11a1155d0c170b99659d9157a50990f2f1d | |
| parent | ed1f5b4dae81316ad53cee5c8cfa7e7f7746ad46 (diff) | |
| parent | cf91b163e1c16cfc0f6e4cd2b3ec78d82bc3ba1c (diff) | |
| download | php-git-9cfb17611691fa1dad2c57ad1d57d92eff196315.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
fixed the test for warnings changed
| -rw-r--r-- | ext/fileinfo/tests/finfo_open_error-win32.phpt | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ext/fileinfo/tests/finfo_open_error-win32.phpt b/ext/fileinfo/tests/finfo_open_error-win32.phpt index e168b7f7d4..0260ca5708 100644 --- a/ext/fileinfo/tests/finfo_open_error-win32.phpt +++ b/ext/fileinfo/tests/finfo_open_error-win32.phpt @@ -43,13 +43,7 @@ bool(false) Warning: finfo_open() expects at most 2 parameters, 3 given in %sfinfo_open_error-win32.php on line %d bool(false) - -Warning: finfo_open(%smagic): failed to open stream: No such file or directory in %sfinfo_open_error-win32.php on line %d - -Warning: finfo_open(%smagic): failed to open stream: No such file or directory in %sfinfo_open_error-win32.php on line %d - -Warning: finfo_open(): Failed to load magic database at '%smagic'. in %sfinfo_open_error-win32.php on line %d -bool(false) +resource(6) of type (file_info) Warning: finfo_open() expects parameter 1 to be long, string given in %sfinfo_open_error-win32.php on line %d bool(false) |