From ded3d984c6133b1f508ed84e96df3316e207c99b Mon Sep 17 00:00:00 2001
From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Mon, 19 Feb 2018 05:59:41 -0300
Subject: Use EXPECT instead of EXPECTF when possible

EXPECTF logic in run-tests.php is considerable, so let's avoid it.
---
 tests/output/ob_010.phpt                        | 2 +-
 tests/output/ob_get_clean_basic_001.phpt        | 2 +-
 tests/output/ob_get_contents_basic_001.phpt     | 2 +-
 tests/output/ob_get_length_basic_001.phpt       | 2 +-
 tests/output/ob_implicit_flush_basic_001.phpt   | 2 +-
 tests/output/ob_implicit_flush_basic_002.phpt   | 2 +-
 tests/output/ob_start_basic_002.phpt            | 2 +-
 tests/output/ob_start_basic_003.phpt            | 2 +-
 tests/output/ob_start_basic_004.phpt            | 2 +-
 tests/output/ob_start_basic_unerasable_001.phpt | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'tests/output')

diff --git a/tests/output/ob_010.phpt b/tests/output/ob_010.phpt
index 7e362cabe1..c5581a860e 100644
--- a/tests/output/ob_010.phpt
+++ b/tests/output/ob_010.phpt
@@ -9,5 +9,5 @@ function obh($s)
 ob_start("obh");
 echo "foo\n";
 ?>
---EXPECTF--
+--EXPECT--
 foo
diff --git a/tests/output/ob_get_clean_basic_001.phpt b/tests/output/ob_get_clean_basic_001.phpt
index 635b58abf9..7e1c475c63 100644
--- a/tests/output/ob_get_clean_basic_001.phpt
+++ b/tests/output/ob_get_clean_basic_001.phpt
@@ -13,6 +13,6 @@ ob_start();
 echo "Hello World";
 var_dump(ob_get_clean());
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 string(11) "Hello World"
diff --git a/tests/output/ob_get_contents_basic_001.phpt b/tests/output/ob_get_contents_basic_001.phpt
index a2c70d790a..8d324e5d61 100644
--- a/tests/output/ob_get_contents_basic_001.phpt
+++ b/tests/output/ob_get_contents_basic_001.phpt
@@ -49,7 +49,7 @@ var_dump(ob_get_contents());
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing ob_get_contents() : basic functionality ***
 
 -- Testing ob_get_contents() function with Zero arguments --
diff --git a/tests/output/ob_get_length_basic_001.phpt b/tests/output/ob_get_length_basic_001.phpt
index 88d6d27850..ef52044c0c 100644
--- a/tests/output/ob_get_length_basic_001.phpt
+++ b/tests/output/ob_get_length_basic_001.phpt
@@ -25,7 +25,7 @@ ob_end_flush();
 echo "No output buffers\n";
 var_dump(ob_get_length());
 ?>
---EXPECTF--
+--EXPECT--
 No output buffers
 bool(false)
 int(0)
diff --git a/tests/output/ob_implicit_flush_basic_001.phpt b/tests/output/ob_implicit_flush_basic_001.phpt
index ab6f6a7a6e..2bbf8fd45a 100644
--- a/tests/output/ob_implicit_flush_basic_001.phpt
+++ b/tests/output/ob_implicit_flush_basic_001.phpt
@@ -16,7 +16,7 @@ var_dump(ob_implicit_flush(false));
 
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing ob_implicit_flush() : check return value ***
 NULL
 NULL
diff --git a/tests/output/ob_implicit_flush_basic_002.phpt b/tests/output/ob_implicit_flush_basic_002.phpt
index ad278e34bd..df985a49b9 100644
--- a/tests/output/ob_implicit_flush_basic_002.phpt
+++ b/tests/output/ob_implicit_flush_basic_002.phpt
@@ -24,6 +24,6 @@ ob_end_clean();
 
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing ob_implicit_flush() : ensure implicit flushing does not apply to user buffers. ***
 Done
diff --git a/tests/output/ob_start_basic_002.phpt b/tests/output/ob_start_basic_002.phpt
index eac69aa8a6..2412ae57f0 100644
--- a/tests/output/ob_start_basic_002.phpt
+++ b/tests/output/ob_start_basic_002.phpt
@@ -36,7 +36,7 @@ foreach ($callbacks as $callback) {
 
 ?>
 ==DONE==
---EXPECTF--
+--EXPECT--
 --> Use callback 'return_empty_string':
 
 
diff --git a/tests/output/ob_start_basic_003.phpt b/tests/output/ob_start_basic_003.phpt
index 6fd7fe798c..23f0bfb274 100644
--- a/tests/output/ob_start_basic_003.phpt
+++ b/tests/output/ob_start_basic_003.phpt
@@ -14,5 +14,5 @@ ob_end_flush();
 echo "done (you shouldn't see this)";
 
 ?>
---EXPECTF--
+--EXPECT--
 I have stolen your output
diff --git a/tests/output/ob_start_basic_004.phpt b/tests/output/ob_start_basic_004.phpt
index c71ac068c4..9fe19e9b0f 100644
--- a/tests/output/ob_start_basic_004.phpt
+++ b/tests/output/ob_start_basic_004.phpt
@@ -33,7 +33,7 @@ for ($cs=-1; $cs<10; $cs++) {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 
 ----( chunk_size: -1, output append size: 1 )----
 f[call:1; len:8]12345678
diff --git a/tests/output/ob_start_basic_unerasable_001.phpt b/tests/output/ob_start_basic_unerasable_001.phpt
index 229ba084cf..e97fd45420 100644
--- a/tests/output/ob_start_basic_unerasable_001.phpt
+++ b/tests/output/ob_start_basic_unerasable_001.phpt
@@ -15,7 +15,7 @@ $str = ob_get_contents();
 var_dump($str);
 ?>
 ==DONE==
---EXPECTF--
+--EXPECT--
 [callback:1]This call will obtain the content:
 string(35) "This call will obtain the content:
 "
-- 
cgit v1.2.1