Commit: da1b5346017899d1f09c908eee2d166249160293 Author: Anatoliy Belsky <a...@php.net> Sun, 22 Apr 2012 19:26:54 +0200 Parents: f13b0ede0764f63762f105fb6c62de460f7b7490 Branches: PHP-5.3 PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=da1b5346017899d1f09c908eee2d166249160293 Log: Fix bug #61811 three of finfo tests failed, see also #61812. The remaining two was assidentially merged back from 5.4 Bugs: https://bugs.php.net/61811 https://bugs.php.net/61812 Changed paths: M ext/fileinfo/tests/finfo_open_001.phpt M ext/fileinfo/tests/finfo_open_error.phpt Diff: diff --git a/ext/fileinfo/tests/finfo_open_001.phpt b/ext/fileinfo/tests/finfo_open_001.phpt index 17935c3..69696eb 100644 --- a/ext/fileinfo/tests/finfo_open_001.phpt +++ b/ext/fileinfo/tests/finfo_open_001.phpt @@ -14,28 +14,10 @@ var_dump(finfo_open(FILEINFO_MIME, '/foo/bar/inexistent')); ?> --EXPECTF-- -Warning: finfo_open() expects parameter 2 to be a valid path, string given in %s on line %d +Warning: finfo_open(): Failed to load magic database at ''. in %s on line %d bool(false) resource(%d) of type (file_info) resource(%d) of type (file_info) - -Warning: finfo_open(%s123): failed to open stream: No such file or directory in %s on line %d - -Warning: finfo_open(%s123): failed to open stream: No such file or directory in %s on line %d - -Warning: finfo_open(): Failed to load magic database at '%s123'. in %s on line %d bool(false) - -Warning: finfo_open(%s1): failed to open stream: No such file or directory in %s on line %d - -Warning: finfo_open(%s1): failed to open stream: No such file or directory in %s on line %d - -Warning: finfo_open(): Failed to load magic database at '%s1'. in %s on line %d bool(false) - -Warning: finfo_open(%sinexistent): failed to open stream: No such file or directory in %s on line %d - -Warning: finfo_open(%sinexistent): failed to open stream: No such file or directory in %s on line %d - -Warning: finfo_open(): Failed to load magic database at '%sinexistent'. in %s on line %d bool(false) diff --git a/ext/fileinfo/tests/finfo_open_error.phpt b/ext/fileinfo/tests/finfo_open_error.phpt index 19ae7a6..aae229f 100644 --- a/ext/fileinfo/tests/finfo_open_error.phpt +++ b/ext/fileinfo/tests/finfo_open_error.phpt @@ -26,12 +26,6 @@ var_dump( new finfo('foobar') ); ===DONE=== --EXPECTF-- *** Testing finfo_open() : error functionality *** - -Warning: finfo_open(%sfoobarfile): failed to open stream: No such file or directory in %s on line %d - -Warning: finfo_open(%sfoobarfile): failed to open stream: No such file or directory in %s on line %d - -Warning: finfo_open(): Failed to load magic database at '%sfoobarfile'. in %s on line %d bool(false) Warning: finfo_open() expects parameter 1 to be long, array given in %s on line %d @@ -43,9 +37,9 @@ bool(false) Notice: finfo_open(): Warning: using regular magic file `%s' in %s on line %d resource(%d) of type (file_info) -Warning: finfo_open() expects parameter 1 to be long, string given in %s on line %d +Warning: finfo_open() expects parameter 1 to be long, %unicode_string_optional% given in %s on line %d bool(false) -Warning: finfo::finfo() expects parameter 1 to be long, string given in %s on line %d +Warning: finfo::finfo() expects parameter 1 to be long, %unicode_string_optional% given in %s on line %d NULL ===DONE=== -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
