Use EXPECT instead of EXPECTF when possible

Zend/tests/bug46665.phpt

@@ -12,5 +12,5 @@ $baz = '\\Foo\\Bar\\Baz';
 new $baz();
 
 ?>
---EXPECTF--
+--EXPECT--
 string(11) "Foo\Bar\Baz"

Zend/tests/empty_str_offset.phpt

@@ -62,7 +62,7 @@ var_dump(empty($str[$f]));
 print "done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 - empty ---
 bool(false)
 bool(true)

Zend/tests/isset_str_offset.phpt

@@ -60,7 +60,7 @@ var_dump(isset($str[$f]));
 print "done\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 - isset ---
 bool(true)
 bool(false)

ext/date/tests/strtotime_basic.phpt

@@ -35,7 +35,7 @@ var_dump(date('Y-m-d', strtotime('second Monday December 2008')));
  */ 
 var_dump(date('Y-m-d', strtotime('third Monday December 2008')));
 ?>
---EXPECTF--
+--EXPECT--
 string(10) "2008-12-01"
 string(10) "2008-12-08"
 string(10) "2008-12-15"

ext/date/tests/strtotime_variation_scottish.phpt

@@ -8,7 +8,7 @@ Checking whisky time
 	var_dump(date('H:i:s', strtotime('back of 19')));
 	var_dump(date('H:i:s', strtotime('front of 19')));
 ?>
---EXPECTF--
+--EXPECT--
 string(8) "07:15:00"
 string(8) "06:45:00"
 string(8) "19:15:00"

ext/pcre/tests/bug47229.phpt

@@ -19,7 +19,7 @@ preg_match("/a\-{1,}/", 'a\----a', $m);
 var_dump($m);
 
 ?>
---EXPECTF--
+--EXPECT--
 string(13) "\-oh really\?"
 array(1) {
   [0]=>

ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt

@@ -22,7 +22,7 @@ foreach ($db->query('SELECT testing(name) FROM foobar') as $row) {
 $db->query('DROP TABLE foobar');
 
 ?>
---EXPECTF--
+--EXPECT--
 array(2) {
   ["testing(name)"]=>
   string(2) "12"

ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt

@@ -23,7 +23,7 @@ foreach ($db->query('SELECT testing(name) FROM foobar') as $row) {
 $db->query('DROP TABLE foobar');
 
 ?>
---EXPECTF--
+--EXPECT--
 array(2) {
   ["testing(name)"]=>
   string(3) "php"

ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt

@@ -16,7 +16,7 @@ var_dump($db->lastInsertId());
 $db->query('DROP TABLE foo');
 
 ?>
---EXPECTF--
+--EXPECT--
 object(PDOStatement)#2 (1) {
   ["queryString"]=>
   string(17) "SELECT * FROM foo"

ext/pdo_sqlite/tests/pdo_sqlite_statement_getattribute.phpt

@@ -15,6 +15,6 @@ $st = $db->prepare('CREATE TABLE test (a TEXT);');
 
 var_dump($st->getAttribute(PDO::SQLITE_ATTR_READONLY_STATEMENT));
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(false)

ext/phar/tests/cache_list/copyonwrite17.phar.phpt

@@ -8,7 +8,7 @@ phar.readonly=0
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --FILE_EXTERNAL--
 files/write17.phar
---EXPECTF--
+--EXPECT--
 NULL
 string(2) "hi"
 ok

ext/phar/tests/cache_list/copyonwrite19.phar.phpt

@@ -8,7 +8,7 @@ phar.readonly=0
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --FILE_EXTERNAL--
 files/write19.phar
---EXPECTF--
+--EXPECT--
 string(2) "hi"
 string(3) "hi2"
 ok

ext/reflection/tests/bug49719.phpt

@@ -36,7 +36,7 @@ $prop->setAccessible(true);
 var_dump($prop->getValue(new b2));
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 bool(false)
 bool(false)

ext/spl/tests/SplDoublylinkedlist_offsetunset_first.phpt

@@ -11,7 +11,7 @@ $list->push('thar');
 $list->offsetUnset(0);
 var_dump($list);
 ?>
---EXPECTF--
+--EXPECT--
 object(SplDoublyLinkedList)#1 (2) {
   ["flags":"SplDoublyLinkedList":private]=>
   int(0)

ext/spl/tests/SplDoublylinkedlist_offsetunset_last.phpt

@@ -11,7 +11,7 @@ $list->push('thar');
 $list->offsetUnset(2);
 var_dump($list);
 ?>
---EXPECTF--
+--EXPECT--
 object(SplDoublyLinkedList)#1 (2) {
   ["flags":"SplDoublyLinkedList":private]=>
   int(0)

ext/spl/tests/SplFixedArray_fromarray_indexes.phpt

@@ -9,7 +9,7 @@ $array = SplFixedArray::fromArray(array(1 => 1,
 										3 => false));
 var_dump($array);
 ?>
---EXPECTF--
+--EXPECT--
 object(SplFixedArray)#1 (4) {
   [0]=>
   NULL

ext/spl/tests/SplFixedArray_fromarray_non_indexes.phpt

@@ -10,7 +10,7 @@ $array = SplFixedArray::fromArray(array(1 => 1,
 									false);
 var_dump($array);
 ?>
---EXPECTF--
+--EXPECT--
 object(SplFixedArray)#1 (3) {
   [0]=>
   int(1)

ext/spl/tests/SplFixedArray_fromarray_param_multiarray.phpt

@@ -7,7 +7,7 @@ Philip Norton philipnorton42@gmail.com
 $array = SplFixedArray::fromArray(array(array('1')));
 var_dump($array);
 ?>
---EXPECTF--
+--EXPECT--
 object(SplFixedArray)#1 (1) {
   [0]=>
   array(1) {

ext/spl/tests/SplFixedArray_offsetUnset_string.phpt

@@ -18,7 +18,7 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
 	var_dump($fixedArray);
 	
 ?>
---EXPECTF--
+--EXPECT--
 object(SplFixedArray)#1 (5) {
   [0]=>
   string(14) "PHPNW Testfest"

ext/spl/tests/SplFixedArray_setsize_001.phpt

@@ -13,7 +13,7 @@ $array[4] = 'five';
 $array->setSize(2);
 var_dump($array);
 ?>
---EXPECTF--
+--EXPECT--
 object(SplFixedArray)#1 (2) {
   [0]=>
   string(3) "one"

ext/sqlite3/tests/sqlite3_02_open.phpt

@@ -15,5 +15,5 @@ try {
 }
 
 ?>
---EXPECTF--
+--EXPECT--
 string(60) "SQLite3::__construct() expects at least 1 parameter, 0 given"

ext/sqlite3/tests/sqlite3_29_createfunction.phpt

@@ -20,7 +20,7 @@ var_dump($db->querySingle('SELECT strtoupper("tEst")'));
 
 
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 string(4) "TEST"
 bool(true)

ext/sqlite3/tests/sqlite3_31_open.phpt

@@ -18,5 +18,5 @@ try {
 ?>
 --CLEAN--
 <?php @unlink(__DIR__ . '/db1.db'); ?>
---EXPECTF--
+--EXPECT--
 string(29) "Already initialised DB Object"

ext/standard/tests/array/array_push_empty.phpt

@@ -16,7 +16,7 @@ var_dump( $array );
 
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 int(3)
 int(3)
 array(3) {

ext/standard/tests/array/array_unshift_empty.phpt

@@ -16,7 +16,7 @@ var_dump( $array );
 
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 int(3)
 int(3)
 array(3) {

ext/standard/tests/network/gethostbyname_error006.phpt

@@ -6,5 +6,5 @@ gethostbyname() function - basic invalid parameter test
 <?php
 	var_dump(gethostbyname(".toto.toto.toto"));
 ?>
---EXPECTF--
+--EXPECT--
 string(15) ".toto.toto.toto"

ext/standard/tests/network/inet_ipv6.phpt

@@ -33,7 +33,7 @@ foreach ($a as $address) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--	
 string(3) "::1"
 string(3) "::2"
 string(4) "::35"

ext/standard/tests/strings/bug46578.phpt

@@ -16,7 +16,7 @@ var_dump(strip_tags('<! a>'));
 var_dump(strip_tags('<? ax'));
 
 ?>
---EXPECTF--
+--EXPECT--
 string(6) "foobar"
 string(6) "foobar"
 string(6) "foobar"

ext/standard/tests/strings/bug47443.phpt

@@ -8,7 +8,7 @@ var_dump(metaphone("scrath"));
 var_dump(metaphone("scratc"));
 
 ?>
---EXPECTF--
+--EXPECT--
 string(4) "SKRX"
 string(4) "SKR0"
 string(5) "SKRTK"

ext/standard/tests/strings/bug47481.phpt

@@ -21,7 +21,7 @@ var_dump($array);
 
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 -- Before sorting: --
 array(6) {
   [0]=>

tests/basic/rfc1867_missing_boundary_2.phpt

@@ -15,7 +15,7 @@ Content-Type: text/plain-file1
 var_dump($_FILES);
 var_dump($_POST);
 ?>
---EXPECTF--
+--EXPECT--
 array(1) {
   ["file1"]=>
   array(5) {