com php-src: Made some SplFileObject::fputcsv not pollute the working dir.: ext/spl/tests/SplFileObject_fputcsv_002.phpt ext/
spl/tests/SplFileObject_fputcsv_error.phpt ext/spl/test s/SplFileObject_fputcsv_variation13.phpt ext/spl/te sts/SplFileObject_fputcsv_variation14.phpt

Commit: 54f0d50d3e7f23637de827c995a5bda64827640c Author: Gustavo André dos Santos Lopes <cataphract@php.net> Wed, 21 Mar 2012 13:13:17 +0000 Parents: 09e367dbaffa1e8c5ba7b88e9997d9ddc1c6d0c0 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=54f0d50d3e7f23637de827c995a5bda64827640c Log: Made some SplFileObject::fputcsv not pollute the working dir. Changed paths: M ext/spl/tests/SplFileObject_fputcsv_002.phpt M ext/spl/tests/SplFileObject_fputcsv_error.phpt M ext/spl/tests/SplFileObject_fputcsv_variation13.phpt M ext/spl/tests/SplFileObject_fputcsv_variation14.phpt Diff: 54f0d50d3e7f23637de827c995a5bda64827640c diff --git a/ext/spl/tests/SplFileObject_fputcsv_002.phpt b/ext/spl/tests/SplFileObject_fputcsv_002.phpt index ded467d..db17493 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_002.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_002..phpt @@ -2,7 +2,7 @@ SplFileObject::fputcsv(): Checking data after calling the function --FILE-- <?php -$fo = new SplFileObject('SplFileObject_fputcsv.csv', 'w'); +$fo = new SplFileObject(__DIR__ . '/SplFileObject_fputcsv.csv', 'w'); $data = array(1, 2, 'foo', 'haha', array(4, 5, 6), 1.3, null); @@ -12,7 +12,8 @@ var_dump($data); ?> --CLEAN-- <?php -unlink('SplFileObject::fputcsv.csv'); +$file = __DIR__ . '/SplFileObject_fputcsv.csv'; +unlink($file); ?> --EXPECTF-- Notice: Array to string conversion in %s on line %d diff --git a/ext/spl/tests/SplFileObject_fputcsv_error.phpt b/ext/spl/tests/SplFileObject_fputcsv_error.phpt index aed2a97..8368e42 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_error.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_error.phpt @@ -2,7 +2,7 @@ SplFileObject::fputcsv(): error conditions --FILE-- <?php -$fo = new SplFileObject('SplFileObject_fputcsv.csv', 'w'); +$fo = new SplFileObject(__DIR__ . '/SplFileObject_fputcsv.csv', 'w'); echo "*** Testing error conditions ***\n"; // zero argument @@ -17,6 +17,11 @@ $enclosure ="\""; var_dump( $fo->fputcsv($fields, $delim, $enclosure, $fo) ); echo "Done\n"; +--CLEAN-- +<?php +$file = __DIR__ . '/SplFileObject_fputcsv.csv'; +unlink($file); +?> --EXPECTF-- *** Testing error conditions *** -- Testing fputcsv() with zero argument -- diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt index 05f6195..b7c2a63 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation13..phpt @@ -8,7 +8,7 @@ Test fputcsv() : usage variations - with default enclosure & delimiter of two ch echo "*** Testing fputcsv() : with default enclosure & delimiter of two chars ***\n"; -$fo = new SplFileObject('SplFileObject_fputcsv.csv', 'w'); +$fo = new SplFileObject(__DIR__ . '/SplFileObject_fputcsv.csv', 'w'); var_dump($fo->fputcsv(array('water', 'fruit'), ',,', '"')); @@ -18,7 +18,8 @@ echo "Done\n"; ?> --CLEAN-- <?php -unlink('SplFileObject::fputcsv.csv'); +$file = __DIR__ . '/SplFileObject_fputcsv.csv'; +unlink($file); ?> --EXPECTF-- *** Testing fputcsv() : with default enclosure & delimiter of two chars *** diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation14.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation14.phpt index 6d1cc58...f8cda0e 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation14.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation14.phpt @@ -8,7 +8,7 @@ Test fputcsv() : usage variations - with enclosure & delimiter of two chars echo "*** Testing fputcsv() : with enclosure & delimiter of two chars and file opened in read mode ***\n"; -$fo = new SplFileObject('SplFileObject_fputcsv.csv', 'w'); +$fo = new SplFileObject(__DIR__ . '/SplFileObject_fputcsv.csv', 'w'); var_dump($fo->fputcsv(array('water', 'fruit'), ',,', '""')); @@ -18,7 +18,8 @@ echo "Done\n"; ?> --CLEAN-- <?php -unlink('SplFileObject::fputcsv.csv'); +$file = __DIR__ . '/SplFileObject_fputcsv.csv'; +unlink($file); ?> --EXPECTF-- *** Testing fputcsv() : with enclosure & delimiter of two chars and file opened in read mode ***