From: Adam Harvey Date: Tue, 15 Jan 2013 07:49:13 +0000 (+0800) Subject: Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa. X-Git-Tag: php-5.5.0alpha4~9^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0510701474e8d99b5b30139b5599e44f9b555a5a;p=php Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa. --- diff --git a/ext/spl/tests/SplFileObject_fputcsv.phpt b/ext/spl/tests/SplFileObject_fputcsv.phpt index 66fdbfd1b9..601edab47f 100644 --- a/ext/spl/tests/SplFileObject_fputcsv.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv.phpt @@ -42,7 +42,7 @@ echo '$list = ';var_export($res);echo ";\n"; $fp = fopen($file, "r"); $res = array(); -while($l=fgetcsv($fp)) +while($l=fgetcsv($fp, 0, ',', '"', '"')) { $res[] = join(',',$l); } @@ -76,10 +76,10 @@ $list = array ( 13 => 'aaa,"""bbb """', 14 => '"aaa""aaa""","""bbb""bbb"', 15 => '"aaa""aaa""""""",bbb', - 16 => 'aaa,"""\\"bbb",ccc', - 17 => '"aaa""\\"a""","""bbb"""', - 18 => '"""\\"""","""aaa"""', - 19 => '"""\\"""""",aaa', + 16 => 'aaa,"""\\""bbb",ccc', + 17 => '"aaa""\\""a""","""bbb"""', + 18 => '"""\\""""","""aaa"""', + 19 => '"""\\""""""",aaa', ); $list = array ( 0 => 'aaa,bbb',