diff options
31 files changed, 31 insertions, 31 deletions
diff --git a/Zend/tests/bug46665.phpt b/Zend/tests/bug46665.phpt index 29491dc26c..d8de8159a5 100644 --- 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 044719a382..f89987109d 100644 --- 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 6be0f227a4..5f7b72771f 100644 --- 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 c64f0e8bdc..b2d971c785 100644 --- 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 0cd642cc82..740583a78e 100644 --- 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 8edd1c0a5a..74dcf20099 100644 --- 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 54eb06411f..0dd5c1d428 100644 --- 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 13867ae25c..7ff85a5c4c 100644 --- 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 bb4d033dda..9857b4bd36 100644 --- 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 559907c380..6b7e36560e 100644 --- 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 6e13088512..57412401b6 100644 --- 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 4870550c4d..e70b0dfa76 100644 --- 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 f200ce297c..b62e1b2ec5 100644 --- 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 7d8aa7e621..51882c46ce 100644 --- 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 ac3cade344..f6dba97cfd 100644 --- 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 a511c63ad8..7c225b05e7 100644 --- 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 79f74cd5e7..03cbeeecd7 100644 --- 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 b669563db4..e5329e03fc 100644 --- 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 f422eef264..5c9431ec24 100644 --- 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 d9c1469ee2..b6fd2f1e4e 100644 --- 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 e6dce35dfe..dcc38d1407 100644 --- 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 da48a4f943..a280229832 100644 --- 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 64db2a7924..cfa346c4e5 100644 --- 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 7ca7e7fdd2..d302159a59 100644 --- 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 546a24a98a..fde05c5d75 100644 --- 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 8a199f6286..46247a113d 100644 --- 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 488f267bf6..3b9782f994 100644 --- 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 a5eff1dbe2..e07e928597 100644 --- 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 033aeb4d79..e673e807ee 100644 --- 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 6cad98ac91..a8f2e028a0 100644 --- 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 bdfe977428..d3f93f8387 100644 --- 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) { |