Sync EXPECT usage with PHP-7.3

91 files changed, 95 insertions, 98 deletions

diff --git a/ext/oci8/tests/array_bind_005.phpt b/ext/oci8/tests/array_bind_005.phpt
index 7aa87ec8e5..31d368d661 100644
--- a/ext/oci8/tests/array_bind_005.phpt
+++ b/ext/oci8/tests/array_bind_005.phpt
@@ -61,7 +61,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 array(5) {
   [0]=>
   string(0) ""
diff --git a/ext/oci8/tests/array_bind_014.phpt b/ext/oci8/tests/array_bind_014.phpt
index 51346263a3..8a88aff33b 100644
--- a/ext/oci8/tests/array_bind_014.phpt
+++ b/ext/oci8/tests/array_bind_014.phpt
@@ -60,7 +60,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 array(5) {
   [0]=>
   int(5)
diff --git a/ext/oci8/tests/b47243_1.phpt b/ext/oci8/tests/b47243_1.phpt
index f6f348e445..711c3f79c9 100644
--- a/ext/oci8/tests/b47243_1.phpt
+++ b/ext/oci8/tests/b47243_1.phpt
@@ -21,5 +21,5 @@ oci_fetch_all($s, $r);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 ===DONE===
diff --git a/ext/oci8/tests/b47243_2.phpt b/ext/oci8/tests/b47243_2.phpt
index 7481d858c0..0a71760b60 100644
--- a/ext/oci8/tests/b47243_2.phpt
+++ b/ext/oci8/tests/b47243_2.phpt
@@ -22,5 +22,5 @@ oci_free_statement($s);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 ===DONE===
diff --git a/ext/oci8/tests/b47243_3.phpt b/ext/oci8/tests/b47243_3.phpt
index 3d597cc388..20e94b7676 100644
--- a/ext/oci8/tests/b47243_3.phpt
+++ b/ext/oci8/tests/b47243_3.phpt
@@ -23,5 +23,5 @@ oci_close($c);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 ===DONE===
diff --git a/ext/oci8/tests/bind_boolean_1.phpt b/ext/oci8/tests/bind_boolean_1.phpt
index a080e7d7f7..35da536c05 100644
--- a/ext/oci8/tests/bind_boolean_1.phpt
+++ b/ext/oci8/tests/bind_boolean_1.phpt
@@ -102,7 +102,7 @@ var_dump($b1, $b2);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
 bool(true)
 bool(false)
diff --git a/ext/oci8/tests/bind_char_3.phpt b/ext/oci8/tests/bind_char_3.phpt
index 9ff09551af..8c86d4dfae 100644
--- a/ext/oci8/tests/bind_char_3.phpt
+++ b/ext/oci8/tests/bind_char_3.phpt
@@ -243,7 +243,7 @@ oci8_test_sql_execute($c, $stmtarray);
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 Test 1.1 In Length: default.  In Type: default.  Out Length: default.          Out Type: default
   Executing:
     Oci_execute error ORA-6502
diff --git a/ext/oci8/tests/bind_char_3_11gR1.phpt b/ext/oci8/tests/bind_char_3_11gR1.phpt
index 8d4707fadd..4ab77c6a5c 100644
--- a/ext/oci8/tests/bind_char_3_11gR1.phpt
+++ b/ext/oci8/tests/bind_char_3_11gR1.phpt
@@ -243,7 +243,7 @@ oci8_test_sql_execute($c, $stmtarray);
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 Test 1.1 In Length: default.  In Type: default.  Out Length: default.          Out Type: default
   Executing:
     Oci_execute error ORA-6502
diff --git a/ext/oci8/tests/bind_char_4.phpt b/ext/oci8/tests/bind_char_4.phpt
index fbc13b4a25..0e380ec5f0 100644
--- a/ext/oci8/tests/bind_char_4.phpt
+++ b/ext/oci8/tests/bind_char_4.phpt
@@ -245,7 +245,7 @@ oci8_test_sql_execute($c, $stmtarray);
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 Test 1.1 In Length: default.  In Type: default.  Out Length: default.          Out Type: default
   Executing:
     Oci_execute error ORA-6502
diff --git a/ext/oci8/tests/bind_char_4_11gR1.phpt b/ext/oci8/tests/bind_char_4_11gR1.phpt
index 96fcb1e51c..cc1276181d 100644
--- a/ext/oci8/tests/bind_char_4_11gR1.phpt
+++ b/ext/oci8/tests/bind_char_4_11gR1.phpt
@@ -245,7 +245,7 @@ oci8_test_sql_execute($c, $stmtarray);
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 Test 1.1 In Length: default.  In Type: default.  Out Length: default.          Out Type: default
   Executing:
     Oci_execute error ORA-6502
diff --git a/ext/oci8/tests/bind_empty.phpt b/ext/oci8/tests/bind_empty.phpt
index 4c6c07e3c0..90e7679371 100644
--- a/ext/oci8/tests/bind_empty.phpt
+++ b/ext/oci8/tests/bind_empty.phpt
@@ -91,7 +91,7 @@ $statement = oci_parse($c, $drop);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
 bool(true)
 Test 2
diff --git a/ext/oci8/tests/bind_misccoltypes.phpt b/ext/oci8/tests/bind_misccoltypes.phpt
index 703bd28c24..cc2a269aee 100644
--- a/ext/oci8/tests/bind_misccoltypes.phpt
+++ b/ext/oci8/tests/bind_misccoltypes.phpt
@@ -270,7 +270,7 @@ oci_close($c);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 TEST86 insert all ORATYPE values
 
 TEST87 SELECT all values using DEFINEs
diff --git a/ext/oci8/tests/bind_query.phpt b/ext/oci8/tests/bind_query.phpt
index e4edc93299..df1d0204cb 100644
--- a/ext/oci8/tests/bind_query.phpt
+++ b/ext/oci8/tests/bind_query.phpt
@@ -64,7 +64,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
 array(1) {
   [0]=>
diff --git a/ext/oci8/tests/bind_sqltafc.phpt b/ext/oci8/tests/bind_sqltafc.phpt
index 8d2ce2ae61..8243851eb3 100644
--- a/ext/oci8/tests/bind_sqltafc.phpt
+++ b/ext/oci8/tests/bind_sqltafc.phpt
@@ -89,7 +89,7 @@ oci_close($c);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 0 - base table creation without binds
 array(5) {
   ["ID"]=>
diff --git a/ext/oci8/tests/bind_sqltchr_1.phpt b/ext/oci8/tests/bind_sqltchr_1.phpt
index aabf9bda5c..a5c6d77b67 100644
--- a/ext/oci8/tests/bind_sqltchr_1.phpt
+++ b/ext/oci8/tests/bind_sqltchr_1.phpt
@@ -135,7 +135,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 TEST241 bind SQLT_CHR
 array(1) {
   ["VARCHAR2_T10"]=>
diff --git a/ext/oci8/tests/bind_sqltchr_2.phpt b/ext/oci8/tests/bind_sqltchr_2.phpt
index 51d588f92c..e459d2270c 100644
--- a/ext/oci8/tests/bind_sqltchr_2.phpt
+++ b/ext/oci8/tests/bind_sqltchr_2.phpt
@@ -43,7 +43,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1 - PL/SQL IN and OUT variables
 string(22) "Cat got your keyboard?"
 string(22) "CAT GOT YOUR KEYBOARD?"
diff --git a/ext/oci8/tests/bind_sqltint.phpt b/ext/oci8/tests/bind_sqltint.phpt
index ac8518e791..dfefe3d7ed 100644
--- a/ext/oci8/tests/bind_sqltint.phpt
+++ b/ext/oci8/tests/bind_sqltint.phpt
@@ -216,7 +216,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 TEST141 wrong bind type SQLT_INT
 array(1) {
   ["VARCHAR2_T10"]=>
diff --git a/ext/oci8/tests/bug27303_3.phpt b/ext/oci8/tests/bug27303_3.phpt
index 6395388471..e291067088 100644
--- a/ext/oci8/tests/bug27303_3.phpt
+++ b/ext/oci8/tests/bug27303_3.phpt
@@ -49,7 +49,7 @@ foreach ($create_st as $statement) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 int(1)
 int(2)
 int(3)
diff --git a/ext/oci8/tests/bug37581.phpt b/ext/oci8/tests/bug37581.phpt
index 39d1168059..b9b491cac0 100644
--- a/ext/oci8/tests/bug37581.phpt
+++ b/ext/oci8/tests/bug37581.phpt
@@ -44,7 +44,7 @@ var_dump($strings);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 array(5) {
   [0]=>
   string(1) "A"
diff --git a/ext/oci8/tests/bug38161.phpt b/ext/oci8/tests/bug38161.phpt
index e0fbba816a..0664510146 100644
--- a/ext/oci8/tests/bug38161.phpt
+++ b/ext/oci8/tests/bug38161.phpt
@@ -24,7 +24,7 @@ var_dump($bv);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 NULL
 int(0)
 Done
diff --git a/ext/oci8/tests/bug40078.phpt b/ext/oci8/tests/bug40078.phpt
index 26c175748b..b7abcf5214 100644
--- a/ext/oci8/tests/bug40078.phpt
+++ b/ext/oci8/tests/bug40078.phpt
@@ -42,7 +42,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 array(5) {
   [0]=>
   string(3) "one"
diff --git a/ext/oci8/tests/bug42496_1.phpt b/ext/oci8/tests/bug42496_1.phpt
index a332b7d4ea..ed64b389f0 100644
--- a/ext/oci8/tests/bug42496_1.phpt
+++ b/ext/oci8/tests/bug42496_1.phpt
@@ -52,6 +52,6 @@ $stmtarray = array(
 oci8_test_sql_execute($c, $stmtarray);
 
 ?>
---EXPECTF--
+--EXPECT--
 Test 1
 Done
diff --git a/ext/oci8/tests/bug42496_2.phpt b/ext/oci8/tests/bug42496_2.phpt
index 2f002296cb..4dff86cc6c 100644
--- a/ext/oci8/tests/bug42496_2.phpt
+++ b/ext/oci8/tests/bug42496_2.phpt
@@ -50,6 +50,6 @@ $stmtarray = array(
 oci8_test_sql_execute($c, $stmtarray);
 
 ?>
---EXPECTF--
+--EXPECT--
 Test 2
 Done
diff --git a/ext/oci8/tests/bug46994.phpt b/ext/oci8/tests/bug46994.phpt
index 8a557c508b..63ddbd0150 100644
--- a/ext/oci8/tests/bug46994.phpt
+++ b/ext/oci8/tests/bug46994.phpt
@@ -71,7 +71,7 @@ oci_close($c);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
 string(26) "This should be the output."
 Test 2
diff --git a/ext/oci8/tests/bug47281.phpt b/ext/oci8/tests/bug47281.phpt
index 60590ca092..e7b6dc43cc 100644
--- a/ext/oci8/tests/bug47281.phpt
+++ b/ext/oci8/tests/bug47281.phpt
@@ -59,7 +59,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
 ORA-20000: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaBcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccDeeeeeeeeeeee
 Test 2
diff --git a/ext/oci8/tests/bug47281_tt.phpt b/ext/oci8/tests/bug47281_tt.phpt
index 4b4e92ede6..687655fe8c 100644
--- a/ext/oci8/tests/bug47281_tt.phpt
+++ b/ext/oci8/tests/bug47281_tt.phpt
@@ -51,7 +51,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
 ORA-57000: TT8507: ORA-20000: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 Test 2
diff --git a/ext/oci8/tests/bug68298.phpt b/ext/oci8/tests/bug68298.phpt
index 4ea8f14c53..e05a6ad949 100644
--- a/ext/oci8/tests/bug68298.phpt
+++ b/ext/oci8/tests/bug68298.phpt
@@ -38,7 +38,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 array(1) {
   ["COL1"]=>
   array(2) {
diff --git a/ext/oci8/tests/bug70700.phpt b/ext/oci8/tests/bug70700.phpt
index 8c948dc205..5431a90f6a 100644
--- a/ext/oci8/tests/bug70700.phpt
+++ b/ext/oci8/tests/bug70700.phpt
@@ -155,7 +155,7 @@ echo 'size of stream4a is ', strlen($stream4a), ' bytes, ', mb_strlen($stream4a)
 echo 'beg of stream4a is ', $start4a, PHP_EOL;
 echo 'end of stream4a is ', $ending4a, PHP_EOL;
 
---EXPECTF--
+--EXPECT--
 
 Test 1: j
 size of string1 is 1000006 bytes, 1000006 chars.
diff --git a/ext/oci8/tests/bug71422.phpt b/ext/oci8/tests/bug71422.phpt
index 5978e04ece..b294b46dad 100644
--- a/ext/oci8/tests/bug71422.phpt
+++ b/ext/oci8/tests/bug71422.phpt
@@ -49,7 +49,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 array(1) {
   ["RAW_QUERY"]=>
   string(3) "Foo"
diff --git a/ext/oci8/tests/bug74625.phpt b/ext/oci8/tests/bug74625.phpt
index df9440e42a..f3bc7ac60a 100644
--- a/ext/oci8/tests/bug74625.phpt
+++ b/ext/oci8/tests/bug74625.phpt
@@ -49,7 +49,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 array(5) {
   [0]=>
   int(-2)
diff --git a/ext/oci8/tests/close.phpt b/ext/oci8/tests/close.phpt
index 55bb4ea364..aed90fcaa7 100644
--- a/ext/oci8/tests/close.phpt
+++ b/ext/oci8/tests/close.phpt
@@ -13,5 +13,5 @@ oci_connect($user, $password, $dbase);
 	
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 Done
diff --git a/ext/oci8/tests/coll_019.phpt b/ext/oci8/tests/coll_019.phpt
index e9896c4658..cfadfe5635 100644
--- a/ext/oci8/tests/coll_019.phpt
+++ b/ext/oci8/tests/coll_019.phpt
@@ -5,9 +5,6 @@ Test collection Oracle error handling collections and numbers (2)
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
 require(dirname(__FILE__).'/skipif.inc');
 ?>
-$target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
-require(dirname(__FILE__).'/skipif.inc');
-?>
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/commit_001.phpt b/ext/oci8/tests/commit_001.phpt
index 09f3bfe12b..2df6b03382 100644
--- a/ext/oci8/tests/commit_001.phpt
+++ b/ext/oci8/tests/commit_001.phpt
@@ -77,7 +77,7 @@ require(dirname(__FILE__).'/drop_table.inc');
 	
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 int(0)
 array(5) {
diff --git a/ext/oci8/tests/conn_attr_5.phpt b/ext/oci8/tests/conn_attr_5.phpt
index 624eb63e12..129181dc27 100644
--- a/ext/oci8/tests/conn_attr_5.phpt
+++ b/ext/oci8/tests/conn_attr_5.phpt
@@ -51,7 +51,7 @@ function get_scope() {
 clean_up($c);
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 **Test - Set and get values for the attributes with scope end ************
 Testing with oci_connect()
 Value of CLIENT_INFO has been set successfully
diff --git a/ext/oci8/tests/connect_scope1.phpt b/ext/oci8/tests/connect_scope1.phpt
index 27b15f1e6e..b1f6653f12 100644
--- a/ext/oci8/tests/connect_scope1.phpt
+++ b/ext/oci8/tests/connect_scope1.phpt
@@ -68,7 +68,7 @@ oci8_test_sql_execute($c1, $stmtarray);
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 Test 1 - oci_connect
 array(1) {
   ["C1"]=>
diff --git a/ext/oci8/tests/connect_scope2.phpt b/ext/oci8/tests/connect_scope2.phpt
index 6fcfa238c9..660630bb6b 100644
--- a/ext/oci8/tests/connect_scope2.phpt
+++ b/ext/oci8/tests/connect_scope2.phpt
@@ -68,7 +68,7 @@ oci8_test_sql_execute($c1, $stmtarray);
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 Test 1 - oci_pconnect
 array(1) {
   ["C1"]=>
diff --git a/ext/oci8/tests/db_op_1.phpt b/ext/oci8/tests/db_op_1.phpt
index b4f7db168b..27de28db03 100644
--- a/ext/oci8/tests/db_op_1.phpt
+++ b/ext/oci8/tests/db_op_1.phpt
@@ -47,7 +47,7 @@ dq($c, 'select dbop_name from v$sql_monitor where dbop_name is not null order by
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
 array(1) {
   ["DUMMY"]=>
diff --git a/ext/oci8/tests/db_op_2.phpt b/ext/oci8/tests/db_op_2.phpt
index 10c5700223..1878347123 100644
--- a/ext/oci8/tests/db_op_2.phpt
+++ b/ext/oci8/tests/db_op_2.phpt
@@ -49,7 +49,7 @@ dq($c, 'select dbop_name from v$sql_monitor where dbop_name like \'db_op2%\' ord
 <?php exit(0); ?>
 --XFAIL--
 Fails due to Oracle Bug 16695981
---EXPECTF--
+--EXPECT--
 Test 1
 array(1) {
   ["DUMMY"]=>
diff --git a/ext/oci8/tests/dbmsoutput.phpt b/ext/oci8/tests/dbmsoutput.phpt
index 68906aa796..6a8a718c8a 100644
--- a/ext/oci8/tests/dbmsoutput.phpt
+++ b/ext/oci8/tests/dbmsoutput.phpt
@@ -132,7 +132,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
 array(1) {
   [0]=>
diff --git a/ext/oci8/tests/define5.phpt b/ext/oci8/tests/define5.phpt
index 978d66b260..774bac2344 100644
--- a/ext/oci8/tests/define5.phpt
+++ b/ext/oci8/tests/define5.phpt
@@ -57,7 +57,7 @@ oci8_test_sql_execute($c, $stmtarray);
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 Test 1 - must do define before execute
 bool(true)
 NULL
diff --git a/ext/oci8/tests/define_old.phpt b/ext/oci8/tests/define_old.phpt
index cc07e2ea94..d174ef9155 100644
--- a/ext/oci8/tests/define_old.phpt
+++ b/ext/oci8/tests/define_old.phpt
@@ -43,6 +43,6 @@ oci8_test_sql_execute($c, $stmtarray);
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 string(4) "some"
 Done
diff --git a/ext/oci8/tests/details.inc b/ext/oci8/tests/details.inc
index e54ea84abd..731b562d0a 100644
--- a/ext/oci8/tests/details.inc
+++ b/ext/oci8/tests/details.inc
@@ -30,11 +30,11 @@ if (file_exists(dirname(__FILE__)."/details_local.inc")) {
 		$dbase						= "localhost/XE";
 		$test_drcp					= FALSE;
 	}
-	
+
 	/*
 	 * Common object names for scripts to use
 	 */
-	
+
 	$table_name = "tb".substr(str_replace(Array(".", "-"), "_", php_uname("n")), 0, 5);
 	$type_name = strtoupper("tp".substr(str_replace(Array(".", "-"), "_", php_uname("n")), 0, 5));
 	$schema = '';
diff --git a/ext/oci8/tests/drcp_connection_class.phpt b/ext/oci8/tests/drcp_connection_class.phpt
index b6ca31ce2a..8544b99fc8 100644
--- a/ext/oci8/tests/drcp_connection_class.phpt
+++ b/ext/oci8/tests/drcp_connection_class.phpt
@@ -24,7 +24,7 @@ echo "The New oci8.connection_class is $new_cc\n";
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 Setting a new connection class now
 The New oci8.connection_class is New cc
 Done
diff --git a/ext/oci8/tests/drcp_functions.inc b/ext/oci8/tests/drcp_functions.inc
index f6b24446c9..320026486e 100644
--- a/ext/oci8/tests/drcp_functions.inc
+++ b/ext/oci8/tests/drcp_functions.inc
@@ -7,7 +7,7 @@ function drcp_create_table($conn)
 	$create_sql = "CREATE TABLE DRCPTEST (id NUMBER, name VARCHAR2(10), dept VARCHAR2(10))";
 	$statement = oci_parse($conn, $create_sql);
 	oci_execute($statement);
-	
+
 	$id_values = array(100,101,102,103,104,105,106,107,108);
 	$name_values = array("WIILIAMS","JOHN","SMITH","JONES","ADAMS","ROBERT",
 						 "BILL","LAWSON","MARY");
@@ -17,7 +17,7 @@ function drcp_create_table($conn)
 		$insert = "INSERT INTO DRCPTEST VALUES(".$id_values[$i].",'". $name_values[$i]."','".$dept_values[$i]."')";
 		$s = oci_parse($conn, $insert);
 		oci_execute($s);
-	}	
+	}
 }
 
 function drcp_drop_table($conn)
@@ -74,12 +74,12 @@ function drcp_create_package($c)
 			end;";
 	$s1 = oci_parse($c, $create_package_stmt);
 	oci_execute($s1);
-	
+
 	$package_body = "create or replace package body drcp_test_package as
 		procedure p1(var1 int) is
 		begin
 		var :=var1;
-		end;	
+		end;
 		function f1 return number is
 		begin
 		return drcp_test_package.var;
diff --git a/ext/oci8/tests/dupcolnames.phpt b/ext/oci8/tests/dupcolnames.phpt
index bf07497178..cc1fdd1854 100644
--- a/ext/oci8/tests/dupcolnames.phpt
+++ b/ext/oci8/tests/dupcolnames.phpt
@@ -59,7 +59,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1 - OCI_ASSOC
 array(3) {
   ["C1"]=>
diff --git a/ext/oci8/tests/error_set.phpt b/ext/oci8/tests/error_set.phpt
index ad56e8aefa..b0c53408c3 100644
--- a/ext/oci8/tests/error_set.phpt
+++ b/ext/oci8/tests/error_set.phpt
@@ -53,7 +53,7 @@ var_dump($r);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
 bool(false)
 24960
diff --git a/ext/oci8/tests/fetch.phpt b/ext/oci8/tests/fetch.phpt
index b968ae4bf6..6fdec313f1 100644
--- a/ext/oci8/tests/fetch.phpt
+++ b/ext/oci8/tests/fetch.phpt
@@ -46,7 +46,7 @@ oci8_test_sql_execute($c, $stmtarray);
 	
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 string(1) "1"
 string(1) "1"
 string(1) "1"
diff --git a/ext/oci8/tests/fetch_all1.phpt b/ext/oci8/tests/fetch_all1.phpt
index b8155b170b..00e747cc35 100644
--- a/ext/oci8/tests/fetch_all1.phpt
+++ b/ext/oci8/tests/fetch_all1.phpt
@@ -48,7 +48,7 @@ oci8_test_sql_execute($c, $stmtarray);
 	
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 int(3)
 array(2) {
   ["ID"]=>
diff --git a/ext/oci8/tests/fetch_all3.phpt b/ext/oci8/tests/fetch_all3.phpt
index f2a401d7c0..728dc7e3eb 100644
--- a/ext/oci8/tests/fetch_all3.phpt
+++ b/ext/oci8/tests/fetch_all3.phpt
@@ -125,7 +125,7 @@ oci8_test_sql_execute($c, $stmtarray);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 None
 int(4)
 array(2) {
diff --git a/ext/oci8/tests/fetch_all4.phpt b/ext/oci8/tests/fetch_all4.phpt
index 1d4a8df7b7..7c3b5ea83c 100644
--- a/ext/oci8/tests/fetch_all4.phpt
+++ b/ext/oci8/tests/fetch_all4.phpt
@@ -47,7 +47,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
 int(0)
 array(2) {
diff --git a/ext/oci8/tests/fetch_all5.phpt b/ext/oci8/tests/fetch_all5.phpt
index d82fd30e41..28e1a2e72d 100644
--- a/ext/oci8/tests/fetch_all5.phpt
+++ b/ext/oci8/tests/fetch_all5.phpt
@@ -58,7 +58,7 @@ oci_close($c);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
 int(3)
 array(2) {
diff --git a/ext/oci8/tests/fetch_into.phpt b/ext/oci8/tests/fetch_into.phpt
index d90c4d95dc..5235dac8a0 100644
--- a/ext/oci8/tests/fetch_into.phpt
+++ b/ext/oci8/tests/fetch_into.phpt
@@ -49,7 +49,7 @@ oci8_test_sql_execute($c, $stmtarray);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 int(2)
 array(2) {
   [0]=>
diff --git a/ext/oci8/tests/fetch_row.phpt b/ext/oci8/tests/fetch_row.phpt
index 40bc4f893c..1b5176974a 100644
--- a/ext/oci8/tests/fetch_row.phpt
+++ b/ext/oci8/tests/fetch_row.phpt
@@ -43,7 +43,7 @@ oci8_test_sql_execute($c, $stmtarray);
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 array(2) {
   [0]=>
   string(1) "1"
diff --git a/ext/oci8/tests/imp_res_2.phpt b/ext/oci8/tests/imp_res_2.phpt
index ca92eba3d3..567cefb2ba 100644
--- a/ext/oci8/tests/imp_res_2.phpt
+++ b/ext/oci8/tests/imp_res_2.phpt
@@ -84,7 +84,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
 Test 2
 array(1) {
diff --git a/ext/oci8/tests/imp_res_3.phpt b/ext/oci8/tests/imp_res_3.phpt
index 53c0465128..965edb1224 100644
--- a/ext/oci8/tests/imp_res_3.phpt
+++ b/ext/oci8/tests/imp_res_3.phpt
@@ -82,7 +82,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
   1  a  1  a  1  a  1  a  1  a
   1  a  1  a  1  a  1  a  2  f
diff --git a/ext/oci8/tests/imp_res_7.phpt b/ext/oci8/tests/imp_res_7.phpt
index abcf8aeb1b..8502ab2488 100644
--- a/ext/oci8/tests/imp_res_7.phpt
+++ b/ext/oci8/tests/imp_res_7.phpt
@@ -593,7 +593,7 @@ while (($row = oci_fetch_row($s)) != false) {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
   1
   2
diff --git a/ext/oci8/tests/imp_res_cancel.phpt b/ext/oci8/tests/imp_res_cancel.phpt
index 692a1fabb1..7c503c3cb9 100644
--- a/ext/oci8/tests/imp_res_cancel.phpt
+++ b/ext/oci8/tests/imp_res_cancel.phpt
@@ -57,7 +57,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
   1
 bool(true)
diff --git a/ext/oci8/tests/imp_res_cursor.phpt b/ext/oci8/tests/imp_res_cursor.phpt
index 6ba1261f25..57bdddeab2 100644
--- a/ext/oci8/tests/imp_res_cursor.phpt
+++ b/ext/oci8/tests/imp_res_cursor.phpt
@@ -87,7 +87,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
   X
   1  abcde
diff --git a/ext/oci8/tests/imp_res_dbmsoutput.phpt b/ext/oci8/tests/imp_res_dbmsoutput.phpt
index 6f1d7cb215..cb6fae095f 100644
--- a/ext/oci8/tests/imp_res_dbmsoutput.phpt
+++ b/ext/oci8/tests/imp_res_dbmsoutput.phpt
@@ -105,7 +105,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
 array(2) {
   [0]=>
diff --git a/ext/oci8/tests/imp_res_field.phpt b/ext/oci8/tests/imp_res_field.phpt
index 5cb88569ca..3d10e15dac 100644
--- a/ext/oci8/tests/imp_res_field.phpt
+++ b/ext/oci8/tests/imp_res_field.phpt
@@ -126,7 +126,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1 - can't get IRS fields from parent
 num fields : 0
 
diff --git a/ext/oci8/tests/imp_res_get_1.phpt b/ext/oci8/tests/imp_res_get_1.phpt
index 226f1e557b..79ad8711ff 100644
--- a/ext/oci8/tests/imp_res_get_1.phpt
+++ b/ext/oci8/tests/imp_res_get_1.phpt
@@ -90,7 +90,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
   1  abcde
   2  fghij
diff --git a/ext/oci8/tests/imp_res_get_2.phpt b/ext/oci8/tests/imp_res_get_2.phpt
index 1747e4b4e3..3ed3036f6b 100644
--- a/ext/oci8/tests/imp_res_get_2.phpt
+++ b/ext/oci8/tests/imp_res_get_2.phpt
@@ -96,7 +96,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
   1  abcde
   2  fghij
diff --git a/ext/oci8/tests/imp_res_get_3.phpt b/ext/oci8/tests/imp_res_get_3.phpt
index dd3e141fa5..f0f0b164da 100644
--- a/ext/oci8/tests/imp_res_get_3.phpt
+++ b/ext/oci8/tests/imp_res_get_3.phpt
@@ -82,7 +82,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
   1  abcde
   2  fghij
diff --git a/ext/oci8/tests/imp_res_get_5.phpt b/ext/oci8/tests/imp_res_get_5.phpt
index cee25cc509..eabc7867e9 100644
--- a/ext/oci8/tests/imp_res_get_5.phpt
+++ b/ext/oci8/tests/imp_res_get_5.phpt
@@ -95,7 +95,7 @@ oci_free_statement($s);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
   3
   4
diff --git a/ext/oci8/tests/imp_res_get_all.phpt b/ext/oci8/tests/imp_res_get_all.phpt
index 02ea0cbe1f..98bb8c08d2 100644
--- a/ext/oci8/tests/imp_res_get_all.phpt
+++ b/ext/oci8/tests/imp_res_get_all.phpt
@@ -59,7 +59,7 @@ while (($s1 = oci_get_implicit_resultset($s))) {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
 array(1) {
   [1]=>
diff --git a/ext/oci8/tests/imp_res_get_cancel.phpt b/ext/oci8/tests/imp_res_get_cancel.phpt
index a9a6d72323..1ea6beaf60 100644
--- a/ext/oci8/tests/imp_res_get_cancel.phpt
+++ b/ext/oci8/tests/imp_res_get_cancel.phpt
@@ -48,7 +48,7 @@ while (($s1 = oci_get_implicit_resultset($s))) {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
   1
   3
diff --git a/ext/oci8/tests/imp_res_get_close_3.phpt b/ext/oci8/tests/imp_res_get_close_3.phpt
index 3cf0b503de..d57644c924 100644
--- a/ext/oci8/tests/imp_res_get_close_3.phpt
+++ b/ext/oci8/tests/imp_res_get_close_3.phpt
@@ -54,7 +54,7 @@ oci_free_statement($s);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
   1
   2
diff --git a/ext/oci8/tests/imp_res_get_cursor.phpt b/ext/oci8/tests/imp_res_get_cursor.phpt
index e00472d18e..417c112419 100644
--- a/ext/oci8/tests/imp_res_get_cursor.phpt
+++ b/ext/oci8/tests/imp_res_get_cursor.phpt
@@ -89,7 +89,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
   1  abcde
   2  fghij
diff --git a/ext/oci8/tests/imp_res_get_dbmsoutput.phpt b/ext/oci8/tests/imp_res_get_dbmsoutput.phpt
index a20d1eaf69..32732163d8 100644
--- a/ext/oci8/tests/imp_res_get_dbmsoutput.phpt
+++ b/ext/oci8/tests/imp_res_get_dbmsoutput.phpt
@@ -119,7 +119,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
 array(3) {
   [0]=>
diff --git a/ext/oci8/tests/imp_res_get_exec.phpt b/ext/oci8/tests/imp_res_get_exec.phpt
index d36fb66136..6f5a503ec3 100644
--- a/ext/oci8/tests/imp_res_get_exec.phpt
+++ b/ext/oci8/tests/imp_res_get_exec.phpt
@@ -48,7 +48,7 @@ oci_free_statement($s);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
   1
   2
diff --git a/ext/oci8/tests/imp_res_get_none.phpt b/ext/oci8/tests/imp_res_get_none.phpt
index f97b798750..73d2913884 100644
--- a/ext/oci8/tests/imp_res_get_none.phpt
+++ b/ext/oci8/tests/imp_res_get_none.phpt
@@ -40,7 +40,7 @@ var_dump($s1);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
 bool(false)
 ===DONE===
diff --git a/ext/oci8/tests/imp_res_insert.phpt b/ext/oci8/tests/imp_res_insert.phpt
index 2fea690607..317d4def66 100644
--- a/ext/oci8/tests/imp_res_insert.phpt
+++ b/ext/oci8/tests/imp_res_insert.phpt
@@ -105,7 +105,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1 - No commit in procedure, OCI_COMMIT_ON_SUCCESS mode
 111
 array(1) {
diff --git a/ext/oci8/tests/imp_res_lob.phpt b/ext/oci8/tests/imp_res_lob.phpt
index 3e52fb117e..16f0701e72 100644
--- a/ext/oci8/tests/imp_res_lob.phpt
+++ b/ext/oci8/tests/imp_res_lob.phpt
@@ -84,7 +84,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
  1 aaaaa a
  2 bbbbb b
diff --git a/ext/oci8/tests/imp_res_prefetch.phpt b/ext/oci8/tests/imp_res_prefetch.phpt
index 8daa2ff414..c00e4be297 100644
--- a/ext/oci8/tests/imp_res_prefetch.phpt
+++ b/ext/oci8/tests/imp_res_prefetch.phpt
@@ -83,7 +83,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1 - prefetch 0
 bool(true)
 array(2) {
diff --git a/ext/oci8/tests/ini_1.phpt b/ext/oci8/tests/ini_1.phpt
index 0c3597b619..9c9b378e7b 100644
--- a/ext/oci8/tests/ini_1.phpt
+++ b/ext/oci8/tests/ini_1.phpt
@@ -55,7 +55,7 @@ echo 'oci8.old_oci_close_semantics = ' . ini_get('oci8.old_oci_close_semantics')
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1 - check initialization
 oci8.privileged_connect = 1
 oci8.max_persistent = 111
diff --git a/ext/oci8/tests/lob_018.phpt b/ext/oci8/tests/lob_018.phpt
index f73bbf54b8..94c888cb64 100644
--- a/ext/oci8/tests/lob_018.phpt
+++ b/ext/oci8/tests/lob_018.phpt
@@ -91,7 +91,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
 string(4) "data"
 string(9) "long data"
diff --git a/ext/oci8/tests/lob_029.phpt b/ext/oci8/tests/lob_029.phpt
index f018a74575..615c2722f2 100644
--- a/ext/oci8/tests/lob_029.phpt
+++ b/ext/oci8/tests/lob_029.phpt
@@ -89,7 +89,7 @@ oci_execute($s);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 Test 1. Check how many rows in the table
 array(1) {
   ["NUMROWS"]=>
diff --git a/ext/oci8/tests/lob_030.phpt b/ext/oci8/tests/lob_030.phpt
index 013a3f0c45..014d40a2a5 100644
--- a/ext/oci8/tests/lob_030.phpt
+++ b/ext/oci8/tests/lob_030.phpt
@@ -62,7 +62,7 @@ require dirname(__FILE__).'/drop_table.inc';
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 Test 1: A CLOB with an even number of bytes
 int(1050000)
 Test 2: A CLOB with an odd number of bytes
diff --git a/ext/oci8/tests/lob_031.phpt b/ext/oci8/tests/lob_031.phpt
index 52674c6782..ee99e4ceec 100644
--- a/ext/oci8/tests/lob_031.phpt
+++ b/ext/oci8/tests/lob_031.phpt
@@ -91,7 +91,7 @@ require dirname(__FILE__).'/drop_table.inc';
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
  1. 3
  2. 6
  3. 9
diff --git a/ext/oci8/tests/lob_043.phpt b/ext/oci8/tests/lob_043.phpt
index 5d723be447..b4ac8d240b 100644
--- a/ext/oci8/tests/lob_043.phpt
+++ b/ext/oci8/tests/lob_043.phpt
@@ -80,7 +80,7 @@ oci_close($c);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1
 f1 ended
 Test 2
diff --git a/ext/oci8/tests/lob_044.phpt b/ext/oci8/tests/lob_044.phpt
index a4ea684ae0..a49c0b7571 100644
--- a/ext/oci8/tests/lob_044.phpt
+++ b/ext/oci8/tests/lob_044.phpt
@@ -59,7 +59,7 @@ oci8_test_sql_execute($c, $stmtarray);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 Test 1 - truncate on insert
 int(72)
 bool(true)
diff --git a/ext/oci8/tests/lob_null.phpt b/ext/oci8/tests/lob_null.phpt
index 45d688ae68..f4dac4de7a 100644
--- a/ext/oci8/tests/lob_null.phpt
+++ b/ext/oci8/tests/lob_null.phpt
@@ -188,7 +188,7 @@ $s = oci_parse($c, 'drop table lob_null_tab');
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 Temporary CLOB: NULL
 Temporary CLOB: ''
 Temporary CLOB: text
@@ -265,4 +265,4 @@ Fetch via the procedure parameter
 7 is an object: string(0) ""
 8 is an object: string(0) ""
 9 is an object: string(28) "Inserted with RETURNING INTO"
-Done
\ No newline at end of file
+Done
diff --git a/ext/oci8/tests/lob_temp.phpt b/ext/oci8/tests/lob_temp.phpt
index 513496942b..186e106bea 100644
--- a/ext/oci8/tests/lob_temp.phpt
+++ b/ext/oci8/tests/lob_temp.phpt
@@ -27,7 +27,7 @@ var_dump($blob->read(2));
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 string(4) "test"
 bool(true)
diff --git a/ext/oci8/tests/lob_temp1.phpt b/ext/oci8/tests/lob_temp1.phpt
index 86c29c1b51..a1cf843dfe 100644
--- a/ext/oci8/tests/lob_temp1.phpt
+++ b/ext/oci8/tests/lob_temp1.phpt
@@ -25,7 +25,7 @@ var_dump($blob->close());
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 string(4) "test"
 bool(true)
diff --git a/ext/oci8/tests/lob_temp2.phpt b/ext/oci8/tests/lob_temp2.phpt
index fd5b56333f..8592fa1750 100644
--- a/ext/oci8/tests/lob_temp2.phpt
+++ b/ext/oci8/tests/lob_temp2.phpt
@@ -28,7 +28,7 @@ var_dump($res);
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 bool(true)
 array(1) {
   ["CLOB"]=>
diff --git a/ext/oci8/tests/minfo.phpt b/ext/oci8/tests/minfo.phpt
index 34a19ca693..05862e8943 100644
--- a/ext/oci8/tests/minfo.phpt
+++ b/ext/oci8/tests/minfo.phpt
@@ -15,5 +15,5 @@ if ($r !== 1)
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 Done
diff --git a/ext/oci8/tests/privileged_connect.phpt b/ext/oci8/tests/privileged_connect.phpt
index 98fe3ed225..3b72f2021a 100644
--- a/ext/oci8/tests/privileged_connect.phpt
+++ b/ext/oci8/tests/privileged_connect.phpt
@@ -14,7 +14,7 @@ oci_connect("", "", "", false, "qwe");
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: oci_connect(): Privileged connect is disabled. Enable oci8.privileged_connect to be able to connect as SYSOPER or SYSDBA in %s on line %d
 
 Warning: oci_connect(): Privileged connect is disabled. Enable oci8.privileged_connect to be able to connect as SYSOPER or SYSDBA in %s on line %d
diff --git a/ext/oci8/tests/privileged_connect1.phpt b/ext/oci8/tests/privileged_connect1.phpt
index 9581675ad2..768b0c20d3 100644
--- a/ext/oci8/tests/privileged_connect1.phpt
+++ b/ext/oci8/tests/privileged_connect1.phpt
@@ -16,7 +16,7 @@ oci_connect("", "", "", false, "qwe");
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: oci_connect(): ORA-%d: %s in %s on line %d
 
 Warning: oci_connect(): ORA-%d: %s in %s on line %d
diff --git a/ext/oci8/tests/statement_type.phpt b/ext/oci8/tests/statement_type.phpt
index 29cdd94402..ed71240a95 100644
--- a/ext/oci8/tests/statement_type.phpt
+++ b/ext/oci8/tests/statement_type.phpt
@@ -31,7 +31,7 @@ foreach ($sqls as $sql) {
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 string(6) "SELECT"
 string(6) "DELETE"
 string(6) "INSERT"
diff --git a/ext/oci8/tests/testping.phpt b/ext/oci8/tests/testping.phpt
index a0d65a30c3..720ba8d071 100644
--- a/ext/oci8/tests/testping.phpt
+++ b/ext/oci8/tests/testping.phpt
@@ -21,5 +21,5 @@ for ($i = 0; $i < 2; $i++) {
 echo "Done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 Done
diff --git a/ext/oci8/tests/uncommitted.phpt b/ext/oci8/tests/uncommitted.phpt
index 3c341c8cb4..a779bba340 100644
--- a/ext/oci8/tests/uncommitted.phpt
+++ b/ext/oci8/tests/uncommitted.phpt
@@ -12,5 +12,5 @@ oci_execute($stmt, OCI_DEFAULT);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 Done