diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-17 15:09:22 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-17 15:09:22 +0200 |
| commit | fe02725ac99ce423244c089156339303d33bb5e9 (patch) | |
| tree | d6bc881ea82b4b180ebcb60f95509648798e8421 | |
| parent | 227a9c75ec01800cb2b02d58ab74ec72abccf478 (diff) | |
| parent | 4e9a65447f748d634f1777287e2dbc65c8a71e05 (diff) | |
| download | php-git-fe02725ac99ce423244c089156339303d33bb5e9.tar.gz | |
Merge branch 'PHP-7.4'
| -rw-r--r-- | ext/spl/tests/SplFileObject_fputcsv_variation13.phpt | 4 | ||||
| -rw-r--r-- | ext/spl/tests/SplFileObject_fputcsv_variation14.phpt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt index 9edaf571fe..a4c2451021 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(__DIR__ . '/SplFileObject_fputcsv.csv', 'w'); +$fo = new SplFileObject(__DIR__ . '/SplFileObject_fputcsv_variation13.csv', 'w'); var_dump($fo->fputcsv(array('water', 'fruit'), ',,', '"')); @@ -18,7 +18,7 @@ echo "Done\n"; ?> --CLEAN-- <?php -$file = __DIR__ . '/SplFileObject_fputcsv.csv'; +$file = __DIR__ . '/SplFileObject_fputcsv_variation13.csv'; unlink($file); ?> --EXPECTF-- diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation14.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation14.phpt index f8cda0e96f..a659da92af 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(__DIR__ . '/SplFileObject_fputcsv.csv', 'w'); +$fo = new SplFileObject(__DIR__ . '/SplFileObject_fputcsv_variation14.csv', 'w'); var_dump($fo->fputcsv(array('water', 'fruit'), ',,', '""')); @@ -18,7 +18,7 @@ echo "Done\n"; ?> --CLEAN-- <?php -$file = __DIR__ . '/SplFileObject_fputcsv.csv'; +$file = __DIR__ . '/SplFileObject_fputcsv_variation14.csv'; unlink($file); ?> --EXPECTF-- |