Use EXPECT instead of EXPECTF when possible

diff --git a/Zend/tests/bug46665.phpt b/Zend/tests/bug46665.phpt
index 29491dc26c5c0d50bc0a4ea885465f49aa12ba61..d8de8159a55e946e183153aab63aa042a89569ef 100644 (file)
--- a/Zend/tests/bug46665.phpt
+++ b/Zend/tests/bug46665.phpt
@@ -12,5 +12,5 @@ $baz = '\\Foo\\Bar\\Baz';
 new $baz();
 
 ?>
---EXPECTF--
+--EXPECT--
 string(11) "Foo\Bar\Baz"

diff --git a/Zend/tests/empty_str_offset.phpt b/Zend/tests/empty_str_offset.phpt
index 044719a382b5656e0202ee341fecdd23c8c84dd8..f89987109df5b3d9aa3610f297a19125b1ed2aef 100644 (file)
--- a/Zend/tests/empty_str_offset.phpt
+++ b/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)

diff --git a/Zend/tests/isset_str_offset.phpt b/Zend/tests/isset_str_offset.phpt
index 6be0f227a434ccd8f87d277f386f5d3cb28e8479..5f7b72771f5937bdfe752851b21fb090a8ea5c5a 100644 (file)
--- a/Zend/tests/isset_str_offset.phpt
+++ b/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)

diff --git a/ext/date/tests/strtotime_basic.phpt b/ext/date/tests/strtotime_basic.phpt
index c64f0e8bdc5250182e01d091587eccad9370d795..b2d971c785947eb167c76fa2a084b710821318b9 100644 (file)
--- a/ext/date/tests/strtotime_basic.phpt
+++ b/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"

diff --git a/ext/date/tests/strtotime_variation_scottish.phpt b/ext/date/tests/strtotime_variation_scottish.phpt
index 0cd642cc823d9cae652aa3c91477fe89cd03df4b..740583a78e5ba7d96a13ab3479a70d584665097c 100644 (file)
--- a/ext/date/tests/strtotime_variation_scottish.phpt
+++ b/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"

diff --git a/ext/pcre/tests/bug47229.phpt b/ext/pcre/tests/bug47229.phpt
index 8edd1c0a5a4e770e0b9de266df25d16ee023bed2..74dcf20099d6b8d0a94317a90f55f3905b26ab15 100644 (file)
--- a/ext/pcre/tests/bug47229.phpt
+++ b/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]=>

diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt
index 54eb06411f959f4a8a81a5210c7cfa3e34625cef..0dd5c1d42829c7084474252bb4ece0d0e6566e75 100644 (file)
--- a/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt
+++ b/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"

diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt
index 13867ae25c0a630a787e8244b8fa20d4406b84fa..7ff85a5c4c112463160be945db6a788993252270 100644 (file)
--- a/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt
+++ b/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"

diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt
index bb4d033ddab4dbbda4416f9c383e71400342b84b..9857b4bd36f075a31b0f456ad9a0797c2f9d3830 100644 (file)
--- a/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt
+++ b/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"

diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_statement_getattribute.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_statement_getattribute.phpt
index 559907c380e0a1924f78fdc5b7e9e6be656de25e..6b7e36560edd438eb87970806a451cd7d3e27466 100644 (file)
--- a/ext/pdo_sqlite/tests/pdo_sqlite_statement_getattribute.phpt
+++ b/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)
\ No newline at end of file

diff --git a/ext/phar/tests/cache_list/copyonwrite17.phar.phpt b/ext/phar/tests/cache_list/copyonwrite17.phar.phpt
index 6e13088512e242b0e0fce7be0c14b2aa36ece432..57412401b6c13ef8b381f1ef24f09c1e89c125fe 100644 (file)
--- a/ext/phar/tests/cache_list/copyonwrite17.phar.phpt
+++ b/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
\ No newline at end of file

diff --git a/ext/phar/tests/cache_list/copyonwrite19.phar.phpt b/ext/phar/tests/cache_list/copyonwrite19.phar.phpt
index 4870550c4d096ba02d2528523a31e17a562c89c6..e70b0dfa765821bd3a20a53e08f816cc40c85408 100644 (file)
--- a/ext/phar/tests/cache_list/copyonwrite19.phar.phpt
+++ b/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
\ No newline at end of file

diff --git a/ext/reflection/tests/bug49719.phpt b/ext/reflection/tests/bug49719.phpt
index f200ce297ca966ad1aceec35b08ab8c2894fc66f..b62e1b2ec5267ad5a2aeffec663e31ab4b7315a0 100644 (file)
--- a/ext/reflection/tests/bug49719.phpt
+++ b/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)

diff --git a/ext/spl/tests/SplDoublylinkedlist_offsetunset_first.phpt b/ext/spl/tests/SplDoublylinkedlist_offsetunset_first.phpt
index 7d8aa7e621498e4118b10c90ea644668a3d64f8c..51882c46ce8b086614048914c8351dd00b4abfe0 100644 (file)
--- a/ext/spl/tests/SplDoublylinkedlist_offsetunset_first.phpt
+++ b/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)

diff --git a/ext/spl/tests/SplDoublylinkedlist_offsetunset_last.phpt b/ext/spl/tests/SplDoublylinkedlist_offsetunset_last.phpt
index ac3cade344b82c549a5874909aa99aaa77ed68a6..f6dba97cfd94817d727cc0be45b67c08c47c08aa 100644 (file)
--- a/ext/spl/tests/SplDoublylinkedlist_offsetunset_last.phpt
+++ b/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)

diff --git a/ext/spl/tests/SplFixedArray_fromarray_indexes.phpt b/ext/spl/tests/SplFixedArray_fromarray_indexes.phpt
index a511c63ad8fec243ae6378f873aa0ef397785c06..7c225b05e7a7a41b8009c2c5998040fdaea05c0c 100644 (file)
--- a/ext/spl/tests/SplFixedArray_fromarray_indexes.phpt
+++ b/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

diff --git a/ext/spl/tests/SplFixedArray_fromarray_non_indexes.phpt b/ext/spl/tests/SplFixedArray_fromarray_non_indexes.phpt
index 79f74cd5e7ff2152fd0bd1912e73ed233141b21c..03cbeeecd75f2cbd731044d1401406c91ac757d5 100644 (file)
--- a/ext/spl/tests/SplFixedArray_fromarray_non_indexes.phpt
+++ b/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)

diff --git a/ext/spl/tests/SplFixedArray_fromarray_param_multiarray.phpt b/ext/spl/tests/SplFixedArray_fromarray_param_multiarray.phpt
index b669563db4bb3da3a49780f39a0e382f49784266..e5329e03fc64ce30cdb516973d66189dee40e755 100644 (file)
--- a/ext/spl/tests/SplFixedArray_fromarray_param_multiarray.phpt
+++ b/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) {

diff --git a/ext/spl/tests/SplFixedArray_offsetUnset_string.phpt b/ext/spl/tests/SplFixedArray_offsetUnset_string.phpt
index f422eef26497a602faf03455da7bb6761848c98e..5c9431ec247192587cc28761e51bb9de593e1f47 100644 (file)
--- a/ext/spl/tests/SplFixedArray_offsetUnset_string.phpt
+++ b/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"

diff --git a/ext/spl/tests/SplFixedArray_setsize_001.phpt b/ext/spl/tests/SplFixedArray_setsize_001.phpt
index d9c1469ee2734215352f17e85faf099b72fd4af9..b6fd2f1e4e13bb8cce701abc1e9e6aa44fba23fc 100644 (file)
--- a/ext/spl/tests/SplFixedArray_setsize_001.phpt
+++ b/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"

diff --git a/ext/sqlite3/tests/sqlite3_02_open.phpt b/ext/sqlite3/tests/sqlite3_02_open.phpt
index e6dce35dfe8414e57c8822de2c625a8128a0d3a6..dcc38d1407cd3a13728cc96ed34bffb9ce7bbbe1 100644 (file)
--- a/ext/sqlite3/tests/sqlite3_02_open.phpt
+++ b/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"

diff --git a/ext/sqlite3/tests/sqlite3_29_createfunction.phpt b/ext/sqlite3/tests/sqlite3_29_createfunction.phpt
index da48a4f943be0153c6e63a095e5a5d6d8f2e9ebe..a280229832e1bff15fb2d822657d903e37301968 100644 (file)
--- a/ext/sqlite3/tests/sqlite3_29_createfunction.phpt
+++ b/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)

diff --git a/ext/sqlite3/tests/sqlite3_31_open.phpt b/ext/sqlite3/tests/sqlite3_31_open.phpt
index 64db2a79248b9624a89a9585f3bb5c4c68fc4a7f..cfa346c4e5e10e8c12733df8b98957bf76e38b1e 100644 (file)
--- a/ext/sqlite3/tests/sqlite3_31_open.phpt
+++ b/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"

diff --git a/ext/standard/tests/array/array_push_empty.phpt b/ext/standard/tests/array/array_push_empty.phpt
index 7ca7e7fdd2549a94e70806465b059d8d9435b4a5..d302159a59781a8e18e22ad7d7a0a87ca85b6828 100644 (file)
--- a/ext/standard/tests/array/array_push_empty.phpt
+++ b/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) {

diff --git a/ext/standard/tests/array/array_unshift_empty.phpt b/ext/standard/tests/array/array_unshift_empty.phpt
index 546a24a98ac2d91ab180aedd5d216809f66e615e..fde05c5d751e14b048505b2c01a78e2ad417d977 100644 (file)
--- a/ext/standard/tests/array/array_unshift_empty.phpt
+++ b/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) {

diff --git a/ext/standard/tests/network/gethostbyname_error006.phpt b/ext/standard/tests/network/gethostbyname_error006.phpt
index 8a199f6286c4cde61c9f395852b0b6481cdde290..46247a113d0cbe5a865dcca181d2ec1f90c9af12 100644 (file)
--- a/ext/standard/tests/network/gethostbyname_error006.phpt
+++ b/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"

diff --git a/ext/standard/tests/network/inet_ipv6.phpt b/ext/standard/tests/network/inet_ipv6.phpt
index 488f267bf6cdfdeabb58771e1052606eff1c799e..3b9782f99481a98f98fd74719c07c17a57da02ba 100644 (file)
--- a/ext/standard/tests/network/inet_ipv6.phpt
+++ b/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"

diff --git a/ext/standard/tests/strings/bug46578.phpt b/ext/standard/tests/strings/bug46578.phpt
index a5eff1dbe25a3b8ac622e2c701c3dba717aaba7a..e07e92859745fbb618e98bc26d7a205e331e622d 100644 (file)
--- a/ext/standard/tests/strings/bug46578.phpt
+++ b/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"

diff --git a/ext/standard/tests/strings/bug47443.phpt b/ext/standard/tests/strings/bug47443.phpt
index 033aeb4d795bc3845aa4cc8130f7302bd672380d..e673e807ee8511841d7b4089b85f92a5d3e18aba 100644 (file)
--- a/ext/standard/tests/strings/bug47443.phpt
+++ b/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"

diff --git a/ext/standard/tests/strings/bug47481.phpt b/ext/standard/tests/strings/bug47481.phpt
index 6cad98ac91b322d588f22f4f328bfe7226d9ecae..a8f2e028a00a6c4a900e036d12f7c0e1a51753ed 100644 (file)
--- a/ext/standard/tests/strings/bug47481.phpt
+++ b/ext/standard/tests/strings/bug47481.phpt
@@ -21,7 +21,7 @@ var_dump($array);
 
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 -- Before sorting: --
 array(6) {
   [0]=>

diff --git a/tests/basic/rfc1867_missing_boundary_2.phpt b/tests/basic/rfc1867_missing_boundary_2.phpt
index bdfe977428529075ff96a89ff6e355223532ac1e..d3f93f838715cb249ed1796f923a947226e5737b 100644 (file)
--- a/tests/basic/rfc1867_missing_boundary_2.phpt
+++ b/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) {