From 51dacafc64336bc7fa02de1ec032d651b1d2b0e1 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 1 Mar 2019 15:32:02 +0100 Subject: [PATCH] Use separate files for SplFileObject::setCsvControl() tests --- ext/spl/tests/SplFileObject_setCsvControl_basic.phpt | 6 +++--- ext/spl/tests/SplFileObject_setCsvControl_error001.phpt | 6 +++--- ext/spl/tests/SplFileObject_setCsvControl_error002.phpt | 6 +++--- ext/spl/tests/SplFileObject_setCsvControl_error003.phpt | 6 +++--- ext/spl/tests/SplFileObject_setCsvControl_variation001.phpt | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ext/spl/tests/SplFileObject_setCsvControl_basic.phpt b/ext/spl/tests/SplFileObject_setCsvControl_basic.phpt index c7f4710868326..c2eb623be9126 100644 --- a/ext/spl/tests/SplFileObject_setCsvControl_basic.phpt +++ b/ext/spl/tests/SplFileObject_setCsvControl_basic.phpt @@ -4,14 +4,14 @@ SPL: SplFileObject::setCsvControl basic Erwin Poeze --FILE-- setFlags(SplFileObject::READ_CSV); $s->setCsvControl('|', '\'', '/'); foreach ($s as $row) { @@ -21,7 +21,7 @@ foreach ($s as $row) { ?> --CLEAN-- --EXPECT-- groene appelen : 10 diff --git a/ext/spl/tests/SplFileObject_setCsvControl_error001.phpt b/ext/spl/tests/SplFileObject_setCsvControl_error001.phpt index 384fed5d231a7..296c4a1aa0c44 100644 --- a/ext/spl/tests/SplFileObject_setCsvControl_error001.phpt +++ b/ext/spl/tests/SplFileObject_setCsvControl_error001.phpt @@ -4,20 +4,20 @@ SPL: SplFileObject::setCsvControl error 001 Erwin Poeze --FILE-- setFlags(SplFileObject::READ_CSV); $s->setCsvControl('||'); ?> --CLEAN-- --EXPECTF-- Warning: SplFileObject::setCsvControl(): delimiter must be a character in %s on line %d diff --git a/ext/spl/tests/SplFileObject_setCsvControl_error002.phpt b/ext/spl/tests/SplFileObject_setCsvControl_error002.phpt index 6452212ee7cf7..885d600225256 100644 --- a/ext/spl/tests/SplFileObject_setCsvControl_error002.phpt +++ b/ext/spl/tests/SplFileObject_setCsvControl_error002.phpt @@ -4,20 +4,20 @@ SPL: SplFileObject::setCsvControl error 002 Erwin Poeze --FILE-- setFlags(SplFileObject::READ_CSV); $s->setCsvControl('|', 'two'); ?> --CLEAN-- --EXPECTF-- Warning: SplFileObject::setCsvControl(): enclosure must be a character in %s on line %d diff --git a/ext/spl/tests/SplFileObject_setCsvControl_error003.phpt b/ext/spl/tests/SplFileObject_setCsvControl_error003.phpt index 071c54c1f0cb8..9e885cbbe3dce 100644 --- a/ext/spl/tests/SplFileObject_setCsvControl_error003.phpt +++ b/ext/spl/tests/SplFileObject_setCsvControl_error003.phpt @@ -6,20 +6,20 @@ Erwin Poeze include_path=. --FILE-- setFlags(SplFileObject::READ_CSV); $s->setCsvControl('|', '\'', 'three'); ?> --CLEAN-- --EXPECTF-- Warning: SplFileObject::setCsvControl(): escape must be empty or a single character in %s on line %d diff --git a/ext/spl/tests/SplFileObject_setCsvControl_variation001.phpt b/ext/spl/tests/SplFileObject_setCsvControl_variation001.phpt index c6da6b3d48969..f54f8eeabd35a 100644 --- a/ext/spl/tests/SplFileObject_setCsvControl_variation001.phpt +++ b/ext/spl/tests/SplFileObject_setCsvControl_variation001.phpt @@ -4,14 +4,14 @@ SPL: SplFileObject::setCsvControl variation 001 Erwin Poeze --FILE-- setFlags(SplFileObject::READ_CSV); $s->setCsvControl(); foreach ($s as $row) { @@ -21,7 +21,7 @@ foreach ($s as $row) { ?> --CLEAN-- --EXPECT-- groene appelen : 10