com php-src: Revert "Apply the fputcsv test fix to SplFileObjec t_fputcsv.phpt. Mea culpa.": ext/spl/tests/Sp lFileObject_fputcsv.phpt
| From: | Adam Harvey | Date: | Tue, 15 Jan 2013 09:40:30 +0000 |
| Subject: | com php-src: Revert "Apply the fputcsv test fix to SplFileObjec t_fputcsv.phpt. Mea culpa.": ext/spl/tests/Sp lFileObject_fputcsv.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70970@lists.php.net to get a copy of this message | ||
Commit: ef86530a561ad3d6374b81909d6dd336159fb465
Author: Adam Harvey <aharvey@php.net> Tue, 15 Jan 2013 17:37:21 +0800
Parents: cab290d2adbd616a18b9efaace6abe629f827190
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ef86530a561ad3d6374b81909d6dd336159fb465
Log:
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
This reverts commit 0510701474e8d99b5b30139b5599e44f9b555a5a.
Changed paths:
M ext/spl/tests/SplFileObject_fputcsv.phpt
Diff:
diff --git a/ext/spl/tests/SplFileObject_fputcsv.phpt b/ext/spl/tests/SplFileObject_fputcsv.phpt
index 601edab..66fdbfd 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, 0, ',', '"', '"'))
+while($l=fgetcsv($fp))
{
$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',