fix test outputs

diff --git a/ext/fileinfo/tests/bug68735.phpt b/ext/fileinfo/tests/bug68735.phpt
index f86109cb8fc08088e279d7495a7ed4bfef8a84fc..03e9a4285f17bd8878ce4c3bd10c53a18fb077f6 100644 (file)
--- a/ext/fileinfo/tests/bug68735.phpt
+++ b/ext/fileinfo/tests/bug68735.phpt
@@ -12,5 +12,5 @@ Bug #68735 fileinfo out-of-bounds memory access
 ?>
 ===DONE===
 --EXPECTF--
-string(%d) "JPEG image data, JFIF standard 1.01, comment: "%S""
+string(%d) "JPEG image data, JFIF standard 1.01, resolution (DPI), density 180x52, segment length 16, comment: "%S""
 ===DONE===

diff --git a/ext/fileinfo/tests/cve-2014-1943.phpt b/ext/fileinfo/tests/cve-2014-1943.phpt
index b2e9c17c3ff0fcaba7e915e44b1e579a9cb63541..f4dddda16c5aff83a296fe1e22213d574a0874e3 100644 (file)
--- a/ext/fileinfo/tests/cve-2014-1943.phpt
+++ b/ext/fileinfo/tests/cve-2014-1943.phpt
@@ -34,6 +34,6 @@ Done
 --EXPECTF--
 string(%d) "%s"
 
-Warning: finfo_file(): Failed identify data 0:(null) in %s on line %d
+Warning: finfo_file(): Failed identify data 0:indirect recursion nesting (%d) exceeded in %s on line %d
 bool(false)
 Done

diff --git a/ext/fileinfo/tests/finfo_file_regex.phpt b/ext/fileinfo/tests/finfo_file_regex.phpt
index 7d9cd3adfa9334f9a5227062c6df3f01a3863d02..ee582b5c52b5e133abcc246306f52f63e10f4182 100644 (file)
--- a/ext/fileinfo/tests/finfo_file_regex.phpt
+++ b/ext/fileinfo/tests/finfo_file_regex.phpt
@@ -25,5 +25,5 @@ var_dump( finfo_file( $finfo, $file, FILEINFO_CONTINUE ) );
 --EXPECTF--
 *** Testing finfo_file() : regex rules ***
 string(28) "text/plain; charset=us-ascii"
-string(22) "awk script, ASCII text"
+string(30) "awk or perl script, ASCII text"
 ===DONE===

diff --git a/ext/fileinfo/tests/precedural_finfo_in_method.phpt b/ext/fileinfo/tests/precedural_finfo_in_method.phpt
index 8c30b8a197866c6c6c7e11228b8f9be8058cf809..8495d4cc1eca324bb45488a6cd9bc544d136b257 100644 (file)
--- a/ext/fileinfo/tests/precedural_finfo_in_method.phpt
+++ b/ext/fileinfo/tests/precedural_finfo_in_method.phpt
@@ -15,4 +15,4 @@ $test->method();
 
 ?>
 --EXPECT--
-string(28) "text/plain; charset=us-ascii"
+string(28) "text/x-php; charset=us-ascii"