Skip to content

Commit cc17595

Browse files
author
Eyal Teutsch
committed
SplFileObject_fgetcsv files: SplFileObject__fgetcsv.csv used instead of SplFileObject::fgetcsv.csv, as to make this naming convetion windows legitimate
1 parent 8e47365 commit cc17595

8 files changed

+24
-24
lines changed

ext/spl/tests/SplFileObject_fgetcsv_basic.phpt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SplFileObject::fgetcsv default path
33
--FILE--
44
<?php
5-
$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
5+
$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
66
fputcsv($fp, array(
77
'field1',
88
'field2',
@@ -11,12 +11,12 @@ fputcsv($fp, array(
1111
));
1212
fclose($fp);
1313

14-
$fo = new SplFileObject('SplFileObject::fgetcsv.csv');
14+
$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
1515
var_dump($fo->fgetcsv());
1616
?>
1717
--CLEAN--
1818
<?php
19-
unlink('SplFileObject::fgetcsv.csv');
19+
unlink('SplFileObject__fgetcsv.csv');
2020
?>
2121
--EXPECTF--
2222
array(4) {

ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SplFileObject::fgetcsv with alternative delimeter
33
--FILE--
44
<?php
5-
$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
5+
$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
66
fputcsv($fp, array(
77
'field1',
88
'field2',
@@ -11,12 +11,12 @@ fputcsv($fp, array(
1111
), '|');
1212
fclose($fp);
1313

14-
$fo = new SplFileObject('SplFileObject::fgetcsv.csv');
14+
$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
1515
var_dump($fo->fgetcsv('|'));
1616
?>
1717
--CLEAN--
1818
<?php
19-
unlink('SplFileObject::fgetcsv.csv');
19+
unlink('SplFileObject__fgetcsv.csv');
2020
?>
2121
--EXPECTF--
2222
array(4) {

ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SplFileObject::fgetcsv with alternative delimeter
33
--FILE--
44
<?php
5-
$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
5+
$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
66
fputcsv($fp, array(
77
'field1',
88
'field2',
@@ -11,12 +11,12 @@ fputcsv($fp, array(
1111
), '|');
1212
fclose($fp);
1313

14-
$fo = new SplFileObject('SplFileObject::fgetcsv.csv');
14+
$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
1515
var_dump($fo->fgetcsv('invalid'));
1616
?>
1717
--CLEAN--
1818
<?php
19-
unlink('SplFileObject::fgetcsv.csv');
19+
unlink('SplFileObject__fgetcsv.csv');
2020
?>
2121
--EXPECTF--
2222
Warning: SplFileObject::fgetcsv(): delimiter must be a character in %s on line %d

ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SplFileObject::fgetcsv with alternative delimeter
33
--FILE--
44
<?php
5-
$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
5+
$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
66
fputcsv($fp, array(
77
'field1',
88
'field2',
@@ -11,12 +11,12 @@ fputcsv($fp, array(
1111
), ',', '"');
1212
fclose($fp);
1313

14-
$fo = new SplFileObject('SplFileObject::fgetcsv.csv');
14+
$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
1515
var_dump($fo->fgetcsv(',', '"'));
1616
?>
1717
--CLEAN--
1818
<?php
19-
unlink('SplFileObject::fgetcsv.csv');
19+
unlink('SplFileObject__fgetcsv.csv');
2020
?>
2121
--EXPECTF--
2222
array(4) {

ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SplFileObject::fgetcsv with alternative delimeter
33
--FILE--
44
<?php
5-
$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
5+
$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
66
fputcsv($fp, array(
77
'field1',
88
'field2',
@@ -11,12 +11,12 @@ fputcsv($fp, array(
1111
), ',', '"');
1212
fclose($fp);
1313

14-
$fo = new SplFileObject('SplFileObject::fgetcsv.csv');
14+
$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
1515
var_dump($fo->fgetcsv(',', 'invalid'));
1616
?>
1717
--CLEAN--
1818
<?php
19-
unlink('SplFileObject::fgetcsv.csv');
19+
unlink('SplFileObject__fgetcsv.csv');
2020
?>
2121
--EXPECTF--
2222
Warning: SplFileObject::fgetcsv(): enclosure must be a character in %s on line %d

ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
SplFileObject::fgetcsv with alternative delimeter
33
--FILE--
44
<?php
5-
$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
5+
$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
66
fwrite($fp, '"aaa","b""bb","ccc"');
77
fclose($fp);
88

9-
$fo = new SplFileObject('SplFileObject::fgetcsv.csv');
9+
$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
1010
var_dump($fo->fgetcsv(',', '"', '"'));
1111
?>
1212
--CLEAN--
1313
<?php
14-
unlink('SplFileObject::fgetcsv.csv');
14+
unlink('SplFileObject__fgetcsv.csv');
1515
?>
1616
--EXPECTF--
1717
array(3) {

ext/spl/tests/SplFileObject_fgetcsv_escape_default.phpt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
SplFileObject::fgetcsv with default escape character
33
--FILE--
44
<?php
5-
$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
5+
$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
66
fwrite($fp, '"aa\"","bb","\"c"');
77
fclose($fp);
88

9-
$fo = new SplFileObject('SplFileObject::fgetcsv.csv');
9+
$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
1010
var_dump($fo->fgetcsv());
1111
?>
1212
--CLEAN--
1313
<?php
14-
unlink('SplFileObject::fgetcsv.csv');
14+
unlink('SplFileObject__fgetcsv.csv');
1515
?>
1616
--EXPECTF--
1717
array(3) {

ext/spl/tests/SplFileObject_fgetcsv_escape_error.phpt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
SplFileObject::fgetcsv with alternative delimeter
33
--FILE--
44
<?php
5-
$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
5+
$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
66
fwrite($fp, '"aaa","b""bb","ccc"');
77
fclose($fp);
88

9-
$fo = new SplFileObject('SplFileObject::fgetcsv.csv');
9+
$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
1010
var_dump($fo->fgetcsv(',', '"', 'invalid'));
1111
?>
1212
--CLEAN--
1313
<?php
14-
unlink('SplFileObject::fgetcsv.csv');
14+
unlink('SplFileObject__fgetcsv.csv');
1515
?>
1616
--EXPECTF--
1717
Warning: SplFileObject::fgetcsv(): escape must be a character in %s on line %d

0 commit comments

Comments
 (0)