eyalt                                    Sun, 26 Dec 2010 13:29:29 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=306673

Log:
SplFileObject_fgetcsv files: SplFileObject__fgetcsv.csv used instead of 
SplFileObject::fgetcsv.csv, as to make this naming convetion windows legitimate

Changed paths:
    U   
php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_basic.phpt
    U   
php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt
    U   
php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt
    U   
php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt
    U   
php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt
    U   
php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt
    U   
php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_escape_default.phpt
    U   
php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_escape_error.phpt
    U   php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_basic.phpt
    U   
php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt
    U   
php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt
    U   
php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt
    U   
php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt
    U   php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt
    U   
php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_escape_default.phpt
    U   php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_escape_error.phpt

Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_basic.phpt	2010-12-26 13:15:25 UTC (rev 306672)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_basic.phpt	2010-12-26 13:29:29 UTC (rev 306673)
@@ -2,7 +2,7 @@
 SplFileObject::fgetcsv default path
 --FILE--
 <?php
-$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
+$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
 fputcsv($fp, array(
 	'field1',
 	'field2',
@@ -11,12 +11,12 @@
 ));
 fclose($fp);

-$fo = new SplFileObject('SplFileObject::fgetcsv.csv');
+$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
 var_dump($fo->fgetcsv());
 ?>
 --CLEAN--
 <?php
-unlink('SplFileObject::fgetcsv.csv');
+unlink('SplFileObject__fgetcsv.csv');
 ?>
 --EXPECTF--
 array(4) {

Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt	2010-12-26 13:15:25 UTC (rev 306672)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt	2010-12-26 13:29:29 UTC (rev 306673)
@@ -2,7 +2,7 @@
 SplFileObject::fgetcsv with alternative delimeter
 --FILE--
 <?php
-$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
+$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
 fputcsv($fp, array(
 	'field1',
 	'field2',
@@ -11,12 +11,12 @@
 ), '|');
 fclose($fp);

-$fo = new SplFileObject('SplFileObject::fgetcsv.csv');
+$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
 var_dump($fo->fgetcsv('|'));
 ?>
 --CLEAN--
 <?php
-unlink('SplFileObject::fgetcsv.csv');
+unlink('SplFileObject__fgetcsv.csv');
 ?>
 --EXPECTF--
 array(4) {

Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt	2010-12-26 13:15:25 UTC (rev 306672)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt	2010-12-26 13:29:29 UTC (rev 306673)
@@ -2,7 +2,7 @@
 SplFileObject::fgetcsv with alternative delimeter
 --FILE--
 <?php
-$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
+$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
 fputcsv($fp, array(
 	'field1',
 	'field2',
@@ -11,12 +11,12 @@
 ), '|');
 fclose($fp);

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

Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt	2010-12-26 13:15:25 UTC (rev 306672)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt	2010-12-26 13:29:29 UTC (rev 306673)
@@ -2,7 +2,7 @@
 SplFileObject::fgetcsv with alternative delimeter
 --FILE--
 <?php
-$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
+$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
 fputcsv($fp, array(
 	'field1',
 	'field2',
@@ -11,12 +11,12 @@
 ), ',', '"');
 fclose($fp);

-$fo = new SplFileObject('SplFileObject::fgetcsv.csv');
+$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
 var_dump($fo->fgetcsv(',', '"'));
 ?>
 --CLEAN--
 <?php
-unlink('SplFileObject::fgetcsv.csv');
+unlink('SplFileObject__fgetcsv.csv');
 ?>
 --EXPECTF--
 array(4) {

Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt	2010-12-26 13:15:25 UTC (rev 306672)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt	2010-12-26 13:29:29 UTC (rev 306673)
@@ -2,7 +2,7 @@
 SplFileObject::fgetcsv with alternative delimeter
 --FILE--
 <?php
-$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
+$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
 fputcsv($fp, array(
 	'field1',
 	'field2',
@@ -11,12 +11,12 @@
 ), ',', '"');
 fclose($fp);

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

Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt	2010-12-26 13:15:25 UTC (rev 306672)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt	2010-12-26 13:29:29 UTC (rev 306673)
@@ -2,16 +2,16 @@
 SplFileObject::fgetcsv with alternative delimeter
 --FILE--
 <?php
-$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
+$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
 fwrite($fp, '"aaa","b""bb","ccc"');
 fclose($fp);

-$fo = new SplFileObject('SplFileObject::fgetcsv.csv');
+$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
 var_dump($fo->fgetcsv(',', '"', '"'));
 ?>
 --CLEAN--
 <?php
-unlink('SplFileObject::fgetcsv.csv');
+unlink('SplFileObject__fgetcsv.csv');
 ?>
 --EXPECTF--
 array(3) {

Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_escape_default.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_escape_default.phpt	2010-12-26 13:15:25 UTC (rev 306672)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_escape_default.phpt	2010-12-26 13:29:29 UTC (rev 306673)
@@ -2,16 +2,16 @@
 SplFileObject::fgetcsv with default escape character
 --FILE--
 <?php
-$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
+$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
 fwrite($fp, '"aa\"","bb","\"c"');
 fclose($fp);

-$fo = new SplFileObject('SplFileObject::fgetcsv.csv');
+$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
 var_dump($fo->fgetcsv());
 ?>
 --CLEAN--
 <?php
-unlink('SplFileObject::fgetcsv.csv');
+unlink('SplFileObject__fgetcsv.csv');
 ?>
 --EXPECTF--
 array(3) {

Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_escape_error.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_escape_error.phpt	2010-12-26 13:15:25 UTC (rev 306672)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileObject_fgetcsv_escape_error.phpt	2010-12-26 13:29:29 UTC (rev 306673)
@@ -2,16 +2,16 @@
 SplFileObject::fgetcsv with alternative delimeter
 --FILE--
 <?php
-$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
+$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
 fwrite($fp, '"aaa","b""bb","ccc"');
 fclose($fp);

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

Modified: php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_basic.phpt
===================================================================
--- php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_basic.phpt	2010-12-26 13:15:25 UTC (rev 306672)
+++ php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_basic.phpt	2010-12-26 13:29:29 UTC (rev 306673)
@@ -2,7 +2,7 @@
 SplFileObject::fgetcsv default path
 --FILE--
 <?php
-$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
+$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
 fputcsv($fp, array(
 	'field1',
 	'field2',
@@ -11,12 +11,12 @@
 ));
 fclose($fp);

-$fo = new SplFileObject('SplFileObject::fgetcsv.csv');
+$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
 var_dump($fo->fgetcsv());
 ?>
 --CLEAN--
 <?php
-unlink('SplFileObject::fgetcsv.csv');
+unlink('SplFileObject__fgetcsv.csv');
 ?>
 --EXPECTF--
 array(4) {

Modified: php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt
===================================================================
--- php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt	2010-12-26 13:15:25 UTC (rev 306672)
+++ php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt	2010-12-26 13:29:29 UTC (rev 306673)
@@ -2,7 +2,7 @@
 SplFileObject::fgetcsv with alternative delimeter
 --FILE--
 <?php
-$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
+$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
 fputcsv($fp, array(
 	'field1',
 	'field2',
@@ -11,12 +11,12 @@
 ), '|');
 fclose($fp);

-$fo = new SplFileObject('SplFileObject::fgetcsv.csv');
+$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
 var_dump($fo->fgetcsv('|'));
 ?>
 --CLEAN--
 <?php
-unlink('SplFileObject::fgetcsv.csv');
+unlink('SplFileObject__fgetcsv.csv');
 ?>
 --EXPECTF--
 array(4) {

Modified: php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt
===================================================================
--- php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt	2010-12-26 13:15:25 UTC (rev 306672)
+++ php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt	2010-12-26 13:29:29 UTC (rev 306673)
@@ -2,7 +2,7 @@
 SplFileObject::fgetcsv with alternative delimeter
 --FILE--
 <?php
-$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
+$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
 fputcsv($fp, array(
 	'field1',
 	'field2',
@@ -11,12 +11,12 @@
 ), '|');
 fclose($fp);

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

Modified: php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt
===================================================================
--- php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt	2010-12-26 13:15:25 UTC (rev 306672)
+++ php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt	2010-12-26 13:29:29 UTC (rev 306673)
@@ -2,7 +2,7 @@
 SplFileObject::fgetcsv with alternative delimeter
 --FILE--
 <?php
-$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
+$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
 fputcsv($fp, array(
 	'field1',
 	'field2',
@@ -11,12 +11,12 @@
 ), ',', '"');
 fclose($fp);

-$fo = new SplFileObject('SplFileObject::fgetcsv.csv');
+$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
 var_dump($fo->fgetcsv(',', '"'));
 ?>
 --CLEAN--
 <?php
-unlink('SplFileObject::fgetcsv.csv');
+unlink('SplFileObject__fgetcsv.csv');
 ?>
 --EXPECTF--
 array(4) {

Modified: php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt
===================================================================
--- php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt	2010-12-26 13:15:25 UTC (rev 306672)
+++ php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt	2010-12-26 13:29:29 UTC (rev 306673)
@@ -2,7 +2,7 @@
 SplFileObject::fgetcsv with alternative delimeter
 --FILE--
 <?php
-$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
+$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
 fputcsv($fp, array(
 	'field1',
 	'field2',
@@ -11,12 +11,12 @@
 ), ',', '"');
 fclose($fp);

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

Modified: php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt
===================================================================
--- php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt	2010-12-26 13:15:25 UTC (rev 306672)
+++ php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt	2010-12-26 13:29:29 UTC (rev 306673)
@@ -2,16 +2,16 @@
 SplFileObject::fgetcsv with alternative delimeter
 --FILE--
 <?php
-$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
+$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
 fwrite($fp, '"aaa","b""bb","ccc"');
 fclose($fp);

-$fo = new SplFileObject('SplFileObject::fgetcsv.csv');
+$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
 var_dump($fo->fgetcsv(',', '"', '"'));
 ?>
 --CLEAN--
 <?php
-unlink('SplFileObject::fgetcsv.csv');
+unlink('SplFileObject__fgetcsv.csv');
 ?>
 --EXPECTF--
 array(3) {

Modified: php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_escape_default.phpt
===================================================================
--- php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_escape_default.phpt	2010-12-26 13:15:25 UTC (rev 306672)
+++ php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_escape_default.phpt	2010-12-26 13:29:29 UTC (rev 306673)
@@ -2,16 +2,16 @@
 SplFileObject::fgetcsv with default escape character
 --FILE--
 <?php
-$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
+$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
 fwrite($fp, '"aa\"","bb","\"c"');
 fclose($fp);

-$fo = new SplFileObject('SplFileObject::fgetcsv.csv');
+$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
 var_dump($fo->fgetcsv());
 ?>
 --CLEAN--
 <?php
-unlink('SplFileObject::fgetcsv.csv');
+unlink('SplFileObject__fgetcsv.csv');
 ?>
 --EXPECTF--
 array(3) {

Modified: php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_escape_error.phpt
===================================================================
--- php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_escape_error.phpt	2010-12-26 13:15:25 UTC (rev 306672)
+++ php/php-src/trunk/ext/spl/tests/SplFileObject_fgetcsv_escape_error.phpt	2010-12-26 13:29:29 UTC (rev 306673)
@@ -2,16 +2,16 @@
 SplFileObject::fgetcsv with alternative delimeter
 --FILE--
 <?php
-$fp = fopen('SplFileObject::fgetcsv.csv', 'w+');
+$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
 fwrite($fp, '"aaa","b""bb","ccc"');
 fclose($fp);

-$fo = new SplFileObject('SplFileObject::fgetcsv.csv');
+$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
 var_dump($fo->fgetcsv(',', '"', 'invalid'));
 ?>
 --CLEAN--
 <?php
-unlink('SplFileObject::fgetcsv.csv');
+unlink('SplFileObject__fgetcsv.csv');
 ?>
 --EXPECTF--
 Warning: SplFileObject::fgetcsv(): escape must be a character in %s on line %d
-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to