]> granicus.if.org Git - php/commitdiff
Fix the test in 5.4 and trunk.
authorHannes Magnusson <bjori@php.net>
Mon, 5 Sep 2011 11:07:38 +0000 (11:07 +0000)
committerHannes Magnusson <bjori@php.net>
Mon, 5 Sep 2011 11:07:38 +0000 (11:07 +0000)
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

index 6a60bafeb81a2cade455332f260f0f4ad53eeaaa..79f6ad51799402488ba11777b71dbf7689940391 100644 (file)
@@ -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);