summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorAnatoliy Belsky <ab@php.net>2012-06-14 16:01:23 (GMT)
committerAnatoliy Belsky <ab@php.net>2012-06-14 16:01:23 (GMT)
commitb04e8145c94babcfe76247e6ecfb2da41796f6c0 (patch)
tree44848bfdf39afcecc1fbc60a79df1258e3c0de82 /ext
parent74916d8ec86f10cf5efd91559e956da191dfe3e7 (diff)
parent3faebe2becdbdf0de134ca4e19542b0014fce162 (diff)
downloadphp-b04e8145c94babcfe76247e6ecfb2da41796f6c0.tar.gz
Merge branch 'PHP-5.4'
* PHP-5.4: Fix bug #62270 Test bug - ext/fileinfo/tests/finfo_open_error-win32
Diffstat (limited to 'ext')
-rw-r--r--ext/fileinfo/tests/finfo_open_error-win32.phpt23
1 files changed, 18 insertions, 5 deletions
diff --git a/ext/fileinfo/tests/finfo_open_error-win32.phpt b/ext/fileinfo/tests/finfo_open_error-win32.phpt
index bd50327..e168b7f 100644
--- a/ext/fileinfo/tests/finfo_open_error-win32.phpt
+++ b/ext/fileinfo/tests/finfo_open_error-win32.phpt
@@ -17,6 +17,7 @@ $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic';
echo "*** Testing finfo_open() : error functionality ***\n";
+// on 5_4, this line generates additional warning messages that 5_3 does not. functionally, it should be fine (should pass)
var_dump( finfo_open( FILEINFO_MIME, 'foobarfile' ) );
var_dump( finfo_open( array(), $magicFile ) );
var_dump( finfo_open( FILEINFO_MIME, $magicFile, 'extraArg' ) );
@@ -29,18 +30,30 @@ 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 %sfinfo_open_error-win32.php on line %d
+
+Warning: finfo_open(%sfoobarfile): 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 '%sfoobarfile'. in %sfinfo_open_error-win32.php on line %d
bool(false)
-Warning: finfo_open() expects parameter 1 to be long, array given in %s on line %d
+Warning: finfo_open() expects parameter 1 to be long, array given in %sfinfo_open_error-win32.php on line %d
bool(false)
-Warning: finfo_open() expects at most 2 parameters, 3 given in %s on line %d
+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(%d) of type (file_info)
-Warning: finfo_open() expects parameter 1 to be long, %unicode_string_optional% given in %s on line %d
+Warning: finfo_open() expects parameter 1 to be long, string given in %sfinfo_open_error-win32.php on line %d
bool(false)
-Warning: finfo::finfo() expects parameter 1 to be long, %unicode_string_optional% given in %s on line %d
+Warning: finfo::finfo() expects parameter 1 to be long, string given in %sfinfo_open_error-win32.php on line %d
NULL
===DONE===