From e1ec448fe6cfb16b662e84b8e3a34954ea4c8123 Mon Sep 17 00:00:00 2001 From: Hannes Magnusson Date: Mon, 5 Sep 2011 11:07:38 +0000 Subject: [PATCH] Fix the test in 5.4 and trunk. older libraries will emmit error here, while new won't. So lets just suppress it rather then making the test uselessly fail for random people. --- ext/iconv/tests/iconv_stream_filter.phpt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ext/iconv/tests/iconv_stream_filter.phpt b/ext/iconv/tests/iconv_stream_filter.phpt index 003c631846..79f6ad5179 100644 --- a/ext/iconv/tests/iconv_stream_filter.phpt +++ b/ext/iconv/tests/iconv_stream_filter.phpt @@ -22,7 +22,7 @@ fclose($fp); $fp = fopen(dirname(__FILE__).'/iconv_stream_filter.txt', 'rb'); stream_filter_append($fp, 'string.rot13'); // this will make conversion fail. stream_filter_append($fp, 'convert.iconv.ISO-2022-JP/EUC-JP'); -var_dump(bin2hex(fread($fp, 10)) != "a4b3a4f3a4cba4c1a4cf"); +var_dump(bin2hex(@fread($fp, 10)) != "a4b3a4f3a4cba4c1a4cf"); var_dump(bin2hex(fread($fp, 5)) != "69636f6e76"); var_dump(bin2hex(fread($fp, 1)) != "0a"); fclose($fp); @@ -34,8 +34,6 @@ string(2) "42" string(20) "a4b3a4f3a4cba4c1a4cf" string(10) "69636f6e76" string(2) "0a" - -Warning: fread(): iconv stream filter ("ISO-2022-JP"=>"EUC-JP"): invalid multibyte sequence in %s on line %d bool(true) bool(true) bool(true) -- 2.50.1