summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Harvey <aharvey@php.net>2013-01-15 15:49:13 +0800
committerAdam Harvey <aharvey@php.net>2013-01-15 15:49:52 +0800
commit0510701474e8d99b5b30139b5599e44f9b555a5a (patch)
tree5bc54017a5ef2859e7bf9350ba1d1cf23ba288b7
parent3bc74903706ab08e916905a0bd634e77aa804def (diff)
downloadphp-git-0510701474e8d99b5b30139b5599e44f9b555a5a.tar.gz
Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa.
-rw-r--r--ext/spl/tests/SplFileObject_fputcsv.phpt10
1 files changed, 5 insertions, 5 deletions
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',