diff options
| author | Gabriel Caruso <carusogabriel34@gmail.com> | 2018-02-19 05:59:41 -0300 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-02-20 21:53:48 +0100 |
| commit | ded3d984c6133b1f508ed84e96df3316e207c99b (patch) | |
| tree | 175c208197d72966fbeb22c1df9dac0a1a33124f | |
| parent | a00286921e8963d284a7a5db0c1fecffa6cb6b54 (diff) | |
| download | php-git-ded3d984c6133b1f508ed84e96df3316e207c99b.tar.gz | |
Use EXPECT instead of EXPECTF when possible
EXPECTF logic in run-tests.php is considerable, so let's avoid it.
2790 files changed, 2744 insertions, 2744 deletions
diff --git a/Zend/tests/010.phpt b/Zend/tests/010.phpt index 45e1832914..8f5fa5a052 100644 --- a/Zend/tests/010.phpt +++ b/Zend/tests/010.phpt @@ -41,7 +41,7 @@ var_dump(get_parent_class(1)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) string(3) "foo" diff --git a/Zend/tests/ErrorException_getSeverity.phpt b/Zend/tests/ErrorException_getSeverity.phpt index 6ad8af109d..c3d171c2d2 100644 --- a/Zend/tests/ErrorException_getSeverity.phpt +++ b/Zend/tests/ErrorException_getSeverity.phpt @@ -862,7 +862,7 @@ try { } ?> ---EXPECTF-- +--EXPECT-- This exception severity is: 1bool(true) bool(true) bool(true) diff --git a/Zend/tests/abstract-static.phpt b/Zend/tests/abstract-static.phpt index bf7ed391ed..1742d4b408 100644 --- a/Zend/tests/abstract-static.phpt +++ b/Zend/tests/abstract-static.phpt @@ -8,6 +8,6 @@ abstract class TestClass } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== diff --git a/Zend/tests/access_modifiers_011.phpt b/Zend/tests/access_modifiers_011.phpt index 4ed154f6f6..b79f060f4f 100644 --- a/Zend/tests/access_modifiers_011.phpt +++ b/Zend/tests/access_modifiers_011.phpt @@ -32,7 +32,7 @@ echo $a->func1(),"\n"; echo $a->func2(),"\n"; ?> ---EXPECTF-- +--EXPECT-- var1 value var2 value in func1 diff --git a/Zend/tests/access_modifiers_012.phpt b/Zend/tests/access_modifiers_012.phpt index ac4d72ce1d..86f678634b 100644 --- a/Zend/tests/access_modifiers_012.phpt +++ b/Zend/tests/access_modifiers_012.phpt @@ -15,7 +15,7 @@ call_user_func(array($c, 'none')); call_user_func(array($c, 'prot')); call_user_func(array($c, 'priv')); ?> ---EXPECTF-- +--EXPECT-- In __call() for method none() In __call() for method prot() In __call() for method priv() diff --git a/Zend/tests/add_001.phpt b/Zend/tests/add_001.phpt index 8d12aea11d..315d1e86e2 100644 --- a/Zend/tests/add_001.phpt +++ b/Zend/tests/add_001.phpt @@ -29,7 +29,7 @@ var_dump($c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(3) { [0]=> int(1) diff --git a/Zend/tests/add_005.phpt b/Zend/tests/add_005.phpt index 7e9bc25d8f..24b08fbf8e 100644 --- a/Zend/tests/add_005.phpt +++ b/Zend/tests/add_005.phpt @@ -16,7 +16,7 @@ var_dump($c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- float(2834756759.1231) float(2834756759.1231) Done diff --git a/Zend/tests/and_001.phpt b/Zend/tests/and_001.phpt index 109b2ce995..cf879c0086 100644 --- a/Zend/tests/and_001.phpt +++ b/Zend/tests/and_001.phpt @@ -30,7 +30,7 @@ var_dump($s); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(3) "020" string(4) "pead" string(4) "pead" diff --git a/Zend/tests/anon/002.phpt b/Zend/tests/anon/002.phpt index 1cbaf81a9f..fdb8915267 100644 --- a/Zend/tests/anon/002.phpt +++ b/Zend/tests/anon/002.phpt @@ -15,7 +15,7 @@ $a = new class extends A implements B { }; var_dump($a instanceof A, $a instanceof B); ---EXPECTF-- +--EXPECT-- bool(true) bool(true) diff --git a/Zend/tests/anon/013.phpt b/Zend/tests/anon/013.phpt index 72ba3d61b7..b66be660d7 100644 --- a/Zend/tests/anon/013.phpt +++ b/Zend/tests/anon/013.phpt @@ -10,6 +10,6 @@ $foo = function() { $closure = Closure::bind($foo, $class, $class); var_dump($closure()); ?> ---EXPECTF-- +--EXPECT-- object(class@anonymous)#1 (0) { } diff --git a/Zend/tests/anon/014.phpt b/Zend/tests/anon/014.phpt index cacac47857..195a6054b2 100644 --- a/Zend/tests/anon/014.phpt +++ b/Zend/tests/anon/014.phpt @@ -12,5 +12,5 @@ $class = new class() { }; var_dump($class->run()); ?> ---EXPECTF-- +--EXPECT-- string(10) "Running..." diff --git a/Zend/tests/arg_unpack/by_ref.phpt b/Zend/tests/arg_unpack/by_ref.phpt index 7c8a86be48..66685a78d9 100644 --- a/Zend/tests/arg_unpack/by_ref.phpt +++ b/Zend/tests/arg_unpack/by_ref.phpt @@ -50,7 +50,7 @@ test2($a, $b, $c, $d, ...$array); var_dump($a, $b, $c, $d, $array); ?> ---EXPECTF-- +--EXPECT-- array(3) { [0]=> int(2) diff --git a/Zend/tests/arg_unpack/string_keys.phpt b/Zend/tests/arg_unpack/string_keys.phpt index e448a417f6..c2913db5b4 100644 --- a/Zend/tests/arg_unpack/string_keys.phpt +++ b/Zend/tests/arg_unpack/string_keys.phpt @@ -19,6 +19,6 @@ try { } ?> ---EXPECTF-- +--EXPECT-- string(36) "Cannot unpack array with string keys" string(42) "Cannot unpack Traversable with string keys" diff --git a/Zend/tests/argument_restriction_004.phpt b/Zend/tests/argument_restriction_004.phpt index 599b3e1604..379ea9b3e9 100644 --- a/Zend/tests/argument_restriction_004.phpt +++ b/Zend/tests/argument_restriction_004.phpt @@ -14,4 +14,4 @@ class Sub extends Base { } } ?> ---EXPECTF-- +--EXPECT-- diff --git a/Zend/tests/assert/expect_001.phpt b/Zend/tests/assert/expect_001.phpt index 667c55b4fc..73c685d2c8 100644 --- a/Zend/tests/assert/expect_001.phpt +++ b/Zend/tests/assert/expect_001.phpt @@ -8,5 +8,5 @@ assert.exception=1 assert(true); var_dump(true); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/Zend/tests/assert/expect_019.phpt b/Zend/tests/assert/expect_019.phpt index 38e9a39c33..97dd6ce86c 100644 --- a/Zend/tests/assert/expect_019.phpt +++ b/Zend/tests/assert/expect_019.phpt @@ -12,7 +12,7 @@ var_dump(\assert(true)); var_dump(assert(false)); var_dump(assert(true)); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/Zend/tests/assign_to_var_001.phpt b/Zend/tests/assign_to_var_001.phpt index d37ebbcbd8..17187abe64 100644 --- a/Zend/tests/assign_to_var_001.phpt +++ b/Zend/tests/assign_to_var_001.phpt @@ -12,7 +12,7 @@ var_dump($var1); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(2) int(2) Done diff --git a/Zend/tests/assign_to_var_002.phpt b/Zend/tests/assign_to_var_002.phpt index e682765e53..ddee1b92de 100644 --- a/Zend/tests/assign_to_var_002.phpt +++ b/Zend/tests/assign_to_var_002.phpt @@ -12,7 +12,7 @@ var_dump($var1); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(1) "g" string(1) "g" Done diff --git a/Zend/tests/assign_to_var_003.phpt b/Zend/tests/assign_to_var_003.phpt index 911ee0bb8e..1fcd41a7f1 100644 --- a/Zend/tests/assign_to_var_003.phpt +++ b/Zend/tests/assign_to_var_003.phpt @@ -12,7 +12,7 @@ var_dump($var1); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- NULL NULL Done diff --git a/Zend/tests/assign_to_var_004.phpt b/Zend/tests/assign_to_var_004.phpt index 787362acc4..a12c5aaa4a 100644 --- a/Zend/tests/assign_to_var_004.phpt +++ b/Zend/tests/assign_to_var_004.phpt @@ -15,7 +15,7 @@ var_dump($var2); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(5) "space" string(5) "space" string(5) "space" diff --git a/Zend/tests/bug22836.phpt b/Zend/tests/bug22836.phpt index 205fd1c696..8141f178c6 100644 --- a/Zend/tests/bug22836.phpt +++ b/Zend/tests/bug22836.phpt @@ -13,7 +13,7 @@ for ($i = 0; $i < 8; $i++) { $h =& f(); } ?> ---EXPECTF-- +--EXPECT-- string(3) "foo" 'foo' string(3) "foo" diff --git a/Zend/tests/bug26229.phpt b/Zend/tests/bug26229.phpt index 347eb55571..b3a237016f 100644 --- a/Zend/tests/bug26229.phpt +++ b/Zend/tests/bug26229.phpt @@ -24,6 +24,6 @@ catch(Exception $e) } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Objects returned by array_iterator::getIterator() must be traversable or implement interface Iterator ===DONE=== diff --git a/Zend/tests/bug26697.phpt b/Zend/tests/bug26697.phpt index 8dda17028a..fe269c0364 100644 --- a/Zend/tests/bug26697.phpt +++ b/Zend/tests/bug26697.phpt @@ -13,7 +13,7 @@ var_dump(class_exists('NotExistingClass')); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- {closure}(NotExistingClass) bool(false) {closure}(NotExistingClass), done diff --git a/Zend/tests/bug28442.phpt b/Zend/tests/bug28442.phpt index 1237357cca..36a6fc6ab9 100644 --- a/Zend/tests/bug28442.phpt +++ b/Zend/tests/bug28442.phpt @@ -45,7 +45,7 @@ var_dump(ClassC::$prop); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===INIT=== string(1) "A" string(1) "C" diff --git a/Zend/tests/bug29210.phpt b/Zend/tests/bug29210.phpt index 3bae8064b9..db3a67bee6 100644 --- a/Zend/tests/bug29210.phpt +++ b/Zend/tests/bug29210.phpt @@ -89,7 +89,7 @@ if (is_callable(array('test_class','test_func4'))) { $object = new foo(); $object->test(); ?> ---EXPECTF-- +--EXPECT-- test_func1 test_func2 test_func3 diff --git a/Zend/tests/bug29368.phpt b/Zend/tests/bug29368.phpt index c16399abbc..1987fa9b45 100644 --- a/Zend/tests/bug29368.phpt +++ b/Zend/tests/bug29368.phpt @@ -28,7 +28,7 @@ unset($bar); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Foo::__construct Caught exception! ===DONE=== diff --git a/Zend/tests/bug32290.phpt b/Zend/tests/bug32290.phpt index 89da67b195..e73bca12ac 100644 --- a/Zend/tests/bug32290.phpt +++ b/Zend/tests/bug32290.phpt @@ -96,7 +96,7 @@ var_dump($x->doSomethingStatic(1)); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- ===A=== TestB::doSomething(1) TestA::doSomething(2) diff --git a/Zend/tests/bug33771.phpt b/Zend/tests/bug33771.phpt index 72d953c9fa..f1b42ce7c8 100644 --- a/Zend/tests/bug33771.phpt +++ b/Zend/tests/bug33771.phpt @@ -33,7 +33,7 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(32767) int(32767) int(30719) diff --git a/Zend/tests/bug40815.phpt b/Zend/tests/bug40815.phpt index 6f7477a9eb..5ca5fd8368 100644 --- a/Zend/tests/bug40815.phpt +++ b/Zend/tests/bug40815.phpt @@ -14,5 +14,5 @@ set_exception_handler("ehandle::exh"); throw new Exception ("Whiii"); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- foo diff --git a/Zend/tests/bug41026.phpt b/Zend/tests/bug41026.phpt index 7caac215e0..f9ad1cec4e 100644 --- a/Zend/tests/bug41026.phpt +++ b/Zend/tests/bug41026.phpt @@ -20,7 +20,7 @@ try_class::main (); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done Warning: (Registered shutdown functions) Unable to call self::on_shutdown() - function does not exist in Unknown on line 0 diff --git a/Zend/tests/bug41075.phpt b/Zend/tests/bug41075.phpt index 0751cbd690..3ce2ad6514 100644 --- a/Zend/tests/bug41075.phpt +++ b/Zend/tests/bug41075.phpt @@ -26,6 +26,6 @@ try { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(40) "Creating default object from empty value" Done diff --git a/Zend/tests/bug43027.phpt b/Zend/tests/bug43027.phpt index adecf3e39a..2cf2d1d6a5 100644 --- a/Zend/tests/bug43027.phpt +++ b/Zend/tests/bug43027.phpt @@ -6,5 +6,5 @@ declare(ticks=1); namespace test; echo "ok\n"; ?> ---EXPECTF-- +--EXPECT-- ok diff --git a/Zend/tests/bug43200_2.phpt b/Zend/tests/bug43200_2.phpt index 3c8a98bddc..8926173aee 100644 --- a/Zend/tests/bug43200_2.phpt +++ b/Zend/tests/bug43200_2.phpt @@ -21,5 +21,5 @@ $o = new C(); $o->foo(); ?> ---EXPECTF-- +--EXPECT-- works diff --git a/Zend/tests/bug46196.phpt b/Zend/tests/bug46196.phpt index 7526d802ab..d4e62779e9 100644 --- a/Zend/tests/bug46196.phpt +++ b/Zend/tests/bug46196.phpt @@ -23,7 +23,7 @@ function myErrorHandler($errno, $errstr, $errfile, $errline) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing restore_error_handler() : error bug #46196 *** NULL bool(true) diff --git a/Zend/tests/bug46811.phpt b/Zend/tests/bug46811.phpt index fe41bffff6..06e10d78fa 100644 --- a/Zend/tests/bug46811.phpt +++ b/Zend/tests/bug46811.phpt @@ -7,7 +7,7 @@ arg_separator.output=& var_dump(ini_set("arg_separator.output", "")); var_dump(ini_get("arg_separator.output")); ?> ---EXPECTF-- +--EXPECT-- bool(false) string(1) "&" diff --git a/Zend/tests/bug47353.phpt b/Zend/tests/bug47353.phpt index 4196fc77f3..aafce9b944 100644 --- a/Zend/tests/bug47353.phpt +++ b/Zend/tests/bug47353.phpt @@ -22,5 +22,5 @@ $a = new A(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/Zend/tests/bug47981.phpt b/Zend/tests/bug47981.phpt index c0fd69abf9..fba320bb13 100644 --- a/Zend/tests/bug47981.phpt +++ b/Zend/tests/bug47981.phpt @@ -13,5 +13,5 @@ interface a{} class b implements a { function f($a=1) {}} class c extends b {function f() {}} ?> ---EXPECTF-- +--EXPECT-- string(60) "Declaration of c::f() should be compatible with b::f($a = 1)" diff --git a/Zend/tests/bug48215.phpt b/Zend/tests/bug48215.phpt index 2e156ad7f3..4582057d98 100644 --- a/Zend/tests/bug48215.phpt +++ b/Zend/tests/bug48215.phpt @@ -28,7 +28,7 @@ $b = new B(); $b->A(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- B::__construct A::__construct B::A diff --git a/Zend/tests/bug48770.phpt b/Zend/tests/bug48770.phpt index 067e892e66..a69838aa6d 100644 --- a/Zend/tests/bug48770.phpt +++ b/Zend/tests/bug48770.phpt @@ -49,5 +49,5 @@ $c = new C; $c->func('This should work!'); ?> ---EXPECTF-- +--EXPECT-- string(26) "A::func: This should work!" diff --git a/Zend/tests/bug53632.phpt b/Zend/tests/bug53632.phpt index 9a6dade9e1..74dfb5c5a3 100644 --- a/Zend/tests/bug53632.phpt +++ b/Zend/tests/bug53632.phpt @@ -6,5 +6,5 @@ $d = 2.2250738585072011e-308; echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/Zend/tests/bug53748.phpt b/Zend/tests/bug53748.phpt index 2f171fe455..77944ca198 100644 --- a/Zend/tests/bug53748.phpt +++ b/Zend/tests/bug53748.phpt @@ -30,7 +30,7 @@ $o= myHelloWorld::getInstance(array(1=>2)); $o= myHelloWorld::getInstance(array(1=>2)); ?> ---EXPECTF-- +--EXPECT-- int(1) int(2) array(1) { diff --git a/Zend/tests/bug54624.phpt b/Zend/tests/bug54624.phpt index 1d0c1ce87c..66239120a4 100644 --- a/Zend/tests/bug54624.phpt +++ b/Zend/tests/bug54624.phpt @@ -22,5 +22,5 @@ eval(' echo "DONE\n"; ?> ---EXPECTF-- +--EXPECT-- DONE diff --git a/Zend/tests/bug55156.phpt b/Zend/tests/bug55156.phpt index 137a43fcaa..fcd602cacf 100644 --- a/Zend/tests/bug55156.phpt +++ b/Zend/tests/bug55156.phpt @@ -26,7 +26,7 @@ namespace foo { } ?> ---EXPECTF-- +--EXPECT-- bool(false) string(12) "/** test1 */" string(12) "/** test2 */" diff --git a/Zend/tests/bug55445.phpt b/Zend/tests/bug55445.phpt index 0f36ac5d88..2ccba5ff08 100644 --- a/Zend/tests/bug55445.phpt +++ b/Zend/tests/bug55445.phpt @@ -4,5 +4,5 @@ Bug #55445 (Lexer error with short open tags) short_open_tag=0 --FILE-- <?php $u = "chris"; ?><p>Welcome <?= $u ?></p> ---EXPECTF-- +--EXPECT-- <p>Welcome chris</p> diff --git a/Zend/tests/bug60536_004.phpt b/Zend/tests/bug60536_004.phpt index a8f4d8b9d4..a78cecc30f 100644 --- a/Zend/tests/bug60536_004.phpt +++ b/Zend/tests/bug60536_004.phpt @@ -28,7 +28,7 @@ class Notice extends Base { } echo "POST-CLASS-GUARD2\n"; ?> ---EXPECTF-- +--EXPECT-- PRE-CLASS-GUARD POST-CLASS-GUARD POST-CLASS-GUARD2 diff --git a/Zend/tests/bug60536_005.phpt b/Zend/tests/bug60536_005.phpt index 1ba22a9752..c007e0ae18 100644 --- a/Zend/tests/bug60536_005.phpt +++ b/Zend/tests/bug60536_005.phpt @@ -27,7 +27,7 @@ class Notice extends Base { } echo "POST-CLASS-GUARD2\n"; ?> ---EXPECTF-- +--EXPECT-- PRE-CLASS-GUARD POST-CLASS-GUARD POST-CLASS-GUARD2 diff --git a/Zend/tests/bug61761.phpt b/Zend/tests/bug61761.phpt index 24c69ae792..0409d67950 100644 --- a/Zend/tests/bug61761.phpt +++ b/Zend/tests/bug61761.phpt @@ -15,5 +15,5 @@ class B extends A ?> ==DONE== ---EXPECTF-- +--EXPECT-- ==DONE== diff --git a/Zend/tests/bug62892.phpt b/Zend/tests/bug62892.phpt index e6b0e60ff3..db25c83466 100644 --- a/Zend/tests/bug62892.phpt +++ b/Zend/tests/bug62892.phpt @@ -16,6 +16,6 @@ $class = new \ReflectionClass('myClass'); var_dump($class->getTraitAliases()); ?> ---EXPECTF-- +--EXPECT-- array(0) { } diff --git a/Zend/tests/bug63055.phpt b/Zend/tests/bug63055.phpt index 5efff9e5bd..c5b2c80871 100644 --- a/Zend/tests/bug63055.phpt +++ b/Zend/tests/bug63055.phpt @@ -21,5 +21,5 @@ $matches[2] = $dummy; str_replace("foo", "bar", "foobar", $matches); echo "okey"; ?> ---EXPECTF-- +--EXPECT-- okey diff --git a/Zend/tests/bug63982.phpt b/Zend/tests/bug63982.phpt index 31294f33e8..4318a5091c 100644 --- a/Zend/tests/bug63982.phpt +++ b/Zend/tests/bug63982.phpt @@ -10,6 +10,6 @@ $test = new Test(); var_dump(isset($test->protectedProperty)); var_dump(isset($test->protectedProperty->foo)); ---EXPECTF-- +--EXPECT-- bool(false) bool(false) diff --git a/Zend/tests/bug64354.phpt b/Zend/tests/bug64354.phpt index 03a4b80b4b..737b2fd46a 100644 --- a/Zend/tests/bug64354.phpt +++ b/Zend/tests/bug64354.phpt @@ -20,5 +20,5 @@ try { var_dump($e->getMessage()); } ?> ---EXPECTF-- +--EXPECT-- string(9) "serialize" diff --git a/Zend/tests/bug64578.phpt b/Zend/tests/bug64578.phpt index 6cb5392cef..b4018e96a2 100644 --- a/Zend/tests/bug64578.phpt +++ b/Zend/tests/bug64578.phpt @@ -9,6 +9,6 @@ function x($s) { $s['a'] = 1; }; $y = '1'; x($y); print_r($y); ---EXPECTF-- +--EXPECT-- string(25) "Illegal string offset 'a'" 1 diff --git a/Zend/tests/bug65419.phpt b/Zend/tests/bug65419.phpt index 677b2750f2..c10a518376 100644 --- a/Zend/tests/bug65419.phpt +++ b/Zend/tests/bug65419.phpt @@ -18,6 +18,6 @@ class ghi ghi::def(); ?> ---EXPECTF-- +--EXPECT-- ghi ghi
\ No newline at end of file diff --git a/Zend/tests/bug66015.phpt b/Zend/tests/bug66015.phpt index 99003e6045..5e0815240d 100644 --- a/Zend/tests/bug66015.phpt +++ b/Zend/tests/bug66015.phpt @@ -25,7 +25,7 @@ $test = new Test(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- array ( 1 => 'first', 2 => 'second', diff --git a/Zend/tests/bug66218.phpt b/Zend/tests/bug66218.phpt index af7a5ab1d0..d800605ac8 100644 --- a/Zend/tests/bug66218.phpt +++ b/Zend/tests/bug66218.phpt @@ -16,6 +16,6 @@ foreach ($fcts as $fct) { } ?> Done ---EXPECTF-- +--EXPECT-- dl Ok Done diff --git a/Zend/tests/bug67368.phpt b/Zend/tests/bug67368.phpt index c92e994b94..b3aff293a0 100644 --- a/Zend/tests/bug67368.phpt +++ b/Zend/tests/bug67368.phpt @@ -8,5 +8,5 @@ class FooBar { const bar = ["bar" => 3]["bar"]; } echo "okey"; ---EXPECTF-- +--EXPECT-- okey diff --git a/Zend/tests/bug69221.phpt b/Zend/tests/bug69221.phpt index 9eb5afcad8..72f242f995 100644 --- a/Zend/tests/bug69221.phpt +++ b/Zend/tests/bug69221.phpt @@ -20,5 +20,5 @@ unset($gen1); foreach ($gen2 as $v) { var_dump($v); } ?> ---EXPECTF-- +--EXPECT-- int(1) diff --git a/Zend/tests/bug69955.phpt b/Zend/tests/bug69955.phpt index 33c36850c0..ece96a88ad 100644 --- a/Zend/tests/bug69955.phpt +++ b/Zend/tests/bug69955.phpt @@ -25,7 +25,7 @@ class C10 implements ArrayAccess $c10 = new C10; var_dump($c10[] += 5); ---EXPECTF-- +--EXPECT-- Inside C10::offsetGet NULL diff --git a/Zend/tests/bug70089.phpt b/Zend/tests/bug70089.phpt index e1884d9dac..1bfc38ae09 100644 --- a/Zend/tests/bug70089.phpt +++ b/Zend/tests/bug70089.phpt @@ -30,7 +30,7 @@ try { var_dump($e->getMessage()); } ?> ---EXPECTF-- +--EXPECT-- string(36) "Cannot use string offset as an array" string(27) "Cannot unset string offsets" string(41) "Only variables can be passed by reference" diff --git a/Zend/tests/bug70987.phpt b/Zend/tests/bug70987.phpt index d31a1d2c6e..3c8dcc79c8 100644 --- a/Zend/tests/bug70987.phpt +++ b/Zend/tests/bug70987.phpt @@ -11,5 +11,5 @@ $bar = function () { var_dump($bar->call(new foo)); ?> ---EXPECTF-- +--EXPECT-- string(3) "foo" diff --git a/Zend/tests/bug71756.phpt b/Zend/tests/bug71756.phpt index 42066f3c2e..1f43c082f0 100644 --- a/Zend/tests/bug71756.phpt +++ b/Zend/tests/bug71756.phpt @@ -20,7 +20,7 @@ function c ($option) { } a(array('bla' => 'false')); ?> ---EXPECTF-- +--EXPECT-- array(1) { ["bla"]=> string(7) "changed" diff --git a/Zend/tests/bug72594.phpt b/Zend/tests/bug72594.phpt index 3e88b2e6d6..c67e68e4ac 100644 --- a/Zend/tests/bug72594.phpt +++ b/Zend/tests/bug72594.phpt @@ -22,7 +22,7 @@ var_dump(get_object_vars($oldFoo)); $newFoo->bing($oldFoo); ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> string(4) "bing" diff --git a/Zend/tests/bug73753.phpt b/Zend/tests/bug73753.phpt index 9a77f62f56..567bb9e01f 100644 --- a/Zend/tests/bug73753.phpt +++ b/Zend/tests/bug73753.phpt @@ -25,5 +25,5 @@ function traverse($a) { $arr = array(1 => 'foo', 'b' => 'bar', 'baz'); var_dump(traverse($arr)); ?> ---EXPECTF-- +--EXPECT-- string(3) "baz" diff --git a/Zend/tests/bug74947.phpt b/Zend/tests/bug74947.phpt index e66d292971..1dd91efb9b 100644 --- a/Zend/tests/bug74947.phpt +++ b/Zend/tests/bug74947.phpt @@ -8,5 +8,5 @@ echo 200000000000000000000000000000000000000000000000000000000000000000000000000 echo -200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000; ?> ---EXPECTF-- +--EXPECT-- INF-INF diff --git a/Zend/tests/call_static_002.phpt b/Zend/tests/call_static_002.phpt index 9604bf5b9f..ac30636ded 100644 --- a/Zend/tests/call_static_002.phpt +++ b/Zend/tests/call_static_002.phpt @@ -19,7 +19,7 @@ call_user_func(array($a, 'aAa')); call_user_func(array('Foo', 'aAa')); ?> ---EXPECTF-- +--EXPECT-- nonstatic string(3) "aAa" static diff --git a/Zend/tests/cast_to_bool.phpt b/Zend/tests/cast_to_bool.phpt index 75ab09d1b5..66cec7c3c3 100644 --- a/Zend/tests/cast_to_bool.phpt +++ b/Zend/tests/cast_to_bool.phpt @@ -36,7 +36,7 @@ foreach ($vars as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(false) diff --git a/Zend/tests/class_alias_017.phpt b/Zend/tests/class_alias_017.phpt index f4d3626e45..555e776227 100644 --- a/Zend/tests/class_alias_017.phpt +++ b/Zend/tests/class_alias_017.phpt @@ -26,7 +26,7 @@ baz::test(); bar::test(); ?> ---EXPECTF-- +--EXPECT-- foo baz foo diff --git a/Zend/tests/class_constants_003.phpt b/Zend/tests/class_constants_003.phpt index c2782ff1c9..1c3bfb737d 100644 --- a/Zend/tests/class_constants_003.phpt +++ b/Zend/tests/class_constants_003.phpt @@ -27,7 +27,7 @@ unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(1) int(5) Done diff --git a/Zend/tests/class_name_as_scalar.phpt b/Zend/tests/class_name_as_scalar.phpt index 38e55b16d5..72a460abaa 100644 --- a/Zend/tests/class_name_as_scalar.phpt +++ b/Zend/tests/class_name_as_scalar.phpt @@ -51,7 +51,7 @@ namespace { } ?> ---EXPECTF-- +--EXPECT-- In NS string(11) "Foo\Bar\Moo" Top diff --git a/Zend/tests/class_properties_dynamic.phpt b/Zend/tests/class_properties_dynamic.phpt index 8a1fc6f029..456bcf4a5b 100644 --- a/Zend/tests/class_properties_dynamic.phpt +++ b/Zend/tests/class_properties_dynamic.phpt @@ -9,5 +9,5 @@ class Foo { } echo (new Foo)->bar; ?> ---EXPECTF-- +--EXPECT-- 3 diff --git a/Zend/tests/closure_024.phpt b/Zend/tests/closure_024.phpt index 74083f73bc..68fd29c687 100644 --- a/Zend/tests/closure_024.phpt +++ b/Zend/tests/closure_024.phpt @@ -18,7 +18,7 @@ echo $cc(10)."\n"; echo "Done.\n"; ?> ---EXPECTF-- +--EXPECT-- 11 11 12 diff --git a/Zend/tests/closure_036.phpt b/Zend/tests/closure_036.phpt index 77d7ce6906..ca87efec4b 100644 --- a/Zend/tests/closure_036.phpt +++ b/Zend/tests/closure_036.phpt @@ -27,7 +27,7 @@ var_dump($cb()); var_dump($cb2()); ?> ---EXPECTF-- +--EXPECT-- int(1) int(11) int(12)
\ No newline at end of file diff --git a/Zend/tests/closure_037.phpt b/Zend/tests/closure_037.phpt index 4b24c85d16..cabd99bfac 100644 --- a/Zend/tests/closure_037.phpt +++ b/Zend/tests/closure_037.phpt @@ -37,7 +37,7 @@ $closure = $b->getClosure(); $closure(); ?> Done. ---EXPECTF-- +--EXPECT-- 1 42 42 diff --git a/Zend/tests/closure_044.phpt b/Zend/tests/closure_044.phpt index 8fdef135dc..b8da50049a 100644 --- a/Zend/tests/closure_044.phpt +++ b/Zend/tests/closure_044.phpt @@ -39,7 +39,7 @@ $d = $nonstaticScoped->bindTo(new A, 'A'); $d(); echo "\n"; echo "Done.\n"; ---EXPECTF-- +--EXPECT-- Before binding bool(false) bool(false) diff --git a/Zend/tests/closure_045.phpt b/Zend/tests/closure_045.phpt index c6276be47b..c309e3c533 100644 --- a/Zend/tests/closure_045.phpt +++ b/Zend/tests/closure_045.phpt @@ -14,5 +14,5 @@ $a->bindTo(new A); echo "Done.\n"; ---EXPECTF-- +--EXPECT-- Done. diff --git a/Zend/tests/closure_046.phpt b/Zend/tests/closure_046.phpt index 2985e6a8db..4e2542b7c0 100644 --- a/Zend/tests/closure_046.phpt +++ b/Zend/tests/closure_046.phpt @@ -39,7 +39,7 @@ $d = $nonstaticScoped->bindTo(new B, "static"); $d(); echo "\n"; echo "Done.\n"; ---EXPECTF-- +--EXPECT-- Before binding bool(false) bool(false) diff --git a/Zend/tests/closures/closure_from_callable_reflection.phpt b/Zend/tests/closures/closure_from_callable_reflection.phpt index af40193fba..111115a44a 100644 --- a/Zend/tests/closures/closure_from_callable_reflection.phpt +++ b/Zend/tests/closures/closure_from_callable_reflection.phpt @@ -35,7 +35,7 @@ foreach ($callables as $callable) { } ?> ---EXPECTF-- +--EXPECT-- Bar int Bar diff --git a/Zend/tests/compare_002.phpt b/Zend/tests/compare_002.phpt index 5e5009c323..33c883f5f4 100644 --- a/Zend/tests/compare_002.phpt +++ b/Zend/tests/compare_002.phpt @@ -48,7 +48,7 @@ foreach($a as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} === array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} !== string(0) "" array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} !== int(1) diff --git a/Zend/tests/compound_assign_with_numeric_strings.phpt b/Zend/tests/compound_assign_with_numeric_strings.phpt index 72c80b0afc..e5cdb344ef 100644 --- a/Zend/tests/compound_assign_with_numeric_strings.phpt +++ b/Zend/tests/compound_assign_with_numeric_strings.phpt @@ -38,7 +38,7 @@ try{ $n = "-1"; $n %= $n; var_dump($n); ---EXPECTF-- +--EXPECT-- int(0) Exception: Bit shift by negative number diff --git a/Zend/tests/declare_005.phpt b/Zend/tests/declare_005.phpt index d1c716cebc..654f8252e0 100644 --- a/Zend/tests/declare_005.phpt +++ b/Zend/tests/declare_005.phpt @@ -12,6 +12,6 @@ foo(); } ?> ---EXPECTF-- +--EXPECT-- tick tick diff --git a/Zend/tests/div_001.phpt b/Zend/tests/div_001.phpt index 5fa264a11e..4f0b34b25f 100644 --- a/Zend/tests/div_001.phpt +++ b/Zend/tests/div_001.phpt @@ -25,7 +25,7 @@ var_dump($c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- float(394758.39454545) float(394758.39454545) float(394758.39454545) diff --git a/Zend/tests/double_to_string_64bit.phpt b/Zend/tests/double_to_string_64bit.phpt index 5ecb1a6067..d228b707d4 100644 --- a/Zend/tests/double_to_string_64bit.phpt +++ b/Zend/tests/double_to_string_64bit.phpt @@ -35,7 +35,7 @@ foreach ($doubles as $d) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(7) "2.9E+37" string(18) "290000000000000000" string(15) "290000000000000" diff --git a/Zend/tests/empty_str_offset.phpt b/Zend/tests/empty_str_offset.phpt index 49e175dd21..721844085a 100644 --- a/Zend/tests/empty_str_offset.phpt +++ b/Zend/tests/empty_str_offset.phpt @@ -54,7 +54,7 @@ var_dump(empty($str[$f])); print "done\n"; ?> ---EXPECTF-- +--EXPECT-- - empty --- bool(false) bool(true) diff --git a/Zend/tests/errmsg_024.phpt b/Zend/tests/errmsg_024.phpt index 011e6fdea9..25c8de3e58 100644 --- a/Zend/tests/errmsg_024.phpt +++ b/Zend/tests/errmsg_024.phpt @@ -13,5 +13,5 @@ class test extends test1 { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/Zend/tests/errmsg_040.phpt b/Zend/tests/errmsg_040.phpt index d5d2bf38d3..088264176b 100644 --- a/Zend/tests/errmsg_040.phpt +++ b/Zend/tests/errmsg_040.phpt @@ -9,7 +9,7 @@ class test { var_dump(test::TEST); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(3) { [0]=> int(1) diff --git a/Zend/tests/error_reporting06.phpt b/Zend/tests/error_reporting06.phpt index 175ea37e80..e81e0a2653 100644 --- a/Zend/tests/error_reporting06.phpt +++ b/Zend/tests/error_reporting06.phpt @@ -25,6 +25,6 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(32767) Done diff --git a/Zend/tests/error_reporting07.phpt b/Zend/tests/error_reporting07.phpt index 09b7690d3c..affc496716 100644 --- a/Zend/tests/error_reporting07.phpt +++ b/Zend/tests/error_reporting07.phpt @@ -25,6 +25,6 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(32767) Done diff --git a/Zend/tests/error_reporting10.phpt b/Zend/tests/error_reporting10.phpt index 12b1db57ba..eb3711af11 100644 --- a/Zend/tests/error_reporting10.phpt +++ b/Zend/tests/error_reporting10.phpt @@ -29,7 +29,7 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(32767) int(32759) Done diff --git a/Zend/tests/exception_handler_001.phpt b/Zend/tests/exception_handler_001.phpt index 8f6572ef01..34f6eb5966 100644 --- a/Zend/tests/exception_handler_001.phpt +++ b/Zend/tests/exception_handler_001.phpt @@ -16,5 +16,5 @@ throw new test(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(12) "test thrown!" diff --git a/Zend/tests/exception_handler_003.phpt b/Zend/tests/exception_handler_003.phpt index 137a6cabb4..964b746d0e 100644 --- a/Zend/tests/exception_handler_003.phpt +++ b/Zend/tests/exception_handler_003.phpt @@ -20,5 +20,5 @@ throw new Exception(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(17) "Exception thrown!" diff --git a/Zend/tests/exception_handler_005.phpt b/Zend/tests/exception_handler_005.phpt index cc99bc6230..6b228e522b 100644 --- a/Zend/tests/exception_handler_005.phpt +++ b/Zend/tests/exception_handler_005.phpt @@ -19,5 +19,5 @@ throw new excEption(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(25) "foo1(): Exception thrown!" diff --git a/Zend/tests/exception_handler_006.phpt b/Zend/tests/exception_handler_006.phpt index 05a5d927fa..6f9f11870e 100644 --- a/Zend/tests/exception_handler_006.phpt +++ b/Zend/tests/exception_handler_006.phpt @@ -21,5 +21,5 @@ throw new excEption(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(24) "foo(): Exception thrown!" diff --git a/Zend/tests/foreach_list_002.phpt b/Zend/tests/foreach_list_002.phpt index 1a7be521b2..0ec1aac2c1 100644 --- a/Zend/tests/foreach_list_002.phpt +++ b/Zend/tests/foreach_list_002.phpt @@ -14,7 +14,7 @@ foreach($array as list(, $a)) { } ?> ---EXPECTF-- +--EXPECT-- int(1) int(3) string(1) "b" diff --git a/Zend/tests/foreach_reference.phpt b/Zend/tests/foreach_reference.phpt index 6b273208aa..58c05e5553 100644 --- a/Zend/tests/foreach_reference.phpt +++ b/Zend/tests/foreach_reference.phpt @@ -16,7 +16,7 @@ var_dump($a); var_dump(array_reverse($array)); ?> ---EXPECTF-- +--EXPECT-- array(4) { [0]=> string(1) "a" diff --git a/Zend/tests/foreach_unset_globals.phpt b/Zend/tests/foreach_unset_globals.phpt index 188c70ab18..7ed0460eee 100644 --- a/Zend/tests/foreach_unset_globals.phpt +++ b/Zend/tests/foreach_unset_globals.phpt @@ -11,7 +11,7 @@ foreach ($arr as $key => $val) { var_dump($arr); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(2) { ["a"]=> int(1) diff --git a/Zend/tests/gc_031.phpt b/Zend/tests/gc_031.phpt index 58c4b15e3a..a79d4311b5 100644 --- a/Zend/tests/gc_031.phpt +++ b/Zend/tests/gc_031.phpt @@ -7,5 +7,5 @@ zend.enable_gc=0 gc_collect_cycles(); echo "DONE\n"; ?> ---EXPECTF-- +--EXPECT-- DONE diff --git a/Zend/tests/generators/bug74157.phpt b/Zend/tests/generators/bug74157.phpt index d5f0233aec..e5b9111f78 100644 --- a/Zend/tests/generators/bug74157.phpt +++ b/Zend/tests/generators/bug74157.phpt @@ -15,7 +15,7 @@ foreach (a(range(1, 3)) as $a) { var_dump($a); } ?> ---EXPECTF-- +--EXPECT-- int(1) int(2) int(3) diff --git a/Zend/tests/generators/finally/return_return.phpt b/Zend/tests/generators/finally/return_return.phpt index 02e2739de7..194fc93de7 100644 --- a/Zend/tests/generators/finally/return_return.phpt +++ b/Zend/tests/generators/finally/return_return.phpt @@ -27,7 +27,7 @@ $gen = gen(); $gen->rewind(); // force run ?> ---EXPECTF-- +--EXPECT-- before return before return in inner finally outer finally run diff --git a/Zend/tests/generators/get_return.phpt b/Zend/tests/generators/get_return.phpt index 0d3e32af14..d1815ff183 100644 --- a/Zend/tests/generators/get_return.phpt +++ b/Zend/tests/generators/get_return.phpt @@ -68,7 +68,7 @@ $gen = gen6(); var_dump($gen->getReturn()); ?> ---EXPECTF-- +--EXPECT-- int(42) int(24) int(42) diff --git a/Zend/tests/get_class_methods_001.phpt b/Zend/tests/get_class_methods_001.phpt index a2a3d0ca20..78745219ba 100644 --- a/Zend/tests/get_class_methods_001.phpt +++ b/Zend/tests/get_class_methods_001.phpt @@ -26,7 +26,7 @@ var_dump(get_class_methods('Y')); Y::test(); ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> string(1) "a" diff --git a/Zend/tests/get_class_methods_002.phpt b/Zend/tests/get_class_methods_002.phpt index 62f326c053..808a07046f 100644 --- a/Zend/tests/get_class_methods_002.phpt +++ b/Zend/tests/get_class_methods_002.phpt @@ -23,7 +23,7 @@ class B implements A { new B; ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(1) "a" diff --git a/Zend/tests/get_defined_vars.phpt b/Zend/tests/get_defined_vars.phpt index 199afd0b50..15e33b8a94 100644 --- a/Zend/tests/get_defined_vars.phpt +++ b/Zend/tests/get_defined_vars.phpt @@ -64,7 +64,7 @@ func1(); echo "\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Displaying various variables through the array captured by the get_defined_vars function call *** int(1) float(22.33) diff --git a/Zend/tests/grammar/regression_001.phpt b/Zend/tests/grammar/regression_001.phpt index 73d5eacdf6..727e11cc45 100644 --- a/Zend/tests/grammar/regression_001.phpt +++ b/Zend/tests/grammar/regression_001.phpt @@ -23,7 +23,7 @@ Foo:: echo "\nDone\n"; ---EXPECTF-- +--EXPECT-- Foo::function Foo::function diff --git a/Zend/tests/grammar/regression_002.phpt b/Zend/tests/grammar/regression_002.phpt index dd307c99d8..06bce25d70 100644 --- a/Zend/tests/grammar/regression_002.phpt +++ b/Zend/tests/grammar/regression_002.phpt @@ -15,7 +15,7 @@ var_dump(Foo:: CLASS); ---EXPECTF-- +--EXPECT-- string(3) "Foo" string(3) "Foo" string(3) "Foo" diff --git a/Zend/tests/grammar/regression_006.phpt b/Zend/tests/grammar/regression_006.phpt index 6aae0ba24b..036ffa7445 100644 --- a/Zend/tests/grammar/regression_006.phpt +++ b/Zend/tests/grammar/regression_006.phpt @@ -20,7 +20,7 @@ echo Obj:: USE, PHP_EOL; echo "\nDone\n"; ---EXPECTF-- +--EXPECT-- declare return function diff --git a/Zend/tests/grammar/regression_007.phpt b/Zend/tests/grammar/regression_007.phpt index 92b22531a4..d75670c7ec 100644 --- a/Zend/tests/grammar/regression_007.phpt +++ b/Zend/tests/grammar/regression_007.phpt @@ -29,7 +29,7 @@ var_dump(Foo::use); echo "\nDone\n"; ---EXPECTF-- +--EXPECT-- Foo::new Foo::new Foo::new diff --git a/Zend/tests/grammar/regression_008.phpt b/Zend/tests/grammar/regression_008.phpt index 7741ed036c..e4259649eb 100644 --- a/Zend/tests/grammar/regression_008.phpt +++ b/Zend/tests/grammar/regression_008.phpt @@ -14,7 +14,7 @@ echo "$friday->require ($friday->require) {$friday->require}", PHP_EOL; echo "\nDone\n"; ---EXPECTF-- +--EXPECT-- fun (fun) fun diff --git a/Zend/tests/grammar/regression_009.phpt b/Zend/tests/grammar/regression_009.phpt index 589d90316b..6b14c33081 100644 --- a/Zend/tests/grammar/regression_009.phpt +++ b/Zend/tests/grammar/regression_009.phpt @@ -13,6 +13,6 @@ class Foo echo PHP_EOL, "Done", PHP_EOL; ---EXPECTF-- +--EXPECT-- Done diff --git a/Zend/tests/grammar/regression_010.phpt b/Zend/tests/grammar/regression_010.phpt index 5dc90f288a..90b864f79b 100644 --- a/Zend/tests/grammar/regression_010.phpt +++ b/Zend/tests/grammar/regression_010.phpt @@ -9,6 +9,6 @@ class B implements\A {} echo "Done", PHP_EOL; ---EXPECTF-- +--EXPECT-- Done diff --git a/Zend/tests/grammar/regression_013.phpt b/Zend/tests/grammar/regression_013.phpt index 1c60ffc273..0379dd26e3 100644 --- a/Zend/tests/grammar/regression_013.phpt +++ b/Zend/tests/grammar/regression_013.phpt @@ -8,6 +8,6 @@ class A { function foo() { "{${$a}}"; } function list() {} } echo "Done", PHP_EOL; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/Zend/tests/grammar/semi_reserved_001.phpt b/Zend/tests/grammar/semi_reserved_001.phpt index 48937de39e..3abb3a2507 100644 --- a/Zend/tests/grammar/semi_reserved_001.phpt +++ b/Zend/tests/grammar/semi_reserved_001.phpt @@ -162,7 +162,7 @@ $obj->__NAMESPACE__(); echo "\nDone\n"; ---EXPECTF-- +--EXPECT-- Obj::empty Obj::callable Obj::class diff --git a/Zend/tests/grammar/semi_reserved_002.phpt b/Zend/tests/grammar/semi_reserved_002.phpt index a082f9ddbb..6a7dc79b74 100644 --- a/Zend/tests/grammar/semi_reserved_002.phpt +++ b/Zend/tests/grammar/semi_reserved_002.phpt @@ -160,7 +160,7 @@ Obj::__NAMESPACE__(); echo "\nDone\n"; ---EXPECTF-- +--EXPECT-- Obj::empty Obj::callable Obj::class diff --git a/Zend/tests/grammar/semi_reserved_003.phpt b/Zend/tests/grammar/semi_reserved_003.phpt index d63824017e..8e459a636f 100644 --- a/Zend/tests/grammar/semi_reserved_003.phpt +++ b/Zend/tests/grammar/semi_reserved_003.phpt @@ -165,7 +165,7 @@ echo $obj->__halt_compiler, PHP_EOL; echo "\nDone\n"; ?> ---EXPECTF-- +--EXPECT-- empty callable class diff --git a/Zend/tests/grammar/semi_reserved_004.phpt b/Zend/tests/grammar/semi_reserved_004.phpt index 38963870a0..b3889b0bae 100644 --- a/Zend/tests/grammar/semi_reserved_004.phpt +++ b/Zend/tests/grammar/semi_reserved_004.phpt @@ -162,7 +162,7 @@ echo Obj::$__halt_compiler, PHP_EOL; echo "\nDone\n"; ---EXPECTF-- +--EXPECT-- empty callable class diff --git a/Zend/tests/grammar/semi_reserved_005.phpt b/Zend/tests/grammar/semi_reserved_005.phpt index 45d20ad0d8..5330828633 100644 --- a/Zend/tests/grammar/semi_reserved_005.phpt +++ b/Zend/tests/grammar/semi_reserved_005.phpt @@ -158,7 +158,7 @@ echo Obj::__NAMESPACE__, PHP_EOL; echo "\nDone\n"; ---EXPECTF-- +--EXPECT-- empty callable trait diff --git a/Zend/tests/grammar/semi_reserved_006.phpt b/Zend/tests/grammar/semi_reserved_006.phpt index 334d09ac36..8205435a5f 100644 --- a/Zend/tests/grammar/semi_reserved_006.phpt +++ b/Zend/tests/grammar/semi_reserved_006.phpt @@ -59,7 +59,7 @@ Foo::farewell(); echo "\nDone\n"; ---EXPECTF-- +--EXPECT-- TraitA::catch TraitA::list TraitB::throw diff --git a/Zend/tests/grammar/semi_reserved_007.phpt b/Zend/tests/grammar/semi_reserved_007.phpt index 5105629cbe..b1d6daeb9d 100644 --- a/Zend/tests/grammar/semi_reserved_007.phpt +++ b/Zend/tests/grammar/semi_reserved_007.phpt @@ -26,7 +26,7 @@ new Bar; echo "\nDone\n"; ---EXPECTF-- +--EXPECT-- From Foo::__construct: self parent diff --git a/Zend/tests/grammar/semi_reserved_008.phpt b/Zend/tests/grammar/semi_reserved_008.phpt index 43218b1b05..a267291886 100644 --- a/Zend/tests/grammar/semi_reserved_008.phpt +++ b/Zend/tests/grammar/semi_reserved_008.phpt @@ -62,7 +62,7 @@ attempt(); echo PHP_EOL, "Done", PHP_EOL; ---EXPECTF-- +--EXPECT-- TraitB::try Done diff --git a/Zend/tests/grammar/semi_reserved_009.phpt b/Zend/tests/grammar/semi_reserved_009.phpt index 1a7b0fc371..05830f80ed 100644 --- a/Zend/tests/grammar/semi_reserved_009.phpt +++ b/Zend/tests/grammar/semi_reserved_009.phpt @@ -19,7 +19,7 @@ Foo::try(); echo PHP_EOL, "Done", PHP_EOL; ---EXPECTF-- +--EXPECT-- TraitA::as Done diff --git a/Zend/tests/grammar/semi_reserved_010.phpt b/Zend/tests/grammar/semi_reserved_010.phpt index 508a7867a4..ad92fcfddc 100644 --- a/Zend/tests/grammar/semi_reserved_010.phpt +++ b/Zend/tests/grammar/semi_reserved_010.phpt @@ -25,7 +25,7 @@ Foo::insteadof(); echo PHP_EOL, "Done", PHP_EOL; ---EXPECTF-- +--EXPECT-- TraitB::insteadof Done diff --git a/Zend/tests/indirect_call_array_004.phpt b/Zend/tests/indirect_call_array_004.phpt index 350f720648..07d8a09215 100644 --- a/Zend/tests/indirect_call_array_004.phpt +++ b/Zend/tests/indirect_call_array_004.phpt @@ -61,7 +61,7 @@ catch (Exception $e) { } ?> ---EXPECTF-- +--EXPECT-- foo From foo::__callStatic: 123 diff --git a/Zend/tests/int_overflow_32bit.phpt b/Zend/tests/int_overflow_32bit.phpt index d9b56495e9..0764e495f7 100644 --- a/Zend/tests/int_overflow_32bit.phpt +++ b/Zend/tests/int_overflow_32bit.phpt @@ -20,7 +20,7 @@ foreach ($doubles as $d) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(-2147483648) int(-2147483647) int(-2147483638) diff --git a/Zend/tests/int_underflow_64bit.phpt b/Zend/tests/int_underflow_64bit.phpt index 48a43a3ca3..40a6dff9ec 100644 --- a/Zend/tests/int_underflow_64bit.phpt +++ b/Zend/tests/int_underflow_64bit.phpt @@ -20,7 +20,7 @@ foreach ($doubles as $d) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(-9223372036854775808) int(-9223372036854775808) int(-9223372036854775808) diff --git a/Zend/tests/inter_04.phpt b/Zend/tests/inter_04.phpt index ea0bd84760..6bac3fe339 100644 --- a/Zend/tests/inter_04.phpt +++ b/Zend/tests/inter_04.phpt @@ -17,5 +17,5 @@ interface c extends a, b { echo "done!\n"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/Zend/tests/isset_str_offset.phpt b/Zend/tests/isset_str_offset.phpt index d693f80a52..f37fd870bf 100644 --- a/Zend/tests/isset_str_offset.phpt +++ b/Zend/tests/isset_str_offset.phpt @@ -51,7 +51,7 @@ var_dump(isset($str[$f])); print "done\n"; ?> ---EXPECTF-- +--EXPECT-- - isset --- bool(true) bool(false) diff --git a/Zend/tests/jump12.phpt b/Zend/tests/jump12.phpt index 10bebc25fc..3c244d6181 100644 --- a/Zend/tests/jump12.phpt +++ b/Zend/tests/jump12.phpt @@ -13,7 +13,7 @@ c: print "ok!\n"; goto b; ?> ---EXPECTF-- +--EXPECT-- ok! ok! ok! diff --git a/Zend/tests/list/list_reference_001.phpt b/Zend/tests/list/list_reference_001.phpt index a173c7103e..07ebbb64ce 100644 --- a/Zend/tests/list/list_reference_001.phpt +++ b/Zend/tests/list/list_reference_001.phpt @@ -26,7 +26,7 @@ $arr = array("one" => 1, "two" => array(2)); var_dump($a, $b, $c); var_dump($arr); ?> ---EXPECTF-- +--EXPECT-- int(1) int(2) array(2) { diff --git a/Zend/tests/list/list_reference_004.phpt b/Zend/tests/list/list_reference_004.phpt index fc9955e28a..5dd237a244 100644 --- a/Zend/tests/list/list_reference_004.phpt +++ b/Zend/tests/list/list_reference_004.phpt @@ -9,7 +9,7 @@ foreach ($coords as [&$x, $y]) { } var_dump($coords); ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> array(2) { diff --git a/Zend/tests/list/list_reference_007.phpt b/Zend/tests/list/list_reference_007.phpt index 51f1cac496..225ebff10f 100644 --- a/Zend/tests/list/list_reference_007.phpt +++ b/Zend/tests/list/list_reference_007.phpt @@ -29,7 +29,7 @@ $a = new StorageRef(['one' => 1, 'two' => 2]); var_dump($a); ?> ---EXPECTF-- +--EXPECT-- object(StorageRef)#1 (1) { ["s":"StorageRef":private]=> array(2) { diff --git a/Zend/tests/list/list_reference_008.phpt b/Zend/tests/list/list_reference_008.phpt index 9c754a698d..2c78984852 100644 --- a/Zend/tests/list/list_reference_008.phpt +++ b/Zend/tests/list/list_reference_008.phpt @@ -34,7 +34,7 @@ var_dump($a, $b); $a++; $b++; var_dump($ref); ?> ---EXPECTF-- +--EXPECT-- int(1) int(1) array(2) { diff --git a/Zend/tests/list/list_reference_009.phpt b/Zend/tests/list/list_reference_009.phpt index f0adc1f088..b60539e7f8 100644 --- a/Zend/tests/list/list_reference_009.phpt +++ b/Zend/tests/list/list_reference_009.phpt @@ -18,7 +18,7 @@ $ary = [[0, 1]]; ] = $ary[0]; var_dump($ary, $a, $b); ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> array(2) { diff --git a/Zend/tests/list_keyed_non_literals.phpt b/Zend/tests/list_keyed_non_literals.phpt index 80f22eda22..7c6afe70b7 100644 --- a/Zend/tests/list_keyed_non_literals.phpt +++ b/Zend/tests/list_keyed_non_literals.phpt @@ -24,7 +24,7 @@ list( var_dump($one, $two, $three); ?> ---EXPECTF-- +--EXPECT-- string(3) "one" string(3) "two" string(5) "three" diff --git a/Zend/tests/lsb_001.phpt b/Zend/tests/lsb_001.phpt index 20a2fd83bb..f22649dcea 100644 --- a/Zend/tests/lsb_001.phpt +++ b/Zend/tests/lsb_001.phpt @@ -48,7 +48,7 @@ echo ChildClass2::testClassConst() . "\n"; echo ChildClass2::testStaticFunction() . "\n"; ?> ==DONE== ---EXPECTF-- +--EXPECT-- TestClassStatic TestClassConst TestClassFunction diff --git a/Zend/tests/lsb_002.phpt b/Zend/tests/lsb_002.phpt index 4fca6ddd72..9dbc496cc0 100644 --- a/Zend/tests/lsb_002.phpt +++ b/Zend/tests/lsb_002.phpt @@ -53,7 +53,7 @@ echo $childClass2->testClassConst() . "\n"; echo $childClass2->testStaticFunction() . "\n"; ?> ==DONE== ---EXPECTF-- +--EXPECT-- TestClassStatic TestClassConst TestClassFunction diff --git a/Zend/tests/lsb_003.phpt b/Zend/tests/lsb_003.phpt index 4e9fe1f7c8..a7a787e568 100644 --- a/Zend/tests/lsb_003.phpt +++ b/Zend/tests/lsb_003.phpt @@ -18,7 +18,7 @@ echo get_class($testClass) . "\n"; echo get_class($childClass) . "\n"; ?> ==DONE== ---EXPECTF-- +--EXPECT-- TestClass ChildClass ==DONE== diff --git a/Zend/tests/lsb_004.phpt b/Zend/tests/lsb_004.phpt index 6baeba00bd..9583ef2547 100644 --- a/Zend/tests/lsb_004.phpt +++ b/Zend/tests/lsb_004.phpt @@ -15,7 +15,7 @@ echo TestClass::getClassName() . "\n"; echo ChildClass::getClassName() . "\n"; ?> ==DONE== ---EXPECTF-- +--EXPECT-- TestClass ChildClass ==DONE== diff --git a/Zend/tests/lsb_005.phpt b/Zend/tests/lsb_005.phpt index 00647a5c70..a01ccd7ca9 100644 --- a/Zend/tests/lsb_005.phpt +++ b/Zend/tests/lsb_005.phpt @@ -36,7 +36,7 @@ TestA::test(); ?> ==DONE== ---EXPECTF-- +--EXPECT-- TestA TestB TestC diff --git a/Zend/tests/lsb_010.phpt b/Zend/tests/lsb_010.phpt index 2ac0306120..c6ef2d8614 100644 --- a/Zend/tests/lsb_010.phpt +++ b/Zend/tests/lsb_010.phpt @@ -29,7 +29,7 @@ unset($foo); unset($fooChild); ?> ---EXPECTF-- +--EXPECT-- Foo::__construct FooChild::__construct Foo::__destruct diff --git a/Zend/tests/lsb_015.phpt b/Zend/tests/lsb_015.phpt index ba293a2468..0c21012ca8 100644 --- a/Zend/tests/lsb_015.phpt +++ b/Zend/tests/lsb_015.phpt @@ -68,7 +68,7 @@ echo "via B:\n"; B::myCatch(); ?> ==DONE== ---EXPECTF-- +--EXPECT-- via A: A A diff --git a/Zend/tests/lsb_016.phpt b/Zend/tests/lsb_016.phpt index f19c6aada8..4c5fa3248e 100644 --- a/Zend/tests/lsb_016.phpt +++ b/Zend/tests/lsb_016.phpt @@ -34,7 +34,7 @@ $o->a = "b"; echo $o->a; ?> ==DONE== ---EXPECTF-- +--EXPECT-- TestChild TestChild TestChild diff --git a/Zend/tests/lsb_019.phpt b/Zend/tests/lsb_019.phpt index 1683ffe638..154a78a849 100644 --- a/Zend/tests/lsb_019.phpt +++ b/Zend/tests/lsb_019.phpt @@ -39,7 +39,7 @@ echo ChildClass1::testStaticFunction() . "\n"; echo ChildClass2::testStaticVar() . "\n"; echo ChildClass2::testStaticFunction() . "\n"; ?> ---EXPECTF-- +--EXPECT-- TestClassStatic TestClassFunction ChildClassStatic diff --git a/Zend/tests/lsb_020.phpt b/Zend/tests/lsb_020.phpt index 65ef97ab43..a7f5b42e67 100644 --- a/Zend/tests/lsb_020.phpt +++ b/Zend/tests/lsb_020.phpt @@ -39,7 +39,7 @@ echo ChildClass1::testStaticFunction() . "\n"; echo ChildClass2::testStaticVar() . "\n"; echo ChildClass2::testStaticFunction() . "\n"; ?> ---EXPECTF-- +--EXPECT-- TestClassStatic TestClassFunction ChildClassStatic diff --git a/Zend/tests/lsb_021.phpt b/Zend/tests/lsb_021.phpt index c591cfa230..a99ea4dd22 100644 --- a/Zend/tests/lsb_021.phpt +++ b/Zend/tests/lsb_021.phpt @@ -35,7 +35,7 @@ C::testForward(); C::testNoForward(); ?> ---EXPECTF-- +--EXPECT-- C C C diff --git a/Zend/tests/methods-on-non-objects-usort.phpt b/Zend/tests/methods-on-non-objects-usort.phpt index 5547695f72..ff4ad7451c 100644 --- a/Zend/tests/methods-on-non-objects-usort.phpt +++ b/Zend/tests/methods-on-non-objects-usort.phpt @@ -19,7 +19,7 @@ usort($list, function($a, $b) use ($comparator) { var_dump($list); echo "Alive\n"; ?> ---EXPECTF-- +--EXPECT-- int(0) string(43) "Call to a member function compare() on null" int(0) diff --git a/Zend/tests/not_001.phpt b/Zend/tests/not_001.phpt index 6eb0f000c9..3f2c812a4c 100644 --- a/Zend/tests/not_001.phpt +++ b/Zend/tests/not_001.phpt @@ -16,7 +16,7 @@ var_dump(bin2hex($s1)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(-24) string(8) "8c90929a" Done diff --git a/Zend/tests/nowdoc_011.phpt b/Zend/tests/nowdoc_011.phpt index 84bcdb6916..3d35989a9a 100644 --- a/Zend/tests/nowdoc_011.phpt +++ b/Zend/tests/nowdoc_011.phpt @@ -16,5 +16,5 @@ THISMUSTNOTERROR; print e::E . "\n"; ?> ---EXPECTF-- +--EXPECT-- If you DON'T see this, something's wrong. diff --git a/Zend/tests/ns_059.phpt b/Zend/tests/ns_059.phpt index 301a6fc830..87f1ea2ac9 100644 --- a/Zend/tests/ns_059.phpt +++ b/Zend/tests/ns_059.phpt @@ -4,6 +4,6 @@ <?php const C = array(); var_dump(C); ---EXPECTF-- +--EXPECT-- array(0) { } diff --git a/Zend/tests/ns_089.phpt b/Zend/tests/ns_089.phpt index c752eafb34..bb83ae7361 100644 --- a/Zend/tests/ns_089.phpt +++ b/Zend/tests/ns_089.phpt @@ -43,7 +43,7 @@ namespace Fiz\Biz\Buz { var_dump(BAR); } ---EXPECTF-- +--EXPECT-- Foo\Bar\Baz\A::__construct Foo\Bar\Baz\B::__construct Foo\Bar\Baz\C::__construct diff --git a/Zend/tests/ns_090.phpt b/Zend/tests/ns_090.phpt index 608d3fcf8e..8511f1c803 100644 --- a/Zend/tests/ns_090.phpt +++ b/Zend/tests/ns_090.phpt @@ -34,7 +34,7 @@ namespace Fiz\Biz\Buz { var_dump(BAR); } ---EXPECTF-- +--EXPECT-- Foo\Bar\Baz\A::__construct Foo\Bar\Baz\B::__construct Foo\Bar\Baz\C::__construct diff --git a/Zend/tests/ns_091.phpt b/Zend/tests/ns_091.phpt index b7eadeb10d..5732e7e50e 100644 --- a/Zend/tests/ns_091.phpt +++ b/Zend/tests/ns_091.phpt @@ -15,6 +15,6 @@ namespace Fiz\Biz\Buz { new B; } ---EXPECTF-- +--EXPECT-- Foo\Bar\A::__construct Foo\Bar\Baz\B::__construct
\ No newline at end of file diff --git a/Zend/tests/ns_093.phpt b/Zend/tests/ns_093.phpt index e0b3e6a1d1..6e0b937963 100644 --- a/Zend/tests/ns_093.phpt +++ b/Zend/tests/ns_093.phpt @@ -22,6 +22,6 @@ use Foo\Bar\ echo "\nDone\n"; ---EXPECTF-- +--EXPECT-- Done
\ No newline at end of file diff --git a/Zend/tests/ns_095.phpt b/Zend/tests/ns_095.phpt index 9c4496473d..2e1c0e229e 100644 --- a/Zend/tests/ns_095.phpt +++ b/Zend/tests/ns_095.phpt @@ -36,7 +36,7 @@ namespace Baz { echo "\nDone\n"; } ?> ---EXPECTF-- +--EXPECT-- string(14) "Foo\Bar\ClassA" string(14) "Foo\Bar\ClassB" diff --git a/Zend/tests/object_types/return_type_reflection.phpt b/Zend/tests/object_types/return_type_reflection.phpt index 461199febe..29dd54428b 100644 --- a/Zend/tests/object_types/return_type_reflection.phpt +++ b/Zend/tests/object_types/return_type_reflection.phpt @@ -22,7 +22,7 @@ var_dump($returnTypeTwo->isBuiltin(), (string)$returnTypeTwo); $returnTypea = (new ReflectionFunction('a'))->getReturnType(); var_dump($returnTypea->isBuiltin(), (string)$returnTypea); ---EXPECTF-- +--EXPECT-- bool(true) string(6) "object" bool(true) diff --git a/Zend/tests/object_types/type_hint_reflection.phpt b/Zend/tests/object_types/type_hint_reflection.phpt index 8968e35d6c..c0dcde3939 100644 --- a/Zend/tests/object_types/type_hint_reflection.phpt +++ b/Zend/tests/object_types/type_hint_reflection.phpt @@ -22,7 +22,7 @@ var_dump($typeHintTwo->isBuiltin(), (string)$typeHintTwo); $typeHinta = (new ReflectionFunction('a'))->getParameters()[0]->getType(); var_dump($typeHinta->isBuiltin(), (string)$typeHinta); ---EXPECTF-- +--EXPECT-- bool(true) string(6) "object" bool(true) diff --git a/Zend/tests/objects_010.phpt b/Zend/tests/objects_010.phpt index 0f85498e2c..af02d91b72 100644 --- a/Zend/tests/objects_010.phpt +++ b/Zend/tests/objects_010.phpt @@ -12,5 +12,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/Zend/tests/objects_018.phpt b/Zend/tests/objects_018.phpt index ca5b4b8cde..98ea982940 100644 --- a/Zend/tests/objects_018.phpt +++ b/Zend/tests/objects_018.phpt @@ -17,5 +17,5 @@ interface Itest3 extends Itest, Itest2 { echo "done!\n"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/Zend/tests/objects_032.phpt b/Zend/tests/objects_032.phpt index e5e3ecadb2..52a5e9fed9 100644 --- a/Zend/tests/objects_032.phpt +++ b/Zend/tests/objects_032.phpt @@ -26,7 +26,7 @@ var_dump($a); ?> ==DONE== ---EXPECTF-- +--EXPECT-- object(A)#1 (1) { ["foo"]=> array(1) { diff --git a/Zend/tests/offset_bool.phpt b/Zend/tests/offset_bool.phpt index 9bf8a89da7..f9bfeeac3e 100644 --- a/Zend/tests/offset_bool.phpt +++ b/Zend/tests/offset_bool.phpt @@ -24,7 +24,7 @@ var_dump($bool[$arr]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- NULL NULL NULL diff --git a/Zend/tests/offset_long.phpt b/Zend/tests/offset_long.phpt index c65a5ba3f8..41fedb5505 100644 --- a/Zend/tests/offset_long.phpt +++ b/Zend/tests/offset_long.phpt @@ -24,7 +24,7 @@ var_dump($long[$arr]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- NULL NULL NULL diff --git a/Zend/tests/offset_null.phpt b/Zend/tests/offset_null.phpt index 9364f0a2e5..cd98db40e7 100644 --- a/Zend/tests/offset_null.phpt +++ b/Zend/tests/offset_null.phpt @@ -24,7 +24,7 @@ var_dump($null[$arr]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- NULL NULL NULL diff --git a/Zend/tests/or_001.phpt b/Zend/tests/or_001.phpt index 1e4e5131a5..1493ec0bec 100644 --- a/Zend/tests/or_001.phpt +++ b/Zend/tests/or_001.phpt @@ -21,7 +21,7 @@ var_dump($s); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(8) "3337>755" string(8) "3337>755" string(4) "wou" diff --git a/Zend/tests/return_types/022.phpt b/Zend/tests/return_types/022.phpt index 47cbb791df..8cf6f5164c 100644 --- a/Zend/tests/return_types/022.phpt +++ b/Zend/tests/return_types/022.phpt @@ -13,5 +13,5 @@ $test = function() use($foo) : Closure { $callable = $test(); var_dump($callable()); ---EXPECTF-- +--EXPECT-- string(3) "bar" diff --git a/Zend/tests/return_types/return_reference_separation.phpt b/Zend/tests/return_types/return_reference_separation.phpt index 2ec0939088..cbf3ed5fd3 100644 --- a/Zend/tests/return_types/return_reference_separation.phpt +++ b/Zend/tests/return_types/return_reference_separation.phpt @@ -25,7 +25,7 @@ var_dump(test3($a)); var_dump($a); ?> ---EXPECTF-- +--EXPECT-- string(3) "123" int(123) string(3) "123" diff --git a/Zend/tests/return_types/rfc002.phpt b/Zend/tests/return_types/rfc002.phpt index 2f3ff02b1c..8d0ed0862f 100644 --- a/Zend/tests/return_types/rfc002.phpt +++ b/Zend/tests/return_types/rfc002.phpt @@ -9,5 +9,5 @@ function answer(): int { var_dump(answer()); ---EXPECTF-- +--EXPECT-- int(42) diff --git a/Zend/tests/settype_bool.phpt b/Zend/tests/settype_bool.phpt index cf59200b81..72b973d0f2 100644 --- a/Zend/tests/settype_bool.phpt +++ b/Zend/tests/settype_bool.phpt @@ -36,7 +36,7 @@ foreach ($vars as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(false) diff --git a/Zend/tests/settype_null.phpt b/Zend/tests/settype_null.phpt index 0abf2f9810..83ddb80561 100644 --- a/Zend/tests/settype_null.phpt +++ b/Zend/tests/settype_null.phpt @@ -36,7 +36,7 @@ foreach ($vars as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- NULL NULL NULL diff --git a/Zend/tests/traits/bug55554c.phpt b/Zend/tests/traits/bug55554c.phpt index 466b3f1c08..e1195ce883 100644 --- a/Zend/tests/traits/bug55554c.phpt +++ b/Zend/tests/traits/bug55554c.phpt @@ -42,5 +42,5 @@ echo "ReportCollision: "; $o = new ReportCollision; ---EXPECTF-- +--EXPECT-- ReportCollision: New constructor executed diff --git a/Zend/tests/traits/bug60217a.phpt b/Zend/tests/traits/bug60217a.phpt index 62a3515955..da0d06cd25 100644 --- a/Zend/tests/traits/bug60217a.phpt +++ b/Zend/tests/traits/bug60217a.phpt @@ -22,5 +22,5 @@ class C { $o = new C; $o->foo(); ---EXPECTF-- +--EXPECT-- C::foo() works. diff --git a/Zend/tests/traits/bug61998.phpt b/Zend/tests/traits/bug61998.phpt index 612caa0662..c5a3e60fbb 100644 --- a/Zend/tests/traits/bug61998.phpt +++ b/Zend/tests/traits/bug61998.phpt @@ -57,7 +57,7 @@ $b->func2(); //from Bar $b->newFunc2(); //from T2 $b->newFunc3(); //from T2 $b->func3(); //from Bar ---EXPECTF-- +--EXPECT-- From T1 From Foo From T1 diff --git a/Zend/tests/traits/bugs/abstract-methods02.phpt b/Zend/tests/traits/bugs/abstract-methods02.phpt index 78abe7d1bc..25130c538b 100644 --- a/Zend/tests/traits/bugs/abstract-methods02.phpt +++ b/Zend/tests/traits/bugs/abstract-methods02.phpt @@ -22,5 +22,5 @@ class TraitsTest { $test = new TraitsTest(); $test->hello(); ?> ---EXPECTF-- +--EXPECT-- Hello
\ No newline at end of file diff --git a/Zend/tests/traits/bugs/abstract-methods03.phpt b/Zend/tests/traits/bugs/abstract-methods03.phpt index 605b1d8e9e..2a699d8df5 100644 --- a/Zend/tests/traits/bugs/abstract-methods03.phpt +++ b/Zend/tests/traits/bugs/abstract-methods03.phpt @@ -18,5 +18,5 @@ class TraitsTest { $test = new TraitsTest(); $test->hello(); ?> ---EXPECTF-- +--EXPECT-- Hello
\ No newline at end of file diff --git a/Zend/tests/traits/bugs/abstract-methods04.phpt b/Zend/tests/traits/bugs/abstract-methods04.phpt index 56a3464067..b3b5bfaca5 100644 --- a/Zend/tests/traits/bugs/abstract-methods04.phpt +++ b/Zend/tests/traits/bugs/abstract-methods04.phpt @@ -32,5 +32,5 @@ $test = new TraitsTest2(); $test->hello(); ?> ---EXPECTF-- +--EXPECT-- HelloHello
\ No newline at end of file diff --git a/Zend/tests/traits/bugs/alias-semantics.phpt b/Zend/tests/traits/bugs/alias-semantics.phpt index ac86692880..5e7965d6dc 100644 --- a/Zend/tests/traits/bugs/alias-semantics.phpt +++ b/Zend/tests/traits/bugs/alias-semantics.phpt @@ -19,5 +19,5 @@ $test->a(); $test->b(); ?> ---EXPECTF-- +--EXPECT-- AA
\ No newline at end of file diff --git a/Zend/tests/traits/bugs/alias-semantics02.phpt b/Zend/tests/traits/bugs/alias-semantics02.phpt index e0b5286e4f..58faf9f290 100644 --- a/Zend/tests/traits/bugs/alias-semantics02.phpt +++ b/Zend/tests/traits/bugs/alias-semantics02.phpt @@ -21,5 +21,5 @@ $test->a(); $test->b(); ?> ---EXPECTF-- +--EXPECT-- AA
\ No newline at end of file diff --git a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt index 0bbea11005..464d9783a4 100644 --- a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt +++ b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt @@ -27,5 +27,5 @@ class TraitsTest { $test = new TraitsTest(); $test->hello(); ?> ---EXPECTF-- +--EXPECT-- Hello
\ No newline at end of file diff --git a/Zend/tests/traits/conflict002.phpt b/Zend/tests/traits/conflict002.phpt index 64712d40a4..ab913d8b05 100644 --- a/Zend/tests/traits/conflict002.phpt +++ b/Zend/tests/traits/conflict002.phpt @@ -28,5 +28,5 @@ class TheWorldIsNotEnough { $o = new TheWorldIsNotEnough(); $o->sayHello(); // echos Hello Universe! ?> ---EXPECTF-- +--EXPECT-- Hello Universe!
\ No newline at end of file diff --git a/Zend/tests/traits/flattening001.phpt b/Zend/tests/traits/flattening001.phpt index aa7f03dcb8..890147dc4a 100644 --- a/Zend/tests/traits/flattening001.phpt +++ b/Zend/tests/traits/flattening001.phpt @@ -36,7 +36,7 @@ $o->setText('bar'); var_dump($o->getText()); ?> ---EXPECTF-- +--EXPECT-- string(4) "test" string(3) "foo" string(3) "bar"
\ No newline at end of file diff --git a/Zend/tests/traits/flattening002.phpt b/Zend/tests/traits/flattening002.phpt index 251af29711..65f8e2fee5 100644 --- a/Zend/tests/traits/flattening002.phpt +++ b/Zend/tests/traits/flattening002.phpt @@ -24,5 +24,5 @@ class MyHelloWorld extends Base { $o = new MyHelloWorld(); $o->sayHello(); ?> ---EXPECTF-- +--EXPECT-- Hello World!
\ No newline at end of file diff --git a/Zend/tests/traits/flattening003.phpt b/Zend/tests/traits/flattening003.phpt index d189ca70c1..3c5d461be1 100644 --- a/Zend/tests/traits/flattening003.phpt +++ b/Zend/tests/traits/flattening003.phpt @@ -28,5 +28,5 @@ $o = new MyHelloWorld(); $o->sayHello(); $o->sayWorld(); ?> ---EXPECTF-- +--EXPECT-- Hello World!
\ No newline at end of file diff --git a/Zend/tests/traits/inheritance001.phpt b/Zend/tests/traits/inheritance001.phpt index e8195c4749..951344ffbb 100644 --- a/Zend/tests/traits/inheritance001.phpt +++ b/Zend/tests/traits/inheritance001.phpt @@ -20,5 +20,5 @@ class TheWorldIsNotEnough { $o = new TheWorldIsNotEnough(); $o->sayHello(); // echos Hello Universe! ?> ---EXPECTF-- +--EXPECT-- Hello Universe!
\ No newline at end of file diff --git a/Zend/tests/traits/inheritance002.phpt b/Zend/tests/traits/inheritance002.phpt index 51badc5a4c..d258e43981 100644 --- a/Zend/tests/traits/inheritance002.phpt +++ b/Zend/tests/traits/inheritance002.phpt @@ -23,5 +23,5 @@ class MyHelloWorld extends Base { $o = new MyHelloWorld(); $o->sayHello(); ?> ---EXPECTF-- +--EXPECT-- World!
\ No newline at end of file diff --git a/Zend/tests/traits/language001.phpt b/Zend/tests/traits/language001.phpt index d892112416..cd8176ca3b 100644 --- a/Zend/tests/traits/language001.phpt +++ b/Zend/tests/traits/language001.phpt @@ -17,5 +17,5 @@ class TraitsTest { $test = new TraitsTest(); $test->hello(); ?> ---EXPECTF-- +--EXPECT-- Hello diff --git a/Zend/tests/traits/language002.phpt b/Zend/tests/traits/language002.phpt index d093f2952d..bd11858ee0 100644 --- a/Zend/tests/traits/language002.phpt +++ b/Zend/tests/traits/language002.phpt @@ -28,5 +28,5 @@ $o->sayHello(); $o->sayWorld(); $o->sayExclamationMark(); ?> ---EXPECTF-- +--EXPECT-- Hello World!
\ No newline at end of file diff --git a/Zend/tests/traits/language003.phpt b/Zend/tests/traits/language003.phpt index 77d4429f43..d3b7a64420 100644 --- a/Zend/tests/traits/language003.phpt +++ b/Zend/tests/traits/language003.phpt @@ -25,5 +25,5 @@ class MyHelloWorld { $o = new MyHelloWorld(); $o->saySomething(); ?> ---EXPECTF-- +--EXPECT-- Hello
\ No newline at end of file diff --git a/Zend/tests/traits/language004.phpt b/Zend/tests/traits/language004.phpt index 4df307ab8d..31e9da99db 100644 --- a/Zend/tests/traits/language004.phpt +++ b/Zend/tests/traits/language004.phpt @@ -27,5 +27,5 @@ $o = new MyHelloWorld(); $o->saySomething(); $o->sayWorld(); ?> ---EXPECTF-- +--EXPECT-- Hello World
\ No newline at end of file diff --git a/Zend/tests/traits/language005.phpt b/Zend/tests/traits/language005.phpt index 20eaeb35c2..13319949f4 100644 --- a/Zend/tests/traits/language005.phpt +++ b/Zend/tests/traits/language005.phpt @@ -36,5 +36,5 @@ $t->bigTalk(); $t->talk(); ?> ---EXPECTF-- +--EXPECT-- bAB
\ No newline at end of file diff --git a/Zend/tests/traits/language006.phpt b/Zend/tests/traits/language006.phpt index 5a32359bb5..b51a8329ac 100644 --- a/Zend/tests/traits/language006.phpt +++ b/Zend/tests/traits/language006.phpt @@ -27,5 +27,5 @@ $o->setWorld(' World!'); $o->sayHelloWorld(); ?> ---EXPECTF-- +--EXPECT-- Hello World!
\ No newline at end of file diff --git a/Zend/tests/traits/language007.phpt b/Zend/tests/traits/language007.phpt index 3b65d0123a..082022cc79 100644 --- a/Zend/tests/traits/language007.phpt +++ b/Zend/tests/traits/language007.phpt @@ -26,5 +26,5 @@ $o->sayHello(); $o->sayWorld(); ?> ---EXPECTF-- +--EXPECT-- Hello World!
\ No newline at end of file diff --git a/Zend/tests/traits/language009.phpt b/Zend/tests/traits/language009.phpt index e55c8d84aa..477d267e29 100644 --- a/Zend/tests/traits/language009.phpt +++ b/Zend/tests/traits/language009.phpt @@ -32,5 +32,5 @@ $t = new MyClass; $t->foo(); ?> ---EXPECTF-- +--EXPECT-- b
\ No newline at end of file diff --git a/Zend/tests/traits/language012.phpt b/Zend/tests/traits/language012.phpt index 481dd64ec7..af854a79e2 100644 --- a/Zend/tests/traits/language012.phpt +++ b/Zend/tests/traits/language012.phpt @@ -22,6 +22,6 @@ $o->inc(); $o->inc(); ?> ---EXPECTF-- +--EXPECT-- 1 2 diff --git a/Zend/tests/traits/language013.phpt b/Zend/tests/traits/language013.phpt index a55cbbed34..91eba5705b 100644 --- a/Zend/tests/traits/language013.phpt +++ b/Zend/tests/traits/language013.phpt @@ -30,7 +30,7 @@ $p->inc(); $p->inc(); ?> ---EXPECTF-- +--EXPECT-- 1 2 1 diff --git a/Zend/tests/traits/property001.phpt b/Zend/tests/traits/property001.phpt index c9c26ad770..90dd8ca92d 100644 --- a/Zend/tests/traits/property001.phpt +++ b/Zend/tests/traits/property001.phpt @@ -29,7 +29,7 @@ class TraitsTest2 { var_dump(property_exists('TraitsTest', 'foo')); var_dump(property_exists('TraitsTest2', 'foo')); ?> ---EXPECTF-- +--EXPECT-- PRE-CLASS-GUARD-TraitsTest PRE-CLASS-GUARD-TraitsTest2 bool(true) diff --git a/Zend/tests/traits/property002.phpt b/Zend/tests/traits/property002.phpt index f58c2a428e..c96f314c93 100644 --- a/Zend/tests/traits/property002.phpt +++ b/Zend/tests/traits/property002.phpt @@ -25,7 +25,7 @@ var_dump(property_exists('TraitsTest', 'world')); $t = new TraitsTest; $t->test(); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) hello World! diff --git a/Zend/tests/traits/property006.phpt b/Zend/tests/traits/property006.phpt index a34f3f217f..fc21e558b9 100644 --- a/Zend/tests/traits/property006.phpt +++ b/Zend/tests/traits/property006.phpt @@ -28,7 +28,7 @@ class Notice extends Base { } echo "POST-CLASS-GUARD2\n"; ?> ---EXPECTF-- +--EXPECT-- PRE-CLASS-GUARD POST-CLASS-GUARD POST-CLASS-GUARD2 diff --git a/Zend/tests/traits/property007.phpt b/Zend/tests/traits/property007.phpt index 80a81958d3..d2f3f0ff59 100644 --- a/Zend/tests/traits/property007.phpt +++ b/Zend/tests/traits/property007.phpt @@ -27,7 +27,7 @@ class Notice extends Base { } echo "POST-CLASS-GUARD2\n"; ?> ---EXPECTF-- +--EXPECT-- PRE-CLASS-GUARD POST-CLASS-GUARD POST-CLASS-GUARD2 diff --git a/Zend/tests/traits/property008.phpt b/Zend/tests/traits/property008.phpt index 41d0e8802b..694ca85b5d 100644 --- a/Zend/tests/traits/property008.phpt +++ b/Zend/tests/traits/property008.phpt @@ -40,7 +40,7 @@ $b = new SubclassB; var_dump($b); ?> ---EXPECTF-- +--EXPECT-- object(SubclassClassicInheritance)#1 (2) { ["hello":"SubclassClassicInheritance":private]=> int(0) diff --git a/Zend/tests/traits/property009.phpt b/Zend/tests/traits/property009.phpt index fdd2351023..0b5918c614 100644 --- a/Zend/tests/traits/property009.phpt +++ b/Zend/tests/traits/property009.phpt @@ -40,7 +40,7 @@ $b = new SubclassB; var_dump($b); ?> ---EXPECTF-- +--EXPECT-- object(SubclassClassicInheritance)#1 (1) { ["hello"]=> diff --git a/Zend/tests/try/catch_finally_001.phpt b/Zend/tests/try/catch_finally_001.phpt index 0c3f597a0a..db0605fc05 100644 --- a/Zend/tests/try/catch_finally_001.phpt +++ b/Zend/tests/try/catch_finally_001.phpt @@ -21,7 +21,7 @@ foo(); echo "\n"; foo(true); ?> ---EXPECTF-- +--EXPECT-- try finally end diff --git a/Zend/tests/try/catch_finally_002.phpt b/Zend/tests/try/catch_finally_002.phpt index c54477ff8c..07a576f2e5 100644 --- a/Zend/tests/try/catch_finally_002.phpt +++ b/Zend/tests/try/catch_finally_002.phpt @@ -15,7 +15,7 @@ function foo () { var_dump(foo()); ?> ---EXPECTF-- +--EXPECT-- try finally int(1) diff --git a/Zend/tests/try/catch_finally_003.phpt b/Zend/tests/try/catch_finally_003.phpt index 24e468d335..610d701872 100644 --- a/Zend/tests/try/catch_finally_003.phpt +++ b/Zend/tests/try/catch_finally_003.phpt @@ -32,7 +32,7 @@ function &bar($a) { var_dump(foo("para")); var_dump(bar("para")); ?> ---EXPECTF-- +--EXPECT-- string(3) "try" string(7) "finally" string(7) "finally" diff --git a/Zend/tests/try/catch_finally_005.phpt b/Zend/tests/try/catch_finally_005.phpt index c2fd55df27..7671d05df5 100644 --- a/Zend/tests/try/catch_finally_005.phpt +++ b/Zend/tests/try/catch_finally_005.phpt @@ -17,5 +17,5 @@ function foo ($a) { var_dump(foo("para")); ?> ---EXPECTF-- +--EXPECT-- int(3) diff --git a/Zend/tests/try/finally_goto_003.phpt b/Zend/tests/try/finally_goto_003.phpt index 8529ff7865..9f4115fee6 100644 --- a/Zend/tests/try/finally_goto_003.phpt +++ b/Zend/tests/try/finally_goto_003.phpt @@ -11,5 +11,5 @@ test: } echo "okey"; ?> ---EXPECTF-- +--EXPECT-- okey diff --git a/Zend/tests/try/try_catch_finally_001.phpt b/Zend/tests/try/try_catch_finally_001.phpt index 3d478f461a..641bb25442 100644 --- a/Zend/tests/try/try_catch_finally_001.phpt +++ b/Zend/tests/try/try_catch_finally_001.phpt @@ -32,5 +32,5 @@ function foo () { var_dump(foo()); ?> ---EXPECTF-- +--EXPECT-- 1234int(1) diff --git a/Zend/tests/try/try_catch_finally_002.phpt b/Zend/tests/try/try_catch_finally_002.phpt index 79efcb3de8..07904fb158 100644 --- a/Zend/tests/try/try_catch_finally_002.phpt +++ b/Zend/tests/try/try_catch_finally_002.phpt @@ -38,5 +38,5 @@ function foo () { var_dump(foo()); ?> ---EXPECTF-- +--EXPECT-- 123456int(7) diff --git a/Zend/tests/try/try_catch_finally_003.phpt b/Zend/tests/try/try_catch_finally_003.phpt index 7ec8ec82db..4d285eedb8 100644 --- a/Zend/tests/try/try_catch_finally_003.phpt +++ b/Zend/tests/try/try_catch_finally_003.phpt @@ -32,5 +32,5 @@ function foo () { var_dump(foo()); ?> ---EXPECTF-- +--EXPECT-- 1234int(4) diff --git a/Zend/tests/try/try_catch_finally_004.phpt b/Zend/tests/try/try_catch_finally_004.phpt index eb8d0966a1..05318e0774 100644 --- a/Zend/tests/try/try_catch_finally_004.phpt +++ b/Zend/tests/try/try_catch_finally_004.phpt @@ -24,7 +24,7 @@ try { } var_dump("end"); ?> ---EXPECTF-- +--EXPECT-- string(3) "try" string(7) "finally" string(8) "finally2" diff --git a/Zend/tests/try/try_catch_finally_005.phpt b/Zend/tests/try/try_catch_finally_005.phpt index dafeb6bbe0..9ff21c3e8b 100644 --- a/Zend/tests/try/try_catch_finally_005.phpt +++ b/Zend/tests/try/try_catch_finally_005.phpt @@ -39,7 +39,7 @@ for ($i = 0; $i < 3; $i ++) { } ?> ---EXPECTF-- +--EXPECT-- string(5) "break" string(9) "continue1" string(9) "continue1" diff --git a/Zend/tests/try/try_catch_finally_006.phpt b/Zend/tests/try/try_catch_finally_006.phpt index dab6af6a58..f09fa1fed2 100644 --- a/Zend/tests/try/try_catch_finally_006.phpt +++ b/Zend/tests/try/try_catch_finally_006.phpt @@ -28,7 +28,7 @@ var_dump(foo()); var_dump(foo(new Exception())); ?> ---EXPECTF-- +--EXPECT-- string(8) "finally1" string(8) "finally2" string(5) "label" diff --git a/Zend/tests/try/try_catch_finally_007.phpt b/Zend/tests/try/try_catch_finally_007.phpt index ad33c68131..fc3520c84c 100644 --- a/Zend/tests/try/try_catch_finally_007.phpt +++ b/Zend/tests/try/try_catch_finally_007.phpt @@ -34,7 +34,7 @@ var_dump(foo()); var_dump(foo(true)); ?> ---EXPECTF-- +--EXPECT-- string(8) "finally1" string(7) "catched" string(8) "finally2" diff --git a/Zend/tests/try/try_finally_006.phpt b/Zend/tests/try/try_finally_006.phpt index f53e6b5bc1..58113465e0 100644 --- a/Zend/tests/try/try_finally_006.phpt +++ b/Zend/tests/try/try_finally_006.phpt @@ -21,6 +21,6 @@ label: foo(); ?> ---EXPECTF-- +--EXPECT-- label okey diff --git a/Zend/tests/type_declarations/default_boolean_hint_values.phpt b/Zend/tests/type_declarations/default_boolean_hint_values.phpt index 6ba262848d..6711de7733 100644 --- a/Zend/tests/type_declarations/default_boolean_hint_values.phpt +++ b/Zend/tests/type_declarations/default_boolean_hint_values.phpt @@ -11,6 +11,6 @@ function foo(bool $x = true, bool $y = false) { foo(); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(false) diff --git a/Zend/tests/type_declarations/internal_function_strict_mode.phpt b/Zend/tests/type_declarations/internal_function_strict_mode.phpt index 8b70bbae1a..a9e7c9a56b 100644 --- a/Zend/tests/type_declarations/internal_function_strict_mode.phpt +++ b/Zend/tests/type_declarations/internal_function_strict_mode.phpt @@ -26,7 +26,7 @@ try { } ?> ---EXPECTF-- +--EXPECT-- *** Trying Ord With Integer *** Caught ord() expects parameter 1 to be string, int given *** Trying Array Map With Invalid Callback diff --git a/Zend/tests/type_declarations/scalar_constant_defaults.phpt b/Zend/tests/type_declarations/scalar_constant_defaults.phpt index 2982d9b2af..b9076c6b52 100644 --- a/Zend/tests/type_declarations/scalar_constant_defaults.phpt +++ b/Zend/tests/type_declarations/scalar_constant_defaults.phpt @@ -64,7 +64,7 @@ echo "Testing int with null null constant" . PHP_EOL; var_dump(int_val_default_null(null)); ?> ---EXPECTF-- +--EXPECT-- Testing int val int(10) Testing float val diff --git a/Zend/tests/type_declarations/scalar_strict_declaration_placement_005.phpt b/Zend/tests/type_declarations/scalar_strict_declaration_placement_005.phpt index 8611a205cf..b213bb11dd 100644 --- a/Zend/tests/type_declarations/scalar_strict_declaration_placement_005.phpt +++ b/Zend/tests/type_declarations/scalar_strict_declaration_placement_005.phpt @@ -10,5 +10,5 @@ namespace Foo; var_dump(strlen("abc")); ?> ---EXPECTF-- +--EXPECT-- int(3)
\ No newline at end of file diff --git a/Zend/tests/type_declarations/scalar_strict_declaration_placement_006.phpt b/Zend/tests/type_declarations/scalar_strict_declaration_placement_006.phpt index 2af05b6c65..7337ee4379 100644 --- a/Zend/tests/type_declarations/scalar_strict_declaration_placement_006.phpt +++ b/Zend/tests/type_declarations/scalar_strict_declaration_placement_006.phpt @@ -21,5 +21,5 @@ namespace Foo; var_dump(strlen("abc")); ?> ---EXPECTF-- +--EXPECT-- int(3)
\ No newline at end of file diff --git a/Zend/tests/type_declarations/scalar_strict_declaration_placement_007.phpt b/Zend/tests/type_declarations/scalar_strict_declaration_placement_007.phpt index 3e4c693afb..deb7a8c976 100644 --- a/Zend/tests/type_declarations/scalar_strict_declaration_placement_007.phpt +++ b/Zend/tests/type_declarations/scalar_strict_declaration_placement_007.phpt @@ -21,5 +21,5 @@ namespace Foo; var_dump(strlen("abc")); ?> ---EXPECTF-- +--EXPECT-- int(3)
\ No newline at end of file diff --git a/Zend/tests/type_declarations/strict_include_explicit_weak.phpt b/Zend/tests/type_declarations/strict_include_explicit_weak.phpt index a42d633f47..997bdf77b4 100644 --- a/Zend/tests/type_declarations/strict_include_explicit_weak.phpt +++ b/Zend/tests/type_declarations/strict_include_explicit_weak.phpt @@ -10,5 +10,5 @@ require 'strict_include_explicit_weak_2.inc'; // calls within that file should stay weak, despite being included by strict fille ?> ---EXPECTF-- +--EXPECT-- Success! diff --git a/Zend/tests/type_declarations/strict_include_weak.phpt b/Zend/tests/type_declarations/strict_include_weak.phpt index ce29db7e75..f90f1f14c4 100644 --- a/Zend/tests/type_declarations/strict_include_weak.phpt +++ b/Zend/tests/type_declarations/strict_include_weak.phpt @@ -10,5 +10,5 @@ require 'strict_include_weak_2.inc'; // calls within that file should stay weak, despite being included by strict file ?> ---EXPECTF-- +--EXPECT-- Success! diff --git a/Zend/tests/unexpected_ref_bug.phpt b/Zend/tests/unexpected_ref_bug.phpt index 61fe1aa5b1..ba61ee582a 100644 --- a/Zend/tests/unexpected_ref_bug.phpt +++ b/Zend/tests/unexpected_ref_bug.phpt @@ -14,5 +14,5 @@ $my_var=array(1,2,3); $data = call_user_func_array("implode",array(&$my_var, new StdClass())); echo "Done.\n"; ?> ---EXPECTF-- +--EXPECT-- Done. diff --git a/Zend/tests/unset_cv08.phpt b/Zend/tests/unset_cv08.phpt index 9b8ab1520f..0798ca48ed 100644 --- a/Zend/tests/unset_cv08.phpt +++ b/Zend/tests/unset_cv08.phpt @@ -9,7 +9,7 @@ echo $a; echo $b; echo "ok\n"; ?> ---EXPECTF-- +--EXPECT-- ok ok ok diff --git a/Zend/tests/use_const/shadow_core.phpt b/Zend/tests/use_const/shadow_core.phpt index 7d8bcbd189..5dbf396e63 100644 --- a/Zend/tests/use_const/shadow_core.phpt +++ b/Zend/tests/use_const/shadow_core.phpt @@ -11,6 +11,6 @@ var_dump(PHP_VERSION); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(42) Done diff --git a/Zend/tests/xor_001.phpt b/Zend/tests/xor_001.phpt index e1a521dff9..c61135e9e2 100644 --- a/Zend/tests/xor_001.phpt +++ b/Zend/tests/xor_001.phpt @@ -11,6 +11,6 @@ var_dump($c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(1) Done diff --git a/Zend/tests/xor_002.phpt b/Zend/tests/xor_002.phpt index 0cf4054fa4..bccf008931 100644 --- a/Zend/tests/xor_002.phpt +++ b/Zend/tests/xor_002.phpt @@ -29,7 +29,7 @@ var_dump(bin2hex($s)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(6) "030107" string(6) "030107" string(8) "070a1e11" diff --git a/Zend/tests/xor_003.phpt b/Zend/tests/xor_003.phpt index 8aa1c636b7..8fd0e98c05 100644 --- a/Zend/tests/xor_003.phpt +++ b/Zend/tests/xor_003.phpt @@ -12,7 +12,7 @@ var_dump($f ^ $f); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(1) int(0) int(0) diff --git a/Zend/tests/zend_signed_multiply-32bit.phpt b/Zend/tests/zend_signed_multiply-32bit.phpt index 3f37cbac19..991cf5e891 100644 --- a/Zend/tests/zend_signed_multiply-32bit.phpt +++ b/Zend/tests/zend_signed_multiply-32bit.phpt @@ -8,7 +8,7 @@ var_dump(0x8000 * -0xffff); var_dump(0x8001 * 0xfffe); var_dump(0x8001 * -0xffff); ?> ---EXPECTF-- +--EXPECT-- int(-2147450880) int(2147483646) float(-2147516415) diff --git a/Zend/tests/zend_signed_multiply-64bit-2.phpt b/Zend/tests/zend_signed_multiply-64bit-2.phpt index f0a3bafa5e..9c61a22bc3 100644 --- a/Zend/tests/zend_signed_multiply-64bit-2.phpt +++ b/Zend/tests/zend_signed_multiply-64bit-2.phpt @@ -13,7 +13,7 @@ for($c = 0; $c <= 16; $c++) { echo "-----------\n"; } ?> ---EXPECTF-- +--EXPECT-- int(-16) int(-922337203685477580) float(1.4757395258968E+19) diff --git a/Zend/tests/zend_signed_multiply-64bit.phpt b/Zend/tests/zend_signed_multiply-64bit.phpt index d392b2e78a..20ef277770 100644 --- a/Zend/tests/zend_signed_multiply-64bit.phpt +++ b/Zend/tests/zend_signed_multiply-64bit.phpt @@ -8,7 +8,7 @@ var_dump(0x80000000 * -0xffffffff); var_dump(0x80000001 * 0xfffffffe); var_dump(0x80000001 * -0xffffffff); ?> ---EXPECTF-- +--EXPECT-- int(-9223372034707292160) int(9223372036854775806) float(-9.2233720390023E+18) diff --git a/Zend/tests/zend_strtod.phpt b/Zend/tests/zend_strtod.phpt index 7f4bca5966..56e25b241c 100644 --- a/Zend/tests/zend_strtod.phpt +++ b/Zend/tests/zend_strtod.phpt @@ -11,7 +11,7 @@ var_dump("123123139932690.21688500" - "11399327900000000.21688500"); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- float(-100) float(808792757210) float(-4.5646456464565E+27) diff --git a/ext/bcmath/tests/bcadd_variation001.phpt b/ext/bcmath/tests/bcadd_variation001.phpt index a0a64f6343..4d80a280b0 100644 --- a/ext/bcmath/tests/bcadd_variation001.phpt +++ b/ext/bcmath/tests/bcadd_variation001.phpt @@ -10,7 +10,7 @@ echo bcadd("2.2", "4.3", "2")."\n"; echo bcadd("2.2", "-7.3", "1")."\n"; echo bcadd("-4.27", "7.3"); ?> ---EXPECTF-- +--EXPECT-- 6.50 -5.1 3.03000
\ No newline at end of file diff --git a/ext/bcmath/tests/bccomp_variation001.phpt b/ext/bcmath/tests/bccomp_variation001.phpt index 456f235ef7..f8ca5b9da5 100644 --- a/ext/bcmath/tests/bccomp_variation001.phpt +++ b/ext/bcmath/tests/bccomp_variation001.phpt @@ -10,7 +10,7 @@ echo bccomp("2.2", "2.2", "2")."\n"; echo bccomp("2.32", "2.2", "2")."\n"; echo bccomp("2.29", "2.3", "2"); ?> ---EXPECTF-- +--EXPECT-- 0 1 -1
\ No newline at end of file diff --git a/ext/bcmath/tests/bccomp_variation002.phpt b/ext/bcmath/tests/bccomp_variation002.phpt index 73fbc82179..c451a281ff 100644 --- a/ext/bcmath/tests/bccomp_variation002.phpt +++ b/ext/bcmath/tests/bccomp_variation002.phpt @@ -10,7 +10,7 @@ echo bccomp("-2", "-2")."\n"; echo bccomp("-2", "2", "1")."\n"; echo bccomp("-2.29", "-2.3", "2"); ?> ---EXPECTF-- +--EXPECT-- 0 -1 1
\ No newline at end of file diff --git a/ext/bcmath/tests/bcpow_variation001.phpt b/ext/bcmath/tests/bcpow_variation001.phpt index 58e96b3c66..049374ba40 100644 --- a/ext/bcmath/tests/bcpow_variation001.phpt +++ b/ext/bcmath/tests/bcpow_variation001.phpt @@ -8,5 +8,5 @@ bcmath.scale=0 <?php echo bcpow("2", "-4"); ?> ---EXPECTF-- +--EXPECT-- 0
\ No newline at end of file diff --git a/ext/bcmath/tests/bcscale_variation001.phpt b/ext/bcmath/tests/bcscale_variation001.phpt index 2a7b8db5e5..1e6dd372a5 100644 --- a/ext/bcmath/tests/bcscale_variation001.phpt +++ b/ext/bcmath/tests/bcscale_variation001.phpt @@ -9,5 +9,5 @@ bcmath.scale=0 bcscale(-4); echo bcdiv("20.56", "4"); ?> ---EXPECTF-- +--EXPECT-- 5
\ No newline at end of file diff --git a/ext/bcmath/tests/bcscale_variation002.phpt b/ext/bcmath/tests/bcscale_variation002.phpt index 0db6cff9f2..117756f1d1 100644 --- a/ext/bcmath/tests/bcscale_variation002.phpt +++ b/ext/bcmath/tests/bcscale_variation002.phpt @@ -8,5 +8,5 @@ bcmath.scale=-2 <?php echo bcadd("-4.27", "7.3"); ?> ---EXPECTF-- +--EXPECT-- 3
\ No newline at end of file diff --git a/ext/bcmath/tests/bcsqrt_variation001.phpt b/ext/bcmath/tests/bcsqrt_variation001.phpt index 5e9ec1edb9..67d1efc2ea 100644 --- a/ext/bcmath/tests/bcsqrt_variation001.phpt +++ b/ext/bcmath/tests/bcsqrt_variation001.phpt @@ -8,5 +8,5 @@ bcmath.scale=0 <?php echo bcsqrt("0"); ?> ---EXPECTF-- +--EXPECT-- 0
\ No newline at end of file diff --git a/ext/bcmath/tests/bug60377.phpt b/ext/bcmath/tests/bug60377.phpt index af7f7d44fd..929790d16a 100644 --- a/ext/bcmath/tests/bug60377.phpt +++ b/ext/bcmath/tests/bug60377.phpt @@ -10,5 +10,5 @@ $var67 = bcsqrt(false); $var414 = bcadd(false,null,10); die('ALIVE'); ?> ---EXPECTF-- +--EXPECT-- ALIVE diff --git a/ext/calendar/tests/jdtojewish64.phpt b/ext/calendar/tests/jdtojewish64.phpt index 9f01109a71..2443563533 100644 --- a/ext/calendar/tests/jdtojewish64.phpt +++ b/ext/calendar/tests/jdtojewish64.phpt @@ -12,7 +12,7 @@ if (PHP_INT_SIZE == 4) { $a = array(38245310, 324542846, 324542847, 9223372036854743639); foreach ($a as $x) var_dump(jdtojewish($x)); ---EXPECTF-- +--EXPECT-- string(11) "2/22/103759" string(12) "12/13/887605" string(5) "0/0/0" diff --git a/ext/calendar/tests/jdtounix_error1.phpt b/ext/calendar/tests/jdtounix_error1.phpt index 2d54cf22be..a4648451aa 100644 --- a/ext/calendar/tests/jdtounix_error1.phpt +++ b/ext/calendar/tests/jdtounix_error1.phpt @@ -10,5 +10,5 @@ date.timezone=UTC <?php var_dump(jdtounix(2440579)) . PHP_EOL; ?> ---EXPECTF-- +--EXPECT-- bool(false)
\ No newline at end of file diff --git a/ext/ctype/tests/ctype_alnum_basic.phpt b/ext/ctype/tests/ctype_alnum_basic.phpt index 2a18b82abd..bf3712d9da 100644 --- a/ext/ctype/tests/ctype_alnum_basic.phpt +++ b/ext/ctype/tests/ctype_alnum_basic.phpt @@ -22,7 +22,7 @@ var_dump(ctype_alnum($c2)); setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_alnum() : basic functionality *** bool(true) bool(false) diff --git a/ext/ctype/tests/ctype_alnum_variation1.phpt b/ext/ctype/tests/ctype_alnum_variation1.phpt index 2505428d21..188a86ce40 100644 --- a/ext/ctype/tests/ctype_alnum_variation1.phpt +++ b/ext/ctype/tests/ctype_alnum_variation1.phpt @@ -99,7 +99,7 @@ fclose($fp); setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_alnum() : usage variations *** -- Iteration 1 -- diff --git a/ext/ctype/tests/ctype_alnum_variation2.phpt b/ext/ctype/tests/ctype_alnum_variation2.phpt index 94ae22da1a..a73d06816b 100644 --- a/ext/ctype/tests/ctype_alnum_variation2.phpt +++ b/ext/ctype/tests/ctype_alnum_variation2.phpt @@ -27,7 +27,7 @@ for ($i = 0; $i < 256; $i++) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_alnum() : usage variations *** character code 48 is alpha numeric character code 49 is alpha numeric diff --git a/ext/ctype/tests/ctype_alnum_variation3.phpt b/ext/ctype/tests/ctype_alnum_variation3.phpt index a9da6c932a..3128feec6c 100644 --- a/ext/ctype/tests/ctype_alnum_variation3.phpt +++ b/ext/ctype/tests/ctype_alnum_variation3.phpt @@ -55,7 +55,7 @@ foreach($values as $value) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_alnum() : usage variations *** -- Iteration 1 -- diff --git a/ext/ctype/tests/ctype_alnum_variation4.phpt b/ext/ctype/tests/ctype_alnum_variation4.phpt index 49167eb34d..d4577b51fb 100644 --- a/ext/ctype/tests/ctype_alnum_variation4.phpt +++ b/ext/ctype/tests/ctype_alnum_variation4.phpt @@ -39,7 +39,7 @@ foreach($hex_values as $c) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_alnum() : usage variations *** -- Octal Values -- diff --git a/ext/ctype/tests/ctype_alpha_basic.phpt b/ext/ctype/tests/ctype_alpha_basic.phpt index f0d8af8abc..041343770e 100644 --- a/ext/ctype/tests/ctype_alpha_basic.phpt +++ b/ext/ctype/tests/ctype_alpha_basic.phpt @@ -22,7 +22,7 @@ var_dump(ctype_alpha($c2)); setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_alpha() : basic functionality *** bool(true) bool(false) diff --git a/ext/ctype/tests/ctype_alpha_variation1.phpt b/ext/ctype/tests/ctype_alpha_variation1.phpt index baa75c8d4e..52ca389749 100644 --- a/ext/ctype/tests/ctype_alpha_variation1.phpt +++ b/ext/ctype/tests/ctype_alpha_variation1.phpt @@ -99,7 +99,7 @@ fclose($fp); setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_alpha() : usage variations *** -- Iteration 1 -- diff --git a/ext/ctype/tests/ctype_alpha_variation2.phpt b/ext/ctype/tests/ctype_alpha_variation2.phpt index 866f372599..f50328079e 100644 --- a/ext/ctype/tests/ctype_alpha_variation2.phpt +++ b/ext/ctype/tests/ctype_alpha_variation2.phpt @@ -27,7 +27,7 @@ for ($i = 0; $i < 256; $i++) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_alpha() : usage variations *** character code 65 is alphabetic character code 66 is alphabetic diff --git a/ext/ctype/tests/ctype_alpha_variation3.phpt b/ext/ctype/tests/ctype_alpha_variation3.phpt index 5ab4bd6dc2..87cfc6fc00 100644 --- a/ext/ctype/tests/ctype_alpha_variation3.phpt +++ b/ext/ctype/tests/ctype_alpha_variation3.phpt @@ -56,7 +56,7 @@ foreach($values as $value) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_alpha() : usage variations *** -- Iteration 1 -- diff --git a/ext/ctype/tests/ctype_alpha_variation4.phpt b/ext/ctype/tests/ctype_alpha_variation4.phpt index c41d97291b..cc2067580a 100644 --- a/ext/ctype/tests/ctype_alpha_variation4.phpt +++ b/ext/ctype/tests/ctype_alpha_variation4.phpt @@ -39,7 +39,7 @@ foreach($hex_values as $c) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_alpha() : usage variations *** -- Octal Values -- diff --git a/ext/ctype/tests/ctype_cntrl_basic.phpt b/ext/ctype/tests/ctype_cntrl_basic.phpt index b9241adc94..2e44795541 100644 --- a/ext/ctype/tests/ctype_cntrl_basic.phpt +++ b/ext/ctype/tests/ctype_cntrl_basic.phpt @@ -22,7 +22,7 @@ var_dump(ctype_cntrl($c2)); setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_cntrl() : basic functionality *** bool(true) bool(false) diff --git a/ext/ctype/tests/ctype_cntrl_variation1.phpt b/ext/ctype/tests/ctype_cntrl_variation1.phpt index f74c13f967..abe74a0567 100644 --- a/ext/ctype/tests/ctype_cntrl_variation1.phpt +++ b/ext/ctype/tests/ctype_cntrl_variation1.phpt @@ -100,7 +100,7 @@ fclose($fp); setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_cntrl() : usage variations *** -- Iteration 1 -- diff --git a/ext/ctype/tests/ctype_cntrl_variation2.phpt b/ext/ctype/tests/ctype_cntrl_variation2.phpt index b48ab94450..7ad64d8369 100644 --- a/ext/ctype/tests/ctype_cntrl_variation2.phpt +++ b/ext/ctype/tests/ctype_cntrl_variation2.phpt @@ -27,7 +27,7 @@ for ($i = 0; $i < 256; $i++) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_cntrl() : usage variations *** character code 0 is control character character code 1 is control character diff --git a/ext/ctype/tests/ctype_cntrl_variation3.phpt b/ext/ctype/tests/ctype_cntrl_variation3.phpt index 4ae5bc3188..529c23876f 100644 --- a/ext/ctype/tests/ctype_cntrl_variation3.phpt +++ b/ext/ctype/tests/ctype_cntrl_variation3.phpt @@ -63,7 +63,7 @@ foreach($values as $value) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_cntrl() : usage variations *** -- Iteration 1 -- diff --git a/ext/ctype/tests/ctype_cntrl_variation4.phpt b/ext/ctype/tests/ctype_cntrl_variation4.phpt index 0e1c50379b..159ba911b1 100644 --- a/ext/ctype/tests/ctype_cntrl_variation4.phpt +++ b/ext/ctype/tests/ctype_cntrl_variation4.phpt @@ -38,7 +38,7 @@ foreach($hex_values as $c) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_cntrl() : usage variations *** -- Octal Values -- diff --git a/ext/ctype/tests/ctype_digit_basic.phpt b/ext/ctype/tests/ctype_digit_basic.phpt index 049580db1b..73e127356c 100644 --- a/ext/ctype/tests/ctype_digit_basic.phpt +++ b/ext/ctype/tests/ctype_digit_basic.phpt @@ -22,7 +22,7 @@ var_dump(ctype_digit($c2)); setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_digit() : basic functionality *** bool(true) bool(false) diff --git a/ext/ctype/tests/ctype_digit_variation1.phpt b/ext/ctype/tests/ctype_digit_variation1.phpt index 306949130d..527d22f821 100644 --- a/ext/ctype/tests/ctype_digit_variation1.phpt +++ b/ext/ctype/tests/ctype_digit_variation1.phpt @@ -99,7 +99,7 @@ fclose($fp); setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_digit() : usage variations *** -- Iteration 1 -- diff --git a/ext/ctype/tests/ctype_digit_variation2.phpt b/ext/ctype/tests/ctype_digit_variation2.phpt index 318737f4f4..4122737d03 100644 --- a/ext/ctype/tests/ctype_digit_variation2.phpt +++ b/ext/ctype/tests/ctype_digit_variation2.phpt @@ -27,7 +27,7 @@ for ($i = 0; $i < 256; $i++) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_digit() : usage variations *** character code 48 is a numeric digit character code 49 is a numeric digit diff --git a/ext/ctype/tests/ctype_digit_variation3.phpt b/ext/ctype/tests/ctype_digit_variation3.phpt index 66ef6f344c..c966132d16 100644 --- a/ext/ctype/tests/ctype_digit_variation3.phpt +++ b/ext/ctype/tests/ctype_digit_variation3.phpt @@ -62,7 +62,7 @@ foreach($values as $value) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_digit() : usage variations *** -- Iteration 1 -- diff --git a/ext/ctype/tests/ctype_digit_variation4.phpt b/ext/ctype/tests/ctype_digit_variation4.phpt index c94be3e6df..f937e07020 100644 --- a/ext/ctype/tests/ctype_digit_variation4.phpt +++ b/ext/ctype/tests/ctype_digit_variation4.phpt @@ -39,7 +39,7 @@ foreach($hex_values as $c) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_digit() : usage variations *** -- Octal Values -- diff --git a/ext/ctype/tests/ctype_graph_basic.phpt b/ext/ctype/tests/ctype_graph_basic.phpt index b45aac6d45..171959d944 100644 --- a/ext/ctype/tests/ctype_graph_basic.phpt +++ b/ext/ctype/tests/ctype_graph_basic.phpt @@ -22,7 +22,7 @@ var_dump(ctype_graph($c2)); setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_graph() : basic functionality *** bool(true) bool(false) diff --git a/ext/ctype/tests/ctype_graph_variation1.phpt b/ext/ctype/tests/ctype_graph_variation1.phpt index 03471f1bda..f8dee30808 100644 --- a/ext/ctype/tests/ctype_graph_variation1.phpt +++ b/ext/ctype/tests/ctype_graph_variation1.phpt @@ -99,7 +99,7 @@ fclose($fp); setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_graph() : usage variations *** -- Iteration 1 -- diff --git a/ext/ctype/tests/ctype_graph_variation2.phpt b/ext/ctype/tests/ctype_graph_variation2.phpt index 8f8b3fed10..5e87d65374 100644 --- a/ext/ctype/tests/ctype_graph_variation2.phpt +++ b/ext/ctype/tests/ctype_graph_variation2.phpt @@ -27,7 +27,7 @@ for ($i = 0; $i < 256; $i++) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_graph() : usage variations *** character code 33 is a printable character character code 34 is a printable character diff --git a/ext/ctype/tests/ctype_graph_variation3.phpt b/ext/ctype/tests/ctype_graph_variation3.phpt index 327a497e9f..263909a9d3 100644 --- a/ext/ctype/tests/ctype_graph_variation3.phpt +++ b/ext/ctype/tests/ctype_graph_variation3.phpt @@ -59,7 +59,7 @@ foreach($values as $value) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_graph() : usage variations *** -- Iteration 1 -- diff --git a/ext/ctype/tests/ctype_graph_variation4.phpt b/ext/ctype/tests/ctype_graph_variation4.phpt index d425b4c7c3..eb733c1d2a 100644 --- a/ext/ctype/tests/ctype_graph_variation4.phpt +++ b/ext/ctype/tests/ctype_graph_variation4.phpt @@ -39,7 +39,7 @@ foreach($hex_values as $c) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_graph() : usage variations *** -- Octal Values -- diff --git a/ext/ctype/tests/ctype_lower_basic.phpt b/ext/ctype/tests/ctype_lower_basic.phpt index be6c0affd2..08dcf81126 100644 --- a/ext/ctype/tests/ctype_lower_basic.phpt +++ b/ext/ctype/tests/ctype_lower_basic.phpt @@ -22,7 +22,7 @@ var_dump(ctype_lower($c2)); setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_lower() : basic functionality *** bool(true) bool(false) diff --git a/ext/ctype/tests/ctype_lower_variation1.phpt b/ext/ctype/tests/ctype_lower_variation1.phpt index 91c8ef5407..9c4a306234 100644 --- a/ext/ctype/tests/ctype_lower_variation1.phpt +++ b/ext/ctype/tests/ctype_lower_variation1.phpt @@ -99,7 +99,7 @@ fclose($fp); setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_lower() : usage variations *** -- Iteration 1 -- diff --git a/ext/ctype/tests/ctype_lower_variation2.phpt b/ext/ctype/tests/ctype_lower_variation2.phpt index 39eff9a956..ac14004e1e 100644 --- a/ext/ctype/tests/ctype_lower_variation2.phpt +++ b/ext/ctype/tests/ctype_lower_variation2.phpt @@ -27,7 +27,7 @@ for ($i = 0; $i < 256; $i++) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_lower() : usage variations *** character code 97 is a lower case character character code 98 is a lower case character diff --git a/ext/ctype/tests/ctype_lower_variation3.phpt b/ext/ctype/tests/ctype_lower_variation3.phpt index 061cc1ce9a..b2cbe2933c 100644 --- a/ext/ctype/tests/ctype_lower_variation3.phpt +++ b/ext/ctype/tests/ctype_lower_variation3.phpt @@ -57,7 +57,7 @@ foreach($values as $value) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_lower() : usage variations *** -- Iteration 1 -- diff --git a/ext/ctype/tests/ctype_lower_variation4.phpt b/ext/ctype/tests/ctype_lower_variation4.phpt index 25e3d17f87..30dfb4c931 100644 --- a/ext/ctype/tests/ctype_lower_variation4.phpt +++ b/ext/ctype/tests/ctype_lower_variation4.phpt @@ -39,7 +39,7 @@ foreach($hex_values as $c) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_lower() : usage variations *** -- Octal Values -- diff --git a/ext/ctype/tests/ctype_print_basic.phpt b/ext/ctype/tests/ctype_print_basic.phpt index 49cb26fbdd..17df251e23 100644 --- a/ext/ctype/tests/ctype_print_basic.phpt +++ b/ext/ctype/tests/ctype_print_basic.phpt @@ -22,7 +22,7 @@ var_dump(ctype_print($c2)); setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_print() : basic functionality *** bool(true) bool(false) diff --git a/ext/ctype/tests/ctype_print_variation1.phpt b/ext/ctype/tests/ctype_print_variation1.phpt index a882c96020..e2223c7223 100644 --- a/ext/ctype/tests/ctype_print_variation1.phpt +++ b/ext/ctype/tests/ctype_print_variation1.phpt @@ -99,7 +99,7 @@ fclose($fp); setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_print() : usage variations *** -- Iteration 1 -- diff --git a/ext/ctype/tests/ctype_print_variation2.phpt b/ext/ctype/tests/ctype_print_variation2.phpt index c216e4da4a..5d620d7112 100644 --- a/ext/ctype/tests/ctype_print_variation2.phpt +++ b/ext/ctype/tests/ctype_print_variation2.phpt @@ -27,7 +27,7 @@ for ($i = 0; $i < 256; $i++) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_print() : usage variations *** character code 32 is a printable character character code 33 is a printable character diff --git a/ext/ctype/tests/ctype_print_variation3.phpt b/ext/ctype/tests/ctype_print_variation3.phpt index 7b90e4fd08..fb872357fa 100644 --- a/ext/ctype/tests/ctype_print_variation3.phpt +++ b/ext/ctype/tests/ctype_print_variation3.phpt @@ -54,7 +54,7 @@ foreach($values as $value) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_print() : usage variations *** -- Iteration 1 -- diff --git a/ext/ctype/tests/ctype_print_variation4.phpt b/ext/ctype/tests/ctype_print_variation4.phpt index d6dc84ac50..21e040dcc2 100644 --- a/ext/ctype/tests/ctype_print_variation4.phpt +++ b/ext/ctype/tests/ctype_print_variation4.phpt @@ -38,7 +38,7 @@ foreach($hex_values as $c) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_print() : usage variations *** -- Octal Values -- diff --git a/ext/ctype/tests/ctype_punct_basic.phpt b/ext/ctype/tests/ctype_punct_basic.phpt index 647f8519b1..2a1296bdb1 100644 --- a/ext/ctype/tests/ctype_punct_basic.phpt +++ b/ext/ctype/tests/ctype_punct_basic.phpt @@ -23,7 +23,7 @@ var_dump(ctype_punct($c2)); setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_punct() : basic functionality *** bool(true) bool(false) diff --git a/ext/ctype/tests/ctype_punct_variation1.phpt b/ext/ctype/tests/ctype_punct_variation1.phpt index 0f57c45a66..ccf882a191 100644 --- a/ext/ctype/tests/ctype_punct_variation1.phpt +++ b/ext/ctype/tests/ctype_punct_variation1.phpt @@ -100,7 +100,7 @@ fclose($fp); setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_punct() : usage variations *** -- Iteration 1 -- diff --git a/ext/ctype/tests/ctype_punct_variation2.phpt b/ext/ctype/tests/ctype_punct_variation2.phpt index 3a4a66ac7b..a75e3d5181 100644 --- a/ext/ctype/tests/ctype_punct_variation2.phpt +++ b/ext/ctype/tests/ctype_punct_variation2.phpt @@ -28,7 +28,7 @@ for ($c = 1; $c < 256; $c++) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_punct() : usage variations *** character code 33 is punctuation character code 34 is punctuation diff --git a/ext/ctype/tests/ctype_punct_variation3.phpt b/ext/ctype/tests/ctype_punct_variation3.phpt index 73e377eed1..cfc6b386bf 100644 --- a/ext/ctype/tests/ctype_punct_variation3.phpt +++ b/ext/ctype/tests/ctype_punct_variation3.phpt @@ -57,7 +57,7 @@ foreach($values as $value) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_punct() : usage variations *** -- Iteration 1 -- diff --git a/ext/ctype/tests/ctype_punct_variation4.phpt b/ext/ctype/tests/ctype_punct_variation4.phpt index 7b7201b140..f44e8db515 100644 --- a/ext/ctype/tests/ctype_punct_variation4.phpt +++ b/ext/ctype/tests/ctype_punct_variation4.phpt @@ -40,7 +40,7 @@ foreach($hex_values as $c) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_punct() : usage variations *** -- Octal Values -- diff --git a/ext/ctype/tests/ctype_space_basic.phpt b/ext/ctype/tests/ctype_space_basic.phpt index 55d9a81cbc..4287f477ee 100644 --- a/ext/ctype/tests/ctype_space_basic.phpt +++ b/ext/ctype/tests/ctype_space_basic.phpt @@ -22,7 +22,7 @@ var_dump(ctype_space($c2)); setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_space() : basic functionality *** bool(true) bool(false) diff --git a/ext/ctype/tests/ctype_space_variation1.phpt b/ext/ctype/tests/ctype_space_variation1.phpt index 4a469ae037..daa68dad6a 100644 --- a/ext/ctype/tests/ctype_space_variation1.phpt +++ b/ext/ctype/tests/ctype_space_variation1.phpt @@ -99,7 +99,7 @@ fclose($fp); setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_space() : usage variations *** -- Iteration 1 -- diff --git a/ext/ctype/tests/ctype_space_variation2.phpt b/ext/ctype/tests/ctype_space_variation2.phpt index 6ffdb9c5ed..ba706333e8 100644 --- a/ext/ctype/tests/ctype_space_variation2.phpt +++ b/ext/ctype/tests/ctype_space_variation2.phpt @@ -26,7 +26,7 @@ for ($c = 1; $c < 256; $c++) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_space() : usage variations *** character code 9 is a space character character code 10 is a space character diff --git a/ext/ctype/tests/ctype_space_variation3.phpt b/ext/ctype/tests/ctype_space_variation3.phpt index bb8423b1ee..ba4222b640 100644 --- a/ext/ctype/tests/ctype_space_variation3.phpt +++ b/ext/ctype/tests/ctype_space_variation3.phpt @@ -57,7 +57,7 @@ foreach($values as $value) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_space() : usage variations *** -- Iteration 1 -- diff --git a/ext/ctype/tests/ctype_space_variation4.phpt b/ext/ctype/tests/ctype_space_variation4.phpt index 305c123e27..24a662b4cb 100644 --- a/ext/ctype/tests/ctype_space_variation4.phpt +++ b/ext/ctype/tests/ctype_space_variation4.phpt @@ -38,7 +38,7 @@ foreach($hex_values as $c) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_space() : usage variations *** -- Octal Values -- diff --git a/ext/ctype/tests/ctype_upper_basic.phpt b/ext/ctype/tests/ctype_upper_basic.phpt index 635e4818dc..0d40e4294c 100644 --- a/ext/ctype/tests/ctype_upper_basic.phpt +++ b/ext/ctype/tests/ctype_upper_basic.phpt @@ -22,7 +22,7 @@ var_dump(ctype_upper($c2)); setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_upper() : basic functionality *** bool(true) bool(false) diff --git a/ext/ctype/tests/ctype_upper_variation1.phpt b/ext/ctype/tests/ctype_upper_variation1.phpt index a257cd3f4a..d3cf1c98d8 100644 --- a/ext/ctype/tests/ctype_upper_variation1.phpt +++ b/ext/ctype/tests/ctype_upper_variation1.phpt @@ -99,7 +99,7 @@ fclose($fp); setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_upper() : usage variations *** -- Iteration 1 -- diff --git a/ext/ctype/tests/ctype_upper_variation2.phpt b/ext/ctype/tests/ctype_upper_variation2.phpt index 9357feb1e4..5a8a2396da 100644 --- a/ext/ctype/tests/ctype_upper_variation2.phpt +++ b/ext/ctype/tests/ctype_upper_variation2.phpt @@ -26,7 +26,7 @@ for ($i = 0; $i < 256; $i++) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_upper() : usage variations *** character code 65 is a uppercase character character code 66 is a uppercase character diff --git a/ext/ctype/tests/ctype_upper_variation3.phpt b/ext/ctype/tests/ctype_upper_variation3.phpt index 3e4509e345..9a25698e49 100644 --- a/ext/ctype/tests/ctype_upper_variation3.phpt +++ b/ext/ctype/tests/ctype_upper_variation3.phpt @@ -56,7 +56,7 @@ foreach($values as $value) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_upper() : usage variations *** -- Iteration 1 -- diff --git a/ext/ctype/tests/ctype_upper_variation4.phpt b/ext/ctype/tests/ctype_upper_variation4.phpt index 0c27992159..cdd99d1078 100644 --- a/ext/ctype/tests/ctype_upper_variation4.phpt +++ b/ext/ctype/tests/ctype_upper_variation4.phpt @@ -38,7 +38,7 @@ foreach($hex_values as $c) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_upper() : usage variations *** -- Octal Values -- diff --git a/ext/ctype/tests/ctype_xdigit_basic.phpt b/ext/ctype/tests/ctype_xdigit_basic.phpt index 179115d23d..562846cfd5 100644 --- a/ext/ctype/tests/ctype_xdigit_basic.phpt +++ b/ext/ctype/tests/ctype_xdigit_basic.phpt @@ -21,7 +21,7 @@ var_dump(ctype_xdigit($c2)); setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_xdigit() : basic functionality *** bool(true) bool(false) diff --git a/ext/ctype/tests/ctype_xdigit_variation1.phpt b/ext/ctype/tests/ctype_xdigit_variation1.phpt index 963755b358..d220729fe0 100644 --- a/ext/ctype/tests/ctype_xdigit_variation1.phpt +++ b/ext/ctype/tests/ctype_xdigit_variation1.phpt @@ -99,7 +99,7 @@ fclose($fp); setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_xdigit() : usage variations *** -- Iteration 1 -- diff --git a/ext/ctype/tests/ctype_xdigit_variation2.phpt b/ext/ctype/tests/ctype_xdigit_variation2.phpt index 1e7b7bd4b4..458c54be11 100644 --- a/ext/ctype/tests/ctype_xdigit_variation2.phpt +++ b/ext/ctype/tests/ctype_xdigit_variation2.phpt @@ -27,7 +27,7 @@ for($c = 1; $c < 256; $c++) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_xdigit() : usage variations *** character code 48 is a hexadecimal 'digit' character code 49 is a hexadecimal 'digit' diff --git a/ext/ctype/tests/ctype_xdigit_variation3.phpt b/ext/ctype/tests/ctype_xdigit_variation3.phpt index 2c9960ced2..282643a95d 100644 --- a/ext/ctype/tests/ctype_xdigit_variation3.phpt +++ b/ext/ctype/tests/ctype_xdigit_variation3.phpt @@ -57,7 +57,7 @@ foreach($values as $value) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_xdigit() : usage variations *** -- Iteration 1 -- diff --git a/ext/ctype/tests/ctype_xdigit_variation4.phpt b/ext/ctype/tests/ctype_xdigit_variation4.phpt index 4707bcebff..f843edb0dc 100644 --- a/ext/ctype/tests/ctype_xdigit_variation4.phpt +++ b/ext/ctype/tests/ctype_xdigit_variation4.phpt @@ -54,7 +54,7 @@ foreach($hex_values2 as $c) { setlocale(LC_CTYPE, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ctype_xdigit() : usage variations *** -- Octal values -- diff --git a/ext/curl/tests/bug52827.phpt b/ext/curl/tests/bug52827.phpt index 85a73fa797..f0faad68f5 100644 --- a/ext/curl/tests/bug52827.phpt +++ b/ext/curl/tests/bug52827.phpt @@ -28,5 +28,5 @@ $handle=curl_init('http://www.example.com'); curl_setopt($handle, CURLOPT_STDERR, $s); echo "Done."; ---EXPECTF-- +--EXPECT-- Done. diff --git a/ext/curl/tests/bug54995.phpt b/ext/curl/tests/bug54995.phpt index 4af59948be..e113d130a1 100644 --- a/ext/curl/tests/bug54995.phpt +++ b/ext/curl/tests/bug54995.phpt @@ -22,5 +22,5 @@ curl_exec($ch); curl_close($ch); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/curl/tests/bug55767.phpt b/ext/curl/tests/bug55767.phpt index bbeecb6b87..8690597ae8 100644 --- a/ext/curl/tests/bug55767.phpt +++ b/ext/curl/tests/bug55767.phpt @@ -33,7 +33,7 @@ include 'skipif.inc'; var_dump( $curl_content ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing curl sending through GET an POST *** string(203) "array(2) { ["test"]=> diff --git a/ext/curl/tests/bug62839.phpt b/ext/curl/tests/bug62839.phpt index e6988d6de1..be8646ea99 100644 --- a/ext/curl/tests/bug62839.phpt +++ b/ext/curl/tests/bug62839.phpt @@ -14,5 +14,5 @@ curl_copy_handle($curl); echo 'DONE!'; ?> ---EXPECTF-- +--EXPECT-- DONE! diff --git a/ext/curl/tests/bug66109.phpt b/ext/curl/tests/bug66109.phpt index 5a18e97294..c40d1e9667 100644 --- a/ext/curl/tests/bug66109.phpt +++ b/ext/curl/tests/bug66109.phpt @@ -19,6 +19,6 @@ var_dump(curl_exec($ch)); curl_close($ch); ?> ---EXPECTF-- +--EXPECT-- string(6) "DELETE" string(3) "GET" diff --git a/ext/curl/tests/bug68937.phpt b/ext/curl/tests/bug68937.phpt index 0f346cf3fa..ff8a906eba 100644 --- a/ext/curl/tests/bug68937.phpt +++ b/ext/curl/tests/bug68937.phpt @@ -36,5 +36,5 @@ function curl_read($ch, $fp, $len) { curl_exec($ch); curl_close($ch); ?> ---EXPECTF-- +--EXPECT-- NULL diff --git a/ext/curl/tests/bug71523.phpt b/ext/curl/tests/bug71523.phpt index 24aa83c620..84f1a17159 100644 --- a/ext/curl/tests/bug71523.phpt +++ b/ext/curl/tests/bug71523.phpt @@ -27,5 +27,5 @@ do { } while ($active); ?> okey ---EXPECTF-- +--EXPECT-- okey diff --git a/ext/curl/tests/curl_basic_001.phpt b/ext/curl/tests/curl_basic_001.phpt index 4921b69bdd..3feea49905 100644 --- a/ext/curl/tests/curl_basic_001.phpt +++ b/ext/curl/tests/curl_basic_001.phpt @@ -35,7 +35,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net> } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing curl_exec() : basic functionality *** string(25) "Hello World! Hello World!" diff --git a/ext/curl/tests/curl_basic_002.phpt b/ext/curl/tests/curl_basic_002.phpt index 69aef4b825..186fa66dfa 100644 --- a/ext/curl/tests/curl_basic_002.phpt +++ b/ext/curl/tests/curl_basic_002.phpt @@ -32,7 +32,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net> var_dump( $curl_content ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); *** string(25) "Hello World! Hello World!" diff --git a/ext/curl/tests/curl_basic_003.phpt b/ext/curl/tests/curl_basic_003.phpt index 9c5967db8f..07cbad4b7a 100644 --- a/ext/curl/tests/curl_basic_003.phpt +++ b/ext/curl/tests/curl_basic_003.phpt @@ -34,7 +34,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net> var_dump( $curl_content ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing curl sending through GET an POST *** string(208) "array(2) { ["test"]=> diff --git a/ext/curl/tests/curl_basic_004.phpt b/ext/curl/tests/curl_basic_004.phpt index 08dc7a1005..b520db6c70 100644 --- a/ext/curl/tests/curl_basic_004.phpt +++ b/ext/curl/tests/curl_basic_004.phpt @@ -33,7 +33,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net> var_dump( $curl_content ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing curl setting referer *** string(19) "http://www.refer.er" ===DONE=== diff --git a/ext/curl/tests/curl_basic_005.phpt b/ext/curl/tests/curl_basic_005.phpt index 200db765dc..4d90ebfd37 100644 --- a/ext/curl/tests/curl_basic_005.phpt +++ b/ext/curl/tests/curl_basic_005.phpt @@ -33,7 +33,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net> var_dump( $curl_content ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing curl with user agent *** string(9) "cURL phpt" ===DONE=== diff --git a/ext/curl/tests/curl_basic_006.phpt b/ext/curl/tests/curl_basic_006.phpt index e48a5ba70d..5d37297bb2 100644 --- a/ext/curl/tests/curl_basic_006.phpt +++ b/ext/curl/tests/curl_basic_006.phpt @@ -35,7 +35,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net> echo "Data: $alldata"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing curl_setopt($ch, CURLOPT_WRITEFUNCTION, <closure>); *** Data: Hello World! Hello World!===DONE=== diff --git a/ext/curl/tests/curl_basic_011.phpt b/ext/curl/tests/curl_basic_011.phpt index 4e33082409..22be2b8b16 100644 --- a/ext/curl/tests/curl_basic_011.phpt +++ b/ext/curl/tests/curl_basic_011.phpt @@ -32,7 +32,7 @@ TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com> var_dump( $curl_content ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing curl with cookie *** string(3) "bar" ===DONE=== diff --git a/ext/curl/tests/curl_basic_012.phpt b/ext/curl/tests/curl_basic_012.phpt index f136880dff..94afa73e26 100644 --- a/ext/curl/tests/curl_basic_012.phpt +++ b/ext/curl/tests/curl_basic_012.phpt @@ -32,7 +32,7 @@ TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com> var_dump( $curl_content ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing curl with HTTP/1.0 *** string(8) "HTTP/1.0" ===DONE=== diff --git a/ext/curl/tests/curl_basic_013.phpt b/ext/curl/tests/curl_basic_013.phpt index 6d09517e8d..4e9233c080 100644 --- a/ext/curl/tests/curl_basic_013.phpt +++ b/ext/curl/tests/curl_basic_013.phpt @@ -32,7 +32,7 @@ TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com> var_dump( $curl_content ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing curl with HTTP/1.1 *** string(8) "HTTP/1.1" ===DONE=== diff --git a/ext/curl/tests/curl_basic_015.phpt b/ext/curl/tests/curl_basic_015.phpt index e8e43e5686..00ad7c9b1d 100644 --- a/ext/curl/tests/curl_basic_015.phpt +++ b/ext/curl/tests/curl_basic_015.phpt @@ -11,6 +11,6 @@ Jean-Marc Fontaine <jmf@durcommefaire.net> var_dump($url == curl_getinfo($ch, CURLINFO_EFFECTIVE_URL)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(true) ===DONE=== diff --git a/ext/curl/tests/curl_basic_017.phpt b/ext/curl/tests/curl_basic_017.phpt index dc0bee926b..2dd06c778a 100644 --- a/ext/curl/tests/curl_basic_017.phpt +++ b/ext/curl/tests/curl_basic_017.phpt @@ -61,7 +61,7 @@ TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix@gmail.com> } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing curl_exec() : basic functionality *** string(75) "Hello World! Hello World!Hello World! diff --git a/ext/curl/tests/curl_basic_018.phpt b/ext/curl/tests/curl_basic_018.phpt index 5c085c1c93..46b80ed982 100644 --- a/ext/curl/tests/curl_basic_018.phpt +++ b/ext/curl/tests/curl_basic_018.phpt @@ -64,7 +64,7 @@ TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix@gmail.com> ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing curl_exec() : basic functionality *** string(75) "Hello World! Hello World!Hello World! diff --git a/ext/curl/tests/curl_basic_019.phpt b/ext/curl/tests/curl_basic_019.phpt index 2c58500ef7..fde4dccb3d 100644 --- a/ext/curl/tests/curl_basic_019.phpt +++ b/ext/curl/tests/curl_basic_019.phpt @@ -19,7 +19,7 @@ Jean-Marc Fontaine <jmf@durcommefaire.net> curl_close($ch); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Hello World! Hello World!bool(true) ===DONE=== diff --git a/ext/curl/tests/curl_basic_020.phpt b/ext/curl/tests/curl_basic_020.phpt index 1227ad3261..99ac93d192 100644 --- a/ext/curl/tests/curl_basic_020.phpt +++ b/ext/curl/tests/curl_basic_020.phpt @@ -17,7 +17,7 @@ Jean-Marc Fontaine <jmf@durcommefaire.net> curl_close($ch); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Hello World! Hello World!int(200) ===DONE=== diff --git a/ext/curl/tests/curl_basic_021.phpt b/ext/curl/tests/curl_basic_021.phpt index e803d98837..46d21cd81b 100644 --- a/ext/curl/tests/curl_basic_021.phpt +++ b/ext/curl/tests/curl_basic_021.phpt @@ -17,6 +17,6 @@ Jean-Marc Fontaine <jmf@durcommefaire.net> curl_close($ch); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- string(24) "text/plain;charset=utf-8" ===DONE=== diff --git a/ext/curl/tests/curl_copy_handle_basic.phpt b/ext/curl/tests/curl_copy_handle_basic.phpt index 1a6ff41699..6aeb669abf 100644 --- a/ext/curl/tests/curl_copy_handle_basic.phpt +++ b/ext/curl/tests/curl_copy_handle_basic.phpt @@ -24,7 +24,7 @@ $ch2 = curl_copy_handle($ch); var_dump(curl_getinfo($ch) === curl_getinfo($ch2)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing curl_copy_handle(): basic *** bool(true) ===DONE=== diff --git a/ext/curl/tests/curl_copy_handle_basic_001.phpt b/ext/curl/tests/curl_copy_handle_basic_001.phpt index aafa41ee2e..0f1cf9dfd7 100644 --- a/ext/curl/tests/curl_copy_handle_basic_001.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_001.phpt @@ -29,7 +29,7 @@ Rick Buitenman <rick@meritos.nl> var_dump( $curl_content ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing curl copy handle with simple GET *** string(106) "array(2) { ["test"]=> diff --git a/ext/curl/tests/curl_copy_handle_basic_002.phpt b/ext/curl/tests/curl_copy_handle_basic_002.phpt index 6e8214ad2b..6b2136bda2 100644 --- a/ext/curl/tests/curl_copy_handle_basic_002.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_002.phpt @@ -30,7 +30,7 @@ Rick Buitenman <rick@meritos.nl> var_dump( $curl_content ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing curl copy handle with simple POST *** string(163) "array(1) { ["test"]=> diff --git a/ext/curl/tests/curl_copy_handle_basic_004.phpt b/ext/curl/tests/curl_copy_handle_basic_004.phpt index c690180a55..cad1be9865 100644 --- a/ext/curl/tests/curl_copy_handle_basic_004.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_004.phpt @@ -31,7 +31,7 @@ Rick Buitenman <rick@meritos.nl> var_dump( $curl_content_copy ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Test curl_copy_handle() after exec() *** string(106) "array(2) { ["test"]=> diff --git a/ext/curl/tests/curl_copy_handle_basic_005.phpt b/ext/curl/tests/curl_copy_handle_basic_005.phpt index e92603324e..939ee7381b 100644 --- a/ext/curl/tests/curl_copy_handle_basic_005.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_005.phpt @@ -33,7 +33,7 @@ Rick Buitenman <rick@meritos.nl> var_dump( $curl_content_copy ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Test curl_copy_handle() after exec() with POST *** string(163) "array(1) { ["test"]=> diff --git a/ext/curl/tests/curl_copy_handle_basic_006.phpt b/ext/curl/tests/curl_copy_handle_basic_006.phpt index 0a5c2a25e6..e33857d57e 100644 --- a/ext/curl/tests/curl_copy_handle_basic_006.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_006.phpt @@ -31,7 +31,7 @@ Rick Buitenman <rick@meritos.nl> ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing curl copy handle with User Agent *** string(9) "cURL phpt" string(9) "cURL phpt" diff --git a/ext/curl/tests/curl_copy_handle_basic_007.phpt b/ext/curl/tests/curl_copy_handle_basic_007.phpt index 6334d2a4b8..23813d32c2 100644 --- a/ext/curl/tests/curl_copy_handle_basic_007.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_007.phpt @@ -28,7 +28,7 @@ Test curl_copy_handle() with simple POST var_dump( $curl_content ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing curl copy handle with simple POST using array as arguments *** string(163) "array(1) { ["test"]=> diff --git a/ext/curl/tests/curl_copy_handle_basic_008.phpt b/ext/curl/tests/curl_copy_handle_basic_008.phpt index cdb7de374d..c48c76db22 100644 --- a/ext/curl/tests/curl_copy_handle_basic_008.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_008.phpt @@ -19,7 +19,7 @@ Test curl_copy_handle() with CURLOPT_PROGRESSFUNCTION echo curl_exec($ch2); ?> ---EXPECTF-- +--EXPECT-- Hello World! Hello World! Hello World! diff --git a/ext/curl/tests/curl_copy_handle_variation1.phpt b/ext/curl/tests/curl_copy_handle_variation1.phpt index da4522192d..8978e2650e 100644 --- a/ext/curl/tests/curl_copy_handle_variation1.phpt +++ b/ext/curl/tests/curl_copy_handle_variation1.phpt @@ -26,7 +26,7 @@ curl_setopt($ch2, CURLOPT_URL, 'http://www.bar.com/'); var_dump(curl_getinfo($ch) === curl_getinfo($ch2)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing curl_copy_handle(): basic *** bool(false) ===DONE=== diff --git a/ext/curl/tests/curl_copy_handle_variation2.phpt b/ext/curl/tests/curl_copy_handle_variation2.phpt index 01e6af9e8c..36b5febf50 100644 --- a/ext/curl/tests/curl_copy_handle_variation2.phpt +++ b/ext/curl/tests/curl_copy_handle_variation2.phpt @@ -35,7 +35,7 @@ curl_setopt($ch2, CURLOPT_URL, 'http://www.bar.com/'); var_dump(curl_getinfo($ch) === curl_getinfo($ch2)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing curl_copy_handle(): add options after copy *** bool(true) bool(false) diff --git a/ext/curl/tests/curl_ftp_pasv.phpt b/ext/curl/tests/curl_ftp_pasv.phpt index 31d670ae0d..f63a710ae9 100644 --- a/ext/curl/tests/curl_ftp_pasv.phpt +++ b/ext/curl/tests/curl_ftp_pasv.phpt @@ -53,6 +53,6 @@ if (false === getenv('PHP_CURL_FTP_REMOTE_PASSWD')) exit("skip PHP_CURL_FTP_REM ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(true) ===DONE=== diff --git a/ext/curl/tests/curl_multi_errno_strerror_001.phpt b/ext/curl/tests/curl_multi_errno_strerror_001.phpt index 1fcdfe9558..9842aeda33 100644 --- a/ext/curl/tests/curl_multi_errno_strerror_001.phpt +++ b/ext/curl/tests/curl_multi_errno_strerror_001.phpt @@ -23,7 +23,7 @@ $errno = curl_multi_errno($mh); echo $errno . PHP_EOL; echo curl_multi_strerror($errno) . PHP_EOL; ?> ---EXPECTF-- +--EXPECT-- 0 No error 6 diff --git a/ext/curl/tests/curl_multi_getcontent_basic3.phpt b/ext/curl/tests/curl_multi_getcontent_basic3.phpt index 190fe9d9c0..9c0f7ddeba 100644 --- a/ext/curl/tests/curl_multi_getcontent_basic3.phpt +++ b/ext/curl/tests/curl_multi_getcontent_basic3.phpt @@ -46,7 +46,7 @@ Rein Velt (rein@velt.org) echo $results2; ?> ---EXPECTF-- +--EXPECT-- array(2) { ["test"]=> string(7) "getpost" diff --git a/ext/curl/tests/curl_multi_segfault.phpt b/ext/curl/tests/curl_multi_segfault.phpt index fffe9f1fbb..8af4dde635 100644 --- a/ext/curl/tests/curl_multi_segfault.phpt +++ b/ext/curl/tests/curl_multi_segfault.phpt @@ -50,6 +50,6 @@ if (false === getenv('PHP_CURL_FTP_REMOTE_PASSWD')) exit("skip PHP_CURL_FTP_REM curl_multi_close($cmh); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(true) ===DONE=== diff --git a/ext/curl/tests/curl_multi_strerror_001.phpt b/ext/curl/tests/curl_multi_strerror_001.phpt index ac330acaee..becaebd6cc 100644 --- a/ext/curl/tests/curl_multi_strerror_001.phpt +++ b/ext/curl/tests/curl_multi_strerror_001.phpt @@ -17,6 +17,6 @@ var_dump(strtolower(curl_multi_strerror(CURLM_OK))); var_dump(strtolower(curl_multi_strerror(CURLM_BAD_HANDLE))); ?> ---EXPECTF-- +--EXPECT-- string(8) "no error" string(20) "invalid multi handle" diff --git a/ext/curl/tests/curl_share_errno_strerror_001.phpt b/ext/curl/tests/curl_share_errno_strerror_001.phpt index 91476cdaff..1db23c7b92 100644 --- a/ext/curl/tests/curl_share_errno_strerror_001.phpt +++ b/ext/curl/tests/curl_share_errno_strerror_001.phpt @@ -23,7 +23,7 @@ $errno = curl_share_errno($sh); echo $errno . PHP_EOL; echo curl_share_strerror($errno) . PHP_EOL; ?> ---EXPECTF-- +--EXPECT-- 0 No error 1 diff --git a/ext/curl/tests/curl_strerror_001.phpt b/ext/curl/tests/curl_strerror_001.phpt index f8a0de311b..f103f43966 100644 --- a/ext/curl/tests/curl_strerror_001.phpt +++ b/ext/curl/tests/curl_strerror_001.phpt @@ -18,7 +18,7 @@ var_dump(strtolower(curl_strerror(CURLE_UNSUPPORTED_PROTOCOL))); var_dump(strtolower(curl_strerror(-1))); ?> ---EXPECTF-- +--EXPECT-- string(8) "no error" string(20) "unsupported protocol" string(13) "unknown error" diff --git a/ext/date/tests/003.phpt b/ext/date/tests/003.phpt index 2be6cf773d..8b1750ee22 100644 --- a/ext/date/tests/003.phpt +++ b/ext/date/tests/003.phpt @@ -10,7 +10,7 @@ for ($i = 0; $i < 32; $i++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(4) "31st" string(3) "1st" string(3) "2nd" diff --git a/ext/date/tests/004.phpt b/ext/date/tests/004.phpt index 33e1fc7910..fb64575cc9 100644 --- a/ext/date/tests/004.phpt +++ b/ext/date/tests/004.phpt @@ -25,7 +25,7 @@ foreach ($tz as $zone) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(1) "2" string(3) "177" string(1) "6" diff --git a/ext/date/tests/010.phpt b/ext/date/tests/010.phpt index ff42de5dea..2172a20068 100644 --- a/ext/date/tests/010.phpt +++ b/ext/date/tests/010.phpt @@ -7,7 +7,7 @@ date_default_timezone_set('UTC'); var_dump($timezone_abbreviations["utc"]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(5) { [0]=> array(3) { diff --git a/ext/date/tests/015.phpt b/ext/date/tests/015.phpt index 46001ad8f0..f870cef7bc 100644 --- a/ext/date/tests/015.phpt +++ b/ext/date/tests/015.phpt @@ -13,7 +13,7 @@ unset($dto); var_dump($tzold->getName()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(3) "UTC" string(3) "UTC" string(10) "US/Eastern" diff --git a/ext/date/tests/DatePeriod_getter.phpt b/ext/date/tests/DatePeriod_getter.phpt index 22006d1ae8..cd02bafd55 100644 --- a/ext/date/tests/DatePeriod_getter.phpt +++ b/ext/date/tests/DatePeriod_getter.phpt @@ -17,7 +17,7 @@ var_dump($period->getEndDate()->getTimeZone()->getName()); var_dump($period->getDateInterval()->format('%R%y-%m-%d-%h-%i-%s')); ?> ---EXPECTF-- +--EXPECT-- string(19) "2000-01-01 00:00:00" string(13) "Europe/Berlin" string(19) "2000-01-31 00:00:00" diff --git a/ext/date/tests/DateTimeZone_clone_basic4.phpt b/ext/date/tests/DateTimeZone_clone_basic4.phpt index a295b915ce..5d1219a87a 100644 --- a/ext/date/tests/DateTimeZone_clone_basic4.phpt +++ b/ext/date/tests/DateTimeZone_clone_basic4.phpt @@ -21,7 +21,7 @@ var_dump( $d1_clone->getName() ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing clone of objects derived from DateTimeZone class with __clone magic method*** -- DateTimeExt1 __clone magic method called -- string(16) "America/New_York" diff --git a/ext/date/tests/DateTimeZone_construct_error.phpt b/ext/date/tests/DateTimeZone_construct_error.phpt index 8c8b14f12c..fb8db122dc 100644 --- a/ext/date/tests/DateTimeZone_construct_error.phpt +++ b/ext/date/tests/DateTimeZone_construct_error.phpt @@ -23,7 +23,7 @@ try { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing DateTimeZone() : error conditions *** -- Testing new DateTimeZone() with more than expected no. of arguments -- diff --git a/ext/date/tests/DateTimeZone_construct_variation1.phpt b/ext/date/tests/DateTimeZone_construct_variation1.phpt index d9625eedc0..c2b208f0df 100644 --- a/ext/date/tests/DateTimeZone_construct_variation1.phpt +++ b/ext/date/tests/DateTimeZone_construct_variation1.phpt @@ -109,7 +109,7 @@ fclose( $file_handle ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing DateTime::__construct() : usage variation - unexpected values to first argument $timezone*** -- int 0 -- diff --git a/ext/date/tests/DateTimeZone_extends_basic1.phpt b/ext/date/tests/DateTimeZone_extends_basic1.phpt index afc2ed64b2..7857e166bc 100644 --- a/ext/date/tests/DateTimeZone_extends_basic1.phpt +++ b/ext/date/tests/DateTimeZone_extends_basic1.phpt @@ -24,7 +24,7 @@ echo $d . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing basic DateTimeZone inheritance() *** -- Create an instance of DateTimeZoneExt -- diff --git a/ext/date/tests/DateTimeZone_serialize_type_3.phpt b/ext/date/tests/DateTimeZone_serialize_type_3.phpt index 396bff9196..885a17debd 100644 --- a/ext/date/tests/DateTimeZone_serialize_type_3.phpt +++ b/ext/date/tests/DateTimeZone_serialize_type_3.phpt @@ -17,7 +17,7 @@ var_dump( $tz2->getName() ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- object(DateTimeZone)#1 (2) { ["timezone_type"]=> int(3) diff --git a/ext/date/tests/DateTime_clone_basic1.phpt b/ext/date/tests/DateTime_clone_basic1.phpt index cef6621a75..0ddd74b14e 100644 --- a/ext/date/tests/DateTime_clone_basic1.phpt +++ b/ext/date/tests/DateTime_clone_basic1.phpt @@ -22,7 +22,7 @@ echo "Clone: " . $clone->format("H:i:s") . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing clone on DateTime objects *** Original: 22:41:50 Clone: 14:25:41 diff --git a/ext/date/tests/DateTime_clone_basic4.phpt b/ext/date/tests/DateTime_clone_basic4.phpt index f19f23d97b..ecb0890bb1 100644 --- a/ext/date/tests/DateTime_clone_basic4.phpt +++ b/ext/date/tests/DateTime_clone_basic4.phpt @@ -24,7 +24,7 @@ var_dump( $d1_clone->format( "m.d.y") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing clone of objects derived from DateTime class with __clone magic method*** -- DateTimeExt1 __clone magic method called -- string(8) "02.03.09" diff --git a/ext/date/tests/DateTime_construct_error.phpt b/ext/date/tests/DateTime_construct_error.phpt index d0a453fd9d..71ce3d3018 100644 --- a/ext/date/tests/DateTime_construct_error.phpt +++ b/ext/date/tests/DateTime_construct_error.phpt @@ -24,7 +24,7 @@ try { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_create() : error conditions *** -- Testing new DateTime() with more than expected no. of arguments -- diff --git a/ext/date/tests/DateTime_extends_basic1.phpt b/ext/date/tests/DateTime_extends_basic1.phpt index 8fe53d69f8..c5f1b90ef2 100644 --- a/ext/date/tests/DateTime_extends_basic1.phpt +++ b/ext/date/tests/DateTime_extends_basic1.phpt @@ -34,7 +34,7 @@ echo $d . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing basic DateTime inheritance() *** -- Create an instance of DateTimeExt -- diff --git a/ext/date/tests/DateTime_extends_basic2.phpt b/ext/date/tests/DateTime_extends_basic2.phpt index a4bf4aa27f..72d27fbd2c 100644 --- a/ext/date/tests/DateTime_extends_basic2.phpt +++ b/ext/date/tests/DateTime_extends_basic2.phpt @@ -25,7 +25,7 @@ echo $d->format("F j, Y, g:i:s a") . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing new DateTime() : with user space __construct magic method *** May 1, 1967, 10:30:41 pm ===DONE===
\ No newline at end of file diff --git a/ext/date/tests/DateTime_extends_basic3.phpt b/ext/date/tests/DateTime_extends_basic3.phpt index bee395aa96..7a8c0bb63d 100644 --- a/ext/date/tests/DateTime_extends_basic3.phpt +++ b/ext/date/tests/DateTime_extends_basic3.phpt @@ -20,7 +20,7 @@ echo $d->format() . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing new DateTime() : with user format() method *** May 1, 1967, 10:30:41 pm ===DONE=== diff --git a/ext/date/tests/DateTime_fix_createFromFormat.phpt b/ext/date/tests/DateTime_fix_createFromFormat.phpt index abde292775..f018eb4297 100644 --- a/ext/date/tests/DateTime_fix_createFromFormat.phpt +++ b/ext/date/tests/DateTime_fix_createFromFormat.phpt @@ -22,7 +22,7 @@ echo "createFromFormat method: " . $fromFormat->format("D., M. j, Y g:iA") . "\n ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing clone on DateTime objects *** Format method: Thu., Nov. 29, 2012 5:00PM createFromFormat method: Thu., Nov. 29, 2012 5:00PM diff --git a/ext/date/tests/DateTime_getOffset_basic1.phpt b/ext/date/tests/DateTime_getOffset_basic1.phpt index 41b1a78d75..30ff125955 100644 --- a/ext/date/tests/DateTime_getOffset_basic1.phpt +++ b/ext/date/tests/DateTime_getOffset_basic1.phpt @@ -21,7 +21,7 @@ echo "Summer offset: " . $summer->getOffset() / 3600 . " hours\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing DateTime::getOffset() : basic functionality *** Winter offset: 0 hours Summer offset: 1 hours diff --git a/ext/date/tests/DateTime_getTimeZone_basic1.phpt b/ext/date/tests/DateTime_getTimeZone_basic1.phpt index ee8a0db9a3..0f3edb33e2 100644 --- a/ext/date/tests/DateTime_getTimeZone_basic1.phpt +++ b/ext/date/tests/DateTime_getTimeZone_basic1.phpt @@ -25,7 +25,7 @@ var_dump( $object->getTimeZone()->getName() ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing DateTime::getTimezone() : basic functionality *** string(13) "Europe/London" string(16) "America/New_York" diff --git a/ext/date/tests/DateTime_modify_basic1.phpt b/ext/date/tests/DateTime_modify_basic1.phpt index 052524d5a4..277a6b2965 100644 --- a/ext/date/tests/DateTime_modify_basic1.phpt +++ b/ext/date/tests/DateTime_modify_basic1.phpt @@ -30,7 +30,7 @@ echo "After modification 4: " . $datetime->format("D, d M Y") . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing DateTime::modify() : basic functionality *** After modification 1: Sun, 01 Feb 2009 After modification 2: Tue, 10 Feb 2009 18:28:43 diff --git a/ext/date/tests/DateTime_setDate_basic1.phpt b/ext/date/tests/DateTime_setDate_basic1.phpt index 7989470cda..8ead020c01 100644 --- a/ext/date/tests/DateTime_setDate_basic1.phpt +++ b/ext/date/tests/DateTime_setDate_basic1.phpt @@ -23,7 +23,7 @@ echo $datetime->format(DATE_RFC2822) . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing DateTime::setDate() : basic functionality *** Fri, 30 Jan 2009 19:34:10 +0000 Fri, 01 Feb 2008 19:34:10 +0000 diff --git a/ext/date/tests/DateTime_setISODate_basic1.phpt b/ext/date/tests/DateTime_setISODate_basic1.phpt index cdedb44e7a..ef6caf0f23 100644 --- a/ext/date/tests/DateTime_setISODate_basic1.phpt +++ b/ext/date/tests/DateTime_setISODate_basic1.phpt @@ -30,7 +30,7 @@ echo "..same day last year was \"" . $datetime->format("D M j") . "\"\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing DateTime::setISODate() : basic functionality *** Week 40 of 2009 is in "September" Week 30 day 3 of 2009 is "Wed Jul 22" diff --git a/ext/date/tests/DateTime_setTime_basic1.phpt b/ext/date/tests/DateTime_setTime_basic1.phpt index bd95fecd08..0dde746c27 100644 --- a/ext/date/tests/DateTime_setTime_basic1.phpt +++ b/ext/date/tests/DateTime_setTime_basic1.phpt @@ -35,7 +35,7 @@ echo "After modification5 " . $datetime ->format(DATE_RFC2822) . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing DateTime::setTime() : basic functionality *** Initial date: Sat, 31 Jan 2009 15:14:10 +0000 After modification1 Sat, 31 Jan 2009 17:20:00 +0000 diff --git a/ext/date/tests/DateTime_setTimezone_basic1.phpt b/ext/date/tests/DateTime_setTimezone_basic1.phpt index f4f479fe04..4f3825ac88 100644 --- a/ext/date/tests/DateTime_setTimezone_basic1.phpt +++ b/ext/date/tests/DateTime_setTimezone_basic1.phpt @@ -22,7 +22,7 @@ echo "New timezone: " . date_timezone_get($datetime)->getName() . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing DateTime::setTimezone() : basic functionality *** Default timezone: Europe/London New timezone: America/Los_Angeles diff --git a/ext/date/tests/bug33415-2.phpt b/ext/date/tests/bug33415-2.phpt index a78557df55..aa15ef93df 100644 --- a/ext/date/tests/bug33415-2.phpt +++ b/ext/date/tests/bug33415-2.phpt @@ -208,7 +208,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; print "wanted=Monday 00:30:00\n\n"; ?> ---EXPECTF-- +--EXPECT-- TZ=Africa/Bujumbura - *Note*: Unexpected, as does not appear to have a DST or timezone transition. tStamp=Thursday 1970-01-01 17:17:17 CAT 0 diff --git a/ext/date/tests/bug45081.phpt b/ext/date/tests/bug45081.phpt index a312b52260..f82303f31e 100644 --- a/ext/date/tests/bug45081.phpt +++ b/ext/date/tests/bug45081.phpt @@ -10,6 +10,6 @@ print "\n"; print strtotime('2008-05-23 00:00:00'); ?> ---EXPECTF-- +--EXPECT-- 1211472000 1211472000 diff --git a/ext/date/tests/bug48187.phpt b/ext/date/tests/bug48187.phpt index 78c0fb2a60..e3af51d767 100644 --- a/ext/date/tests/bug48187.phpt +++ b/ext/date/tests/bug48187.phpt @@ -23,6 +23,6 @@ if (time() - $begin_t < 1) { var_dump('time() difference greater or equal 1 second'); } ?> ---EXPECTF-- +--EXPECT-- string(36) "microtime() difference less 1 second" string(31) "time() difference less 1 second"
\ No newline at end of file diff --git a/ext/date/tests/bug48678.phpt b/ext/date/tests/bug48678.phpt index 9565cb2dfb..4f3b51d5b1 100644 --- a/ext/date/tests/bug48678.phpt +++ b/ext/date/tests/bug48678.phpt @@ -6,7 +6,7 @@ $x = new DateInterval("P3Y6M4DT12H30M5S"); print_r($x); $y = unserialize(serialize($x)); print_r($y); ---EXPECTF-- +--EXPECT-- DateInterval Object ( [y] => 3 diff --git a/ext/date/tests/bug51819.phpt b/ext/date/tests/bug51819.phpt index 37cab2055e..a5f21abf85 100644 --- a/ext/date/tests/bug51819.phpt +++ b/ext/date/tests/bug51819.phpt @@ -30,5 +30,5 @@ foreach ($aTz as $sTz) { var_dump('this should be the only output'); ?> ---EXPECTF-- +--EXPECT-- string(30) "this should be the only output" diff --git a/ext/date/tests/bug51994.phpt b/ext/date/tests/bug51994.phpt index 2c456ba6e3..dd7f9032c5 100644 --- a/ext/date/tests/bug51994.phpt +++ b/ext/date/tests/bug51994.phpt @@ -6,7 +6,7 @@ $trans_date = '10153'; // 152nd day of year 2010 -> 03.06.2010 $a_date = date_parse_from_format('yz', $trans_date); var_dump($a_date); ?> ---EXPECTF-- +--EXPECT-- array(12) { ["year"]=> int(2010) diff --git a/ext/date/tests/bug52063.phpt b/ext/date/tests/bug52063.phpt index 7364a80612..9818c88ce7 100644 --- a/ext/date/tests/bug52063.phpt +++ b/ext/date/tests/bug52063.phpt @@ -10,6 +10,6 @@ $a = date_create("2009-01-01", null); echo $a->format(DateTime::COOKIE); echo "\n"; ?> ---EXPECTF-- +--EXPECT-- Thursday, 01-Jan-2009 00:00:00 WET Thursday, 01-Jan-2009 00:00:00 WET diff --git a/ext/date/tests/bug52290.phpt b/ext/date/tests/bug52290.phpt index 78ede1387c..735df6ad18 100644 --- a/ext/date/tests/bug52290.phpt +++ b/ext/date/tests/bug52290.phpt @@ -20,7 +20,7 @@ var_dump($dt->format('o-\WW-N | Y-m-d | H:i:s | U')); $dt->setTime(20, 30, 40); var_dump($dt->format('o-\WW-N | Y-m-d | H:i:s | U')); ?> ---EXPECTF-- +--EXPECT-- string(47) "2005-W52-7 | 2006-01-01 | 00:00:00 | 1136073600" string(47) "2005-W52-1 | 2005-12-26 | 00:00:00 | 1135555200" string(47) "2007-W41-3 | 2007-10-10 | 00:00:00 | 1191974400" diff --git a/ext/date/tests/bug53879.phpt b/ext/date/tests/bug53879.phpt index 3fd8250415..30dbb693e7 100644 --- a/ext/date/tests/bug53879.phpt +++ b/ext/date/tests/bug53879.phpt @@ -7,7 +7,7 @@ date.timezone=UTC $date = DateTime::createFromFormat(DateTime::COOKIE, "Mon, 21-Jan-2041 15:24:52 GMT"); print_r($date); ?> ---EXPECTF-- +--EXPECT-- DateTime Object ( [date] => 2041-01-21 15:24:52.000000 diff --git a/ext/date/tests/bug54283.phpt b/ext/date/tests/bug54283.phpt index 780d0fa762..9a8a07ce5a 100644 --- a/ext/date/tests/bug54283.phpt +++ b/ext/date/tests/bug54283.phpt @@ -10,5 +10,5 @@ try { } ?> ---EXPECTF-- +--EXPECT-- string(51) "DatePeriod::__construct(): Unknown or bad format ()" diff --git a/ext/date/tests/bug55407.phpt b/ext/date/tests/bug55407.phpt index 7180d2f37f..c4638c94b3 100644 --- a/ext/date/tests/bug55407.phpt +++ b/ext/date/tests/bug55407.phpt @@ -13,5 +13,5 @@ class DateTime extends \DateTime { echo "DONE\n"; ?> ---EXPECTF-- +--EXPECT-- DONE diff --git a/ext/date/tests/bug61642.phpt b/ext/date/tests/bug61642.phpt index d03a814d88..872ceb4f3e 100644 --- a/ext/date/tests/bug61642.phpt +++ b/ext/date/tests/bug61642.phpt @@ -34,7 +34,7 @@ foreach ($weekdays as $days) { echo implode(' ', $line), "\n"; } ?> ---EXPECTF-- +--EXPECT-- ### 2012-03-29 Thu 2012-03-30 Fri 2012-03-31 Sat 2012-04-01 Sun 2012-04-02 Mon 2012-04-03 Tue 2012-04-04 Wed 2012-04-05 Thu -11 2012-03-14 Wed 2012-03-15 Thu 2012-03-16 Fri 2012-03-16 Fri 2012-03-16 Fri 2012-03-19 Mon 2012-03-20 Tue 2012-03-21 Wed diff --git a/ext/date/tests/bug67118_2.phpt b/ext/date/tests/bug67118_2.phpt index 9b6f545525..fcd7037868 100644 --- a/ext/date/tests/bug67118_2.phpt +++ b/ext/date/tests/bug67118_2.phpt @@ -21,7 +21,7 @@ $date = '12 Sep 2007 15:49:12 UT'; var_dump(new Foo($date)); ?> Done ---EXPECTF-- +--EXPECT-- First try Second try object(Foo)#1 (3) { diff --git a/ext/date/tests/bug74080.phpt b/ext/date/tests/bug74080.phpt index 3c881edeec..a86c78144e 100644 --- a/ext/date/tests/bug74080.phpt +++ b/ext/date/tests/bug74080.phpt @@ -7,5 +7,5 @@ $date = mktime(17, 52, 13, 4, 30, 2016); var_dump(date(\DateTime::RFC7231, $date)); ?> ---EXPECTF-- +--EXPECT-- string(29) "Sat, 30 Apr 2016 17:52:13 GMT" diff --git a/ext/date/tests/bug75222.phpt b/ext/date/tests/bug75222.phpt index 2a2ee5ff21..dc9ad22ea8 100644 --- a/ext/date/tests/bug75222.phpt +++ b/ext/date/tests/bug75222.phpt @@ -11,7 +11,7 @@ var_dump($diff->f); var_dump(get_object_vars($diff)['f']); var_dump($diff->f === get_object_vars($diff)['f']); ?> ---EXPECTF-- +--EXPECT-- float(0.123456) float(0.123456) bool(true) diff --git a/ext/date/tests/date_add_basic.phpt b/ext/date/tests/date_add_basic.phpt index 14a3d832bb..38d7ed76e2 100644 --- a/ext/date/tests/date_add_basic.phpt +++ b/ext/date/tests/date_add_basic.phpt @@ -35,7 +35,7 @@ foreach($intervals as $interval) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_add() : basic functionality *** string(19) "2008-01-01 12:25:00" string(19) "2011-07-06 00:55:05" diff --git a/ext/date/tests/date_date_set_basic1.phpt b/ext/date/tests/date_date_set_basic1.phpt index 64802125f6..831a862d0c 100644 --- a/ext/date/tests/date_date_set_basic1.phpt +++ b/ext/date/tests/date_date_set_basic1.phpt @@ -23,7 +23,7 @@ echo date_format($datetime, DATE_RFC2822) . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_date_set() : basic functionality *** Fri, 30 Jan 2009 19:34:10 +0000 Fri, 01 Feb 2008 19:34:10 +0000 diff --git a/ext/date/tests/date_default_timezone_get-1-win32.phpt b/ext/date/tests/date_default_timezone_get-1-win32.phpt index fbd5c6d856..73003fb689 100644 --- a/ext/date/tests/date_default_timezone_get-1-win32.phpt +++ b/ext/date/tests/date_default_timezone_get-1-win32.phpt @@ -16,6 +16,6 @@ date.timezone= from the multiple names like Europe/Berlin or Europe/Paris . For this reason the test is parametrized so there is no hardcoded timezone data.*/ ?> ---EXPECTF-- +--EXPECT-- UTC UTC diff --git a/ext/date/tests/date_default_timezone_get-2.phpt b/ext/date/tests/date_default_timezone_get-2.phpt index b2f4b8232f..5c835c35f3 100644 --- a/ext/date/tests/date_default_timezone_get-2.phpt +++ b/ext/date/tests/date_default_timezone_get-2.phpt @@ -11,5 +11,5 @@ date.timezone= putenv('TZ='); echo date_default_timezone_get(), "\n"; ?> ---EXPECTF-- +--EXPECT-- UTC diff --git a/ext/date/tests/date_format_basic1.phpt b/ext/date/tests/date_format_basic1.phpt index dc55efb0ae..dc2a84a9b1 100644 --- a/ext/date/tests/date_format_basic1.phpt +++ b/ext/date/tests/date_format_basic1.phpt @@ -26,7 +26,7 @@ var_dump( date_format($date, "H:i:s") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_format() : basic functionality *** string(23) "July 14, 2005, 10:30 pm" string(8) "07.14.05" diff --git a/ext/date/tests/date_interval_create_from_date_string.phpt b/ext/date/tests/date_interval_create_from_date_string.phpt index 9a1745c9ac..318bf3d629 100644 --- a/ext/date/tests/date_interval_create_from_date_string.phpt +++ b/ext/date/tests/date_interval_create_from_date_string.phpt @@ -25,7 +25,7 @@ $i = date_interval_create_from_date_string($string); var_dump($i->y); var_dump($i->d); ?> ---EXPECTF-- +--EXPECT-- int(1) int(14) int(3) diff --git a/ext/date/tests/date_interval_format.phpt b/ext/date/tests/date_interval_format.phpt index 768fe46b6a..801dd4e97d 100644 --- a/ext/date/tests/date_interval_format.phpt +++ b/ext/date/tests/date_interval_format.phpt @@ -16,6 +16,6 @@ $interval = new DateInterval('P32D'); echo date_interval_format($interval, '%d days'); ?> ---EXPECTF-- +--EXPECT-- 4 days 32 days diff --git a/ext/date/tests/date_isodate_set_basic1.phpt b/ext/date/tests/date_isodate_set_basic1.phpt index dc8daba533..2764ce8dba 100644 --- a/ext/date/tests/date_isodate_set_basic1.phpt +++ b/ext/date/tests/date_isodate_set_basic1.phpt @@ -30,7 +30,7 @@ echo "..same day last year was \"" . date_format($datetime, "D M j") . "\"\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_isodate_set() : basic functionality *** Week 40 of 2009 is in "September" Week 30 day 3 of 2009 is "Wed Jul 22" diff --git a/ext/date/tests/date_modify_basic1.phpt b/ext/date/tests/date_modify_basic1.phpt index 038b94ce08..42e0ebf60d 100644 --- a/ext/date/tests/date_modify_basic1.phpt +++ b/ext/date/tests/date_modify_basic1.phpt @@ -30,7 +30,7 @@ echo "After modification 4: " . date_format($datetime, "D, d M Y") . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_modify() : basic functionality *** After modification 1: Sun, 01 Feb 2009 After modification 2: Tue, 10 Feb 2009 18:28:43 diff --git a/ext/date/tests/date_offset_get_basic1.phpt b/ext/date/tests/date_offset_get_basic1.phpt index 42f38939e8..ec6fb16350 100644 --- a/ext/date/tests/date_offset_get_basic1.phpt +++ b/ext/date/tests/date_offset_get_basic1.phpt @@ -21,7 +21,7 @@ echo "Summer offset: " . date_offset_get($summer) / 3600 . " hours\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_offset_get() : basic functionality *** Winter offset: 0 hours Summer offset: 1 hours diff --git a/ext/date/tests/date_sub_basic.phpt b/ext/date/tests/date_sub_basic.phpt index 0e12704945..00e9626198 100644 --- a/ext/date/tests/date_sub_basic.phpt +++ b/ext/date/tests/date_sub_basic.phpt @@ -35,7 +35,7 @@ foreach($intervals as $interval) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_sub() : basic functionality *** string(19) "2008-01-01 12:25:00" string(19) "2004-06-26 23:54:55" diff --git a/ext/date/tests/date_sun_info_001.phpt b/ext/date/tests/date_sun_info_001.phpt index 44b6d112e4..35ca37ae98 100644 --- a/ext/date/tests/date_sun_info_001.phpt +++ b/ext/date/tests/date_sun_info_001.phpt @@ -7,7 +7,7 @@ $sun_info = date_sun_info(strtotime("2006-12-12"), 31.7667, 35.2333); var_dump($sun_info); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(9) { ["sunrise"]=> int(1165897761) diff --git a/ext/date/tests/date_sun_info_002.phpt b/ext/date/tests/date_sun_info_002.phpt index 4df725187d..73956cc46a 100644 --- a/ext/date/tests/date_sun_info_002.phpt +++ b/ext/date/tests/date_sun_info_002.phpt @@ -10,7 +10,7 @@ foreach ($sun_info as $key => $elem ) } echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 2007-04-13 06:13:31 CEST sunrise 2007-04-13 20:30:51 CEST sunset 2007-04-13 13:22:11 CEST transit diff --git a/ext/date/tests/date_sun_info_003.phpt b/ext/date/tests/date_sun_info_003.phpt index 7e18d2da41..7e74bab621 100644 --- a/ext/date/tests/date_sun_info_003.phpt +++ b/ext/date/tests/date_sun_info_003.phpt @@ -19,7 +19,7 @@ foreach ($sun_info as $key => $elem ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- sunrise: 21:00:00 sunset: 21:00:00 transit: 10:03:48 diff --git a/ext/date/tests/date_sunrise_variation7.phpt b/ext/date/tests/date_sunrise_variation7.phpt index 6e9c2ec83b..3993ca6a8b 100644 --- a/ext/date/tests/date_sunrise_variation7.phpt +++ b/ext/date/tests/date_sunrise_variation7.phpt @@ -34,7 +34,7 @@ foreach($inputs as $timezone => $value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_sunrise() : usage variation *** string(5) "06:42" string(5) "06:41" diff --git a/ext/date/tests/date_sunrise_variation8.phpt b/ext/date/tests/date_sunrise_variation8.phpt index 1d22be8c8c..fe8aefeb9f 100644 --- a/ext/date/tests/date_sunrise_variation8.phpt +++ b/ext/date/tests/date_sunrise_variation8.phpt @@ -36,7 +36,7 @@ foreach( $time_date as $date => $time ){ ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_sunrise() : usage variation *** --12 Aug 2008-- diff --git a/ext/date/tests/date_sunset_variation7.phpt b/ext/date/tests/date_sunset_variation7.phpt index 67bd2f4182..00d836dcbe 100644 --- a/ext/date/tests/date_sunset_variation7.phpt +++ b/ext/date/tests/date_sunset_variation7.phpt @@ -34,7 +34,7 @@ foreach($inputs as $timezone => $value) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_sunset() : usage variation *** --Pacific/Samoa-- diff --git a/ext/date/tests/date_sunset_variation8.phpt b/ext/date/tests/date_sunset_variation8.phpt index 07319ab4e1..dcccfaccb6 100644 --- a/ext/date/tests/date_sunset_variation8.phpt +++ b/ext/date/tests/date_sunset_variation8.phpt @@ -36,7 +36,7 @@ foreach( $time_date as $date => $time ){ ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_sunset() : usage variation *** --12 Aug 2008-- diff --git a/ext/date/tests/date_time_set_basic1.phpt b/ext/date/tests/date_time_set_basic1.phpt index c0c9c66c56..9c1a025d47 100644 --- a/ext/date/tests/date_time_set_basic1.phpt +++ b/ext/date/tests/date_time_set_basic1.phpt @@ -35,7 +35,7 @@ echo "After modification5 " . date_format($datetime, DATE_RFC2822) . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_time_set() : basic functionality *** Initial date: Sat, 31 Jan 2009 15:14:10 +0000 After modification1 Sat, 31 Jan 2009 17:20:00 +0000 diff --git a/ext/date/tests/date_timestamp_set.phpt b/ext/date/tests/date_timestamp_set.phpt index e01660193f..24546ee2ad 100644 --- a/ext/date/tests/date_timestamp_set.phpt +++ b/ext/date/tests/date_timestamp_set.phpt @@ -15,5 +15,5 @@ date_timestamp_set($dtms021, 1234567890); var_dump(date_format($dtms021, 'B => (U) => T Y-M-d H:i:s')); ?> ---EXPECTF-- +--EXPECT-- string(47) "021 => (1234567890) => UTC 2009-Feb-13 23:31:30"
\ No newline at end of file diff --git a/ext/date/tests/date_timestamp_set_nullparam2.phpt b/ext/date/tests/date_timestamp_set_nullparam2.phpt index 1442da4426..8983cc4e2d 100644 --- a/ext/date/tests/date_timestamp_set_nullparam2.phpt +++ b/ext/date/tests/date_timestamp_set_nullparam2.phpt @@ -13,7 +13,7 @@ $dtms021 = date_create(); var_dump(date_timestamp_set($dtms021, null)); ?> ---EXPECTF-- +--EXPECT-- object(DateTime)#1 (3) { ["date"]=> string(26) "1970-01-01 00:00:00.000000" diff --git a/ext/date/tests/date_timezone_get_basic1.phpt b/ext/date/tests/date_timezone_get_basic1.phpt index f77352ef8f..7e86036ada 100644 --- a/ext/date/tests/date_timezone_get_basic1.phpt +++ b/ext/date/tests/date_timezone_get_basic1.phpt @@ -27,7 +27,7 @@ var_dump( timezone_name_get($tz) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_timezone_get() : basic functionality *** string(13) "Europe/London" string(16) "America/New_York" diff --git a/ext/date/tests/date_timezone_set_basic1.phpt b/ext/date/tests/date_timezone_set_basic1.phpt index 2e9154cebe..6df429b3a9 100644 --- a/ext/date/tests/date_timezone_set_basic1.phpt +++ b/ext/date/tests/date_timezone_set_basic1.phpt @@ -26,7 +26,7 @@ echo "New timezone: " . timezone_name_get($tz) . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing date_timezone_set() : basic functionality *** Default timezone: Europe/London New timezone: America/Los_Angeles diff --git a/ext/date/tests/getdate_variation2.phpt b/ext/date/tests/getdate_variation2.phpt index f987d2134d..bd3b6d5779 100644 --- a/ext/date/tests/getdate_variation2.phpt +++ b/ext/date/tests/getdate_variation2.phpt @@ -31,7 +31,7 @@ foreach($inputs as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing getdate() : usage variation *** --octal 05-- diff --git a/ext/date/tests/getdate_variation3.phpt b/ext/date/tests/getdate_variation3.phpt index f7d6863208..7001237d0a 100644 --- a/ext/date/tests/getdate_variation3.phpt +++ b/ext/date/tests/getdate_variation3.phpt @@ -31,7 +31,7 @@ foreach($inputs as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing getdate() : usage variation *** --hexadcimal 0x5-- diff --git a/ext/date/tests/getdate_variation4.phpt b/ext/date/tests/getdate_variation4.phpt index 92719ac650..59c1681cd7 100644 --- a/ext/date/tests/getdate_variation4.phpt +++ b/ext/date/tests/getdate_variation4.phpt @@ -32,7 +32,7 @@ foreach($inputs as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing getdate() : usage variation *** --01 Jan 1970-- diff --git a/ext/date/tests/getdate_variation5.phpt b/ext/date/tests/getdate_variation5.phpt index e4524a8659..9cf29a2fc8 100644 --- a/ext/date/tests/getdate_variation5.phpt +++ b/ext/date/tests/getdate_variation5.phpt @@ -36,7 +36,7 @@ foreach($inputs as $timezone) { }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing getdate() : usage variation *** --Pacific/Samoa-- diff --git a/ext/date/tests/getdate_variation6.phpt b/ext/date/tests/getdate_variation6.phpt index 5c03a3bb71..64943ce864 100644 --- a/ext/date/tests/getdate_variation6.phpt +++ b/ext/date/tests/getdate_variation6.phpt @@ -26,7 +26,7 @@ foreach($inputs as $key => $value) { }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing getdate() : usage variation *** --String 0-- diff --git a/ext/date/tests/gmmktime_variation8.phpt b/ext/date/tests/gmmktime_variation8.phpt index b0c56a127b..dac3ecfe99 100644 --- a/ext/date/tests/gmmktime_variation8.phpt +++ b/ext/date/tests/gmmktime_variation8.phpt @@ -33,7 +33,7 @@ echo "\n-- Testing gmmktime() function with supplying hexa decimal values to arg var_dump( gmmktime($hour, $min, $sec, $mon, $day, $year) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing gmmktime() : usage variation *** -- Testing gmmktime() function with supplying octal values to arguments -- diff --git a/ext/date/tests/gmstrftime_variation19.phpt b/ext/date/tests/gmstrftime_variation19.phpt index 9ba714750e..78af097cbd 100644 --- a/ext/date/tests/gmstrftime_variation19.phpt +++ b/ext/date/tests/gmstrftime_variation19.phpt @@ -37,7 +37,7 @@ foreach($inputs as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing gmstrftime() : usage variation *** --Newline character-- diff --git a/ext/date/tests/gmstrftime_variation8.phpt b/ext/date/tests/gmstrftime_variation8.phpt index 59057aa173..0d3f6b0632 100644 --- a/ext/date/tests/gmstrftime_variation8.phpt +++ b/ext/date/tests/gmstrftime_variation8.phpt @@ -30,7 +30,7 @@ foreach($inputs as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing gmstrftime() : usage variation *** --A literal % character-- diff --git a/ext/date/tests/idate_variation6.phpt b/ext/date/tests/idate_variation6.phpt index 161a80d511..bc02e275af 100644 --- a/ext/date/tests/idate_variation6.phpt +++ b/ext/date/tests/idate_variation6.phpt @@ -23,7 +23,7 @@ $timestamp = mktime(8, 8, 8, 8, 8, 2001); var_dump( idate($format, $timestamp) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing idate() : usage variation *** -- Testing idate() function for 2 digit year having no zero as starting number -- diff --git a/ext/date/tests/localtime_variation4.phpt b/ext/date/tests/localtime_variation4.phpt index 2796c22d5b..5eedb7a3f6 100644 --- a/ext/date/tests/localtime_variation4.phpt +++ b/ext/date/tests/localtime_variation4.phpt @@ -31,7 +31,7 @@ foreach($inputs as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing localtime() : usage variation *** --Octal 0-- diff --git a/ext/date/tests/localtime_variation5.phpt b/ext/date/tests/localtime_variation5.phpt index 883e34887b..cd48a162af 100644 --- a/ext/date/tests/localtime_variation5.phpt +++ b/ext/date/tests/localtime_variation5.phpt @@ -31,7 +31,7 @@ foreach($inputs as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing localtime() : usage variation *** --Hexa-decimal 0-- diff --git a/ext/date/tests/strftime_variation19.phpt b/ext/date/tests/strftime_variation19.phpt index f36d0a189e..49fe1c1f1c 100644 --- a/ext/date/tests/strftime_variation19.phpt +++ b/ext/date/tests/strftime_variation19.phpt @@ -37,7 +37,7 @@ foreach($inputs as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strftime() : usage variation *** --Newline character-- diff --git a/ext/date/tests/strftime_variation8.phpt b/ext/date/tests/strftime_variation8.phpt index af8089f980..2dd50931e6 100644 --- a/ext/date/tests/strftime_variation8.phpt +++ b/ext/date/tests/strftime_variation8.phpt @@ -22,7 +22,7 @@ var_dump( strftime($format, $timestamp) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strftime() : usage variation *** -- Testing strftime() function with a literal % character to format -- diff --git a/ext/date/tests/timezone_abbreviations_list_basic1.phpt b/ext/date/tests/timezone_abbreviations_list_basic1.phpt index c3510f1e64..e5f2f6d718 100644 --- a/ext/date/tests/timezone_abbreviations_list_basic1.phpt +++ b/ext/date/tests/timezone_abbreviations_list_basic1.phpt @@ -23,7 +23,7 @@ var_dump( $abbr["acst"] ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing timezone_abbreviations_list() : basic functionality *** string(5) "array" int(142) diff --git a/ext/date/tests/timezone_identifiers_list_basic1.phpt b/ext/date/tests/timezone_identifiers_list_basic1.phpt index 4476da20dd..474c56c213 100644 --- a/ext/date/tests/timezone_identifiers_list_basic1.phpt +++ b/ext/date/tests/timezone_identifiers_list_basic1.phpt @@ -24,7 +24,7 @@ var_dump(in_array("UTC", $zones)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing timezone_identifiers_list() : basic functionality *** Check return tpe is ARRAY bool(true) diff --git a/ext/date/tests/timezone_name_from_abbr_basic1.phpt b/ext/date/tests/timezone_name_from_abbr_basic1.phpt index b6a0bd94f7..1a7ea5e4cf 100644 --- a/ext/date/tests/timezone_name_from_abbr_basic1.phpt +++ b/ext/date/tests/timezone_name_from_abbr_basic1.phpt @@ -36,7 +36,7 @@ var_dump( timezone_name_from_abbr("", 5400) ); // offset = 1.5 hrs var_dump( timezone_name_from_abbr("", 62400) ); // offset = 24 hrs ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing timezone_name_from_abbr() : basic functionality *** -- Tests with special cases first - no lookup needed -- string(3) "UTC" diff --git a/ext/date/tests/timezone_offset_get_variation1.phpt b/ext/date/tests/timezone_offset_get_variation1.phpt index ad0b8fd956..1aeab06c5c 100644 --- a/ext/date/tests/timezone_offset_get_variation1.phpt +++ b/ext/date/tests/timezone_offset_get_variation1.phpt @@ -119,7 +119,7 @@ fclose( $file_handle ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing timezone_offset_get() : usage variation - unexpected values to first argument $object*** -- int 0 -- diff --git a/ext/date/tests/timezone_offset_get_variation2.phpt b/ext/date/tests/timezone_offset_get_variation2.phpt index 64835500c4..3bb8e69823 100644 --- a/ext/date/tests/timezone_offset_get_variation2.phpt +++ b/ext/date/tests/timezone_offset_get_variation2.phpt @@ -119,7 +119,7 @@ fclose( $file_handle ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing timezone_offset_get() : usage variation - unexpected values to second argument $datetime*** -- int 0 -- diff --git a/ext/dba/tests/dba_db4_001.phpt b/ext/dba/tests/dba_db4_001.phpt index ecc8389cb1..992a900532 100644 --- a/ext/dba/tests/dba_db4_001.phpt +++ b/ext/dba/tests/dba_db4_001.phpt @@ -26,7 +26,7 @@ if (($db_file = dba_open($db_filename, "c", $handler)) !== FALSE) { <?php require(dirname(__FILE__) .'/clean.inc'); ?> ---EXPECTF-- +--EXPECT-- database handler: db4 database file created This is a test insert diff --git a/ext/dba/tests/dba_db4_002.phpt b/ext/dba/tests/dba_db4_002.phpt index 18ac0ec461..9f08311e80 100644 --- a/ext/dba/tests/dba_db4_002.phpt +++ b/ext/dba/tests/dba_db4_002.phpt @@ -26,7 +26,7 @@ if (($db_file = dba_open($db_filename, "n", $handler)) !== FALSE) { <?php require(dirname(__FILE__) .'/clean.inc'); ?> ---EXPECTF-- +--EXPECT-- database handler: db4 database file created This is a test insert diff --git a/ext/dba/tests/dba_db4_004.phpt b/ext/dba/tests/dba_db4_004.phpt index ca876f82d7..1fdb353e6e 100644 --- a/ext/dba/tests/dba_db4_004.phpt +++ b/ext/dba/tests/dba_db4_004.phpt @@ -33,7 +33,7 @@ if (($db_file = dba_open($db_filename, "n", $handler)) !== FALSE) { <?php require(dirname(__FILE__) .'/clean.inc'); ?> ---EXPECTF-- +--EXPECT-- database handler: db4 int(14) database file created diff --git a/ext/dba/tests/dba_db4_005.phpt b/ext/dba/tests/dba_db4_005.phpt index 54bb475e9e..ec5f98aed1 100644 --- a/ext/dba/tests/dba_db4_005.phpt +++ b/ext/dba/tests/dba_db4_005.phpt @@ -26,7 +26,7 @@ if (($db_file = dba_popen($db_filename, "c", $handler)) !== FALSE) { <?php require(dirname(__FILE__) .'/clean.inc'); ?> ---EXPECTF-- +--EXPECT-- database handler: db4 database file created This is a test insert diff --git a/ext/dba/tests/dba_db4_006.phpt b/ext/dba/tests/dba_db4_006.phpt index 7d95385fe3..2a80161d08 100644 --- a/ext/dba/tests/dba_db4_006.phpt +++ b/ext/dba/tests/dba_db4_006.phpt @@ -26,7 +26,7 @@ if (($db_file = dba_popen($db_filename, "n", $handler)) !== FALSE) { <?php require(dirname(__FILE__) .'/clean.inc'); ?> ---EXPECTF-- +--EXPECT-- database handler: db4 database file created This is a test insert diff --git a/ext/dba/tests/dba_db4_008.phpt b/ext/dba/tests/dba_db4_008.phpt index 80f62eab5b..2f7d130750 100644 --- a/ext/dba/tests/dba_db4_008.phpt +++ b/ext/dba/tests/dba_db4_008.phpt @@ -33,7 +33,7 @@ if (($db_file = dba_popen($db_filename, "n", $handler)) !== FALSE) { <?php require(dirname(__FILE__) .'/clean.inc'); ?> ---EXPECTF-- +--EXPECT-- database handler: db4 int(14) database file created diff --git a/ext/dba/tests/dba_db4_011.phpt b/ext/dba/tests/dba_db4_011.phpt index ce9be2770b..e42e03b7e9 100644 --- a/ext/dba/tests/dba_db4_011.phpt +++ b/ext/dba/tests/dba_db4_011.phpt @@ -27,7 +27,7 @@ if (($db_file=dba_open($db_filename, "c", $handler))!==FALSE) { <?php require(dirname(__FILE__) .'/clean.inc'); ?> ---EXPECTF-- +--EXPECT-- database handler: db4 bool(true) bool(true) diff --git a/ext/dba/tests/dba_db4_015.phpt b/ext/dba/tests/dba_db4_015.phpt index a1535675b8..163828203d 100644 --- a/ext/dba/tests/dba_db4_015.phpt +++ b/ext/dba/tests/dba_db4_015.phpt @@ -32,7 +32,7 @@ if (($db_file = dba_popen($db_filename, "wl", $handler)) !== FALSE) { <?php require(dirname(__FILE__) .'/clean.inc'); ?> ---EXPECTF-- +--EXPECT-- database handler: db4 database file created database file opened diff --git a/ext/dba/tests/dba_db4_016.phpt b/ext/dba/tests/dba_db4_016.phpt index b79cc71f82..4e97819a59 100644 --- a/ext/dba/tests/dba_db4_016.phpt +++ b/ext/dba/tests/dba_db4_016.phpt @@ -47,7 +47,7 @@ if (($db_file = dba_popen($db_filename, "c", $handler)) !== FALSE) { <?php require(dirname(__FILE__) .'/clean.inc'); ?> ---EXPECTF-- +--EXPECT-- database handler: db4 database file created bool(true) diff --git a/ext/dba/tests/dba_db4_017.phpt b/ext/dba/tests/dba_db4_017.phpt index 12bf3df866..2f9469299b 100644 --- a/ext/dba/tests/dba_db4_017.phpt +++ b/ext/dba/tests/dba_db4_017.phpt @@ -30,7 +30,7 @@ if (($db_file = dba_open($db_filename, "cd", $handler)) !== FALSE) { <?php require(dirname(__FILE__) .'/clean.inc'); ?> ---EXPECTF-- +--EXPECT-- database handler: db4 database file created bool(true) diff --git a/ext/dba/tests/dba_db4_optimize.phpt b/ext/dba/tests/dba_db4_optimize.phpt index de27dd8df4..d090f495bd 100644 --- a/ext/dba/tests/dba_db4_optimize.phpt +++ b/ext/dba/tests/dba_db4_optimize.phpt @@ -31,7 +31,7 @@ if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) { <?php require(dirname(__FILE__) .'/clean.inc'); ?> ---EXPECTF-- +--EXPECT-- database handler: db4 YY bool(true) diff --git a/ext/dba/tests/dba_db4_sync.phpt b/ext/dba/tests/dba_db4_sync.phpt index 8c4e248bc8..5fb4728fbf 100644 --- a/ext/dba/tests/dba_db4_sync.phpt +++ b/ext/dba/tests/dba_db4_sync.phpt @@ -31,7 +31,7 @@ if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) { <?php require(dirname(__FILE__) .'/clean.inc'); ?> ---EXPECTF-- +--EXPECT-- database handler: db4 YY bool(true) diff --git a/ext/dom/tests/DOMAttr_construct_error_001.phpt b/ext/dom/tests/DOMAttr_construct_error_001.phpt index 64e6835f96..fbe2512c1d 100644 --- a/ext/dom/tests/DOMAttr_construct_error_001.phpt +++ b/ext/dom/tests/DOMAttr_construct_error_001.phpt @@ -13,5 +13,5 @@ try { echo $e->getMessage(), "\n"; } ?> ---EXPECTF-- +--EXPECT-- DOMAttr::__construct() expects at least 1 parameter, 0 given diff --git a/ext/dom/tests/DOMAttr_value_basic_001.phpt b/ext/dom/tests/DOMAttr_value_basic_001.phpt index 51c4ac954d..cfc68bdaa8 100644 --- a/ext/dom/tests/DOMAttr_value_basic_001.phpt +++ b/ext/dom/tests/DOMAttr_value_basic_001.phpt @@ -11,6 +11,6 @@ $attr = new DOMAttr('category'); print $attr->value."\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== diff --git a/ext/dom/tests/DOMAttr_value_basic_002.phpt b/ext/dom/tests/DOMAttr_value_basic_002.phpt index 384a9ca4af..724b9808e3 100644 --- a/ext/dom/tests/DOMAttr_value_basic_002.phpt +++ b/ext/dom/tests/DOMAttr_value_basic_002.phpt @@ -11,5 +11,5 @@ $attr = new DOMAttr('category'); $attr->value = 1; print $attr->value; ?> ---EXPECTF-- +--EXPECT-- 1 diff --git a/ext/dom/tests/DOMComment_appendData_basic.phpt b/ext/dom/tests/DOMComment_appendData_basic.phpt index c756f1665a..e1540f97c4 100644 --- a/ext/dom/tests/DOMComment_appendData_basic.phpt +++ b/ext/dom/tests/DOMComment_appendData_basic.phpt @@ -16,6 +16,6 @@ $dom->saveXML(); echo $dom->saveXML(); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> <!--test-comment-more-data-->
\ No newline at end of file diff --git a/ext/dom/tests/DOMComment_construct_error_001.phpt b/ext/dom/tests/DOMComment_construct_error_001.phpt index 27424c35e4..e02c2a97a2 100644 --- a/ext/dom/tests/DOMComment_construct_error_001.phpt +++ b/ext/dom/tests/DOMComment_construct_error_001.phpt @@ -13,5 +13,5 @@ try { echo $e->getMessage(), "\n"; } ?> ---EXPECTF-- +--EXPECT-- DOMComment::__construct() expects at most 1 parameter, 2 given diff --git a/ext/dom/tests/DOMComment_insertData_basic.phpt b/ext/dom/tests/DOMComment_insertData_basic.phpt index 5a4857d677..16fa55e40d 100644 --- a/ext/dom/tests/DOMComment_insertData_basic.phpt +++ b/ext/dom/tests/DOMComment_insertData_basic.phpt @@ -16,6 +16,6 @@ $dom->appendChild($comment); echo $dom->saveXML(); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> <!--test-inserted-comment--> diff --git a/ext/dom/tests/DOMComment_insertData_error1.phpt b/ext/dom/tests/DOMComment_insertData_error1.phpt index 56922ac518..bd72642e33 100644 --- a/ext/dom/tests/DOMComment_insertData_error1.phpt +++ b/ext/dom/tests/DOMComment_insertData_error1.phpt @@ -20,5 +20,5 @@ try { } ?> ---EXPECTF-- +--EXPECT-- Throws DOMException for -ve offset diff --git a/ext/dom/tests/DOMComment_insertData_error2.phpt b/ext/dom/tests/DOMComment_insertData_error2.phpt index d2affa89e7..0ead9624b8 100644 --- a/ext/dom/tests/DOMComment_insertData_error2.phpt +++ b/ext/dom/tests/DOMComment_insertData_error2.phpt @@ -20,5 +20,5 @@ try { } ?> ---EXPECTF-- +--EXPECT-- Throws DOMException for offset too large
\ No newline at end of file diff --git a/ext/dom/tests/DOMComment_replaceData_basic.phpt b/ext/dom/tests/DOMComment_replaceData_basic.phpt index 2963cb1e06..0d1b1a9c9c 100644 --- a/ext/dom/tests/DOMComment_replaceData_basic.phpt +++ b/ext/dom/tests/DOMComment_replaceData_basic.phpt @@ -22,7 +22,7 @@ $dom->appendChild($comment); echo $dom->saveXML(); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> <!--testreplacedcomment--> <?xml version="1.0"?> diff --git a/ext/dom/tests/DOMComment_replaceData_error1.phpt b/ext/dom/tests/DOMComment_replaceData_error1.phpt index 4ae4cb61da..16ea993e34 100644 --- a/ext/dom/tests/DOMComment_replaceData_error1.phpt +++ b/ext/dom/tests/DOMComment_replaceData_error1.phpt @@ -20,5 +20,5 @@ try { } ?> ---EXPECTF-- +--EXPECT-- Throws DOMException for -ve offest diff --git a/ext/dom/tests/DOMComment_replaceData_error2.phpt b/ext/dom/tests/DOMComment_replaceData_error2.phpt index 89614f9756..7dc8f1e9b9 100644 --- a/ext/dom/tests/DOMComment_replaceData_error2.phpt +++ b/ext/dom/tests/DOMComment_replaceData_error2.phpt @@ -20,5 +20,5 @@ try { } ?> ---EXPECTF-- +--EXPECT-- Throws DOMException for offest too large
\ No newline at end of file diff --git a/ext/dom/tests/DOMDocumentFragment_construct_error_001.phpt b/ext/dom/tests/DOMDocumentFragment_construct_error_001.phpt index c84689ad8e..819306566c 100644 --- a/ext/dom/tests/DOMDocumentFragment_construct_error_001.phpt +++ b/ext/dom/tests/DOMDocumentFragment_construct_error_001.phpt @@ -13,5 +13,5 @@ try { echo $e->getMessage(), "\n"; } ?> ---EXPECTF-- +--EXPECT-- DOMDocumentFragment::__construct() expects exactly 0 parameters, 1 given diff --git a/ext/dom/tests/DOMDocument_createAttribute_error.phpt b/ext/dom/tests/DOMDocument_createAttribute_error.phpt index bf71d554aa..da2a967c3a 100644 --- a/ext/dom/tests/DOMDocument_createAttribute_error.phpt +++ b/ext/dom/tests/DOMDocument_createAttribute_error.phpt @@ -23,5 +23,5 @@ catch(Exception $e) { } ?> ---EXPECTF-- +--EXPECT-- PASS diff --git a/ext/dom/tests/DOMDocument_createAttribute_variation.phpt b/ext/dom/tests/DOMDocument_createAttribute_variation.phpt index ff81343cc9..a5f3dcd041 100644 --- a/ext/dom/tests/DOMDocument_createAttribute_variation.phpt +++ b/ext/dom/tests/DOMDocument_createAttribute_variation.phpt @@ -10,5 +10,5 @@ $attr = $dom->createAttribute('string'); echo get_class($attr); ?> ---EXPECTF-- +--EXPECT-- DOMAttr diff --git a/ext/dom/tests/DOMDocument_createEntityReference_basic.phpt b/ext/dom/tests/DOMDocument_createEntityReference_basic.phpt index 4f4ddf1765..2a3316ecc8 100644 --- a/ext/dom/tests/DOMDocument_createEntityReference_basic.phpt +++ b/ext/dom/tests/DOMDocument_createEntityReference_basic.phpt @@ -14,6 +14,6 @@ $ref = $dom->createEntityReference('nbsp'); $dom->appendChild($ref); echo $dom->saveXML(); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> diff --git a/ext/dom/tests/DOMDocument_loadHTML_basic.phpt b/ext/dom/tests/DOMDocument_loadHTML_basic.phpt index 616d1d8371..839bd0f923 100644 --- a/ext/dom/tests/DOMDocument_loadHTML_basic.phpt +++ b/ext/dom/tests/DOMDocument_loadHTML_basic.phpt @@ -13,6 +13,6 @@ $doc = new DOMDocument(); $doc->loadHTML("<html><body><p>Test<br></p></body></html>"); echo $doc->saveHTML(); ?> ---EXPECTF-- +--EXPECT-- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html><body><p>Test<br></p></body></html> diff --git a/ext/dom/tests/DOMDocument_relaxNGValidateSource_basic.phpt b/ext/dom/tests/DOMDocument_relaxNGValidateSource_basic.phpt index 93b9cf7173..94f86eb9d2 100644 --- a/ext/dom/tests/DOMDocument_relaxNGValidateSource_basic.phpt +++ b/ext/dom/tests/DOMDocument_relaxNGValidateSource_basic.phpt @@ -35,5 +35,5 @@ $result = $doc->relaxNGValidateSource($rng); var_dump($result); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/dom/tests/DOMDocument_relaxNGValidate_basic.phpt b/ext/dom/tests/DOMDocument_relaxNGValidate_basic.phpt index 76a64425ce..7a08f37fa5 100644 --- a/ext/dom/tests/DOMDocument_relaxNGValidate_basic.phpt +++ b/ext/dom/tests/DOMDocument_relaxNGValidate_basic.phpt @@ -20,5 +20,5 @@ $doc->loadXML($xml); $result = $doc->relaxNGValidate($rng); var_dump($result); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt b/ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt index dd0824b0d1..c38ea89633 100644 --- a/ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt +++ b/ext/dom/tests/DOMDocument_saveHTMLFile_basic.phpt @@ -24,6 +24,6 @@ var_dump($bytes); echo file_get_contents($filename); unlink($filename); ?> ---EXPECTF-- +--EXPECT-- int(126) <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>This is the title</title></head></html> diff --git a/ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt b/ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt index 5aece3780a..7471a6e60c 100644 --- a/ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt +++ b/ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt @@ -25,7 +25,7 @@ var_dump($bytes); echo file_get_contents($filename); unlink($filename); ?> ---EXPECTF-- +--EXPECT-- int(129) <html><head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> diff --git a/ext/dom/tests/DOMDocument_saveHTML_basic.phpt b/ext/dom/tests/DOMDocument_saveHTML_basic.phpt index 76f1ed0abf..c8ce0602f2 100644 --- a/ext/dom/tests/DOMDocument_saveHTML_basic.phpt +++ b/ext/dom/tests/DOMDocument_saveHTML_basic.phpt @@ -20,5 +20,5 @@ $text = $doc->createTextNode('This is the title'); $text = $title->appendChild($text); echo $doc->saveHTML(); ?> ---EXPECTF-- +--EXPECT-- <html><head><title>This is the title</title></head></html> diff --git a/ext/dom/tests/DOMDocument_saveHTML_variant1.phpt b/ext/dom/tests/DOMDocument_saveHTML_variant1.phpt index d1691138ae..c5728860c8 100644 --- a/ext/dom/tests/DOMDocument_saveHTML_variant1.phpt +++ b/ext/dom/tests/DOMDocument_saveHTML_variant1.phpt @@ -18,7 +18,7 @@ $text = $title->appendChild($text); echo $doc->saveHTML(NULL), "\n"; echo $doc->saveHTML($title), "\n"; ?> ---EXPECTF-- +--EXPECT-- <html><head><title>This is the title</title></head></html> <title>This is the title</title> diff --git a/ext/dom/tests/DOMDocument_saveHTML_variant2.phpt b/ext/dom/tests/DOMDocument_saveHTML_variant2.phpt index 54ccda1fa5..86b150d519 100644 --- a/ext/dom/tests/DOMDocument_saveHTML_variant2.phpt +++ b/ext/dom/tests/DOMDocument_saveHTML_variant2.phpt @@ -21,6 +21,6 @@ $e = $d->getElementsByTagName("p"); $e = $e->item(0); echo $d->saveXml($e),"\n"; echo $d->saveHtml($e),"\n"; ---EXPECTF-- +--EXPECT-- <p>Hi.<br/>there</p> <p>Hi.<br>there</p> diff --git a/ext/dom/tests/DOMDocument_save_basic.phpt b/ext/dom/tests/DOMDocument_save_basic.phpt index c7d1ead24b..e477a1758d 100644 --- a/ext/dom/tests/DOMDocument_save_basic.phpt +++ b/ext/dom/tests/DOMDocument_save_basic.phpt @@ -28,6 +28,6 @@ echo 'Wrote: ' . $doc->save($temp_filename) . ' bytes'; // Wrote: 72 bytes $temp_filename = dirname(__FILE__)."/DomDocument_save_basic.tmp"; unlink($temp_filename); ?> ---EXPECTF-- +--EXPECT-- Wrote: 72 bytes diff --git a/ext/dom/tests/DOMDocument_savexml_basic.phpt b/ext/dom/tests/DOMDocument_savexml_basic.phpt index 10f748cc48..09cc995049 100644 --- a/ext/dom/tests/DOMDocument_savexml_basic.phpt +++ b/ext/dom/tests/DOMDocument_savexml_basic.phpt @@ -34,6 +34,6 @@ var_dump($result == $dom->saveXML()); unlink($filename); ---EXPECTF-- +--EXPECT-- int(151) bool(true)
\ No newline at end of file diff --git a/ext/dom/tests/DOMDocument_validate_basic.phpt b/ext/dom/tests/DOMDocument_validate_basic.phpt index 7c0eec8ddd..21979b0bbe 100644 --- a/ext/dom/tests/DOMDocument_validate_basic.phpt +++ b/ext/dom/tests/DOMDocument_validate_basic.phpt @@ -27,5 +27,5 @@ $dom = new DOMDocument('1.0'); $dom->loadXML($xml); var_dump($dom->validate()); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/dom/tests/DOMDocument_validate_external_dtd.phpt b/ext/dom/tests/DOMDocument_validate_external_dtd.phpt index dd4ec960d2..39dd70ee88 100644 --- a/ext/dom/tests/DOMDocument_validate_external_dtd.phpt +++ b/ext/dom/tests/DOMDocument_validate_external_dtd.phpt @@ -16,5 +16,5 @@ $dom->substituteEntities = true; $dom->load(dirname(__FILE__).'/dom.xml'); var_dump($dom->validate()); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/dom/tests/DOMElement_hasAttributes_basic.phpt b/ext/dom/tests/DOMElement_hasAttributes_basic.phpt index 8e804bea92..39366eaab1 100644 --- a/ext/dom/tests/DOMElement_hasAttributes_basic.phpt +++ b/ext/dom/tests/DOMElement_hasAttributes_basic.phpt @@ -35,7 +35,7 @@ var_dump($element->hasAttributes()); ?> ---EXPECTF-- +--EXPECT-- Verify that we have a DOMElement object: DOMElement diff --git a/ext/dom/tests/DOMImplementation_createDocumentType_basic.phpt b/ext/dom/tests/DOMImplementation_createDocumentType_basic.phpt index 3b19ea4614..880aae9d7c 100644 --- a/ext/dom/tests/DOMImplementation_createDocumentType_basic.phpt +++ b/ext/dom/tests/DOMImplementation_createDocumentType_basic.phpt @@ -13,6 +13,6 @@ $doctype = $imp->createDocumentType("html", $doc = $imp->createDocument(null, 'html', $doctype); echo $doc->saveHTML(); ?> ---EXPECTF-- +--EXPECT-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html></html> diff --git a/ext/dom/tests/DOMImplementation_createDocument_basic.phpt b/ext/dom/tests/DOMImplementation_createDocument_basic.phpt index 78d20aeee5..e501cd29e3 100644 --- a/ext/dom/tests/DOMImplementation_createDocument_basic.phpt +++ b/ext/dom/tests/DOMImplementation_createDocument_basic.phpt @@ -10,5 +10,5 @@ $x = new DOMImplementation(); $doc = $x->createDocument(null, 'html'); echo $doc->saveHTML(); ?> ---EXPECTF-- +--EXPECT-- <html></html> diff --git a/ext/dom/tests/DOMImplementation_hasFeature_basic.phpt b/ext/dom/tests/DOMImplementation_hasFeature_basic.phpt index b53e912b77..8efb23c8af 100644 --- a/ext/dom/tests/DOMImplementation_hasFeature_basic.phpt +++ b/ext/dom/tests/DOMImplementation_hasFeature_basic.phpt @@ -10,6 +10,6 @@ $imp = new DOMImplementation(); var_dump($imp->hasFeature('Core', '1.0')); var_dump($imp->hasFeature('XML', '2.0')); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) diff --git a/ext/dom/tests/DOMNamedNodeMap_count.phpt b/ext/dom/tests/DOMNamedNodeMap_count.phpt index 656dd4859e..f226455ca9 100644 --- a/ext/dom/tests/DOMNamedNodeMap_count.phpt +++ b/ext/dom/tests/DOMNamedNodeMap_count.phpt @@ -22,7 +22,7 @@ var_dump($root->attributes->count()); var_dump(count($root->attributes)); ?> ---EXPECTF-- +--EXPECT-- int(5) int(5) int(5) diff --git a/ext/dom/tests/DOMNode_C14NFile_basic.phpt b/ext/dom/tests/DOMNode_C14NFile_basic.phpt index 6af6e3ecb2..69edc860e4 100644 --- a/ext/dom/tests/DOMNode_C14NFile_basic.phpt +++ b/ext/dom/tests/DOMNode_C14NFile_basic.phpt @@ -33,6 +33,6 @@ var_dump($content); $output = dirname(__FILE__).'/DOMNode_C14NFile_basic.tmp'; unlink($output); ?> ---EXPECTF-- +--EXPECT-- int(34) string(34) "<title>The Grapes of Wrath</title>" diff --git a/ext/dom/tests/DOMNode_C14N_basic.phpt b/ext/dom/tests/DOMNode_C14N_basic.phpt index 52a47a15d2..bbfd7bcefb 100644 --- a/ext/dom/tests/DOMNode_C14N_basic.phpt +++ b/ext/dom/tests/DOMNode_C14N_basic.phpt @@ -25,5 +25,5 @@ $doc->loadXML($xml); $node = $doc->getElementsByTagName('title')->item(0); var_dump($node->C14N()); ?> ---EXPECTF-- +--EXPECT-- string(34) "<title>The Grapes of Wrath</title>" diff --git a/ext/dom/tests/DOMNode_cloneNode_basic.phpt b/ext/dom/tests/DOMNode_cloneNode_basic.phpt index cba3c17a2c..ef66626ad8 100644 --- a/ext/dom/tests/DOMNode_cloneNode_basic.phpt +++ b/ext/dom/tests/DOMNode_cloneNode_basic.phpt @@ -72,7 +72,7 @@ for ($index = 0; $index < $children->length; $index++) { dumpcourse($children->item($index)); } ---EXPECTF-- +--EXPECT-- Start cloneNode test node 0 Course: new title3:DOMElement diff --git a/ext/dom/tests/DOMNode_getLineNo_basic.phpt b/ext/dom/tests/DOMNode_getLineNo_basic.phpt index 3f57681c3e..f74d5d7cc9 100644 --- a/ext/dom/tests/DOMNode_getLineNo_basic.phpt +++ b/ext/dom/tests/DOMNode_getLineNo_basic.phpt @@ -14,6 +14,6 @@ foreach($nodes as $node) { var_dump($node->getLineNo()); } ?> ---EXPECTF-- +--EXPECT-- int(4) int(8) diff --git a/ext/dom/tests/DOMNode_getNodePath_basic.phpt b/ext/dom/tests/DOMNode_getNodePath_basic.phpt index 7c14ffab90..b422a5dbef 100644 --- a/ext/dom/tests/DOMNode_getNodePath_basic.phpt +++ b/ext/dom/tests/DOMNode_getNodePath_basic.phpt @@ -14,6 +14,6 @@ foreach($nodes as $node) { var_dump($node->getNodePath()); } ?> ---EXPECTF-- +--EXPECT-- string(20) "/books/book[1]/title" string(20) "/books/book[2]/title" diff --git a/ext/dom/tests/DOMNode_hasChildNodes.phpt b/ext/dom/tests/DOMNode_hasChildNodes.phpt index 5c1d714e12..a62dafd109 100644 --- a/ext/dom/tests/DOMNode_hasChildNodes.phpt +++ b/ext/dom/tests/DOMNode_hasChildNodes.phpt @@ -33,7 +33,7 @@ $dom->loadXML('<root><a/><b/></root>'); var_dump($dom->documentElement->hasChildNodes()); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> <root/> Document has child nodes diff --git a/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt b/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt index 3a6f6b4218..470921cfee 100644 --- a/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt +++ b/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt @@ -37,7 +37,7 @@ echo "Text has child nodes: "; var_dump($text->hasChildNodes()); ?> ---EXPECTF-- +--EXPECT-- Root has child nodes: bool(true) Title has child nodes: bool(true) Text has child nodes: bool(false)
\ No newline at end of file diff --git a/ext/dom/tests/DOMNode_insertBefore.phpt b/ext/dom/tests/DOMNode_insertBefore.phpt index d371aaf045..04a881e56c 100644 --- a/ext/dom/tests/DOMNode_insertBefore.phpt +++ b/ext/dom/tests/DOMNode_insertBefore.phpt @@ -23,7 +23,7 @@ $e2->parentNode->insertBefore($e1, $e2); echo $dom->saveXML(); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> <root/> Add new node B diff --git a/ext/dom/tests/DOMNode_insertBefore_error1.phpt b/ext/dom/tests/DOMNode_insertBefore_error1.phpt index d655479d00..72c1a5ba5c 100644 --- a/ext/dom/tests/DOMNode_insertBefore_error1.phpt +++ b/ext/dom/tests/DOMNode_insertBefore_error1.phpt @@ -20,5 +20,5 @@ try { } ?> ---EXPECTF-- +--EXPECT-- Wrong Document Error diff --git a/ext/dom/tests/DOMNode_normalize_basic.phpt b/ext/dom/tests/DOMNode_normalize_basic.phpt index e413fb033a..7e15c47f13 100644 --- a/ext/dom/tests/DOMNode_normalize_basic.phpt +++ b/ext/dom/tests/DOMNode_normalize_basic.phpt @@ -57,7 +57,7 @@ echo "Number of child nodes of title after normalizing title = "; var_dump($title->childNodes->length); ?> ---EXPECTF-- +--EXPECT-- Number of child nodes of title = int(1) Number of child nodes of title after adding second title = int(2) Number of child nodes of title after normalizing author = int(2) diff --git a/ext/dom/tests/DOMNode_removeChild_basic.phpt b/ext/dom/tests/DOMNode_removeChild_basic.phpt index fb0977488e..e1399f959d 100644 --- a/ext/dom/tests/DOMNode_removeChild_basic.phpt +++ b/ext/dom/tests/DOMNode_removeChild_basic.phpt @@ -57,7 +57,7 @@ for ($index = 0; $index < $children->length; $index++) { dumpcourse($current); } ---EXPECTF-- +--EXPECT-- original has 5 nodes node 4 Course: no title:DOMText diff --git a/ext/dom/tests/DomNodeList_count.phpt b/ext/dom/tests/DomNodeList_count.phpt index 3ebf4ae7d2..b899c36a5a 100644 --- a/ext/dom/tests/DomNodeList_count.phpt +++ b/ext/dom/tests/DomNodeList_count.phpt @@ -22,7 +22,7 @@ var_dump($root->childNodes->count()); var_dump(count($root->childNodes)); ?> ---EXPECTF-- +--EXPECT-- int(7) int(7) int(7) diff --git a/ext/dom/tests/bug28817.phpt b/ext/dom/tests/bug28817.phpt index a250bff03e..9683088680 100644 --- a/ext/dom/tests/bug28817.phpt +++ b/ext/dom/tests/bug28817.phpt @@ -24,7 +24,7 @@ $z=new z(); var_dump($z->p_array); var_dump($z->p_variable); ?> ---EXPECTF-- +--EXPECT-- array(4) { [0]=> string(5) "bonus" diff --git a/ext/dom/tests/bug42082.phpt b/ext/dom/tests/bug42082.phpt index b5fc893163..1ec561003e 100644 --- a/ext/dom/tests/bug42082.phpt +++ b/ext/dom/tests/bug42082.phpt @@ -17,7 +17,7 @@ var_dump($doc->firstChild->nodeValue, empty($doc->firstChild->nodeValue), isset( var_dump(empty($doc->nodeType), empty($doc->firstChild->nodeType)) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- DOMNodeList int(0) bool(true) diff --git a/ext/dom/tests/bug54601.phpt b/ext/dom/tests/bug54601.phpt index 012302bc3e..7e7ddec16e 100644 --- a/ext/dom/tests/bug54601.phpt +++ b/ext/dom/tests/bug54601.phpt @@ -22,7 +22,7 @@ print $doc->saveXML(); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- DOMDocumentType <?xml version="1.0" encoding="utf-8"?> <set><foo>footext</foo><bar>bartext</bar></set> diff --git a/ext/dom/tests/canonicalization.phpt b/ext/dom/tests/canonicalization.phpt index cf1a81f24a..167f094ff8 100644 --- a/ext/dom/tests/canonicalization.phpt +++ b/ext/dom/tests/canonicalization.phpt @@ -48,7 +48,7 @@ echo $doc->c14N(TRUE, FALSE, test namespace prefix is also included */ echo $doc->C14N(TRUE, FALSE, NULL, array('test')); ?> ---EXPECTF-- +--EXPECT-- <contain xmlns="http://www.example.com/ns/foo" xmlns:fubar="http://www.example.com/ns/fubar" xmlns:test="urn::test"> <bar><test1></test1></bar> diff --git a/ext/dom/tests/dom_comment_basic.phpt b/ext/dom/tests/dom_comment_basic.phpt index 3a6970562b..ecabe73334 100644 --- a/ext/dom/tests/dom_comment_basic.phpt +++ b/ext/dom/tests/dom_comment_basic.phpt @@ -27,7 +27,7 @@ for ($index = 0; $index < $children->length; $index++) { var_dump($current->textContent); } ---EXPECTF-- +--EXPECT-- bool(true) --- child 0 --- DOMText diff --git a/ext/dom/tests/dom_comment_variation.phpt b/ext/dom/tests/dom_comment_variation.phpt index 1f30e7c7ea..d44babdeaa 100644 --- a/ext/dom/tests/dom_comment_variation.phpt +++ b/ext/dom/tests/dom_comment_variation.phpt @@ -24,7 +24,7 @@ for ($index = 0; $index < $children->length; $index++) { var_dump($current->textContent); } ---EXPECTF-- +--EXPECT-- bool(true) --- child 0 --- DOMComment diff --git a/ext/exif/tests/bug64739.phpt b/ext/exif/tests/bug64739.phpt index 453cc88495..185d39c1d5 100644 --- a/ext/exif/tests/bug64739.phpt +++ b/ext/exif/tests/bug64739.phpt @@ -33,7 +33,7 @@ var_dump($headers2['Author']); ?> Done ---EXPECTF-- +--EXPECT-- Test bool(true) bool(true) diff --git a/ext/exif/tests/bug72735/bug72682.phpt b/ext/exif/tests/bug72735/bug72682.phpt index b3f17791a3..d738b96eca 100644 --- a/ext/exif/tests/bug72735/bug72682.phpt +++ b/ext/exif/tests/bug72735/bug72682.phpt @@ -11,7 +11,7 @@ foreach (['nokia.jpg', 'samsung.jpg', 'panasonic.jpg'] as $picture) { var_dump($info['MakerNote']); } ?> ---EXPECTF-- +--EXPECT-- nokia.jpg: string(5) "Nikon" samsung.jpg: NULL panasonic.jpg: string(9) "Panasonic" diff --git a/ext/exif/tests/bug72735/bug72735.phpt b/ext/exif/tests/bug72735/bug72735.phpt index 38d9ed2199..8b6c170434 100644 --- a/ext/exif/tests/bug72735/bug72735.phpt +++ b/ext/exif/tests/bug72735/bug72735.phpt @@ -18,7 +18,7 @@ foreach (['nokia.jpg', 'samsung.jpg', 'panasonic.jpg'] as $picture) { echo 'int(' . $len . ')', PHP_EOL; } ?> ---EXPECTF-- +--EXPECT-- nokia.jpg: int(5899) samsung.jpg: int(5778) panasonic.jpg: int(651) diff --git a/ext/fileinfo/tests/bug61173.phpt b/ext/fileinfo/tests/bug61173.phpt index 96eb3010e0..9fbf48b2ec 100644 --- a/ext/fileinfo/tests/bug61173.phpt +++ b/ext/fileinfo/tests/bug61173.phpt @@ -13,5 +13,5 @@ try { } catch (TypeError $e) { echo $e->getMessage(), "\n"; } ---EXPECTF-- +--EXPECT-- finfo::finfo() expects at most 2 parameters, 3 given diff --git a/ext/fileinfo/tests/bug68398.phpt b/ext/fileinfo/tests/bug68398.phpt index 78d3b8929f..504df2b042 100644 --- a/ext/fileinfo/tests/bug68398.phpt +++ b/ext/fileinfo/tests/bug68398.phpt @@ -9,7 +9,7 @@ $f = new finfo(FILEINFO_MIME); var_dump($f->file(dirname(__FILE__) . DIRECTORY_SEPARATOR . '68398.zip')); ?> +++DONE+++ ---EXPECTF-- +--EXPECT-- string(31) "application/zip; charset=binary" +++DONE+++ diff --git a/ext/fileinfo/tests/bug69320.phpt b/ext/fileinfo/tests/bug69320.phpt index 4eea7470b8..4078649edf 100644 --- a/ext/fileinfo/tests/bug69320.phpt +++ b/ext/fileinfo/tests/bug69320.phpt @@ -15,6 +15,6 @@ var_dump(finfo_file(finfo_open(FILEINFO_MIME_TYPE), $fname)); $fname = dirname(__FILE__) . DIRECTORY_SEPARATOR . "bug69320.txt"; unlink($fname); ?> ---EXPECTF-- +--EXPECT-- string(10) "text/plain" diff --git a/ext/fileinfo/tests/finfo_buffer_basic-mb.phpt b/ext/fileinfo/tests/finfo_buffer_basic-mb.phpt index e56062a534..8a675ea75a 100644 --- a/ext/fileinfo/tests/finfo_buffer_basic-mb.phpt +++ b/ext/fileinfo/tests/finfo_buffer_basic-mb.phpt @@ -38,7 +38,7 @@ foreach( $options as $option ) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing finfo_buffer() : basic functionality *** string(36) "ASCII text, with no line terminators" string(3) "ELF" diff --git a/ext/fileinfo/tests/finfo_buffer_basic.phpt b/ext/fileinfo/tests/finfo_buffer_basic.phpt index 0c3c641388..e6caa697c4 100644 --- a/ext/fileinfo/tests/finfo_buffer_basic.phpt +++ b/ext/fileinfo/tests/finfo_buffer_basic.phpt @@ -38,7 +38,7 @@ foreach( $options as $option ) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing finfo_buffer() : basic functionality *** string(36) "ASCII text, with no line terminators" string(3) "ELF" diff --git a/ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt b/ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt index 5179fd4497..7dab9e1839 100644 --- a/ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt +++ b/ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt @@ -37,7 +37,7 @@ foreach( $options as $option ) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing finfo_buffer() : variation functionality with oo interface *** string(36) "ASCII text, with no line terminators" string(3) "ELF" diff --git a/ext/fileinfo/tests/finfo_buffer_variation1.phpt b/ext/fileinfo/tests/finfo_buffer_variation1.phpt index 4fdd2be272..1d99986697 100644 --- a/ext/fileinfo/tests/finfo_buffer_variation1.phpt +++ b/ext/fileinfo/tests/finfo_buffer_variation1.phpt @@ -37,7 +37,7 @@ foreach( $options as $option ) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing finfo_buffer() : variation functionality with oo interface *** string(36) "ASCII text, with no line terminators" string(3) "ELF" diff --git a/ext/fileinfo/tests/finfo_file_stream_001.phpt b/ext/fileinfo/tests/finfo_file_stream_001.phpt index 5535259cd8..4a22c5419d 100644 --- a/ext/fileinfo/tests/finfo_file_stream_001.phpt +++ b/ext/fileinfo/tests/finfo_file_stream_001.phpt @@ -20,7 +20,7 @@ var_dump( finfo_file($fp, $png) ); ?> ---EXPECTF-- +--EXPECT-- string(15) "application/zip" string(9) "directory" string(9) "image/png" diff --git a/ext/fileinfo/tests/finfo_open_002.phpt b/ext/fileinfo/tests/finfo_open_002.phpt index cf4809f093..3a3891d72c 100644 --- a/ext/fileinfo/tests/finfo_open_002.phpt +++ b/ext/fileinfo/tests/finfo_open_002.phpt @@ -11,7 +11,7 @@ $x->finfo(); echo "done!\n"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/fileinfo/tests/finfo_phpinfo_basic.phpt b/ext/fileinfo/tests/finfo_phpinfo_basic.phpt index 7d1b008d5a..ff65b36b3d 100644 --- a/ext/fileinfo/tests/finfo_phpinfo_basic.phpt +++ b/ext/fileinfo/tests/finfo_phpinfo_basic.phpt @@ -15,7 +15,7 @@ var_dump(preg_match("/fileinfo support => enabled/", $output)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing finfo extension : loading info phpinfo() *** int(1) ===DONE=== diff --git a/ext/filter/tests/022.phpt b/ext/filter/tests/022.phpt index 649c6e409d..d8d118540e 100644 --- a/ext/filter/tests/022.phpt +++ b/ext/filter/tests/022.phpt @@ -13,7 +13,7 @@ var_dump(filter_var("123456789000000", FILTER_SANITIZE_EMAIL)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(5) "a@b.c" string(30) "a[!@#$%^&*@a@#$%^&*.com@#$%^&*" string(21) "whitespaceheresommore" diff --git a/ext/filter/tests/026.phpt b/ext/filter/tests/026.phpt index 38d15e7d0a..7cfc557fcb 100644 --- a/ext/filter/tests/026.phpt +++ b/ext/filter/tests/026.phpt @@ -19,7 +19,7 @@ var_dump(filter_var("", FILTER_SANITIZE_STRIPPED, FILTER_FLAG_STRIP_HIGH)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(40) "Let me see you Stripped down to the bone" string(11) "!@#$%^&*()>" string(0) "" diff --git a/ext/filter/tests/034.phpt b/ext/filter/tests/034.phpt index 364f9024f1..37481813a9 100644 --- a/ext/filter/tests/034.phpt +++ b/ext/filter/tests/034.phpt @@ -29,5 +29,5 @@ foreach($booleans as $val=>$exp) { } echo "Ok."; ?> ---EXPECTF-- +--EXPECT-- Ok. diff --git a/ext/filter/tests/036.phpt b/ext/filter/tests/036.phpt index 0f6fd0e60f..114b8f097f 100644 --- a/ext/filter/tests/036.phpt +++ b/ext/filter/tests/036.phpt @@ -22,7 +22,7 @@ var_dump($var); //should be still string(1) "1" echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(2) { ["test1"]=> int(1) diff --git a/ext/filter/tests/053.phpt b/ext/filter/tests/053.phpt index a179f3ea35..36b0423471 100644 --- a/ext/filter/tests/053.phpt +++ b/ext/filter/tests/053.phpt @@ -13,5 +13,5 @@ filter_var('durty/boy', FILTER_CALLBACK, array( print "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/ext/filter/tests/bug46973.phpt b/ext/filter/tests/bug46973.phpt index eacacf5b3e..8c5d9db910 100644 --- a/ext/filter/tests/bug46973.phpt +++ b/ext/filter/tests/bug46973.phpt @@ -10,7 +10,7 @@ var_dump(filter_var('3ffe:6a88:85a3:08d3:1319:8a2e:0370:7344', FILTER_VALIDATE_I var_dump(filter_var('1fff::a88:85a3::172.31.128.1', FILTER_VALIDATE_IP,FILTER_FLAG_IPV6)); ?> ---EXPECTF-- +--EXPECT-- bool(false) string(39) "3ffe:6a88:85a3:08d3:1319:8a2e:0370:7344" bool(false) diff --git a/ext/filter/tests/bug49274.phpt b/ext/filter/tests/bug49274.phpt index 2adc6ed977..c9141a3956 100644 --- a/ext/filter/tests/bug49274.phpt +++ b/ext/filter/tests/bug49274.phpt @@ -6,5 +6,5 @@ <?php var_dump(filter_var(new stdClass, FILTER_VALIDATE_EMAIL)); ?> ---EXPECTF-- +--EXPECT-- bool(false) diff --git a/ext/filter/tests/bug50158.phpt b/ext/filter/tests/bug50158.phpt index d41dfd56c0..8b29e72b2d 100644 --- a/ext/filter/tests/bug50158.phpt +++ b/ext/filter/tests/bug50158.phpt @@ -18,7 +18,7 @@ $email_address = "test?mail@example.com"; var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL)); ?> ---EXPECTF-- +--EXPECT-- string(21) "test=mail@example.com" string(21) "test-mail@example.com" string(21) "test+mail@example.com" diff --git a/ext/filter/tests/bug67167.01.phpt b/ext/filter/tests/bug67167.01.phpt index 09e84fd053..91889f1980 100644 --- a/ext/filter/tests/bug67167.01.phpt +++ b/ext/filter/tests/bug67167.01.phpt @@ -12,5 +12,5 @@ var_dump(filter_var( FILTER_NULL_ON_FAILURE )); ---EXPECTF-- +--EXPECT-- NULL diff --git a/ext/filter/tests/bug67167.02.phpt b/ext/filter/tests/bug67167.02.phpt index 3ab0990dd3..fd634334bb 100644 --- a/ext/filter/tests/bug67167.02.phpt +++ b/ext/filter/tests/bug67167.02.phpt @@ -15,6 +15,6 @@ var_dump(filter_var( --XFAIL-- Requires php_zval_filter to not use convert_to_string for all filters. ---EXPECTF-- +--EXPECT-- NULL diff --git a/ext/filter/tests/bug7715.phpt b/ext/filter/tests/bug7715.phpt index 4298d505d3..b281db4f49 100644 --- a/ext/filter/tests/bug7715.phpt +++ b/ext/filter/tests/bug7715.phpt @@ -22,7 +22,7 @@ foreach ($data as $val) { } echo "\n"; ?> ---EXPECTF-- +--EXPECT-- float(0.23) float(-42) float(42) diff --git a/ext/filter/tests/bug7733.phpt b/ext/filter/tests/bug7733.phpt index 562fbf1ebb..11fce11232 100644 --- a/ext/filter/tests/bug7733.phpt +++ b/ext/filter/tests/bug7733.phpt @@ -14,7 +14,7 @@ $data = array( $out = filter_var($data, FILTER_VALIDATE_FLOAT, FILTER_REQUIRE_ARRAY); var_dump($out); ?> ---EXPECTF-- +--EXPECT-- array(5) { [0]=> bool(false) diff --git a/ext/filter/tests/filter_var_array_with_ref.phpt b/ext/filter/tests/filter_var_array_with_ref.phpt index 565008ba5a..22e4dc8702 100644 --- a/ext/filter/tests/filter_var_array_with_ref.phpt +++ b/ext/filter/tests/filter_var_array_with_ref.phpt @@ -11,7 +11,7 @@ var_dump(filter_var_array($array2, FILTER_VALIDATE_INT)); var_dump($array); ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> &array(1) { diff --git a/ext/ftp/tests/ftp_append.phpt b/ext/ftp/tests/ftp_append.phpt index ff695c4d5b..29b1f918e3 100644 --- a/ext/ftp/tests/ftp_append.phpt +++ b/ext/ftp/tests/ftp_append.phpt @@ -35,7 +35,7 @@ unlink($barPath); $fooBarPath = __DIR__ . '/ftp_append_foobar'; unlink($fooBarPath); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/ftp/tests/ftp_mdtm_basic.phpt b/ext/ftp/tests/ftp_mdtm_basic.phpt index 39aeb766fb..3424bb8344 100644 --- a/ext/ftp/tests/ftp_mdtm_basic.phpt +++ b/ext/ftp/tests/ftp_mdtm_basic.phpt @@ -38,7 +38,7 @@ $time = ftp_mdtm($ftp, "MdTm 19990929043300 file6"); var_dump($time); ?> ---EXPECTF-- +--EXPECT-- bool(true) June 15 1998 10:00:45 000000 June 15 1998 10:00:45 000000 diff --git a/ext/gd/tests/bug38179.phpt b/ext/gd/tests/bug38179.phpt index 34a6d58e07..8adc389228 100644 --- a/ext/gd/tests/bug38179.phpt +++ b/ext/gd/tests/bug38179.phpt @@ -23,6 +23,6 @@ printf("%X\n", $p1); imagedestroy($src); imagedestroy($dst_tc); ?> ---EXPECTF-- +--EXPECT-- 46FF0000 diff --git a/ext/gd/tests/bug39273.phpt b/ext/gd/tests/bug39273.phpt index 9867b7469a..7e938f4bb1 100644 --- a/ext/gd/tests/bug39273.phpt +++ b/ext/gd/tests/bug39273.phpt @@ -27,5 +27,5 @@ imagesavealpha($img, 1); $c = imagecolorat($img, 0,0); printf("%X", $c); ?> ---EXPECTF-- +--EXPECT-- 32FF0000 diff --git a/ext/gd/tests/bug39366.phpt b/ext/gd/tests/bug39366.phpt index f80564565d..85c72fe860 100644 --- a/ext/gd/tests/bug39366.phpt +++ b/ext/gd/tests/bug39366.phpt @@ -17,5 +17,5 @@ imagesavealpha($rotate, true); $c = imagecolorat($rotate,5,5); printf("%X\n", $c); ?> ---EXPECTF-- +--EXPECT-- 32FF0000 diff --git a/ext/gd/tests/bug39508.phpt b/ext/gd/tests/bug39508.phpt index 791c59c230..f00a4aae4e 100644 --- a/ext/gd/tests/bug39508.phpt +++ b/ext/gd/tests/bug39508.phpt @@ -11,5 +11,5 @@ $bgcolor = imagecolorallocatealpha($im,255, 255, 0, 0); imagefill($im,0,0,$bgcolor); print_r(imagecolorat($im, 1,0)); ?> ---EXPECTF-- +--EXPECT-- 16776960 diff --git a/ext/gd/tests/bug42434.phpt b/ext/gd/tests/bug42434.phpt index 7e492c38da..eb9e8293fd 100644 --- a/ext/gd/tests/bug42434.phpt +++ b/ext/gd/tests/bug42434.phpt @@ -22,5 +22,5 @@ if (imagecolorat($im, 9, 0) == 0x000000) { imagedestroy($im); ?> ---EXPECTF-- +--EXPECT-- DONE
\ No newline at end of file diff --git a/ext/gd/tests/bug43121.phpt b/ext/gd/tests/bug43121.phpt index feb10267c2..08348d0012 100644 --- a/ext/gd/tests/bug43121.phpt +++ b/ext/gd/tests/bug43121.phpt @@ -20,5 +20,5 @@ ImageDestroy( $im ); print "OK"; ?> ---EXPECTF-- +--EXPECT-- OK diff --git a/ext/gd/tests/bug44849.phpt b/ext/gd/tests/bug44849.phpt index a6d162c3db..368a08a242 100644 --- a/ext/gd/tests/bug44849.phpt +++ b/ext/gd/tests/bug44849.phpt @@ -8,5 +8,5 @@ Bug #44849 (imagecolorclosesthwb is not available on Windows) <?php var_dump(function_exists('imagecolorclosesthwb')); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/gd/tests/bug48732-mb.phpt b/ext/gd/tests/bug48732-mb.phpt index 42871ee206..8e937bfe8e 100644 --- a/ext/gd/tests/bug48732-mb.phpt +++ b/ext/gd/tests/bug48732-mb.phpt @@ -19,5 +19,5 @@ echo 'Left Bottom: (' . $bbox[0] . ', ' . $bbox[1] . ')'; ?> --CLEAN-- <?php @unlink(dirname(__FILE__) . '/bug48732ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.png'); ?> ---EXPECTF-- +--EXPECT-- Left Bottom: (0, 46) diff --git a/ext/gd/tests/bug48732.phpt b/ext/gd/tests/bug48732.phpt index 38dc861a9d..5e77e06103 100644 --- a/ext/gd/tests/bug48732.phpt +++ b/ext/gd/tests/bug48732.phpt @@ -18,5 +18,5 @@ echo 'Left Bottom: (' . $bbox[0] . ', ' . $bbox[1] . ')'; ?> --CLEAN-- <?php @unlink(dirname(__FILE__) . '/bug48732.png'); ?> ---EXPECTF-- +--EXPECT-- Left Bottom: (0, 46) diff --git a/ext/gd/tests/bug49600.phpt b/ext/gd/tests/bug49600.phpt index 068f8f36a8..1f767f6f97 100644 --- a/ext/gd/tests/bug49600.phpt +++ b/ext/gd/tests/bug49600.phpt @@ -28,5 +28,5 @@ foreach (array("E", "I", "P", "g", "i", "q") as $c) } echo 'OK'; ?> ---EXPECTF-- +--EXPECT-- OK
\ No newline at end of file diff --git a/ext/gd/tests/bug51263.phpt b/ext/gd/tests/bug51263.phpt index 8e86f41764..69496e011b 100644 --- a/ext/gd/tests/bug51263.phpt +++ b/ext/gd/tests/bug51263.phpt @@ -28,5 +28,5 @@ for ($j=0; $j<30; $j++) { } echo "OK\n"; ?> ---EXPECTF-- +--EXPECT-- OK diff --git a/ext/gd/tests/bug51671.phpt b/ext/gd/tests/bug51671.phpt index 5dd77fe67b..1d72e734a9 100644 --- a/ext/gd/tests/bug51671.phpt +++ b/ext/gd/tests/bug51671.phpt @@ -20,5 +20,5 @@ for ($iy = 0; $iy < $h; $iy++) { echo "OK\n"; ?> ---EXPECTF-- +--EXPECT-- OK diff --git a/ext/gd/tests/bug60160.phpt b/ext/gd/tests/bug60160.phpt index af2df41820..c6a50ba48b 100644 --- a/ext/gd/tests/bug60160.phpt +++ b/ext/gd/tests/bug60160.phpt @@ -22,5 +22,5 @@ for ($ix = 0; $ix < $w; $ix++) { echo "OK\n"; ?> ---EXPECTF-- +--EXPECT-- OK diff --git a/ext/gd/tests/bug70976.phpt b/ext/gd/tests/bug70976.phpt index dfbd4b49ec..2cef56cc32 100644 --- a/ext/gd/tests/bug70976.phpt +++ b/ext/gd/tests/bug70976.phpt @@ -9,5 +9,5 @@ Bug #70976 (Memory Read via gdImageRotateInterpolated Array Index Out of Bounds) $img = imagerotate(imagecreate(10,10),45,0x7ffffff9); var_dump($img); ?> ---EXPECTF-- +--EXPECT-- resource(5) of type (gd)
\ No newline at end of file diff --git a/ext/gd/tests/bug71952.phpt b/ext/gd/tests/bug71952.phpt index f1f66bf26d..8d574e0559 100644 --- a/ext/gd/tests/bug71952.phpt +++ b/ext/gd/tests/bug71952.phpt @@ -10,5 +10,5 @@ $vals=[str_repeat("A","200"),0,1,2,3,4,5,6,7,8,9]; imageaffinematrixget(4,$vals[0]); var_dump($vals[0]); ?> ---EXPECTF-- +--EXPECT-- string(200) "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
\ No newline at end of file diff --git a/ext/gd/tests/colorexact.phpt b/ext/gd/tests/colorexact.phpt index e6983b7516..41582492b0 100644 --- a/ext/gd/tests/colorexact.phpt +++ b/ext/gd/tests/colorexact.phpt @@ -31,7 +31,7 @@ echo imagecolorexact($im, 12,12,12) . "\n"; imagedestroy($im); ?> ---EXPECTF-- +--EXPECT-- FF00FF 64FF00FF 0 diff --git a/ext/gd/tests/colorresolve.phpt b/ext/gd/tests/colorresolve.phpt index 9af0f18600..0a939bd85f 100644 --- a/ext/gd/tests/colorresolve.phpt +++ b/ext/gd/tests/colorresolve.phpt @@ -66,7 +66,7 @@ print_r(imagecolorsforindex($im, $c)); ?> ---EXPECTF-- +--EXPECT-- FF00FF Array ( diff --git a/ext/gd/tests/copy.phpt b/ext/gd/tests/copy.phpt index 5aafc31e76..28bb3ed173 100644 --- a/ext/gd/tests/copy.phpt +++ b/ext/gd/tests/copy.phpt @@ -102,7 +102,7 @@ if ($p1 && $p2 && $p3) { echo "P/TC: ok\n"; } ?> ---EXPECTF-- +--EXPECT-- TC/TC: ok TC/P: ok P/P: ok diff --git a/ext/gd/tests/copyresized.phpt b/ext/gd/tests/copyresized.phpt index fe98642dbb..df4996332d 100644 --- a/ext/gd/tests/copyresized.phpt +++ b/ext/gd/tests/copyresized.phpt @@ -85,7 +85,7 @@ imagecopyresized($dst_tc, $src_tc, 0,0, 0,0, imagesx($dst_tc), imagesy($dst_tc), if (!check_doublesize($dst_tc)) exit("3 failed\n"); echo "P->P: ok\n"; ?> ---EXPECTF-- +--EXPECT-- TC->TC: ok P->TC: ok P->P: ok diff --git a/ext/gd/tests/dashedlines.phpt b/ext/gd/tests/dashedlines.phpt index 7c13084157..66209f47d8 100644 --- a/ext/gd/tests/dashedlines.phpt +++ b/ext/gd/tests/dashedlines.phpt @@ -72,7 +72,7 @@ imagedestroy($im); ?> ---EXPECTF-- +--EXPECT-- Horizontal: ok Vertical: ok Diagonal: ok diff --git a/ext/gd/tests/imageantialias_error2.phpt b/ext/gd/tests/imageantialias_error2.phpt index 8dad8bd115..6bde8fe54a 100644 --- a/ext/gd/tests/imageantialias_error2.phpt +++ b/ext/gd/tests/imageantialias_error2.phpt @@ -19,5 +19,5 @@ $image = imagecreatetruecolor(180, 30); var_dump(imageantialias($image, 'wrong param')); // 'wrogn param' is converted to true ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/gd/tests/imagecolorallocate_basic.phpt b/ext/gd/tests/imagecolorallocate_basic.phpt index 25b2821485..22efeb60e9 100644 --- a/ext/gd/tests/imagecolorallocate_basic.phpt +++ b/ext/gd/tests/imagecolorallocate_basic.phpt @@ -26,7 +26,7 @@ var_dump( imagecolorallocate($im, 0, 0, 255) ); var_dump( imagecolorallocate($im, 255, 255, 255) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing imagecolorallocate() : basic functionality *** int(16711680) int(65280) diff --git a/ext/gd/tests/imagecolorallocate_variation5.phpt b/ext/gd/tests/imagecolorallocate_variation5.phpt index 794abb3d71..27cdaeb5f7 100644 --- a/ext/gd/tests/imagecolorallocate_variation5.phpt +++ b/ext/gd/tests/imagecolorallocate_variation5.phpt @@ -45,7 +45,7 @@ foreach($values as $key => $value) { }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing imagecolorallocate() : usage variations *** --Octal 000-- diff --git a/ext/gd/tests/imagecolorallocate_variation6.phpt b/ext/gd/tests/imagecolorallocate_variation6.phpt index bc939c9799..48b096cb26 100644 --- a/ext/gd/tests/imagecolorallocate_variation6.phpt +++ b/ext/gd/tests/imagecolorallocate_variation6.phpt @@ -39,7 +39,7 @@ foreach($values as $key => $value) { }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing imagecolorallocate() : usage variations *** --Decimal 256-- diff --git a/ext/gd/tests/imagecolormatch_basic.phpt b/ext/gd/tests/imagecolormatch_basic.phpt index 1d188121b6..46e8878d9d 100644 --- a/ext/gd/tests/imagecolormatch_basic.phpt +++ b/ext/gd/tests/imagecolormatch_basic.phpt @@ -15,5 +15,5 @@ $imb = imagecreate(110, 20); $background_color = imagecolorallocate($imb, 0, 0, 100); var_dump(imagecolormatch($ima, $imb)); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/gd/tests/imagecolorstotal_basic.phpt b/ext/gd/tests/imagecolorstotal_basic.phpt index 472a10d864..71eddd9ff4 100644 --- a/ext/gd/tests/imagecolorstotal_basic.phpt +++ b/ext/gd/tests/imagecolorstotal_basic.phpt @@ -30,7 +30,7 @@ imagedestroy($im); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing imagecolorstotal() : basic functionality *** Total colors in image: 128 ===DONE===
\ No newline at end of file diff --git a/ext/gd/tests/imagecolourstotal_basic.phpt b/ext/gd/tests/imagecolourstotal_basic.phpt index c26fa68cf2..0db589bdf6 100644 --- a/ext/gd/tests/imagecolourstotal_basic.phpt +++ b/ext/gd/tests/imagecolourstotal_basic.phpt @@ -40,7 +40,7 @@ imagedestroy( $img ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing imagecolorstotal() : basic functionality *** int(0) int(1) diff --git a/ext/gd/tests/imagefilter_error13.phpt b/ext/gd/tests/imagefilter_error13.phpt index 687d148be5..bcba260b9a 100644 --- a/ext/gd/tests/imagefilter_error13.phpt +++ b/ext/gd/tests/imagefilter_error13.phpt @@ -13,5 +13,5 @@ $image = imagecreatetruecolor(180, 30); var_dump(imagefilter($image, IMG_FILTER_COLORIZE, 800, 255, 255)); // Wrong value is truncated to 255 ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/gd/tests/libgd00100.phpt b/ext/gd/tests/libgd00100.phpt index 84f8858a9a..a0ad74a5f5 100644 --- a/ext/gd/tests/libgd00100.phpt +++ b/ext/gd/tests/libgd00100.phpt @@ -111,5 +111,5 @@ test_image_equals_file(__DIR__ . '/libgd00100.png', $im); imagedestroy($im); ?> ---EXPECTF-- +--EXPECT-- The images are equal. diff --git a/ext/gd/tests/types.phpt b/ext/gd/tests/types.phpt index 0b79e78d1b..246e3ba7d2 100644 --- a/ext/gd/tests/types.phpt +++ b/ext/gd/tests/types.phpt @@ -29,5 +29,5 @@ if ($flags&16 && !function_exists("imagecreatefromxpm")) { } echo "ok\n"; ?> ---EXPECTF-- +--EXPECT-- ok diff --git a/ext/gettext/tests/bug66267.phpt b/ext/gettext/tests/bug66267.phpt index 56396860b4..de16b65d9e 100644 --- a/ext/gettext/tests/bug66267.phpt +++ b/ext/gettext/tests/bug66267.phpt @@ -42,7 +42,7 @@ foreach ($loc as $l) { ?> ==DONE== ---EXPECTF-- +--EXPECT-- LC_ALL=de_DE hello=hallo diff --git a/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt b/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt index 2c8e5612fe..6d0048026d 100644 --- a/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt +++ b/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt @@ -13,7 +13,7 @@ test if bind_textdomain_codeset() returns correct value echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(false) string(5) "UTF-8" Done diff --git a/ext/gettext/tests/gettext_bindtextdomain-cwd.phpt b/ext/gettext/tests/gettext_bindtextdomain-cwd.phpt index eac7ff3fc7..95d6e7e3e6 100644 --- a/ext/gettext/tests/gettext_bindtextdomain-cwd.phpt +++ b/ext/gettext/tests/gettext_bindtextdomain-cwd.phpt @@ -19,7 +19,7 @@ bindtextdomain('messages', './locale'); var_dump(gettext('Basic test')); ?> ---EXPECTF-- +--EXPECT-- string(10) "Basic test" string(12) "A basic test" --CREDITS-- diff --git a/ext/gettext/tests/gettext_bindtextdomain-path.phpt b/ext/gettext/tests/gettext_bindtextdomain-path.phpt index 45349b4379..8bc1854e04 100644 --- a/ext/gettext/tests/gettext_bindtextdomain-path.phpt +++ b/ext/gettext/tests/gettext_bindtextdomain-path.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("gettext")) { <?php chdir(dirname(__FILE__)); var_dump(bindtextdomain('example.org', 'foobar')); ---EXPECTF-- +--EXPECT-- bool(false) --CREDITS-- Till Klampaeckel, till@php.net diff --git a/ext/gettext/tests/gettext_dcgettext.phpt b/ext/gettext/tests/gettext_dcgettext.phpt index 24b558ebf6..c74194db2d 100644 --- a/ext/gettext/tests/gettext_dcgettext.phpt +++ b/ext/gettext/tests/gettext_dcgettext.phpt @@ -17,7 +17,7 @@ bindtextdomain('dngettextTest', './locale'); var_dump(dcgettext('dngettextTest', 'item', LC_CTYPE)); var_dump(dcgettext('dngettextTest', 'item', LC_MESSAGES)); ---EXPECTF-- +--EXPECT-- string(8) "cProdukt" string(7) "Produkt" --CREDITS-- diff --git a/ext/gmp/tests/bug52906.phpt b/ext/gmp/tests/bug52906.phpt index 60fc7417b6..2bcd6a4e57 100644 --- a/ext/gmp/tests/bug52906.phpt +++ b/ext/gmp/tests/bug52906.phpt @@ -24,7 +24,7 @@ foreach($vals as $data) { } echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 7%3=1 7%3=1 2%7=2 diff --git a/ext/gmp/tests/clone.phpt b/ext/gmp/tests/clone.phpt index 56b5ca3dfe..54e23a78ac 100644 --- a/ext/gmp/tests/clone.phpt +++ b/ext/gmp/tests/clone.phpt @@ -11,7 +11,7 @@ gmp_clrbit($a, 0); var_dump($a, $b); // $b should be unaffected ?> ---EXPECTF-- +--EXPECT-- object(GMP)#1 (1) { ["num"]=> string(1) "2" diff --git a/ext/hash/tests/bug70312.phpt b/ext/hash/tests/bug70312.phpt index 5ded1ac5a5..6978feb65b 100644 --- a/ext/hash/tests/bug70312.phpt +++ b/ext/hash/tests/bug70312.phpt @@ -10,7 +10,7 @@ var_dump(hash('haval192,5', '123456789012345678901234567890123456789012345678901 var_dump(hash('haval224,5', '1234567890123456789012345678901234567890123456789012345678901234')); var_dump(hash('haval256,5', '1234567890123456789012345678901234567890123456789012345678901234')); ?> ---EXPECTF-- +--EXPECT-- string(32) "f3f0d23819b87228b4b70ee350afaa9d" string(40) "aded6485e137f11d7292212ba3fa961714df0564" string(48) "e53da2b16269fe732e9a898a96707a9f28404d7333b02286" diff --git a/ext/hash/tests/hash-clone.phpt b/ext/hash/tests/hash-clone.phpt index ba9257d1c2..9a067d73ae 100644 --- a/ext/hash/tests/hash-clone.phpt +++ b/ext/hash/tests/hash-clone.phpt @@ -30,7 +30,7 @@ foreach ($algos as $algo) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(3) "md2" string(32) "d5ac4ffd08f6a57b9bd402b8068392ff" string(32) "d5ac4ffd08f6a57b9bd402b8068392ff" diff --git a/ext/hash/tests/hash_copy_001.phpt b/ext/hash/tests/hash_copy_001.phpt index cd1af4de09..411b5d033d 100644 --- a/ext/hash/tests/hash_copy_001.phpt +++ b/ext/hash/tests/hash_copy_001.phpt @@ -30,7 +30,7 @@ foreach ($algos as $algo) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(3) "md2" string(32) "d5ac4ffd08f6a57b9bd402b8068392ff" string(32) "d5ac4ffd08f6a57b9bd402b8068392ff" diff --git a/ext/hash/tests/hash_file_basic.phpt b/ext/hash/tests/hash_file_basic.phpt index b16927d20e..f655421904 100644 --- a/ext/hash/tests/hash_file_basic.phpt +++ b/ext/hash/tests/hash_file_basic.phpt @@ -34,7 +34,7 @@ $filename = 'hash_file_basic_example.txt'; unlink( $filename ); ?> ---EXPECTF-- +--EXPECT-- *** Testing hash_file() : basic functionality *** string(32) "5c6ffbdd40d9556b73a21e63c3e0e904" string(40) "c0854fb9fb03c41cce3802cb0d220529e6eef94e" diff --git a/ext/hash/tests/hash_file_basic1.phpt b/ext/hash/tests/hash_file_basic1.phpt index 9a2bc01016..2e088cebe6 100644 --- a/ext/hash/tests/hash_file_basic1.phpt +++ b/ext/hash/tests/hash_file_basic1.phpt @@ -59,7 +59,7 @@ unlink($file); ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing hash_file() : basic functionality *** adler32: ff87222e crc32: 61664d33 diff --git a/ext/hash/tests/hash_hkdf_basic.phpt b/ext/hash/tests/hash_hkdf_basic.phpt index 7a8ffde6a1..06b5dac2cd 100644 --- a/ext/hash/tests/hash_hkdf_basic.phpt +++ b/ext/hash/tests/hash_hkdf_basic.phpt @@ -53,7 +53,7 @@ echo 'snefru256: ', bin2hex(hash_hkdf('snefru256', $ikm)), "\n"; echo 'gost: ', bin2hex(hash_hkdf('gost', $ikm)), "\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing hash_hkdf(): basic functionality *** md2: 87779851d2377dab25da16fd7aadfdf5 md4: 422c6bd8dd2a6baae8abadef618c3ede diff --git a/ext/hash/tests/hash_hkdf_rfc5869.phpt b/ext/hash/tests/hash_hkdf_rfc5869.phpt index 592d6aee9a..d1ad9961f4 100644 --- a/ext/hash/tests/hash_hkdf_rfc5869.phpt +++ b/ext/hash/tests/hash_hkdf_rfc5869.phpt @@ -68,7 +68,7 @@ echo "Test case 7 (SHA-1 with zero-length info, salt not provided): ", )), "\n"; ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing hash_hkdf(): RFC 5869 test vectors *** Test case 1 (SHA-256): 3cb25f25faacd57a90434f64d0362f2a2d2d0a90cf1a5a4c5db02d56ecc4c5bf34007208d5b887185865 Test case 2 (SHA-256 with longer inputs/outputs): b11e398dc80327a1c8e7f78c596a49344f012eda2d4efad8a050cc4c19afa97c59045a99cac7827271cb41c65e590e09da3275600c2f09b8367793a9aca3db71cc30c58179ec3e87c14c01d5c1f3434f1d87 diff --git a/ext/hash/tests/hash_hmac_basic.phpt b/ext/hash/tests/hash_hmac_basic.phpt index ad4e754e55..327cb58281 100644 --- a/ext/hash/tests/hash_hmac_basic.phpt +++ b/ext/hash/tests/hash_hmac_basic.phpt @@ -37,7 +37,7 @@ echo "sha256(raw): " . bin2hex(hash_hmac('sha256', $content, $key, TRUE)) . "\n" ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing hash_hmac() : basic functionality *** gost: a4a3c80bdf3f8665bf07376a34dc9c1b11af7c813f4928f62e39f0c0dc564dad haval128,3: 4d1318607f0406bd1b7bd50907772672 diff --git a/ext/hash/tests/new-context.phpt b/ext/hash/tests/new-context.phpt index 5b69115b12..b4ddf64a0f 100644 --- a/ext/hash/tests/new-context.phpt +++ b/ext/hash/tests/new-context.phpt @@ -10,5 +10,5 @@ try { } catch (Error $e) { echo "Exception: {$e->getMessage()}\n"; } ---EXPECTF-- +--EXPECT-- Exception: Call to private HashContext::__construct() from invalid context diff --git a/ext/hash/tests/serialize-context.phpt b/ext/hash/tests/serialize-context.phpt index 81b3a11f70..78177cda50 100644 --- a/ext/hash/tests/serialize-context.phpt +++ b/ext/hash/tests/serialize-context.phpt @@ -11,5 +11,5 @@ try { } catch (Exception $e) { echo "Exception: {$e->getMessage()}\n"; } ---EXPECTF-- +--EXPECT-- Exception: Serialization of 'HashContext' is not allowed
\ No newline at end of file diff --git a/ext/iconv/tests/iconv_default_charset.phpt b/ext/iconv/tests/iconv_default_charset.phpt index ebfc7e6ee1..4b44c1266e 100644 --- a/ext/iconv/tests/iconv_default_charset.phpt +++ b/ext/iconv/tests/iconv_default_charset.phpt @@ -52,7 +52,7 @@ var_dump(ini_set('default_charset', 'ISO-8859-1'), echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing default_charset handling *** --- Get php.ini values --- string(5) "UTF-8" diff --git a/ext/iconv/tests/iconv_encoding_basic.phpt b/ext/iconv/tests/iconv_encoding_basic.phpt index 35314f1e69..094a050e5a 100644 --- a/ext/iconv/tests/iconv_encoding_basic.phpt +++ b/ext/iconv/tests/iconv_encoding_basic.phpt @@ -48,7 +48,7 @@ var_dump(iconv_get_encoding("all")); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing iconv_get_encoding()/iconv_set_encoding() : basic functionality *** --- Default get_encoding --- array(3) { diff --git a/ext/iconv/tests/iconv_stream_filter.phpt b/ext/iconv/tests/iconv_stream_filter.phpt index 79f6ad5179..afa6d67446 100644 --- a/ext/iconv/tests/iconv_stream_filter.phpt +++ b/ext/iconv/tests/iconv_stream_filter.phpt @@ -27,7 +27,7 @@ var_dump(bin2hex(fread($fp, 5)) != "69636f6e76"); var_dump(bin2hex(fread($fp, 1)) != "0a"); fclose($fp); ?> ---EXPECTF-- +--EXPECT-- string(20) "1b244224332473244b24" string(10) "41244f1b28" string(2) "42" diff --git a/ext/iconv/tests/iconv_strlen_basic.phpt b/ext/iconv/tests/iconv_strlen_basic.phpt index e5d6271f69..f4f8d7fb9b 100644 --- a/ext/iconv/tests/iconv_strlen_basic.phpt +++ b/ext/iconv/tests/iconv_strlen_basic.phpt @@ -29,7 +29,7 @@ echo "\n-- Multibyte String --\n"; var_dump(iconv_strlen($string_mb, 'UTF-8')); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing iconv_strlen() : basic functionality*** -- ASCII String -- diff --git a/ext/iconv/tests/iconv_strpos_basic.phpt b/ext/iconv/tests/iconv_strpos_basic.phpt index 1017f8e3b6..88f4903ca3 100644 --- a/ext/iconv/tests/iconv_strpos_basic.phpt +++ b/ext/iconv/tests/iconv_strpos_basic.phpt @@ -42,7 +42,7 @@ var_dump(iconv_strpos($string_mb, $needle2)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing iconv_strpos() : basic functionality*** -- ASCII string 1 -- diff --git a/ext/iconv/tests/iconv_strrpos_basic.phpt b/ext/iconv/tests/iconv_strrpos_basic.phpt index 78dfaa0db1..5a6ee82d9f 100644 --- a/ext/iconv/tests/iconv_strrpos_basic.phpt +++ b/ext/iconv/tests/iconv_strrpos_basic.phpt @@ -42,7 +42,7 @@ var_dump(iconv_strrpos($string_mb, $needle2)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing iconv_strrpos() : basic *** -- ASCII string 1 -- diff --git a/ext/imap/tests/bug63126.phpt b/ext/imap/tests/bug63126.phpt index 70fba3843e..b046c46b55 100644 --- a/ext/imap/tests/bug63126.phpt +++ b/ext/imap/tests/bug63126.phpt @@ -46,7 +46,7 @@ foreach ($tests as $name => $testparams) { } echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Test for Array Test for String Done diff --git a/ext/intl/tests/breakiter_getText_basic.phpt b/ext/intl/tests/breakiter_getText_basic.phpt index 0e5a26c16a..37cd161e02 100644 --- a/ext/intl/tests/breakiter_getText_basic.phpt +++ b/ext/intl/tests/breakiter_getText_basic.phpt @@ -12,6 +12,6 @@ $bi = IntlBreakIterator::createWordInstance('pt'); var_dump($bi->getText()); $bi->setText('foo bar'); var_dump($bi->getText()); ---EXPECTF-- +--EXPECT-- NULL string(7) "foo bar" diff --git a/ext/intl/tests/breakiter_last_basic.phpt b/ext/intl/tests/breakiter_last_basic.phpt index cf816c3670..48693f1ed0 100644 --- a/ext/intl/tests/breakiter_last_basic.phpt +++ b/ext/intl/tests/breakiter_last_basic.phpt @@ -14,7 +14,7 @@ $bi->setText('foo bar trans'); var_dump($bi->current()); var_dump($bi->last()); var_dump($bi->current()); ---EXPECTF-- +--EXPECT-- int(0) int(13) int(13) diff --git a/ext/intl/tests/bug53512.phpt b/ext/intl/tests/bug53512.phpt index 0de2c49a20..872e5987be 100644 --- a/ext/intl/tests/bug53512.phpt +++ b/ext/intl/tests/bug53512.phpt @@ -16,7 +16,7 @@ foreach ($badvals as $val) { } ?> ---EXPECTF-- +--EXPECT-- bool(false) string(65) "numfmt_set_symbol: invalid symbol value: U_ILLEGAL_ARGUMENT_ERROR" bool(false) diff --git a/ext/intl/tests/bug67397.phpt b/ext/intl/tests/bug67397.phpt index b2b2911f8a..b2278ea7e6 100644 --- a/ext/intl/tests/bug67397.phpt +++ b/ext/intl/tests/bug67397.phpt @@ -16,6 +16,6 @@ function ut_main() include_once( 'ut_common.inc' ); ut_run(); ?> ---EXPECTF-- +--EXPECT-- false 'locale_get_display_name : name too long: U_ILLEGAL_ARGUMENT_ERROR' diff --git a/ext/intl/tests/bug69374.phpt b/ext/intl/tests/bug69374.phpt index 4d9fffab7a..6788255289 100644 --- a/ext/intl/tests/bug69374.phpt +++ b/ext/intl/tests/bug69374.phpt @@ -16,7 +16,7 @@ echo IntlDateFormatter::formatObject ($date, $pattern2, 'ko_KR'), "\n"; ?> ==DONE== ---EXPECTF-- +--EXPECT-- tháng 04, 2015 2015년 4월 ==DONE== diff --git a/ext/intl/tests/bug69398.phpt b/ext/intl/tests/bug69398.phpt index ea7dbd5098..152feedc39 100644 --- a/ext/intl/tests/bug69398.phpt +++ b/ext/intl/tests/bug69398.phpt @@ -14,7 +14,7 @@ echo IntlDateFormatter::formatObject ($date, array(IntlDateFormatter::SHORT, Int ?> ==DONE== ---EXPECTF-- +--EXPECT-- 04/04/2015 15. 4. 4. ==DONE== diff --git a/ext/intl/tests/bug72533.phpt b/ext/intl/tests/bug72533.phpt index c7fcba39d0..1a182afdd9 100644 --- a/ext/intl/tests/bug72533.phpt +++ b/ext/intl/tests/bug72533.phpt @@ -24,7 +24,7 @@ function ut_main() include_once( 'ut_common.inc' ); ut_run(); ?> ---EXPECTF-- +--EXPECT-- false 'locale_accept_from_http: locale string too long: U_ILLEGAL_ARGUMENT_ERROR' 'en'
\ No newline at end of file diff --git a/ext/intl/tests/bug74298.phpt b/ext/intl/tests/bug74298.phpt index 0bfb59b48e..c86bca9fba 100644 --- a/ext/intl/tests/bug74298.phpt +++ b/ext/intl/tests/bug74298.phpt @@ -24,7 +24,7 @@ var_dump(datefmt_create( 'yyyy-MM-dd HH:mm:ss.SSSSSS' )->format(new \DateTime('2017-01-01 01:02:03.123456', new \DateTimeZone('UTC')))); ?> ---EXPECTF-- +--EXPECT-- string(26) "2017-01-01T01:02:03.123456" string(26) "2017-01-01 01:02:03.123000" string(26) "2017-01-01 01:02:03.123000" diff --git a/ext/intl/tests/dateformat_clone.phpt b/ext/intl/tests/dateformat_clone.phpt index f060444741..2a98ff30cd 100644 --- a/ext/intl/tests/dateformat_clone.phpt +++ b/ext/intl/tests/dateformat_clone.phpt @@ -28,7 +28,7 @@ $res_str .= "\nResult of clone formatting timestamp=0 is : \n$formatted"; echo $res_str; ?> ---EXPECTF-- +--EXPECT-- Result of formatting timestamp=0 is : 31-12-69 Result of formatting timestamp=0 is : diff --git a/ext/intl/tests/dateformat_clone2.phpt b/ext/intl/tests/dateformat_clone2.phpt index c91f4b8b32..34b802120a 100644 --- a/ext/intl/tests/dateformat_clone2.phpt +++ b/ext/intl/tests/dateformat_clone2.phpt @@ -28,7 +28,7 @@ $res_str .= "\nResult of clone formatting timestamp=0 is : \n$formatted"; echo $res_str; ?> ---EXPECTF-- +--EXPECT-- Result of formatting timestamp=0 is : 31-12-70 Result of formatting timestamp=0 is : diff --git a/ext/intl/tests/dateformat_timezone_arg_variations4.phpt b/ext/intl/tests/dateformat_timezone_arg_variations4.phpt index 7be709a66f..be6b1221ce 100644 --- a/ext/intl/tests/dateformat_timezone_arg_variations4.phpt +++ b/ext/intl/tests/dateformat_timezone_arg_variations4.phpt @@ -35,7 +35,7 @@ echo $df->format($ts), "\n"; $df = new IntlDateFormatter('es_ES', 0, 0, 'Europe/Amsterdam', 0); echo $df->format($ts), "\n"; ---EXPECTF-- +--EXPECT-- sábado, 31 de diciembre de 2011, 23:00:00 (hora estándar de las Azores) domingo, 1 de enero de 2012, 1:00:00 (hora estándar de Europa central) domingo, 1 de enero de 2012, 0:00:00 (hora estándar de Europa occidental) diff --git a/ext/intl/tests/formatter_clone.phpt b/ext/intl/tests/formatter_clone.phpt index 4e8d096244..d474eb2b70 100644 --- a/ext/intl/tests/formatter_clone.phpt +++ b/ext/intl/tests/formatter_clone.phpt @@ -24,7 +24,7 @@ $res_str .= "Formatted(clone) number: " . ut_nfmt_format( $fmt_clone, $test_valu echo $res_str; ?> ---EXPECTF-- +--EXPECT-- Formatted number: 12345.123456 Formatted number: 12345.1 Formatted(clone) number: 12345.123456 diff --git a/ext/intl/tests/formatter_clone_bad_obj.phpt b/ext/intl/tests/formatter_clone_bad_obj.phpt index ef7b28a546..f90aae011f 100644 --- a/ext/intl/tests/formatter_clone_bad_obj.phpt +++ b/ext/intl/tests/formatter_clone_bad_obj.phpt @@ -16,5 +16,5 @@ try { var_dump($e->getMessage()); } ---EXPECTF-- +--EXPECT-- string(42) "Cannot clone unconstructed NumberFormatter" diff --git a/ext/intl/tests/locale_parse_locale2.phpt b/ext/intl/tests/locale_parse_locale2.phpt index 30cc8cc0ae..f1482730c3 100644 --- a/ext/intl/tests/locale_parse_locale2.phpt +++ b/ext/intl/tests/locale_parse_locale2.phpt @@ -96,7 +96,7 @@ include_once( 'ut_common.inc' ); ut_run(); ?> ---EXPECTF-- +--EXPECT-- --------------------- uk-ua_CALIFORNIA@currency=;currency=GRN: language : 'uk' , region : 'UA' , variant0 : 'CALIFORNIA' , diff --git a/ext/intl/tests/msgfmt_clone.phpt b/ext/intl/tests/msgfmt_clone.phpt index 9d8ea64442..04c1c1cee4 100644 --- a/ext/intl/tests/msgfmt_clone.phpt +++ b/ext/intl/tests/msgfmt_clone.phpt @@ -24,7 +24,7 @@ $res_str .= "Formatting clone result: " . ut_msgfmt_format( $fmt_clone, array(12 echo $res_str; ?> ---EXPECTF-- +--EXPECT-- Formatting result: 123 monkeys on 456 trees Formatting result: 123 trees hosting 456 monkeys Formatting clone result: 123 monkeys on 456 trees diff --git a/ext/intl/tests/msgfmt_format_error1.phpt b/ext/intl/tests/msgfmt_format_error1.phpt index 684b05970a..da4880a97b 100644 --- a/ext/intl/tests/msgfmt_format_error1.phpt +++ b/ext/intl/tests/msgfmt_format_error1.phpt @@ -15,5 +15,5 @@ EOD; $mf = new MessageFormatter('en_US', $fmt); var_dump($mf->format(array(7))); ---EXPECTF-- +--EXPECT-- string(5) "7 {1}" diff --git a/ext/intl/tests/resourcebundle_create.phpt b/ext/intl/tests/resourcebundle_create.phpt index 2bf4f556a8..9d551219ec 100644 --- a/ext/intl/tests/resourcebundle_create.phpt +++ b/ext/intl/tests/resourcebundle_create.phpt @@ -38,7 +38,7 @@ function ut_main() { include_once( 'ut_common.inc' ); ut_run(); ?> ---EXPECTF-- +--EXPECT-- ResourceBundle Object ( ) diff --git a/ext/intl/tests/resourcebundle_internal.phpt b/ext/intl/tests/resourcebundle_internal.phpt index fe90081e79..2063ae2277 100644 --- a/ext/intl/tests/resourcebundle_internal.phpt +++ b/ext/intl/tests/resourcebundle_internal.phpt @@ -13,7 +13,7 @@ var_dump($b->get('ICUVersion') !== NULL); $b = new ResourceBundle('supplementalData', 'ICUDATA', false); var_dump($b->get('cldrVersion') !== NULL); ?> ---EXPECTF-- +--EXPECT-- string(11) "Deutschland" bool(true) bool(true) diff --git a/ext/intl/tests/resourcebundle_iterator.phpt b/ext/intl/tests/resourcebundle_iterator.phpt index a10b9deb89..e0b83d8190 100644 --- a/ext/intl/tests/resourcebundle_iterator.phpt +++ b/ext/intl/tests/resourcebundle_iterator.phpt @@ -32,7 +32,7 @@ Test ResourceBundle iterator echo "$onekey => $oneval\n"; } ?> ---EXPECTF-- +--EXPECT-- Here comes testarray: ResourceBundle Object ( diff --git a/ext/intl/tests/resourcebundle_traversable.phpt b/ext/intl/tests/resourcebundle_traversable.phpt index 1e6af7b909..4aeec2330d 100644 --- a/ext/intl/tests/resourcebundle_traversable.phpt +++ b/ext/intl/tests/resourcebundle_traversable.phpt @@ -11,7 +11,7 @@ Bug #55610: ResourceBundle does not implement Traversable var_dump($r instanceof Traversable); var_dump(iterator_to_array($r->get('testarray'))); ?> ---EXPECTF-- +--EXPECT-- bool(true) array(3) { [0]=> diff --git a/ext/intl/tests/spoofchecker_001.phpt b/ext/intl/tests/spoofchecker_001.phpt index 71cb665849..3bcc429906 100644 --- a/ext/intl/tests/spoofchecker_001.phpt +++ b/ext/intl/tests/spoofchecker_001.phpt @@ -16,7 +16,7 @@ echo "certain all-uppercase Latin sequences can be spoof of Greek\n"; var_dump($x->isSuspicious("NAPKIN PEZ")); var_dump($x->isSuspicious("napkin pez")); ?> ---EXPECTF-- +--EXPECT-- paypal with Cyrillic spoof characters bool(true) certain all-uppercase Latin sequences can be spoof of Greek diff --git a/ext/intl/tests/spoofchecker_002.phpt b/ext/intl/tests/spoofchecker_002.phpt index d570917350..0917f68a2f 100644 --- a/ext/intl/tests/spoofchecker_002.phpt +++ b/ext/intl/tests/spoofchecker_002.phpt @@ -13,7 +13,7 @@ var_dump($x->areConfusable("hello, world", "goodbye, world")); var_dump($x->areConfusable("hello, world", "hello, world")); var_dump($x->areConfusable("hello, world", "he11o, wor1d")); ?> ---EXPECTF-- +--EXPECT-- Checking if words are confusable bool(false) bool(true) diff --git a/ext/intl/tests/spoofchecker_003.phpt b/ext/intl/tests/spoofchecker_003.phpt index 0be9bfa409..9cd7f350dc 100644 --- a/ext/intl/tests/spoofchecker_003.phpt +++ b/ext/intl/tests/spoofchecker_003.phpt @@ -18,7 +18,7 @@ echo "Is suspcious, ko_KR\n"; $x->setAllowedLocales('en_US, ko_KR'); var_dump($x->isSuspicious($korean)); ?> ---EXPECTF-- +--EXPECT-- Is suspcious, en_US bool(true) Is suspcious, ko_KR diff --git a/ext/intl/tests/spoofchecker_004.phpt b/ext/intl/tests/spoofchecker_004.phpt index a26b39209f..b84eceb07b 100644 --- a/ext/intl/tests/spoofchecker_004.phpt +++ b/ext/intl/tests/spoofchecker_004.phpt @@ -20,7 +20,7 @@ $x->setChecks(Spoofchecker::MIXED_SCRIPT_CONFUSABLE | var_dump($x->areConfusable("HELLO", "H\xD0\x95LLO")); var_dump($x->areConfusable("hello", "h\xD0\xB5llo")); ?> ---EXPECTF-- +--EXPECT-- Check with default settings bool(true) bool(true) diff --git a/ext/intl/tests/spoofchecker_005.phpt b/ext/intl/tests/spoofchecker_005.phpt index 0fc3d52a8c..0b963d55de 100644 --- a/ext/intl/tests/spoofchecker_005.phpt +++ b/ext/intl/tests/spoofchecker_005.phpt @@ -20,7 +20,7 @@ $x->setChecks(Spoofchecker::MIXED_SCRIPT_CONFUSABLE | var_dump($x->areConfusable("HELLO", "H\xD0\x95LLO")); var_dump($x->areConfusable("hello", "h\xD0\xB5llo")); ?> ---EXPECTF-- +--EXPECT-- Check with default settings bool(true) bool(true) diff --git a/ext/intl/tests/spoofchecker_006.phpt b/ext/intl/tests/spoofchecker_006.phpt index 038a255419..7839d2e424 100644 --- a/ext/intl/tests/spoofchecker_006.phpt +++ b/ext/intl/tests/spoofchecker_006.phpt @@ -17,7 +17,7 @@ $x->setAllowedLocales("gr_GR"); var_dump($x->isSuspicious("NAPKIN PEZ")); var_dump($x->isSuspicious("napkin pez")); ?> ---EXPECTF-- +--EXPECT-- paypal with Cyrillic spoof characters bool(true) bool(true) diff --git a/ext/intl/tests/uconverter_func_subst.phpt b/ext/intl/tests/uconverter_func_subst.phpt index 5cac5ce59c..12168f3cca 100644 --- a/ext/intl/tests/uconverter_func_subst.phpt +++ b/ext/intl/tests/uconverter_func_subst.phpt @@ -22,7 +22,7 @@ foreach(array('?','','??') as $subst) { } } ---EXPECTF-- +--EXPECT-- string(23) "This is an ascii string" string(12) "Snowman: (?)" Error: transcode() returned error 1: U_ILLEGAL_ARGUMENT_ERROR: U_ILLEGAL_ARGUMENT_ERROR diff --git a/ext/json/tests/002.phpt b/ext/json/tests/002.phpt index b562b616c8..48ecdc5d7b 100644 --- a/ext/json/tests/002.phpt +++ b/ext/json/tests/002.phpt @@ -22,7 +22,7 @@ var_dump(json_encode("руÑÑиш")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(2) """" string(4) "null" string(4) "true" diff --git a/ext/json/tests/005.phpt b/ext/json/tests/005.phpt index 01a307f4a3..48c4b38830 100644 --- a/ext/json/tests/005.phpt +++ b/ext/json/tests/005.phpt @@ -13,7 +13,7 @@ var_dump(json_encode($a)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> array(0) { diff --git a/ext/json/tests/bug41403.phpt b/ext/json/tests/bug41403.phpt index 4f30b25901..f3af6b92ce 100644 --- a/ext/json/tests/bug41403.phpt +++ b/ext/json/tests/bug41403.phpt @@ -20,7 +20,7 @@ var_dump(json_decode('[123,13452345]')); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> float(2,1) diff --git a/ext/json/tests/bug43941.phpt b/ext/json/tests/bug43941.phpt index 48bd7ad524..97ca58e07d 100644 --- a/ext/json/tests/bug43941.phpt +++ b/ext/json/tests/bug43941.phpt @@ -12,7 +12,7 @@ var_dump(json_encode(array("ab\xE0", "ab\xE0c", "abc"), JSON_PARTIAL_OUTPUT_ON_E echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(5) ""abc"" bool(false) string(4) "null" diff --git a/ext/json/tests/bug53946.phpt b/ext/json/tests/bug53946.phpt index 111438ddc4..b8d3fcc3e4 100644 --- a/ext/json/tests/bug53946.phpt +++ b/ext/json/tests/bug53946.phpt @@ -9,7 +9,7 @@ var_dump(json_encode("latin 1234 -/ russian мама мыла раму speci var_dump(json_encode("ab\xE0")); var_dump(json_encode("ab\xE0", JSON_UNESCAPED_UNICODE)); ?> ---EXPECTF-- +--EXPECT-- string(156) ""latin 1234 -\/ russian \u043c\u0430\u043c\u0430 \u043c\u044b\u043b\u0430 \u0440\u0430\u043c\u0443 specialchars \u0002 \b \n U+1D11E >\ud834\udd1e<"" string(100) ""latin 1234 -\/ russian мама мыла раму specialchars \u0002 \b \n U+1D11E >ð„ž<"" bool(false) diff --git a/ext/json/tests/bug54058.phpt b/ext/json/tests/bug54058.phpt index 4b8773f93d..ccb6389110 100644 --- a/ext/json/tests/bug54058.phpt +++ b/ext/json/tests/bug54058.phpt @@ -29,7 +29,7 @@ json_encode($c); var_dump(json_last_error(), json_last_error_msg()); ?> ---EXPECTF-- +--EXPECT-- int(5) string(56) "Malformed UTF-8 characters, possibly incorrectly encoded" int(5) diff --git a/ext/json/tests/bug61537.phpt b/ext/json/tests/bug61537.phpt index 80ed051c9a..03a61d8645 100644 --- a/ext/json/tests/bug61537.phpt +++ b/ext/json/tests/bug61537.phpt @@ -23,7 +23,7 @@ var_dump(json_encode($invalid_utf8, JSON_PARTIAL_OUTPUT_ON_ERROR)); var_dump(json_last_error(), json_last_error_msg()); ?> ---EXPECTF-- +--EXPECT-- bool(false) int(5) string(56) "Malformed UTF-8 characters, possibly incorrectly encoded" diff --git a/ext/json/tests/bug61978.phpt b/ext/json/tests/bug61978.phpt index d4d1748f29..68df624de1 100644 --- a/ext/json/tests/bug61978.phpt +++ b/ext/json/tests/bug61978.phpt @@ -37,7 +37,7 @@ $obj2 = new JsonTest2(); var_dump(json_encode($obj2, JSON_PARTIAL_OUTPUT_ON_ERROR)); ?> ---EXPECTF-- +--EXPECT-- string(24) "{"test":"123","me":null}" == string(24) "{"test":"123","me":null}" diff --git a/ext/json/tests/bug62010.phpt b/ext/json/tests/bug62010.phpt index ddac8963c3..6b5c72589b 100644 --- a/ext/json/tests/bug62010.phpt +++ b/ext/json/tests/bug62010.phpt @@ -9,7 +9,7 @@ var_dump(json_decode('"\ud834"')); var_dump(json_last_error() === JSON_ERROR_UTF16); var_dump(json_last_error_msg()); ?> ---EXPECTF-- +--EXPECT-- NULL bool(true) string(50) "Single unpaired UTF-16 surrogate in unicode escape" diff --git a/ext/json/tests/bug62369.phpt b/ext/json/tests/bug62369.phpt index cf254bfc18..6d9f58b967 100644 --- a/ext/json/tests/bug62369.phpt +++ b/ext/json/tests/bug62369.phpt @@ -29,6 +29,6 @@ switch (json_last_error()) { echo 'ERROR' . PHP_EOL; break; } ---EXPECTF-- +--EXPECT-- OK ERROR diff --git a/ext/json/tests/bug68546.phpt b/ext/json/tests/bug68546.phpt index f8c8d135f3..4994ecf4b0 100644 --- a/ext/json/tests/bug68546.phpt +++ b/ext/json/tests/bug68546.phpt @@ -16,7 +16,7 @@ var_dump(json_last_error_msg()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- NULL bool(true) NULL diff --git a/ext/json/tests/bug68567.phpt b/ext/json/tests/bug68567.phpt index 6d4082c2b7..064efa76ae 100644 --- a/ext/json/tests/bug68567.phpt +++ b/ext/json/tests/bug68567.phpt @@ -9,6 +9,6 @@ var_dump(json_encode(array("\x80" => 1), JSON_PARTIAL_OUTPUT_ON_ERROR)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- string(6) "{"":1}" ===DONE=== diff --git a/ext/json/tests/bug68817.phpt b/ext/json/tests/bug68817.phpt index aa9a63f93d..99fc5f7954 100644 --- a/ext/json/tests/bug68817.phpt +++ b/ext/json/tests/bug68817.phpt @@ -9,7 +9,7 @@ var_dump(json_decode('[""]')); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- array(1) { [0]=> string(0) "" diff --git a/ext/json/tests/bug73113.phpt b/ext/json/tests/bug73113.phpt index b1d70bc4c7..d45e51f683 100644 --- a/ext/json/tests/bug73113.phpt +++ b/ext/json/tests/bug73113.phpt @@ -20,5 +20,5 @@ try { } catch (\Exception $e) { echo $e->getMessage(); } ---EXPECTF-- +--EXPECT-- This error is expected diff --git a/ext/json/tests/inf_nan_error.phpt b/ext/json/tests/inf_nan_error.phpt index f9deecc469..bb60a104ad 100644 --- a/ext/json/tests/inf_nan_error.phpt +++ b/ext/json/tests/inf_nan_error.phpt @@ -27,7 +27,7 @@ var_dump(json_last_error(), json_last_error_msg()); var_dump(json_encode($nan, JSON_PARTIAL_OUTPUT_ON_ERROR)); var_dump(json_last_error(), json_last_error_msg()); ?> ---EXPECTF-- +--EXPECT-- float(INF) bool(false) int(7) diff --git a/ext/json/tests/json_encode_basic.phpt b/ext/json/tests/json_encode_basic.phpt index 7fe855d1dc..265d67299c 100644 --- a/ext/json/tests/json_encode_basic.phpt +++ b/ext/json/tests/json_encode_basic.phpt @@ -87,7 +87,7 @@ foreach($inputs as $input) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing json_encode() : basic functionality *** -- Iteration 1 -- string(1) "0" diff --git a/ext/json/tests/json_encode_basic_utf8.phpt b/ext/json/tests/json_encode_basic_utf8.phpt index d03e83a8a9..7330a56a2a 100644 --- a/ext/json/tests/json_encode_basic_utf8.phpt +++ b/ext/json/tests/json_encode_basic_utf8.phpt @@ -11,7 +11,7 @@ var_dump(json_encode($utf8_string)); ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing json_encode() : basic functionality with UTF-8 input*** string(103) ""\u65e5\u672c\u8a9e\u30c6\u30ad\u30b9\u30c8\u3067\u3059\u300201234\uff15\uff16\uff17\uff18\uff19\u3002"" ===Done=== diff --git a/ext/ldap/tests/ldap_connect_ldap_conf.phpt b/ext/ldap/tests/ldap_connect_ldap_conf.phpt index 5379de4cb5..86b17b5613 100644 --- a/ext/ldap/tests/ldap_connect_ldap_conf.phpt +++ b/ext/ldap/tests/ldap_connect_ldap_conf.phpt @@ -21,6 +21,6 @@ var_dump($host); unlink($conf); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- string(16) "example.com:3141" ===DONE=== diff --git a/ext/ldap/tests/ldap_exop_refresh.phpt b/ext/ldap/tests/ldap_exop_refresh.phpt index fd843a62c6..2c579931ca 100644 --- a/ext/ldap/tests/ldap_exop_refresh.phpt +++ b/ext/ldap/tests/ldap_exop_refresh.phpt @@ -38,6 +38,6 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); ldap_delete($link, "cn=tmp,$base"); remove_dummy_data($link, $base); ?> ---EXPECTF-- +--EXPECT-- int(1234) ===DONE=== diff --git a/ext/ldap/tests/ldap_get_attributes_basic.phpt b/ext/ldap/tests/ldap_get_attributes_basic.phpt index c380432d1b..b831a7f164 100644 --- a/ext/ldap/tests/ldap_get_attributes_basic.phpt +++ b/ext/ldap/tests/ldap_get_attributes_basic.phpt @@ -26,7 +26,7 @@ include "connect.inc"; $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); remove_dummy_data($link, $base); ?> ---EXPECTF-- +--EXPECT-- array(5) { ["objectClass"]=> array(3) { diff --git a/ext/libxml/tests/003.phpt b/ext/libxml/tests/003.phpt index dcf6c0bb65..c168785647 100644 --- a/ext/libxml/tests/003.phpt +++ b/ext/libxml/tests/003.phpt @@ -22,7 +22,7 @@ var_dump(libxml_use_internal_errors(false)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(true) Done diff --git a/ext/mbstring/tests/bug40685.phpt b/ext/mbstring/tests/bug40685.phpt index 1a673e5d15..9434158106 100644 --- a/ext/mbstring/tests/bug40685.phpt +++ b/ext/mbstring/tests/bug40685.phpt @@ -14,7 +14,7 @@ var_dump(mb_decode_numericentity('=', $map, 'UTF-8')); var_dump(mb_decode_numericentity('=', $map, 'UTF-8')); var_dump(mb_decode_numericentity('=', $map, 'UTF-8')); ?> ---EXPECTF-- +--EXPECT-- string(1) "&" string(3) "&&&" string(2) "&#" diff --git a/ext/mbstring/tests/bug52931.phpt b/ext/mbstring/tests/bug52931.phpt index 72debf7d05..ab8c8df723 100644 --- a/ext/mbstring/tests/bug52931.phpt +++ b/ext/mbstring/tests/bug52931.phpt @@ -17,7 +17,7 @@ var_dump(strripos($string, '</body>')); var_dump(mb_strripos($string, '</body>')); ?> ---EXPECTF-- +--EXPECT-- Deprecated: The mbstring.func_overload directive is deprecated in Unknown on line 0 int(27) int(27) diff --git a/ext/mbstring/tests/bug52981.phpt b/ext/mbstring/tests/bug52981.phpt index 7dce14a7ad..f6be08bf33 100644 --- a/ext/mbstring/tests/bug52981.phpt +++ b/ext/mbstring/tests/bug52981.phpt @@ -17,7 +17,7 @@ test("\xF0\x90\x90\xB8");// U+10438 DESERET SMALL LETTER H (added in 3.1.0, Marc // not OK test("\xE2\xB0\xB0"); // U+2C30 GLAGOLITIC SMALL LETTER AZU (added in 4.1.0, March 2005) test("\xD4\xA5"); // U+0525 CYRILLIC SMALL LETTER PE WITH DESCENDER (added in 5.2.0, October 2009) ---EXPECTF-- +--EXPECT-- f0 90 90 90 e2 b0 80 d4 a4 diff --git a/ext/mbstring/tests/bug66797.phpt b/ext/mbstring/tests/bug66797.phpt index df9e789be6..3709dc2bb2 100644 --- a/ext/mbstring/tests/bug66797.phpt +++ b/ext/mbstring/tests/bug66797.phpt @@ -15,7 +15,7 @@ var_dump( ); ?> ==DONE== ---EXPECTF-- +--EXPECT-- string(3) "bar" string(3) "bar" string(0) "" diff --git a/ext/mbstring/tests/bug73532.phpt b/ext/mbstring/tests/bug73532.phpt index 8173a20f68..87689d450a 100644 --- a/ext/mbstring/tests/bug73532.phpt +++ b/ext/mbstring/tests/bug73532.phpt @@ -6,5 +6,5 @@ Bug #73532 (Null pointer dereference in mb_eregi) <?php var_dump(mb_eregi("a", "\xf5")); ?> ---EXPECTF-- +--EXPECT-- bool(false) diff --git a/ext/mbstring/tests/mb_chr_ord.phpt b/ext/mbstring/tests/mb_chr_ord.phpt index 153699b1b0..f2d42fa682 100644 --- a/ext/mbstring/tests/mb_chr_ord.phpt +++ b/ext/mbstring/tests/mb_chr_ord.phpt @@ -16,7 +16,7 @@ for($ch = 1; $ch < 80000; $ch++) { } } echo 'OK'; ---EXPECTF-- +--EXPECT-- ERROR(55296) ERROR(55297) ERROR(55298) diff --git a/ext/mbstring/tests/mb_convert_encoding_array.phpt b/ext/mbstring/tests/mb_convert_encoding_array.phpt index 5bb78df028..b41c717873 100644 --- a/ext/mbstring/tests/mb_convert_encoding_array.phpt +++ b/ext/mbstring/tests/mb_convert_encoding_array.phpt @@ -70,7 +70,7 @@ var_dump(base64_encode_array(mb_convert_encoding($euc_jp_string, 'UTF-8', 'EUC-J echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_convert_encoding() : array functionality *** -- Convert to JIS -- diff --git a/ext/mbstring/tests/mb_convert_encoding_basic.phpt b/ext/mbstring/tests/mb_convert_encoding_basic.phpt index 0060a71808..19626795eb 100644 --- a/ext/mbstring/tests/mb_convert_encoding_basic.phpt +++ b/ext/mbstring/tests/mb_convert_encoding_basic.phpt @@ -58,7 +58,7 @@ var_dump(base64_encode(mb_convert_encoding($euc_jp_string, 'UTF-8', 'EUC-JP'))); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_convert_encoding() : basic functionality *** -- Convert to JIS -- diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt index 0487a194f2..4aa1323adb 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt @@ -46,7 +46,7 @@ foreach ($nonEnglish as $lang => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_encode_mimeheader() : basic *** Language: English diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt index cd52fa526d..3e05b77611 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt @@ -41,7 +41,7 @@ foreach ($inputs as $lang => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_encode_mimeheader() : basic2 *** Language: SJIS diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt index b2f0c8b7d1..f43717327c 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt @@ -41,7 +41,7 @@ foreach ($inputs as $lang => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_encode_mimeheader() : basic2 *** Language: SJIS diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt index 668ae8bfea..de2a848172 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt @@ -37,7 +37,7 @@ foreach ($linefeeds as $linefeed) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_encode_mimeheader() : usage variations *** -- Iteration 1 -- diff --git a/ext/mbstring/tests/mb_encode_numericentity.phpt b/ext/mbstring/tests/mb_encode_numericentity.phpt index dffb419662..51ad6c22a1 100644 --- a/ext/mbstring/tests/mb_encode_numericentity.phpt +++ b/ext/mbstring/tests/mb_encode_numericentity.phpt @@ -16,7 +16,7 @@ echo mb_encode_numericentity($str2, $convmap, "UTF-8")."\n"; $convmap = array(0xFF, 0x2FFFF, 0, 0xFFFF); echo mb_encode_numericentity('aÅ’bÅ“cÅ dÅ¡e€fg', $convmap, "UTF-8")."\n"; ?> ---EXPECTF-- +--EXPECT-- ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ ƒΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρςστυφχψωϑϒϖ•…′″‾⁄℘ℑℜ™ℵ←↑→↓↔↵⇐⇑⇒⇓⇔∀∂∃∅∇∈∉∋∏∑−∗√∝∞∠∧∨∩∪∫∴∼≅≈≠≡≤≥⊂⊃⊄⊆⊇⊕⊗⊥⋅⌈⌉⌊⌋〈〉◊♠♣♥♦ aŒbœcŠdše€fg diff --git a/ext/mbstring/tests/mb_ereg_match_basic.phpt b/ext/mbstring/tests/mb_ereg_match_basic.phpt index c035acc018..f730a637d3 100644 --- a/ext/mbstring/tests/mb_ereg_match_basic.phpt +++ b/ext/mbstring/tests/mb_ereg_match_basic.phpt @@ -41,7 +41,7 @@ var_dump(mb_ereg_match($regex2, $string_mb)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_ereg_match() : basic functionality *** diff --git a/ext/mbstring/tests/mb_ereg_variation1.phpt b/ext/mbstring/tests/mb_ereg_variation1.phpt index 3077bcbd5d..7172dd2a75 100644 --- a/ext/mbstring/tests/mb_ereg_variation1.phpt +++ b/ext/mbstring/tests/mb_ereg_variation1.phpt @@ -90,7 +90,7 @@ fclose($fp); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_ereg() : usage variations *** -- Iteration 1 -- diff --git a/ext/mbstring/tests/mb_ereg_variation4.phpt b/ext/mbstring/tests/mb_ereg_variation4.phpt index 7f7d6dfc93..80c879e38c 100644 --- a/ext/mbstring/tests/mb_ereg_variation4.phpt +++ b/ext/mbstring/tests/mb_ereg_variation4.phpt @@ -73,7 +73,7 @@ function base64_encode_var_dump($regs) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_ereg() : usage variations *** -- Iteration 1 -- diff --git a/ext/mbstring/tests/mb_ereg_variation5.phpt b/ext/mbstring/tests/mb_ereg_variation5.phpt index c26d82ead5..0a7eb53d77 100644 --- a/ext/mbstring/tests/mb_ereg_variation5.phpt +++ b/ext/mbstring/tests/mb_ereg_variation5.phpt @@ -61,7 +61,7 @@ function base64_encode_var_dump($regs) { } } ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_ereg() : usage variations *** ASCII String without $regs arg: int(1) diff --git a/ext/mbstring/tests/mb_internal_encoding_basic2.phpt b/ext/mbstring/tests/mb_internal_encoding_basic2.phpt index eb8fea2b9b..4f9a6a6026 100644 --- a/ext/mbstring/tests/mb_internal_encoding_basic2.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_basic2.phpt @@ -38,7 +38,7 @@ var_dump(mb_internal_encoding()); //check internal encoding is now set to UTF echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_internal_encoding() : basic functionality *** string(0) "" string(10) "ISO-8859-1" diff --git a/ext/mbstring/tests/mb_split.phpt b/ext/mbstring/tests/mb_split.phpt index 45d361c598..4f5171623c 100644 --- a/ext/mbstring/tests/mb_split.phpt +++ b/ext/mbstring/tests/mb_split.phpt @@ -36,7 +36,7 @@ mbstring.func_overload=0 } ?> ---EXPECTF-- +--EXPECT-- bool(true) ok ok diff --git a/ext/mbstring/tests/mb_stripos_basic.phpt b/ext/mbstring/tests/mb_stripos_basic.phpt index e061d8f7cc..5a2fb6cb37 100644 --- a/ext/mbstring/tests/mb_stripos_basic.phpt +++ b/ext/mbstring/tests/mb_stripos_basic.phpt @@ -97,7 +97,7 @@ foreach ($greek_needles as $needle) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_stripos() : basic functionality*** -- ASCII Strings, needle should be found -- diff --git a/ext/mbstring/tests/mb_stripos_basic2.phpt b/ext/mbstring/tests/mb_stripos_basic2.phpt index 76a6cc5066..a9399da391 100644 --- a/ext/mbstring/tests/mb_stripos_basic2.phpt +++ b/ext/mbstring/tests/mb_stripos_basic2.phpt @@ -71,7 +71,7 @@ foreach ($greek_needles as $needle) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_stripos() : basic functionality*** -- ASCII Strings -- diff --git a/ext/mbstring/tests/mb_strlen_basic.phpt b/ext/mbstring/tests/mb_strlen_basic.phpt index 6214f3069c..0e62b881b4 100644 --- a/ext/mbstring/tests/mb_strlen_basic.phpt +++ b/ext/mbstring/tests/mb_strlen_basic.phpt @@ -31,7 +31,7 @@ var_dump(mb_strlen($string_mb, 'UTF-8')); echo "\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strlen() : basic functionality*** -- ASCII String -- diff --git a/ext/mbstring/tests/mb_strlen_variation3.phpt b/ext/mbstring/tests/mb_strlen_variation3.phpt index efa11ad47e..b254cbc712 100644 --- a/ext/mbstring/tests/mb_strlen_variation3.phpt +++ b/ext/mbstring/tests/mb_strlen_variation3.phpt @@ -104,7 +104,7 @@ foreach($encoding as $enc) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strlen() : usage variations *** -- Iteration 1: UCS-4 -- diff --git a/ext/mbstring/tests/mb_strripos_basic.phpt b/ext/mbstring/tests/mb_strripos_basic.phpt index c9e1ff84fc..d63a2eaf6c 100644 --- a/ext/mbstring/tests/mb_strripos_basic.phpt +++ b/ext/mbstring/tests/mb_strripos_basic.phpt @@ -97,7 +97,7 @@ foreach ($greek_needles as $needle) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strripos() : basic functionality*** -- ASCII Strings, needle should be found -- diff --git a/ext/mbstring/tests/mb_strripos_basic2.phpt b/ext/mbstring/tests/mb_strripos_basic2.phpt index b330323c7e..09fc7e352b 100644 --- a/ext/mbstring/tests/mb_strripos_basic2.phpt +++ b/ext/mbstring/tests/mb_strripos_basic2.phpt @@ -71,7 +71,7 @@ foreach ($greek_needles as $needle) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strripos() : basic functionality*** -- ASCII Strings -- diff --git a/ext/mbstring/tests/mb_strrpos_basic.phpt b/ext/mbstring/tests/mb_strrpos_basic.phpt index 9de0388f43..aac9fc020f 100644 --- a/ext/mbstring/tests/mb_strrpos_basic.phpt +++ b/ext/mbstring/tests/mb_strrpos_basic.phpt @@ -40,7 +40,7 @@ var_dump(mb_strrpos($string_mb, $needle2)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strrpos() : basic *** -- ASCII string 1 -- diff --git a/ext/mbstring/tests/mb_strrpos_variation5.phpt b/ext/mbstring/tests/mb_strrpos_variation5.phpt index cb5089679b..6205ecac48 100644 --- a/ext/mbstring/tests/mb_strrpos_variation5.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation5.phpt @@ -38,7 +38,7 @@ foreach ($inputs as $type => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strrpos() : usage variations *** -- Double Quoted String -- diff --git a/ext/mbstring/tests/mb_strtolower_basic.phpt b/ext/mbstring/tests/mb_strtolower_basic.phpt index 6d9cba72fe..4f727094b1 100644 --- a/ext/mbstring/tests/mb_strtolower_basic.phpt +++ b/ext/mbstring/tests/mb_strtolower_basic.phpt @@ -45,7 +45,7 @@ if ($mb == $greek_lower) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strtolower() : basic functionality*** -- ASCII String -- diff --git a/ext/mbstring/tests/mb_strtolower_variation3.phpt b/ext/mbstring/tests/mb_strtolower_variation3.phpt index 99256e1ec4..bf918df182 100644 --- a/ext/mbstring/tests/mb_strtolower_variation3.phpt +++ b/ext/mbstring/tests/mb_strtolower_variation3.phpt @@ -44,7 +44,7 @@ if ($b == $string_all_mb) { // Japanese characters only - should not be any conv echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strtolower() : usage variations *** -- Mixed string (mulitbyte and ASCII characters) -- diff --git a/ext/mbstring/tests/mb_strtolower_variation4.phpt b/ext/mbstring/tests/mb_strtolower_variation4.phpt index f08b508798..007430b262 100644 --- a/ext/mbstring/tests/mb_strtolower_variation4.phpt +++ b/ext/mbstring/tests/mb_strtolower_variation4.phpt @@ -39,7 +39,7 @@ foreach ($uppers as $lang => $sourcestring) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strtolower() : usage variations *** -- Basic Latin -- diff --git a/ext/mbstring/tests/mb_strtoupper_variation3.phpt b/ext/mbstring/tests/mb_strtoupper_variation3.phpt index f0cb0fa47c..de77f39225 100644 --- a/ext/mbstring/tests/mb_strtoupper_variation3.phpt +++ b/ext/mbstring/tests/mb_strtoupper_variation3.phpt @@ -45,7 +45,7 @@ if ($b == $string_all_mb) { // Japanese characters only - should not be any conv echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strtoupper() : usage variations *** -- Mixed string (mulitbyte and ASCII characters) -- diff --git a/ext/mbstring/tests/mb_strtoupper_variation4.phpt b/ext/mbstring/tests/mb_strtoupper_variation4.phpt index 8f5abe7269..739671b6c4 100644 --- a/ext/mbstring/tests/mb_strtoupper_variation4.phpt +++ b/ext/mbstring/tests/mb_strtoupper_variation4.phpt @@ -40,7 +40,7 @@ foreach ($lowers as $lang => $sourcestring) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_strtoupper() : usage variations *** -- Basic Latin -- diff --git a/ext/mbstring/tests/mb_substr_basic.phpt b/ext/mbstring/tests/mb_substr_basic.phpt index d6d6b75d23..8842e7a3d1 100644 --- a/ext/mbstring/tests/mb_substr_basic.phpt +++ b/ext/mbstring/tests/mb_substr_basic.phpt @@ -40,7 +40,7 @@ var_dump(base64_encode($result_2)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_substr() : basic functionality *** -- ASCII string 1 -- diff --git a/ext/mbstring/tests/mb_substr_count_basic.phpt b/ext/mbstring/tests/mb_substr_count_basic.phpt index c4d1d7830a..13cd4a7f25 100644 --- a/ext/mbstring/tests/mb_substr_count_basic.phpt +++ b/ext/mbstring/tests/mb_substr_count_basic.phpt @@ -34,7 +34,7 @@ var_dump(mb_substr_count($string_mb, $needle_mb2)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_substr_count() : basic functionality *** -- ASCII String -- diff --git a/ext/mbstring/tests/mb_substr_count_variation4.phpt b/ext/mbstring/tests/mb_substr_count_variation4.phpt index 21c9f956fb..0a98d2051b 100644 --- a/ext/mbstring/tests/mb_substr_count_variation4.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation4.phpt @@ -33,7 +33,7 @@ var_dump(mb_substr_count($string_mb, $needle_mb, 'utf-8')); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_substr_count() : usage variations *** -- ASCII String -- diff --git a/ext/mbstring/tests/mb_substr_variation3.phpt b/ext/mbstring/tests/mb_substr_variation3.phpt index f0ba2bc0a2..702bdda147 100644 --- a/ext/mbstring/tests/mb_substr_variation3.phpt +++ b/ext/mbstring/tests/mb_substr_variation3.phpt @@ -104,7 +104,7 @@ foreach($encoding as $enc) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mb_substr() : usage variations *** -- Iteration 1: UCS-4 -- diff --git a/ext/mbstring/tests/php_gr_jp_10830.phpt b/ext/mbstring/tests/php_gr_jp_10830.phpt index f9599d995f..375520af88 100644 --- a/ext/mbstring/tests/php_gr_jp_10830.phpt +++ b/ext/mbstring/tests/php_gr_jp_10830.phpt @@ -13,6 +13,6 @@ var_dump( mb_ereg("^[^><]+$",$a) ); var_dump( !!preg_match("/^[^><]+$/",$a) ); ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) diff --git a/ext/mbstring/tests/php_gr_jp_dev_884-1.phpt b/ext/mbstring/tests/php_gr_jp_dev_884-1.phpt index 4978d0ce57..b6c97b324a 100644 --- a/ext/mbstring/tests/php_gr_jp_dev_884-1.phpt +++ b/ext/mbstring/tests/php_gr_jp_dev_884-1.phpt @@ -11,6 +11,6 @@ set_time_limit(2); var_dump(preg_replace("/.*/", "b", "a")); var_dump(mb_ereg_replace(".*", "b", "a")); ?> ---EXPECTF-- +--EXPECT-- string(2) "bb" string(2) "bb" diff --git a/ext/mbstring/tests/php_gr_jp_dev_884-2.phpt b/ext/mbstring/tests/php_gr_jp_dev_884-2.phpt index 2f74dff64b..7c4ebc9a4e 100644 --- a/ext/mbstring/tests/php_gr_jp_dev_884-2.phpt +++ b/ext/mbstring/tests/php_gr_jp_dev_884-2.phpt @@ -12,7 +12,7 @@ var_dump(preg_replace("/C?$/", "Z", "ABC")); var_dump(mb_ereg_replace("C*$", "Z", "ABC")); var_dump(preg_replace("/C*$/", "Z", "ABC")); ?> ---EXPECTF-- +--EXPECT-- string(4) "ABZZ" string(4) "ABZZ" string(4) "ABZZ" diff --git a/ext/mbstring/tests/zend_multibyte-02.phpt b/ext/mbstring/tests/zend_multibyte-02.phpt index 43eb0aebd8..6008be5a11 100644 --- a/ext/mbstring/tests/zend_multibyte-02.phpt +++ b/ext/mbstring/tests/zend_multibyte-02.phpt @@ -11,5 +11,5 @@ mbstring.internal_encoding=CP932 <?php var_dump(bin2hex("テスト")); ?> ---EXPECTF-- +--EXPECT-- string(12) "836583588367" diff --git a/ext/mbstring/tests/zend_multibyte-06.phpt b/ext/mbstring/tests/zend_multibyte-06.phpt index 71e5c903b9..c75c0b8cb2 100644 --- a/ext/mbstring/tests/zend_multibyte-06.phpt +++ b/ext/mbstring/tests/zend_multibyte-06.phpt @@ -11,5 +11,5 @@ mbstring.internal_encoding=CP932 declare(encoding="UTF-8"); var_dump(bin2hex("テスト")); ?> ---EXPECTF-- +--EXPECT-- string(12) "836583588367" diff --git a/ext/mbstring/tests/zend_multibyte-10.phpt b/ext/mbstring/tests/zend_multibyte-10.phpt index ad70b853af..498170e747 100644 --- a/ext/mbstring/tests/zend_multibyte-10.phpt +++ b/ext/mbstring/tests/zend_multibyte-10.phpt @@ -10,5 +10,5 @@ declare(encoding="ISO-8859-15"); declare(encoding="ISO-8859-1"); echo "ok\n"; ?> ---EXPECTF-- +--EXPECT-- ok diff --git a/ext/mbstring/tests/zend_multibyte-15.phpt b/ext/mbstring/tests/zend_multibyte-15.phpt index 35246bcdca..b24ed25fb2 100644 --- a/ext/mbstring/tests/zend_multibyte-15.phpt +++ b/ext/mbstring/tests/zend_multibyte-15.phpt @@ -13,6 +13,6 @@ declare(encoding="UTF-8") { echo "ok\n"; } ?> ---EXPECTF-- +--EXPECT-- ok ok diff --git a/ext/mbstring/tests/zend_multibyte-16.phpt b/ext/mbstring/tests/zend_multibyte-16.phpt index 7f1d91e294..a9b0920184 100644 --- a/ext/mbstring/tests/zend_multibyte-16.phpt +++ b/ext/mbstring/tests/zend_multibyte-16.phpt @@ -11,6 +11,6 @@ declare(encoding="ISO-8859-15") { } echo "ok\n"; ?> ---EXPECTF-- +--EXPECT-- ok ok diff --git a/ext/mysqli/tests/002.phpt b/ext/mysqli/tests/002.phpt index aaece46faf..5a8dcae0c1 100644 --- a/ext/mysqli/tests/002.phpt +++ b/ext/mysqli/tests/002.phpt @@ -57,7 +57,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_fetch_null")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(11) { [0]=> int(1) diff --git a/ext/mysqli/tests/003.phpt b/ext/mysqli/tests/003.phpt index 63d5b43cfc..2e2089d4b2 100644 --- a/ext/mysqli/tests/003.phpt +++ b/ext/mysqli/tests/003.phpt @@ -83,7 +83,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(7) { [0]=> string(10) "2002-01-02" diff --git a/ext/mysqli/tests/004.phpt b/ext/mysqli/tests/004.phpt index 4896a786a8..ad58e7af27 100644 --- a/ext/mysqli/tests/004.phpt +++ b/ext/mysqli/tests/004.phpt @@ -61,7 +61,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(10) "1234567890" diff --git a/ext/mysqli/tests/005.phpt b/ext/mysqli/tests/005.phpt index e433351e01..cbb1cccf96 100644 --- a/ext/mysqli/tests/005.phpt +++ b/ext/mysqli/tests/005.phpt @@ -51,7 +51,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(10) "1234567890" diff --git a/ext/mysqli/tests/009.phpt b/ext/mysqli/tests/009.phpt index e82ca65859..7807929348 100644 --- a/ext/mysqli/tests/009.phpt +++ b/ext/mysqli/tests/009.phpt @@ -92,7 +92,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch_uint")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(8) { [0]=> int(5) diff --git a/ext/mysqli/tests/011.phpt b/ext/mysqli/tests/011.phpt index 3b93b0a207..1792fec6a2 100644 --- a/ext/mysqli/tests/011.phpt +++ b/ext/mysqli/tests/011.phpt @@ -56,7 +56,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(8) { [0]=> int(19) diff --git a/ext/mysqli/tests/012.phpt b/ext/mysqli/tests/012.phpt index ebf8d76daf..2d8c6500ec 100644 --- a/ext/mysqli/tests/012.phpt +++ b/ext/mysqli/tests/012.phpt @@ -55,7 +55,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(8) { [0]=> int(120) diff --git a/ext/mysqli/tests/013.phpt b/ext/mysqli/tests/013.phpt index 6d75bde731..421899d10a 100644 --- a/ext/mysqli/tests/013.phpt +++ b/ext/mysqli/tests/013.phpt @@ -67,6 +67,6 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- ok done!
\ No newline at end of file diff --git a/ext/mysqli/tests/014.phpt b/ext/mysqli/tests/014.phpt index 30044dc4fb..2015f2ef6a 100644 --- a/ext/mysqli/tests/014.phpt +++ b/ext/mysqli/tests/014.phpt @@ -80,7 +80,7 @@ mysqli autocommit/commit/rollback <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- Num_of_rows=1 array(2) { [0]=> diff --git a/ext/mysqli/tests/015.phpt b/ext/mysqli/tests/015.phpt index 227a142d6a..de950b00f7 100644 --- a/ext/mysqli/tests/015.phpt +++ b/ext/mysqli/tests/015.phpt @@ -78,7 +78,7 @@ mysqli autocommit/commit/rollback with innodb <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(1) "1" diff --git a/ext/mysqli/tests/016.phpt b/ext/mysqli/tests/016.phpt index 143143c8f5..60170a727e 100644 --- a/ext/mysqli/tests/016.phpt +++ b/ext/mysqli/tests/016.phpt @@ -28,6 +28,6 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> ---EXPECTF-- +--EXPECT-- string(6) "foobar" done!
\ No newline at end of file diff --git a/ext/mysqli/tests/019.phpt b/ext/mysqli/tests/019.phpt index 3c5530c03a..06f03c0cf1 100644 --- a/ext/mysqli/tests/019.phpt +++ b/ext/mysqli/tests/019.phpt @@ -66,7 +66,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS insert_read")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(11) { [0]=> int(1) diff --git a/ext/mysqli/tests/021.phpt b/ext/mysqli/tests/021.phpt index 6076529959..2011ae630d 100644 --- a/ext/mysqli/tests/021.phpt +++ b/ext/mysqli/tests/021.phpt @@ -49,7 +49,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(10) "1234567890" diff --git a/ext/mysqli/tests/026.phpt b/ext/mysqli/tests/026.phpt index 997dee6517..14b8dcbdba 100644 --- a/ext/mysqli/tests/026.phpt +++ b/ext/mysqli/tests/026.phpt @@ -55,7 +55,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(10) "Hello Worl" diff --git a/ext/mysqli/tests/032.phpt b/ext/mysqli/tests/032.phpt index d773defb26..d6427e7815 100644 --- a/ext/mysqli/tests/032.phpt +++ b/ext/mysqli/tests/032.phpt @@ -37,6 +37,6 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS general_test")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- string(38) "Records: 3 Duplicates: 0 Warnings: 0" done!
\ No newline at end of file diff --git a/ext/mysqli/tests/043.phpt b/ext/mysqli/tests/043.phpt index c3a9901e4f..964e38330e 100644 --- a/ext/mysqli/tests/043.phpt +++ b/ext/mysqli/tests/043.phpt @@ -51,7 +51,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_update")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> string(15) "Rasmus is No. 1" diff --git a/ext/mysqli/tests/048.phpt b/ext/mysqli/tests/048.phpt index bd2625ad61..6f55d03716 100644 --- a/ext/mysqli/tests/048.phpt +++ b/ext/mysqli/tests/048.phpt @@ -51,7 +51,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_fetch_null")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(11) { [0]=> int(1) diff --git a/ext/mysqli/tests/058.phpt b/ext/mysqli/tests/058.phpt index 3d268749b9..0c75488dd6 100644 --- a/ext/mysqli/tests/058.phpt +++ b/ext/mysqli/tests/058.phpt @@ -59,7 +59,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS mbind")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(4) { [0]=> int(1) diff --git a/ext/mysqli/tests/059.phpt b/ext/mysqli/tests/059.phpt index d6e9d6ed55..a05acb825b 100644 --- a/ext/mysqli/tests/059.phpt +++ b/ext/mysqli/tests/059.phpt @@ -52,6 +52,6 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS mbind")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- string(6) "foobar" done!
\ No newline at end of file diff --git a/ext/mysqli/tests/061.phpt b/ext/mysqli/tests/061.phpt index a6a0c4f205..8c5b6aa23c 100644 --- a/ext/mysqli/tests/061.phpt +++ b/ext/mysqli/tests/061.phpt @@ -70,7 +70,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS t_061")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- foo-bar string-string rab-oof diff --git a/ext/mysqli/tests/062.phpt b/ext/mysqli/tests/062.phpt index bfb7ea35bf..fa02853a19 100644 --- a/ext/mysqli/tests/062.phpt +++ b/ext/mysqli/tests/062.phpt @@ -22,7 +22,7 @@ require_once('skipifconnectfailure.inc'); var_dump($row); print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> string(3) "foo" diff --git a/ext/mysqli/tests/063.phpt b/ext/mysqli/tests/063.phpt index da6708c0ac..c4852ac91d 100644 --- a/ext/mysqli/tests/063.phpt +++ b/ext/mysqli/tests/063.phpt @@ -20,5 +20,5 @@ require_once('skipifconnectfailure.inc'); var_dump($foo); ?> ---EXPECTF-- +--EXPECT-- string(3) "foo"
\ No newline at end of file diff --git a/ext/mysqli/tests/068.phpt b/ext/mysqli/tests/068.phpt index 78f710db8c..0d7899d177 100644 --- a/ext/mysqli/tests/068.phpt +++ b/ext/mysqli/tests/068.phpt @@ -7,5 +7,5 @@ mysqli get_client_info $s = mysqli_get_client_info(); echo gettype($s); ?> ---EXPECTF-- +--EXPECT-- string
\ No newline at end of file diff --git a/ext/mysqli/tests/069.phpt b/ext/mysqli/tests/069.phpt index c83cbc3c16..c195173188 100644 --- a/ext/mysqli/tests/069.phpt +++ b/ext/mysqli/tests/069.phpt @@ -26,7 +26,7 @@ require_once('skipifconnectfailure.inc'); $mysql->close(); print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(1) { [1]=> string(1) "1" diff --git a/ext/mysqli/tests/074.phpt b/ext/mysqli/tests/074.phpt index 7b4590f99c..b790f62839 100644 --- a/ext/mysqli/tests/074.phpt +++ b/ext/mysqli/tests/074.phpt @@ -21,7 +21,7 @@ require_once('skipifconnectfailure.inc'); var_dump($result->fetch_row()); ?> ---EXPECTF-- +--EXPECT-- bool(true) array(1) { [0]=> diff --git a/ext/mysqli/tests/bug29311.phpt b/ext/mysqli/tests/bug29311.phpt index cd7b9ef009..cfd5235e2b 100644 --- a/ext/mysqli/tests/bug29311.phpt +++ b/ext/mysqli/tests/bug29311.phpt @@ -47,5 +47,5 @@ require_once('skipifconnectfailure.inc'); } print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/bug30967.phpt b/ext/mysqli/tests/bug30967.phpt index 48007cee6c..9af81ea12a 100644 --- a/ext/mysqli/tests/bug30967.phpt +++ b/ext/mysqli/tests/bug30967.phpt @@ -22,5 +22,5 @@ require_once('skipifconnectfailure.inc'); $mysql->close(); ?> ---EXPECTF-- +--EXPECT-- 1064 diff --git a/ext/mysqli/tests/bug33263.phpt b/ext/mysqli/tests/bug33263.phpt index ac2de197bb..33c5dbbc56 100644 --- a/ext/mysqli/tests/bug33263.phpt +++ b/ext/mysqli/tests/bug33263.phpt @@ -33,5 +33,5 @@ require_once('skipifconnectfailure.inc'); $mysql->close(); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/bug35517.phpt b/ext/mysqli/tests/bug35517.phpt index c40035d9c8..78b3206af4 100644 --- a/ext/mysqli/tests/bug35517.phpt +++ b/ext/mysqli/tests/bug35517.phpt @@ -45,7 +45,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS temp")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- 3000000897 3800001532 3900002281 diff --git a/ext/mysqli/tests/bug38710.phpt b/ext/mysqli/tests/bug38710.phpt index c3bb7285c8..b5baf19442 100644 --- a/ext/mysqli/tests/bug38710.phpt +++ b/ext/mysqli/tests/bug38710.phpt @@ -20,5 +20,5 @@ if ($text !== str_repeat('a', ($IS_MYSQLND || mysqli_get_server_version($db) > 5 } echo "Done"; ?> ---EXPECTF-- +--EXPECT-- Done
\ No newline at end of file diff --git a/ext/mysqli/tests/bug42378.phpt b/ext/mysqli/tests/bug42378.phpt index f3bbe346fa..1c75141306 100644 --- a/ext/mysqli/tests/bug42378.phpt +++ b/ext/mysqli/tests/bug42378.phpt @@ -184,7 +184,7 @@ memory_limit=83886080 <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- FLOAT FORMAT(col1, 0) FLOAT diff --git a/ext/mysqli/tests/bug44897.phpt b/ext/mysqli/tests/bug44897.phpt index 84c245d0fc..89853a3acf 100644 --- a/ext/mysqli/tests/bug44897.phpt +++ b/ext/mysqli/tests/bug44897.phpt @@ -85,5 +85,5 @@ mysqli_query($link, "DROP PROCEDURE IF EXISTS p"); mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/bug45019.phpt b/ext/mysqli/tests/bug45019.phpt index b4c115d4cc..f7ace737d8 100644 --- a/ext/mysqli/tests/bug45019.phpt +++ b/ext/mysqli/tests/bug45019.phpt @@ -51,7 +51,7 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- Using CAST('somestring' AS CHAR)... string(3) "one" string(5) "three" diff --git a/ext/mysqli/tests/bug46109.phpt b/ext/mysqli/tests/bug46109.phpt index c377171b7b..a1c77ac2d8 100644 --- a/ext/mysqli/tests/bug46109.phpt +++ b/ext/mysqli/tests/bug46109.phpt @@ -14,5 +14,5 @@ require_once('skipifconnectfailure.inc'); $mysqli->init(); echo "done"; ?> ---EXPECTF-- +--EXPECT-- done diff --git a/ext/mysqli/tests/bug48909.phpt b/ext/mysqli/tests/bug48909.phpt index 76901390cb..94bf4236dc 100644 --- a/ext/mysqli/tests/bug48909.phpt +++ b/ext/mysqli/tests/bug48909.phpt @@ -42,5 +42,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done
\ No newline at end of file diff --git a/ext/mysqli/tests/bug49027.phpt b/ext/mysqli/tests/bug49027.phpt index 55b74ce017..059d986584 100644 --- a/ext/mysqli/tests/bug49027.phpt +++ b/ext/mysqli/tests/bug49027.phpt @@ -50,7 +50,7 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> string(2) "42" diff --git a/ext/mysqli/tests/bug49442.phpt b/ext/mysqli/tests/bug49442.phpt index dce7b33cb7..f20cbb1b11 100644 --- a/ext/mysqli/tests/bug49442.phpt +++ b/ext/mysqli/tests/bug49442.phpt @@ -108,7 +108,7 @@ mysqli.max_persistent=1 <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- array(2) { ["id"]=> string(2) "97" diff --git a/ext/mysqli/tests/bug50772.phpt b/ext/mysqli/tests/bug50772.phpt index eecef84ad2..6d0ee6c24c 100644 --- a/ext/mysqli/tests/bug50772.phpt +++ b/ext/mysqli/tests/bug50772.phpt @@ -30,7 +30,7 @@ require_once('skipifconnectfailure.inc'); } echo "done\n"; ?> ---EXPECTF-- +--EXPECT-- ok 1 ok 2 done
\ No newline at end of file diff --git a/ext/mysqli/tests/bug51605.phpt b/ext/mysqli/tests/bug51605.phpt index 02328a5be8..c57a7b36d3 100644 --- a/ext/mysqli/tests/bug51605.phpt +++ b/ext/mysqli/tests/bug51605.phpt @@ -37,7 +37,7 @@ mysqli.reconnect = Off print "done!"; ?> ---EXPECTF-- +--EXPECT-- closed once closed twice closed for third time diff --git a/ext/mysqli/tests/bug52082.phpt b/ext/mysqli/tests/bug52082.phpt index 8e3bd59ba5..815f79013a 100644 --- a/ext/mysqli/tests/bug52082.phpt +++ b/ext/mysqli/tests/bug52082.phpt @@ -22,7 +22,7 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(20) "character_set_client" diff --git a/ext/mysqli/tests/bug52891.phpt b/ext/mysqli/tests/bug52891.phpt index 463efd6d4e..7e4758887f 100644 --- a/ext/mysqli/tests/bug52891.phpt +++ b/ext/mysqli/tests/bug52891.phpt @@ -114,7 +114,7 @@ if (!mysqli_query($link, 'DROP TABLE IF EXISTS tsint')) { mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- tsint: array(1) { ["a"]=> diff --git a/ext/mysqli/tests/bug54221.phpt b/ext/mysqli/tests/bug54221.phpt index 78c9a2c40e..b031909aa2 100644 --- a/ext/mysqli/tests/bug54221.phpt +++ b/ext/mysqli/tests/bug54221.phpt @@ -41,7 +41,7 @@ mysqli.reconnect = Off print "done!"; ?> ---EXPECTF-- +--EXPECT-- Warning: : Warning: 1050: Table 't54221' already exists done! diff --git a/ext/mysqli/tests/bug54674.phpt b/ext/mysqli/tests/bug54674.phpt index efc67308b6..e18eed7f99 100644 --- a/ext/mysqli/tests/bug54674.phpt +++ b/ext/mysqli/tests/bug54674.phpt @@ -26,6 +26,6 @@ mysqli.reconnect = Off print "done!"; ?> ---EXPECTF-- +--EXPECT-- bool(true) done! diff --git a/ext/mysqli/tests/bug55283.phpt b/ext/mysqli/tests/bug55283.phpt index a10c604fdd..6ea62065b9 100644 --- a/ext/mysqli/tests/bug55283.phpt +++ b/ext/mysqli/tests/bug55283.phpt @@ -59,7 +59,7 @@ $link->close(); echo "done\n"; ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(10) "Ssl_cipher" diff --git a/ext/mysqli/tests/bug66043.phpt b/ext/mysqli/tests/bug66043.phpt index 52e42b6177..54ddf6943c 100644 --- a/ext/mysqli/tests/bug66043.phpt +++ b/ext/mysqli/tests/bug66043.phpt @@ -22,5 +22,5 @@ $stmt->execute(); $stmt->bind_result($testArg); echo "Okey"; ?> ---EXPECTF-- +--EXPECT-- Okey diff --git a/ext/mysqli/tests/bug66124.phpt b/ext/mysqli/tests/bug66124.phpt index 8c0027f9e6..9cb5f45726 100644 --- a/ext/mysqli/tests/bug66124.phpt +++ b/ext/mysqli/tests/bug66124.phpt @@ -91,7 +91,7 @@ if ($result){ $link->close(); ?> done ---EXPECTF-- +--EXPECT-- Using 'i': insert id:1311200011005001566=>1311200011005001566 fetch id:1311200011005001566 diff --git a/ext/mysqli/tests/bug67839.phpt b/ext/mysqli/tests/bug67839.phpt index 58b2d2fa82..f36c2bf6e7 100644 --- a/ext/mysqli/tests/bug67839.phpt +++ b/ext/mysqli/tests/bug67839.phpt @@ -64,5 +64,5 @@ precision=5 <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- 1: 9.9999: 9.9999 diff --git a/ext/mysqli/tests/bug68077.phpt b/ext/mysqli/tests/bug68077.phpt index 0652e68c9b..f9fb962e77 100644 --- a/ext/mysqli/tests/bug68077.phpt +++ b/ext/mysqli/tests/bug68077.phpt @@ -74,7 +74,7 @@ $link->close(); unlink('bug53503.data'); ?> ---EXPECTF-- +--EXPECT-- done [006] [2000] open_basedir restriction in effect. Unable to open file done diff --git a/ext/mysqli/tests/bug70384.phpt b/ext/mysqli/tests/bug70384.phpt index aa8662badf..6987789d36 100644 --- a/ext/mysqli/tests/bug70384.phpt +++ b/ext/mysqli/tests/bug70384.phpt @@ -58,5 +58,5 @@ mysqli_float_handling - ensure 4 byte float is handled correctly <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- OK
\ No newline at end of file diff --git a/ext/mysqli/tests/bug72489.phpt b/ext/mysqli/tests/bug72489.phpt index 4e8fb3f4e5..744a504c8d 100644 --- a/ext/mysqli/tests/bug72489.phpt +++ b/ext/mysqli/tests/bug72489.phpt @@ -60,6 +60,6 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS bug72489")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- Finished 1 Finished 2 diff --git a/ext/mysqli/tests/bug73462.phpt b/ext/mysqli/tests/bug73462.phpt index 6de73761f4..5fb978feb1 100644 --- a/ext/mysqli/tests/bug73462.phpt +++ b/ext/mysqli/tests/bug73462.phpt @@ -37,5 +37,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/bug73949.phpt b/ext/mysqli/tests/bug73949.phpt index 7ce311eb77..9de75ecd2b 100644 --- a/ext/mysqli/tests/bug73949.phpt +++ b/ext/mysqli/tests/bug73949.phpt @@ -20,5 +20,5 @@ $t=array(new stdClass); while($db= mysqli_fetch_object($res,'cc',$t)){} print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/bug74547.phpt b/ext/mysqli/tests/bug74547.phpt index a771c9a852..940357ad04 100644 --- a/ext/mysqli/tests/bug74547.phpt +++ b/ext/mysqli/tests/bug74547.phpt @@ -20,6 +20,6 @@ Bug #74547 mysqli::change_user() doesn't accept null as $database argument w/str mysqli_close($link); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(true) ===DONE=== diff --git a/ext/mysqli/tests/mysqli_affected_rows.phpt b/ext/mysqli/tests/mysqli_affected_rows.phpt index a08f897ef9..95c3bb3426 100644 --- a/ext/mysqli/tests/mysqli_affected_rows.phpt +++ b/ext/mysqli/tests/mysqli_affected_rows.phpt @@ -131,5 +131,5 @@ mysqli_affected_rows() <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt index 2b9b549cb4..7a6a5be996 100644 --- a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt +++ b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt @@ -110,5 +110,5 @@ mysqli->affected_rows <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_autocommit.phpt b/ext/mysqli/tests/mysqli_autocommit.phpt index fdbedc5fb6..cc41786bdb 100644 --- a/ext/mysqli/tests/mysqli_autocommit.phpt +++ b/ext/mysqli/tests/mysqli_autocommit.phpt @@ -143,5 +143,5 @@ mysqli_autocommit() <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_autocommit_oo.phpt b/ext/mysqli/tests/mysqli_autocommit_oo.phpt index 5f61915e20..7c616aab50 100644 --- a/ext/mysqli/tests/mysqli_autocommit_oo.phpt +++ b/ext/mysqli/tests/mysqli_autocommit_oo.phpt @@ -133,5 +133,5 @@ mysqli->autocommit() <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_change_user.phpt b/ext/mysqli/tests/mysqli_change_user.phpt index a7ae1d6690..7b9f23cf9e 100644 --- a/ext/mysqli/tests/mysqli_change_user.phpt +++ b/ext/mysqli/tests/mysqli_change_user.phpt @@ -144,5 +144,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_change_user_insert_id.phpt b/ext/mysqli/tests/mysqli_change_user_insert_id.phpt index 7d1c398142..00fa9f0af6 100644 --- a/ext/mysqli/tests/mysqli_change_user_insert_id.phpt +++ b/ext/mysqli/tests/mysqli_change_user_insert_id.phpt @@ -61,5 +61,5 @@ if (!$IS_MYSQLND) { <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt b/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt index e40154ce10..fa8c66f56b 100644 --- a/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt +++ b/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt @@ -103,5 +103,5 @@ die("skip - is the server still buggy?"); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_change_user_old.phpt b/ext/mysqli/tests/mysqli_change_user_old.phpt index 96357ebf51..cf53016f59 100644 --- a/ext/mysqli/tests/mysqli_change_user_old.phpt +++ b/ext/mysqli/tests/mysqli_change_user_old.phpt @@ -123,5 +123,5 @@ if (mysqli_get_server_version($link) >= 50600) print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_change_user_oo.phpt b/ext/mysqli/tests/mysqli_change_user_oo.phpt index 34a3e51bb1..5203381088 100644 --- a/ext/mysqli/tests/mysqli_change_user_oo.phpt +++ b/ext/mysqli/tests/mysqli_change_user_oo.phpt @@ -88,5 +88,5 @@ if (mysqli_get_server_version($link) >= 50600) print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt b/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt index 6a37b6b44a..577673f0b5 100644 --- a/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt +++ b/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt @@ -29,5 +29,5 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_change_user_rollback.phpt b/ext/mysqli/tests/mysqli_change_user_rollback.phpt index ed3330e064..12370b18cc 100644 --- a/ext/mysqli/tests/mysqli_change_user_rollback.phpt +++ b/ext/mysqli/tests/mysqli_change_user_rollback.phpt @@ -66,5 +66,5 @@ if (!have_innodb($link)) <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_change_user_set_names.phpt b/ext/mysqli/tests/mysqli_change_user_set_names.phpt index 0adaf52b85..614aa7a023 100644 --- a/ext/mysqli/tests/mysqli_change_user_set_names.phpt +++ b/ext/mysqli/tests/mysqli_change_user_set_names.phpt @@ -153,5 +153,5 @@ if ($version[0] <= 4 && $version[1] < 1) mysqli_close($link); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_character_set.phpt b/ext/mysqli/tests/mysqli_character_set.phpt index 82be2c4683..855141e40d 100644 --- a/ext/mysqli/tests/mysqli_character_set.phpt +++ b/ext/mysqli/tests/mysqli_character_set.phpt @@ -103,5 +103,5 @@ if (!function_exists('mysqli_set_charset')) { <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_character_set_name.phpt b/ext/mysqli/tests/mysqli_character_set_name.phpt index 8d21b561e0..90dd46fa73 100644 --- a/ext/mysqli/tests/mysqli_character_set_name.phpt +++ b/ext/mysqli/tests/mysqli_character_set_name.phpt @@ -71,5 +71,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_character_set_name_oo.phpt b/ext/mysqli/tests/mysqli_character_set_name_oo.phpt index 1a81bdcb39..5d303fd503 100644 --- a/ext/mysqli/tests/mysqli_character_set_name_oo.phpt +++ b/ext/mysqli/tests/mysqli_character_set_name_oo.phpt @@ -66,5 +66,5 @@ mysqli_chararcter_set_name(), mysql_client_encoding() [alias] print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt b/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt index db1d3444c7..9247721e43 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt @@ -24,7 +24,7 @@ if ($MYSQLND_VERSION < 50004) inspectClass($class); print "done!\n"; ?> ---EXPECTF-- +--EXPECT-- Inspecting class 'mysqli' isInternal: yes isUserDefined: no diff --git a/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt b/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt index 75a8e8cfcb..ee2765c4dc 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt @@ -24,7 +24,7 @@ if ($MYSQLND_VERSION < 50004) inspectClass($class); print "done!"; ?> ---EXPECTF-- +--EXPECT-- Inspecting class 'mysqli_result' isInternal: yes isUserDefined: no diff --git a/ext/mysqli/tests/mysqli_close.phpt b/ext/mysqli/tests/mysqli_close.phpt index 937137564e..a300fb8314 100644 --- a/ext/mysqli/tests/mysqli_close.phpt +++ b/ext/mysqli/tests/mysqli_close.phpt @@ -36,5 +36,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_close_oo.phpt b/ext/mysqli/tests/mysqli_close_oo.phpt index 49189bbab1..305d5edf88 100644 --- a/ext/mysqli/tests/mysqli_close_oo.phpt +++ b/ext/mysqli/tests/mysqli_close_oo.phpt @@ -32,5 +32,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_commit.phpt b/ext/mysqli/tests/mysqli_commit.phpt index ea64ae8065..27ae3a928a 100644 --- a/ext/mysqli/tests/mysqli_commit.phpt +++ b/ext/mysqli/tests/mysqli_commit.phpt @@ -73,5 +73,5 @@ if (!have_innodb($link)) <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_connect_errno.phpt b/ext/mysqli/tests/mysqli_connect_errno.phpt index a7f90f1527..c2d22ee8ea 100644 --- a/ext/mysqli/tests/mysqli_connect_errno.phpt +++ b/ext/mysqli/tests/mysqli_connect_errno.phpt @@ -36,5 +36,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_connect_error.phpt b/ext/mysqli/tests/mysqli_connect_error.phpt index 79ac3f1f79..dca311ea93 100644 --- a/ext/mysqli/tests/mysqli_connect_error.phpt +++ b/ext/mysqli/tests/mysqli_connect_error.phpt @@ -35,5 +35,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt index 7f049b052f..d60ff3876a 100644 --- a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt +++ b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt @@ -156,7 +156,7 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(1) { ["testing"]=> string(19) "mysqli.default_port" diff --git a/ext/mysqli/tests/mysqli_connect_twice.phpt b/ext/mysqli/tests/mysqli_connect_twice.phpt index 2809a3feda..97ca40c61c 100644 --- a/ext/mysqli/tests/mysqli_connect_twice.phpt +++ b/ext/mysqli/tests/mysqli_connect_twice.phpt @@ -72,7 +72,7 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(1) { ["it_works"]=> string(2) "ok" diff --git a/ext/mysqli/tests/mysqli_constants.phpt b/ext/mysqli/tests/mysqli_constants.phpt index 42113aef2b..6f1cd5faa7 100644 --- a/ext/mysqli/tests/mysqli_constants.phpt +++ b/ext/mysqli/tests/mysqli_constants.phpt @@ -237,5 +237,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_constants_categories.phpt b/ext/mysqli/tests/mysqli_constants_categories.phpt index e51325a213..28aaa582ad 100644 --- a/ext/mysqli/tests/mysqli_constants_categories.phpt +++ b/ext/mysqli/tests/mysqli_constants_categories.phpt @@ -20,5 +20,5 @@ require_once('skipifemb.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_debug_ini.phpt b/ext/mysqli/tests/mysqli_debug_ini.phpt index bcf00672d6..d644bf9204 100644 --- a/ext/mysqli/tests/mysqli_debug_ini.phpt +++ b/ext/mysqli/tests/mysqli_debug_ini.phpt @@ -48,6 +48,6 @@ mysqlnd.debug="t:O,/tmp/mysqli_debug_phpt.trace" print "done!"; ?> ---EXPECTF-- +--EXPECT-- string(32) "t:O,/tmp/mysqli_debug_phpt.trace" done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt b/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt index f46aec9359..333aaa10c0 100644 --- a/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt +++ b/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt @@ -128,5 +128,5 @@ if (!$IS_MYSQLND) <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_explain_metadata.phpt b/ext/mysqli/tests/mysqli_explain_metadata.phpt index 8f4a7cc8c5..157559b340 100644 --- a/ext/mysqli/tests/mysqli_explain_metadata.phpt +++ b/ext/mysqli/tests/mysqli_explain_metadata.phpt @@ -159,5 +159,5 @@ if (!$IS_MYSQLND) <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt index 2fb8281939..171a1a4010 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt @@ -31,7 +31,7 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- [002] array(2) { ["id"]=> diff --git a/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt index 82e4d7b666..ccd94043a1 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt @@ -111,5 +111,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt index d9bdcfad37..586bfb03b3 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt @@ -113,5 +113,5 @@ mysqli_fetch_assoc() - BIT <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt index ce7e82dc08..09ff9d193d 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt @@ -74,5 +74,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt index e234a28fe5..f55a32b951 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt @@ -240,5 +240,5 @@ mysqli_close($link); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_field_types.phpt b/ext/mysqli/tests/mysqli_fetch_field_types.phpt index d02c02c765..70464ffb51 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_types.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_types.phpt @@ -122,5 +122,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fork.phpt b/ext/mysqli/tests/mysqli_fork.phpt index f5a0b7bc95..4862b7a220 100644 --- a/ext/mysqli/tests/mysqli_fork.phpt +++ b/ext/mysqli/tests/mysqli_fork.phpt @@ -236,7 +236,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS messages")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(1) { ["message"]=> string(20) "dumped by the parent" diff --git a/ext/mysqli/tests/mysqli_get_client_info.phpt b/ext/mysqli/tests/mysqli_get_client_info.phpt index bb3f5cc1f1..ffb9e954cc 100644 --- a/ext/mysqli/tests/mysqli_get_client_info.phpt +++ b/ext/mysqli/tests/mysqli_get_client_info.phpt @@ -14,5 +14,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt index e2dff9befb..0b3d772d5c 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt @@ -44,5 +44,5 @@ mysqlnd.collect_memory_statistics=0 <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_client_version.phpt b/ext/mysqli/tests/mysqli_get_client_version.phpt index 5862c0aaa1..9fb1040580 100644 --- a/ext/mysqli/tests/mysqli_get_client_version.phpt +++ b/ext/mysqli/tests/mysqli_get_client_version.phpt @@ -10,5 +10,5 @@ mysqli_get_client_version() print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_connection_stats.phpt b/ext/mysqli/tests/mysqli_get_connection_stats.phpt index 64eba16679..80875a44e6 100644 --- a/ext/mysqli/tests/mysqli_get_connection_stats.phpt +++ b/ext/mysqli/tests/mysqli_get_connection_stats.phpt @@ -83,5 +83,5 @@ if (!function_exists('mysqli_get_connection_stats')) { <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt b/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt index 4897063c12..549d9c8a72 100644 --- a/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt +++ b/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt @@ -49,5 +49,5 @@ if (!function_exists('mysqli_get_connection_stats')) { mysqli_close($link); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_host_info.phpt b/ext/mysqli/tests/mysqli_get_host_info.phpt index 2c3c0f806d..0dd7291342 100644 --- a/ext/mysqli/tests/mysqli_get_host_info.phpt +++ b/ext/mysqli/tests/mysqli_get_host_info.phpt @@ -31,5 +31,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_proto_info.phpt b/ext/mysqli/tests/mysqli_get_proto_info.phpt index 7fbefeb853..28313670ad 100644 --- a/ext/mysqli/tests/mysqli_get_proto_info.phpt +++ b/ext/mysqli/tests/mysqli_get_proto_info.phpt @@ -25,5 +25,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_server_info.phpt b/ext/mysqli/tests/mysqli_get_server_info.phpt index a7f785302b..d1eb116cb0 100644 --- a/ext/mysqli/tests/mysqli_get_server_info.phpt +++ b/ext/mysqli/tests/mysqli_get_server_info.phpt @@ -29,5 +29,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_server_version.phpt b/ext/mysqli/tests/mysqli_get_server_version.phpt index b30c4a3801..30b95748b3 100644 --- a/ext/mysqli/tests/mysqli_get_server_version.phpt +++ b/ext/mysqli/tests/mysqli_get_server_version.phpt @@ -24,5 +24,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_warnings.phpt b/ext/mysqli/tests/mysqli_get_warnings.phpt index 2b70fda3ed..b0076c1859 100644 --- a/ext/mysqli/tests/mysqli_get_warnings.phpt +++ b/ext/mysqli/tests/mysqli_get_warnings.phpt @@ -154,5 +154,5 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS t1")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_info.phpt b/ext/mysqli/tests/mysqli_info.phpt index d60ffd9fbe..21851d6b30 100644 --- a/ext/mysqli/tests/mysqli_info.phpt +++ b/ext/mysqli/tests/mysqli_info.phpt @@ -94,5 +94,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_init.phpt b/ext/mysqli/tests/mysqli_init.phpt index 1abb7ca37e..c6774c311f 100644 --- a/ext/mysqli/tests/mysqli_init.phpt +++ b/ext/mysqli/tests/mysqli_init.phpt @@ -21,5 +21,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_insert_id_variation.phpt b/ext/mysqli/tests/mysqli_insert_id_variation.phpt index e858ca0689..12c858fbe4 100644 --- a/ext/mysqli/tests/mysqli_insert_id_variation.phpt +++ b/ext/mysqli/tests/mysqli_insert_id_variation.phpt @@ -99,5 +99,5 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_insert_id_var")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- DONE
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt b/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt index c7f38fa0fc..2833f3fb18 100644 --- a/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt +++ b/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt @@ -112,5 +112,5 @@ memory_limit=256M <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt index e42d3b31f3..85a36981b5 100644 --- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt +++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt @@ -40,7 +40,7 @@ max_execution_time=12 print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(1) { ["SLEEP(6)"]=> string(1) "0" diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt index 1d1b3c917f..a00ab15948 100644 --- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt +++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt @@ -39,7 +39,7 @@ mysqlnd.net_read_timeout=0 print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(1) { ["SLEEP(2)"]=> string(1) "0" diff --git a/ext/mysqli/tests/mysqli_no_reconnect.phpt b/ext/mysqli/tests/mysqli_no_reconnect.phpt index 653c672077..465f9fee97 100644 --- a/ext/mysqli/tests/mysqli_no_reconnect.phpt +++ b/ext/mysqli/tests/mysqli_no_reconnect.phpt @@ -123,5 +123,5 @@ mysqli.reconnect=0 mysqli_close($link2); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt b/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt index 4b0c947191..7b98713046 100644 --- a/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt +++ b/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt @@ -105,5 +105,5 @@ if (!$IS_MYSQLND) <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_options_openbasedir.phpt b/ext/mysqli/tests/mysqli_options_openbasedir.phpt index 9457adfb5d..d7b4b6b13e 100644 --- a/ext/mysqli/tests/mysqli_options_openbasedir.phpt +++ b/ext/mysqli/tests/mysqli_options_openbasedir.phpt @@ -25,5 +25,5 @@ if ($IS_MYSQLND) { mysqli_close($link); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_pam_sha256.phpt b/ext/mysqli/tests/mysqli_pam_sha256.phpt index 3016e200d7..760da471dd 100644 --- a/ext/mysqli/tests/mysqli_pam_sha256.phpt +++ b/ext/mysqli/tests/mysqli_pam_sha256.phpt @@ -109,5 +109,5 @@ $link->close(); $link->query('DROP USER shatest'); $link->query('DROP USER shatest@localhost'); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt index afed773b01..1461933015 100644 --- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt +++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt @@ -128,5 +128,5 @@ $link->close(); $file = sprintf("%s%s%s_%s", sys_get_temp_dir(), DIRECTORY_SEPARATOR, "test_sha256_" , @date("Ymd")); @unlink($file); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt b/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt index 1453d663ba..9af480e003 100644 --- a/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt +++ b/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt @@ -140,7 +140,7 @@ mysqli.max_links=-1 print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(1) { ["it_works"]=> string(2) "ok" diff --git a/ext/mysqli/tests/mysqli_pconn_kill.phpt b/ext/mysqli/tests/mysqli_pconn_kill.phpt index f8d8d7e8bd..b60bb3662b 100644 --- a/ext/mysqli/tests/mysqli_pconn_kill.phpt +++ b/ext/mysqli/tests/mysqli_pconn_kill.phpt @@ -91,5 +91,5 @@ mysqli.max_persistent=2 <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_pconn_limits.phpt b/ext/mysqli/tests/mysqli_pconn_limits.phpt index ee9e1f9cc6..960c4a2635 100644 --- a/ext/mysqli/tests/mysqli_pconn_limits.phpt +++ b/ext/mysqli/tests/mysqli_pconn_limits.phpt @@ -89,7 +89,7 @@ mysqli.max_links=-1 <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- Regular connection 1 - 'works..' Regular connection 2 - 'works...' Persistent connection 1 - 'works...' diff --git a/ext/mysqli/tests/mysqli_pconn_twice.phpt b/ext/mysqli/tests/mysqli_pconn_twice.phpt index c550f0f495..c821177eeb 100644 --- a/ext/mysqli/tests/mysqli_pconn_twice.phpt +++ b/ext/mysqli/tests/mysqli_pconn_twice.phpt @@ -65,7 +65,7 @@ mysqli.max_links=-1 print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(1) { ["it_works"]=> string(2) "ok" diff --git a/ext/mysqli/tests/mysqli_pconnect.phpt b/ext/mysqli/tests/mysqli_pconnect.phpt index 734029acb1..ac17c22b84 100644 --- a/ext/mysqli/tests/mysqli_pconnect.phpt +++ b/ext/mysqli/tests/mysqli_pconnect.phpt @@ -68,5 +68,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_phpinfo.phpt b/ext/mysqli/tests/mysqli_phpinfo.phpt index e23a5f696f..2ecd838592 100644 --- a/ext/mysqli/tests/mysqli_phpinfo.phpt +++ b/ext/mysqli/tests/mysqli_phpinfo.phpt @@ -68,5 +68,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_prepare.phpt b/ext/mysqli/tests/mysqli_prepare.phpt index d6d6c092b9..0c3bedf5b5 100644 --- a/ext/mysqli/tests/mysqli_prepare.phpt +++ b/ext/mysqli/tests/mysqli_prepare.phpt @@ -130,6 +130,6 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test2")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- bool(false) done! diff --git a/ext/mysqli/tests/mysqli_prepare_no_object.phpt b/ext/mysqli/tests/mysqli_prepare_no_object.phpt index e45de69eda..b10706aa04 100644 --- a/ext/mysqli/tests/mysqli_prepare_no_object.phpt +++ b/ext/mysqli/tests/mysqli_prepare_no_object.phpt @@ -38,7 +38,7 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- a) [1065] Query was empty b) [1065] Query was empty c) [1065] Query was empty diff --git a/ext/mysqli/tests/mysqli_ps_select_union.phpt b/ext/mysqli/tests/mysqli_ps_select_union.phpt index 730dc8403b..cb5699fc1e 100644 --- a/ext/mysqli/tests/mysqli_ps_select_union.phpt +++ b/ext/mysqli/tests/mysqli_ps_select_union.phpt @@ -251,7 +251,7 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- Using CAST('somestring' AS CHAR)... string(3) "one" string(5) "three" diff --git a/ext/mysqli/tests/mysqli_query_stored_proc.phpt b/ext/mysqli/tests/mysqli_query_stored_proc.phpt index 4f4e671f3b..1df5cc8760 100644 --- a/ext/mysqli/tests/mysqli_query_stored_proc.phpt +++ b/ext/mysqli/tests/mysqli_query_stored_proc.phpt @@ -163,7 +163,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(2) { ["id"]=> string(1) "1" diff --git a/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt b/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt index 67c4442d28..20384d9a0f 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt @@ -74,7 +74,7 @@ mysqli_error($link)); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) done! diff --git a/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt b/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt index 208056fc47..14bf97c635 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt @@ -67,7 +67,7 @@ mysqli_error($link)); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) done! diff --git a/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt b/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt index 7fa5523661..cff45e06d4 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt @@ -66,7 +66,7 @@ mysqli_error($link)); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) done! diff --git a/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt b/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt index 0f7a5083b8..537ac7292f 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt @@ -67,7 +67,7 @@ mysqli_error($link)); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) done! diff --git a/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt index 945e1eaed7..85ac847666 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt @@ -67,7 +67,7 @@ mysqli_error($link)); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) done! diff --git a/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt b/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt index a121d5fb8f..47535f937e 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt @@ -57,7 +57,7 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(1) { ["label"]=> string(1) "\" diff --git a/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt b/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt index ae4986e0b1..9e1562dba0 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt @@ -46,7 +46,7 @@ mysqli_close($link); mysqli_close($link); print "done!"; ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) done! diff --git a/ext/mysqli/tests/mysqli_reap_async_query.phpt b/ext/mysqli/tests/mysqli_reap_async_query.phpt index 3f3bce3292..b43b6b2478 100644 --- a/ext/mysqli/tests/mysqli_reap_async_query.phpt +++ b/ext/mysqli/tests/mysqli_reap_async_query.phpt @@ -87,7 +87,7 @@ if (!$IS_MYSQLND) print "done!"; ?> ---EXPECTF-- +--EXPECT-- [012 + 2] array ( '_one' => '1', ) diff --git a/ext/mysqli/tests/mysqli_reconnect.phpt b/ext/mysqli/tests/mysqli_reconnect.phpt index 7f05a20d2f..606d380285 100644 --- a/ext/mysqli/tests/mysqli_reconnect.phpt +++ b/ext/mysqli/tests/mysqli_reconnect.phpt @@ -126,5 +126,5 @@ mysqli.reconnect=1 mysqli_close($link2); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_ssl_set.phpt b/ext/mysqli/tests/mysqli_ssl_set.phpt index 2abae55c1e..8463cc58b8 100644 --- a/ext/mysqli/tests/mysqli_ssl_set.phpt +++ b/ext/mysqli/tests/mysqli_ssl_set.phpt @@ -57,5 +57,5 @@ if (!function_exists('mysqli_ssl_set')) */ print "done!\n"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_attr_get.phpt b/ext/mysqli/tests/mysqli_stmt_attr_get.phpt index d58885e986..92937a15ce 100644 --- a/ext/mysqli/tests/mysqli_stmt_attr_get.phpt +++ b/ext/mysqli/tests/mysqli_stmt_attr_get.phpt @@ -66,5 +66,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt index 0d5e8f9bec..e05843e5b7 100644 --- a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt +++ b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt @@ -25,5 +25,5 @@ die("SKIP: prefetch isn't supported at the moment"); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_attr_set.phpt b/ext/mysqli/tests/mysqli_stmt_attr_set.phpt index 5b53a06222..b3d60380cb 100644 --- a/ext/mysqli/tests/mysqli_stmt_attr_set.phpt +++ b/ext/mysqli/tests/mysqli_stmt_attr_set.phpt @@ -273,5 +273,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt b/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt index d7a78f1cf0..5ad6f583e7 100644 --- a/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt +++ b/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt @@ -46,5 +46,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt b/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt index 39c602034d..0daab8b11a 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt @@ -115,7 +115,7 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- Testing 273 columns with 240 rows... ... table created ... statement with 65520 parameters prepared diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt index 97b15242dc..a8a18ace85 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt @@ -328,7 +328,7 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- Regular, procedural, using variables int(1) string(1) "a" diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt index 29a5ee3fbd..5800a9bcc0 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt @@ -96,7 +96,7 @@ memory_limit=256M <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- int(1) executing bool(true) diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt index 58626be672..e7b581f815 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt @@ -203,5 +203,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt index daab40c506..2e3df083b7 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt @@ -123,5 +123,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt index acf0d0be2d..3818b6ccfd 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt @@ -155,5 +155,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt index 68ec601e10..64b0b192ff 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt @@ -337,5 +337,5 @@ memory_limit=83886080 <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt index 56508533ba..6d096531e8 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt @@ -93,5 +93,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt index 3380f0edbb..957044cd67 100644 --- a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt +++ b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt @@ -66,7 +66,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS type_change")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) ---- Row 1 diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt index 29e3947a78..f9ab267502 100644 --- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt +++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt @@ -194,5 +194,5 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt index 35433b136a..293761bb84 100644 --- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt @@ -125,7 +125,7 @@ mysqli_close($link); ?> --XFAIL-- Unsupported and undefined, under development ---EXPECTF-- +--EXPECT-- [010] More results: yes [011] Next result: yes done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt index 2a2914ad88..49ca6f6bff 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt @@ -72,5 +72,5 @@ Fetching BIT column values using the PS API <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt index 0cbc05f6c7..14333e7665 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt @@ -50,7 +50,7 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- OK: 1 OK: 2 done! diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt index 84998b9423..00bde68284 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt @@ -137,5 +137,5 @@ mysqli_stmt_fetch - geometry / spatial types <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt index 6c476f7e9d..87dd01223f 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt @@ -129,5 +129,5 @@ Fetching BIT column values using the PS API <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt index 046f90438e..a717bee50d 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt @@ -45,6 +45,6 @@ mysqli_stmt_get_result() - meta data, field_count() <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- 2 2 done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt index c86a385bee..9bfd7d6958 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt @@ -139,5 +139,5 @@ mysqli_stmt_get_result - geometry / spatial types <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt index c057f7d9fb..658f7da77f 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt @@ -91,5 +91,5 @@ if (!function_exists('mysqli_stmt_get_result')) <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt index 7b6d3c26a0..7d21558593 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt @@ -253,5 +253,5 @@ mysqli_stmt_get_result - data types <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_multires.phpt b/ext/mysqli/tests/mysqli_stmt_multires.phpt index 28cf5e38f4..b95bfd7f91 100644 --- a/ext/mysqli/tests/mysqli_stmt_multires.phpt +++ b/ext/mysqli/tests/mysqli_stmt_multires.phpt @@ -99,7 +99,7 @@ require_once('skipifconnectfailure.inc'); printf("[001] [%d] %s\n", $link->error, $link->errno); } ?> ---EXPECTF-- +--EXPECT-- string(4) "pre:" NULL NULL diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt index a7dad1b47c..44c1f1bdcc 100644 --- a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt +++ b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt @@ -228,5 +228,5 @@ die("skip Check again when the Klingons visit earth - http://bugs.mysql.com/bug. <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt index a1fc2007fe..eeb74d9093 100644 --- a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt +++ b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt @@ -94,5 +94,5 @@ if (stristr(mysqli_get_client_info(), 'mysqlnd')) <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt index 95d2302f4c..07acb041b5 100644 --- a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt +++ b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt @@ -99,5 +99,5 @@ Warning: mysqli_stmt_send_long_data(): There was an error while sending long dat <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_store_result.phpt b/ext/mysqli/tests/mysqli_stmt_store_result.phpt index aa292a9198..89b8ed3bf8 100644 --- a/ext/mysqli/tests/mysqli_stmt_store_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_store_result.phpt @@ -86,5 +86,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt b/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt index 2dec703b99..58d588ac49 100644 --- a/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt +++ b/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt @@ -37,5 +37,5 @@ mysqlnd.debug=d:t:O,/tmp/mysqlnd.trace <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_thread_safe.phpt b/ext/mysqli/tests/mysqli_thread_safe.phpt index 0777c2abd7..2f6a87ba42 100644 --- a/ext/mysqli/tests/mysqli_thread_safe.phpt +++ b/ext/mysqli/tests/mysqli_thread_safe.phpt @@ -12,5 +12,5 @@ require_once('skipifemb.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/oci8/tests/array_bind_005.phpt b/ext/oci8/tests/array_bind_005.phpt index 4a73e0ffc8..c1d7c21b19 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 8d9a21b697..fe73d0e797 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 2911229175..cd1677e8c0 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 ae96953d7b..6552c5b11c 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 cc57c20d63..9f2570bd1b 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 49ac03c882..ad22fe055c 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 af0ad4e682..e967767d6e 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 b8f2284830..161f87440e 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 646b3317a1..e3ea6c20c9 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 9e55b3b1ff..9a80a4cc82 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 47d08d2bc3..f65099f752 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 a1eeafc761..aba25579cc 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 d9b54e295f..f83aff17bc 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 d430474fab..a741e24ad1 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 71854f3d46..3386fb4177 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 604b57f262..462b8df861 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 0990a95f3b..3fc1702da5 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 223faa5cad..361781516b 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 17a143a932..40c8c12b45 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/commit_001.phpt b/ext/oci8/tests/commit_001.phpt index ef4018118e..dad1376e2d 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 70a6d2b096..4d85fe5e69 100644 --- a/ext/oci8/tests/conn_attr_5.phpt +++ b/ext/oci8/tests/conn_attr_5.phpt @@ -52,7 +52,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 d265d1da9f..ae0f8f4519 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 7d05c11411..e9d205e0c5 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 f645cf80ff..5860bbd5d7 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 05c2269ae0..74028f794e 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 eaace0fa08..b69b6a03fd 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/drcp_connection_class.phpt b/ext/oci8/tests/drcp_connection_class.phpt index c01c144d23..1db9ef10a6 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/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_all.phpt b/ext/oci8/tests/fetch_all.phpt index b8155b170b..00e747cc35 100644 --- a/ext/oci8/tests/fetch_all.phpt +++ b/ext/oci8/tests/fetch_all.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_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 4c0be1cc07..de35c017c9 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 860a5fbb34..16dff5fc66 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 0fc4815893..9f1cb07829 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 05ae5e6857..c1babc9455 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 663d630dfb..578dc7f49f 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 cac0a5d1c0..6533ba0a04 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 8c9808d96c..188201f425 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 54b8295cf9..1e82745967 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 665f773b57..ab82423e47 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 b20b8dd397..0eafa00aa5 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 15b2efaef0..393ff2fb0f 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 3cfa0967a2..faaed0b18e 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 d2dcbea6c7..92965130bc 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 7dbcecbfe9..5f668f6f01 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 4793a6c882..bdd352154b 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 ccdb6f5490..ce44b00a33 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 cbc2389e46..b89d399ab4 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 dbd8f3ef3a..82548d42d4 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 981f4945e2..e925f8ca99 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 d9c0705b55..107a2c4adc 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 247803581d..7e4aaadd92 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 5acdd518e5..4a1b1e0a45 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 2fba79813e..f11e782195 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 352cd50337..797fe8ef68 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 85b230e900..a99dd79833 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 d7fd21b961..ec7ff75066 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 39d27fd4a3..276a31b86e 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 4cd159510b..7f0d233e07 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 28599cc33b..6adbb6fa64 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 be3e53453d..abb2815975 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 diff --git a/ext/oci8/tests/lob_temp.phpt b/ext/oci8/tests/lob_temp.phpt index 9a07fb5ac0..d43a8c9f43 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 e27ea6d47d..4d119bcb1d 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 d774b4d724..a66cd72357 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/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 diff --git a/ext/odbc/tests/odbc_exec_002.phpt b/ext/odbc/tests/odbc_exec_002.phpt index 8f9672df50..309497e6c6 100644 --- a/ext/odbc/tests/odbc_exec_002.phpt +++ b/ext/odbc/tests/odbc_exec_002.phpt @@ -27,7 +27,7 @@ odbc_exec($conn, 'DROP TABLE FOO'); odbc_exec($conn, 'DROP DATABASE odbcTEST'); ?> ---EXPECTF-- +--EXPECT-- bool(true) string(1) "1" array(1) { diff --git a/ext/opcache/tests/log_verbosity_bug.phpt b/ext/opcache/tests/log_verbosity_bug.phpt index 2e5d7a9add..c965e5c4b7 100644 --- a/ext/opcache/tests/log_verbosity_bug.phpt +++ b/ext/opcache/tests/log_verbosity_bug.phpt @@ -16,5 +16,5 @@ opcache.log_verbosity_level=-1 <?php var_dump("Script should fail"); ?> ---EXPECTF-- +--EXPECT-- diff --git a/ext/opcache/tests/opt/sccp_023.phpt b/ext/opcache/tests/opt/sccp_023.phpt index 0a25424eda..d327d6279e 100644 --- a/ext/opcache/tests/opt/sccp_023.phpt +++ b/ext/opcache/tests/opt/sccp_023.phpt @@ -21,7 +21,7 @@ function a ($field_type, $allowed_values) { var_dump(a("list_string", ["xxx"])); ?> ---EXPECTF-- +--EXPECT-- array(1) { ["allowed_values"]=> array(1) { diff --git a/ext/opcache/tests/opt/sccp_025.phpt b/ext/opcache/tests/opt/sccp_025.phpt index 020973368e..8f46dab830 100644 --- a/ext/opcache/tests/opt/sccp_025.phpt +++ b/ext/opcache/tests/opt/sccp_025.phpt @@ -39,7 +39,7 @@ function test($phpEx) } var_dump(test("xxx")); ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> array(1) { diff --git a/ext/opcache/tests/wrong_inlining_004.phpt b/ext/opcache/tests/wrong_inlining_004.phpt index d4b2d391a0..8ecb87cd4f 100644 --- a/ext/opcache/tests/wrong_inlining_004.phpt +++ b/ext/opcache/tests/wrong_inlining_004.phpt @@ -19,5 +19,5 @@ function test() { test(); ?> ---EXPECTF-- +--EXPECT-- int(42) diff --git a/ext/openssl/tests/bug36732.phpt b/ext/openssl/tests/bug36732.phpt index 87fad9843e..83aa302100 100644 --- a/ext/openssl/tests/bug36732.phpt +++ b/ext/openssl/tests/bug36732.phpt @@ -36,6 +36,6 @@ if (strpos($str, 'X509v3 extensions:')) { echo "Ok\n"; } ?> ---EXPECTF-- +--EXPECT-- Ok Ok diff --git a/ext/openssl/tests/bug37820.phpt b/ext/openssl/tests/bug37820.phpt index 2eef8c5bdc..b7df0dcd8f 100644 --- a/ext/openssl/tests/bug37820.phpt +++ b/ext/openssl/tests/bug37820.phpt @@ -32,5 +32,5 @@ if ($ok == 1) { ?> ---EXPECTF-- +--EXPECT-- Ok diff --git a/ext/openssl/tests/bug39217.phpt b/ext/openssl/tests/bug39217.phpt index 7895e2f3de..8bafedbab4 100644 --- a/ext/openssl/tests/bug39217.phpt +++ b/ext/openssl/tests/bug39217.phpt @@ -14,6 +14,6 @@ foreach($certs as $cert) { echo "\n"; } ?> ---EXPECTF-- +--EXPECT-- 163040343498260435477161879008842183802 15 diff --git a/ext/openssl/tests/bug41353.phpt b/ext/openssl/tests/bug41353.phpt index 47fda89f7b..2f5ca2007e 100644 --- a/ext/openssl/tests/bug41353.phpt +++ b/ext/openssl/tests/bug41353.phpt @@ -12,5 +12,5 @@ openssl_pkcs12_read(1, $a, 1); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/ext/openssl/tests/bug48182.phpt b/ext/openssl/tests/bug48182.phpt index 5211c23d20..e528b43cad 100644 --- a/ext/openssl/tests/bug48182.phpt +++ b/ext/openssl/tests/bug48182.phpt @@ -44,7 +44,7 @@ echo "Running bug48182\n"; include 'ServerClientTestCase.inc'; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ---EXPECTF-- +--EXPECT-- Running bug48182 Sending bug48182 Sending data over to SSL server in async mode with contents like Hello World diff --git a/ext/openssl/tests/bug64802.phpt b/ext/openssl/tests/bug64802.phpt index 3b273998d0..d1065f66a7 100644 --- a/ext/openssl/tests/bug64802.phpt +++ b/ext/openssl/tests/bug64802.phpt @@ -11,7 +11,7 @@ $cert = file_get_contents(__DIR__.'/bug64802.pem'); $r = openssl_x509_parse($cert,$use_short_names=false); var_dump($r['subject']['commonName']); ?> ---EXPECTF-- +--EXPECT-- array(6) { [0]=> string(9) "www.rd.io" diff --git a/ext/openssl/tests/bug65538_003.phpt b/ext/openssl/tests/bug65538_003.phpt index da99779143..80280d1e15 100644 --- a/ext/openssl/tests/bug65538_003.phpt +++ b/ext/openssl/tests/bug65538_003.phpt @@ -49,5 +49,5 @@ CODE; include 'ServerClientTestCase.inc'; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ---EXPECTF-- +--EXPECT-- string(12) "Hello World!" diff --git a/ext/openssl/tests/bug66501.phpt b/ext/openssl/tests/bug66501.phpt index fa450318c2..daf7cb6aa0 100644 --- a/ext/openssl/tests/bug66501.phpt +++ b/ext/openssl/tests/bug66501.phpt @@ -18,5 +18,5 @@ sqOTOnMoezkbSmVVMuwz9flvnqHGmQvmug== $key = openssl_pkey_get_private($pkey); $res = openssl_sign($data ='alpha', $sign, $key, 'SHA1'); var_dump($res); ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/openssl/tests/bug67403.phpt b/ext/openssl/tests/bug67403.phpt index 0a19686af1..19701af381 100644 --- a/ext/openssl/tests/bug67403.phpt +++ b/ext/openssl/tests/bug67403.phpt @@ -14,7 +14,7 @@ $r = openssl_x509_parse(file_get_contents(__DIR__.'/bug37820cert.pem')); var_dump($r['signatureTypeSN']); var_dump($r['signatureTypeLN']); var_dump($r['signatureTypeNID']); ---EXPECTF-- +--EXPECT-- string(8) "RSA-SHA1" string(21) "sha1WithRSAEncryption" int(65) diff --git a/ext/openssl/tests/bug74022.phpt b/ext/openssl/tests/bug74022.phpt index 0ab321c73a..e3ec128fdf 100644 --- a/ext/openssl/tests/bug74022.phpt +++ b/ext/openssl/tests/bug74022.phpt @@ -13,7 +13,7 @@ var_dump(openssl_pkcs12_read($cert_store, $cert_info, "csos")); var_dump(openssl_error_string()); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(true) bool(false) ===DONE=== diff --git a/ext/openssl/tests/bug74022_2.phpt b/ext/openssl/tests/bug74022_2.phpt index 65d0977674..356e22549f 100644 --- a/ext/openssl/tests/bug74022_2.phpt +++ b/ext/openssl/tests/bug74022_2.phpt @@ -19,6 +19,6 @@ $p12 = base64_decode($p12_base64); test($p12, 'qwerty'); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- int(2) ===DONE=== diff --git a/ext/openssl/tests/bug74099.phpt b/ext/openssl/tests/bug74099.phpt index c0e02ba0cc..6d111052ce 100644 --- a/ext/openssl/tests/bug74099.phpt +++ b/ext/openssl/tests/bug74099.phpt @@ -16,5 +16,5 @@ $tag = null; $ciphertext = openssl_encrypt($plaintext, 'aes-256-gcm', $key, \OPENSSL_RAW_DATA, $iv, $tag, $aad); var_dump($ciphertext); ?> ---EXPECTF-- +--EXPECT-- string(0) "" diff --git a/ext/openssl/tests/bug74159.phpt b/ext/openssl/tests/bug74159.phpt index c031ea2fee..0ca8fb7db3 100644 --- a/ext/openssl/tests/bug74159.phpt +++ b/ext/openssl/tests/bug74159.phpt @@ -107,6 +107,6 @@ CODE; include 'ServerClientTestCase.inc'; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ?> ---EXPECTF-- +--EXPECT-- Written 1048575 bytes DONE diff --git a/ext/openssl/tests/bug74341.phpt b/ext/openssl/tests/bug74341.phpt index a3c78cfab0..6682b72bd1 100644 --- a/ext/openssl/tests/bug74341.phpt +++ b/ext/openssl/tests/bug74341.phpt @@ -47,6 +47,6 @@ $parsed_cert = openssl_x509_parse($pem_cert); var_dump($parsed_cert['validFrom_time_t']); var_dump($parsed_cert['validTo_time_t']); ?> ---EXPECTF-- +--EXPECT-- int(1389052800) int(1459494000) diff --git a/ext/openssl/tests/bug74402.phpt b/ext/openssl/tests/bug74402.phpt index 8cd98362df..db0800791b 100644 --- a/ext/openssl/tests/bug74402.phpt +++ b/ext/openssl/tests/bug74402.phpt @@ -25,6 +25,6 @@ $iv = ''; var_dump(strlen($data)); var_dump(openssl_seal($data, $sealed_data, $env_keys, $key, 'AES256', $iv)); ?> ---EXPECTF-- +--EXPECT-- int(64) int(80) diff --git a/ext/openssl/tests/bug74720_0.phpt b/ext/openssl/tests/bug74720_0.phpt index d84dc47d77..b6b4b35d62 100644 --- a/ext/openssl/tests/bug74720_0.phpt +++ b/ext/openssl/tests/bug74720_0.phpt @@ -83,7 +83,7 @@ unlink($tmpFileOut2); ?> ==DONE== ---EXPECTF-- +--EXPECT-- bool(true) bool(true) int(39) diff --git a/ext/openssl/tests/bug74720_1.phpt b/ext/openssl/tests/bug74720_1.phpt index 9a8099a33c..d85f9ba83a 100644 --- a/ext/openssl/tests/bug74720_1.phpt +++ b/ext/openssl/tests/bug74720_1.phpt @@ -82,7 +82,7 @@ unlink($outPath); ?> ==DONE== ---EXPECTF-- +--EXPECT-- bool(true) ==DONE== diff --git a/ext/openssl/tests/bug74798.phpt b/ext/openssl/tests/bug74798.phpt index 5b41af3efc..ad74b51fb4 100644 --- a/ext/openssl/tests/bug74798.phpt +++ b/ext/openssl/tests/bug74798.phpt @@ -85,7 +85,7 @@ unlink($tmpFileOut2); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(true) bool(true) int(40) diff --git a/ext/openssl/tests/cve2013_4073.phpt b/ext/openssl/tests/cve2013_4073.phpt index e676ddfb99..a626e21f95 100644 --- a/ext/openssl/tests/cve2013_4073.phpt +++ b/ext/openssl/tests/cve2013_4073.phpt @@ -9,7 +9,7 @@ $cert = file_get_contents(__DIR__ . '/cve2013_4073.pem'); $info = openssl_x509_parse($cert); var_export($info['extensions']); ---EXPECTF-- +--EXPECT-- array ( 'basicConstraints' => 'CA:FALSE', 'subjectKeyIdentifier' => '88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C', diff --git a/ext/openssl/tests/openssl_csr_get_subject_basic.phpt b/ext/openssl/tests/openssl_csr_get_subject_basic.phpt index 6fe41f80e8..bfc2d3ce8d 100644 --- a/ext/openssl/tests/openssl_csr_get_subject_basic.phpt +++ b/ext/openssl/tests/openssl_csr_get_subject_basic.phpt @@ -39,7 +39,7 @@ $csr_file = file_get_contents(dirname(__FILE__) . '/cert.csr'); var_dump(openssl_csr_get_subject($csr_file)); var_dump(openssl_csr_get_subject($csr, false)); ?> ---EXPECTF-- +--EXPECT-- array(6) { ["C"]=> string(2) "NL" diff --git a/ext/openssl/tests/openssl_pbkdf2_basic.phpt b/ext/openssl/tests/openssl_pbkdf2_basic.phpt index 3ec4dce236..991e068f63 100644 --- a/ext/openssl/tests/openssl_pbkdf2_basic.phpt +++ b/ext/openssl/tests/openssl_pbkdf2_basic.phpt @@ -18,7 +18,7 @@ var_dump(bin2hex(openssl_pbkdf2('passwordPASSWORDpassword', 'saltSALTsaltSALTsal var_dump(bin2hex(openssl_pbkdf2("pass\0word", "sa\0lt", 16, 4096))); ?> ---EXPECTF-- +--EXPECT-- string(40) "0c60c80f961f0e71f3a9b524af6012062fe037a6" string(40) "ea6c014dc72d6f8ccd1ed92ace1d41f0d8de8957" string(40) "4b007901b765489abead49d926f721d065a429c1" diff --git a/ext/openssl/tests/openssl_pkcs12_read_basic.phpt b/ext/openssl/tests/openssl_pkcs12_read_basic.phpt index ece9dd2eee..24d038970d 100644 --- a/ext/openssl/tests/openssl_pkcs12_read_basic.phpt +++ b/ext/openssl/tests/openssl_pkcs12_read_basic.phpt @@ -14,7 +14,7 @@ var_dump(openssl_pkcs12_read($p12, $certs, "")); var_dump(openssl_pkcs12_read($p12, $certs, $pass)); var_dump($certs); ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) bool(true) diff --git a/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt b/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt index e8ba264550..b51205bb53 100644 --- a/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt +++ b/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt @@ -25,7 +25,7 @@ var_dump(openssl_pkcs7_decrypt($a, $b, 0, 0)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(57) "Object of class stdClass could not be converted to string" string(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert" bool(false) diff --git a/ext/openssl/tests/session_meta_capture.phpt b/ext/openssl/tests/session_meta_capture.phpt index a09d7e8780..76182e17d5 100644 --- a/ext/openssl/tests/session_meta_capture.phpt +++ b/ext/openssl/tests/session_meta_capture.phpt @@ -53,7 +53,7 @@ CODE; include 'ServerClientTestCase.inc'; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ---EXPECTF-- +--EXPECT-- string(5) "TLSv1" string(7) "TLSv1.1" string(7) "TLSv1.2" diff --git a/ext/openssl/tests/streams_crypto_method.phpt b/ext/openssl/tests/streams_crypto_method.phpt index f8ec86498d..15d0598e0f 100644 --- a/ext/openssl/tests/streams_crypto_method.phpt +++ b/ext/openssl/tests/streams_crypto_method.phpt @@ -49,5 +49,5 @@ CODE; include 'ServerClientTestCase.inc'; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ---EXPECTF-- +--EXPECT-- Hello World! diff --git a/ext/pcntl/tests/002.phpt b/ext/pcntl/tests/002.phpt index 3cec8833f8..ce61b7b7fe 100644 --- a/ext/pcntl/tests/002.phpt +++ b/ext/pcntl/tests/002.phpt @@ -73,7 +73,7 @@ if ($pid == -1) { } ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) signo == SIGTERM diff --git a/ext/pcntl/tests/async_signals.phpt b/ext/pcntl/tests/async_signals.phpt index b650606df3..86b006295d 100644 --- a/ext/pcntl/tests/async_signals.phpt +++ b/ext/pcntl/tests/async_signals.phpt @@ -19,7 +19,7 @@ $i = 0; // dummy echo "Done!\n"; ?> ---EXPECTF-- +--EXPECT-- Start! Signal handler called! Done! diff --git a/ext/pcntl/tests/bug73783.phpt b/ext/pcntl/tests/bug73783.phpt index beacdf6b8d..cf28868086 100644 --- a/ext/pcntl/tests/bug73783.phpt +++ b/ext/pcntl/tests/bug73783.phpt @@ -24,5 +24,5 @@ if (microtime(true) - $before >= 0.8) { echo "failed\n"; } ?> ---EXPECTF-- +--EXPECT-- working diff --git a/ext/pcntl/tests/pcntl_signal_dispatch.phpt b/ext/pcntl/tests/pcntl_signal_dispatch.phpt index acf6cc05e1..a7a26dbf65 100644 --- a/ext/pcntl/tests/pcntl_signal_dispatch.phpt +++ b/ext/pcntl/tests/pcntl_signal_dispatch.phpt @@ -20,7 +20,7 @@ pcntl_signal_dispatch(); echo "Done!\n"; ?> ---EXPECTF-- +--EXPECT-- Start! Signal handler called! Done! diff --git a/ext/pcntl/tests/pcntl_signal_get_handler.phpt b/ext/pcntl/tests/pcntl_signal_get_handler.phpt index 48f911e5e3..ee699942a8 100644 --- a/ext/pcntl/tests/pcntl_signal_get_handler.phpt +++ b/ext/pcntl/tests/pcntl_signal_get_handler.phpt @@ -22,7 +22,7 @@ pcntl_signal_dispatch(); echo "ok\n"; ?> ---EXPECTF-- +--EXPECT-- int(0) string(10) "pcntl_test" int(0) diff --git a/ext/pcntl/tests/signal_closure_handler.phpt b/ext/pcntl/tests/signal_closure_handler.phpt index 438e05159f..106b928296 100644 --- a/ext/pcntl/tests/signal_closure_handler.phpt +++ b/ext/pcntl/tests/signal_closure_handler.phpt @@ -19,7 +19,7 @@ $i = 0; // dummy echo "Done!\n"; ?> ---EXPECTF-- +--EXPECT-- Start! Signal handler called! Done! diff --git a/ext/pcre/tests/004.phpt b/ext/pcre/tests/004.phpt index 11361d1b32..606b561126 100644 --- a/ext/pcre/tests/004.phpt +++ b/ext/pcre/tests/004.phpt @@ -14,7 +14,7 @@ var_dump($m); var_dump(preg_split('/PHP_(?:NAMED_)?(?:FUNCTION|METHOD)\s*\((\w+(?:,\s*\w+)?)\)/S', "PHP_FUNCTION(s, preg_match)\n{\nlalala", -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_OFFSET_CAPTURE)); ?> ---EXPECTF-- +--EXPECT-- int(2) array(2) { [0]=> diff --git a/ext/pcre/tests/006.phpt b/ext/pcre/tests/006.phpt index a16b4fbe71..793581ecd9 100644 --- a/ext/pcre/tests/006.phpt +++ b/ext/pcre/tests/006.phpt @@ -17,7 +17,7 @@ var_dump($result); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(58) "[CODE]<td align="$stylevar[right]">[/CODE]" NULL string(58) "[CODE]<td align="$stylevar[right]">[/CODE]" diff --git a/ext/pcre/tests/bug52971.phpt b/ext/pcre/tests/bug52971.phpt index 25a5424b8e..130fbf31a2 100644 --- a/ext/pcre/tests/bug52971.phpt +++ b/ext/pcre/tests/bug52971.phpt @@ -16,7 +16,7 @@ preg_match_all($pattern, $message, $match, PREG_OFFSET_CAPTURE); var_dump($match); ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> array(2) { diff --git a/ext/pcre/tests/bug63055.phpt b/ext/pcre/tests/bug63055.phpt index 16c50b54e5..a5f582d5d2 100644 --- a/ext/pcre/tests/bug63055.phpt +++ b/ext/pcre/tests/bug63055.phpt @@ -19,5 +19,5 @@ $matches[2] = $dummy; preg_match_all("/(\d)+/", "foo123456bar", $matches); echo "okey"; ?> ---EXPECTF-- +--EXPECT-- okey diff --git a/ext/pcre/tests/bug67238.phpt b/ext/pcre/tests/bug67238.phpt index 117662af6b..66f4d6c272 100644 --- a/ext/pcre/tests/bug67238.phpt +++ b/ext/pcre/tests/bug67238.phpt @@ -6,5 +6,5 @@ Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream echo preg_match('/a{1,3}b/U', 'ab'); ?> ---EXPECTF-- +--EXPECT-- 1 diff --git a/ext/pcre/tests/bug75539.phpt b/ext/pcre/tests/bug75539.phpt index 12c56e0b76..17b256f9c4 100644 --- a/ext/pcre/tests/bug75539.phpt +++ b/ext/pcre/tests/bug75539.phpt @@ -7,6 +7,6 @@ var_dump(preg_match('/((?1)?z)/', '')); var_dump(preg_last_error() === \PREG_INTERNAL_ERROR); ?> ---EXPECTF-- +--EXPECT-- int(0) bool(false) diff --git a/ext/pcre/tests/marks.phpt b/ext/pcre/tests/marks.phpt index 8838a00500..1ff33e96e7 100644 --- a/ext/pcre/tests/marks.phpt +++ b/ext/pcre/tests/marks.phpt @@ -33,7 +33,7 @@ var_dump(preg_replace_callback($regex, function($matches) { }, '_a__b__c__d_')); ?> ---EXPECTF-- +--EXPECT-- int(1) array(5) { [0]=> diff --git a/ext/pcre/tests/no_jit_bug70110.phpt b/ext/pcre/tests/no_jit_bug70110.phpt index d1ce7abc4e..fa673ac935 100644 --- a/ext/pcre/tests/no_jit_bug70110.phpt +++ b/ext/pcre/tests/no_jit_bug70110.phpt @@ -10,7 +10,7 @@ var_dump(preg_match('~(*NO_JIT)(a)*~', str_repeat('a', 5431), $match)) ?> ==DONE== ---EXPECTF-- +--EXPECT-- int(1) int(1) ==DONE== diff --git a/ext/pcre/tests/preg_match_all_basic.phpt b/ext/pcre/tests/preg_match_all_basic.phpt index 20c4a96be4..773bad3053 100644 --- a/ext/pcre/tests/preg_match_all_basic.phpt +++ b/ext/pcre/tests/preg_match_all_basic.phpt @@ -24,7 +24,7 @@ var_dump(preg_match_all('/this isn\'t in the string/', $string)); var_dump(preg_match_all('/world/', $string)); var_dump(preg_match_all('/[0-9]/', $string)); ?> ---EXPECTF-- +--EXPECT-- int(1) array(1) { [0]=> diff --git a/ext/pcre/tests/preg_match_all_edit_basic.phpt b/ext/pcre/tests/preg_match_all_edit_basic.phpt index 9edcf73596..b0de5c92ad 100644 --- a/ext/pcre/tests/preg_match_all_edit_basic.phpt +++ b/ext/pcre/tests/preg_match_all_edit_basic.phpt @@ -25,7 +25,7 @@ var_dump($match4); var_dump(preg_match_all('/(This is a ){2}(.*)\stest/', $string, $match5)); //tries to find "This is aThis is a [...] test" (0 matches) var_dump($match5); ?> ---EXPECTF-- +--EXPECT-- int(1) array(1) { [0]=> diff --git a/ext/pcre/tests/preg_match_basic.phpt b/ext/pcre/tests/preg_match_basic.phpt index ddf54a0aaf..8538033f52 100644 --- a/ext/pcre/tests/preg_match_basic.phpt +++ b/ext/pcre/tests/preg_match_basic.phpt @@ -19,7 +19,7 @@ var_dump(preg_match('/hello world/', $string, $match5)); //tries to find "hello var_dump($match5); ?> ---EXPECTF-- +--EXPECT-- int(1) array(1) { diff --git a/ext/pcre/tests/preg_match_basic_002.phpt b/ext/pcre/tests/preg_match_basic_002.phpt index 977a67ea10..3bfc9942fe 100644 --- a/ext/pcre/tests/preg_match_basic_002.phpt +++ b/ext/pcre/tests/preg_match_basic_002.phpt @@ -13,7 +13,7 @@ preg_match("/M(.*)/", $string, $matches); var_dump($matches); ?> ===Done=== ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(2) "My" diff --git a/ext/pcre/tests/preg_match_basic_edit.phpt b/ext/pcre/tests/preg_match_basic_edit.phpt index bd469d3346..f79c3628c6 100644 --- a/ext/pcre/tests/preg_match_basic_edit.phpt +++ b/ext/pcre/tests/preg_match_basic_edit.phpt @@ -27,7 +27,7 @@ var_dump(preg_match('/hello world/', $string, $match5)); //tries to find " var_dump($match5); ?> ---EXPECTF-- +--EXPECT-- int(1) array(1) { diff --git a/ext/pcre/tests/preg_replace.phpt b/ext/pcre/tests/preg_replace.phpt index 092857c57e..4d57d9f7ee 100644 --- a/ext/pcre/tests/preg_replace.phpt +++ b/ext/pcre/tests/preg_replace.phpt @@ -9,7 +9,7 @@ var_dump(preg_replace('{{\D+}}', 'ddd', 'abcd')); var_dump(preg_replace('/(ab)(c)(d)(e)(f)(g)(h)(i)(j)(k)/', 'a${1}2$103', 'zabcdefghijkl')); ?> ---EXPECTF-- +--EXPECT-- string(1) "x" string(4) "abcd" string(8) "zaab2k3l" diff --git a/ext/pcre/tests/preg_replace_callback_array.phpt b/ext/pcre/tests/preg_replace_callback_array.phpt index 6780bfba1b..01973eaa32 100644 --- a/ext/pcre/tests/preg_replace_callback_array.phpt +++ b/ext/pcre/tests/preg_replace_callback_array.phpt @@ -42,7 +42,7 @@ var_dump(preg_replace_callback_array( var_dump($count); ?> ---EXPECTF-- +--EXPECT-- string(2) "ok" string(2) "ok" string(2) "ok" diff --git a/ext/pcre/tests/preg_replace_callback_basic.phpt b/ext/pcre/tests/preg_replace_callback_basic.phpt index 01d290a1b9..45778871db 100644 --- a/ext/pcre/tests/preg_replace_callback_basic.phpt +++ b/ext/pcre/tests/preg_replace_callback_basic.phpt @@ -26,7 +26,7 @@ $new_subject3 = preg_replace_callback('/\d/', "integer_word", $subject3, 5, $cou print "$new_subject3 \n"; print $count; ?> ---EXPECTF-- +--EXPECT-- there are seven words in this sentence. one two three 4 is now written in words there are no numbers in this string diff --git a/ext/pcre/tests/preg_replace_edit_basic.phpt b/ext/pcre/tests/preg_replace_edit_basic.phpt index 556b48b8c1..adcee00d9e 100644 --- a/ext/pcre/tests/preg_replace_edit_basic.phpt +++ b/ext/pcre/tests/preg_replace_edit_basic.phpt @@ -29,7 +29,7 @@ var_dump(preg_replace('<(\w)\s*-\s*(\w)>', var_dump(preg_replace('<(^[a-z]\w+)@(\w+)\.(\w+)\.([a-z]{2,}$)>', '\\1 at \\2 dot \\3 dot \\4', 'josmessa@uk.ibm.com')); //finds the e-mail address and replaces the @ and . with "at" and "dot" (uses backreferences) ('josmessa at uk dot ibm dot com') ?> ---EXPECTF-- +--EXPECT-- string(54) "123456789 - Hello, world - This is a string." string(54) "123456789 - Hello, world - This is a string." string(54) "444444789 - Hello, world - This is a string." diff --git a/ext/pcre/tests/preg_replace_variation1.phpt b/ext/pcre/tests/preg_replace_variation1.phpt index ac79e0bfaf..d99cc63212 100644 --- a/ext/pcre/tests/preg_replace_variation1.phpt +++ b/ext/pcre/tests/preg_replace_variation1.phpt @@ -13,5 +13,5 @@ $string = 'This is a string. It contains numbers (0-9) as well as parentheses an $new_string = preg_replace(array('/\b\w{1}s/', '/(\d{1})-(\d{1})/', '/[\(!\)]/'), array('test', '$1 to $2', '*'), $string); print $new_string; ?> ---EXPECTF-- +--EXPECT-- This test a string. It contains numbers *0 to 9* test well test parentheses and some other things* diff --git a/ext/pdo/tests/bug_38394.phpt b/ext/pdo/tests/bug_38394.phpt index be990b3b19..d0dea337d1 100644 --- a/ext/pdo/tests/bug_38394.phpt +++ b/ext/pdo/tests/bug_38394.phpt @@ -27,7 +27,7 @@ $s->execute(array('a' => 9, 'b' => 10, 'c' => 11)); var_dump($db->query("SELECT * FROM test")->fetchAll(PDO::FETCH_ASSOC)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- array(2) { [0]=> array(3) { diff --git a/ext/pdo/tests/bug_50458.phpt b/ext/pdo/tests/bug_50458.phpt index 3deb2892ee..431073753f 100644 --- a/ext/pdo/tests/bug_50458.phpt +++ b/ext/pdo/tests/bug_50458.phpt @@ -21,7 +21,7 @@ var_dump($res->fetchAll(PDO::FETCH_FUNC, function($a) { return strtoupper($a); } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- array(1) { [0]=> string(3) "XYZ" diff --git a/ext/pdo/tests/bug_52098.phpt b/ext/pdo/tests/bug_52098.phpt index c9d39af522..d30a8e462f 100644 --- a/ext/pdo/tests/bug_52098.phpt +++ b/ext/pdo/tests/bug_52098.phpt @@ -52,7 +52,7 @@ echo $obj->lucky(); $db->exec("DROP TABLE test"); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Calling object method 'foo' Calling object method 'bar' Calling object method 'lucky' diff --git a/ext/pdo/tests/bug_61292.phpt b/ext/pdo/tests/bug_61292.phpt index 0e41be3859..0a6885cf7c 100644 --- a/ext/pdo/tests/bug_61292.phpt +++ b/ext/pdo/tests/bug_61292.phpt @@ -38,6 +38,6 @@ class Database_SQL extends PDO (new Database_SQL)->foo(); ?> ---EXPECTF-- +--EXPECT-- array(0) { } diff --git a/ext/pdo/tests/bug_65946.phpt b/ext/pdo/tests/bug_65946.phpt index 9318428910..447af58517 100644 --- a/ext/pdo/tests/bug_65946.phpt +++ b/ext/pdo/tests/bug_65946.phpt @@ -40,7 +40,7 @@ if(!($res = $stmt->execute())) var_dump($stmt->errorInfo()); if(!($res = $stmt->execute())) var_dump($stmt->errorInfo()); var_dump($stmt->fetchAll(PDO::FETCH_ASSOC)); ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> array(1) { diff --git a/ext/pdo_mysql/tests/bug70389.phpt b/ext/pdo_mysql/tests/bug70389.phpt index b9084f63e3..2245459b94 100644 --- a/ext/pdo_mysql/tests/bug70389.phpt +++ b/ext/pdo_mysql/tests/bug70389.phpt @@ -22,7 +22,7 @@ new PDO(PDO_MYSQL_TEST_DSN, PDO_MYSQL_TEST_USER, PDO_MYSQL_TEST_PASS, $flags); var_dump($flags); ?> ---EXPECTF-- +--EXPECT-- array(3) { [1005]=> bool(true) diff --git a/ext/pdo_mysql/tests/bug70862.phpt b/ext/pdo_mysql/tests/bug70862.phpt index 4a3a618854..527d9544de 100644 --- a/ext/pdo_mysql/tests/bug70862.phpt +++ b/ext/pdo_mysql/tests/bug70862.phpt @@ -41,6 +41,6 @@ require dirname(__FILE__) . '/mysql_pdo_test.inc'; $db = MySQLPDOTest::factory(); $db->exec('DROP TABLE IF EXISTS test'); ?> ---EXPECTF-- +--EXPECT-- string(0) "" done! diff --git a/ext/pdo_mysql/tests/bug_39858.phpt b/ext/pdo_mysql/tests/bug_39858.phpt index 896519f8ab..ec4c9586cc 100644 --- a/ext/pdo_mysql/tests/bug_39858.phpt +++ b/ext/pdo_mysql/tests/bug_39858.phpt @@ -70,7 +70,7 @@ require dirname(__FILE__) . '/mysql_pdo_test.inc'; $db = MySQLPDOTest::factory(); $db->exec("DROP PROCEDURE IF EXISTS p"); ?> ---EXPECTF-- +--EXPECT-- Emulated Prepared Statements... array(1) { [0]=> diff --git a/ext/pdo_mysql/tests/bug_41698.phpt b/ext/pdo_mysql/tests/bug_41698.phpt index e23aac2a55..b2dee60d74 100644 --- a/ext/pdo_mysql/tests/bug_41698.phpt +++ b/ext/pdo_mysql/tests/bug_41698.phpt @@ -22,7 +22,7 @@ $stmt = $db->prepare('INSERT INTO test VALUES(?)'); $stmt->execute(array($value)); var_dump($db->query('SELECT * from test')->fetchAll(PDO::FETCH_ASSOC)); ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> array(1) { diff --git a/ext/pdo_mysql/tests/bug_41997.phpt b/ext/pdo_mysql/tests/bug_41997.phpt index f001eec7d0..3a90244365 100644 --- a/ext/pdo_mysql/tests/bug_41997.phpt +++ b/ext/pdo_mysql/tests/bug_41997.phpt @@ -38,7 +38,7 @@ var_dump($stmt->fetchAll(PDO::FETCH_ASSOC)); var_dump($stmt->errorInfo()); print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> array(1) { diff --git a/ext/pdo_mysql/tests/bug_44707.phpt b/ext/pdo_mysql/tests/bug_44707.phpt index 90dc4c20f4..d5d4539fcc 100644 --- a/ext/pdo_mysql/tests/bug_44707.phpt +++ b/ext/pdo_mysql/tests/bug_44707.phpt @@ -73,7 +73,7 @@ bug_44707($db); print "done!"; ?> ---EXPECTF-- +--EXPECT-- Native Prepared Statements bool(false) bool(false) diff --git a/ext/pdo_mysql/tests/bug_50323.phpt b/ext/pdo_mysql/tests/bug_50323.phpt index 5455c664c0..30f856efc8 100644 --- a/ext/pdo_mysql/tests/bug_50323.phpt +++ b/ext/pdo_mysql/tests/bug_50323.phpt @@ -56,5 +56,5 @@ $db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt'); @$db->exec('DROP DATABASE IF EXISTS `crazy;dbname`'); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/pdo_mysql/tests/bug_51670.phpt b/ext/pdo_mysql/tests/bug_51670.phpt index d5387e6c6f..ddfd139d94 100644 --- a/ext/pdo_mysql/tests/bug_51670.phpt +++ b/ext/pdo_mysql/tests/bug_51670.phpt @@ -19,6 +19,6 @@ $query->execute(); if(!is_array($query->getColumnMeta(0))) die('FAIL!'); echo 'done!'; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/pdo_mysql/tests/bug_61411.phpt b/ext/pdo_mysql/tests/bug_61411.phpt index 794d307873..d840f222f1 100644 --- a/ext/pdo_mysql/tests/bug_61411.phpt +++ b/ext/pdo_mysql/tests/bug_61411.phpt @@ -43,7 +43,7 @@ foreach ($stmt as $line) { print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(2) { [1]=> int(1) diff --git a/ext/pdo_mysql/tests/bug_61755.phpt b/ext/pdo_mysql/tests/bug_61755.phpt index 1d2b96805a..a6f55f5938 100644 --- a/ext/pdo_mysql/tests/bug_61755.phpt +++ b/ext/pdo_mysql/tests/bug_61755.phpt @@ -31,7 +31,7 @@ try { echo "\ndone!\n"; ?> ---EXPECTF-- +--EXPECT-- NULL-Byte before first placeholder: Length of item 0: 3, Value of item 1: c diff --git a/ext/pdo_mysql/tests/bug_74376.phpt b/ext/pdo_mysql/tests/bug_74376.phpt index 29b16748ff..1d2acfdc69 100644 --- a/ext/pdo_mysql/tests/bug_74376.phpt +++ b/ext/pdo_mysql/tests/bug_74376.phpt @@ -23,5 +23,5 @@ $stmt = $db->query("select (select 1 union select 2)"); print "ok"; ?> ---EXPECTF-- +--EXPECT-- ok diff --git a/ext/pdo_mysql/tests/bug_pecl_12925.phpt b/ext/pdo_mysql/tests/bug_pecl_12925.phpt index 25281fe31c..1d9558bf66 100644 --- a/ext/pdo_mysql/tests/bug_pecl_12925.phpt +++ b/ext/pdo_mysql/tests/bug_pecl_12925.phpt @@ -42,7 +42,7 @@ bug_pecl_1295($db); $db->exec('DROP TABLE IF EXISTS test'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- Emulated... array(1) { [0]=> diff --git a/ext/pdo_mysql/tests/bug_pecl_7976.phpt b/ext/pdo_mysql/tests/bug_pecl_7976.phpt index 9efba0d537..8a1362599b 100644 --- a/ext/pdo_mysql/tests/bug_pecl_7976.phpt +++ b/ext/pdo_mysql/tests/bug_pecl_7976.phpt @@ -58,7 +58,7 @@ $db->exec('DROP PROCEDURE IF EXISTS p'); ?> --XFAIL-- Works with mysqlnd. It is not supported by libmysql. For libmysql is good enough to see no crash. ---EXPECTF-- +--EXPECT-- Emulated... array(1) { [0]=> diff --git a/ext/pdo_mysql/tests/pdo_mysql___construct_ini.phpt b/ext/pdo_mysql/tests/pdo_mysql___construct_ini.phpt index 14f81a66f1..8c8922f20b 100644 --- a/ext/pdo_mysql/tests/pdo_mysql___construct_ini.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql___construct_ini.phpt @@ -51,6 +51,6 @@ pdo.dsn.mysql="mysql:dbname=phptest;socket=/tmp/mysql.sock" print "done!"; ?> ---EXPECTF-- +--EXPECT-- pdo.dsn.mysql cannot be accessed through ini_get_all()/ini_get() done!
\ No newline at end of file diff --git a/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt b/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt index 20add5a11e..133d42215d 100644 --- a/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt @@ -77,7 +77,7 @@ if (MySQLPDOTest::isPDOMySQLnd()) print "done!"; ?> ---EXPECTF-- +--EXPECT-- [001] Expecting default value for 'PDO::MYSQL_ATTR_INIT_COMMAND' of ''/string, getAttribute() reports setting ''/boolean [026] Execting '1'/boolean got ''/boolean' for options 'PDO::MYSQL_ATTR_READ_DEFAULT_FILE' done! diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_autocommit.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_autocommit.phpt index 9a73f1b296..925290e734 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_attr_autocommit.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_attr_autocommit.phpt @@ -94,5 +94,5 @@ $db = MySQLPDOTest::factory(); require dirname(__FILE__) . '/mysql_pdo_test.inc'; MySQLPDOTest::dropTestTable(); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt index cdbc02b645..a39fff5c81 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt @@ -89,7 +89,7 @@ $db = MySQLPDOTest::factory(); require dirname(__FILE__) . '/mysql_pdo_test.inc'; MySQLPDOTest::dropTestTable(); ?> ---EXPECTF-- +--EXPECT-- string(15) "PDO::CASE_LOWER" array(2) { [0]=> diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_client_version.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_client_version.phpt index 2d939635c8..464d2b422d 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_attr_client_version.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_attr_client_version.phpt @@ -33,5 +33,5 @@ $db = MySQLPDOTest::factory(); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_connection_status.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_connection_status.phpt index 7db5ec35ec..9fd9bf9b26 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_attr_connection_status.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_attr_connection_status.phpt @@ -28,5 +28,5 @@ $db = MySQLPDOTest::factory(); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_driver_name.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_driver_name.phpt index 108a7c3984..d852af01fd 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_attr_driver_name.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_attr_driver_name.phpt @@ -26,6 +26,6 @@ $db = MySQLPDOTest::factory(); print "done!"; ?> ---EXPECTF-- +--EXPECT-- string(5) "mysql" done!
\ No newline at end of file diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_fetch_table_names.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_fetch_table_names.phpt index cc13ec03d3..b85ba236f8 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_attr_fetch_table_names.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_attr_fetch_table_names.phpt @@ -24,7 +24,7 @@ MySQLPDOTest::skip(); print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> array(1) { diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_multi_statements.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_multi_statements.phpt index 312deddb81..b812bf7bb5 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_attr_multi_statements.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_attr_multi_statements.phpt @@ -49,7 +49,7 @@ error_reporting=E_ALL $db->exec(sprintf('DROP TABLE IF EXISTS %s', $table)); print "done!"; ?> ---EXPECTF-- +--EXPECT-- string(5) "00000" array(2) { [0]=> diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_server_info.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_server_info.phpt index 4d0868ae7d..f7c6d0b2d0 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_attr_server_info.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_attr_server_info.phpt @@ -44,5 +44,5 @@ $db = MySQLPDOTest::factory(); printf("[007] SHOW STATUS and server info have reported a different uptime, please check. Server info: '%s', SHOW STATUS: '%s'\n", $info, $uptime); print "done!"; ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_server_version.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_server_version.phpt index a59a6b0cc2..1d65e4486c 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_attr_server_version.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_attr_server_version.phpt @@ -61,5 +61,5 @@ $db = MySQLPDOTest::factory(); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt b/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt index 3fd9827ff2..1cd24f0dbf 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt @@ -186,7 +186,7 @@ if (false == MySQLPDOTest::detect_transactional_mysql_engine($db)) require dirname(__FILE__) . '/mysql_pdo_test.inc'; MySQLPDOTest::dropTestTable(); ?> ---EXPECTF-- +--EXPECT-- array(2) { ["id"]=> string(1) "1" diff --git a/ext/pdo_mysql/tests/pdo_mysql_bit.phpt b/ext/pdo_mysql/tests/pdo_mysql_bit.phpt index 587ac9f2e2..4cb5c64259 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_bit.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_bit.phpt @@ -53,7 +53,7 @@ require dirname(__FILE__) . '/mysql_pdo_test.inc'; $db = MySQLPDOTest::factory(); $db->exec('DROP TABLE IF EXISTS test'); ?> ---EXPECTF-- +--EXPECT-- array(2) { ["id"]=> string(2) "20" diff --git a/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt b/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt index 4528213f11..f7dede52ef 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt @@ -29,5 +29,5 @@ MySQLPDOTest::skip(); echo "failed!\n"; } ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/pdo_mysql/tests/pdo_mysql_errorcode.phpt b/ext/pdo_mysql/tests/pdo_mysql_errorcode.phpt index b970c4ef94..db38c6904f 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_errorcode.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_errorcode.phpt @@ -82,5 +82,5 @@ $db = MySQLPDOTest::factory(); require dirname(__FILE__) . '/mysql_pdo_test.inc'; MySQLPDOTest::dropTestTable(); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/pdo_mysql/tests/pdo_mysql_errorinfo.phpt b/ext/pdo_mysql/tests/pdo_mysql_errorinfo.phpt index 93e1fbf1a2..dca3b2305b 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_errorinfo.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_errorinfo.phpt @@ -101,7 +101,7 @@ $db = MySQLPDOTest::factory(); require dirname(__FILE__) . '/mysql_pdo_test.inc'; MySQLPDOTest::dropTestTable(); ?> ---EXPECTF-- +--EXPECT-- Emulated Prepared Statements... [015] Driver-specific error code not set [015] Driver-specific error message.not set diff --git a/ext/pdo_mysql/tests/pdo_mysql_exec_ddl.phpt b/ext/pdo_mysql/tests/pdo_mysql_exec_ddl.phpt index 2e80053556..2dc00e012b 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_exec_ddl.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_exec_ddl.phpt @@ -88,5 +88,5 @@ MySQLPDOTest::dropTestTable($db); @$db->exec('DROP DATABASE IF EXISTS pdo_exec_ddl'); @$db->exec('DROP DATABASE IF EXISTS pdo_exec_ddl2'); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt b/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt index 364a8d976e..e1ca9e1e16 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt @@ -116,5 +116,5 @@ require dirname(__FILE__) . '/mysql_pdo_test.inc'; $db = MySQLPDOTest::factory(); $db->exec('DROP TABLE IF EXISTS test'); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt b/ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt index a508459e55..6a7de2c22a 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt @@ -58,7 +58,7 @@ $db = MySQLPDOTest::factory(); print "done!"; ?> ---EXPECTF-- +--EXPECT-- [002] Suspicious FETCH_BOTH result, dumping array(2) { [0]=> diff --git a/ext/pdo_mysql/tests/pdo_mysql_get_attribute.phpt b/ext/pdo_mysql/tests/pdo_mysql_get_attribute.phpt index 49bd5551ac..8ab2c98b4c 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_get_attribute.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_get_attribute.phpt @@ -101,5 +101,5 @@ PDO::ATTR_SERVER_INFO require dirname(__FILE__) . '/mysql_pdo_test.inc'; MySQLPDOTest::dropTestTable(); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/pdo_mysql/tests/pdo_mysql_last_insert_id.phpt b/ext/pdo_mysql/tests/pdo_mysql_last_insert_id.phpt index 313b20d189..0ce9e1e539 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_last_insert_id.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_last_insert_id.phpt @@ -115,5 +115,5 @@ $db = MySQLPDOTest::factory(); require dirname(__FILE__) . '/mysql_pdo_test.inc'; MySQLPDOTest::dropTestTable(); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/pdo_mysql/tests/pdo_mysql_multi_stmt_nextrowset.phpt b/ext/pdo_mysql/tests/pdo_mysql_multi_stmt_nextrowset.phpt index f327aa4089..6398a83928 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_multi_stmt_nextrowset.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_multi_stmt_nextrowset.phpt @@ -86,7 +86,7 @@ if (!MySQLPDOTest::isPDOMySQLnd()) require dirname(__FILE__) . '/mysql_pdo_test.inc'; MySQLPDOTest::dropTestTable(); ?> ---EXPECTF-- +--EXPECT-- Native PS... Testing with PDO::MYSQL_ATTR_MULTI_STATEMENTS set to false diff --git a/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt b/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt index d59c930328..880f10b875 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt @@ -95,5 +95,5 @@ MySQLPDOTest::skip(); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated.phpt index f8340f7753..437ea7a458 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated.phpt @@ -327,7 +327,7 @@ $db->exec('DROP TABLE IF EXISTS test'); --XFAIL-- PDO's PS parser has some problems with invalid SQL and crashes from time to time (check with valgrind...) ---EXPECTF-- +--EXPECT-- array(1) { ["one"]=> string(1) "1" diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated_anonymous.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated_anonymous.phpt index 0ac614e4cc..3f63ffcb01 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated_anonymous.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated_anonymous.phpt @@ -64,7 +64,7 @@ require dirname(__FILE__) . '/mysql_pdo_test.inc'; $db = MySQLPDOTest::factory(); $db->exec('DROP TABLE IF EXISTS test'); ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> array(2) { diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_match_against.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_match_against.phpt index ba5142a0c8..12cf051647 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_prepare_match_against.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_match_against.phpt @@ -44,7 +44,7 @@ require dirname(__FILE__) . '/mysql_pdo_test.inc'; $db = MySQLPDOTest::factory(); $db->exec('DROP TABLE IF EXISTS test'); ?> ---EXPECTF-- +--EXPECT-- array(0) { } array(0) { diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native.phpt index 43006c6d58..13b9034788 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native.phpt @@ -341,7 +341,7 @@ require dirname(__FILE__) . '/mysql_pdo_test.inc'; $db = MySQLPDOTest::factory(); $db->exec('DROP TABLE IF EXISTS test'); ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> array(1) { diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_named_placeholder.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_named_placeholder.phpt index 530170d576..896d9cd2a3 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_named_placeholder.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_named_placeholder.phpt @@ -72,7 +72,7 @@ require dirname(__FILE__) . '/mysql_pdo_test.inc'; $db = MySQLPDOTest::factory(); $db->exec('DROP TABLE IF EXISTS test'); ?> ---EXPECTF-- +--EXPECT-- [003] Execute has failed, 'HY093' array ( 0 => 'HY093', 1 => NULL, diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_placeholder_everywhere.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_placeholder_everywhere.phpt index dbff9c4b95..0187858f8b 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_placeholder_everywhere.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_placeholder_everywhere.phpt @@ -65,7 +65,7 @@ require dirname(__FILE__) . '/mysql_pdo_test.inc'; $db = MySQLPDOTest::factory(); $db->exec('DROP TABLE IF EXISTS test'); ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> array(2) { diff --git a/ext/pdo_mysql/tests/pdo_mysql_rollback.phpt b/ext/pdo_mysql/tests/pdo_mysql_rollback.phpt index c0737b2ecc..79a036ca8f 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_rollback.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_rollback.phpt @@ -88,7 +88,7 @@ $db = MySQLPDOTest::factory(); $db->exec('DROP TABLE IF EXISTS test'); $db->exec('DROP TABLE IF EXISTS test2'); ?> ---EXPECTF-- +--EXPECT-- int(1) int(0) int(1) diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_bindcolumn.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_bindcolumn.phpt index dd4920e39d..1dd3ca0fa6 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_bindcolumn.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_bindcolumn.phpt @@ -107,7 +107,7 @@ require dirname(__FILE__) . '/mysql_pdo_test.inc'; $db = MySQLPDOTest::factory(); $db->exec('DROP TABLE IF EXISTS test'); ?> ---EXPECTF-- +--EXPECT-- id = 1 (integer) / label = 'a' (string) id = 2 (integer) / label = 'b' (string) id = 3 (integer) / label = 'c' (string) diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_bindparam.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_bindparam.phpt index 70b2f3fa25..4c3716de4b 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_bindparam.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_bindparam.phpt @@ -121,7 +121,7 @@ MySQLPDOTest::skip(); require dirname(__FILE__) . '/mysql_pdo_test.inc'; MySQLPDOTest::dropTestTable(); ?> ---EXPECTF-- +--EXPECT-- Emulated PS... Buffered... in = 0 -> id = 1 (integer) / label = 'a' (string) diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_bindparam_types.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_bindparam_types.phpt index 9421f62eea..95d7754ca5 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_bindparam_types.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_bindparam_types.phpt @@ -169,5 +169,5 @@ $db = MySQLPDOTest::factory(); require dirname(__FILE__) . '/mysql_pdo_test.inc'; MySQLPDOTest::dropTestTable(); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_bindvalue.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_bindvalue.phpt index 1c62d77314..42f01d5332 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_bindvalue.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_bindvalue.phpt @@ -300,7 +300,7 @@ $db = MySQLPDOTest::factory(); require dirname(__FILE__) . '/mysql_pdo_test.inc'; MySQLPDOTest::dropTestTable(); ?> ---EXPECTF-- +--EXPECT-- Testing native PS... Binding variable... in = 0 -> id = 1 (integer) / label = 'a' (string) diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt index ae7e7fc424..dfdd308e5b 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt @@ -142,7 +142,7 @@ $db = MySQLPDOTest::factory(); $db->exec('DROP TABLE IF EXISTS test'); @unlink(MySQLPDOTest::getTempDir() . DIRECTORY_SEPARATOR . 'pdoblob.tst'); ?> ---EXPECTF-- +--EXPECT-- Emulated PS... Native PS... done!
\ No newline at end of file diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_blobs.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_blobs.phpt index f809e02b11..3e25f85b7a 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_blobs.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_blobs.phpt @@ -94,5 +94,5 @@ require dirname(__FILE__) . '/mysql_pdo_test.inc'; $db = MySQLPDOTest::factory(); $db->exec('DROP TABLE IF EXISTS test'); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_closecursor_empty.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_closecursor_empty.phpt index aea272b1d2..6b4e4d225f 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_closecursor_empty.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_closecursor_empty.phpt @@ -66,7 +66,7 @@ $db = MySQLPDOTest::factory(); require dirname(__FILE__) . '/mysql_pdo_test.inc'; MySQLPDOTest::dropTestTable(); ?> ---EXPECTF-- +--EXPECT-- in = 0 -> id = 1 (integer) / label = 'a' (string) in = 0 -> id = 2 (integer) / label = 'b' (string) in = 0 -> id = 1 (integer) / label = 'a' (string) diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_columncount.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_columncount.phpt index 54b433f3cc..dd9c47bc37 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_columncount.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_columncount.phpt @@ -59,7 +59,7 @@ $db = MySQLPDOTest::factory(); require dirname(__FILE__) . '/mysql_pdo_test.inc'; MySQLPDOTest::dropTestTable(); ?> ---EXPECTF-- +--EXPECT-- Testing emulated PS... int(3) int(2) diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_non_select.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_non_select.phpt index fa4b122ef2..d996dbc3b6 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_non_select.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_non_select.phpt @@ -187,5 +187,5 @@ MySQLPDOTest::skip(); require dirname(__FILE__) . '/mysql_pdo_test.inc'; MySQLPDOTest::dropTestTable(); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt index 10ce72f8c6..a7b40b461c 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt @@ -309,6 +309,6 @@ try { $db->exec('DROP TABLE IF EXISTS test'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- Testing native PS... done! diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_rowcount.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_rowcount.phpt index 17e2412de1..e93bf78a13 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_rowcount.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_rowcount.phpt @@ -32,5 +32,5 @@ MySQLPDOTest::skip(); require dirname(__FILE__) . '/mysql_pdo_test.inc'; MySQLPDOTest::dropTestTable(); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt index e58d4a6578..02f8c682b2 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt @@ -121,5 +121,5 @@ if ($version < 50000) print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/pdo_mysql/tests/pdo_mysql_types.phpt b/ext/pdo_mysql/tests/pdo_mysql_types.phpt index 22c6b66c98..7fb9fe51ed 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_types.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_types.phpt @@ -180,5 +180,5 @@ require dirname(__FILE__) . '/mysql_pdo_test.inc'; $db = MySQLPDOTest::factory(); $db->exec('DROP TABLE IF EXISTS test'); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/pdo_mysql/tests/pdo_mysql_types_zerofill.phpt b/ext/pdo_mysql/tests/pdo_mysql_types_zerofill.phpt index f97bd1bbe2..50d5864d8f 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_types_zerofill.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_types_zerofill.phpt @@ -124,5 +124,5 @@ require dirname(__FILE__) . '/mysql_pdo_test.inc'; $db = MySQLPDOTest::factory(); $db->exec('DROP TABLE IF EXISTS test'); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/pdo_mysql/tests/pecl_bug_5780.phpt b/ext/pdo_mysql/tests/pecl_bug_5780.phpt index 3f3bf966b9..9ae279eaba 100644 --- a/ext/pdo_mysql/tests/pecl_bug_5780.phpt +++ b/ext/pdo_mysql/tests/pecl_bug_5780.phpt @@ -33,7 +33,7 @@ $db = MySQLPDOTest::factory(); $db->exec('DROP TABLE IF EXISTS test'); $db->exec('DROP TABLE IF EXISTS test2'); ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(7) "testing" diff --git a/ext/pdo_mysql/tests/pecl_bug_5802.phpt b/ext/pdo_mysql/tests/pecl_bug_5802.phpt index 088b4ed5e1..397d2e7b9f 100644 --- a/ext/pdo_mysql/tests/pecl_bug_5802.phpt +++ b/ext/pdo_mysql/tests/pecl_bug_5802.phpt @@ -40,7 +40,7 @@ require dirname(__FILE__) . '/mysql_pdo_test.inc'; $db = MySQLPDOTest::factory(); $db->exec('DROP TABLE IF EXISTS test'); ?> ---EXPECTF-- +--EXPECT-- array(3) { [0]=> array(1) { diff --git a/ext/pdo_oci/tests/bug41996.phpt b/ext/pdo_oci/tests/bug41996.phpt index ac8e35fe60..695a678da1 100644 --- a/ext/pdo_oci/tests/bug41996.phpt +++ b/ext/pdo_oci/tests/bug41996.phpt @@ -16,5 +16,5 @@ $stmt = $db->prepare('SELECT rowid FROM dual'); $stmt->execute(); $row = $stmt->fetch(); var_dump(strlen($row[0]) > 0); ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/pdo_oci/tests/bug46274.phpt b/ext/pdo_oci/tests/bug46274.phpt index 23ee8ee20f..7b4b3f74f2 100644 --- a/ext/pdo_oci/tests/bug46274.phpt +++ b/ext/pdo_oci/tests/bug46274.phpt @@ -56,7 +56,7 @@ var_dump($res->fetch()); $db->exec("DROP TABLE test_one_blob"); ?> ---EXPECTF-- +--EXPECT-- array(2) { ["blob1"]=> string(3) "foo" diff --git a/ext/pdo_oci/tests/bug54379.phpt b/ext/pdo_oci/tests/bug54379.phpt index abb6bc73e1..b356f7dfc8 100644 --- a/ext/pdo_oci/tests/bug54379.phpt +++ b/ext/pdo_oci/tests/bug54379.phpt @@ -26,7 +26,7 @@ $stmt->execute(); var_dump($stmt->fetchAll(PDO::FETCH_ASSOC)); $db->exec("DROP TABLE test"); ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> array(1) { diff --git a/ext/pdo_oci/tests/bug57702.phpt b/ext/pdo_oci/tests/bug57702.phpt index d0abc6ff8c..4389276195 100644 --- a/ext/pdo_oci/tests/bug57702.phpt +++ b/ext/pdo_oci/tests/bug57702.phpt @@ -146,7 +146,7 @@ $stmt->execute(); print "done\n"; ?> ---EXPECTF-- +--EXPECT-- First Query string(11) "row 1 col 1" string(11) "row 1 col 2" diff --git a/ext/pdo_oci/tests/bug60994.phpt b/ext/pdo_oci/tests/bug60994.phpt index 0f27222de9..5ac2644bee 100644 --- a/ext/pdo_oci/tests/bug60994.phpt +++ b/ext/pdo_oci/tests/bug60994.phpt @@ -96,7 +96,7 @@ echo 'end of stream4 is ', $ending4, PHP_EOL; --XFAIL-- Fails due to Bug 60994 ---EXPECTF-- +--EXPECT-- Test 1: j size of string1 is 1000006 bytes, 1000006 chars. diff --git a/ext/pdo_oci/tests/checkliveness.phpt b/ext/pdo_oci/tests/checkliveness.phpt index 4bb070f40d..a403a3929e 100644 --- a/ext/pdo_oci/tests/checkliveness.phpt +++ b/ext/pdo_oci/tests/checkliveness.phpt @@ -46,7 +46,7 @@ try { } $db = null; ---EXPECTF-- +--EXPECT-- array(2) { ["DUMMY"]=> string(1) "X" diff --git a/ext/pdo_oci/tests/pdo_oci_attr_autocommit_3.phpt b/ext/pdo_oci/tests/pdo_oci_attr_autocommit_3.phpt index ab9b99fc6c..4066db6a8f 100644 --- a/ext/pdo_oci/tests/pdo_oci_attr_autocommit_3.phpt +++ b/ext/pdo_oci/tests/pdo_oci_attr_autocommit_3.phpt @@ -44,7 +44,7 @@ $dbh2->exec("drop table pdo_ac_tab"); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- PDO::ATTR_AUTOCOMMIT: bool(false) Insert data Second connection should be able to see committed data diff --git a/ext/pdo_oci/tests/pdo_oci_fread_1.phpt b/ext/pdo_oci/tests/pdo_oci_fread_1.phpt index 26a92f01b4..dac53dbea7 100644 --- a/ext/pdo_oci/tests/pdo_oci_fread_1.phpt +++ b/ext/pdo_oci/tests/pdo_oci_fread_1.phpt @@ -55,6 +55,6 @@ foreach ($stmtarray as $stmt) { } ?> ---EXPECTF-- +--EXPECT-- Test 1 *abcjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj**jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj**jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj**jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjxyz* diff --git a/ext/pdo_oci/tests/pdo_oci_quote1.phpt b/ext/pdo_oci/tests/pdo_oci_quote1.phpt index d92317f8d0..1ee83fde4f 100644 --- a/ext/pdo_oci/tests/pdo_oci_quote1.phpt +++ b/ext/pdo_oci/tests/pdo_oci_quote1.phpt @@ -39,7 +39,7 @@ echo "Done\n"; @$db->exec("drop table poq_tab"); ?> ---EXPECTF-- +--EXPECT-- Unquoted : NULL Quoted : string(2) "''" array(1) { diff --git a/ext/pdo_oci/tests/pdo_oci_stream_1.phpt b/ext/pdo_oci/tests/pdo_oci_stream_1.phpt index 27a28b9bb8..9f17e9f61b 100644 --- a/ext/pdo_oci/tests/pdo_oci_stream_1.phpt +++ b/ext/pdo_oci/tests/pdo_oci_stream_1.phpt @@ -84,7 +84,7 @@ foreach ($stmtarray as $stmt) { } ?> ---EXPECTF-- +--EXPECT-- Test 1 Read b$ Read cd$ diff --git a/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt b/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt index 22ae7c6724..54a5ef840b 100644 --- a/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt +++ b/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt @@ -66,5 +66,5 @@ echo "Fetch operation done!\n"; $db->exec("drop table pdo_oci_stream_2"); ?> ---EXPECTF-- +--EXPECT-- Fetch operation done! diff --git a/ext/pdo_oci/tests/pdo_oci_templob_1.phpt b/ext/pdo_oci/tests/pdo_oci_templob_1.phpt index 41391058dd..d79b6b72ce 100644 --- a/ext/pdo_oci/tests/pdo_oci_templob_1.phpt +++ b/ext/pdo_oci/tests/pdo_oci_templob_1.phpt @@ -80,6 +80,6 @@ else } ?> ---EXPECTF-- +--EXPECT-- Success! All the temporary LOB in previously closed statements are properly cleaned. diff --git a/ext/pdo_oci/tests/pecl_bug_6364.phpt b/ext/pdo_oci/tests/pecl_bug_6364.phpt index b2981ec0bc..925665e42b 100644 --- a/ext/pdo_oci/tests/pecl_bug_6364.phpt +++ b/ext/pdo_oci/tests/pecl_bug_6364.phpt @@ -43,7 +43,7 @@ $dbh->exec ("drop table bug_6364_t"); ?> ---EXPECTF-- +--EXPECT-- string(4) "val4" string(4) "val5" array(10) { diff --git a/ext/pdo_pgsql/tests/bug43925.phpt b/ext/pdo_pgsql/tests/bug43925.phpt index e22ffba041..e531a2f7d4 100644 --- a/ext/pdo_pgsql/tests/bug43925.phpt +++ b/ext/pdo_pgsql/tests/bug43925.phpt @@ -53,7 +53,7 @@ foreach ($stmt->fetchAll() as $row) { $dbh->query('DROP TABLE nodes'); ?> ---EXPECTF-- +--EXPECT-- 1 - 1 - 1 - 1 - 1 - 1 - 6 - 6 2 - 2 - 1 - 1 - 2 - 2 - 3 - 3 3 - 3 - 1 - 1 - 4 - 4 - 5 - 5 diff --git a/ext/pdo_pgsql/tests/bug46274.phpt b/ext/pdo_pgsql/tests/bug46274.phpt index 40706ecaa3..92ac6a668e 100644 --- a/ext/pdo_pgsql/tests/bug46274.phpt +++ b/ext/pdo_pgsql/tests/bug46274.phpt @@ -63,7 +63,7 @@ var_dump($res->fetch()); $db->query('DROP TABLE test_one_blob'); ?> ---EXPECTF-- +--EXPECT-- array(2) { ["blob1"]=> string(3) "foo" diff --git a/ext/pdo_pgsql/tests/bug48764.phpt b/ext/pdo_pgsql/tests/bug48764.phpt index d102a055b0..a40e453d8d 100644 --- a/ext/pdo_pgsql/tests/bug48764.phpt +++ b/ext/pdo_pgsql/tests/bug48764.phpt @@ -60,7 +60,7 @@ function bug($db, $options = array()) { } } ---EXPECTF-- +--EXPECT-- Test 1 42P18 Test 2 diff --git a/ext/pdo_pgsql/tests/bug61267.phpt b/ext/pdo_pgsql/tests/bug61267.phpt index 4214cd9be0..f91eceecdf 100644 --- a/ext/pdo_pgsql/tests/bug61267.phpt +++ b/ext/pdo_pgsql/tests/bug61267.phpt @@ -17,6 +17,6 @@ $res = $db->exec('SELECT * from generate_series(1, 42);'); var_dump($res); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(0) Done diff --git a/ext/pdo_pgsql/tests/bug62593.phpt b/ext/pdo_pgsql/tests/bug62593.phpt index 4ab4566f00..1b5b3c05aa 100644 --- a/ext/pdo_pgsql/tests/bug62593.phpt +++ b/ext/pdo_pgsql/tests/bug62593.phpt @@ -58,7 +58,7 @@ foreach ($errors as $error) } echo $expect; ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(false) bool(true) diff --git a/ext/pdo_pgsql/tests/bug69752.phpt b/ext/pdo_pgsql/tests/bug69752.phpt index bb7e5e87e7..e83855f218 100644 --- a/ext/pdo_pgsql/tests/bug69752.phpt +++ b/ext/pdo_pgsql/tests/bug69752.phpt @@ -51,5 +51,5 @@ for($i = 0; $i < $max; $i++) { $pdo->rollBack(); echo "done\n" ?> ---EXPECTF-- +--EXPECT-- done diff --git a/ext/pdo_sqlite/tests/bug35336.phpt b/ext/pdo_sqlite/tests/bug35336.phpt index 59dbda38ba..ecb4213ad5 100644 --- a/ext/pdo_sqlite/tests/bug35336.phpt +++ b/ext/pdo_sqlite/tests/bug35336.phpt @@ -20,7 +20,7 @@ $rez = $a->query ("SELECT * FROM test")->fetchAll(PDO::FETCH_CLASS, 'EEE'); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- hello world hello world Done diff --git a/ext/pdo_sqlite/tests/bug50728.phpt b/ext/pdo_sqlite/tests/bug50728.phpt index 3dbbb1ffff..b00ea50cf0 100644 --- a/ext/pdo_sqlite/tests/bug50728.phpt +++ b/ext/pdo_sqlite/tests/bug50728.phpt @@ -12,5 +12,5 @@ try { var_dump($e->getCode()); } ?> ---EXPECTF-- +--EXPECT-- int(14) diff --git a/ext/pdo_sqlite/tests/bug60104.phpt b/ext/pdo_sqlite/tests/bug60104.phpt index fd36b57b76..7a71df8c68 100644 --- a/ext/pdo_sqlite/tests/bug60104.phpt +++ b/ext/pdo_sqlite/tests/bug60104.phpt @@ -17,5 +17,5 @@ setUp(); setUp(); echo "done"; ?> ---EXPECTF-- +--EXPECT-- done diff --git a/ext/pdo_sqlite/tests/bug66033.phpt b/ext/pdo_sqlite/tests/bug66033.phpt index 28da3b54bf..ebd519171a 100644 --- a/ext/pdo_sqlite/tests/bug66033.phpt +++ b/ext/pdo_sqlite/tests/bug66033.phpt @@ -29,5 +29,5 @@ try { var_dump($e->getMessage()); } ?> ---EXPECTF-- +--EXPECT-- string(4) "Blah" diff --git a/ext/pdo_sqlite/tests/bug70862.phpt b/ext/pdo_sqlite/tests/bug70862.phpt index 3df1e4f2bd..b0b133d870 100644 --- a/ext/pdo_sqlite/tests/bug70862.phpt +++ b/ext/pdo_sqlite/tests/bug70862.phpt @@ -31,6 +31,6 @@ var_dump($f); ?> +++DONE+++ ---EXPECTF-- +--EXPECT-- string(0) "" +++DONE+++ diff --git a/ext/pdo_sqlite/tests/bug_42589.phpt b/ext/pdo_sqlite/tests/bug_42589.phpt index abd5e8cea7..de614648a7 100644 --- a/ext/pdo_sqlite/tests/bug_42589.phpt +++ b/ext/pdo_sqlite/tests/bug_42589.phpt @@ -18,6 +18,6 @@ $meta2 = $result->getColumnMeta(1); var_dump(!empty($meta1['table']) && $meta1['table'] == 'test'); var_dump(!empty($meta2['table']) && $meta2['table'] == 'test'); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_createcollation.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_createcollation.phpt index c35e3637ac..efcce00e3d 100644 --- a/ext/pdo_sqlite/tests/pdo_sqlite_createcollation.phpt +++ b/ext/pdo_sqlite/tests/pdo_sqlite_createcollation.phpt @@ -29,7 +29,7 @@ foreach ($result as $row) { $db->query('DROP TABLE foobar'); ?> ---EXPECTF-- +--EXPECT-- 1 2 10 diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_createfunction_with_flags.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_createfunction_with_flags.phpt index 70ccdd0cd3..da6f3cf0fb 100644 --- a/ext/pdo_sqlite/tests/pdo_sqlite_createfunction_with_flags.phpt +++ b/ext/pdo_sqlite/tests/pdo_sqlite_createfunction_with_flags.phpt @@ -26,7 +26,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_transaction.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_transaction.phpt index 101cc73cb0..8cdaae16e6 100644 --- a/ext/pdo_sqlite/tests/pdo_sqlite_transaction.phpt +++ b/ext/pdo_sqlite/tests/pdo_sqlite_transaction.phpt @@ -24,5 +24,5 @@ var_dump($r->rowCount()); $db->query('DROP TABLE foobar'); ?> ---EXPECTF-- +--EXPECT-- int(0) diff --git a/ext/pgsql/tests/80_bug27597.phpt b/ext/pgsql/tests/80_bug27597.phpt index 7d5b5db890..df9d1c76cf 100644 --- a/ext/pgsql/tests/80_bug27597.phpt +++ b/ext/pgsql/tests/80_bug27597.phpt @@ -40,7 +40,7 @@ pg_close($dbh); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Array ( [id] => 0 diff --git a/ext/pgsql/tests/bug46408.phpt b/ext/pgsql/tests/bug46408.phpt index 5803347988..eef0a9f966 100644 --- a/ext/pgsql/tests/bug46408.phpt +++ b/ext/pgsql/tests/bug46408.phpt @@ -21,6 +21,6 @@ pg_close($dbh); echo "Done".PHP_EOL; ?> ---EXPECTF-- +--EXPECT-- 3,5 Done diff --git a/ext/pgsql/tests/bug47199.phpt b/ext/pgsql/tests/bug47199.phpt index faa787fd54..622630c057 100644 --- a/ext/pgsql/tests/bug47199.phpt +++ b/ext/pgsql/tests/bug47199.phpt @@ -35,7 +35,7 @@ pg_close($dbh); echo PHP_EOL."Done".PHP_EOL; ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> array(2) { diff --git a/ext/phar/tests/004.phpt b/ext/phar/tests/004.phpt index 963a9b45a0..b8ebd4137d 100644 --- a/ext/phar/tests/004.phpt +++ b/ext/phar/tests/004.phpt @@ -10,5 +10,5 @@ Phar::mapPhar('hio'); echo $e->getMessage(); } ?> ---EXPECTF-- +--EXPECT-- __HALT_COMPILER(); must be declared in a phar diff --git a/ext/phar/tests/028.phpt b/ext/phar/tests/028.phpt index 087f822777..95aa7b0887 100644 --- a/ext/phar/tests/028.phpt +++ b/ext/phar/tests/028.phpt @@ -32,7 +32,7 @@ include $pname . '/a.php'; ===DONE=== --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- +--EXPECT-- This is a This is b This is b/c diff --git a/ext/phar/tests/030.phpt b/ext/phar/tests/030.phpt index e1e94dba80..14df993e1b 100644 --- a/ext/phar/tests/030.phpt +++ b/ext/phar/tests/030.phpt @@ -37,7 +37,7 @@ echo $e->getMessage(),"\n"; <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- +--EXPECT-- This is a This is b This is b/c diff --git a/ext/phar/tests/bug54395.phpt b/ext/phar/tests/bug54395.phpt index 091ed326a8..a3d90a1b3e 100644 --- a/ext/phar/tests/bug54395.phpt +++ b/ext/phar/tests/bug54395.phpt @@ -12,5 +12,5 @@ try { } ?> ---EXPECTF-- +--EXPECT-- string(25) "Mounting of 1 to 1 failed" diff --git a/ext/phar/tests/bug60261.phpt b/ext/phar/tests/bug60261.phpt index 84d4203e10..31baa82394 100644 --- a/ext/phar/tests/bug60261.phpt +++ b/ext/phar/tests/bug60261.phpt @@ -13,5 +13,5 @@ try { } ?> ---EXPECTF-- +--EXPECT-- Phar::__construct() expects at least 1 parameter, 0 given diff --git a/ext/phar/tests/bug70019.phpt b/ext/phar/tests/bug70019.phpt index 85bf1780aa..4b0cd38260 100644 --- a/ext/phar/tests/bug70019.phpt +++ b/ext/phar/tests/bug70019.phpt @@ -19,6 +19,6 @@ $dir = __DIR__."/bug70019"; unlink("$dir/ThisIsATestFile.txt"); rmdir($dir); ?> ---EXPECTF-- +--EXPECT-- bool(true) ===DONE=== diff --git a/ext/phar/tests/bug70433.phpt b/ext/phar/tests/bug70433.phpt index cc8f438463..1bf979efad 100644 --- a/ext/phar/tests/bug70433.phpt +++ b/ext/phar/tests/bug70433.phpt @@ -10,7 +10,7 @@ $meta = $phar->getMetadata(); var_dump($meta); ?> DONE ---EXPECTF-- +--EXPECT-- object(PharData)#1 (3) { ["pathName":"SplFileInfo":private]=> string(0) "" diff --git a/ext/phar/tests/bug74196.phpt b/ext/phar/tests/bug74196.phpt index 7a8e9235a3..4cd238d654 100644 --- a/ext/phar/tests/bug74196.phpt +++ b/ext/phar/tests/bug74196.phpt @@ -18,6 +18,6 @@ var_dump(file_exists($decompressed_name)); unlink($decompressed_name); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) diff --git a/ext/phar/tests/cache_list/copyonwrite10.phar.phpt b/ext/phar/tests/cache_list/copyonwrite10.phar.phpt index 3d5b7fe784..660776af05 100644 --- a/ext/phar/tests/cache_list/copyonwrite10.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite10.phar.phpt @@ -8,7 +8,7 @@ phar.readonly=0 <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- files/write10.phar ---EXPECTF-- +--EXPECT-- string(214) "<?php $p = new Phar(__FILE__); var_dump($p->getStub()); diff --git a/ext/phar/tests/cache_list/copyonwrite11.phar.phpt b/ext/phar/tests/cache_list/copyonwrite11.phar.phpt index c3851e6494..eae6a8e26e 100644 --- a/ext/phar/tests/cache_list/copyonwrite11.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite11.phar.phpt @@ -8,7 +8,7 @@ phar.readonly=0 <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- files/write11.phar ---EXPECTF-- +--EXPECT-- string(174) "<?php $p = new Phar(__FILE__); var_dump($p->getStub()); diff --git a/ext/phar/tests/cache_list/copyonwrite13.phar.phpt b/ext/phar/tests/cache_list/copyonwrite13.phar.phpt index fc47174d2b..bbb3ab5aa9 100644 --- a/ext/phar/tests/cache_list/copyonwrite13.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite13.phar.phpt @@ -9,7 +9,7 @@ phar.readonly=0 <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?> --FILE_EXTERNAL-- files/write13.phar ---EXPECTF-- +--EXPECT-- bool(false) bool(true) ok
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/copyonwrite14.phar.phpt b/ext/phar/tests/cache_list/copyonwrite14.phar.phpt index 11201ac989..9e10b31591 100644 --- a/ext/phar/tests/cache_list/copyonwrite14.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite14.phar.phpt @@ -9,7 +9,7 @@ phar.readonly=0 <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?> --FILE_EXTERNAL-- files/write14.phar ---EXPECTF-- +--EXPECT-- bool(true) bool(false) ok
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/copyonwrite15.phar.phpt b/ext/phar/tests/cache_list/copyonwrite15.phar.phpt index 6e46289227..a74439ddeb 100644 --- a/ext/phar/tests/cache_list/copyonwrite15.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite15.phar.phpt @@ -8,7 +8,7 @@ phar.readonly=0 <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- files/write15.phar ---EXPECTF-- +--EXPECT-- bool(false) bool(true) ok
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/copyonwrite16.phar.phpt b/ext/phar/tests/cache_list/copyonwrite16.phar.phpt index f17784c355..5e8744e9f3 100644 --- a/ext/phar/tests/cache_list/copyonwrite16.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite16.phar.phpt @@ -8,7 +8,7 @@ phar.readonly=0 <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- files/write16.phar ---EXPECTF-- +--EXPECT-- bool(true) bool(false) ok
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/copyonwrite18.phar.phpt b/ext/phar/tests/cache_list/copyonwrite18.phar.phpt index 3e65f5a124..751194b330 100644 --- a/ext/phar/tests/cache_list/copyonwrite18.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite18.phar.phpt @@ -8,7 +8,7 @@ phar.readonly=0 <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- files/write18.phar ---EXPECTF-- +--EXPECT-- 100666 100444 ok
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/copyonwrite20.phar.phpt b/ext/phar/tests/cache_list/copyonwrite20.phar.phpt index acce57415c..aa0c9653ee 100644 --- a/ext/phar/tests/cache_list/copyonwrite20.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite20.phar.phpt @@ -8,7 +8,7 @@ phar.readonly=0 <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- files/write20.phar ---EXPECTF-- +--EXPECT-- string(2) "hi" NULL ok
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/copyonwrite21.phar.phpt b/ext/phar/tests/cache_list/copyonwrite21.phar.phpt index 8960ea7171..6b32520f2d 100644 --- a/ext/phar/tests/cache_list/copyonwrite21.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite21.phar.phpt @@ -9,7 +9,7 @@ phar.readonly=0 <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?> --FILE_EXTERNAL-- files/write21.phar ---EXPECTF-- +--EXPECT-- bool(false) bool(true) ok
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/copyonwrite22.phar.phpt b/ext/phar/tests/cache_list/copyonwrite22.phar.phpt index 7cba216395..141f9c9ad7 100644 --- a/ext/phar/tests/cache_list/copyonwrite22.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite22.phar.phpt @@ -9,7 +9,7 @@ phar.readonly=0 <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?> --FILE_EXTERNAL-- files/write22.phar ---EXPECTF-- +--EXPECT-- bool(true) bool(false) ok
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/copyonwrite23.phar.phpt b/ext/phar/tests/cache_list/copyonwrite23.phar.phpt index 292e5af668..c6025fd125 100644 --- a/ext/phar/tests/cache_list/copyonwrite23.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite23.phar.phpt @@ -9,7 +9,7 @@ phar.readonly=0 <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?> --FILE_EXTERNAL-- files/write23.phar ---EXPECTF-- +--EXPECT-- bool(true) bool(false) bool(false) diff --git a/ext/phar/tests/cache_list/copyonwrite24.phar.phpt b/ext/phar/tests/cache_list/copyonwrite24.phar.phpt index 69197f2b4b..3bf0e11c3d 100644 --- a/ext/phar/tests/cache_list/copyonwrite24.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite24.phar.phpt @@ -9,7 +9,7 @@ phar.readonly=0 <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?> --FILE_EXTERNAL-- files/write24.phar ---EXPECTF-- +--EXPECT-- bool(false) bool(true) ok
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/copyonwrite25.phar.phpt b/ext/phar/tests/cache_list/copyonwrite25.phar.phpt index b661cb61c1..13cae01e85 100644 --- a/ext/phar/tests/cache_list/copyonwrite25.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite25.phar.phpt @@ -9,7 +9,7 @@ phar.readonly=0 <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?> --FILE_EXTERNAL-- files/write25.phar ---EXPECTF-- +--EXPECT-- bool(false) bool(true) <?php __HALT_COMPILER(); diff --git a/ext/phar/tests/cache_list/copyonwrite9.phar.phpt b/ext/phar/tests/cache_list/copyonwrite9.phar.phpt index ffda9565bd..ee0eb34937 100644 --- a/ext/phar/tests/cache_list/copyonwrite9.phar.phpt +++ b/ext/phar/tests/cache_list/copyonwrite9.phar.phpt @@ -8,7 +8,7 @@ phar.readonly=0 <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE_EXTERNAL-- files/write9.phar ---EXPECTF-- +--EXPECT-- string(188) "<?php $p = new Phar(__FILE__); var_dump($p->getStub()); diff --git a/ext/phar/tests/cache_list/frontcontroller24.phpt b/ext/phar/tests/cache_list/frontcontroller24.phpt index 561826bd78..cd7c990c29 100644 --- a/ext/phar/tests/cache_list/frontcontroller24.phpt +++ b/ext/phar/tests/cache_list/frontcontroller24.phpt @@ -13,5 +13,5 @@ PATH_INFO=/unknown/file files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 ---EXPECTF-- +--EXPECT-- My 404 is rawesome
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/frontcontroller25.phpt b/ext/phar/tests/cache_list/frontcontroller25.phpt index a8779392b6..3ec1d52d54 100644 --- a/ext/phar/tests/cache_list/frontcontroller25.phpt +++ b/ext/phar/tests/cache_list/frontcontroller25.phpt @@ -13,6 +13,6 @@ PATH_INFO=/a1.phps/extra/stuff files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 ---EXPECTF-- +--EXPECT-- string(42) "/frontcontroller25.php/a1.phps/extra/stuff" string(12) "/extra/stuff"
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/frontcontroller26.phpt b/ext/phar/tests/cache_list/frontcontroller26.phpt index 86a1c1444c..b7d1270107 100644 --- a/ext/phar/tests/cache_list/frontcontroller26.phpt +++ b/ext/phar/tests/cache_list/frontcontroller26.phpt @@ -12,5 +12,5 @@ PATH_INFO=/unknown.ext files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: application/octet-stream ---EXPECTF-- +--EXPECT-- <?php var_dump("hi");
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/frontcontroller27.phpt b/ext/phar/tests/cache_list/frontcontroller27.phpt index 4a76e02eae..1e0898dffc 100644 --- a/ext/phar/tests/cache_list/frontcontroller27.phpt +++ b/ext/phar/tests/cache_list/frontcontroller27.phpt @@ -13,5 +13,5 @@ PATH_INFO=/noext files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: text/plain;charset=UTF-8 ---EXPECTF-- +--EXPECT-- hi
\ No newline at end of file diff --git a/ext/phar/tests/cache_list/frontcontroller33.phpt b/ext/phar/tests/cache_list/frontcontroller33.phpt index 9573854823..65e0733670 100644 --- a/ext/phar/tests/cache_list/frontcontroller33.phpt +++ b/ext/phar/tests/cache_list/frontcontroller33.phpt @@ -12,5 +12,5 @@ REQUEST_URI=/frontcontroller33.php Content-type: text/html; charset=UTF-8 --FILE_EXTERNAL-- files/frontcontroller18.phar ---EXPECTF-- +--EXPECT-- phar error: rewrite callback must return a string or false
\ No newline at end of file diff --git a/ext/phar/tests/frontcontroller24.phpt b/ext/phar/tests/frontcontroller24.phpt index 767971ee91..69cd9f92b6 100644 --- a/ext/phar/tests/frontcontroller24.phpt +++ b/ext/phar/tests/frontcontroller24.phpt @@ -12,5 +12,5 @@ PATH_INFO=/unknown/file files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 ---EXPECTF-- +--EXPECT-- My 404 is rawesome
\ No newline at end of file diff --git a/ext/phar/tests/frontcontroller25.phpt b/ext/phar/tests/frontcontroller25.phpt index 9b383de413..1ef9117550 100644 --- a/ext/phar/tests/frontcontroller25.phpt +++ b/ext/phar/tests/frontcontroller25.phpt @@ -12,6 +12,6 @@ PATH_INFO=/a1.phps/extra/stuff files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 ---EXPECTF-- +--EXPECT-- string(42) "/frontcontroller25.php/a1.phps/extra/stuff" string(12) "/extra/stuff"
\ No newline at end of file diff --git a/ext/phar/tests/frontcontroller26.phpt b/ext/phar/tests/frontcontroller26.phpt index a8097b0886..e66dd2036b 100644 --- a/ext/phar/tests/frontcontroller26.phpt +++ b/ext/phar/tests/frontcontroller26.phpt @@ -10,5 +10,5 @@ PATH_INFO=/unknown.ext files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: application/octet-stream ---EXPECTF-- +--EXPECT-- <?php var_dump("hi");
\ No newline at end of file diff --git a/ext/phar/tests/frontcontroller27.phpt b/ext/phar/tests/frontcontroller27.phpt index 16203f6feb..9aa82f1349 100644 --- a/ext/phar/tests/frontcontroller27.phpt +++ b/ext/phar/tests/frontcontroller27.phpt @@ -12,5 +12,5 @@ PATH_INFO=/noext files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: text/plain;charset=UTF-8 ---EXPECTF-- +--EXPECT-- hi
\ No newline at end of file diff --git a/ext/phar/tests/frontcontroller33.phpt b/ext/phar/tests/frontcontroller33.phpt index 8593e31766..6247a4ebfc 100644 --- a/ext/phar/tests/frontcontroller33.phpt +++ b/ext/phar/tests/frontcontroller33.phpt @@ -11,5 +11,5 @@ REQUEST_URI=/frontcontroller33.php Content-type: text/html; charset=UTF-8 --FILE_EXTERNAL-- files/frontcontroller18.phar ---EXPECTF-- +--EXPECT-- phar error: rewrite callback must return a string or false
\ No newline at end of file diff --git a/ext/phar/tests/ini_set.phpt b/ext/phar/tests/ini_set.phpt index 4ddc9794f9..6bba43991a 100644 --- a/ext/phar/tests/ini_set.phpt +++ b/ext/phar/tests/ini_set.phpt @@ -19,7 +19,7 @@ var_dump(ini_get('phar.require_hash')); var_dump(ini_get('phar.readonly')); __HALT_COMPILER(); ?> ---EXPECTF-- +--EXPECT-- string(1) "1" string(1) "1" string(1) "1" diff --git a/ext/phar/tests/open_for_write_existing.phpt b/ext/phar/tests/open_for_write_existing.phpt index 2a3ec8b824..e9e2c05b9e 100644 --- a/ext/phar/tests/open_for_write_existing.phpt +++ b/ext/phar/tests/open_for_write_existing.phpt @@ -26,6 +26,6 @@ include $pname . '/b/c.php'; ===DONE=== --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- +--EXPECT-- extra ===DONE=== diff --git a/ext/phar/tests/phar_magic.phpt b/ext/phar/tests/phar_magic.phpt index f6a0a675ef..c2b25685f1 100644 --- a/ext/phar/tests/phar_magic.phpt +++ b/ext/phar/tests/phar_magic.phpt @@ -24,7 +24,7 @@ include $fname; unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); __HALT_COMPILER(); ?> ---EXPECTF-- +--EXPECT-- in b <?php include "b/c.php"; in d diff --git a/ext/phar/tests/phar_oo_008.phpt b/ext/phar/tests/phar_oo_008.phpt index dc9ab7f9ca..b0f518d39b 100644 --- a/ext/phar/tests/phar_oo_008.phpt +++ b/ext/phar/tests/phar_oo_008.phpt @@ -85,7 +85,7 @@ foreach($v as $k => $d) unlink(dirname(__FILE__) . '/files/phar_oo_008.phar.php'); __halt_compiler(); ?> ---EXPECTF-- +--EXPECT-- ===1=== 0=>1,2,3 diff --git a/ext/phar/tests/phar_oo_009.phpt b/ext/phar/tests/phar_oo_009.phpt index 3c842fabed..f651a52563 100644 --- a/ext/phar/tests/phar_oo_009.phpt +++ b/ext/phar/tests/phar_oo_009.phpt @@ -39,7 +39,7 @@ foreach($f as $k => $v) unlink(dirname(__FILE__) . '/files/phar_oo_009.phar.php'); __halt_compiler(); ?> ---EXPECTF-- +--EXPECT-- 0=>1,2,3 1=>2,a,b 2=>3,"c","'e'" diff --git a/ext/phar/tests/phar_oo_010.phpt b/ext/phar/tests/phar_oo_010.phpt index ca3abddfce..0869828f8f 100644 --- a/ext/phar/tests/phar_oo_010.phpt +++ b/ext/phar/tests/phar_oo_010.phpt @@ -38,7 +38,7 @@ var_dump(isset($phar['b'])); unlink(dirname(__FILE__) . '/files/phar_oo_010.phar.php'); __halt_compiler(); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/phar/tests/phar_oo_011b.phpt b/ext/phar/tests/phar_oo_011b.phpt index d36c083dff..b7a1c420f1 100644 --- a/ext/phar/tests/phar_oo_011b.phpt +++ b/ext/phar/tests/phar_oo_011b.phpt @@ -33,6 +33,6 @@ catch (BadMethodCallException $e) unlink(dirname(__FILE__) . '/files/phar_oo_011b.phar.php'); __halt_compiler(); ?> ---EXPECTF-- +--EXPECT-- Exception: Write operations disabled by the php.ini setting phar.readonly ===DONE=== diff --git a/ext/phar/tests/phar_oo_012b.phpt b/ext/phar/tests/phar_oo_012b.phpt index c650a3ceff..cb17a601e4 100644 --- a/ext/phar/tests/phar_oo_012b.phpt +++ b/ext/phar/tests/phar_oo_012b.phpt @@ -36,6 +36,6 @@ catch (BadMethodCallException $e) unlink(dirname(__FILE__) . '/files/phar_oo_012b.phar.php'); __halt_compiler(); ?> ---EXPECTF-- +--EXPECT-- Exception: Write operations disabled by the php.ini setting phar.readonly ===DONE=== diff --git a/ext/phar/tests/phar_oo_compressallbz2.phpt b/ext/phar/tests/phar_oo_compressallbz2.phpt index 3f52227194..f6bf3f23a0 100644 --- a/ext/phar/tests/phar_oo_compressallbz2.phpt +++ b/ext/phar/tests/phar_oo_compressallbz2.phpt @@ -47,7 +47,7 @@ var_dump($phar['b']->isCompressed(Phar::BZ2)); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- +--EXPECT-- string(1) "a" bool(false) string(1) "b" diff --git a/ext/phar/tests/phar_oo_compressallgz.phpt b/ext/phar/tests/phar_oo_compressallgz.phpt index 55e7435f95..8a23e7de84 100644 --- a/ext/phar/tests/phar_oo_compressallgz.phpt +++ b/ext/phar/tests/phar_oo_compressallgz.phpt @@ -51,7 +51,7 @@ echo $e->getMessage() . "\n"; unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- +--EXPECT-- string(1) "a" bool(false) string(1) "b" diff --git a/ext/phar/tests/phar_oo_compressed_001.phpt b/ext/phar/tests/phar_oo_compressed_001.phpt index af02012573..4bd04dec37 100644 --- a/ext/phar/tests/phar_oo_compressed_001.phpt +++ b/ext/phar/tests/phar_oo_compressed_001.phpt @@ -50,7 +50,7 @@ var_dump($phar['d']->isCompressed()); <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- +--EXPECT-- string(1) "a" bool(false) string(1) "b" diff --git a/ext/phar/tests/phar_oo_compressed_001b.phpt b/ext/phar/tests/phar_oo_compressed_001b.phpt index 6d4c732862..97c3cbb7ca 100644 --- a/ext/phar/tests/phar_oo_compressed_001b.phpt +++ b/ext/phar/tests/phar_oo_compressed_001b.phpt @@ -50,7 +50,7 @@ var_dump($phar['d']->isCompressed()); <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- +--EXPECT-- string(1) "a" bool(false) string(1) "b" diff --git a/ext/phar/tests/phar_oo_compressed_002.phpt b/ext/phar/tests/phar_oo_compressed_002.phpt index d03d6f1a98..1a539ac803 100644 --- a/ext/phar/tests/phar_oo_compressed_002.phpt +++ b/ext/phar/tests/phar_oo_compressed_002.phpt @@ -53,7 +53,7 @@ var_dump($phar['e']->isCompressed()); <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- +--EXPECT-- string(1) "a" bool(false) string(1) "b" diff --git a/ext/phar/tests/phar_oo_compressed_002b.phpt b/ext/phar/tests/phar_oo_compressed_002b.phpt index 0e167012b7..278137c676 100644 --- a/ext/phar/tests/phar_oo_compressed_002b.phpt +++ b/ext/phar/tests/phar_oo_compressed_002b.phpt @@ -53,7 +53,7 @@ var_dump($phar['e']->isCompressed()); <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- +--EXPECT-- string(1) "a" bool(false) string(1) "b" diff --git a/ext/phar/tests/phar_oo_getmodified.phpt b/ext/phar/tests/phar_oo_getmodified.phpt index d531393281..9ed19966b3 100644 --- a/ext/phar/tests/phar_oo_getmodified.phpt +++ b/ext/phar/tests/phar_oo_getmodified.phpt @@ -30,7 +30,7 @@ var_dump($phar->getModified()); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(true) ===DONE=== diff --git a/ext/phar/tests/phar_oo_uncompressall.phpt b/ext/phar/tests/phar_oo_uncompressall.phpt index 19cf953197..ef348563f1 100644 --- a/ext/phar/tests/phar_oo_uncompressall.phpt +++ b/ext/phar/tests/phar_oo_uncompressall.phpt @@ -55,7 +55,7 @@ var_dump($phar['a']->isCompressed()); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> ---EXPECTF-- +--EXPECT-- string(1) "a" bool(false) string(1) "b" diff --git a/ext/phar/tests/pharfileinfo_destruct.phpt b/ext/phar/tests/pharfileinfo_destruct.phpt index 48a58c0d09..23e7042fa4 100644 --- a/ext/phar/tests/pharfileinfo_destruct.phpt +++ b/ext/phar/tests/pharfileinfo_destruct.phpt @@ -21,5 +21,5 @@ unset($b); ===DONE=== --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?> ---EXPECTF-- +--EXPECT-- ===DONE===
\ No newline at end of file diff --git a/ext/phar/tests/tar/033.phpt b/ext/phar/tests/tar/033.phpt index 29223e49e3..1054cb1f66 100644 --- a/ext/phar/tests/tar/033.phpt +++ b/ext/phar/tests/tar/033.phpt @@ -39,7 +39,7 @@ try { <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(true) bool(false) diff --git a/ext/phar/tests/tar/create_new_and_modify.phpt b/ext/phar/tests/tar/create_new_and_modify.phpt index e8f0ecf061..8620ca0520 100644 --- a/ext/phar/tests/tar/create_new_and_modify.phpt +++ b/ext/phar/tests/tar/create_new_and_modify.phpt @@ -43,7 +43,7 @@ include $pname . '/b.php'; ===DONE=== --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.php'); ?> ---EXPECTF-- +--EXPECT-- bool(true) brand new! bool(true) diff --git a/ext/phar/tests/tar/phar_magic.phpt b/ext/phar/tests/tar/phar_magic.phpt index 1bb336f96c..11a36fd930 100644 --- a/ext/phar/tests/tar/phar_magic.phpt +++ b/ext/phar/tests/tar/phar_magic.phpt @@ -25,7 +25,7 @@ include $fname; unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.php'); __HALT_COMPILER(); ?> ---EXPECTF-- +--EXPECT-- bool(true) in b <?php include "b/c.php"; diff --git a/ext/phar/tests/tar/tar_makebz2.phpt b/ext/phar/tests/tar/tar_makebz2.phpt index ed614d894b..91b0da7c72 100644 --- a/ext/phar/tests/tar/tar_makebz2.phpt +++ b/ext/phar/tests/tar/tar_makebz2.phpt @@ -32,7 +32,7 @@ var_dump($phar2->isCompressed() == Phar::BZ2); @unlink(dirname(__FILE__) . '/tar_makebz2.phar.tar.bz2'); @unlink(dirname(__FILE__) . '/tar_makebz2_b.phar.tar.bz2'); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/phar/tests/tar/tar_makegz.phpt b/ext/phar/tests/tar/tar_makegz.phpt index 7d6ea89fd0..93d515280a 100644 --- a/ext/phar/tests/tar/tar_makegz.phpt +++ b/ext/phar/tests/tar/tar_makegz.phpt @@ -33,7 +33,7 @@ var_dump($phar2->isCompressed() == Phar::GZ); @unlink(dirname(__FILE__) . '/tar_makegz.phar.tar.gz'); @unlink(dirname(__FILE__) . '/tar_makegz_b.phar.tar.gz'); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/phar/tests/zip/create_new_and_modify.phpt b/ext/phar/tests/zip/create_new_and_modify.phpt index 0941bb6e61..3ff2346f67 100644 --- a/ext/phar/tests/zip/create_new_and_modify.phpt +++ b/ext/phar/tests/zip/create_new_and_modify.phpt @@ -43,7 +43,7 @@ include $pname . '/b.php'; ===DONE=== --CLEAN-- <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); ?> ---EXPECTF-- +--EXPECT-- bool(true) brand new! bool(true) diff --git a/ext/phar/tests/zip/phar_oo_compressallbz2.phpt b/ext/phar/tests/zip/phar_oo_compressallbz2.phpt index d6b0a8f4cf..7632bd03b3 100644 --- a/ext/phar/tests/zip/phar_oo_compressallbz2.phpt +++ b/ext/phar/tests/zip/phar_oo_compressallbz2.phpt @@ -48,7 +48,7 @@ var_dump($c['a']->isCompressed(Phar::BZ2)); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> ---EXPECTF-- +--EXPECT-- string(1) "a" bool(false) string(1) "b" diff --git a/ext/phar/tests/zip/phar_oo_compressallgz.phpt b/ext/phar/tests/zip/phar_oo_compressallgz.phpt index 47dddac487..97b9e19d6e 100644 --- a/ext/phar/tests/zip/phar_oo_compressallgz.phpt +++ b/ext/phar/tests/zip/phar_oo_compressallgz.phpt @@ -39,7 +39,7 @@ var_dump($phar['c']->isCompressed(Phar::GZ)); <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php'); ?> ---EXPECTF-- +--EXPECT-- string(1) "a" bool(false) string(1) "b" diff --git a/ext/posix/tests/posix_errno_basic.phpt b/ext/posix/tests/posix_errno_basic.phpt index cd94a97515..5835a2e1ef 100644 --- a/ext/posix/tests/posix_errno_basic.phpt +++ b/ext/posix/tests/posix_errno_basic.phpt @@ -17,6 +17,6 @@ echo "*** Test by calling method or function with its expected arguments ***\n"; var_dump(posix_errno()); ?> ---EXPECTF-- +--EXPECT-- *** Test by calling method or function with its expected arguments *** int(0) diff --git a/ext/posix/tests/posix_errno_variation1.phpt b/ext/posix/tests/posix_errno_variation1.phpt index b57b7c0cac..0f464a5b89 100644 --- a/ext/posix/tests/posix_errno_variation1.phpt +++ b/ext/posix/tests/posix_errno_variation1.phpt @@ -18,6 +18,6 @@ posix_setuid(0); var_dump(posix_errno()); ?> ---EXPECTF-- +--EXPECT-- *** Test by calling function with permission error *** int(1) diff --git a/ext/posix/tests/posix_errno_variation2.phpt b/ext/posix/tests/posix_errno_variation2.phpt index ad3aa311ea..93ac96fb71 100644 --- a/ext/posix/tests/posix_errno_variation2.phpt +++ b/ext/posix/tests/posix_errno_variation2.phpt @@ -25,6 +25,6 @@ posix_kill($pid, SIGKILL); var_dump(posix_errno()); ?> ---EXPECTF-- +--EXPECT-- *** Test by calling function with pid error *** int(3) diff --git a/ext/posix/tests/posix_getsid.phpt b/ext/posix/tests/posix_getsid.phpt index 62ed3c9ebd..1f57690d23 100644 --- a/ext/posix/tests/posix_getsid.phpt +++ b/ext/posix/tests/posix_getsid.phpt @@ -20,7 +20,7 @@ var_dump( is_long(posix_getsid($pid)) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing posix_getsid() : function test *** -- Testing posix_getsid() function with current process pid -- diff --git a/ext/posix/tests/posix_setegid_basic.phpt b/ext/posix/tests/posix_setegid_basic.phpt index 729abc5f54..0bf8ed5480 100644 --- a/ext/posix/tests/posix_setegid_basic.phpt +++ b/ext/posix/tests/posix_setegid_basic.phpt @@ -8,5 +8,5 @@ Test function posix_setegid() by calling it with its expected arguments <?php var_dump(posix_setegid(posix_getegid())); ?> ---EXPECTF-- +--EXPECT-- bool(true)
\ No newline at end of file diff --git a/ext/posix/tests/posix_seteuid_basic.phpt b/ext/posix/tests/posix_seteuid_basic.phpt index 204ebe8d07..7a185828f6 100644 --- a/ext/posix/tests/posix_seteuid_basic.phpt +++ b/ext/posix/tests/posix_seteuid_basic.phpt @@ -15,5 +15,5 @@ $myuid = posix_geteuid(); $uid = var_dump(posix_seteuid( $myuid ) ); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/posix/tests/posix_seteuid_variation2.phpt b/ext/posix/tests/posix_seteuid_variation2.phpt index bcba394385..b466bbb5c4 100644 --- a/ext/posix/tests/posix_seteuid_variation2.phpt +++ b/ext/posix/tests/posix_seteuid_variation2.phpt @@ -29,7 +29,7 @@ foreach ( $variation_array as $var ) { var_dump(posix_seteuid( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with boolean values *** bool(false) bool(false) diff --git a/ext/posix/tests/posix_seteuid_variation5.phpt b/ext/posix/tests/posix_seteuid_variation5.phpt index 8e43e1a152..dac4e475f2 100644 --- a/ext/posix/tests/posix_seteuid_variation5.phpt +++ b/ext/posix/tests/posix_seteuid_variation5.phpt @@ -28,7 +28,7 @@ foreach ( $variation_array as $var ) { var_dump(posix_seteuid( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with int values *** bool(false) bool(false) diff --git a/ext/posix/tests/posix_setgid_basic.phpt b/ext/posix/tests/posix_setgid_basic.phpt index da3751fea4..28958c6bc5 100644 --- a/ext/posix/tests/posix_setgid_basic.phpt +++ b/ext/posix/tests/posix_setgid_basic.phpt @@ -20,7 +20,7 @@ var_dump(posix_setgid( $gid ) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Test by calling method or function with its expected arguments *** bool(true) ===DONE=== diff --git a/ext/posix/tests/posix_setgid_variation2.phpt b/ext/posix/tests/posix_setgid_variation2.phpt index b8e50bad4d..6832abb923 100644 --- a/ext/posix/tests/posix_setgid_variation2.phpt +++ b/ext/posix/tests/posix_setgid_variation2.phpt @@ -30,7 +30,7 @@ foreach ( $variation_array as $var ) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with boolean values *** bool(false) bool(false) diff --git a/ext/posix/tests/posix_setgid_variation5.phpt b/ext/posix/tests/posix_setgid_variation5.phpt index 49e98ec8eb..721ca3c475 100644 --- a/ext/posix/tests/posix_setgid_variation5.phpt +++ b/ext/posix/tests/posix_setgid_variation5.phpt @@ -29,7 +29,7 @@ foreach ( $variation_array as $var ) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with int values *** bool(false) bool(false) diff --git a/ext/posix/tests/posix_setrlimit.phpt b/ext/posix/tests/posix_setrlimit.phpt index 4806fcfb4d..818ac73b9e 100644 --- a/ext/posix/tests/posix_setrlimit.phpt +++ b/ext/posix/tests/posix_setrlimit.phpt @@ -12,7 +12,7 @@ var_dump(posix_setrlimit(POSIX_RLIMIT_NOFILE, 128, 128)); var_dump(posix_setrlimit(POSIX_RLIMIT_NOFILE, 129, 128)); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(false) diff --git a/ext/posix/tests/posix_setuid_basic.phpt b/ext/posix/tests/posix_setuid_basic.phpt index 986b0be62c..8539e47e7a 100644 --- a/ext/posix/tests/posix_setuid_basic.phpt +++ b/ext/posix/tests/posix_setuid_basic.phpt @@ -15,5 +15,5 @@ $myuid = posix_getuid(); $uid = var_dump(posix_setuid( $myuid ) ); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/posix/tests/posix_setuid_variation2.phpt b/ext/posix/tests/posix_setuid_variation2.phpt index 77505a64f7..bf0c5f448d 100644 --- a/ext/posix/tests/posix_setuid_variation2.phpt +++ b/ext/posix/tests/posix_setuid_variation2.phpt @@ -29,7 +29,7 @@ foreach ( $variation_array as $var ) { var_dump(posix_setuid( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with boolean values *** bool(false) bool(false) diff --git a/ext/posix/tests/posix_setuid_variation5.phpt b/ext/posix/tests/posix_setuid_variation5.phpt index a4ebe63395..1bb485f40f 100644 --- a/ext/posix/tests/posix_setuid_variation5.phpt +++ b/ext/posix/tests/posix_setuid_variation5.phpt @@ -28,7 +28,7 @@ foreach ( $variation_array as $var ) { var_dump(posix_setuid( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with int values *** bool(false) bool(false) diff --git a/ext/posix/tests/posix_ttyname.phpt b/ext/posix/tests/posix_ttyname.phpt index 76dff4e4c0..8164b1d44c 100644 --- a/ext/posix/tests/posix_ttyname.phpt +++ b/ext/posix/tests/posix_ttyname.phpt @@ -19,7 +19,7 @@ PHP Testfest Berlin 2009-05-10 var_dump(posix_ttyname(STDOUT)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/posix/tests/posix_ttyname_variation1.phpt b/ext/posix/tests/posix_ttyname_variation1.phpt index efbf64a4b7..f11721a77e 100644 --- a/ext/posix/tests/posix_ttyname_variation1.phpt +++ b/ext/posix/tests/posix_ttyname_variation1.phpt @@ -33,7 +33,7 @@ foreach ( $variation_array as $var ) { var_dump(posix_ttyname( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with array values *** bool(false) bool(false) diff --git a/ext/posix/tests/posix_ttyname_variation2.phpt b/ext/posix/tests/posix_ttyname_variation2.phpt index 324614275f..88c67c5141 100644 --- a/ext/posix/tests/posix_ttyname_variation2.phpt +++ b/ext/posix/tests/posix_ttyname_variation2.phpt @@ -30,7 +30,7 @@ foreach ( $variation_array as $var ) { var_dump(posix_ttyname( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with boolean values *** bool(false) bool(false) diff --git a/ext/posix/tests/posix_ttyname_variation3.phpt b/ext/posix/tests/posix_ttyname_variation3.phpt index a3ebc8cc5d..89f5085329 100644 --- a/ext/posix/tests/posix_ttyname_variation3.phpt +++ b/ext/posix/tests/posix_ttyname_variation3.phpt @@ -35,7 +35,7 @@ foreach ( $variation_array as $var ) { var_dump(posix_ttyname( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with emptyUnsetUndefNull values *** bool(false) bool(false) diff --git a/ext/posix/tests/posix_ttyname_variation4.phpt b/ext/posix/tests/posix_ttyname_variation4.phpt index da999341e5..8664b0dd10 100644 --- a/ext/posix/tests/posix_ttyname_variation4.phpt +++ b/ext/posix/tests/posix_ttyname_variation4.phpt @@ -31,7 +31,7 @@ foreach ( $variation_array as $var ) { var_dump(posix_ttyname( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with float values *** bool(false) bool(false) diff --git a/ext/posix/tests/posix_ttyname_variation5.phpt b/ext/posix/tests/posix_ttyname_variation5.phpt index 7290f07dc3..472af33028 100644 --- a/ext/posix/tests/posix_ttyname_variation5.phpt +++ b/ext/posix/tests/posix_ttyname_variation5.phpt @@ -28,7 +28,7 @@ foreach ( $variation_array as $var ) { var_dump(posix_ttyname( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with int values *** bool(false) bool(false) diff --git a/ext/posix/tests/posix_ttyname_variation7.phpt b/ext/posix/tests/posix_ttyname_variation7.phpt index 8a92ef627e..348248607a 100644 --- a/ext/posix/tests/posix_ttyname_variation7.phpt +++ b/ext/posix/tests/posix_ttyname_variation7.phpt @@ -34,7 +34,7 @@ foreach ( $variation_array as $var ) { var_dump(posix_ttyname( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with string values *** bool(false) bool(false) diff --git a/ext/readline/tests/libedit_callback_handler_remove_001.phpt b/ext/readline/tests/libedit_callback_handler_remove_001.phpt index b7eaa2103f..6b0d0d7887 100644 --- a/ext/readline/tests/libedit_callback_handler_remove_001.phpt +++ b/ext/readline/tests/libedit_callback_handler_remove_001.phpt @@ -15,7 +15,7 @@ var_dump(readline_callback_handler_install('testing: ', 'foo')); var_dump(readline_callback_handler_remove()); ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(true) bool(true) diff --git a/ext/readline/tests/libedit_info_001-win32.phpt b/ext/readline/tests/libedit_info_001-win32.phpt index 5d43921c60..d91bfbafb1 100644 --- a/ext/readline/tests/libedit_info_001-win32.phpt +++ b/ext/readline/tests/libedit_info_001-win32.phpt @@ -21,7 +21,7 @@ var_dump(readline_info('attempted_completion_over',1)); var_dump(readline_info('attempted_completion_over')); ?> ---EXPECTF-- +--EXPECT-- array(4) { ["line_buffer"]=> string(0) "" diff --git a/ext/reflection/tests/002.phpt b/ext/reflection/tests/002.phpt index cbd7319731..3a51990cf6 100644 --- a/ext/reflection/tests/002.phpt +++ b/ext/reflection/tests/002.phpt @@ -48,7 +48,7 @@ var_dump($r->bar); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ReflectionMethodEx::__construct string(26) "ReflectionFunctionAbstract" string(7) "getName" diff --git a/ext/reflection/tests/008.phpt b/ext/reflection/tests/008.phpt index 2abdcdb57b..a5c3ef13e1 100644 --- a/ext/reflection/tests/008.phpt +++ b/ext/reflection/tests/008.phpt @@ -26,7 +26,7 @@ foreach ($a as $key=>$val) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(20) "Invalid method name " string(21) "Invalid method name 1" string(21) "Class does not exist" diff --git a/ext/reflection/tests/027.phpt b/ext/reflection/tests/027.phpt index 06db60b8ec..e750682ab6 100644 --- a/ext/reflection/tests/027.phpt +++ b/ext/reflection/tests/027.phpt @@ -18,5 +18,5 @@ try { echo $e->getMessage(); } ?> ---EXPECTF-- +--EXPECT-- Cannot fetch information from a terminated Generator diff --git a/ext/reflection/tests/028.phpt b/ext/reflection/tests/028.phpt index 5f1e7a2faa..ed6950fce3 100644 --- a/ext/reflection/tests/028.phpt +++ b/ext/reflection/tests/028.phpt @@ -16,5 +16,5 @@ try { echo "Done!\n"; } ?> ---EXPECTF-- +--EXPECT-- Done! diff --git a/ext/reflection/tests/ReflectionClass_getConstant_basic.phpt b/ext/reflection/tests/ReflectionClass_getConstant_basic.phpt index 6e051113d5..cbed1252fa 100644 --- a/ext/reflection/tests/ReflectionClass_getConstant_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_getConstant_basic.phpt @@ -23,7 +23,7 @@ foreach($classes as $class) { var_dump($rc->getConstant('doesntexist')); } ?> ---EXPECTF-- +--EXPECT-- Reflecting on class C: string(12) "hello from C" bool(false) diff --git a/ext/reflection/tests/ReflectionClass_getConstants_basic.phpt b/ext/reflection/tests/ReflectionClass_getConstants_basic.phpt index 9abdcc801a..a9c0cd4225 100644 --- a/ext/reflection/tests/ReflectionClass_getConstants_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_getConstants_basic.phpt @@ -22,7 +22,7 @@ foreach($classes as $class) { var_dump($rc->getConstants()); } ?> ---EXPECTF-- +--EXPECT-- Constants from class C: array(1) { ["a"]=> diff --git a/ext/reflection/tests/ReflectionClass_getDefaultProperties_001.phpt b/ext/reflection/tests/ReflectionClass_getDefaultProperties_001.phpt index e19db81188..d29436b734 100644 --- a/ext/reflection/tests/ReflectionClass_getDefaultProperties_001.phpt +++ b/ext/reflection/tests/ReflectionClass_getDefaultProperties_001.phpt @@ -73,7 +73,7 @@ foreach ($classes as $class) { } ?> ---EXPECTF-- +--EXPECT-- ---- Static properties in A ---- Array ( diff --git a/ext/reflection/tests/ReflectionClass_getInterfaces_001.phpt b/ext/reflection/tests/ReflectionClass_getInterfaces_001.phpt index 42136003e7..147d868c94 100644 --- a/ext/reflection/tests/ReflectionClass_getInterfaces_001.phpt +++ b/ext/reflection/tests/ReflectionClass_getInterfaces_001.phpt @@ -42,7 +42,7 @@ foreach ($classes as $class) { } ?> ---EXPECTF-- +--EXPECT-- ---( Interfaces implemented by A0 )--- Array ( diff --git a/ext/reflection/tests/ReflectionClass_getInterfaces_002.phpt b/ext/reflection/tests/ReflectionClass_getInterfaces_002.phpt index 328a7c3e69..8fa08869da 100644 --- a/ext/reflection/tests/ReflectionClass_getInterfaces_002.phpt +++ b/ext/reflection/tests/ReflectionClass_getInterfaces_002.phpt @@ -17,7 +17,7 @@ $rc = new ReflectionClass('I7'); $interfaces = $rc->getInterfaces(); print_r($interfaces); ?> ---EXPECTF-- +--EXPECT-- Array ( [I6] => ReflectionClass Object diff --git a/ext/reflection/tests/ReflectionClass_getName_basic.phpt b/ext/reflection/tests/ReflectionClass_getName_basic.phpt index 158413f158..e99d30840b 100644 --- a/ext/reflection/tests/ReflectionClass_getName_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_getName_basic.phpt @@ -19,7 +19,7 @@ $r3 = new ReflectionClass("TrickClass"); var_dump($r1->getName(), $r2->getName(), $r3->getName()); ?> ---EXPECTF-- +--EXPECT-- string(8) "stdClass" string(8) "stdClass" string(10) "TrickClass" diff --git a/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt b/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt index 6e6d4341c8..1c4cfc6106 100644 --- a/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt +++ b/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt @@ -28,7 +28,7 @@ var_dump($rd->hasConstant("myConst")); echo "Check absent constant: "; var_dump($rd->hasConstant("doesntExist")); ?> ---EXPECTF-- +--EXPECT-- Check existing constant: bool(true) Check existing constant, different case: bool(false) Check absent constant: bool(false) diff --git a/ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt b/ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt index 0ff2523d6f..aa3af85c1e 100644 --- a/ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt @@ -18,6 +18,6 @@ Class C { const foo=1; } ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(false) diff --git a/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt b/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt index 81614bd9f8..9a8e252cc7 100644 --- a/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt +++ b/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt @@ -41,7 +41,7 @@ foreach($classes as $class) { var_dump($rc->hasMethod("doesntExist")); } ?> ---EXPECTF-- +--EXPECT-- Reflecting on class pubf: --> Check for f(): bool(true) --> Check for s(): bool(true) diff --git a/ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt b/ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt index fa4ee482b2..1c8d08175d 100644 --- a/ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt @@ -48,7 +48,7 @@ Class C { } } ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt b/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt index 88c4cd509a..3101a7a6ae 100644 --- a/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt +++ b/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt @@ -41,7 +41,7 @@ foreach($classes as $class) { var_dump($rc->hasProperty("doesntExist")); } ?> ---EXPECTF-- +--EXPECT-- Reflecting on class pubf: --> Check for s: bool(true) --> Check for a: bool(true) diff --git a/ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt b/ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt index d6dda7c2a3..e21656b7b2 100644 --- a/ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt @@ -30,7 +30,7 @@ Class C { public static $staticFoo; } ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/reflection/tests/ReflectionClass_isInstance_basic.phpt b/ext/reflection/tests/ReflectionClass_isInstance_basic.phpt index 2da09449ff..8bf2841043 100644 --- a/ext/reflection/tests/ReflectionClass_isInstance_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_isInstance_basic.phpt @@ -28,7 +28,7 @@ foreach ($classes as $class) { } ?> ---EXPECTF-- +--EXPECT-- is myA a A? bool(true) is myB a A? bool(true) is myC a A? bool(false) diff --git a/ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt b/ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt index 6ebcfa99a9..5b8c92010e 100644 --- a/ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt @@ -32,7 +32,7 @@ foreach($classes as $class ) { } ?> ---EXPECTF-- +--EXPECT-- Is C instantiable? bool(true) Is iface instantiable? bool(false) Is ifaceImpl instantiable? bool(true) diff --git a/ext/reflection/tests/ReflectionClass_isInternal_basic.phpt b/ext/reflection/tests/ReflectionClass_isInternal_basic.phpt index 2eaacb67f8..7d7e61335d 100644 --- a/ext/reflection/tests/ReflectionClass_isInternal_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_isInternal_basic.phpt @@ -14,7 +14,7 @@ $r5 = new ReflectionClass("C"); var_dump($r1->isInternal(), $r2->isInternal(), $r3->isInternal(), $r4->isInternal(), $r5->isInternal()); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt b/ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt index 94fcf00ece..538a26c5a5 100644 --- a/ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt @@ -25,7 +25,7 @@ foreach ($rcs as $childName => $child) { } } ?> ---EXPECTF-- +--EXPECT-- Is A a subclass of A? - Using object argument: bool(false) - Using string argument: bool(false) diff --git a/ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt b/ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt index af43fcefa4..5babb546ae 100644 --- a/ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt @@ -14,7 +14,7 @@ $r5 = new ReflectionClass("C"); var_dump($r1->isUserDefined(), $r2->isUserDefined(), $r3->isUserDefined(), $r4->isUserDefined(), $r5->isUserDefined()); ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/reflection/tests/ReflectionClass_modifiers_001.phpt b/ext/reflection/tests/ReflectionClass_modifiers_001.phpt index a1464a5ab9..d82519e4f4 100644 --- a/ext/reflection/tests/ReflectionClass_modifiers_001.phpt +++ b/ext/reflection/tests/ReflectionClass_modifiers_001.phpt @@ -21,7 +21,7 @@ foreach ($classes as $class) { var_dump($rc->getModifiers()); } ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) bool(true) diff --git a/ext/reflection/tests/ReflectionClass_toString_001.phpt b/ext/reflection/tests/ReflectionClass_toString_001.phpt index fab6387e05..cafdd2e37c 100644 --- a/ext/reflection/tests/ReflectionClass_toString_001.phpt +++ b/ext/reflection/tests/ReflectionClass_toString_001.phpt @@ -8,7 +8,7 @@ Steve Seear <stevseea@php.net> $rc = new ReflectionClass("ReflectionClass"); echo $rc; ?> ---EXPECTF-- +--EXPECT-- Class [ <internal:Reflection> class ReflectionClass implements Reflector ] { - Constants [3] { diff --git a/ext/reflection/tests/ReflectionFunction_construct.001.phpt b/ext/reflection/tests/ReflectionFunction_construct.001.phpt index 0e2e8a3681..eab542e005 100644 --- a/ext/reflection/tests/ReflectionFunction_construct.001.phpt +++ b/ext/reflection/tests/ReflectionFunction_construct.001.phpt @@ -34,7 +34,7 @@ try { } ?> ---EXPECTF-- +--EXPECT-- Ok - ReflectionFunction::__construct() expects parameter 1 to be string, array given Function nonExistentFunction() does not exist Ok - ReflectionFunction::__construct() expects exactly 1 parameter, 0 given diff --git a/ext/reflection/tests/ReflectionFunction_getClosureThis.phpt b/ext/reflection/tests/ReflectionFunction_getClosureThis.phpt index 367de45fff..ee44f24cdf 100644 --- a/ext/reflection/tests/ReflectionFunction_getClosureThis.phpt +++ b/ext/reflection/tests/ReflectionFunction_getClosureThis.phpt @@ -7,6 +7,6 @@ $rf = new ReflectionFunction($closure); var_dump($rf->getClosureThis()); echo "Done!\n"; ?> ---EXPECTF-- +--EXPECT-- NULL Done! diff --git a/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt b/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt index 786be050c1..e78a28a551 100644 --- a/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt +++ b/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt @@ -30,7 +30,7 @@ $closure( 'succeeded' ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ReflectionFunction::getClosure() : basic functionality *** string(19) "Inside foo function" string(16) "Arg is succeeded" diff --git a/ext/reflection/tests/ReflectionFunction_isClosure_basic.phpt b/ext/reflection/tests/ReflectionFunction_isClosure_basic.phpt index 7c36b8e63b..ae546b40f3 100644 --- a/ext/reflection/tests/ReflectionFunction_isClosure_basic.phpt +++ b/ext/reflection/tests/ReflectionFunction_isClosure_basic.phpt @@ -9,5 +9,5 @@ $closure = function($param) { return "this is a closure"; }; $rc = new ReflectionFunction($closure); var_dump($rc->isClosure()); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/reflection/tests/ReflectionFunction_isDeprecated_basic.phpt b/ext/reflection/tests/ReflectionFunction_isDeprecated_basic.phpt index 7b37b939e4..f8d476ae46 100644 --- a/ext/reflection/tests/ReflectionFunction_isDeprecated_basic.phpt +++ b/ext/reflection/tests/ReflectionFunction_isDeprecated_basic.phpt @@ -8,5 +8,5 @@ TestFest PHP|Tek // We currently don't have any deprecated functions :/ $rc = new ReflectionFunction('var_dump'); var_dump($rc->isDeprecated()); ---EXPECTF-- +--EXPECT-- bool(false) diff --git a/ext/reflection/tests/ReflectionFunction_isDisabled_basic.phpt b/ext/reflection/tests/ReflectionFunction_isDisabled_basic.phpt index d6d2c24b85..220c16f9cb 100644 --- a/ext/reflection/tests/ReflectionFunction_isDisabled_basic.phpt +++ b/ext/reflection/tests/ReflectionFunction_isDisabled_basic.phpt @@ -10,5 +10,5 @@ disable_functions=is_file $rc = new ReflectionFunction('is_file'); var_dump($rc->isDisabled()); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/reflection/tests/ReflectionFunction_isGenerator_basic.phpt b/ext/reflection/tests/ReflectionFunction_isGenerator_basic.phpt index c4889b12bc..8bbbfa516f 100644 --- a/ext/reflection/tests/ReflectionFunction_isGenerator_basic.phpt +++ b/ext/reflection/tests/ReflectionFunction_isGenerator_basic.phpt @@ -43,7 +43,7 @@ foreach($rc->getMethods() as $m) { var_dump($m->isGenerator()); } ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(true) bool(false) diff --git a/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt b/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt index 98125cba65..bb0543d098 100644 --- a/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt +++ b/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt @@ -50,7 +50,7 @@ try{ } ?> ---EXPECTF-- +--EXPECT-- Too few arguments: Ok - ReflectionMethod::__construct() expects exactly 1 parameter, 0 given diff --git a/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt b/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt index c97c41c738..c7d63446e5 100644 --- a/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt +++ b/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt @@ -47,7 +47,7 @@ $closure(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ReflectionMethod::getClosure() : basic functionality *** string(34) "Static Example class, Hello World!" string(22) "Example class, bar: 42" diff --git a/ext/reflection/tests/ReflectionMethod_getDocComment_property_list.phpt b/ext/reflection/tests/ReflectionMethod_getDocComment_property_list.phpt index 4719571124..94fbc3daec 100644 --- a/ext/reflection/tests/ReflectionMethod_getDocComment_property_list.phpt +++ b/ext/reflection/tests/ReflectionMethod_getDocComment_property_list.phpt @@ -30,7 +30,7 @@ $reflection = new ReflectionProperty('\X', 'z'); echo 'X::z', PHP_EOL; var_dump($reflection->getDocComment()); ?> ---EXPECTF-- +--EXPECT-- X::x string(24) "/** * doc 1 diff --git a/ext/reflection/tests/ReflectionObject_getConstant_basic.phpt b/ext/reflection/tests/ReflectionObject_getConstant_basic.phpt index 3d151bc7d5..7f9bc1f35c 100644 --- a/ext/reflection/tests/ReflectionObject_getConstant_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_getConstant_basic.phpt @@ -23,7 +23,7 @@ foreach($classes as $class) { var_dump($rc->getConstant('doesntexist')); } ?> ---EXPECTF-- +--EXPECT-- Reflecting on instance of class C: string(12) "hello from C" bool(false) diff --git a/ext/reflection/tests/ReflectionObject_getConstants_basic.phpt b/ext/reflection/tests/ReflectionObject_getConstants_basic.phpt index 6479ec90ed..8a56c9f64e 100644 --- a/ext/reflection/tests/ReflectionObject_getConstants_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_getConstants_basic.phpt @@ -23,7 +23,7 @@ foreach($classes as $class) { } ?> ---EXPECTF-- +--EXPECT-- Reflecting on instance of class C: array(1) { ["a"]=> diff --git a/ext/reflection/tests/ReflectionObject_isInstance_basic.phpt b/ext/reflection/tests/ReflectionObject_isInstance_basic.phpt index ef605aad84..48778f83c2 100644 --- a/ext/reflection/tests/ReflectionObject_isInstance_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_isInstance_basic.phpt @@ -21,7 +21,7 @@ foreach ($classes as $class) { } ?> ---EXPECTF-- +--EXPECT-- is myA a A? bool(true) is myB a A? bool(true) is myX a A? bool(false) diff --git a/ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt b/ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt index 4b8a6ec221..c362704b1c 100644 --- a/ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt @@ -30,7 +30,7 @@ foreach($classes as $class ) { var_dump($ro->IsInstantiable()); } ?> ---EXPECTF-- +--EXPECT-- Is C instantiable? bool(true) Is ifaceImpl instantiable? bool(true) Is D instantiable? bool(true) diff --git a/ext/reflection/tests/ReflectionObject_isInternal_basic.phpt b/ext/reflection/tests/ReflectionObject_isInternal_basic.phpt index 066bca70ee..60a95dc886 100644 --- a/ext/reflection/tests/ReflectionObject_isInternal_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_isInternal_basic.phpt @@ -15,7 +15,7 @@ var_dump($r1->isInternal(), $r2->isInternal(), $r3->isInternal(), $r4->isInternal(), $r5->isInternal()); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt b/ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt index e89066a7ea..59832c2d02 100644 --- a/ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt @@ -37,7 +37,7 @@ foreach ($ros as $childName => $child) { } } ?> ---EXPECTF-- +--EXPECT-- Is A a subclass of A? - Using ReflectionClass object argument: bool(false) - Using ReflectionObject object argument: bool(false) diff --git a/ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt b/ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt index 4cb08fcb67..390df504db 100644 --- a/ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt @@ -15,7 +15,7 @@ var_dump($r1->isUserDefined(), $r2->isUserDefined(), $r3->isUserDefined(), $r4->isUserDefined(), $r5->isUserDefined()); ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt b/ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt index 942bea2dc2..da08cc6288 100644 --- a/ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt +++ b/ext/reflection/tests/ReflectionParameter_canBePassedByValue.phpt @@ -34,7 +34,7 @@ aux('ufunc'); echo "Done.\n"; ?> ---EXPECTF-- +--EXPECT-- => array_multisort: Name: arr1 diff --git a/ext/reflection/tests/ReflectionParameter_export_error2.phpt b/ext/reflection/tests/ReflectionParameter_export_error2.phpt index 8bdbc6ad86..aa0bc0aa7c 100644 --- a/ext/reflection/tests/ReflectionParameter_export_error2.phpt +++ b/ext/reflection/tests/ReflectionParameter_export_error2.phpt @@ -26,6 +26,6 @@ catch (ReflectionException $e) { echo $e->getMessage() . "\n"; } ?> ---EXPECTF-- +--EXPECT-- Method ReflectionFunction::__invoke() does not exist The parameter class is expected to be either a string, an array(class, method) or a callable object diff --git a/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt b/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt index 6c154558e9..654a76aae0 100644 --- a/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt +++ b/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt @@ -39,7 +39,7 @@ catch(ReflectionException $e) { echo "Done.\n"; ?> ---EXPECTF-- +--EXPECT-- Class A does not exist Method C::b() does not exist Method C::b() does not exist diff --git a/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt b/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt index d61480377c..65339e308a 100644 --- a/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt +++ b/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt @@ -44,7 +44,7 @@ D::testFromC(); echo "\n\n--> Reflect inherited private from subclass:\n"; D::testFromD(); ?> ---EXPECTF-- +--EXPECT-- --> Reflect inherited private from global scope: Property D::$p does not exist diff --git a/ext/reflection/tests/ReflectionProperty_getModifiers_basic.phpt b/ext/reflection/tests/ReflectionProperty_getModifiers_basic.phpt index 38137551fc..4c99444e30 100644 --- a/ext/reflection/tests/ReflectionProperty_getModifiers_basic.phpt +++ b/ext/reflection/tests/ReflectionProperty_getModifiers_basic.phpt @@ -31,7 +31,7 @@ for ($i = 1;$i <= 6;$i++) { } ?> ---EXPECTF-- +--EXPECT-- C::a1: int(256) D::a1: int(256) C::a2: int(512) diff --git a/ext/reflection/tests/ReflectionType_possible_types.phpt b/ext/reflection/tests/ReflectionType_possible_types.phpt index 3b486a60fd..ccb8725466 100644 --- a/ext/reflection/tests/ReflectionType_possible_types.phpt +++ b/ext/reflection/tests/ReflectionType_possible_types.phpt @@ -21,7 +21,7 @@ foreach ($functions as $function) { var_dump($returnType->getName()); } ?> ---EXPECTF-- +--EXPECT-- string(4) "void" string(3) "int" string(5) "float" diff --git a/ext/reflection/tests/bug30209.phpt b/ext/reflection/tests/bug30209.phpt index 2735a741e2..bc1f6c7e86 100644 --- a/ext/reflection/tests/bug30209.phpt +++ b/ext/reflection/tests/bug30209.phpt @@ -25,7 +25,7 @@ $foo = new Foo; $foo->testBAR(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- string(7) "testBAR" string(7) "testBAR" ===DONE=== diff --git a/ext/reflection/tests/bug37816.phpt b/ext/reflection/tests/bug37816.phpt index 18a49046dc..f919b7424a 100644 --- a/ext/reflection/tests/bug37816.phpt +++ b/ext/reflection/tests/bug37816.phpt @@ -23,6 +23,6 @@ catch (Exception $e) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Caught: Cannot access non-public member TestClass::p ===DONE=== diff --git a/ext/reflection/tests/bug38653.phpt b/ext/reflection/tests/bug38653.phpt index 68781d2aba..09a309e67c 100644 --- a/ext/reflection/tests/bug38653.phpt +++ b/ext/reflection/tests/bug38653.phpt @@ -20,7 +20,7 @@ var_dump($foo->getConstant("no such const")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(10) string(0) "" string(4) "test" diff --git a/ext/reflection/tests/bug39001.phpt b/ext/reflection/tests/bug39001.phpt index 1ed675f029..79d2d8352e 100644 --- a/ext/reflection/tests/bug39001.phpt +++ b/ext/reflection/tests/bug39001.phpt @@ -21,7 +21,7 @@ var_dump($r->getProperty('protectedVar')->getDeclaringClass()->getName()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(7) "CParent" string(7) "CParent" Done diff --git a/ext/reflection/tests/bug39067.phpt b/ext/reflection/tests/bug39067.phpt index 8a7a6044e1..20fdb68ddd 100644 --- a/ext/reflection/tests/bug39067.phpt +++ b/ext/reflection/tests/bug39067.phpt @@ -37,7 +37,7 @@ var_dump($rc->getProperty('x')->getDeclaringClass()->getName()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(1) "C" string(1) "B" string(1) "A" diff --git a/ext/reflection/tests/bug40794.phpt b/ext/reflection/tests/bug40794.phpt index bb93b91280..ea3e3967ca 100644 --- a/ext/reflection/tests/bug40794.phpt +++ b/ext/reflection/tests/bug40794.phpt @@ -20,7 +20,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(3) { ["prop1"]=> string(1) "1" diff --git a/ext/reflection/tests/bug41884.phpt b/ext/reflection/tests/bug41884.phpt index f8c0a0a2bc..31aa7c94e3 100644 --- a/ext/reflection/tests/bug41884.phpt +++ b/ext/reflection/tests/bug41884.phpt @@ -15,7 +15,7 @@ var_dump($class->getDefaultProperties()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(2) { ["fooStatic"]=> string(3) "foo" diff --git a/ext/reflection/tests/bug60357.phpt b/ext/reflection/tests/bug60357.phpt index a5ddd4096c..731e25996f 100644 --- a/ext/reflection/tests/bug60357.phpt +++ b/ext/reflection/tests/bug60357.phpt @@ -6,5 +6,5 @@ function foo( array $x = array( 'a', 'b' ) ) {} $r = new ReflectionParameter( 'foo', 0 ); echo $r->__toString(); ?> ---EXPECTF-- +--EXPECT-- Parameter #0 [ <optional> array $x = Array ] diff --git a/ext/reflection/tests/bug60367.phpt b/ext/reflection/tests/bug60367.phpt index 5c4a098979..3834445733 100644 --- a/ext/reflection/tests/bug60367.phpt +++ b/ext/reflection/tests/bug60367.phpt @@ -24,5 +24,5 @@ $method->invokeArgs(null, array()); $method = new ReflectionMethod("A::call"); $method->invoke(null); $method->invokeArgs(null, array()); ---EXPECTF-- +--EXPECT-- BBAA diff --git a/ext/reflection/tests/bug71767.phpt b/ext/reflection/tests/bug71767.phpt index 8c4059abf4..ed83e486d8 100644 --- a/ext/reflection/tests/bug71767.phpt +++ b/ext/reflection/tests/bug71767.phpt @@ -37,7 +37,7 @@ echo $reflectionClosure->getDocComment() . PHP_EOL; echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- /** Correct docblock */ /** Correct docblock */ /** Correct docblock */ diff --git a/ext/reflection/tests/closures_001.phpt b/ext/reflection/tests/closures_001.phpt index 6cc7e6755c..c79f20f79c 100644 --- a/ext/reflection/tests/closures_001.phpt +++ b/ext/reflection/tests/closures_001.phpt @@ -48,7 +48,7 @@ var_dump($rp->isOptional()); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- int(2) int(1) int(2) diff --git a/ext/reflection/tests/closures_002.phpt b/ext/reflection/tests/closures_002.phpt index e8b080f5cb..65eb5c86f7 100644 --- a/ext/reflection/tests/closures_002.phpt +++ b/ext/reflection/tests/closures_002.phpt @@ -20,7 +20,7 @@ var_dump($rp->isOptional()); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- string(8) "__invoke" int(2) int(1) diff --git a/ext/reflection/tests/closures_003.phpt b/ext/reflection/tests/closures_003.phpt index 4483dc06e3..6e8dc71fcb 100644 --- a/ext/reflection/tests/closures_003.phpt +++ b/ext/reflection/tests/closures_003.phpt @@ -19,7 +19,7 @@ echo $method->getName ()."\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- __invoke __invoke ===DONE=== diff --git a/ext/reflection/tests/closures_003_v1.phpt b/ext/reflection/tests/closures_003_v1.phpt index 1b8e1c4d0a..c67d9571e1 100644 --- a/ext/reflection/tests/closures_003_v1.phpt +++ b/ext/reflection/tests/closures_003_v1.phpt @@ -19,7 +19,7 @@ echo $method->getName ()."\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- {closure} {closure} ===DONE=== diff --git a/ext/reflection/tests/closures_004.phpt b/ext/reflection/tests/closures_004.phpt index 807aea1f38..a09447bc05 100644 --- a/ext/reflection/tests/closures_004.phpt +++ b/ext/reflection/tests/closures_004.phpt @@ -31,7 +31,7 @@ $closure2->__invoke (); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Invoked! Invoked! Invoked! diff --git a/ext/reflection/tests/static_properties_002.phpt b/ext/reflection/tests/static_properties_002.phpt index 218c629cdb..204c5e0e15 100644 --- a/ext/reflection/tests/static_properties_002.phpt +++ b/ext/reflection/tests/static_properties_002.phpt @@ -47,7 +47,7 @@ echo 'Number of properties: '. count($r->getStaticProperties()) . "\n"; echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- base::show(2) derived::show(2) base::inc() diff --git a/ext/session/tests/005.phpt b/ext/session/tests/005.phpt index 3dbf859523..3a95c9f8f6 100644 --- a/ext/session/tests/005.phpt +++ b/ext/session/tests/005.phpt @@ -89,7 +89,7 @@ var_dump($_SESSION["c"]); session_destroy(); ?> ---EXPECTF-- +--EXPECT-- OPEN: PHPSESSID READ: abtest object(foo)#4 (2) { diff --git a/ext/session/tests/bug60634.phpt b/ext/session/tests/bug60634.phpt index 56b235af55..064f29a0d2 100644 --- a/ext/session/tests/bug60634.phpt +++ b/ext/session/tests/bug60634.phpt @@ -50,7 +50,7 @@ echo "um, hi\n"; */ ?> ---EXPECTF-- +--EXPECT-- write: goodbye cruel world Warning: Unknown: Cannot call session save handler in a recursive manner in Unknown on line 0 diff --git a/ext/session/tests/bug60860.phpt b/ext/session/tests/bug60860.phpt index 38a3796b68..f6f641d94e 100644 --- a/ext/session/tests/bug60860.phpt +++ b/ext/session/tests/bug60860.phpt @@ -14,7 +14,7 @@ session_start(); echo "ok\n"; ?> ---EXPECTF-- +--EXPECT-- PHP Recoverable fatal error: PHP Startup: Cannot set 'user' save handler by ini_set() or session_module_name() in Unknown on line 0 ok diff --git a/ext/session/tests/bug61728.phpt b/ext/session/tests/bug61728.phpt index 2780d7b7e2..b0ed3a1a17 100644 --- a/ext/session/tests/bug61728.phpt +++ b/ext/session/tests/bug61728.phpt @@ -37,5 +37,5 @@ function gc ($maxlifetime) { session_set_save_handler ("open", "close", "read", "write", "destroy", "gc"); session_start(); ---EXPECTF-- +--EXPECT-- 8 diff --git a/ext/session/tests/bug63379.phpt b/ext/session/tests/bug63379.phpt index 80941828c8..06711727cf 100644 --- a/ext/session/tests/bug63379.phpt +++ b/ext/session/tests/bug63379.phpt @@ -33,7 +33,7 @@ session_unset(); session_start(); var_dump($_SESSION); ---EXPECTF-- +--EXPECT-- array(1) { ["foo"]=> string(5) "hello" diff --git a/ext/session/tests/bug63379_nodestroy.phpt b/ext/session/tests/bug63379_nodestroy.phpt index 03a9ae74d9..3e377f35b5 100644 --- a/ext/session/tests/bug63379_nodestroy.phpt +++ b/ext/session/tests/bug63379_nodestroy.phpt @@ -33,7 +33,7 @@ session_unset(); session_start(); var_dump($_SESSION); ---EXPECTF-- +--EXPECT-- array(1) { ["foo"]=> string(5) "hello" diff --git a/ext/session/tests/bug65475.phpt b/ext/session/tests/bug65475.phpt index 7dc5463879..fcf5e59b60 100644 --- a/ext/session/tests/bug65475.phpt +++ b/ext/session/tests/bug65475.phpt @@ -26,7 +26,7 @@ var_dump($session_id === session_id()); var_dump($_SESSION['cnt']); // Should be int(2) session_write_close(); ---EXPECTF-- +--EXPECT-- Testing file module bool(true) bool(true) diff --git a/ext/session/tests/bug66481.phpt b/ext/session/tests/bug66481.phpt index c75cb88d1c..3ceb3e299e 100644 --- a/ext/session/tests/bug66481.phpt +++ b/ext/session/tests/bug66481.phpt @@ -10,7 +10,7 @@ ob_start(); var_dump(session_name("foo")); var_dump(session_name("bar")); ---EXPECTF-- +--EXPECT-- PHP Warning: PHP Startup: session.name cannot be a numeric or empty '' in Unknown on line 0 Warning: PHP Startup: session.name cannot be a numeric or empty '' in Unknown on line 0 diff --git a/ext/session/tests/bug66827.phpt b/ext/session/tests/bug66827.phpt index 09bfa203ef..6329d29226 100644 --- a/ext/session/tests/bug66827.phpt +++ b/ext/session/tests/bug66827.phpt @@ -8,5 +8,5 @@ $_COOKIE[session_name()] = array(); session_start(); echo 'OK'; ?> ---EXPECTF-- +--EXPECT-- OK diff --git a/ext/session/tests/bug71603.phpt b/ext/session/tests/bug71603.phpt index 588b1fecfb..40032088fe 100644 --- a/ext/session/tests/bug71603.phpt +++ b/ext/session/tests/bug71603.phpt @@ -11,6 +11,6 @@ session.use_only_cookies=0 ob_start(); echo "ok\n"; ?> ---EXPECTF-- +--EXPECT-- ok diff --git a/ext/session/tests/bug71974.phpt b/ext/session/tests/bug71974.phpt index b692bce2c5..388befdaf3 100644 --- a/ext/session/tests/bug71974.phpt +++ b/ext/session/tests/bug71974.phpt @@ -17,7 +17,7 @@ ob_start(); session_start() ?> <a href="some.php">abc</a> ---EXPECTF-- +--EXPECT-- <a href="some.php">abc</a> diff --git a/ext/session/tests/bug72940.phpt b/ext/session/tests/bug72940.phpt index 4d53bc098e..d8f8c35bf4 100644 --- a/ext/session/tests/bug72940.phpt +++ b/ext/session/tests/bug72940.phpt @@ -29,7 +29,7 @@ session_start(); var_dump(session_id(), SID); session_destroy(); ?> ---EXPECTF-- +--EXPECT-- string(12) "bug72940test" string(0) "" string(11) "bug72940get" diff --git a/ext/session/tests/bug74833.phpt b/ext/session/tests/bug74833.phpt index 5a0eda71f7..fdd6054f8a 100644 --- a/ext/session/tests/bug74833.phpt +++ b/ext/session/tests/bug74833.phpt @@ -16,7 +16,7 @@ var_dump(isset($c['session']['SID'])); ob_end_flush(); ?> ==DONE== ---EXPECTF-- +--EXPECT-- bool(true) ==DONE== diff --git a/ext/session/tests/session_abort_basic.phpt b/ext/session/tests/session_abort_basic.phpt index b9736a912b..b5a12ae4c1 100644 --- a/ext/session/tests/session_abort_basic.phpt +++ b/ext/session/tests/session_abort_basic.phpt @@ -37,7 +37,7 @@ var_dump($_SESSION); // Should only have 'foo' echo "Done".PHP_EOL; ?> ---EXPECTF-- +--EXPECT-- *** Testing session_abort() : basic functionality *** array(2) { ["foo"]=> diff --git a/ext/session/tests/session_cache_expire_basic.phpt b/ext/session/tests/session_cache_expire_basic.phpt index 7166485937..6da766cd86 100644 --- a/ext/session/tests/session_cache_expire_basic.phpt +++ b/ext/session/tests/session_cache_expire_basic.phpt @@ -26,7 +26,7 @@ var_dump(session_cache_expire()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_cache_expire() : basic functionality *** int(180) int(180) diff --git a/ext/session/tests/session_cache_expire_variation1.phpt b/ext/session/tests/session_cache_expire_variation1.phpt index 9d0ba27fea..8c5f2692ee 100644 --- a/ext/session/tests/session_cache_expire_variation1.phpt +++ b/ext/session/tests/session_cache_expire_variation1.phpt @@ -28,7 +28,7 @@ var_dump(session_cache_expire()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_cache_expire() : variation *** int(360) int(360) diff --git a/ext/session/tests/session_cache_expire_variation2.phpt b/ext/session/tests/session_cache_expire_variation2.phpt index f17f4711a9..20835e6365 100644 --- a/ext/session/tests/session_cache_expire_variation2.phpt +++ b/ext/session/tests/session_cache_expire_variation2.phpt @@ -27,7 +27,7 @@ var_dump(session_cache_expire()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_cache_expire() : variation *** int(360) int(360) diff --git a/ext/session/tests/session_cache_expire_variation3.phpt b/ext/session/tests/session_cache_expire_variation3.phpt index c243c1f115..8e107956d4 100644 --- a/ext/session/tests/session_cache_expire_variation3.phpt +++ b/ext/session/tests/session_cache_expire_variation3.phpt @@ -30,7 +30,7 @@ var_dump(ini_get("session.cache_expire")); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_cache_expire() : variation *** string(3) "180" int(180) diff --git a/ext/session/tests/session_cache_limiter_basic.phpt b/ext/session/tests/session_cache_limiter_basic.phpt index 559a89143c..bfc2f68427 100644 --- a/ext/session/tests/session_cache_limiter_basic.phpt +++ b/ext/session/tests/session_cache_limiter_basic.phpt @@ -42,7 +42,7 @@ var_dump(session_destroy()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_cache_limiter() : basic functionality *** string(7) "nocache" string(7) "nocache" diff --git a/ext/session/tests/session_commit_basic.phpt b/ext/session/tests/session_commit_basic.phpt index c72d3ba927..f032ad469e 100644 --- a/ext/session/tests/session_commit_basic.phpt +++ b/ext/session/tests/session_commit_basic.phpt @@ -27,7 +27,7 @@ var_dump($_SESSION); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_commit() : basic functionality *** bool(true) array(0) { diff --git a/ext/session/tests/session_commit_variation1.phpt b/ext/session/tests/session_commit_variation1.phpt index a58a562483..ab045e00fa 100644 --- a/ext/session/tests/session_commit_variation1.phpt +++ b/ext/session/tests/session_commit_variation1.phpt @@ -27,7 +27,7 @@ var_dump(session_destroy()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_commit() : variation *** bool(true) bool(true) diff --git a/ext/session/tests/session_commit_variation2.phpt b/ext/session/tests/session_commit_variation2.phpt index 9bde83ce0a..4d1107281e 100644 --- a/ext/session/tests/session_commit_variation2.phpt +++ b/ext/session/tests/session_commit_variation2.phpt @@ -33,7 +33,7 @@ var_dump(session_destroy()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_commit() : variation *** bool(true) array(0) { diff --git a/ext/session/tests/session_commit_variation3.phpt b/ext/session/tests/session_commit_variation3.phpt index ed4618a04e..9442faf238 100644 --- a/ext/session/tests/session_commit_variation3.phpt +++ b/ext/session/tests/session_commit_variation3.phpt @@ -26,7 +26,7 @@ var_dump(session_destroy()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_commit() : variation *** array(0) { } diff --git a/ext/session/tests/session_commit_variation4.phpt b/ext/session/tests/session_commit_variation4.phpt index fb3ea73058..9a6b929ca2 100644 --- a/ext/session/tests/session_commit_variation4.phpt +++ b/ext/session/tests/session_commit_variation4.phpt @@ -39,7 +39,7 @@ var_dump(ini_get('session.use_strict_mode')); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_commit() : variation *** string(1) "0" string(0) "" diff --git a/ext/session/tests/session_decode_basic.phpt b/ext/session/tests/session_decode_basic.phpt index f8aa24305a..07144aa4f5 100644 --- a/ext/session/tests/session_decode_basic.phpt +++ b/ext/session/tests/session_decode_basic.phpt @@ -96,7 +96,7 @@ fclose($fp); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_decode() : basic functionality *** bool(true) diff --git a/ext/session/tests/session_decode_basic_serialize.phpt b/ext/session/tests/session_decode_basic_serialize.phpt index dd88438e15..9afb0a38e0 100644 --- a/ext/session/tests/session_decode_basic_serialize.phpt +++ b/ext/session/tests/session_decode_basic_serialize.phpt @@ -97,7 +97,7 @@ fclose($fp); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_decode() : basic functionality *** bool(true) diff --git a/ext/session/tests/session_decode_variation1.phpt b/ext/session/tests/session_decode_variation1.phpt index b2d06b1abb..dc37e089dc 100644 --- a/ext/session/tests/session_decode_variation1.phpt +++ b/ext/session/tests/session_decode_variation1.phpt @@ -31,7 +31,7 @@ var_dump(session_destroy()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_decode() : variation *** bool(true) bool(true) diff --git a/ext/session/tests/session_decode_variation2.phpt b/ext/session/tests/session_decode_variation2.phpt index 1a9b687900..8343ab9c94 100644 --- a/ext/session/tests/session_decode_variation2.phpt +++ b/ext/session/tests/session_decode_variation2.phpt @@ -28,7 +28,7 @@ var_dump(session_destroy()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_decode() : variation *** bool(true) array(0) { diff --git a/ext/session/tests/session_decode_variation4.phpt b/ext/session/tests/session_decode_variation4.phpt index 81642754f0..ee9f892bf0 100644 --- a/ext/session/tests/session_decode_variation4.phpt +++ b/ext/session/tests/session_decode_variation4.phpt @@ -29,7 +29,7 @@ var_dump(session_destroy()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_decode() : variation *** bool(true) array(0) { diff --git a/ext/session/tests/session_destroy_variation2.phpt b/ext/session/tests/session_destroy_variation2.phpt index c72c65bac9..40f49a46a4 100644 --- a/ext/session/tests/session_destroy_variation2.phpt +++ b/ext/session/tests/session_destroy_variation2.phpt @@ -29,7 +29,7 @@ var_dump(session_destroy()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_destroy() : variation *** bool(true) bool(true) diff --git a/ext/session/tests/session_encode_serialize.phpt b/ext/session/tests/session_encode_serialize.phpt index 41c79c3e51..a5b147e504 100644 --- a/ext/session/tests/session_encode_serialize.phpt +++ b/ext/session/tests/session_encode_serialize.phpt @@ -17,7 +17,7 @@ session_write_close(); // Should finish without errors echo 'Done'.PHP_EOL; ?> ---EXPECTF-- +--EXPECT-- bool(true) string(51) "a:3:{i:-3;s:3:"foo";i:3;s:3:"bar";s:3:"var";i:123;}" Done diff --git a/ext/session/tests/session_encode_variation3.phpt b/ext/session/tests/session_encode_variation3.phpt index 47b2441b30..3cdbbfe707 100644 --- a/ext/session/tests/session_encode_variation3.phpt +++ b/ext/session/tests/session_encode_variation3.phpt @@ -25,7 +25,7 @@ var_dump(session_destroy()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_encode() : variation *** bool(true) string(34) "foo|a:3:{i:0;i:1;i:1;i:2;i:2;i:3;}" diff --git a/ext/session/tests/session_encode_variation4.phpt b/ext/session/tests/session_encode_variation4.phpt index 89af6ebb21..bf6b0307d8 100644 --- a/ext/session/tests/session_encode_variation4.phpt +++ b/ext/session/tests/session_encode_variation4.phpt @@ -27,7 +27,7 @@ var_dump(session_destroy()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_encode() : variation *** bool(true) string(52) "foo|a:3:{i:0;i:1;i:1;i:2;i:2;i:3;}guff|R:1;blah|R:1;" diff --git a/ext/session/tests/session_encode_variation5.phpt b/ext/session/tests/session_encode_variation5.phpt index d7639fadb1..b4854552aa 100644 --- a/ext/session/tests/session_encode_variation5.phpt +++ b/ext/session/tests/session_encode_variation5.phpt @@ -27,7 +27,7 @@ var_dump(session_destroy()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_encode() : variation *** bool(true) string(64) "data|a:5:{i:0;i:1;i:1;i:2;i:2;i:3;s:3:"foo";R:1;s:4:"blah";R:1;}" diff --git a/ext/session/tests/session_encode_variation7.phpt b/ext/session/tests/session_encode_variation7.phpt index 04cfe4439d..a7ffb364be 100644 --- a/ext/session/tests/session_encode_variation7.phpt +++ b/ext/session/tests/session_encode_variation7.phpt @@ -26,7 +26,7 @@ var_dump(session_destroy()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_encode() : variation *** bool(true) string(24) "A2Zvb2k6MTIzNDU2Nzg5MDs=" diff --git a/ext/session/tests/session_get_cookie_params_basic.phpt b/ext/session/tests/session_get_cookie_params_basic.phpt index 5d328550ea..ca4d330e67 100644 --- a/ext/session/tests/session_get_cookie_params_basic.phpt +++ b/ext/session/tests/session_get_cookie_params_basic.phpt @@ -30,7 +30,7 @@ var_dump(session_get_cookie_params()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_get_cookie_params() : basic functionality *** array(5) { ["lifetime"]=> diff --git a/ext/session/tests/session_get_cookie_params_variation1.phpt b/ext/session/tests/session_get_cookie_params_variation1.phpt index bb921a56b1..6d5f816cde 100644 --- a/ext/session/tests/session_get_cookie_params_variation1.phpt +++ b/ext/session/tests/session_get_cookie_params_variation1.phpt @@ -36,7 +36,7 @@ var_dump(session_get_cookie_params()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_get_cookie_params() : variation *** array(5) { ["lifetime"]=> diff --git a/ext/session/tests/session_id_basic.phpt b/ext/session/tests/session_id_basic.phpt index 852d2f9578..32a9679e20 100644 --- a/ext/session/tests/session_id_basic.phpt +++ b/ext/session/tests/session_id_basic.phpt @@ -30,7 +30,7 @@ var_dump(session_id()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_id() : basic functionality *** string(0) "" string(0) "" diff --git a/ext/session/tests/session_id_error3.phpt b/ext/session/tests/session_id_error3.phpt index e6404eb70e..aeb0fe38a0 100644 --- a/ext/session/tests/session_id_error3.phpt +++ b/ext/session/tests/session_id_error3.phpt @@ -54,7 +54,7 @@ var_dump(session_id()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_id() : error functionality *** string(0) "" string(0) "" diff --git a/ext/session/tests/session_module_name_variation4.phpt b/ext/session/tests/session_module_name_variation4.phpt index 3fd42e46d7..595bc5c3c5 100644 --- a/ext/session/tests/session_module_name_variation4.phpt +++ b/ext/session/tests/session_module_name_variation4.phpt @@ -40,7 +40,7 @@ var_dump(session_destroy()); ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_module_name() : variation *** array(3) { diff --git a/ext/session/tests/session_name_basic.phpt b/ext/session/tests/session_name_basic.phpt index 8c3a9bbcd1..50cefe2812 100644 --- a/ext/session/tests/session_name_basic.phpt +++ b/ext/session/tests/session_name_basic.phpt @@ -29,7 +29,7 @@ var_dump(session_name()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_name() : error functionality *** string(9) "PHPSESSID" string(9) "PHPSESSID" diff --git a/ext/session/tests/session_name_variation2.phpt b/ext/session/tests/session_name_variation2.phpt index 84bfeba740..536a9d31a5 100644 --- a/ext/session/tests/session_name_variation2.phpt +++ b/ext/session/tests/session_name_variation2.phpt @@ -27,7 +27,7 @@ var_dump(session_name()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_name() : variation *** string(4) "blah" string(4) "blah" diff --git a/ext/session/tests/session_reset_basic.phpt b/ext/session/tests/session_reset_basic.phpt index 1fb7f8fe87..a2ddc7af34 100644 --- a/ext/session/tests/session_reset_basic.phpt +++ b/ext/session/tests/session_reset_basic.phpt @@ -35,7 +35,7 @@ var_dump($_SESSION); // Should only have 'foo' echo "Done".PHP_EOL; ?> ---EXPECTF-- +--EXPECT-- *** Testing session_abort() : basic functionality *** array(2) { ["foo"]=> diff --git a/ext/session/tests/session_set_save_handler_class_011.phpt b/ext/session/tests/session_set_save_handler_class_011.phpt index 7fa3657694..2be99e2add 100644 --- a/ext/session/tests/session_set_save_handler_class_011.phpt +++ b/ext/session/tests/session_set_save_handler_class_011.phpt @@ -57,7 +57,7 @@ $_SESSION['foo'] = 'bar'; echo "done\n"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_set_save_handler() : shutdown failure *** (#1) constructor called done diff --git a/ext/session/tests/session_set_save_handler_class_014.phpt b/ext/session/tests/session_set_save_handler_class_014.phpt index ba689cef02..a96367c13a 100644 --- a/ext/session/tests/session_set_save_handler_class_014.phpt +++ b/ext/session/tests/session_set_save_handler_class_014.phpt @@ -27,7 +27,7 @@ session_set_save_handler($handler); session_start(); ---EXPECTF-- +--EXPECT-- PHP Recoverable fatal error: PHP Startup: Cannot set 'user' save handler by ini_set() or session_module_name() in Unknown on line 0 *** Testing session_set_save_handler() : calling default handler when save_handler=user *** diff --git a/ext/session/tests/session_set_save_handler_class_015.phpt b/ext/session/tests/session_set_save_handler_class_015.phpt index 3bef51be4f..146984175e 100644 --- a/ext/session/tests/session_set_save_handler_class_015.phpt +++ b/ext/session/tests/session_set_save_handler_class_015.phpt @@ -20,5 +20,5 @@ echo "*** Testing session_set_save_handler() : register session handler but don' session_set_save_handler(new SessionHandler); ---EXPECTF-- +--EXPECT-- *** Testing session_set_save_handler() : register session handler but don't start *** diff --git a/ext/session/tests/session_set_save_handler_error2.phpt b/ext/session/tests/session_set_save_handler_error2.phpt index 1f2a8b9e6a..fb1673e0ce 100644 --- a/ext/session/tests/session_set_save_handler_error2.phpt +++ b/ext/session/tests/session_set_save_handler_error2.phpt @@ -41,7 +41,7 @@ session_destroy(); ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_set_save_handler() : error functionality *** array(3) { ["Blah"]=> diff --git a/ext/session/tests/session_start_variation2.phpt b/ext/session/tests/session_start_variation2.phpt index 6c9b29e3ec..1cc6454d5e 100644 --- a/ext/session/tests/session_start_variation2.phpt +++ b/ext/session/tests/session_start_variation2.phpt @@ -29,7 +29,7 @@ var_dump(session_destroy()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_start() : variation *** bool(true) bool(true) diff --git a/ext/session/tests/session_start_variation4.phpt b/ext/session/tests/session_start_variation4.phpt index 42895493a7..76f21f4bca 100644 --- a/ext/session/tests/session_start_variation4.phpt +++ b/ext/session/tests/session_start_variation4.phpt @@ -25,7 +25,7 @@ echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_start() : variation *** array(1) { ["blah"]=> diff --git a/ext/session/tests/session_start_variation5.phpt b/ext/session/tests/session_start_variation5.phpt index bbc987e3c8..edcadbf7bb 100644 --- a/ext/session/tests/session_start_variation5.phpt +++ b/ext/session/tests/session_start_variation5.phpt @@ -31,7 +31,7 @@ session_destroy(); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_start() : variation *** array(4) { ["colour"]=> diff --git a/ext/session/tests/session_start_variation6.phpt b/ext/session/tests/session_start_variation6.phpt index 56471cc7f3..639527a63f 100644 --- a/ext/session/tests/session_start_variation6.phpt +++ b/ext/session/tests/session_start_variation6.phpt @@ -32,7 +32,7 @@ session_destroy(); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_start() : variation *** array(4) { ["colour"]=> diff --git a/ext/session/tests/session_start_variation7.phpt b/ext/session/tests/session_start_variation7.phpt index be079f3350..33101b5147 100644 --- a/ext/session/tests/session_start_variation7.phpt +++ b/ext/session/tests/session_start_variation7.phpt @@ -32,7 +32,7 @@ session_destroy(); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_start() : variation *** array(4) { ["colour"]=> diff --git a/ext/session/tests/session_status.phpt b/ext/session/tests/session_status.phpt index d1f7e2f386..f58514aa10 100644 --- a/ext/session/tests/session_status.phpt +++ b/ext/session/tests/session_status.phpt @@ -17,7 +17,7 @@ session_start(); var_dump(session_status() == PHP_SESSION_ACTIVE); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_status() : active, none bool(true) bool(true) diff --git a/ext/session/tests/session_status_disabled.phpt b/ext/session/tests/session_status_disabled.phpt index c4d1f2192d..9a16a2fc0e 100644 --- a/ext/session/tests/session_status_disabled.phpt +++ b/ext/session/tests/session_status_disabled.phpt @@ -12,6 +12,6 @@ echo "*** Testing session_status() : disabled\n"; var_dump(session_status() == PHP_SESSION_DISABLED); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_status() : disabled bool(true) diff --git a/ext/session/tests/session_unset_basic.phpt b/ext/session/tests/session_unset_basic.phpt index 2e4d3bf5e8..7a19a5e93d 100644 --- a/ext/session/tests/session_unset_basic.phpt +++ b/ext/session/tests/session_unset_basic.phpt @@ -26,7 +26,7 @@ var_dump($_SESSION); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_unset() : basic functionality *** bool(true) array(1) { diff --git a/ext/session/tests/session_unset_variation1.phpt b/ext/session/tests/session_unset_variation1.phpt index 5c1fc2c701..c01128031d 100644 --- a/ext/session/tests/session_unset_variation1.phpt +++ b/ext/session/tests/session_unset_variation1.phpt @@ -28,7 +28,7 @@ var_dump(session_unset()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_unset() : variation *** bool(false) bool(true) diff --git a/ext/session/tests/session_write_close_basic.phpt b/ext/session/tests/session_write_close_basic.phpt index 5b32f5c266..481f4876ea 100644 --- a/ext/session/tests/session_write_close_basic.phpt +++ b/ext/session/tests/session_write_close_basic.phpt @@ -27,7 +27,7 @@ var_dump($_SESSION); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_write_close() : basic functionality *** bool(true) array(0) { diff --git a/ext/session/tests/session_write_close_variation1.phpt b/ext/session/tests/session_write_close_variation1.phpt index 53452b45b9..e5a87370c3 100644 --- a/ext/session/tests/session_write_close_variation1.phpt +++ b/ext/session/tests/session_write_close_variation1.phpt @@ -27,7 +27,7 @@ var_dump(session_destroy()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_write_close() : variation *** bool(true) bool(true) diff --git a/ext/session/tests/session_write_close_variation2.phpt b/ext/session/tests/session_write_close_variation2.phpt index ac4f843cae..eb3bfc104b 100644 --- a/ext/session/tests/session_write_close_variation2.phpt +++ b/ext/session/tests/session_write_close_variation2.phpt @@ -33,7 +33,7 @@ var_dump(session_destroy()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_write_close() : variation *** bool(true) array(0) { diff --git a/ext/session/tests/session_write_close_variation3.phpt b/ext/session/tests/session_write_close_variation3.phpt index 249b5730df..a8f5457f24 100644 --- a/ext/session/tests/session_write_close_variation3.phpt +++ b/ext/session/tests/session_write_close_variation3.phpt @@ -26,7 +26,7 @@ var_dump(session_destroy()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_write_close() : variation *** array(0) { } diff --git a/ext/session/tests/session_write_close_variation4.phpt b/ext/session/tests/session_write_close_variation4.phpt index f1a7cb59d9..a6d78cf134 100644 --- a/ext/session/tests/session_write_close_variation4.phpt +++ b/ext/session/tests/session_write_close_variation4.phpt @@ -36,7 +36,7 @@ var_dump(session_destroy()); echo "Done"; ob_end_flush(); ?> ---EXPECTF-- +--EXPECT-- *** Testing session_write_close() : variation *** string(0) "" bool(true) diff --git a/ext/simplexml/tests/025.phpt b/ext/simplexml/tests/025.phpt index b9e3bbb0dc..955410a5ee 100644 --- a/ext/simplexml/tests/025.phpt +++ b/ext/simplexml/tests/025.phpt @@ -48,7 +48,7 @@ var_dump($sxe->getDocNamespaces()); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- array(1) { ["xhtml"]=> string(31) "http://www.w3.org/TR/REC-html40" diff --git a/ext/simplexml/tests/026.phpt b/ext/simplexml/tests/026.phpt index d6de94be3d..7b6ca54183 100644 --- a/ext/simplexml/tests/026.phpt +++ b/ext/simplexml/tests/026.phpt @@ -32,7 +32,7 @@ traverse_xml($people); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- <people> <person>Jane </person> diff --git a/ext/simplexml/tests/028.phpt b/ext/simplexml/tests/028.phpt index 753056b9ad..9adb923ddc 100644 --- a/ext/simplexml/tests/028.phpt +++ b/ext/simplexml/tests/028.phpt @@ -32,7 +32,7 @@ traverse_xml($people); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- <people> </people> <people> diff --git a/ext/simplexml/tests/029.phpt b/ext/simplexml/tests/029.phpt index 86a4f308e3..117e6b7939 100644 --- a/ext/simplexml/tests/029.phpt +++ b/ext/simplexml/tests/029.phpt @@ -27,7 +27,7 @@ foreach($people as $person) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- string(3) "Joe" int(3) int(0) diff --git a/ext/simplexml/tests/032.phpt b/ext/simplexml/tests/032.phpt index 48bc887ecc..55e2bc186d 100644 --- a/ext/simplexml/tests/032.phpt +++ b/ext/simplexml/tests/032.phpt @@ -38,7 +38,7 @@ var_dump($people2 == $people1); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/simplexml/tests/034.phpt b/ext/simplexml/tests/034.phpt index f5d92b142b..3d52a60a0c 100644 --- a/ext/simplexml/tests/034.phpt +++ b/ext/simplexml/tests/034.phpt @@ -18,5 +18,5 @@ echo count($p); $p = (array)$foo->bar->p; echo count($p); ?> ---EXPECTF-- +--EXPECT-- 33 diff --git a/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt b/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt index 15c81b2a9a..fc918798a5 100644 --- a/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt +++ b/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt @@ -10,7 +10,7 @@ SimpleXMLElement->addAttribute() var_dump($simple->attributes()); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- object(SimpleXMLElement)#2 (1) { ["@attributes"]=> array(1) { diff --git a/ext/simplexml/tests/SimpleXMLElement_getDocNamespaces.phpt b/ext/simplexml/tests/SimpleXMLElement_getDocNamespaces.phpt index 52d1341ae5..77abe3301d 100644 --- a/ext/simplexml/tests/SimpleXMLElement_getDocNamespaces.phpt +++ b/ext/simplexml/tests/SimpleXMLElement_getDocNamespaces.phpt @@ -7,5 +7,5 @@ Testing getDocNamespaces() with invalid XML $xml = @new SimpleXMLElement("X",1); var_dump($xml->getDocNamespaces()); ?> ---EXPECTF-- +--EXPECT-- bool(false) diff --git a/ext/simplexml/tests/bug35785.phpt b/ext/simplexml/tests/bug35785.phpt index 080a510837..10bae9ca10 100644 --- a/ext/simplexml/tests/bug35785.phpt +++ b/ext/simplexml/tests/bug35785.phpt @@ -18,7 +18,7 @@ echo $xml->asXML(); ?> ===DONE=== <?php exit(0); __halt_compiler(); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> <root><bla><posts><name>FooBar</name></posts></bla></root> bool(false) diff --git a/ext/simplexml/tests/bug37386.phpt b/ext/simplexml/tests/bug37386.phpt index 06b69c4705..92e8cef48b 100644 --- a/ext/simplexml/tests/bug37386.phpt +++ b/ext/simplexml/tests/bug37386.phpt @@ -17,7 +17,7 @@ $node[0] = 'New Value'; print $sx1->asXML(); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> <root><node>node1</node><node>node2</node></root> diff --git a/ext/simplexml/tests/bug37565.phpt b/ext/simplexml/tests/bug37565.phpt index 24500d09b1..0af93deaf3 100644 --- a/ext/simplexml/tests/bug37565.phpt +++ b/ext/simplexml/tests/bug37565.phpt @@ -29,7 +29,7 @@ try { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Error: simplexml_load_string() expects parameter 2 to be a class name derived from SimpleXMLElement, 'Setting' given Error: Argument 1 passed to Reflection::export() must implement interface Reflector, null given Error: simplexml_load_file() expects parameter 2 to be a class name derived from SimpleXMLElement, 'Setting' given diff --git a/ext/simplexml/tests/bug38354.phpt b/ext/simplexml/tests/bug38354.phpt index d2fcde11c2..04ed8f2823 100644 --- a/ext/simplexml/tests/bug38354.phpt +++ b/ext/simplexml/tests/bug38354.phpt @@ -17,7 +17,7 @@ foreach ($xml->xpath("//*") as $element) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(101) "<?xml version="1.0"?> <code> <a href="javascript:alert('1');"><strong>Item Two</strong></a> diff --git a/ext/simplexml/tests/bug44478.phpt b/ext/simplexml/tests/bug44478.phpt index 17a26f949b..377754f792 100644 --- a/ext/simplexml/tests/bug44478.phpt +++ b/ext/simplexml/tests/bug44478.phpt @@ -18,7 +18,7 @@ print $xml_element->asXML(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- a & b a & b a & b diff --git a/ext/simplexml/tests/bug45553.phpt b/ext/simplexml/tests/bug45553.phpt index b355c48696..6634498556 100644 --- a/ext/simplexml/tests/bug45553.phpt +++ b/ext/simplexml/tests/bug45553.phpt @@ -26,7 +26,7 @@ $atts = $x->xpath("/xml/data/@label"); echo $atts[0] . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- I am A I am a:Nothing I am a:A diff --git a/ext/simplexml/tests/bug46003.phpt b/ext/simplexml/tests/bug46003.phpt index 712675c097..e21a4ce742 100644 --- a/ext/simplexml/tests/bug46003.phpt +++ b/ext/simplexml/tests/bug46003.phpt @@ -24,7 +24,7 @@ var_dump(isset($x->o->text)); var_dump(isset($x->o->xx)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(true) bool(false) bool(true) diff --git a/ext/simplexml/tests/bug46047.phpt b/ext/simplexml/tests/bug46047.phpt index 0438154823..61b6316e6d 100644 --- a/ext/simplexml/tests/bug46047.phpt +++ b/ext/simplexml/tests/bug46047.phpt @@ -15,7 +15,7 @@ $xml = new SimpleXMLElement('<foo><bar/><baz/></foo>'); print_r($xml); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- SimpleXMLElement Object ( [bar] => SimpleXMLElement Object diff --git a/ext/simplexml/tests/bug48601.phpt b/ext/simplexml/tests/bug48601.phpt index 0b81facf49..20d6060a36 100644 --- a/ext/simplexml/tests/bug48601.phpt +++ b/ext/simplexml/tests/bug48601.phpt @@ -16,5 +16,5 @@ if (! is_array($nodes)) { } ?> ---EXPECTF-- +--EXPECT-- Result Count: 0 diff --git a/ext/simplexml/tests/feature55218.phpt b/ext/simplexml/tests/feature55218.phpt index 25ea534376..c1489ed375 100644 --- a/ext/simplexml/tests/feature55218.phpt +++ b/ext/simplexml/tests/feature55218.phpt @@ -49,7 +49,7 @@ var_dump( $x->person[1]->getDocNamespaces(false, false) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- getDocNamespaces Backwards Compatibility: diff --git a/ext/simplexml/tests/simplexml_load_file.phpt b/ext/simplexml/tests/simplexml_load_file.phpt index 8dc6481f5d..1442a0ed47 100644 --- a/ext/simplexml/tests/simplexml_load_file.phpt +++ b/ext/simplexml/tests/simplexml_load_file.phpt @@ -9,7 +9,7 @@ simplexml_load_file() var_dump($simple); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- object(SimpleXMLElement)#1 (1) { ["book"]=> array(2) { diff --git a/ext/simplexml/tests/sxe_004.phpt b/ext/simplexml/tests/sxe_004.phpt index ac4bcd8bf7..15b9a53aae 100644 --- a/ext/simplexml/tests/sxe_004.phpt +++ b/ext/simplexml/tests/sxe_004.phpt @@ -84,7 +84,7 @@ foreach($rit as $data) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- SXETest::rewind SXETest::valid SXETest::hasChildren diff --git a/ext/snmp/tests/bug60749.phpt b/ext/snmp/tests/bug60749.phpt index 302f351c10..2ce1ca3488 100644 --- a/ext/snmp/tests/bug60749.phpt +++ b/ext/snmp/tests/bug60749.phpt @@ -24,5 +24,5 @@ if (strcmp($info["hostname"], "$ip:$port") !== 0) { } var_dump($session->close()); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/snmp/tests/reflection.phpt b/ext/snmp/tests/reflection.phpt index 8e2b92f2e8..11938f355f 100644 --- a/ext/snmp/tests/reflection.phpt +++ b/ext/snmp/tests/reflection.phpt @@ -21,7 +21,7 @@ reflection::export(new reflectionmethod('snmp', 'getError')); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- Method [ <internal:snmp, ctor> public method __construct ] { - Parameters [5] { diff --git a/ext/soap/tests/bug68996.phpt b/ext/soap/tests/bug68996.phpt index e503d80239..5168e1fcfc 100644 --- a/ext/soap/tests/bug68996.phpt +++ b/ext/soap/tests/bug68996.phpt @@ -38,7 +38,7 @@ $HTTP_RAW_POST_DATA = <<<EOF EOF; $s->handle($HTTP_RAW_POST_DATA); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0" encoding="UTF-8"?> <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode></faultcode><faultstring>some msg</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope> <?xml version="1.0" encoding="UTF-8"?> diff --git a/ext/sockets/tests/bug49341.phpt b/ext/sockets/tests/bug49341.phpt index 961b5e7bc8..a73c4c1c63 100644 --- a/ext/sockets/tests/bug49341.phpt +++ b/ext/sockets/tests/bug49341.phpt @@ -11,5 +11,5 @@ if (PHP_OS !== 'Darwin' && false === strpos(PHP_OS, 'BSD')) { --FILE-- <?php var_dump(defined('SO_REUSEPORT')); ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/sockets/tests/bug63000.phpt b/ext/sockets/tests/bug63000.phpt index c806ba4c08..364f9f965b 100644 --- a/ext/sockets/tests/bug63000.phpt +++ b/ext/sockets/tests/bug63000.phpt @@ -18,5 +18,5 @@ $so = socket_set_option($socket, IPPROTO_IP, MCAST_JOIN_GROUP, array( "interface" => 0, )); var_dump($so); ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/sockets/tests/socket_abstract_path.phpt b/ext/sockets/tests/socket_abstract_path.phpt index 816e5c11bb..4c89dc4238 100644 --- a/ext/sockets/tests/socket_abstract_path.phpt +++ b/ext/sockets/tests/socket_abstract_path.phpt @@ -37,7 +37,7 @@ checktimeout($conns, 500); if (!socket_recv($conns, $buf, 20, 0)) die("recv"); print_r($buf); ?> ---EXPECTF-- +--EXPECT-- creating server socket creating client socket int(11) diff --git a/ext/sockets/tests/socket_abstract_path_sendmsg.phpt b/ext/sockets/tests/socket_abstract_path_sendmsg.phpt index 5a9275a26b..e8499e021c 100644 --- a/ext/sockets/tests/socket_abstract_path_sendmsg.phpt +++ b/ext/sockets/tests/socket_abstract_path_sendmsg.phpt @@ -33,7 +33,7 @@ checktimeout($s, 500); if (!socket_recv($s, $buf, 20, 0)) die("recv"); print_r($buf); ?> ---EXPECTF-- +--EXPECT-- creating send socket creating receive socket int(11) diff --git a/ext/sockets/tests/socket_bind.phpt b/ext/sockets/tests/socket_bind.phpt index 7ea2df8e1c..28cf36c322 100644 --- a/ext/sockets/tests/socket_bind.phpt +++ b/ext/sockets/tests/socket_bind.phpt @@ -33,7 +33,7 @@ fa@php.net var_dump($s_close); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) int(16) diff --git a/ext/sockets/tests/socket_select-wrongparams-1-win32.phpt b/ext/sockets/tests/socket_select-wrongparams-1-win32.phpt index 34d46d6f6f..490bb7319a 100644 --- a/ext/sockets/tests/socket_select-wrongparams-1-win32.phpt +++ b/ext/sockets/tests/socket_select-wrongparams-1-win32.phpt @@ -18,7 +18,7 @@ $write = null; $except = null; $time = -1; var_dump(socket_select($sockets, $write, $except, $time)); ---EXPECTF-- +--EXPECT-- int(0) --CREDITS-- Till Klampaeckel, till@php.net diff --git a/ext/sockets/tests/socket_send.phpt b/ext/sockets/tests/socket_send.phpt index 969a79eb2a..a11e0d7732 100644 --- a/ext/sockets/tests/socket_send.phpt +++ b/ext/sockets/tests/socket_send.phpt @@ -47,7 +47,7 @@ unset($stringSocketLength); unset($socket); unset($socketConn); ?> ---EXPECTF-- +--EXPECT-- okey okey okey diff --git a/ext/sockets/tests/socket_send_win32.phpt b/ext/sockets/tests/socket_send_win32.phpt index 0f2311b984..3f53dfc5a2 100644 --- a/ext/sockets/tests/socket_send_win32.phpt +++ b/ext/sockets/tests/socket_send_win32.phpt @@ -38,6 +38,6 @@ unset($stringSocketLength); unset($socket); unset($socketConn); ?> ---EXPECTF-- +--EXPECT-- okey okey diff --git a/ext/spl/tests/ArrayObject_unserialize_empty_string.phpt b/ext/spl/tests/ArrayObject_unserialize_empty_string.phpt index 4c446c82b9..d2c75f7f09 100644 --- a/ext/spl/tests/ArrayObject_unserialize_empty_string.phpt +++ b/ext/spl/tests/ArrayObject_unserialize_empty_string.phpt @@ -9,5 +9,5 @@ $a = new ArrayObject(array()); $a->unserialize(""); ?> Done ---EXPECTF-- +--EXPECT-- Done diff --git a/ext/spl/tests/DirectoryIterator_getBasename_basic_test.phpt b/ext/spl/tests/DirectoryIterator_getBasename_basic_test.phpt index d4f22f68a1..520f65e9cb 100644 --- a/ext/spl/tests/DirectoryIterator_getBasename_basic_test.phpt +++ b/ext/spl/tests/DirectoryIterator_getBasename_basic_test.phpt @@ -19,5 +19,5 @@ PHPNW Testfest 2009 - Adrian Hardy unlink($targetDir.DIRECTORY_SEPARATOR.'getBasename_test.txt'); rmdir($targetDir); ?> ---EXPECTF-- +--EXPECT-- getBasename_test diff --git a/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt b/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt index 7398d4b9d2..a35a524f35 100644 --- a/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt +++ b/ext/spl/tests/DirectoryIterator_getExtension_basic.phpt @@ -40,7 +40,7 @@ foreach ($files as $file) { } rmdir($dir); ?> ---EXPECTF-- +--EXPECT-- bool(true) array(5) { [0]=> diff --git a/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt b/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt index 0c75bf4c00..81ab6c0921 100644 --- a/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt +++ b/ext/spl/tests/DirectoryIterator_getGroup_basic.phpt @@ -25,5 +25,5 @@ var_dump($expected == $actual); $dirname = 'DirectoryIterator_getGroup_basic'; rmdir($dirname); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt b/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt index a1092c2fea..709510d7cf 100644 --- a/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt +++ b/ext/spl/tests/DirectoryIterator_getOwner_basic.phpt @@ -25,5 +25,5 @@ var_dump($expected == $actual); $dirname = 'DirectoryIterator_getOwner_basic'; rmdir($dirname); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/spl/tests/SplDoublyLinkedList_add_invalid_offset.phpt b/ext/spl/tests/SplDoublyLinkedList_add_invalid_offset.phpt index b94b067f4d..fa38d93425 100644 --- a/ext/spl/tests/SplDoublyLinkedList_add_invalid_offset.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_add_invalid_offset.phpt @@ -9,5 +9,5 @@ try { echo "Exception: ".$e->getMessage()."\n"; } ?> ---EXPECTF-- +--EXPECT-- Exception: Offset invalid or out of range diff --git a/ext/spl/tests/SplDoublyLinkedList_add_null_offset.phpt b/ext/spl/tests/SplDoublyLinkedList_add_null_offset.phpt index 396f89b491..b14c9ab013 100644 --- a/ext/spl/tests/SplDoublyLinkedList_add_null_offset.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_add_null_offset.phpt @@ -9,5 +9,5 @@ try { echo "Exception: ".$e->getMessage()."\n"; } ?> ---EXPECTF-- +--EXPECT-- Exception: Offset invalid or out of range diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetExists_success.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetExists_success.phpt index 0399b4948d..fc8c4b7dcd 100644 --- a/ext/spl/tests/SplDoublyLinkedList_offsetExists_success.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_offsetExists_success.phpt @@ -25,7 +25,7 @@ if($list->offsetExists(2) === false) { echo "PASS\n"; } ?> ---EXPECTF-- +--EXPECT-- PASS PASS PASS diff --git a/ext/spl/tests/SplFileInfo_getExtension_basic.phpt b/ext/spl/tests/SplFileInfo_getExtension_basic.phpt index b47b6bb4d0..72597ef12d 100644 --- a/ext/spl/tests/SplFileInfo_getExtension_basic.phpt +++ b/ext/spl/tests/SplFileInfo_getExtension_basic.phpt @@ -18,7 +18,7 @@ foreach ($exts as $ext) { unlink($file . $ext); } ?> ---EXPECTF-- +--EXPECT-- string(3) "txt" string(3) "txt" string(9) "extension" diff --git a/ext/spl/tests/SplFileInfo_getGroup_basic.phpt b/ext/spl/tests/SplFileInfo_getGroup_basic.phpt index d279935637..fcfafefdb4 100644 --- a/ext/spl/tests/SplFileInfo_getGroup_basic.phpt +++ b/ext/spl/tests/SplFileInfo_getGroup_basic.phpt @@ -22,5 +22,5 @@ var_dump($expected == $actual); $filename = __DIR__ . "/SplFileInfo_getGroup_basic"; unlink($filename); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/spl/tests/SplFileInfo_getInode_basic.phpt b/ext/spl/tests/SplFileInfo_getInode_basic.phpt index 9ee2c6ee51..5e2a110879 100644 --- a/ext/spl/tests/SplFileInfo_getInode_basic.phpt +++ b/ext/spl/tests/SplFileInfo_getInode_basic.phpt @@ -26,5 +26,5 @@ var_dump($fileInfo->getInode() == $result); <?php unlink('SplFileInfo_getInode_basic.txt'); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/spl/tests/SplFileInfo_getOwner_basic.phpt b/ext/spl/tests/SplFileInfo_getOwner_basic.phpt index 3df8e4858b..97932b10ad 100644 --- a/ext/spl/tests/SplFileInfo_getOwner_basic.phpt +++ b/ext/spl/tests/SplFileInfo_getOwner_basic.phpt @@ -22,5 +22,5 @@ var_dump($expected == $actual); $filename = __DIR__ . "/SplFileInfo_getOwner_basic"; unlink($filename); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/spl/tests/SplFileInfo_getPerms_basic.phpt b/ext/spl/tests/SplFileInfo_getPerms_basic.phpt index af09907605..f6eb4104fe 100644 --- a/ext/spl/tests/SplFileInfo_getPerms_basic.phpt +++ b/ext/spl/tests/SplFileInfo_getPerms_basic.phpt @@ -26,5 +26,5 @@ var_dump($fileInfo->getPerms() == 0100557); <?php unlink('SplFileInfo_getPerms_basic.txt'); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/spl/tests/SplFileInfo_setInfoClass_error.phpt b/ext/spl/tests/SplFileInfo_setInfoClass_error.phpt index aa884b30a0..a280a6e147 100644 --- a/ext/spl/tests/SplFileInfo_setInfoClass_error.phpt +++ b/ext/spl/tests/SplFileInfo_setInfoClass_error.phpt @@ -12,5 +12,5 @@ try { } ?> ---EXPECTF-- +--EXPECT-- SplFileInfo::setInfoClass() expects parameter 1 to be a class name derived from SplFileInfo, 'stdClass' given diff --git a/ext/spl/tests/SplFileObject_fflush_basic_001.phpt b/ext/spl/tests/SplFileObject_fflush_basic_001.phpt index 2d8a9c8044..e4ea7fe8f1 100644 --- a/ext/spl/tests/SplFileObject_fflush_basic_001.phpt +++ b/ext/spl/tests/SplFileObject_fflush_basic_001.phpt @@ -33,6 +33,6 @@ $obj = New SplFileObject("SPLtest://ftruncate_test"); var_dump($obj->fflush()); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(false) diff --git a/ext/spl/tests/SplFileObject_fgetcsv_basic.phpt b/ext/spl/tests/SplFileObject_fgetcsv_basic.phpt index 84b5403698..28901050d3 100644 --- a/ext/spl/tests/SplFileObject_fgetcsv_basic.phpt +++ b/ext/spl/tests/SplFileObject_fgetcsv_basic.phpt @@ -18,7 +18,7 @@ var_dump($fo->fgetcsv()); <?php unlink('SplFileObject__fgetcsv1.csv'); ?> ---EXPECTF-- +--EXPECT-- array(4) { [0]=> string(6) "field1" diff --git a/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt b/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt index a8125a0257..585e0b6e39 100644 --- a/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt +++ b/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt @@ -18,7 +18,7 @@ var_dump($fo->fgetcsv('|')); <?php unlink('SplFileObject__fgetcsv2.csv'); ?> ---EXPECTF-- +--EXPECT-- array(4) { [0]=> string(6) "field1" diff --git a/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt b/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt index efe765cbf8..32527a9238 100644 --- a/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt +++ b/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt @@ -18,7 +18,7 @@ var_dump($fo->fgetcsv(',', '"')); <?php unlink('SplFileObject__fgetcsv4.csv'); ?> ---EXPECTF-- +--EXPECT-- array(4) { [0]=> string(6) "field1" diff --git a/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt b/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt index 960f36d63f..f6a68ff1fa 100644 --- a/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt +++ b/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt @@ -13,7 +13,7 @@ var_dump($fo->fgetcsv(',', '"', '"')); <?php unlink('SplFileObject__fgetcsv6.csv'); ?> ---EXPECTF-- +--EXPECT-- array(3) { [0]=> string(3) "aaa" diff --git a/ext/spl/tests/SplFileObject_fgetcsv_escape_default.phpt b/ext/spl/tests/SplFileObject_fgetcsv_escape_default.phpt index 69089636c1..9614f91d41 100644 --- a/ext/spl/tests/SplFileObject_fgetcsv_escape_default.phpt +++ b/ext/spl/tests/SplFileObject_fgetcsv_escape_default.phpt @@ -13,7 +13,7 @@ var_dump($fo->fgetcsv()); <?php unlink('SplFileObject__fgetcsv7.csv'); ?> ---EXPECTF-- +--EXPECT-- array(3) { [0]=> string(4) "aa\"" diff --git a/ext/spl/tests/SplFixedArray__construct_param_array.phpt b/ext/spl/tests/SplFixedArray__construct_param_array.phpt index 57832e7c30..89983c377e 100644 --- a/ext/spl/tests/SplFixedArray__construct_param_array.phpt +++ b/ext/spl/tests/SplFixedArray__construct_param_array.phpt @@ -12,5 +12,5 @@ try { } ?> ---EXPECTF-- +--EXPECT-- Ok - SplFixedArray::__construct() expects parameter 1 to be int, array given diff --git a/ext/spl/tests/SplFixedArray__construct_param_null.phpt b/ext/spl/tests/SplFixedArray__construct_param_null.phpt index 3b1543d4dc..4685c20b29 100644 --- a/ext/spl/tests/SplFixedArray__construct_param_null.phpt +++ b/ext/spl/tests/SplFixedArray__construct_param_null.phpt @@ -10,7 +10,7 @@ $array = new SplFixedArray( NULL ); print_r( $array ); ?> ---EXPECTF-- +--EXPECT-- SplFixedArray Object ( )
\ No newline at end of file diff --git a/ext/spl/tests/SplFixedArray__construct_param_string.phpt b/ext/spl/tests/SplFixedArray__construct_param_string.phpt index c10edbddc2..bfec39de32 100644 --- a/ext/spl/tests/SplFixedArray__construct_param_string.phpt +++ b/ext/spl/tests/SplFixedArray__construct_param_string.phpt @@ -12,5 +12,5 @@ try { ?> ---EXPECTF-- +--EXPECT-- Ok - SplFixedArray::__construct() expects parameter 1 to be int, string given diff --git a/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt b/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt index d8daca9a33..af9f5f3ee8 100644 --- a/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt +++ b/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt @@ -11,5 +11,5 @@ try { } ?> ---EXPECTF-- +--EXPECT-- Ok - SplFixedArray::__construct() expects parameter 1 to be int, object given diff --git a/ext/spl/tests/SplFixedArray_setSize_param_float.phpt b/ext/spl/tests/SplFixedArray_setSize_param_float.phpt index c65686c61d..7e76485885 100644 --- a/ext/spl/tests/SplFixedArray_setSize_param_float.phpt +++ b/ext/spl/tests/SplFixedArray_setSize_param_float.phpt @@ -8,7 +8,7 @@ $fixed_array = new SplFixedArray(2); $fixed_array->setSize(3.14159); var_dump($fixed_array); ?> ---EXPECTF-- +--EXPECT-- object(SplFixedArray)#1 (3) { [0]=> NULL diff --git a/ext/spl/tests/SplHeap_isEmpty.phpt b/ext/spl/tests/SplHeap_isEmpty.phpt index e179dbc8ec..c3f79c6882 100644 --- a/ext/spl/tests/SplHeap_isEmpty.phpt +++ b/ext/spl/tests/SplHeap_isEmpty.phpt @@ -10,6 +10,6 @@ $h = new SplMaxHeap(); var_dump($h->isEmpty()); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter3.phpt b/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter3.phpt index 617f85e63c..bc9f78a1ca 100644 --- a/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter3.phpt +++ b/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter3.phpt @@ -15,5 +15,5 @@ try { ?> Done ---EXPECTF-- +--EXPECT-- Done diff --git a/ext/spl/tests/SplQueue_setIteratorMode.phpt b/ext/spl/tests/SplQueue_setIteratorMode.phpt index 172a1d97a4..5ad1d9258a 100644 --- a/ext/spl/tests/SplQueue_setIteratorMode.phpt +++ b/ext/spl/tests/SplQueue_setIteratorMode.phpt @@ -11,5 +11,5 @@ try { echo $e->getMessage(); } ?> ---EXPECTF-- +--EXPECT-- Iterators' LIFO/FIFO modes for SplStack/SplQueue objects are frozen diff --git a/ext/spl/tests/SplStack_setIteratorMode.phpt b/ext/spl/tests/SplStack_setIteratorMode.phpt index d70105e034..342a6b8bb2 100644 --- a/ext/spl/tests/SplStack_setIteratorMode.phpt +++ b/ext/spl/tests/SplStack_setIteratorMode.phpt @@ -11,5 +11,5 @@ try { echo $e->getMessage(); } ?> ---EXPECTF-- +--EXPECT-- Iterators' LIFO/FIFO modes for SplStack/SplQueue objects are frozen diff --git a/ext/spl/tests/SplTempFileObject_constructor_basic.phpt b/ext/spl/tests/SplTempFileObject_constructor_basic.phpt index b2e640c7ac..2692b2c48d 100644 --- a/ext/spl/tests/SplTempFileObject_constructor_basic.phpt +++ b/ext/spl/tests/SplTempFileObject_constructor_basic.phpt @@ -4,7 +4,7 @@ SPL SplTempFileObject constructor sets correct defaults when pass 0 arguments <?php var_dump(new SplTempFileObject()); ?> ---EXPECTF-- +--EXPECT-- object(SplTempFileObject)#1 (5) { ["pathName":"SplFileInfo":private]=> string(10) "php://temp" diff --git a/ext/spl/tests/SplTempFileObject_constructor_error.phpt b/ext/spl/tests/SplTempFileObject_constructor_error.phpt index 338aa4b0b0..37b00991ff 100644 --- a/ext/spl/tests/SplTempFileObject_constructor_error.phpt +++ b/ext/spl/tests/SplTempFileObject_constructor_error.phpt @@ -8,5 +8,5 @@ try { echo $e->getMessage(), "\n"; } ?> ---EXPECTF-- +--EXPECT-- SplTempFileObject::__construct() expects parameter 1 to be int, string given diff --git a/ext/spl/tests/SplTempFileObject_constructor_maxmemory_basic.phpt b/ext/spl/tests/SplTempFileObject_constructor_maxmemory_basic.phpt index 2ef1b2cd1a..765635f530 100644 --- a/ext/spl/tests/SplTempFileObject_constructor_maxmemory_basic.phpt +++ b/ext/spl/tests/SplTempFileObject_constructor_maxmemory_basic.phpt @@ -4,7 +4,7 @@ SPL SplTempFileObject constructor sets correct values when passed fixed memory s <?php var_dump(new SplTempFileObject(1024)); ?> ---EXPECTF-- +--EXPECT-- object(SplTempFileObject)#1 (5) { ["pathName":"SplFileInfo":private]=> string(25) "php://temp/maxmemory:1024" diff --git a/ext/spl/tests/SplTempFileObject_constructor_memory_lt1_variation.phpt b/ext/spl/tests/SplTempFileObject_constructor_memory_lt1_variation.phpt index 9fe5892113..0984acccbf 100644 --- a/ext/spl/tests/SplTempFileObject_constructor_memory_lt1_variation.phpt +++ b/ext/spl/tests/SplTempFileObject_constructor_memory_lt1_variation.phpt @@ -4,7 +4,7 @@ SPL SplTempFileObject constructor sets correct defaults when passed a negative v <?php var_dump(new SplTempFileObject(-1)); ?> ---EXPECTF-- +--EXPECT-- object(SplTempFileObject)#1 (5) { ["pathName":"SplFileInfo":private]=> string(12) "php://memory" diff --git a/ext/spl/tests/arrayObject___construct_basic1.phpt b/ext/spl/tests/arrayObject___construct_basic1.phpt index f192ccab45..a14166c35e 100644 --- a/ext/spl/tests/arrayObject___construct_basic1.phpt +++ b/ext/spl/tests/arrayObject___construct_basic1.phpt @@ -16,7 +16,7 @@ var_dump(new ArrayObject(array('key1' => 'val1'))); echo "--> Nested ArrayObject argument:\n"; var_dump(new ArrayObject(new ArrayObject($a))); ?> ---EXPECTF-- +--EXPECT-- --> No arguments: object(ArrayObject)#1 (1) { ["storage":"ArrayObject":private]=> diff --git a/ext/spl/tests/arrayObject___construct_basic6.phpt b/ext/spl/tests/arrayObject___construct_basic6.phpt index 1c7ec36363..58ba46061b 100644 --- a/ext/spl/tests/arrayObject___construct_basic6.phpt +++ b/ext/spl/tests/arrayObject___construct_basic6.phpt @@ -21,7 +21,7 @@ var_dump($ao); $ao = new MyArrayObject(array(1,2,3), ArrayObject::STD_PROP_LIST); var_dump($ao); ?> ---EXPECTF-- +--EXPECT-- object(ArrayObject)#1 (2) { ["p"]=> int(1) diff --git a/ext/spl/tests/arrayObject___construct_error1.phpt b/ext/spl/tests/arrayObject___construct_error1.phpt index f0e1107d51..aaf38ac499 100644 --- a/ext/spl/tests/arrayObject___construct_error1.phpt +++ b/ext/spl/tests/arrayObject___construct_error1.phpt @@ -18,7 +18,7 @@ try { echo $e->getMessage() . "(" . $e->getLine() . ")\n"; } ?> ---EXPECTF-- +--EXPECT-- Bad iterator type: ArrayObject::__construct() expects parameter 3 to be a class name derived from Iterator, 'Exception' given(6) Non-existent class: diff --git a/ext/spl/tests/arrayObject___construct_error2.phpt b/ext/spl/tests/arrayObject___construct_error2.phpt index 35ba83d09f..ec01f57e34 100644 --- a/ext/spl/tests/arrayObject___construct_error2.phpt +++ b/ext/spl/tests/arrayObject___construct_error2.phpt @@ -17,6 +17,6 @@ try { echo $e->getMessage() . "(" . $e->getLine() . ")\n"; } ?> ---EXPECTF-- +--EXPECT-- Too many arguments: ArrayObject::__construct() expects at most 3 parameters, 4 given(12) diff --git a/ext/spl/tests/arrayObject_asort_basic2.phpt b/ext/spl/tests/arrayObject_asort_basic2.phpt index d481d0c4ed..7c506e1214 100644 --- a/ext/spl/tests/arrayObject_asort_basic2.phpt +++ b/ext/spl/tests/arrayObject_asort_basic2.phpt @@ -23,7 +23,7 @@ var_dump($ao1->asort()); var_dump($ao1, $c); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ArrayObject::asort() : basic functionality *** bool(true) object(ArrayObject)#2 (1) { diff --git a/ext/spl/tests/arrayObject_clone_basic1.phpt b/ext/spl/tests/arrayObject_clone_basic1.phpt index dd4abf3ffb..67876330f5 100644 --- a/ext/spl/tests/arrayObject_clone_basic1.phpt +++ b/ext/spl/tests/arrayObject_clone_basic1.phpt @@ -13,7 +13,7 @@ $aa1['new.aa1'] = 'new element added to aa1'; $aa2['new.aa2'] = 'new element added to aa2'; var_dump($a, $aa1, $aa2); ?> ---EXPECTF-- +--EXPECT-- array(4) { [0]=> int(1) diff --git a/ext/spl/tests/arrayObject_clone_basic2.phpt b/ext/spl/tests/arrayObject_clone_basic2.phpt index 932eaed712..dccd26492f 100644 --- a/ext/spl/tests/arrayObject_clone_basic2.phpt +++ b/ext/spl/tests/arrayObject_clone_basic2.phpt @@ -15,7 +15,7 @@ $ao1['new.ao1'] = 'new element added to ao1'; $ao2['new.ao2'] = 'new element added to ao2'; var_dump($c, $ao1, $ao2); ?> ---EXPECTF-- +--EXPECT-- object(C)#1 (3) { ["p1"]=> string(32) "new prop added to c before clone" diff --git a/ext/spl/tests/arrayObject_clone_basic3.phpt b/ext/spl/tests/arrayObject_clone_basic3.phpt index f7ac89442e..53afecb58f 100644 --- a/ext/spl/tests/arrayObject_clone_basic3.phpt +++ b/ext/spl/tests/arrayObject_clone_basic3.phpt @@ -21,7 +21,7 @@ $clonedOuterArrayObject['new.coAO'] = 'new element added to $clonedOuterArrayObj var_dump($wrappedObject, $innerArrayObject, $outerArrayObject, $clonedOuterArrayObject); ?> ---EXPECTF-- +--EXPECT-- object(C)#1 (5) { ["p"]=> string(9) "C::p.orig" diff --git a/ext/spl/tests/arrayObject_getFlags_basic1.phpt b/ext/spl/tests/arrayObject_getFlags_basic1.phpt index b078c51ab2..b9445d4119 100644 --- a/ext/spl/tests/arrayObject_getFlags_basic1.phpt +++ b/ext/spl/tests/arrayObject_getFlags_basic1.phpt @@ -17,7 +17,7 @@ var_dump($ao->getFlags()); $cao = clone $ao; var_dump($cao->getFlags()); ?> ---EXPECTF-- +--EXPECT-- int(0) int(1) int(2) diff --git a/ext/spl/tests/arrayObject_getFlags_basic2.phpt b/ext/spl/tests/arrayObject_getFlags_basic2.phpt index f7d56eaf88..651c240303 100644 --- a/ext/spl/tests/arrayObject_getFlags_basic2.phpt +++ b/ext/spl/tests/arrayObject_getFlags_basic2.phpt @@ -16,7 +16,7 @@ $ao2 = new ArrayObject($ao, 0); var_dump($ao2->getFlags()); ?> ---EXPECTF-- +--EXPECT-- int(3) int(3) int(3) diff --git a/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt b/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt index b23c196224..2b67093da2 100644 --- a/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt +++ b/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt @@ -58,7 +58,7 @@ foreach($ao as $key=>$value) { } ?> ---EXPECTF-- +--EXPECT-- --> Access using MyIterator: string(10) "MyIterator" object(MyIterator)#2 (1) { diff --git a/ext/spl/tests/arrayObject_ksort_basic2.phpt b/ext/spl/tests/arrayObject_ksort_basic2.phpt index 1464e73761..cd1020c0cb 100644 --- a/ext/spl/tests/arrayObject_ksort_basic2.phpt +++ b/ext/spl/tests/arrayObject_ksort_basic2.phpt @@ -23,7 +23,7 @@ var_dump($ao1->ksort()); var_dump($ao1, $c); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ArrayObject::ksort() : basic functionality *** bool(true) object(ArrayObject)#2 (1) { diff --git a/ext/spl/tests/arrayObject_magicMethods5.phpt b/ext/spl/tests/arrayObject_magicMethods5.phpt index 023086d83a..78f0adbdd1 100644 --- a/ext/spl/tests/arrayObject_magicMethods5.phpt +++ b/ext/spl/tests/arrayObject_magicMethods5.phpt @@ -70,7 +70,7 @@ var_dump($obj); echo " Wrapping ArrayObject:\n"; var_dump($ao); ?> ---EXPECTF-- +--EXPECT-- --> Write existent, non-existent and dynamic: In UsesMagic::__set(a,changed) In UsesMagic::__set(dynamic,new) diff --git a/ext/spl/tests/arrayObject_natcasesort_basic1.phpt b/ext/spl/tests/arrayObject_natcasesort_basic1.phpt index 62ad2ed482..c959fb88e2 100644 --- a/ext/spl/tests/arrayObject_natcasesort_basic1.phpt +++ b/ext/spl/tests/arrayObject_natcasesort_basic1.phpt @@ -19,7 +19,7 @@ var_dump($ao2->natcasesort('blah')); var_dump($ao2); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ArrayObject::natcasesort() : basic functionality *** bool(true) object(ArrayObject)#1 (1) { diff --git a/ext/spl/tests/arrayObject_natsort_basic1.phpt b/ext/spl/tests/arrayObject_natsort_basic1.phpt index 1b4fd60f55..d23e819f1d 100644 --- a/ext/spl/tests/arrayObject_natsort_basic1.phpt +++ b/ext/spl/tests/arrayObject_natsort_basic1.phpt @@ -19,7 +19,7 @@ var_dump($ao2->natsort('blah')); var_dump($ao2); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ArrayObject::natsort() : basic functionality *** bool(true) object(ArrayObject)#1 (1) { diff --git a/ext/spl/tests/arrayObject_offsetExists_nullcheck.phpt b/ext/spl/tests/arrayObject_offsetExists_nullcheck.phpt index 1953643c84..e20e9918d7 100644 --- a/ext/spl/tests/arrayObject_offsetExists_nullcheck.phpt +++ b/ext/spl/tests/arrayObject_offsetExists_nullcheck.phpt @@ -6,5 +6,5 @@ $ao = new ArrayObject(array('foo' => null)); var_dump($ao->offsetExists('foo')); ?> ---EXPECTF-- +--EXPECT-- bool(true)
\ No newline at end of file diff --git a/ext/spl/tests/arrayObject_uasort_basic1.phpt b/ext/spl/tests/arrayObject_uasort_basic1.phpt index 203edb6fb8..6e447b6a63 100644 --- a/ext/spl/tests/arrayObject_uasort_basic1.phpt +++ b/ext/spl/tests/arrayObject_uasort_basic1.phpt @@ -28,7 +28,7 @@ $ao->uasort('cmp'); var_dump($ao); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ArrayObject::uasort() : basic functionality *** object(ArrayObject)#1 (1) { ["storage":"ArrayObject":private]=> diff --git a/ext/spl/tests/arrayObject_uasort_error1.phpt b/ext/spl/tests/arrayObject_uasort_error1.phpt index d7306c9c88..74e3d65089 100644 --- a/ext/spl/tests/arrayObject_uasort_error1.phpt +++ b/ext/spl/tests/arrayObject_uasort_error1.phpt @@ -24,7 +24,7 @@ try { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Function expects exactly one argument Function expects exactly one argument ===DONE=== diff --git a/ext/spl/tests/arrayObject_uksort_basic1.phpt b/ext/spl/tests/arrayObject_uksort_basic1.phpt index 1581589e43..825c4d747c 100644 --- a/ext/spl/tests/arrayObject_uksort_basic1.phpt +++ b/ext/spl/tests/arrayObject_uksort_basic1.phpt @@ -27,7 +27,7 @@ $ao->uksort('cmp'); var_dump($ao); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing ArrayObject::uksort() : basic functionality *** object(ArrayObject)#1 (1) { ["storage":"ArrayObject":private]=> diff --git a/ext/spl/tests/arrayObject_uksort_error1.phpt b/ext/spl/tests/arrayObject_uksort_error1.phpt index d019fc4400..ec699eb67d 100644 --- a/ext/spl/tests/arrayObject_uksort_error1.phpt +++ b/ext/spl/tests/arrayObject_uksort_error1.phpt @@ -24,7 +24,7 @@ try { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Function expects exactly one argument Function expects exactly one argument ===DONE=== diff --git a/ext/spl/tests/array_003.phpt b/ext/spl/tests/array_003.phpt index de4ce30f91..204387da04 100644 --- a/ext/spl/tests/array_003.phpt +++ b/ext/spl/tests/array_003.phpt @@ -36,7 +36,7 @@ foreach($test as $key => $val) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- test Object ( [pub] => public diff --git a/ext/spl/tests/array_004.phpt b/ext/spl/tests/array_004.phpt index 0b80e5c89f..c976bdd87b 100644 --- a/ext/spl/tests/array_004.phpt +++ b/ext/spl/tests/array_004.phpt @@ -17,7 +17,7 @@ foreach($obj as $ak=>$av) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 0=>0 - 0=>0 0=>0 - 1=>1 0=>0 - 2=>2 diff --git a/ext/spl/tests/array_006.phpt b/ext/spl/tests/array_006.phpt index 49f2838f77..2735432e26 100644 --- a/ext/spl/tests/array_006.phpt +++ b/ext/spl/tests/array_006.phpt @@ -22,7 +22,7 @@ foreach($obj as $ak=>$av) { ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- ==Normal== 0=>0 - 0=>0 0=>0 - 1=>1 diff --git a/ext/spl/tests/array_007.phpt b/ext/spl/tests/array_007.phpt index 7d9bf6afc1..edf2a922d6 100644 --- a/ext/spl/tests/array_007.phpt +++ b/ext/spl/tests/array_007.phpt @@ -40,7 +40,7 @@ foreach($test as $key => $val) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- test Object ( [pub] => public diff --git a/ext/spl/tests/array_008.phpt b/ext/spl/tests/array_008.phpt index e7a618dda5..01b2290e50 100644 --- a/ext/spl/tests/array_008.phpt +++ b/ext/spl/tests/array_008.phpt @@ -18,7 +18,7 @@ foreach($obj as $ak=>&$av) { ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- 0=>modify - 0=>modify 0=>modify - 1=>1 0=>modify - 2=>2 diff --git a/ext/spl/tests/array_014.phpt b/ext/spl/tests/array_014.phpt index 1ac9d4f956..4bf0b83c9c 100644 --- a/ext/spl/tests/array_014.phpt +++ b/ext/spl/tests/array_014.phpt @@ -39,7 +39,7 @@ foreach($it as $v) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- int(11) int(5) int(4) diff --git a/ext/spl/tests/array_016.phpt b/ext/spl/tests/array_016.phpt index 8637c5c886..0a6edea01c 100644 --- a/ext/spl/tests/array_016.phpt +++ b/ext/spl/tests/array_016.phpt @@ -20,7 +20,7 @@ foreach(new IteratorIterator($it) as $v) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- int(0) int(1) int(2) diff --git a/ext/spl/tests/array_018.phpt b/ext/spl/tests/array_018.phpt Binary files differindex 7c68a6280e..9d20ae47a9 100644 --- a/ext/spl/tests/array_018.phpt +++ b/ext/spl/tests/array_018.phpt diff --git a/ext/spl/tests/array_020.phpt b/ext/spl/tests/array_020.phpt index 4c6fe0df25..3258c7f16c 100644 --- a/ext/spl/tests/array_020.phpt +++ b/ext/spl/tests/array_020.phpt @@ -46,7 +46,7 @@ foreach($ar as $k => $v) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- ArrayIteratorEx::rewind ArrayIteratorEx::valid ArrayIteratorEx::current diff --git a/ext/spl/tests/bug31346.phpt b/ext/spl/tests/bug31346.phpt index e3bf51f57f..b2d29905ac 100644 --- a/ext/spl/tests/bug31346.phpt +++ b/ext/spl/tests/bug31346.phpt @@ -14,5 +14,5 @@ $i->next(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== diff --git a/ext/spl/tests/bug37457.phpt b/ext/spl/tests/bug37457.phpt index e66fa4d6ed..188d2fba81 100644 --- a/ext/spl/tests/bug37457.phpt +++ b/ext/spl/tests/bug37457.phpt @@ -69,7 +69,7 @@ catch (Exception $e) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Collection::__construct Collection::rewind Collection::valid diff --git a/ext/spl/tests/bug38618.phpt b/ext/spl/tests/bug38618.phpt index 17439b4973..95a3da83cc 100644 --- a/ext/spl/tests/bug38618.phpt +++ b/ext/spl/tests/bug38618.phpt @@ -88,7 +88,7 @@ test_array($array, 'Protected Property New', RecursiveArrayIterator::CHILD_ARRAY <?php exit(0); ?> ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===Default with array=== 1 => apple 1 => grape diff --git a/ext/spl/tests/bug41691.phpt b/ext/spl/tests/bug41691.phpt index 3cf3d8780c..11fe80817c 100644 --- a/ext/spl/tests/bug41691.phpt +++ b/ext/spl/tests/bug41691.phpt @@ -17,7 +17,7 @@ var_dump($a->exchangeArray(array('a'=>1,'b'=>1,'c'=>1))); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(3) { ["a"]=> NULL diff --git a/ext/spl/tests/bug42703.phpt b/ext/spl/tests/bug42703.phpt index 5c52763cd6..4b3e4675cc 100644 --- a/ext/spl/tests/bug42703.phpt +++ b/ext/spl/tests/bug42703.phpt @@ -35,7 +35,7 @@ catch (Exception $e) { var_dump($itit->current()); var_dump($itit->key()); ?> ---EXPECTF-- +--EXPECT-- string(3) "boo" NULL NULL diff --git a/ext/spl/tests/bug44615.phpt b/ext/spl/tests/bug44615.phpt index 1fd3d199dc..0b9aa82bc3 100644 --- a/ext/spl/tests/bug44615.phpt +++ b/ext/spl/tests/bug44615.phpt @@ -20,7 +20,7 @@ foreach (new RecursiveIteratorIterator($rai) as $t) { var_dump($t); } ?> ---EXPECTF-- +--EXPECT-- string(1) "z" object(stdClass)#1 (0) { } diff --git a/ext/spl/tests/bug45216.phpt b/ext/spl/tests/bug45216.phpt index b3c4aa51bf..0c4ab93ff3 100644 --- a/ext/spl/tests/bug45216.phpt +++ b/ext/spl/tests/bug45216.phpt @@ -17,6 +17,6 @@ var_dump(fgetss($handle)); <?php unlink(dirname(__FILE__) . '/foo.html'); ?> ---EXPECTF-- +--EXPECT-- string(12) "text 0text 1" string(12) "text 0text 1" diff --git a/ext/spl/tests/bug50579.phpt b/ext/spl/tests/bug50579.phpt index e32262a743..8672f86eea 100644 --- a/ext/spl/tests/bug50579.phpt +++ b/ext/spl/tests/bug50579.phpt @@ -31,7 +31,7 @@ foreach ($i as $name=>$value) { } ?> ---EXPECTF-- +--EXPECT-- test1=>[test888] test3=>[test999] test1=>888 diff --git a/ext/spl/tests/bug52573.phpt b/ext/spl/tests/bug52573.phpt index 54587fae1d..8817da0f1e 100644 --- a/ext/spl/tests/bug52573.phpt +++ b/ext/spl/tests/bug52573.phpt @@ -9,7 +9,7 @@ var_dump($f->fscanf('<?php // %s', $result)); var_dump($result); var_dump($f->fscanf('<?php // %s')); ?> ---EXPECTF-- +--EXPECT-- int(1) string(4) "test" array(1) { diff --git a/ext/spl/tests/bug53071.phpt b/ext/spl/tests/bug53071.phpt index a2983ed2b2..ca394f5434 100644 --- a/ext/spl/tests/bug53071.phpt +++ b/ext/spl/tests/bug53071.phpt @@ -22,6 +22,6 @@ var_dump(gc_collect_cycles()); echo "Done.\n"; ?> ---EXPECTF-- +--EXPECT-- int(4) Done. diff --git a/ext/spl/tests/bug53144.phpt b/ext/spl/tests/bug53144.phpt index 7cf179b3eb..8fb86e8204 100644 --- a/ext/spl/tests/bug53144.phpt +++ b/ext/spl/tests/bug53144.phpt @@ -15,6 +15,6 @@ $b->removeAll($b); var_dump(count($b)); ?> ---EXPECTF-- +--EXPECT-- int(2) int(0)
\ No newline at end of file diff --git a/ext/spl/tests/bug53362.phpt b/ext/spl/tests/bug53362.phpt index 70ba6e2036..7ae74ce559 100644 --- a/ext/spl/tests/bug53362.phpt +++ b/ext/spl/tests/bug53362.phpt @@ -16,7 +16,7 @@ $obj[]=2; $obj[]=2; ?> ---EXPECTF-- +--EXPECT-- NULL NULL NULL diff --git a/ext/spl/tests/bug54292.phpt b/ext/spl/tests/bug54292.phpt index 288f49a4ec..ffbbcc3220 100644 --- a/ext/spl/tests/bug54292.phpt +++ b/ext/spl/tests/bug54292.phpt @@ -10,5 +10,5 @@ try { } ?> ---EXPECTF-- +--EXPECT-- string(74) "SplFileObject::__construct() expects parameter 2 to be string, array given" diff --git a/ext/spl/tests/bug61527.phpt b/ext/spl/tests/bug61527.phpt index 03dbbe346b..fa8291228c 100644 --- a/ext/spl/tests/bug61527.phpt +++ b/ext/spl/tests/bug61527.phpt @@ -64,7 +64,7 @@ var_dump($ai4->getChildren()); ?> ==DONE== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- NULL NULL int(4) diff --git a/ext/spl/tests/bug61697.phpt b/ext/spl/tests/bug61697.phpt index 8cd38289ef..458bba6663 100644 --- a/ext/spl/tests/bug61697.phpt +++ b/ext/spl/tests/bug61697.phpt @@ -18,7 +18,7 @@ foreach (spl_autoload_functions() AS $func) print_r(spl_autoload_functions()); ?> ---EXPECTF-- +--EXPECT-- Array ( ) diff --git a/ext/spl/tests/bug62616.phpt b/ext/spl/tests/bug62616.phpt index 4e4be94491..6fc17828ba 100644 --- a/ext/spl/tests/bug62616.phpt +++ b/ext/spl/tests/bug62616.phpt @@ -10,6 +10,6 @@ $ii = new IteratorIterator($ai); var_dump($ii->count()); ?> ---EXPECTF-- +--EXPECT-- int(2) int(2) diff --git a/ext/spl/tests/bug62672.phpt b/ext/spl/tests/bug62672.phpt index d0d6a62451..d255762254 100644 --- a/ext/spl/tests/bug62672.phpt +++ b/ext/spl/tests/bug62672.phpt @@ -27,5 +27,5 @@ class ObjB extends ObjA $obj = new ObjB(new ArrayObject()); var_dump($obj == unserialize(serialize($obj))); ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/spl/tests/bug62904.phpt b/ext/spl/tests/bug62904.phpt index 8ce0d7bc79..9a31cc5e94 100644 --- a/ext/spl/tests/bug62904.phpt +++ b/ext/spl/tests/bug62904.phpt @@ -13,6 +13,6 @@ $x = new foo(2); $z = clone $x; echo "No crash."; ---EXPECTF-- +--EXPECT-- No crash. diff --git a/ext/spl/tests/bug64264.phpt b/ext/spl/tests/bug64264.phpt index e7b695bd82..e02fb775c4 100644 --- a/ext/spl/tests/bug64264.phpt +++ b/ext/spl/tests/bug64264.phpt @@ -21,7 +21,7 @@ $myFixedArr->setSize(2); print_r($myFixedArr->toArray()); ?> ---EXPECTF-- +--EXPECT-- Array ( [0] => foo diff --git a/ext/spl/tests/bug66702.phpt b/ext/spl/tests/bug66702.phpt index fedfc869a8..3e4df51abe 100644 --- a/ext/spl/tests/bug66702.phpt +++ b/ext/spl/tests/bug66702.phpt @@ -18,7 +18,7 @@ print_r(iterator_to_array($it2)); $it2 = new \RegexIterator($it, "/^ba/", \RegexIterator::MATCH, \RegexIterator::USE_KEY | \RegexIterator::INVERT_MATCH); print_r(iterator_to_array($it2)); ---EXPECTF-- +--EXPECT-- Array ( [1] => bar diff --git a/ext/spl/tests/bug67359.phpt b/ext/spl/tests/bug67359.phpt index e2e61133f3..e97a403717 100644 --- a/ext/spl/tests/bug67359.phpt +++ b/ext/spl/tests/bug67359.phpt @@ -24,5 +24,5 @@ catch(Exception $e) } echo "okey" ?> ---EXPECTF-- +--EXPECT-- okey diff --git a/ext/spl/tests/bug67538.phpt b/ext/spl/tests/bug67538.phpt index b6f3848c36..33d95f04c7 100644 --- a/ext/spl/tests/bug67538.phpt +++ b/ext/spl/tests/bug67538.phpt @@ -13,5 +13,5 @@ $list->offsetUnset(0); $list->next(); echo "okey"; ?> ---EXPECTF-- +--EXPECT-- okey diff --git a/ext/spl/tests/bug67805.phpt b/ext/spl/tests/bug67805.phpt index ba07b3da92..1f64f0fcac 100644 --- a/ext/spl/tests/bug67805.phpt +++ b/ext/spl/tests/bug67805.phpt @@ -10,6 +10,6 @@ $line = $splFileObject->getCurrentLine(); var_dump($line === '<?p'); var_dump(strlen($line) === 3); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) diff --git a/ext/spl/tests/bug68479.phpt b/ext/spl/tests/bug68479.phpt index e4e7976a9b..031857e774 100644 --- a/ext/spl/tests/bug68479.phpt +++ b/ext/spl/tests/bug68479.phpt @@ -9,7 +9,7 @@ var_dump($params); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- array(4) { [0]=> object(ReflectionParameter)#2 (1) { diff --git a/ext/spl/tests/bug68557.phpt b/ext/spl/tests/bug68557.phpt index c1ac95257b..ff58c7a046 100644 --- a/ext/spl/tests/bug68557.phpt +++ b/ext/spl/tests/bug68557.phpt @@ -35,7 +35,7 @@ unlink(__DIR__ . DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR . 'a'); unlink(__DIR__ . DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR . 'b'); rmdir(__DIR__ . DIRECTORY_SEPARATOR . 'tmp'); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/spl/tests/bug69335.phpt b/ext/spl/tests/bug69335.phpt index 41f03efcb0..3b065b6473 100644 --- a/ext/spl/tests/bug69335.phpt +++ b/ext/spl/tests/bug69335.phpt @@ -12,7 +12,7 @@ foreach ($a as $k => $v) { } } ?> ---EXPECTF-- +--EXPECT-- string(6) "1 => 1" string(6) "3 => 3" string(6) "5 => 5" diff --git a/ext/spl/tests/bug70868.phpt b/ext/spl/tests/bug70868.phpt index d3dd76354a..a253927d1d 100644 --- a/ext/spl/tests/bug70868.phpt +++ b/ext/spl/tests/bug70868.phpt @@ -24,7 +24,7 @@ foreach ($iterator as $foo) { echo "Done", PHP_EOL; ?> ---EXPECTF-- +--EXPECT-- string(6) "A.phpt" string(6) "B.phpt" diff --git a/ext/spl/tests/bug70959.phpt b/ext/spl/tests/bug70959.phpt index 3fd500736d..541807ae16 100644 --- a/ext/spl/tests/bug70959.phpt +++ b/ext/spl/tests/bug70959.phpt @@ -19,6 +19,6 @@ $obj->setTest('test'); var_dump($obj->getTest()); $obj2 = unserialize(serialize($obj)); var_dump($obj2->getTest()); ---EXPECTF-- +--EXPECT-- string(4) "test" string(4) "test" diff --git a/ext/spl/tests/bug73029.phpt b/ext/spl/tests/bug73029.phpt index a379f8005e..8789e91df2 100644 --- a/ext/spl/tests/bug73029.phpt +++ b/ext/spl/tests/bug73029.phpt @@ -11,6 +11,6 @@ $x = $m[2]; } ?> DONE ---EXPECTF-- +--EXPECT-- Error at offset 10 of 19 bytes DONE diff --git a/ext/spl/tests/bug73629.phpt b/ext/spl/tests/bug73629.phpt index 5b6587c685..29b9dfc061 100644 --- a/ext/spl/tests/bug73629.phpt +++ b/ext/spl/tests/bug73629.phpt @@ -15,6 +15,6 @@ try { }
?>
===DONE===
---EXPECTF--
+--EXPECT--
expected exception: Iterators' LIFO/FIFO modes for SplStack/SplQueue objects are frozen
===DONE===
diff --git a/ext/spl/tests/bug75049.phpt b/ext/spl/tests/bug75049.phpt index 2f03a3b031..eafdb84541 100644 --- a/ext/spl/tests/bug75049.phpt +++ b/ext/spl/tests/bug75049.phpt @@ -12,5 +12,5 @@ foreach (spl_autoload_functions() as $loader) { echo (int)spl_autoload_unregister($loader); } echo (int)count(spl_autoload_functions()); ---EXPECTF-- +--EXPECT-- 11110 diff --git a/ext/spl/tests/dit_003.phpt b/ext/spl/tests/dit_003.phpt index 4ffc2921e0..507ed49f0e 100644 --- a/ext/spl/tests/dit_003.phpt +++ b/ext/spl/tests/dit_003.phpt @@ -10,6 +10,6 @@ foreach(new FilesystemIterator(__DIR__) as $ent) var_dump($count > 0); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(true) ===DONE=== diff --git a/ext/spl/tests/dit_004.phpt b/ext/spl/tests/dit_004.phpt index 4ad0e4b772..d9f1912283 100644 --- a/ext/spl/tests/dit_004.phpt +++ b/ext/spl/tests/dit_004.phpt @@ -14,7 +14,7 @@ var_dump((string)$c == (string)$a); var_dump($a->key(), $c->key()); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(true) int(0) int(0) diff --git a/ext/spl/tests/dit_005.phpt b/ext/spl/tests/dit_005.phpt index 52a335172f..9278a115a3 100644 --- a/ext/spl/tests/dit_005.phpt +++ b/ext/spl/tests/dit_005.phpt @@ -14,7 +14,7 @@ var_dump((string)$c == (string)$a); var_dump($a->key() == $c->key()); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/spl/tests/dllist_001.phpt b/ext/spl/tests/dllist_001.phpt index e27f23ca44..4a18cf2322 100644 --- a/ext/spl/tests/dllist_001.phpt +++ b/ext/spl/tests/dllist_001.phpt @@ -48,7 +48,7 @@ echo count($dll)."\n"; ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- Exception: Can't pop from an empty datastructure Exception: Can't shift from an empty datastructure 2 diff --git a/ext/spl/tests/dllist_002.phpt b/ext/spl/tests/dllist_002.phpt index e956de60fd..e1287718de 100644 --- a/ext/spl/tests/dllist_002.phpt +++ b/ext/spl/tests/dllist_002.phpt @@ -35,7 +35,7 @@ foreach($dll2 as $k=>$v) { ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- 0=>2 ->0=>2 ->1=>3 diff --git a/ext/spl/tests/dllist_003.phpt b/ext/spl/tests/dllist_003.phpt index 9a9556840f..53dd7cb752 100644 --- a/ext/spl/tests/dllist_003.phpt +++ b/ext/spl/tests/dllist_003.phpt @@ -28,7 +28,7 @@ var_dump($dll->count()); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- 2=>4 1=>3 0=>2 diff --git a/ext/spl/tests/dllist_004.phpt b/ext/spl/tests/dllist_004.phpt index 44d9611fca..0a74d59892 100644 --- a/ext/spl/tests/dllist_004.phpt +++ b/ext/spl/tests/dllist_004.phpt @@ -46,7 +46,7 @@ echo count($stack)."\n"; ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- Exception: Can't pop from an empty datastructure Exception: Can't shift from an empty datastructure 2 diff --git a/ext/spl/tests/dllist_005.phpt b/ext/spl/tests/dllist_005.phpt index 33161ba17d..2e2058f76a 100644 --- a/ext/spl/tests/dllist_005.phpt +++ b/ext/spl/tests/dllist_005.phpt @@ -46,7 +46,7 @@ echo count($queue)."\n"; ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- Exception: Can't shift from an empty datastructure Exception: Can't shift from an empty datastructure 2 diff --git a/ext/spl/tests/dllist_006.phpt b/ext/spl/tests/dllist_006.phpt index b4055dcb9c..d5590642ea 100644 --- a/ext/spl/tests/dllist_006.phpt +++ b/ext/spl/tests/dllist_006.phpt @@ -47,7 +47,7 @@ try { ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- int(1) int(2) int(3) diff --git a/ext/spl/tests/dllist_007.phpt b/ext/spl/tests/dllist_007.phpt index 38f801fde7..d15e064ac4 100644 --- a/ext/spl/tests/dllist_007.phpt +++ b/ext/spl/tests/dllist_007.phpt @@ -14,7 +14,7 @@ while ($a->valid()) { ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- int(1) NULL int(2) diff --git a/ext/spl/tests/dllist_013.phpt b/ext/spl/tests/dllist_013.phpt index b60f063924..b9a4ef7648 100644 --- a/ext/spl/tests/dllist_013.phpt +++ b/ext/spl/tests/dllist_013.phpt @@ -32,7 +32,7 @@ echo $dll->pop()."\n"; ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- Exception: Offset invalid or out of range 7 7 diff --git a/ext/spl/tests/dllist_memleak.phpt b/ext/spl/tests/dllist_memleak.phpt index 9bae68bf2e..a52d2887d0 100644 --- a/ext/spl/tests/dllist_memleak.phpt +++ b/ext/spl/tests/dllist_memleak.phpt @@ -18,7 +18,7 @@ echo $dll->current()."\n"; ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- 1 3 ===DONE=== diff --git a/ext/spl/tests/fixedarray_001.phpt b/ext/spl/tests/fixedarray_001.phpt index 8276333e10..c85d9e8dcc 100644 --- a/ext/spl/tests/fixedarray_001.phpt +++ b/ext/spl/tests/fixedarray_001.phpt @@ -45,7 +45,7 @@ $a[0] = "valueNew"; var_dump($b[0]); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Exception: Index invalid or out of range Exception: Index invalid or out of range Exception: Index invalid or out of range diff --git a/ext/spl/tests/fixedarray_002.phpt b/ext/spl/tests/fixedarray_002.phpt index 2521516c14..ade6b7decf 100644 --- a/ext/spl/tests/fixedarray_002.phpt +++ b/ext/spl/tests/fixedarray_002.phpt @@ -68,7 +68,7 @@ var_dump($a[0], $a[2], $a[3], $a[4]); var_dump(count($a), $a->getSize(), count($a) == $a->getSize()); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- A::offsetSet Exception: Index invalid or out of range A::offsetGet diff --git a/ext/spl/tests/fixedarray_003.phpt b/ext/spl/tests/fixedarray_003.phpt index 69cec7528e..33043a80e3 100644 --- a/ext/spl/tests/fixedarray_003.phpt +++ b/ext/spl/tests/fixedarray_003.phpt @@ -50,7 +50,7 @@ foreach ($a as $k => $v) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ==Direct instance== 0 => a 1 => c diff --git a/ext/spl/tests/fixedarray_004.phpt b/ext/spl/tests/fixedarray_004.phpt index cb62e0c2c9..fb32c2fd52 100644 --- a/ext/spl/tests/fixedarray_004.phpt +++ b/ext/spl/tests/fixedarray_004.phpt @@ -13,6 +13,6 @@ try { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- string(29) "Index invalid or out of range" ===DONE=== diff --git a/ext/spl/tests/fixedarray_009.phpt b/ext/spl/tests/fixedarray_009.phpt index 4d2624528b..185b9d1acc 100644 --- a/ext/spl/tests/fixedarray_009.phpt +++ b/ext/spl/tests/fixedarray_009.phpt @@ -9,5 +9,5 @@ try { echo "Ok - ".$iae->getMessage().PHP_EOL; } ?> ---EXPECTF-- +--EXPECT-- Ok - SplFixedArray::__construct() expects parameter 1 to be int, string given diff --git a/ext/spl/tests/fixedarray_015.phpt b/ext/spl/tests/fixedarray_015.phpt index 9468d9626c..a25e1dc669 100644 --- a/ext/spl/tests/fixedarray_015.phpt +++ b/ext/spl/tests/fixedarray_015.phpt @@ -11,6 +11,6 @@ try { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Ok - SplFixedArray::__construct() expects parameter 1 to be int, string given Done diff --git a/ext/spl/tests/heap_001.phpt b/ext/spl/tests/heap_001.phpt index da4dde8ad2..f9cfd68710 100644 --- a/ext/spl/tests/heap_001.phpt +++ b/ext/spl/tests/heap_001.phpt @@ -38,7 +38,7 @@ echo $h2->extract()."\n"; ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- Exception: Can't extract from an empty heap 5 3 diff --git a/ext/spl/tests/heap_002.phpt b/ext/spl/tests/heap_002.phpt index 387510f766..578d15b21c 100644 --- a/ext/spl/tests/heap_002.phpt +++ b/ext/spl/tests/heap_002.phpt @@ -36,7 +36,7 @@ echo $h->extract()."\n"; ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- Exception: Can't extract from an empty heap 5 1 diff --git a/ext/spl/tests/heap_003.phpt b/ext/spl/tests/heap_003.phpt index 87f95e9a2b..4a4bcff5ff 100644 --- a/ext/spl/tests/heap_003.phpt +++ b/ext/spl/tests/heap_003.phpt @@ -29,7 +29,7 @@ foreach ($h as $out) { ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- 10 9 8 diff --git a/ext/spl/tests/heap_004.phpt b/ext/spl/tests/heap_004.phpt index 7b00ebfbff..e493d20fac 100644 --- a/ext/spl/tests/heap_004.phpt +++ b/ext/spl/tests/heap_004.phpt @@ -55,7 +55,7 @@ try { ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- inserted 1 Exception: foo Exception: Heap is corrupted, heap properties are no longer ensured. diff --git a/ext/spl/tests/heap_005.phpt b/ext/spl/tests/heap_005.phpt index 1291cda770..8621f09aa4 100644 --- a/ext/spl/tests/heap_005.phpt +++ b/ext/spl/tests/heap_005.phpt @@ -17,7 +17,7 @@ foreach ($h as $k => $o) { ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- 99 => 1 98 => 2 97 => 3 diff --git a/ext/spl/tests/heap_006.phpt b/ext/spl/tests/heap_006.phpt index 3218bdfb16..41c7b84638 100644 --- a/ext/spl/tests/heap_006.phpt +++ b/ext/spl/tests/heap_006.phpt @@ -17,7 +17,7 @@ foreach ($h as $k => $o) { ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- 99 => 100 98 => 99 97 => 98 diff --git a/ext/spl/tests/heap_007.phpt b/ext/spl/tests/heap_007.phpt index e8d5c9997c..27bd66edf1 100644 --- a/ext/spl/tests/heap_007.phpt +++ b/ext/spl/tests/heap_007.phpt @@ -22,7 +22,7 @@ while ($h->valid()) { ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- count($h) = 4 $h->count() = 4 3=>5 diff --git a/ext/spl/tests/heap_008.phpt b/ext/spl/tests/heap_008.phpt index 178f5462e4..3a746b2e6f 100644 --- a/ext/spl/tests/heap_008.phpt +++ b/ext/spl/tests/heap_008.phpt @@ -13,7 +13,7 @@ var_dump($h); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- object(SplMaxHeap)#1 (3) { ["flags":"SplHeap":private]=> int(0) diff --git a/ext/spl/tests/heap_top_variation_002.phpt b/ext/spl/tests/heap_top_variation_002.phpt index cd6a8d0ad9..4d6bdd593a 100644 --- a/ext/spl/tests/heap_top_variation_002.phpt +++ b/ext/spl/tests/heap_top_variation_002.phpt @@ -27,5 +27,5 @@ try { echo $e->getMessage(); } ?> ---EXPECTF-- +--EXPECT-- Heap is corrupted, heap properties are no longer ensured. diff --git a/ext/spl/tests/heap_top_variation_003.phpt b/ext/spl/tests/heap_top_variation_003.phpt index 7a91a9c000..c2ea2bcd95 100644 --- a/ext/spl/tests/heap_top_variation_003.phpt +++ b/ext/spl/tests/heap_top_variation_003.phpt @@ -12,5 +12,5 @@ try { echo $e->getMessage(); } ?> ---EXPECTF-- +--EXPECT-- Can't peek at an empty heap diff --git a/ext/spl/tests/iterator_005.phpt b/ext/spl/tests/iterator_005.phpt index 640ca9f9c2..cacf006c5a 100644 --- a/ext/spl/tests/iterator_005.phpt +++ b/ext/spl/tests/iterator_005.phpt @@ -38,7 +38,7 @@ foreach(new IteratorIterator($it) as $v) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- ArrayIteratorEx::rewind int(0) int(1) diff --git a/ext/spl/tests/iterator_010.phpt b/ext/spl/tests/iterator_010.phpt index 39d1000f62..b8013d7311 100644 --- a/ext/spl/tests/iterator_010.phpt +++ b/ext/spl/tests/iterator_010.phpt @@ -13,6 +13,6 @@ foreach(new LimitIterator(new EmptyIterator(), 0, 3) as $key => $val) ?> ===DONE=== <?php exit(0); ---EXPECTF-- +--EXPECT-- ===EmptyIterator=== ===DONE=== diff --git a/ext/spl/tests/iterator_011.phpt b/ext/spl/tests/iterator_011.phpt index fca159a20f..62b8ed8ea9 100644 --- a/ext/spl/tests/iterator_011.phpt +++ b/ext/spl/tests/iterator_011.phpt @@ -34,7 +34,7 @@ foreach($it as $val=>$key) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- ===EmptyIterator=== ===InfiniteIterator=== 2=>C diff --git a/ext/spl/tests/iterator_012.phpt b/ext/spl/tests/iterator_012.phpt index 81bc02f69c..63a3fce8bf 100644 --- a/ext/spl/tests/iterator_012.phpt +++ b/ext/spl/tests/iterator_012.phpt @@ -23,7 +23,7 @@ foreach($it as $key=>$val) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- ===Current=== 0=>A ===Next=== diff --git a/ext/spl/tests/iterator_013.phpt b/ext/spl/tests/iterator_013.phpt index 119631c000..6da31e391d 100644 --- a/ext/spl/tests/iterator_013.phpt +++ b/ext/spl/tests/iterator_013.phpt @@ -47,7 +47,7 @@ foreach($it as $key=>$val) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- ===Empty=== ===Append=== 0=>A diff --git a/ext/spl/tests/iterator_015.phpt b/ext/spl/tests/iterator_015.phpt index aa30f79e1f..bce00ae4d5 100644 --- a/ext/spl/tests/iterator_015.phpt +++ b/ext/spl/tests/iterator_015.phpt @@ -39,7 +39,7 @@ foreach($rit as $k=>$v) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- <ul> 0=>a <ul> diff --git a/ext/spl/tests/iterator_016.phpt b/ext/spl/tests/iterator_016.phpt index f231c6eb34..77ffae83b0 100644 --- a/ext/spl/tests/iterator_016.phpt +++ b/ext/spl/tests/iterator_016.phpt @@ -52,7 +52,7 @@ foreach($rit as $k=>$v) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- Menu::getIterator <ul> 0=>a diff --git a/ext/spl/tests/iterator_017.phpt b/ext/spl/tests/iterator_017.phpt index 39d1000f62..b8013d7311 100644 --- a/ext/spl/tests/iterator_017.phpt +++ b/ext/spl/tests/iterator_017.phpt @@ -13,6 +13,6 @@ foreach(new LimitIterator(new EmptyIterator(), 0, 3) as $key => $val) ?> ===DONE=== <?php exit(0); ---EXPECTF-- +--EXPECT-- ===EmptyIterator=== ===DONE=== diff --git a/ext/spl/tests/iterator_018.phpt b/ext/spl/tests/iterator_018.phpt index 9c234bb11d..618988630d 100644 --- a/ext/spl/tests/iterator_018.phpt +++ b/ext/spl/tests/iterator_018.phpt @@ -34,7 +34,7 @@ foreach($it as $val=>$key) ?> ===DONE=== <?php exit(0); ---EXPECTF-- +--EXPECT-- ===EmptyIterator=== ===InfiniteIterator=== 2=>C diff --git a/ext/spl/tests/iterator_019.phpt b/ext/spl/tests/iterator_019.phpt index 81bc02f69c..63a3fce8bf 100644 --- a/ext/spl/tests/iterator_019.phpt +++ b/ext/spl/tests/iterator_019.phpt @@ -23,7 +23,7 @@ foreach($it as $key=>$val) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- ===Current=== 0=>A ===Next=== diff --git a/ext/spl/tests/iterator_020.phpt b/ext/spl/tests/iterator_020.phpt index 119631c000..6da31e391d 100644 --- a/ext/spl/tests/iterator_020.phpt +++ b/ext/spl/tests/iterator_020.phpt @@ -47,7 +47,7 @@ foreach($it as $key=>$val) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- ===Empty=== ===Append=== 0=>A diff --git a/ext/spl/tests/iterator_037.phpt b/ext/spl/tests/iterator_037.phpt index 2aa61bb03f..a95cbee77c 100644 --- a/ext/spl/tests/iterator_037.phpt +++ b/ext/spl/tests/iterator_037.phpt @@ -89,7 +89,7 @@ catch (Exception $e) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===1=== int(1) string(1) "1" diff --git a/ext/spl/tests/iterator_041b.phpt b/ext/spl/tests/iterator_041b.phpt index e7ea8b8008..8f55ade319 100644 --- a/ext/spl/tests/iterator_041b.phpt +++ b/ext/spl/tests/iterator_041b.phpt @@ -96,7 +96,7 @@ MyArrayIterator::test('iterator_count', array(3 => 6)); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- ===iterator_to_array=== State 0: __construct() State 1: __construct() diff --git a/ext/spl/tests/iterator_043.phpt b/ext/spl/tests/iterator_043.phpt index 301a593ba2..6dbbfdd97b 100644 --- a/ext/spl/tests/iterator_043.phpt +++ b/ext/spl/tests/iterator_043.phpt @@ -12,7 +12,7 @@ var_dump($it->getChildren()); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- NULL NULL ===DONE=== diff --git a/ext/spl/tests/iterator_046.phpt b/ext/spl/tests/iterator_046.phpt index f57415a3b2..b31e3bc533 100644 --- a/ext/spl/tests/iterator_046.phpt +++ b/ext/spl/tests/iterator_046.phpt @@ -42,7 +42,7 @@ $it->show(); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- MyCachingIterator::fill() MyCachingIterator::show() string(1) "0" diff --git a/ext/spl/tests/iterator_048.phpt b/ext/spl/tests/iterator_048.phpt index 64ca97f4d6..de13e5b6b2 100644 --- a/ext/spl/tests/iterator_048.phpt +++ b/ext/spl/tests/iterator_048.phpt @@ -23,7 +23,7 @@ $it->show(); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- int(0) string(3) "Bar" int(2) diff --git a/ext/spl/tests/iterator_070.phpt b/ext/spl/tests/iterator_070.phpt index bbb518e074..fadd88185a 100644 --- a/ext/spl/tests/iterator_070.phpt +++ b/ext/spl/tests/iterator_070.phpt @@ -14,7 +14,7 @@ var_dump($recItIt->nextElement()); ?> ---EXPECTF-- +--EXPECT-- NULL NULL NULL
\ No newline at end of file diff --git a/ext/spl/tests/iterator_071.phpt b/ext/spl/tests/iterator_071.phpt index 8370906abb..5fc65edf9c 100644 --- a/ext/spl/tests/iterator_071.phpt +++ b/ext/spl/tests/iterator_071.phpt @@ -21,7 +21,7 @@ $recItIt = new MyRecursiveIteratorIterator($recArrIt, RecursiveIteratorIterator: foreach ($recItIt as $key => $val) echo "$key\n"; ?> ---EXPECTF-- +--EXPECT-- MyRecursiveIteratorIterator::nextelement 0 MyRecursiveIteratorIterator::nextelement diff --git a/ext/spl/tests/observer_007.phpt b/ext/spl/tests/observer_007.phpt index e494f19796..4525edc693 100644 --- a/ext/spl/tests/observer_007.phpt +++ b/ext/spl/tests/observer_007.phpt @@ -14,7 +14,7 @@ var_dump($a == $b); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(false) bool(true) diff --git a/ext/spl/tests/observer_008.phpt b/ext/spl/tests/observer_008.phpt index 56a3c892c0..65f3e4da52 100644 --- a/ext/spl/tests/observer_008.phpt +++ b/ext/spl/tests/observer_008.phpt @@ -28,7 +28,7 @@ var_dump($a->count()); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- int(3) int(2) int(1) diff --git a/ext/spl/tests/observer_009.phpt b/ext/spl/tests/observer_009.phpt index 6ac676c492..c55660fa29 100644 --- a/ext/spl/tests/observer_009.phpt +++ b/ext/spl/tests/observer_009.phpt @@ -24,7 +24,7 @@ echo "\n"; ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- Count storage A: 2 x x Count storage B: 2 x x ===DONE=== diff --git a/ext/spl/tests/observer_010.phpt b/ext/spl/tests/observer_010.phpt index 5cedff8c7c..5cb9b799ee 100644 --- a/ext/spl/tests/observer_010.phpt +++ b/ext/spl/tests/observer_010.phpt @@ -10,6 +10,6 @@ $map = new SplObjectStorage(); $map[$a] = 'foo'; var_dump($map[$b] ?? null); var_dump($map[$a] ?? null); ---EXPECTF-- +--EXPECT-- NULL string(3) "foo" diff --git a/ext/spl/tests/pqueue_001.phpt b/ext/spl/tests/pqueue_001.phpt index de164e549a..c9338484b5 100644 --- a/ext/spl/tests/pqueue_001.phpt +++ b/ext/spl/tests/pqueue_001.phpt @@ -61,7 +61,7 @@ foreach ($pq3 as $k=>$v) { ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- Exception: Can't extract from an empty heap 2=>b 1=>a diff --git a/ext/spl/tests/pqueue_002.phpt b/ext/spl/tests/pqueue_002.phpt index eaab2cf809..5e3767f2fd 100644 --- a/ext/spl/tests/pqueue_002.phpt +++ b/ext/spl/tests/pqueue_002.phpt @@ -55,7 +55,7 @@ try { ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- inserted 1 Exception: foo Exception: Heap is corrupted, heap properties are no longer ensured. diff --git a/ext/spl/tests/pqueue_003.phpt b/ext/spl/tests/pqueue_003.phpt index 9c0b5a5147..c90585767f 100644 --- a/ext/spl/tests/pqueue_003.phpt +++ b/ext/spl/tests/pqueue_003.phpt @@ -21,7 +21,7 @@ while ($h->valid()) { ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- count($h) = 4 $h->count() = 4 3=>5 diff --git a/ext/spl/tests/pqueue_004.phpt b/ext/spl/tests/pqueue_004.phpt index 3a86f9e4a3..172cc8e218 100644 --- a/ext/spl/tests/pqueue_004.phpt +++ b/ext/spl/tests/pqueue_004.phpt @@ -13,7 +13,7 @@ var_dump($pq); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- object(SplPriorityQueue)#1 (3) { ["flags":"SplPriorityQueue":private]=> int(1) diff --git a/ext/spl/tests/pqueue_compare_basic.phpt b/ext/spl/tests/pqueue_compare_basic.phpt index 1544add469..bc4085e8dd 100644 --- a/ext/spl/tests/pqueue_compare_basic.phpt +++ b/ext/spl/tests/pqueue_compare_basic.phpt @@ -12,7 +12,7 @@ var_dump($h->compare(5, 4) > 0); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/spl/tests/recursive_tree_iterator_001.phpt b/ext/spl/tests/recursive_tree_iterator_001.phpt index f70186cdd8..ac9f281388 100644 --- a/ext/spl/tests/recursive_tree_iterator_001.phpt +++ b/ext/spl/tests/recursive_tree_iterator_001.phpt @@ -48,7 +48,7 @@ foreach(new RecursiveTreeIterator($it, 0, CachingIterator::CATCH_GET_CHILD) as $ ?> ===DONE=== ---EXPECTF-- +--EXPECT-- -- flags = BYPASS_KEY -- [0] => |-Array [0] => | |-a diff --git a/ext/spl/tests/recursive_tree_iterator_002.phpt b/ext/spl/tests/recursive_tree_iterator_002.phpt index 1aae288e63..7d82b191e2 100644 --- a/ext/spl/tests/recursive_tree_iterator_002.phpt +++ b/ext/spl/tests/recursive_tree_iterator_002.phpt @@ -11,6 +11,6 @@ try { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- InvalidArgumentException thrown ===DONE=== diff --git a/ext/spl/tests/recursive_tree_iterator_004.phpt b/ext/spl/tests/recursive_tree_iterator_004.phpt index ad3ba6cd0a..9435db8bbd 100644 --- a/ext/spl/tests/recursive_tree_iterator_004.phpt +++ b/ext/spl/tests/recursive_tree_iterator_004.phpt @@ -30,7 +30,7 @@ foreach($it as $k => $v) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- [0] => |-Array [0] => | |-a [1] => | \-1 diff --git a/ext/spl/tests/recursive_tree_iterator_006.phpt b/ext/spl/tests/recursive_tree_iterator_006.phpt index 17f51b6d0c..1d1891e4a4 100644 --- a/ext/spl/tests/recursive_tree_iterator_006.phpt +++ b/ext/spl/tests/recursive_tree_iterator_006.phpt @@ -58,7 +58,7 @@ foreach(new RecursiveTreeIterator($it, 0, CachingIterator::CATCH_GET_CHILD) as $ ?> ===DONE=== ---EXPECTF-- +--EXPECT-- -- flags = BYPASS_KEY -- [0] => |-Array [0] => | |-a diff --git a/ext/spl/tests/recursive_tree_iterator_007.phpt b/ext/spl/tests/recursive_tree_iterator_007.phpt index 6a8ff8425a..7374a066fa 100644 --- a/ext/spl/tests/recursive_tree_iterator_007.phpt +++ b/ext/spl/tests/recursive_tree_iterator_007.phpt @@ -28,6 +28,6 @@ try { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- UnexpectedValueException thrown ===DONE=== diff --git a/ext/spl/tests/recursive_tree_iterator_008.phpt b/ext/spl/tests/recursive_tree_iterator_008.phpt index a0349800fb..6ce555007d 100644 --- a/ext/spl/tests/recursive_tree_iterator_008.phpt +++ b/ext/spl/tests/recursive_tree_iterator_008.phpt @@ -31,7 +31,7 @@ try { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- [a] => 035Array [0] => 0145b [c] => 045Array diff --git a/ext/spl/tests/recursive_tree_iterator_setpostfix.phpt b/ext/spl/tests/recursive_tree_iterator_setpostfix.phpt index d59e278fd6..b363c1dd4b 100644 --- a/ext/spl/tests/recursive_tree_iterator_setpostfix.phpt +++ b/ext/spl/tests/recursive_tree_iterator_setpostfix.phpt @@ -55,7 +55,7 @@ foreach($it as $k => $v) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ---- diff --git a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt index b114a9022d..83d2caa2a8 100644 --- a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt +++ b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt @@ -17,7 +17,7 @@ $iterator->next(); var_dump(get_class($iterator->getSubIterator())); var_dump($iterator->getSubIterator()->getArrayCopy()); ?> ---EXPECTF-- +--EXPECT-- string(22) "RecursiveArrayIterator" array(3) { [0]=> diff --git a/ext/spl/tests/regexiterator_getpregflags.phpt b/ext/spl/tests/regexiterator_getpregflags.phpt index 58a4dc4a3b..9c4d8eaecb 100644 --- a/ext/spl/tests/regexiterator_getpregflags.phpt +++ b/ext/spl/tests/regexiterator_getpregflags.phpt @@ -29,5 +29,5 @@ $r->setPregFlags(PREG_OFFSET_CAPTURE); echo is_long($r->getPregFlags()); ?> ---EXPECTF-- +--EXPECT-- 1
\ No newline at end of file diff --git a/ext/spl/tests/regexiterator_setpregflags.phpt b/ext/spl/tests/regexiterator_setpregflags.phpt index ea1b455488..ffccdca7fd 100644 --- a/ext/spl/tests/regexiterator_setpregflags.phpt +++ b/ext/spl/tests/regexiterator_setpregflags.phpt @@ -30,5 +30,5 @@ echo $r->getPregFlags(); ?> ---EXPECTF-- +--EXPECT-- 256
\ No newline at end of file diff --git a/ext/spl/tests/spl_autoload_003.phpt b/ext/spl/tests/spl_autoload_003.phpt index 00fdd2734f..6fe7a38b30 100644 --- a/ext/spl/tests/spl_autoload_003.phpt +++ b/ext/spl/tests/spl_autoload_003.phpt @@ -37,7 +37,7 @@ catch(Exception $e) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- TestFunc1(TestClass) TestFunc2(TestClass) Exception: Class TestClass missing diff --git a/ext/spl/tests/spl_autoload_004.phpt b/ext/spl/tests/spl_autoload_004.phpt index 1f26521b90..7dac3abcea 100644 --- a/ext/spl/tests/spl_autoload_004.phpt +++ b/ext/spl/tests/spl_autoload_004.phpt @@ -28,7 +28,7 @@ var_dump(class_exists("TestClass", true)); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> array(2) { diff --git a/ext/spl/tests/spl_autoload_005.phpt b/ext/spl/tests/spl_autoload_005.phpt index f4db521d52..90fd63d88b 100644 --- a/ext/spl/tests/spl_autoload_005.phpt +++ b/ext/spl/tests/spl_autoload_005.phpt @@ -47,7 +47,7 @@ catch(Exception $e) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- Exception: Passed array specifies a non static method but no object (non-static method MyAutoLoader::autoLoad() should not be called statically) MyAutoLoader::autoLoad(TestClass) MyAutoLoader::autoThrow(TestClass) diff --git a/ext/spl/tests/spl_autoload_006.phpt b/ext/spl/tests/spl_autoload_006.phpt index 21a6084eb4..a8d6619b19 100644 --- a/ext/spl/tests/spl_autoload_006.phpt +++ b/ext/spl/tests/spl_autoload_006.phpt @@ -22,7 +22,7 @@ var_dump(class_exists("TestClass", true)); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> array(2) { diff --git a/ext/spl/tests/spl_autoload_010.phpt b/ext/spl/tests/spl_autoload_010.phpt index cd70bdccf0..239b8366ec 100644 --- a/ext/spl/tests/spl_autoload_010.phpt +++ b/ext/spl/tests/spl_autoload_010.phpt @@ -23,7 +23,7 @@ new C; ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- B -> C A -> C C -> C diff --git a/ext/spl/tests/spl_autoload_011.phpt b/ext/spl/tests/spl_autoload_011.phpt index 5a992550e5..f2bc9496f7 100644 --- a/ext/spl/tests/spl_autoload_011.phpt +++ b/ext/spl/tests/spl_autoload_011.phpt @@ -24,7 +24,7 @@ var_dump(class_exists("C", true)); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- var:2 bool(false) ===DONE=== diff --git a/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt b/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt index dcb4287c45..544c7602a0 100644 --- a/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt +++ b/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt @@ -20,6 +20,6 @@ $test = new CachingIterator($arrayIterator, 3); // this throws an exception ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Flags must contain only one of CALL_TOSTRING, TOSTRING_USE_KEY, TOSTRING_USE_CURRENT, TOSTRING_USE_INNER ===DONE=== diff --git a/ext/spl/tests/spl_cachingiterator___toString_basic.phpt b/ext/spl/tests/spl_cachingiterator___toString_basic.phpt index 57ca5152ed..91948c80b4 100644 --- a/ext/spl/tests/spl_cachingiterator___toString_basic.phpt +++ b/ext/spl/tests/spl_cachingiterator___toString_basic.phpt @@ -12,5 +12,5 @@ var_dump( $ci->__toString() // if conversion to string is done by echo, for example, an exeption is thrown. Invoking __toString explicitly covers different code. ); ?> ---EXPECTF-- +--EXPECT-- string(0) "" diff --git a/ext/spl/tests/spl_iterator_getcallchildren.phpt b/ext/spl/tests/spl_iterator_getcallchildren.phpt index 77b03b6b7f..2178db7c96 100644 --- a/ext/spl/tests/spl_iterator_getcallchildren.phpt +++ b/ext/spl/tests/spl_iterator_getcallchildren.phpt @@ -24,7 +24,7 @@ var_dump($output); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- array(3) { [0]=> int(7) diff --git a/ext/spl/tests/spl_iterator_iterator_constructor.phpt b/ext/spl/tests/spl_iterator_iterator_constructor.phpt index 4c3fae25a2..bbdcc34f0a 100644 --- a/ext/spl/tests/spl_iterator_iterator_constructor.phpt +++ b/ext/spl/tests/spl_iterator_iterator_constructor.phpt @@ -21,6 +21,6 @@ try { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- IteratorIterator::__construct() expects at most 2 parameters, 3 given ===DONE=== diff --git a/ext/spl/tests/spl_limit_iterator_check_limits.phpt b/ext/spl/tests/spl_limit_iterator_check_limits.phpt index ae1bc85e89..03bdb787ae 100644 --- a/ext/spl/tests/spl_limit_iterator_check_limits.phpt +++ b/ext/spl/tests/spl_limit_iterator_check_limits.phpt @@ -31,7 +31,7 @@ try { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Parameter offset must be >= 0 Parameter count must either be -1 or a value greater than or equal 0 ===DONE=== diff --git a/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt b/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt index a34b5577d9..d07e7a1421 100644 --- a/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt +++ b/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt @@ -14,7 +14,7 @@ TestFest London May 2009 var_dump($k); } ?> ---EXPECTF-- +--EXPECT-- one=>1 string(3) "one" two=>2 diff --git a/ext/sqlite3/tests/bug68760.phpt b/ext/sqlite3/tests/bug68760.phpt index 2ed4a1f314..901926ebd7 100644 --- a/ext/sqlite3/tests/bug68760.phpt +++ b/ext/sqlite3/tests/bug68760.phpt @@ -29,7 +29,7 @@ catch(\Exception $e) { echo "Exception: ".$e->getMessage(); } ?> ---EXPECTF-- +--EXPECT-- callback Exception: oops diff --git a/ext/sqlite3/tests/sqlite3_08_udf.phpt b/ext/sqlite3/tests/sqlite3_08_udf.phpt index 061b8a02e0..7f00dbb1c4 100644 --- a/ext/sqlite3/tests/sqlite3_08_udf.phpt +++ b/ext/sqlite3/tests/sqlite3_08_udf.phpt @@ -35,7 +35,7 @@ echo "Closing database\n"; var_dump($db->close()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Creating Table bool(true) INSERT into table diff --git a/ext/sqlite3/tests/sqlite3_11_numrows.phpt b/ext/sqlite3/tests/sqlite3_11_numrows.phpt index 44fb533974..87168db06b 100644 --- a/ext/sqlite3/tests/sqlite3_11_numrows.phpt +++ b/ext/sqlite3/tests/sqlite3_11_numrows.phpt @@ -32,7 +32,7 @@ echo "Closing database\n"; var_dump($db->close()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Creating Table bool(true) INSERT into table diff --git a/ext/sqlite3/tests/sqlite3_16_select_no_results.phpt b/ext/sqlite3/tests/sqlite3_16_select_no_results.phpt index 0f2330e596..91875b68ad 100644 --- a/ext/sqlite3/tests/sqlite3_16_select_no_results.phpt +++ b/ext/sqlite3/tests/sqlite3_16_select_no_results.phpt @@ -23,7 +23,7 @@ echo "Closing database\n"; var_dump($db->close()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Creating Table bool(true) SELECTING results diff --git a/ext/sqlite3/tests/sqlite3_18_changes.phpt b/ext/sqlite3/tests/sqlite3_18_changes.phpt index 4de4a85e9d..6515ce71dc 100644 --- a/ext/sqlite3/tests/sqlite3_18_changes.phpt +++ b/ext/sqlite3/tests/sqlite3_18_changes.phpt @@ -25,7 +25,7 @@ echo "Closing database\n"; var_dump($db->close()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Creating Table bool(true) INSERT into table diff --git a/ext/sqlite3/tests/sqlite3_19_columninfo.phpt b/ext/sqlite3/tests/sqlite3_19_columninfo.phpt index 7f243b78d5..2395c75399 100644 --- a/ext/sqlite3/tests/sqlite3_19_columninfo.phpt +++ b/ext/sqlite3/tests/sqlite3_19_columninfo.phpt @@ -29,7 +29,7 @@ echo "Closing database\n"; var_dump($db->close()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Creating Table bool(true) INSERT into table diff --git a/ext/sqlite3/tests/sqlite3_24_last_insert_rowid.phpt b/ext/sqlite3/tests/sqlite3_24_last_insert_rowid.phpt index 52752e52e7..dd1225103d 100644 --- a/ext/sqlite3/tests/sqlite3_24_last_insert_rowid.phpt +++ b/ext/sqlite3/tests/sqlite3_24_last_insert_rowid.phpt @@ -21,7 +21,7 @@ echo "Closing database\n"; var_dump($db->close()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Creating Table bool(true) INSERT into table diff --git a/ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt b/ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt index 1eef6662c5..84993571ec 100644 --- a/ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt +++ b/ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt @@ -39,7 +39,7 @@ echo "Closing database\n"; var_dump($db->close()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Creating Table bool(true) INSERT into table diff --git a/ext/sqlite3/tests/sqlite3_31_changes.phpt b/ext/sqlite3/tests/sqlite3_31_changes.phpt index 589a498f30..1c16497bce 100644 --- a/ext/sqlite3/tests/sqlite3_31_changes.phpt +++ b/ext/sqlite3/tests/sqlite3_31_changes.phpt @@ -12,7 +12,7 @@ var_dump($db); var_dump($db->changes()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- object(SQLite3)#1 (0) { } int(0) diff --git a/ext/sqlite3/tests/sqlite3_35_stmt_readonly.phpt b/ext/sqlite3/tests/sqlite3_35_stmt_readonly.phpt index 23392e5a51..776e9af933 100644 --- a/ext/sqlite3/tests/sqlite3_35_stmt_readonly.phpt +++ b/ext/sqlite3/tests/sqlite3_35_stmt_readonly.phpt @@ -36,7 +36,7 @@ echo "Closing database\n"; var_dump($db->close()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Creating Table bool(true) INSERT into table diff --git a/ext/sqlite3/tests/sqlite3_37_createfunction_flags.phpt b/ext/sqlite3/tests/sqlite3_37_createfunction_flags.phpt index 0c5bd860f6..bc195f7b94 100644 --- a/ext/sqlite3/tests/sqlite3_37_createfunction_flags.phpt +++ b/ext/sqlite3/tests/sqlite3_37_createfunction_flags.phpt @@ -23,7 +23,7 @@ var_dump($db->querySingle('SELECT strtoupper("tEst")')); ?> ---EXPECTF-- +--EXPECT-- bool(true) string(4) "TEST" bool(true) diff --git a/ext/sqlite3/tests/sqlite3_bind_bug68849.phpt b/ext/sqlite3/tests/sqlite3_bind_bug68849.phpt index d04e596b50..7e4a4e8243 100644 --- a/ext/sqlite3/tests/sqlite3_bind_bug68849.phpt +++ b/ext/sqlite3/tests/sqlite3_bind_bug68849.phpt @@ -35,7 +35,7 @@ var_dump($r->fetchArray(SQLITE3_ASSOC)); ?> ==DONE== ---EXPECTF-- +--EXPECT-- array(3) { ["a"]=> int(1) diff --git a/ext/sqlite3/tests/sqlite3_prepare_001.phpt b/ext/sqlite3/tests/sqlite3_prepare_001.phpt index baf0c83025..5142081b3a 100644 --- a/ext/sqlite3/tests/sqlite3_prepare_001.phpt +++ b/ext/sqlite3/tests/sqlite3_prepare_001.phpt @@ -15,5 +15,5 @@ test($foo); echo "done\n"; ?> ---EXPECTF-- +--EXPECT-- done diff --git a/ext/sqlite3/tests/sqlite3_prepare_with_empty_string.phpt b/ext/sqlite3/tests/sqlite3_prepare_with_empty_string.phpt index 391bc54dd3..ccd45e2360 100644 --- a/ext/sqlite3/tests/sqlite3_prepare_with_empty_string.phpt +++ b/ext/sqlite3/tests/sqlite3_prepare_with_empty_string.phpt @@ -11,6 +11,6 @@ $db = new SQLite3(':memory:'); var_dump($db->prepare('')); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(false) Done diff --git a/ext/sqlite3/tests/sqlite3stmt_paramCount_basic.phpt b/ext/sqlite3/tests/sqlite3stmt_paramCount_basic.phpt index 97ef1f7aba..a520f5715b 100644 --- a/ext/sqlite3/tests/sqlite3stmt_paramCount_basic.phpt +++ b/ext/sqlite3/tests/sqlite3stmt_paramCount_basic.phpt @@ -39,7 +39,7 @@ $result = null; var_dump($db->close()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Creating Table bool(true) INSERT into table diff --git a/ext/standard/tests/array/array_change_key_case.phpt b/ext/standard/tests/array/array_change_key_case.phpt index 3123458252..1ce78d51fe 100644 --- a/ext/standard/tests/array/array_change_key_case.phpt +++ b/ext/standard/tests/array/array_change_key_case.phpt @@ -60,7 +60,7 @@ foreach ($arrays as $item) { echo "end\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing basic operations *** ** Iteration 1 ** array(0) { diff --git a/ext/standard/tests/array/array_change_key_case_variation3.phpt b/ext/standard/tests/array/array_change_key_case_variation3.phpt index f395f8ed6b..025e8f5d61 100644 --- a/ext/standard/tests/array/array_change_key_case_variation3.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation3.phpt @@ -100,7 +100,7 @@ foreach($inputs as $key => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_change_key_case() : usage variations *** -- Iteration 1 : int data -- diff --git a/ext/standard/tests/array/array_change_key_case_variation4.phpt b/ext/standard/tests/array/array_change_key_case_variation4.phpt index 89b6ee0797..022cee099d 100644 --- a/ext/standard/tests/array/array_change_key_case_variation4.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation4.phpt @@ -23,7 +23,7 @@ for ($i = -5; $i <=5; $i += 1){ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_change_key_case() : usage variations *** -- $sort argument is -5 -- diff --git a/ext/standard/tests/array/array_change_key_case_variation5.phpt b/ext/standard/tests/array/array_change_key_case_variation5.phpt index 185534f9be..b58e78317f 100644 --- a/ext/standard/tests/array/array_change_key_case_variation5.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation5.phpt @@ -26,7 +26,7 @@ echo key($input) . " => " . current ($input) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_change_key_case() : usage variations *** -- Call array_change_key_case() -- diff --git a/ext/standard/tests/array/array_change_key_case_variation6.phpt b/ext/standard/tests/array/array_change_key_case_variation6.phpt index 3cafb4d0ad..c4aaa0bde4 100644 --- a/ext/standard/tests/array/array_change_key_case_variation6.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation6.phpt @@ -26,7 +26,7 @@ var_dump(array_change_key_case($input['English'], CASE_UPPER)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_change_key_case() : usage variations *** -- Pass a two-dimensional array as $input argument -- diff --git a/ext/standard/tests/array/array_change_key_case_variation7.phpt b/ext/standard/tests/array/array_change_key_case_variation7.phpt index a08a1afa8c..b7539c63a6 100644 --- a/ext/standard/tests/array/array_change_key_case_variation7.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation7.phpt @@ -29,7 +29,7 @@ var_dump($new_input); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_change_key_case() : usage variations *** -- $input argument is a reference to array -- diff --git a/ext/standard/tests/array/array_change_key_case_variation8.phpt b/ext/standard/tests/array/array_change_key_case_variation8.phpt index 361480008a..423310d7ab 100644 --- a/ext/standard/tests/array/array_change_key_case_variation8.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation8.phpt @@ -36,7 +36,7 @@ foreach($inputs as $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_change_key_case() : usage variations *** -- $case = default -- diff --git a/ext/standard/tests/array/array_chunk_basic1.phpt b/ext/standard/tests/array/array_chunk_basic1.phpt index 56a90f479b..44c9b5ffaa 100644 --- a/ext/standard/tests/array/array_chunk_basic1.phpt +++ b/ext/standard/tests/array/array_chunk_basic1.phpt @@ -39,7 +39,7 @@ foreach ($input_arrays as $input_array){ echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_chunk() : basic functionality *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_chunk_basic2.phpt b/ext/standard/tests/array/array_chunk_basic2.phpt index f96d863e12..6e622df070 100644 --- a/ext/standard/tests/array/array_chunk_basic2.phpt +++ b/ext/standard/tests/array/array_chunk_basic2.phpt @@ -39,7 +39,7 @@ foreach ($input_arrays as $input_array){ echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_chunk() : basic functionality *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_chunk_variation4.phpt b/ext/standard/tests/array/array_chunk_variation4.phpt index 7f04f51bff..b5d0818327 100644 --- a/ext/standard/tests/array/array_chunk_variation4.phpt +++ b/ext/standard/tests/array/array_chunk_variation4.phpt @@ -34,7 +34,7 @@ var_dump( array_chunk($input_array, $size, false) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_chunk() : usage variations *** -- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' as defualt -- diff --git a/ext/standard/tests/array/array_chunk_variation6.phpt b/ext/standard/tests/array/array_chunk_variation6.phpt index f44eb39604..0f66fc19f5 100644 --- a/ext/standard/tests/array/array_chunk_variation6.phpt +++ b/ext/standard/tests/array/array_chunk_variation6.phpt @@ -47,7 +47,7 @@ foreach ($input_arrays as $input_array){ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_chunk() : usage variations *** -- Testing array_chunk() by supplying various arrays -- diff --git a/ext/standard/tests/array/array_chunk_variation7.phpt b/ext/standard/tests/array/array_chunk_variation7.phpt index c8a71964f1..0d5ccb7e6d 100644 --- a/ext/standard/tests/array/array_chunk_variation7.phpt +++ b/ext/standard/tests/array/array_chunk_variation7.phpt @@ -34,7 +34,7 @@ var_dump( array_chunk($input_array, $size, false) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_chunk() : usage variations *** -- Testing array_chunk(), input array containing references diff --git a/ext/standard/tests/array/array_column_variant.phpt b/ext/standard/tests/array/array_column_variant.phpt index 0af0869497..576a2526cc 100644 --- a/ext/standard/tests/array/array_column_variant.phpt +++ b/ext/standard/tests/array/array_column_variant.phpt @@ -18,7 +18,7 @@ echo "-- pass null as second parameter and no third param to get back array_valu var_dump(array_column($rows, null)); echo "Done\n"; ---EXPECTF-- +--EXPECT-- -- pass null as second parameter to get back all columns indexed by third parameter -- array(2) { [3]=> diff --git a/ext/standard/tests/array/array_column_variant_objects.phpt b/ext/standard/tests/array/array_column_variant_objects.phpt index 80e1839736..dc9c0e7e8f 100644 --- a/ext/standard/tests/array/array_column_variant_objects.phpt +++ b/ext/standard/tests/array/array_column_variant_objects.phpt @@ -78,7 +78,7 @@ var_dump(array_column($records, 'last_name', 'first_name')); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_column() : object property fetching (numeric property names) *** -- first_name column from recordset -- array(3) { diff --git a/ext/standard/tests/array/array_combine_basic.phpt b/ext/standard/tests/array/array_combine_basic.phpt index 5d855cfec6..40fb677234 100644 --- a/ext/standard/tests/array/array_combine_basic.phpt +++ b/ext/standard/tests/array/array_combine_basic.phpt @@ -29,7 +29,7 @@ var_dump( array_combine($keys_array, $values_array) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_combine() : basic functionality *** array(2) { [1]=> diff --git a/ext/standard/tests/array/array_combine_variation3.phpt b/ext/standard/tests/array/array_combine_variation3.phpt index 1381fe0f4c..5d03ffe068 100644 --- a/ext/standard/tests/array/array_combine_variation3.phpt +++ b/ext/standard/tests/array/array_combine_variation3.phpt @@ -84,7 +84,7 @@ foreach($arrays as $array) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_combine() : Passing different types of arrays to both $keys and $values argument *** -- Iteration 1 -- array(2) { diff --git a/ext/standard/tests/array/array_combine_variation6.phpt b/ext/standard/tests/array/array_combine_variation6.phpt index 94c7b4d664..654ba0f16a 100644 --- a/ext/standard/tests/array/array_combine_variation6.phpt +++ b/ext/standard/tests/array/array_combine_variation6.phpt @@ -30,7 +30,7 @@ var_dump( array_combine($arr_binary, $arr_normal) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_combine() : binary safe checking *** array(2) { ["hello"]=> diff --git a/ext/standard/tests/array/array_count_values_variation.phpt b/ext/standard/tests/array/array_count_values_variation.phpt index 1d614b452a..9a2830b918 100644 --- a/ext/standard/tests/array/array_count_values_variation.phpt +++ b/ext/standard/tests/array/array_count_values_variation.phpt @@ -37,7 +37,7 @@ echo "Done"; <?php unlink("array_count_file"); ?> ---EXPECTF-- +--EXPECT-- *** Testing array_count_values() : parameter variations *** array(3) { ["bobv"]=> diff --git a/ext/standard/tests/array/array_diff_assoc_basic.phpt b/ext/standard/tests/array/array_diff_assoc_basic.phpt index c6b3aef00b..919bd9b3ad 100644 --- a/ext/standard/tests/array/array_diff_assoc_basic.phpt +++ b/ext/standard/tests/array/array_diff_assoc_basic.phpt @@ -36,7 +36,7 @@ var_dump(array_diff_assoc($array_string_key, $array_numeric_key)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : basic functionality *** -- Compare Default keys to numeric keys -- array(3) { diff --git a/ext/standard/tests/array/array_diff_assoc_variation10.phpt b/ext/standard/tests/array/array_diff_assoc_variation10.phpt index 0687ed8a5b..5e4460cd2a 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation10.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation10.phpt @@ -31,7 +31,7 @@ var_dump(array_diff_assoc($array2, $array1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : usage variations *** array(3) { [0]=> diff --git a/ext/standard/tests/array/array_diff_assoc_variation4.phpt b/ext/standard/tests/array/array_diff_assoc_variation4.phpt index 34e979ab29..c93f9c1d0f 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation4.phpt @@ -101,7 +101,7 @@ foreach($inputs as $key => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : usage variations *** diff --git a/ext/standard/tests/array/array_diff_assoc_variation5.phpt b/ext/standard/tests/array/array_diff_assoc_variation5.phpt index c89c656421..ddaebb85ef 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation5.phpt @@ -47,7 +47,7 @@ var_dump(array_diff_assoc($arr_default_int, $arr_float, $arr_string, $arr_string echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : usage variations *** -- Result of comparing integers and floating point numbers: -- diff --git a/ext/standard/tests/array/array_diff_assoc_variation6.phpt b/ext/standard/tests/array/array_diff_assoc_variation6.phpt index d6190b658a..e04d80724b 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation6.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation6.phpt @@ -75,7 +75,7 @@ foreach($inputs as $input) { }; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : usage variations *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_diff_assoc_variation7.phpt b/ext/standard/tests/array/array_diff_assoc_variation7.phpt index 6fab0aebfd..eeb881f629 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation7.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation7.phpt @@ -47,7 +47,7 @@ var_dump(array_diff_assoc($arr2, $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : usage variations *** -- Results when $a = a: -- diff --git a/ext/standard/tests/array/array_diff_assoc_variation8.phpt b/ext/standard/tests/array/array_diff_assoc_variation8.phpt index 3189c11f25..54680957ab 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation8.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation8.phpt @@ -30,7 +30,7 @@ var_dump(array_diff_assoc($array_assoc, $array_index)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : variation *** array(2) { [0]=> diff --git a/ext/standard/tests/array/array_diff_assoc_variation9.phpt b/ext/standard/tests/array/array_diff_assoc_variation9.phpt index 5ab6232659..bc3e5417cc 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation9.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation9.phpt @@ -37,7 +37,7 @@ var_dump(array_diff_assoc($array1, $array2['sub_arraya'])); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : usage variations *** -- Compare two 2-D arrays -- array(2) { diff --git a/ext/standard/tests/array/array_diff_basic.phpt b/ext/standard/tests/array/array_diff_basic.phpt index 30aead657c..4ef78f88f9 100644 --- a/ext/standard/tests/array/array_diff_basic.phpt +++ b/ext/standard/tests/array/array_diff_basic.phpt @@ -52,7 +52,7 @@ var_dump(array_diff($array_int1, $array_int2, $array_string1, $array_string2)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : basic functionality *** -- Test indexed array with integers as elements -- array(2) { diff --git a/ext/standard/tests/array/array_diff_key.phpt b/ext/standard/tests/array/array_diff_key.phpt index 765431f124..4110a65a6c 100644 --- a/ext/standard/tests/array/array_diff_key.phpt +++ b/ext/standard/tests/array/array_diff_key.phpt @@ -62,7 +62,7 @@ function comp_func($a, $b) { } ?> ---EXPECTF-- +--EXPECT-- ------ Test 1 -------- array(4) { [1]=> diff --git a/ext/standard/tests/array/array_diff_key_variation4.phpt b/ext/standard/tests/array/array_diff_key_variation4.phpt index d3ef45c460..4201becefd 100644 --- a/ext/standard/tests/array/array_diff_key_variation4.phpt +++ b/ext/standard/tests/array/array_diff_key_variation4.phpt @@ -26,7 +26,7 @@ foreach($input_arrays as $key =>$value) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_key() : usage variation *** --decimal indexed-- diff --git a/ext/standard/tests/array/array_diff_key_variation5.phpt b/ext/standard/tests/array/array_diff_key_variation5.phpt index f777953c59..ff8f3aff4b 100644 --- a/ext/standard/tests/array/array_diff_key_variation5.phpt +++ b/ext/standard/tests/array/array_diff_key_variation5.phpt @@ -19,7 +19,7 @@ var_dump( array_diff_key($input_array, $float_indx_array) ); var_dump( array_diff_key($float_indx_array, $input_array) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_key() : usage variation *** -- Testing array_diff_key() function with float indexed array -- diff --git a/ext/standard/tests/array/array_diff_key_variation6.phpt b/ext/standard/tests/array/array_diff_key_variation6.phpt index 48334fc0a9..8670d05257 100644 --- a/ext/standard/tests/array/array_diff_key_variation6.phpt +++ b/ext/standard/tests/array/array_diff_key_variation6.phpt @@ -19,7 +19,7 @@ var_dump( array_diff_key($input_array, $boolean_indx_array) ); var_dump( array_diff_key($boolean_indx_array, $input_array) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_key() : usage variation *** -- Testing array_diff_key() function with boolean indexed array -- diff --git a/ext/standard/tests/array/array_diff_key_variation7.phpt b/ext/standard/tests/array/array_diff_key_variation7.phpt index c2e806c009..d3acf8c88c 100644 --- a/ext/standard/tests/array/array_diff_key_variation7.phpt +++ b/ext/standard/tests/array/array_diff_key_variation7.phpt @@ -30,7 +30,7 @@ foreach($input_arrays as $key =>$value) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_key() : usage variation *** --null indexed-- diff --git a/ext/standard/tests/array/array_diff_key_variation8.phpt b/ext/standard/tests/array/array_diff_key_variation8.phpt index 3242e6970b..7134b4e52d 100644 --- a/ext/standard/tests/array/array_diff_key_variation8.phpt +++ b/ext/standard/tests/array/array_diff_key_variation8.phpt @@ -33,7 +33,7 @@ var_dump( array_diff_key($array1, $array2) ); var_dump( array_diff_key($array2, $array1) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_key() : usage variation *** -- Testing array_diff_key() function with multi dimensional array -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation10.phpt b/ext/standard/tests/array/array_diff_uassoc_variation10.phpt index 57b17d1bcf..db0476ae34 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation10.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation10.phpt @@ -20,7 +20,7 @@ var_dump( array_diff_uassoc($float_indx_array, $input_array, "strcasecmp") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** -- Testing array_diff_key() function with float indexed array -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation11.phpt b/ext/standard/tests/array/array_diff_uassoc_variation11.phpt index b77df32796..f2e945840f 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation11.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation11.phpt @@ -20,7 +20,7 @@ var_dump( array_diff_uassoc($boolean_indx_array, $input_array, "strcasecmp") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** -- Testing array_diff_key() function with float indexed array -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation12.phpt b/ext/standard/tests/array/array_diff_uassoc_variation12.phpt index 9d48231a3f..656faf4793 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation12.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation12.phpt @@ -31,7 +31,7 @@ foreach($input_arrays as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** --null indexed-- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation13.phpt b/ext/standard/tests/array/array_diff_uassoc_variation13.phpt index 92194262ab..4094218697 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation13.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation13.phpt @@ -33,7 +33,7 @@ var_dump( array_diff_uassoc($array2, $array1, "strcasecmp") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** -- Testing array_diff_uassoc() function with referenced variable $ref_var has value 'a' -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation5.phpt b/ext/standard/tests/array/array_diff_uassoc_variation5.phpt index c35b2ebd9d..dde0b1ea07 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation5.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation5.phpt @@ -29,7 +29,7 @@ var_dump( array_diff_uassoc($arr_float, $arr_default_int, "key_compare_func") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** -- Result of comparing integers and floating point numbers -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation6.phpt b/ext/standard/tests/array/array_diff_uassoc_variation6.phpt index ad4e8ffda7..998cc33f42 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation6.phpt @@ -33,7 +33,7 @@ var_dump( array_diff_uassoc($arr_string_float, $arr_float, "key_compare_func") ) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** -- Result of comparing floating points and strings containing integers -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation7.phpt b/ext/standard/tests/array/array_diff_uassoc_variation7.phpt index da2030cf12..cbc1d8305c 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation7.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation7.phpt @@ -28,7 +28,7 @@ var_dump( array_diff_uassoc($arr_string_float, $arr_string_int, "key_compare_fun ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** -- Result of comparing strings containing integers and strings containing floating points -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation8.phpt b/ext/standard/tests/array/array_diff_uassoc_variation8.phpt index d450def21b..40062170c4 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation8.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation8.phpt @@ -33,7 +33,7 @@ var_dump( array_diff_uassoc($arr_string_float, $arr_default_int, "key_compare_fu ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** -- Result of comparing integers and strings containing an integers -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation9.phpt b/ext/standard/tests/array/array_diff_uassoc_variation9.phpt index 72746bb904..cb4672773d 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation9.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation9.phpt @@ -27,7 +27,7 @@ foreach($input_arrays as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** --decimal indexed-- diff --git a/ext/standard/tests/array/array_diff_ukey_variation5.phpt b/ext/standard/tests/array/array_diff_ukey_variation5.phpt index fb0c97af09..eae2cbb915 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation5.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation5.phpt @@ -33,7 +33,7 @@ var_dump( array_diff_ukey($array1, $array2, 'strcasecmp') ); var_dump( array_diff_ukey($array2, $array1, 'strcasecmp') ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_ukey() : usage variation *** -- Testing array_diff_ukey() function with multi dimensional array -- diff --git a/ext/standard/tests/array/array_diff_ukey_variation6.phpt b/ext/standard/tests/array/array_diff_ukey_variation6.phpt index 2188a88dda..ab94239696 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation6.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation6.phpt @@ -30,7 +30,7 @@ foreach($input_arrays as $key =>$value) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_ukey() : usage variation *** --decimal indexed-- diff --git a/ext/standard/tests/array/array_diff_ukey_variation7.phpt b/ext/standard/tests/array/array_diff_ukey_variation7.phpt index 88888d6b37..d499fe73c1 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation7.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation7.phpt @@ -25,7 +25,7 @@ var_dump( array_diff_ukey($input_array, $float_indx_array, 'key_compare_func') ) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_ukey() : usage variation *** -- Testing array_diff_ukey() function with float indexed array -- diff --git a/ext/standard/tests/array/array_diff_ukey_variation8.phpt b/ext/standard/tests/array/array_diff_ukey_variation8.phpt index 9bb9498996..c3dbdc1376 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation8.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation8.phpt @@ -25,7 +25,7 @@ var_dump( array_diff_ukey($input_array, $boolean_indx_array, 'key_compare_func') ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_ukey() : usage variation *** -- Testing array_diff_ukey() function with boolean indexed array -- diff --git a/ext/standard/tests/array/array_diff_ukey_variation9.phpt b/ext/standard/tests/array/array_diff_ukey_variation9.phpt index 024f5f4247..c211bfe88b 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation9.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation9.phpt @@ -30,7 +30,7 @@ foreach($input_arrays as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_ukey() : usage variation *** --null indexed-- diff --git a/ext/standard/tests/array/array_diff_variation10.phpt b/ext/standard/tests/array/array_diff_variation10.phpt index 9442b946d9..ec748c2884 100644 --- a/ext/standard/tests/array/array_diff_variation10.phpt +++ b/ext/standard/tests/array/array_diff_variation10.phpt @@ -31,7 +31,7 @@ var_dump(array_diff($array2, $array1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : usage variations *** array(1) { [0]=> diff --git a/ext/standard/tests/array/array_diff_variation3.phpt b/ext/standard/tests/array/array_diff_variation3.phpt index 84f73fd287..5888c3b1ba 100644 --- a/ext/standard/tests/array/array_diff_variation3.phpt +++ b/ext/standard/tests/array/array_diff_variation3.phpt @@ -103,7 +103,7 @@ foreach($values as $value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : usage variations *** Iteration: 1 diff --git a/ext/standard/tests/array/array_diff_variation4.phpt b/ext/standard/tests/array/array_diff_variation4.phpt index 75b01adaa1..01fb1a43ef 100644 --- a/ext/standard/tests/array/array_diff_variation4.phpt +++ b/ext/standard/tests/array/array_diff_variation4.phpt @@ -103,7 +103,7 @@ foreach($values as $value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : usage variations *** Iteration: 1 diff --git a/ext/standard/tests/array/array_diff_variation5.phpt b/ext/standard/tests/array/array_diff_variation5.phpt index cb6b5d3dab..71667f67fa 100644 --- a/ext/standard/tests/array/array_diff_variation5.phpt +++ b/ext/standard/tests/array/array_diff_variation5.phpt @@ -48,7 +48,7 @@ var_dump(array_diff($arr_float_str, $arr_int_str)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : usage variations *** -- Compare integers and floats: -- array(0) { diff --git a/ext/standard/tests/array/array_diff_variation6.phpt b/ext/standard/tests/array/array_diff_variation6.phpt index 8ea84bb9da..9a71db570c 100644 --- a/ext/standard/tests/array/array_diff_variation6.phpt +++ b/ext/standard/tests/array/array_diff_variation6.phpt @@ -29,7 +29,7 @@ var_dump(array_diff($array_assoc, $array_index)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : usage variations *** array(1) { [0]=> diff --git a/ext/standard/tests/array/array_diff_variation7.phpt b/ext/standard/tests/array/array_diff_variation7.phpt index c53cbb3d1c..8274d858ca 100644 --- a/ext/standard/tests/array/array_diff_variation7.phpt +++ b/ext/standard/tests/array/array_diff_variation7.phpt @@ -45,7 +45,7 @@ var_dump(array_diff($arr2, $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : usage variations *** -- Basic Comparison -- diff --git a/ext/standard/tests/array/array_fill.phpt b/ext/standard/tests/array/array_fill.phpt index c6c7e1e457..230fe61652 100644 --- a/ext/standard/tests/array/array_fill.phpt +++ b/ext/standard/tests/array/array_fill.phpt @@ -20,7 +20,7 @@ foreach($array1 as $start) echo '== Done =='; ?> ===============Done==================== ---EXPECTF-- +--EXPECT-- =========================== start: 0 num: 0 value: 1 array(0) { diff --git a/ext/standard/tests/array/array_fill_basic.phpt b/ext/standard/tests/array/array_fill_basic.phpt index 309c9ca073..a368bbaf93 100644 --- a/ext/standard/tests/array/array_fill_basic.phpt +++ b/ext/standard/tests/array/array_fill_basic.phpt @@ -42,7 +42,7 @@ for($i = 0; $i < count($values); $i ++) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_fill() : basic functionality *** -- Iteration 1 -- array(2) { diff --git a/ext/standard/tests/array/array_fill_keys_variation2.phpt b/ext/standard/tests/array/array_fill_keys_variation2.phpt index 4f3681aaf4..1c9382eb09 100644 --- a/ext/standard/tests/array/array_fill_keys_variation2.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation2.phpt @@ -46,7 +46,7 @@ var_dump(array_fill_keys($refArray, $simpleStr)); fclose($fp); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_fill_keys() : parameter variations *** -- Testing array_fill_keys() function with reference value -- diff --git a/ext/standard/tests/array/array_fill_variation4.phpt b/ext/standard/tests/array/array_fill_variation4.phpt index 13b566a7db..d3f9e4c1e7 100644 --- a/ext/standard/tests/array/array_fill_variation4.phpt +++ b/ext/standard/tests/array/array_fill_variation4.phpt @@ -43,7 +43,7 @@ for($i =0; $i < count($values); $i ++) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_fill() : variation *** *** Filling 2 dimensional array with all basic valid values *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_fill_variation5.phpt b/ext/standard/tests/array/array_fill_variation5.phpt index 10fcc9c2eb..341e0cf565 100644 --- a/ext/standard/tests/array/array_fill_variation5.phpt +++ b/ext/standard/tests/array/array_fill_variation5.phpt @@ -52,7 +52,7 @@ for($i = 0; $i < count($values); $i++) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_fill() : usage variations *** --- Testing array_fill() with different types of array values for 'val' argument --- -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_filter_basic.phpt b/ext/standard/tests/array/array_filter_basic.phpt index daec07bacd..28c10ff2e6 100644 --- a/ext/standard/tests/array/array_filter_basic.phpt +++ b/ext/standard/tests/array/array_filter_basic.phpt @@ -34,7 +34,7 @@ var_dump( array_filter($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_filter() : basic functionality *** array(2) { [1]=> diff --git a/ext/standard/tests/array/array_filter_variation3.phpt b/ext/standard/tests/array/array_filter_variation3.phpt index e22697a978..c4a12e661b 100644 --- a/ext/standard/tests/array/array_filter_variation3.phpt +++ b/ext/standard/tests/array/array_filter_variation3.phpt @@ -49,7 +49,7 @@ for($count = 0; $count < count($input_values); $count++) echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_filter() : usage variations - different types of array for 'input' argument*** -- Iteration 1 -- array(5) { diff --git a/ext/standard/tests/array/array_filter_variation4.phpt b/ext/standard/tests/array/array_filter_variation4.phpt index 7f028b1552..03a08835b9 100644 --- a/ext/standard/tests/array/array_filter_variation4.phpt +++ b/ext/standard/tests/array/array_filter_variation4.phpt @@ -58,7 +58,7 @@ var_dump( array_filter($input, "callback4") ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_filter() : usage variation - different 'callback' functions*** -- Callback function without parameter and with return -- array(8) { diff --git a/ext/standard/tests/array/array_filter_variation5.phpt b/ext/standard/tests/array/array_filter_variation5.phpt index 66b140a224..f35c321376 100644 --- a/ext/standard/tests/array/array_filter_variation5.phpt +++ b/ext/standard/tests/array/array_filter_variation5.phpt @@ -65,7 +65,7 @@ var_dump( array_filter($input, 'always_false') ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_filter() : usage variations - different false elements in 'input' *** array(0) { } diff --git a/ext/standard/tests/array/array_filter_variation6.phpt b/ext/standard/tests/array/array_filter_variation6.phpt index 1020c28aad..2e7ea77dca 100644 --- a/ext/standard/tests/array/array_filter_variation6.phpt +++ b/ext/standard/tests/array/array_filter_variation6.phpt @@ -43,7 +43,7 @@ var_dump( array_filter($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_filter() : usage variations - 'input' containing references *** array(3) { [0]=> diff --git a/ext/standard/tests/array/array_filter_variation7.phpt b/ext/standard/tests/array/array_filter_variation7.phpt index 79fb574e23..25e3c94d31 100644 --- a/ext/standard/tests/array/array_filter_variation7.phpt +++ b/ext/standard/tests/array/array_filter_variation7.phpt @@ -33,7 +33,7 @@ var_dump( array_filter($input, function($input) { }) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_filter() : usage variations - Anonymous callback functions *** Anonymous callback function with regular parameter and statement array(3) { diff --git a/ext/standard/tests/array/array_filter_variation8.phpt b/ext/standard/tests/array/array_filter_variation8.phpt index 4440b3324e..810cb89732 100644 --- a/ext/standard/tests/array/array_filter_variation8.phpt +++ b/ext/standard/tests/array/array_filter_variation8.phpt @@ -59,7 +59,7 @@ var_dump( array_filter($input, 'callback5') ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_filter() : usage variations - callback function with different return values*** callback function with int return value array(9) { diff --git a/ext/standard/tests/array/array_flip_basic.phpt b/ext/standard/tests/array/array_flip_basic.phpt index 08a63fb66b..ab326b4ab6 100644 --- a/ext/standard/tests/array/array_flip_basic.phpt +++ b/ext/standard/tests/array/array_flip_basic.phpt @@ -30,7 +30,7 @@ $input = array(1 => 'one','two', 3 => 'three', 4, "five" => 5); var_dump( array_flip($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_flip() : basic functionality *** array(2) { [1]=> diff --git a/ext/standard/tests/array/array_flip_variation3.phpt b/ext/standard/tests/array/array_flip_variation3.phpt Binary files differindex 1d56dfa6e0..a3ad5acd88 100644 --- a/ext/standard/tests/array/array_flip_variation3.phpt +++ b/ext/standard/tests/array/array_flip_variation3.phpt diff --git a/ext/standard/tests/array/array_flip_variation5.phpt b/ext/standard/tests/array/array_flip_variation5.phpt index 29222a12ce..cf60dc6955 100644 --- a/ext/standard/tests/array/array_flip_variation5.phpt +++ b/ext/standard/tests/array/array_flip_variation5.phpt @@ -39,7 +39,7 @@ var_dump( array_flip($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_flip() : 'input' array with repeatitive keys/values *** array(3) { ["VaLuE"]=> diff --git a/ext/standard/tests/array/array_intersect_assoc_basic.phpt b/ext/standard/tests/array/array_intersect_assoc_basic.phpt index bf0f2195a1..c1d381051a 100644 --- a/ext/standard/tests/array/array_intersect_assoc_basic.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_basic.phpt @@ -40,7 +40,7 @@ var_dump( array_intersect_assoc($arr_associative, $arr_default_keys, $arr3, $arr echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_assoc() : basic functionality *** array(4) { [0]=> diff --git a/ext/standard/tests/array/array_intersect_assoc_variation10.phpt b/ext/standard/tests/array/array_intersect_assoc_variation10.phpt index 9bce974a9d..95631fc1ac 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation10.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation10.phpt @@ -31,7 +31,7 @@ var_dump( array_intersect_assoc($arr_binary, $arr_binary) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_assoc() : binary safe checking *** array(2) { [0]=> diff --git a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt index e3f0ae08ec..af7df4f35c 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt @@ -101,7 +101,7 @@ foreach($arrays as $arr1) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_assoc() : Passing different types of arrays to $arr1 argument *** -- Iteration 1 -- array(1) { diff --git a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt index 9eb342f8e7..495ec30ff9 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt @@ -100,7 +100,7 @@ foreach($arrays as $arr2) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_assoc() : Passing different types of arrays to $arr2 argument *** -- Iteration 1 -- array(1) { diff --git a/ext/standard/tests/array/array_intersect_assoc_variation5.phpt b/ext/standard/tests/array/array_intersect_assoc_variation5.phpt index 7d8e09eb2d..0aa109933a 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation5.phpt @@ -79,7 +79,7 @@ foreach($arrays as $arr1) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_assoc() : assoc array with diff keys to $arr1 argument *** -- Iteration 1 -- array(0) { diff --git a/ext/standard/tests/array/array_intersect_assoc_variation6.phpt b/ext/standard/tests/array/array_intersect_assoc_variation6.phpt index 75806225ca..f3e6964d7b 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation6.phpt @@ -79,7 +79,7 @@ foreach($arrays as $arr2) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_assoc() : assoc array with diff keys to $arr2 argument *** -- Iteration 1 -- array(0) { diff --git a/ext/standard/tests/array/array_intersect_basic.phpt b/ext/standard/tests/array/array_intersect_basic.phpt index fde5782c90..03661f2756 100644 --- a/ext/standard/tests/array/array_intersect_basic.phpt +++ b/ext/standard/tests/array/array_intersect_basic.phpt @@ -39,7 +39,7 @@ var_dump( array_intersect($arr_associative, $arr_default_keys, $arr3, $arr_assoc echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect() : basic functionality *** array(4) { [0]=> diff --git a/ext/standard/tests/array/array_intersect_key.phpt b/ext/standard/tests/array/array_intersect_key.phpt index 6d27839404..52a0ee5e97 100644 --- a/ext/standard/tests/array/array_intersect_key.phpt +++ b/ext/standard/tests/array/array_intersect_key.phpt @@ -59,7 +59,7 @@ function comp_func($a, $b) { } ?> ---EXPECTF-- +--EXPECT-- array(3) { [2]=> int(4) diff --git a/ext/standard/tests/array/array_intersect_key_variation4.phpt b/ext/standard/tests/array/array_intersect_key_variation4.phpt index 1d3d97602c..24e649fe15 100644 --- a/ext/standard/tests/array/array_intersect_key_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation4.phpt @@ -25,7 +25,7 @@ foreach($input_arrays as $key =>$value) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_key() : usage variation *** --decimal indexed-- diff --git a/ext/standard/tests/array/array_intersect_key_variation5.phpt b/ext/standard/tests/array/array_intersect_key_variation5.phpt index c286de6e3f..c89add62ec 100644 --- a/ext/standard/tests/array/array_intersect_key_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation5.phpt @@ -18,7 +18,7 @@ var_dump( array_intersect_key($input_array, $float_indx_array) ); var_dump( array_intersect_key($float_indx_array,$input_array ) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_key() : usage variation *** -- Testing array_intersect_key() function with float indexed array -- diff --git a/ext/standard/tests/array/array_intersect_key_variation6.phpt b/ext/standard/tests/array/array_intersect_key_variation6.phpt index 823b0707d9..b671e11e92 100644 --- a/ext/standard/tests/array/array_intersect_key_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation6.phpt @@ -18,7 +18,7 @@ var_dump( array_intersect_key($input_array, $boolean_indx_array) ); var_dump( array_intersect_key($boolean_indx_array,$input_array ) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_key() : usage variation *** -- Testing array_intersect_key() function with boolean indexed array -- diff --git a/ext/standard/tests/array/array_intersect_key_variation7.phpt b/ext/standard/tests/array/array_intersect_key_variation7.phpt index fe4446a243..4dabf8d1b7 100644 --- a/ext/standard/tests/array/array_intersect_key_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation7.phpt @@ -28,7 +28,7 @@ foreach($input_arrays as $key =>$value) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_key() : usage variation *** --null indexed-- diff --git a/ext/standard/tests/array/array_intersect_key_variation8.phpt b/ext/standard/tests/array/array_intersect_key_variation8.phpt index 2b889b5965..5792930afc 100644 --- a/ext/standard/tests/array/array_intersect_key_variation8.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation8.phpt @@ -31,7 +31,7 @@ var_dump( array_intersect_key($array1, $array2) ); var_dump( array_intersect_key($array2,$array1 ) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_key() : usage variation *** array(2) { ["first"]=> diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt index aa0c82d158..9fda4da434 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt @@ -34,7 +34,7 @@ $obj = new MyClass(); var_dump( array_intersect_uassoc($array1, $array2, array($obj,'class_compare_func')) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** -- Testing array_intersect_uassoc() function using class with static method as callback -- diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation5.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation5.phpt index ec7ee81969..10835a1871 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation5.phpt @@ -33,7 +33,7 @@ echo "\n-- Result of integers and strings containing floating points intersectio var_dump( array_intersect_uassoc($arr_default_int, $arr_string_float, "key_compare_func") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** -- Result of integers and floating point intersection -- diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation6.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation6.phpt index 55dd46d48e..b29a9684d5 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation6.phpt @@ -29,7 +29,7 @@ echo "\n-- Result of floating points and strings containing floating point inter var_dump( array_intersect_uassoc($arr_float, $arr_string_float, "key_compare_func") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** -- Result of floating points and strings containing integers intersection -- diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation7.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation7.phpt index 7fa053a91a..4be5ebf5d7 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation7.phpt @@ -33,7 +33,7 @@ echo "\n-- Result of strings containing integers and strings containing floating var_dump( array_intersect_uassoc($arr1_string_int, $arr2_string_float, "key_compare_func") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** -- Result of strings containing integers intersection -- diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation8.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation8.phpt index 7b218f7faa..256b883d28 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation8.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation8.phpt @@ -28,7 +28,7 @@ echo "\n-- Testing array_intersect_uassoc() function when \$array2 is referencd var_dump( array_intersect_uassoc($array1, $array2, "strcasecmp") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** -- Testing array_intersect_uassoc() function with referenced variable $ref_var has value 'a' -- diff --git a/ext/standard/tests/array/array_intersect_ukey_variation5.phpt b/ext/standard/tests/array/array_intersect_ukey_variation5.phpt index c1520fbb64..b512b06040 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation5.phpt @@ -34,7 +34,7 @@ echo "\n-- Result of integers and strings containing floating points intersectio var_dump( array_intersect_ukey($arr_default_int, $arr_string_float, "key_compare_func") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_ukey() : usage variation *** -- Result of integers and floating point intersection -- diff --git a/ext/standard/tests/array/array_intersect_ukey_variation6.phpt b/ext/standard/tests/array/array_intersect_ukey_variation6.phpt index a918660e42..6231a657a9 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation6.phpt @@ -30,7 +30,7 @@ echo "\n-- Result of floating points and strings containing floating point inter var_dump( array_intersect_ukey($arr_float, $arr_string_float, 'key_compare_func') ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_ukey() : usage variation *** -- Result of floating points and strings containing integers intersection -- diff --git a/ext/standard/tests/array/array_intersect_ukey_variation7.phpt b/ext/standard/tests/array/array_intersect_ukey_variation7.phpt index 75b601c11f..c79277df56 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation7.phpt @@ -34,7 +34,7 @@ echo "\n-- Result of strings containing integers and strings containing floating var_dump( array_intersect_ukey($arr1_string_int, $arr2_string_float, 'key_compare_func') ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_ukey() : usage variation *** -- Result of strings containing integers intersection -- diff --git a/ext/standard/tests/array/array_intersect_ukey_variation9.phpt b/ext/standard/tests/array/array_intersect_ukey_variation9.phpt index fe130a86f6..38c91fca07 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation9.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation9.phpt @@ -34,7 +34,7 @@ $obj = new MyClass(); var_dump( array_intersect_ukey($array1, $array2, array($obj,'class_compare_func')) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_ukey() : usage variation *** -- Testing array_intersect_ukey() function using class with static method as callback -- diff --git a/ext/standard/tests/array/array_intersect_variation10.phpt b/ext/standard/tests/array/array_intersect_variation10.phpt index e193f97d46..266f9b8f89 100644 --- a/ext/standard/tests/array/array_intersect_variation10.phpt +++ b/ext/standard/tests/array/array_intersect_variation10.phpt @@ -30,7 +30,7 @@ var_dump( array_intersect($arr_binary, $arr_binary) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect() : binary safe checking *** array(2) { [0]=> diff --git a/ext/standard/tests/array/array_intersect_variation3.phpt b/ext/standard/tests/array/array_intersect_variation3.phpt index c404e58bab..aa0f0b704a 100644 --- a/ext/standard/tests/array/array_intersect_variation3.phpt +++ b/ext/standard/tests/array/array_intersect_variation3.phpt @@ -100,7 +100,7 @@ foreach($arrays as $arr1) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect() : Passing different types of arrays to $arr1 argument *** -- Iterator 1 -- array(2) { diff --git a/ext/standard/tests/array/array_intersect_variation4.phpt b/ext/standard/tests/array/array_intersect_variation4.phpt index 66624a66cd..93419842cb 100644 --- a/ext/standard/tests/array/array_intersect_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_variation4.phpt @@ -99,7 +99,7 @@ foreach($arrays as $arr2) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect() : Passing different types of arrays to $arr2 argument *** -- Iteration 1 -- array(3) { diff --git a/ext/standard/tests/array/array_intersect_variation5.phpt b/ext/standard/tests/array/array_intersect_variation5.phpt index 9aaedeb382..14f8cdd6d1 100644 --- a/ext/standard/tests/array/array_intersect_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_variation5.phpt @@ -76,7 +76,7 @@ foreach($arrays as $arr1) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect() : assoc array with diff keys to $arr1 argument *** -- Iterator 1 -- array(0) { diff --git a/ext/standard/tests/array/array_intersect_variation6.phpt b/ext/standard/tests/array/array_intersect_variation6.phpt index 48d01f7d54..8534bd2a8a 100644 --- a/ext/standard/tests/array/array_intersect_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_variation6.phpt @@ -76,7 +76,7 @@ foreach($arrays as $arr2) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect() : assoc array with diff keys to $arr2 argument *** -- Iterator 1 -- array(0) { diff --git a/ext/standard/tests/array/array_key_exists_basic.phpt b/ext/standard/tests/array/array_key_exists_basic.phpt index 6fbd415dc5..6ebaf56ded 100644 --- a/ext/standard/tests/array/array_key_exists_basic.phpt +++ b/ext/standard/tests/array/array_key_exists_basic.phpt @@ -22,7 +22,7 @@ var_dump(array_key_exists($key2, $search)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : basic functionality *** bool(true) bool(false) diff --git a/ext/standard/tests/array/array_key_exists_object1.phpt b/ext/standard/tests/array/array_key_exists_object1.phpt index 3b263df474..70fb49a725 100644 --- a/ext/standard/tests/array/array_key_exists_object1.phpt +++ b/ext/standard/tests/array/array_key_exists_object1.phpt @@ -47,7 +47,7 @@ var_dump($class2); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : object functionality *** -- Do not assign a value to $class1->var3 -- diff --git a/ext/standard/tests/array/array_key_exists_object2.phpt b/ext/standard/tests/array/array_key_exists_object2.phpt index 4a790e9d37..78c20c9c72 100644 --- a/ext/standard/tests/array/array_key_exists_object2.phpt +++ b/ext/standard/tests/array/array_key_exists_object2.phpt @@ -49,7 +49,7 @@ var_dump($class2); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : object functionality *** -- Do not assign a value to $class1->var3 -- diff --git a/ext/standard/tests/array/array_key_exists_variation4.phpt b/ext/standard/tests/array/array_key_exists_variation4.phpt index 84dfeb9373..4bf3473ef3 100644 --- a/ext/standard/tests/array/array_key_exists_variation4.phpt +++ b/ext/standard/tests/array/array_key_exists_variation4.phpt @@ -23,7 +23,7 @@ var_dump(array_key_exists('one', $search)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : usage variations *** -- $search is a reference to $array -- diff --git a/ext/standard/tests/array/array_key_exists_variation5.phpt b/ext/standard/tests/array/array_key_exists_variation5.phpt index 9c15759fc7..2144fb893c 100644 --- a/ext/standard/tests/array/array_key_exists_variation5.phpt +++ b/ext/standard/tests/array/array_key_exists_variation5.phpt @@ -28,7 +28,7 @@ var_dump(array_key_exists(0, $multi_array['sub1'])); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : usage variations *** -- Attempt to match key in sub-array -- diff --git a/ext/standard/tests/array/array_key_exists_variation6.phpt b/ext/standard/tests/array/array_key_exists_variation6.phpt index d19e58e764..abfba0a4c3 100644 --- a/ext/standard/tests/array/array_key_exists_variation6.phpt +++ b/ext/standard/tests/array/array_key_exists_variation6.phpt @@ -43,7 +43,7 @@ foreach($array as $name => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : usage variations *** -- Key in $search array is : null -- diff --git a/ext/standard/tests/array/array_key_exists_variation7.phpt b/ext/standard/tests/array/array_key_exists_variation7.phpt index 845c1e54ba..6211882222 100644 --- a/ext/standard/tests/array/array_key_exists_variation7.phpt +++ b/ext/standard/tests/array/array_key_exists_variation7.phpt @@ -25,7 +25,7 @@ echo key($input) . " => " . current ($input) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : usage variations *** -- Call array_key_exists() -- diff --git a/ext/standard/tests/array/array_key_exists_variation8.phpt b/ext/standard/tests/array/array_key_exists_variation8.phpt index d5bad62e2c..522fd67e99 100644 --- a/ext/standard/tests/array/array_key_exists_variation8.phpt +++ b/ext/standard/tests/array/array_key_exists_variation8.phpt @@ -110,7 +110,7 @@ foreach($inputs as $type => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : usage variations *** -- Iteration 1: int data -- diff --git a/ext/standard/tests/array/array_keys_basic.phpt b/ext/standard/tests/array/array_keys_basic.phpt index 80b624bb20..0aa84d984d 100644 --- a/ext/standard/tests/array/array_keys_basic.phpt +++ b/ext/standard/tests/array/array_keys_basic.phpt @@ -10,7 +10,7 @@ var_dump(array_keys($basic_arr)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_keys() on basic array operation *** array(5) { [0]=> diff --git a/ext/standard/tests/array/array_keys_variation_001.phpt b/ext/standard/tests/array/array_keys_variation_001.phpt index 1891c131cb..a6203fbbf5 100644 --- a/ext/standard/tests/array/array_keys_variation_001.phpt +++ b/ext/standard/tests/array/array_keys_variation_001.phpt @@ -29,7 +29,7 @@ foreach ($arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_keys() on various arrays *** -- Iteration 0 -- array(0) { diff --git a/ext/standard/tests/array/array_keys_variation_002.phpt b/ext/standard/tests/array/array_keys_variation_002.phpt index d5df95b828..1e7f0df4ad 100644 --- a/ext/standard/tests/array/array_keys_variation_002.phpt +++ b/ext/standard/tests/array/array_keys_variation_002.phpt @@ -25,7 +25,7 @@ var_dump(array_keys(array())); // null array echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_keys() on range of values *** array(4) { [0]=> diff --git a/ext/standard/tests/array/array_keys_variation_002_64bit.phpt b/ext/standard/tests/array/array_keys_variation_002_64bit.phpt index c0a034ec3e..04f574d810 100644 --- a/ext/standard/tests/array/array_keys_variation_002_64bit.phpt +++ b/ext/standard/tests/array/array_keys_variation_002_64bit.phpt @@ -25,7 +25,7 @@ var_dump(array_keys(array())); // null array echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_keys() on range of values *** array(6) { [0]=> diff --git a/ext/standard/tests/array/array_keys_variation_003.phpt b/ext/standard/tests/array/array_keys_variation_003.phpt index 5ccf542b69..b3a97a0dfb 100644 --- a/ext/standard/tests/array/array_keys_variation_003.phpt +++ b/ext/standard/tests/array/array_keys_variation_003.phpt @@ -26,7 +26,7 @@ foreach ($values as $value){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_keys() on all the types other than arrays *** bool(true) array(3) { diff --git a/ext/standard/tests/array/array_keys_variation_004.phpt b/ext/standard/tests/array/array_keys_variation_004.phpt index 1a4f0fcca1..081660d51b 100644 --- a/ext/standard/tests/array/array_keys_variation_004.phpt +++ b/ext/standard/tests/array/array_keys_variation_004.phpt @@ -25,7 +25,7 @@ foreach ($values as $value){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_keys() on all the types other than arrays *** array(0) { } diff --git a/ext/standard/tests/array/array_keys_variation_005.phpt b/ext/standard/tests/array/array_keys_variation_005.phpt index 9a912d68ed..ee37400801 100644 --- a/ext/standard/tests/array/array_keys_variation_005.phpt +++ b/ext/standard/tests/array/array_keys_variation_005.phpt @@ -20,7 +20,7 @@ fclose( $resource1 ); closedir( $resource2 ); ?> ---EXPECTF-- +--EXPECT-- *** Testing array_keys() with resource type *** array(1) { [0]=> diff --git a/ext/standard/tests/array/array_map_001.phpt b/ext/standard/tests/array/array_map_001.phpt index 7d313b59f6..087e3ba284 100644 --- a/ext/standard/tests/array/array_map_001.phpt +++ b/ext/standard/tests/array/array_map_001.phpt @@ -17,6 +17,6 @@ try { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(17) "exception caught!" Done diff --git a/ext/standard/tests/array/array_map_basic.phpt b/ext/standard/tests/array/array_map_basic.phpt index 53a7bb4e26..e67817e2ae 100644 --- a/ext/standard/tests/array/array_map_basic.phpt +++ b/ext/standard/tests/array/array_map_basic.phpt @@ -40,7 +40,7 @@ var_dump( array_map('concatenate', $arr1, $arr2) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : basic functionality *** -- With two integer array -- array(3) { diff --git a/ext/standard/tests/array/array_map_variation11.phpt b/ext/standard/tests/array/array_map_variation11.phpt index 9cad3668d5..6a17b299ee 100644 --- a/ext/standard/tests/array/array_map_variation11.phpt +++ b/ext/standard/tests/array/array_map_variation11.phpt @@ -26,7 +26,7 @@ var_dump( array_map('square_recur_single_array', $array1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : recursive callback function *** array(3) { [0]=> diff --git a/ext/standard/tests/array/array_map_variation13.phpt b/ext/standard/tests/array/array_map_variation13.phpt index 94babdf963..d83f78cbfa 100644 --- a/ext/standard/tests/array/array_map_variation13.phpt +++ b/ext/standard/tests/array/array_map_variation13.phpt @@ -54,7 +54,7 @@ var_dump( array_map('callback_without_ret', $array1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : callback with diff return value *** -- with integer return value -- array(3) { diff --git a/ext/standard/tests/array/array_map_variation19.phpt b/ext/standard/tests/array/array_map_variation19.phpt index 0e56428a03..1f4d2f5679 100644 --- a/ext/standard/tests/array/array_map_variation19.phpt +++ b/ext/standard/tests/array/array_map_variation19.phpt @@ -25,7 +25,7 @@ $ref =& $arr2[0]; array_map("callback", $arr2); var_dump($arr2); ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(10) "original.0" diff --git a/ext/standard/tests/array/array_map_variation3.phpt b/ext/standard/tests/array/array_map_variation3.phpt index a0715504e9..3e8bfea962 100644 --- a/ext/standard/tests/array/array_map_variation3.phpt +++ b/ext/standard/tests/array/array_map_variation3.phpt @@ -56,7 +56,7 @@ foreach($arrays as $arr1) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : different arrays for 'arr1' argument *** -- Iteration 1 -- array(2) { diff --git a/ext/standard/tests/array/array_map_variation6.phpt b/ext/standard/tests/array/array_map_variation6.phpt index 2409a5763c..9b6ee42e2a 100644 --- a/ext/standard/tests/array/array_map_variation6.phpt +++ b/ext/standard/tests/array/array_map_variation6.phpt @@ -30,7 +30,7 @@ $arr1 = array( var_dump( array_map('callback', $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : array having subarrays *** array(5) { [0]=> diff --git a/ext/standard/tests/array/array_map_variation7.phpt b/ext/standard/tests/array/array_map_variation7.phpt index 8f88a0f88c..44ad142184 100644 --- a/ext/standard/tests/array/array_map_variation7.phpt +++ b/ext/standard/tests/array/array_map_variation7.phpt @@ -32,7 +32,7 @@ var_dump( array_map('callback', array(), array(1, 2, 3), array('a', 'b')) ); // echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : arrays with diff. size *** array(3) { [0]=> diff --git a/ext/standard/tests/array/array_map_variation8.phpt b/ext/standard/tests/array/array_map_variation8.phpt index 5672e6cd95..99b206d0f9 100644 --- a/ext/standard/tests/array/array_map_variation8.phpt +++ b/ext/standard/tests/array/array_map_variation8.phpt @@ -46,7 +46,7 @@ var_dump( array_map('callback_cat', $arr1, $arr1) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : array with references for 'arr1' argument *** -- with one array -- array(6) { diff --git a/ext/standard/tests/array/array_map_variation9.phpt b/ext/standard/tests/array/array_map_variation9.phpt index f33b717c6c..9c70340b30 100644 --- a/ext/standard/tests/array/array_map_variation9.phpt +++ b/ext/standard/tests/array/array_map_variation9.phpt @@ -37,7 +37,7 @@ try { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : array with binary data for 'arr1' argument *** -- checking binary safe array with one parameter callback function -- array(4) { diff --git a/ext/standard/tests/array/array_merge_basic.phpt b/ext/standard/tests/array/array_merge_basic.phpt index c4dc69638e..fcf9131ed8 100644 --- a/ext/standard/tests/array/array_merge_basic.phpt +++ b/ext/standard/tests/array/array_merge_basic.phpt @@ -25,7 +25,7 @@ var_dump(array_merge($array2, $array1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : basic functionality *** array(6) { [0]=> diff --git a/ext/standard/tests/array/array_merge_recursive_basic1.phpt b/ext/standard/tests/array/array_merge_recursive_basic1.phpt index a86a8510ae..e22208753e 100644 --- a/ext/standard/tests/array/array_merge_recursive_basic1.phpt +++ b/ext/standard/tests/array/array_merge_recursive_basic1.phpt @@ -25,7 +25,7 @@ var_dump( array_merge_recursive($arr1,$arr2,$arr3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : array with default keys *** -- With default argument -- array(2) { diff --git a/ext/standard/tests/array/array_merge_recursive_basic2.phpt b/ext/standard/tests/array/array_merge_recursive_basic2.phpt index 3f8c62e7ab..ce17a06b89 100644 --- a/ext/standard/tests/array/array_merge_recursive_basic2.phpt +++ b/ext/standard/tests/array/array_merge_recursive_basic2.phpt @@ -25,7 +25,7 @@ var_dump( array_merge_recursive($arr1,$arr2,$arr3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : associative arrays *** -- With default argument -- array(2) { diff --git a/ext/standard/tests/array/array_merge_recursive_variation10.phpt b/ext/standard/tests/array/array_merge_recursive_variation10.phpt index 42d315eb89..06595d5130 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation10.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation10.phpt @@ -39,7 +39,7 @@ var_dump( array_merge_recursive($arr1["array"], $arr2["array"]) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : two dimensional array for $arr1 argument *** -- Passing the entire 2-d array -- -- With default argument -- diff --git a/ext/standard/tests/array/array_merge_recursive_variation3.phpt b/ext/standard/tests/array/array_merge_recursive_variation3.phpt index 76bf913918..8a76a67153 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation3.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation3.phpt @@ -95,7 +95,7 @@ foreach($arrays as $arr1) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : Passing different arrays to $arr1 argument *** -- Iteration 1 -- -- With default argument -- diff --git a/ext/standard/tests/array/array_merge_recursive_variation6.phpt b/ext/standard/tests/array/array_merge_recursive_variation6.phpt index 8e460ba366..22819dfb37 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation6.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation6.phpt @@ -33,7 +33,7 @@ var_dump( array_merge_recursive($arr1_string_key, $arr2) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : array with duplicate keys for $arr1 argument *** -- With default argument -- array(3) { diff --git a/ext/standard/tests/array/array_merge_recursive_variation7.phpt b/ext/standard/tests/array/array_merge_recursive_variation7.phpt index b244e7d6b8..419eed5d11 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation7.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation7.phpt @@ -40,7 +40,7 @@ var_dump( array_merge_recursive($arr1, $arr2) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : array with reference variables for $arr1 argument *** -- With default argument -- array(6) { diff --git a/ext/standard/tests/array/array_merge_recursive_variation8.phpt b/ext/standard/tests/array/array_merge_recursive_variation8.phpt index 6ad2f6989f..255ed070aa 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation8.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation8.phpt @@ -27,7 +27,7 @@ var_dump( array_merge_recursive($arr1, $arr2) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : array with binary data for $arr1 argument *** -- With default argument -- array(5) { diff --git a/ext/standard/tests/array/array_merge_recursive_variation9.phpt b/ext/standard/tests/array/array_merge_recursive_variation9.phpt index d51d2f8908..59a94024f1 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation9.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation9.phpt @@ -48,7 +48,7 @@ var_dump( array_merge_recursive($arr1, $arr2) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : arrays with common key and value *** -- Integer values -- array(3) { diff --git a/ext/standard/tests/array/array_merge_variation10.phpt b/ext/standard/tests/array/array_merge_variation10.phpt index 7f08a4bb78..46403fac9e 100644 --- a/ext/standard/tests/array/array_merge_variation10.phpt +++ b/ext/standard/tests/array/array_merge_variation10.phpt @@ -35,7 +35,7 @@ echo key($arr3) . " => " . current ($arr3) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : usage variations *** -- Call array_merge() -- diff --git a/ext/standard/tests/array/array_merge_variation4.phpt b/ext/standard/tests/array/array_merge_variation4.phpt index e4eb2570cd..ad7d7fe5dc 100644 --- a/ext/standard/tests/array/array_merge_variation4.phpt +++ b/ext/standard/tests/array/array_merge_variation4.phpt @@ -107,7 +107,7 @@ foreach($inputs as $key => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : usage variations *** -- Iteration 1: int data -- diff --git a/ext/standard/tests/array/array_merge_variation5.phpt b/ext/standard/tests/array/array_merge_variation5.phpt index eca6078e6a..143d4ca1e6 100644 --- a/ext/standard/tests/array/array_merge_variation5.phpt +++ b/ext/standard/tests/array/array_merge_variation5.phpt @@ -24,7 +24,7 @@ var_dump(array_merge($arr2, $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : usage variations *** array(7) { [0]=> diff --git a/ext/standard/tests/array/array_merge_variation6.phpt b/ext/standard/tests/array/array_merge_variation6.phpt index 13b346eb3f..3ddc068244 100644 --- a/ext/standard/tests/array/array_merge_variation6.phpt +++ b/ext/standard/tests/array/array_merge_variation6.phpt @@ -24,7 +24,7 @@ var_dump(array_merge($arr2, $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : usage variations *** array(5) { ["zero"]=> diff --git a/ext/standard/tests/array/array_merge_variation7.phpt b/ext/standard/tests/array/array_merge_variation7.phpt index 00943f3ea4..fedf61e96e 100644 --- a/ext/standard/tests/array/array_merge_variation7.phpt +++ b/ext/standard/tests/array/array_merge_variation7.phpt @@ -24,7 +24,7 @@ var_dump(array_merge($arr2, $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : usage variations *** array(8) { [0]=> diff --git a/ext/standard/tests/array/array_merge_variation8.phpt b/ext/standard/tests/array/array_merge_variation8.phpt index a4cdea74fe..700bbb8913 100644 --- a/ext/standard/tests/array/array_merge_variation8.phpt +++ b/ext/standard/tests/array/array_merge_variation8.phpt @@ -26,7 +26,7 @@ var_dump(array_merge($arr2, $arr1[3])); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : usage variations *** -- Merge a two-dimensional and a one-dimensional array -- diff --git a/ext/standard/tests/array/array_merge_variation9.phpt b/ext/standard/tests/array/array_merge_variation9.phpt index 69e0401a0e..95daa10558 100644 --- a/ext/standard/tests/array/array_merge_variation9.phpt +++ b/ext/standard/tests/array/array_merge_variation9.phpt @@ -34,7 +34,7 @@ var_dump(array_merge($arr2, $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : usage variations *** -- Merge an array made up of referenced variables to an assoc. array -- diff --git a/ext/standard/tests/array/array_multisort_basic1.phpt b/ext/standard/tests/array/array_multisort_basic1.phpt index ab7db94463..7d33596630 100644 --- a/ext/standard/tests/array/array_multisort_basic1.phpt +++ b/ext/standard/tests/array/array_multisort_basic1.phpt @@ -25,7 +25,7 @@ var_dump($ar2); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : basic functionality *** -- Testing array_multisort() function with all normal arguments -- diff --git a/ext/standard/tests/array/array_multisort_basic2.phpt b/ext/standard/tests/array/array_multisort_basic2.phpt index 4a46072e65..682543bc9f 100644 --- a/ext/standard/tests/array/array_multisort_basic2.phpt +++ b/ext/standard/tests/array/array_multisort_basic2.phpt @@ -20,7 +20,7 @@ var_dump($ar1, $ar2); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : basic functionality - renumbering of numeric keys *** -- Testing array_multisort() function with all normal arguments -- diff --git a/ext/standard/tests/array/array_multisort_case.phpt b/ext/standard/tests/array/array_multisort_case.phpt index 6be42edf57..f766e5fc1d 100644 --- a/ext/standard/tests/array/array_multisort_case.phpt +++ b/ext/standard/tests/array/array_multisort_case.phpt @@ -36,7 +36,7 @@ var_dump($a, $b); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : case-sensitive array(7) { [0]=> diff --git a/ext/standard/tests/array/array_multisort_incase.phpt b/ext/standard/tests/array/array_multisort_incase.phpt index 951cce4927..46d55ae065 100644 --- a/ext/standard/tests/array/array_multisort_incase.phpt +++ b/ext/standard/tests/array/array_multisort_incase.phpt @@ -36,7 +36,7 @@ var_dump($a, $b); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : case-insensitive array(7) { [0]=> diff --git a/ext/standard/tests/array/array_multisort_natural.phpt b/ext/standard/tests/array/array_multisort_natural.phpt index e7910882e4..35576c481c 100644 --- a/ext/standard/tests/array/array_multisort_natural.phpt +++ b/ext/standard/tests/array/array_multisort_natural.phpt @@ -32,7 +32,7 @@ var_dump($a, $b); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : natural sorting array(5) { [0]=> diff --git a/ext/standard/tests/array/array_multisort_natural_case.phpt b/ext/standard/tests/array/array_multisort_natural_case.phpt index d59e4931b6..163819ef96 100644 --- a/ext/standard/tests/array/array_multisort_natural_case.phpt +++ b/ext/standard/tests/array/array_multisort_natural_case.phpt @@ -36,7 +36,7 @@ var_dump($a, $b); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : natural sorting case-sensitive array(7) { [0]=> diff --git a/ext/standard/tests/array/array_multisort_natural_incase.phpt b/ext/standard/tests/array/array_multisort_natural_incase.phpt index 87514058a9..1ada637f0e 100644 --- a/ext/standard/tests/array/array_multisort_natural_incase.phpt +++ b/ext/standard/tests/array/array_multisort_natural_incase.phpt @@ -36,7 +36,7 @@ var_dump($a, $b); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : natural sorting case-insensitive array(7) { [0]=> diff --git a/ext/standard/tests/array/array_multisort_variation10.phpt b/ext/standard/tests/array/array_multisort_variation10.phpt index 71c4494270..e4e9075562 100644 --- a/ext/standard/tests/array/array_multisort_variation10.phpt +++ b/ext/standard/tests/array/array_multisort_variation10.phpt @@ -14,7 +14,7 @@ var_dump(array_multisort(array(1,3,2,4))); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : Testing with anonymous arguments *** bool(true) ===DONE=== diff --git a/ext/standard/tests/array/array_multisort_variation11.phpt b/ext/standard/tests/array/array_multisort_variation11.phpt index 046b45f020..49e8d0f30e 100644 --- a/ext/standard/tests/array/array_multisort_variation11.phpt +++ b/ext/standard/tests/array/array_multisort_variation11.phpt @@ -15,7 +15,7 @@ var_dump(array_multisort(array())); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : Testing with empty array *** bool(true) ===DONE=== diff --git a/ext/standard/tests/array/array_multisort_variation4.phpt b/ext/standard/tests/array/array_multisort_variation4.phpt index 5d11fb3ac0..76eb9ab04b 100644 --- a/ext/standard/tests/array/array_multisort_variation4.phpt +++ b/ext/standard/tests/array/array_multisort_variation4.phpt @@ -22,7 +22,7 @@ var_dump($arr3); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : Testing with multiple array arguments *** bool(true) array(4) { diff --git a/ext/standard/tests/array/array_multisort_variation5.phpt b/ext/standard/tests/array/array_multisort_variation5.phpt index 76d7092c21..66504ca798 100644 --- a/ext/standard/tests/array/array_multisort_variation5.phpt +++ b/ext/standard/tests/array/array_multisort_variation5.phpt @@ -24,7 +24,7 @@ var_dump($ar); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : Testing all array sort specifiers *** array(3) { [0]=> diff --git a/ext/standard/tests/array/array_multisort_variation6.phpt b/ext/standard/tests/array/array_multisort_variation6.phpt index 4e2a62227d..81bd1d1acd 100644 --- a/ext/standard/tests/array/array_multisort_variation6.phpt +++ b/ext/standard/tests/array/array_multisort_variation6.phpt @@ -24,7 +24,7 @@ var_dump($ar); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : Testing all array sort specifiers *** array(3) { [0]=> diff --git a/ext/standard/tests/array/array_multisort_variation7.phpt b/ext/standard/tests/array/array_multisort_variation7.phpt index 10980be592..996c183fcd 100644 --- a/ext/standard/tests/array/array_multisort_variation7.phpt +++ b/ext/standard/tests/array/array_multisort_variation7.phpt @@ -37,7 +37,7 @@ var_dump($inputs); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : usage variation - test sort order of all types*** bool(true) array(10) { diff --git a/ext/standard/tests/array/array_multisort_variation8.phpt b/ext/standard/tests/array/array_multisort_variation8.phpt index 6b50e0ebbb..90c66a97cc 100644 --- a/ext/standard/tests/array/array_multisort_variation8.phpt +++ b/ext/standard/tests/array/array_multisort_variation8.phpt @@ -43,7 +43,7 @@ var_dump($inputs); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : usage variation - test sort order of all types*** bool(true) array(10) { diff --git a/ext/standard/tests/array/array_pad_variation4.phpt b/ext/standard/tests/array/array_pad_variation4.phpt index 83c1e8300d..0216245cc2 100644 --- a/ext/standard/tests/array/array_pad_variation4.phpt +++ b/ext/standard/tests/array/array_pad_variation4.phpt @@ -27,7 +27,7 @@ var_dump( array_pad($input, -$pad_size, $binary) ); // negative 'pad_size' echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_pad() : Passing binary values to $pad_value argument *** array(6) { [0]=> diff --git a/ext/standard/tests/array/array_pad_variation5.phpt b/ext/standard/tests/array/array_pad_variation5.phpt index 4e8e0f1132..ec4c87eee6 100644 --- a/ext/standard/tests/array/array_pad_variation5.phpt +++ b/ext/standard/tests/array/array_pad_variation5.phpt @@ -31,7 +31,7 @@ var_dump( array_pad($input, -$pad_size, $pad_value) ); // negative 'pad_value' echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_pad() : Passing 2-d array to $pad_value argument *** array(5) { [0]=> diff --git a/ext/standard/tests/array/array_pad_variation6.phpt b/ext/standard/tests/array/array_pad_variation6.phpt index a491573909..1ef1ef067c 100644 --- a/ext/standard/tests/array/array_pad_variation6.phpt +++ b/ext/standard/tests/array/array_pad_variation6.phpt @@ -90,7 +90,7 @@ foreach($inputs as $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_pad() : Passing different arrays to $input argument *** -- Iteration 1 -- array(6) { diff --git a/ext/standard/tests/array/array_pad_variation7.phpt b/ext/standard/tests/array/array_pad_variation7.phpt index 887f351948..06836b8239 100644 --- a/ext/standard/tests/array/array_pad_variation7.phpt +++ b/ext/standard/tests/array/array_pad_variation7.phpt @@ -38,7 +38,7 @@ var_dump( array_pad($input[1], -$pad_size, $pad_value) ); // negative 'pad_size echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_pad() : Passing 2-D array to $input argument *** -- Entire 2-d array for $input argument -- array(5) { diff --git a/ext/standard/tests/array/array_pop.phpt b/ext/standard/tests/array/array_pop.phpt index 34a5c54268..2336d2a394 100644 --- a/ext/standard/tests/array/array_pop.phpt +++ b/ext/standard/tests/array/array_pop.phpt @@ -42,7 +42,7 @@ foreach( $mixed_array as $sub_array ) echo"\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Normal testing with various array inputs *** -- Input Array for Iteration 1 is -- diff --git a/ext/standard/tests/array/array_pop_variation.phpt b/ext/standard/tests/array/array_pop_variation.phpt index 795a8bcf86..c2e30cb7a3 100644 --- a/ext/standard/tests/array/array_pop_variation.phpt +++ b/ext/standard/tests/array/array_pop_variation.phpt @@ -39,7 +39,7 @@ var_dump( current($mixed_array[1]) ); echo"\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Checking for internal array pointer being reset when pop is called *** Current Element is : int(1) diff --git a/ext/standard/tests/array/array_product_variation2.phpt b/ext/standard/tests/array/array_product_variation2.phpt index c4c47d86a2..79821981a0 100644 --- a/ext/standard/tests/array/array_product_variation2.phpt +++ b/ext/standard/tests/array/array_product_variation2.phpt @@ -14,7 +14,7 @@ echo "\n-- Testing array_product() function with a keyed array array --\n"; var_dump( array_product(array("bob" => 2, "janet" => 5)) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_product() : variations *** -- Testing array_product() function with a keyed array array -- diff --git a/ext/standard/tests/array/array_product_variation3.phpt b/ext/standard/tests/array/array_product_variation3.phpt index dc8609ebd8..e2b5e3efe8 100644 --- a/ext/standard/tests/array/array_product_variation3.phpt +++ b/ext/standard/tests/array/array_product_variation3.phpt @@ -28,7 +28,7 @@ var_dump( array_product(array(-99999999.9, 99999999.1))); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_product() : variations - negative numbers*** -- Testing array_product() function with one negative number -- diff --git a/ext/standard/tests/array/array_product_variation4.phpt b/ext/standard/tests/array/array_product_variation4.phpt index 9f83c5646b..f2b9f2bc29 100644 --- a/ext/standard/tests/array/array_product_variation4.phpt +++ b/ext/standard/tests/array/array_product_variation4.phpt @@ -21,7 +21,7 @@ for ($i = 0; $i < 999; $i++) { var_dump( array_product($array) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_product() : variations *** -- Testing array_product() function with a very large array -- diff --git a/ext/standard/tests/array/array_push_basic.phpt b/ext/standard/tests/array/array_push_basic.phpt index 5ccf037dab..ff4ab2d711 100644 --- a/ext/standard/tests/array/array_push_basic.phpt +++ b/ext/standard/tests/array/array_push_basic.phpt @@ -30,7 +30,7 @@ var_dump($array_assoc); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_push() : basic functionality *** -- Push values onto an indexed array -- diff --git a/ext/standard/tests/array/array_push_variation2.phpt b/ext/standard/tests/array/array_push_variation2.phpt index 7fefcfa49a..9e31a7628a 100644 --- a/ext/standard/tests/array/array_push_variation2.phpt +++ b/ext/standard/tests/array/array_push_variation2.phpt @@ -98,7 +98,7 @@ fclose($fp); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_push() : usage variations *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_push_variation3.phpt b/ext/standard/tests/array/array_push_variation3.phpt index 2bc71a7696..8b7ef48ce7 100644 --- a/ext/standard/tests/array/array_push_variation3.phpt +++ b/ext/standard/tests/array/array_push_variation3.phpt @@ -27,7 +27,7 @@ var_dump($array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_push() : usage variations *** -- Pass array as $var argument -- diff --git a/ext/standard/tests/array/array_push_variation5.phpt b/ext/standard/tests/array/array_push_variation5.phpt index 4b6f39975d..e5024daccf 100644 --- a/ext/standard/tests/array/array_push_variation5.phpt +++ b/ext/standard/tests/array/array_push_variation5.phpt @@ -24,7 +24,7 @@ echo key($stack) . " => " . current ($stack) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_push() : usage variations *** diff --git a/ext/standard/tests/array/array_push_variation6.phpt b/ext/standard/tests/array/array_push_variation6.phpt index 19afebb747..903a7a5ef4 100644 --- a/ext/standard/tests/array/array_push_variation6.phpt +++ b/ext/standard/tests/array/array_push_variation6.phpt @@ -106,7 +106,7 @@ foreach($inputs as $key => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_push() : usage variations *** -- Iteration 1 : int data -- diff --git a/ext/standard/tests/array/array_reduce.phpt b/ext/standard/tests/array/array_reduce.phpt index 94ecca6130..9d702ebce0 100644 --- a/ext/standard/tests/array/array_reduce.phpt +++ b/ext/standard/tests/array/array_reduce.phpt @@ -37,7 +37,7 @@ var_dump(array_reduce($array, 'reduce_null', $initial), $initial); echo "\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_reduce() to integer *** int(61) int(42) diff --git a/ext/standard/tests/array/array_reduce_variation1.phpt b/ext/standard/tests/array/array_reduce_variation1.phpt index adffeb53d4..e4bbea8bf0 100644 --- a/ext/standard/tests/array/array_reduce_variation1.phpt +++ b/ext/standard/tests/array/array_reduce_variation1.phpt @@ -33,7 +33,7 @@ try { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_reduce() : variation *** --- Testing with a callback with too few parameters --- diff --git a/ext/standard/tests/array/array_reduce_variation3.phpt b/ext/standard/tests/array/array_reduce_variation3.phpt index f6301026b3..a359d425db 100644 --- a/ext/standard/tests/array/array_reduce_variation3.phpt +++ b/ext/standard/tests/array/array_reduce_variation3.phpt @@ -25,7 +25,7 @@ var_dump(array_reduce($array, array(new A(), "adder2"))); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_reduce() : variation - object callbacks *** --- Static method callback --- diff --git a/ext/standard/tests/array/array_reverse_basic1.phpt b/ext/standard/tests/array/array_reverse_basic1.phpt index f41e0a3f49..abca4e4ae5 100644 --- a/ext/standard/tests/array/array_reverse_basic1.phpt +++ b/ext/standard/tests/array/array_reverse_basic1.phpt @@ -25,7 +25,7 @@ var_dump( array_reverse($array, false) ); // expects the keys not to be preserv echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_reverse() : basic functionality *** array(6) { [0]=> diff --git a/ext/standard/tests/array/array_reverse_basic2.phpt b/ext/standard/tests/array/array_reverse_basic2.phpt index 9f41f0b486..88a62b8573 100644 --- a/ext/standard/tests/array/array_reverse_basic2.phpt +++ b/ext/standard/tests/array/array_reverse_basic2.phpt @@ -25,7 +25,7 @@ var_dump( array_reverse($array, false) ); // expects the keys not to be preserv echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_reverse() : basic functionality *** array(4) { [0]=> diff --git a/ext/standard/tests/array/array_reverse_variation3.phpt b/ext/standard/tests/array/array_reverse_variation3.phpt index 10298428f8..a5ef1e0d2b 100644 --- a/ext/standard/tests/array/array_reverse_variation3.phpt +++ b/ext/standard/tests/array/array_reverse_variation3.phpt @@ -81,7 +81,7 @@ fclose($fp); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_reverse() : usage variations *** -- Iteration 1 -- - with default argument - diff --git a/ext/standard/tests/array/array_reverse_variation6.phpt b/ext/standard/tests/array/array_reverse_variation6.phpt index ae1e195ca6..edbefd345f 100644 --- a/ext/standard/tests/array/array_reverse_variation6.phpt +++ b/ext/standard/tests/array/array_reverse_variation6.phpt @@ -43,7 +43,7 @@ var_dump( array_reverse($two_dimensional_array[1], false) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_reverse() : usage variations *** -- with default argument -- array(3) { diff --git a/ext/standard/tests/array/array_search.phpt b/ext/standard/tests/array/array_search.phpt Binary files differindex 1afcb1d4ba..1787e52163 100644 --- a/ext/standard/tests/array/array_search.phpt +++ b/ext/standard/tests/array/array_search.phpt diff --git a/ext/standard/tests/array/array_search_variation1.phpt b/ext/standard/tests/array/array_search_variation1.phpt index 96395013bb..094767dacd 100644 --- a/ext/standard/tests/array/array_search_variation1.phpt +++ b/ext/standard/tests/array/array_search_variation1.phpt @@ -60,7 +60,7 @@ foreach($arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_search() with different needle values *** -- Iteration 1 -- bool(false) diff --git a/ext/standard/tests/array/array_search_variation2.phpt b/ext/standard/tests/array/array_search_variation2.phpt index da90de0cb7..a8bac04edb 100644 --- a/ext/standard/tests/array/array_search_variation2.phpt +++ b/ext/standard/tests/array/array_search_variation2.phpt @@ -49,7 +49,7 @@ foreach($array_type as $type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_search() with different haystack values *** -- Iteration 1 -- int(0) diff --git a/ext/standard/tests/array/array_search_variation4.phpt b/ext/standard/tests/array/array_search_variation4.phpt index 7feb2ef147..95656899ce 100644 --- a/ext/standard/tests/array/array_search_variation4.phpt +++ b/ext/standard/tests/array/array_search_variation4.phpt @@ -55,7 +55,7 @@ var_dump( array_search('123abc', array(123), TRUE) ); // false in strict mode echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing resource type with array_search() *** int(0) bool(false) diff --git a/ext/standard/tests/array/array_shift_basic.phpt b/ext/standard/tests/array/array_shift_basic.phpt index 2bb4ae93ae..e030adc2bc 100644 --- a/ext/standard/tests/array/array_shift_basic.phpt +++ b/ext/standard/tests/array/array_shift_basic.phpt @@ -25,7 +25,7 @@ var_dump($array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_shift() : basic functionality *** -- Before shift: -- diff --git a/ext/standard/tests/array/array_shift_variation3.phpt b/ext/standard/tests/array/array_shift_variation3.phpt index cc260c6305..d3a359fab8 100644 --- a/ext/standard/tests/array/array_shift_variation3.phpt +++ b/ext/standard/tests/array/array_shift_variation3.phpt @@ -103,7 +103,7 @@ foreach($inputs as $key => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_shift() : usage variations *** -- Iteration 1 : int data -- diff --git a/ext/standard/tests/array/array_shift_variation4.phpt b/ext/standard/tests/array/array_shift_variation4.phpt index f27681561a..150f312e70 100644 --- a/ext/standard/tests/array/array_shift_variation4.phpt +++ b/ext/standard/tests/array/array_shift_variation4.phpt @@ -36,7 +36,7 @@ var_dump($stack_last); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_shift() : usage variations *** -- Before shift: -- diff --git a/ext/standard/tests/array/array_shift_variation6.phpt b/ext/standard/tests/array/array_shift_variation6.phpt index 9033e7d17c..1840e080d2 100644 --- a/ext/standard/tests/array/array_shift_variation6.phpt +++ b/ext/standard/tests/array/array_shift_variation6.phpt @@ -37,7 +37,7 @@ var_dump($copied_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_shift() : usage variations *** -- Variable is referenced array -- diff --git a/ext/standard/tests/array/array_shift_variation7.phpt b/ext/standard/tests/array/array_shift_variation7.phpt index 9367cacbc9..02af5dd4a1 100644 --- a/ext/standard/tests/array/array_shift_variation7.phpt +++ b/ext/standard/tests/array/array_shift_variation7.phpt @@ -23,7 +23,7 @@ echo key($stack) . " => " . current ($stack) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_shift() : usage variations *** -- Call array_shift() -- diff --git a/ext/standard/tests/array/array_slice_basic.phpt b/ext/standard/tests/array/array_slice_basic.phpt index a4cbe46751..295d9625a0 100644 --- a/ext/standard/tests/array/array_slice_basic.phpt +++ b/ext/standard/tests/array/array_slice_basic.phpt @@ -30,7 +30,7 @@ var_dump( array_slice($input, $offset) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : basic functionality *** -- All arguments -- diff --git a/ext/standard/tests/array/array_slice_variation1.phpt b/ext/standard/tests/array/array_slice_variation1.phpt index daed1d84fc..ccb83ccf57 100644 --- a/ext/standard/tests/array/array_slice_variation1.phpt +++ b/ext/standard/tests/array/array_slice_variation1.phpt @@ -21,7 +21,7 @@ var_dump($a); ?> ---EXPECTF-- +--EXPECT-- array(3) { [0]=> int(1) diff --git a/ext/standard/tests/array/array_slice_variation10.phpt b/ext/standard/tests/array/array_slice_variation10.phpt index 85c521d6d3..c2b48a94f6 100644 --- a/ext/standard/tests/array/array_slice_variation10.phpt +++ b/ext/standard/tests/array/array_slice_variation10.phpt @@ -26,7 +26,7 @@ echo key($input) . " => " . current ($input) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : usage variations *** -- Call array_slice() -- diff --git a/ext/standard/tests/array/array_slice_variation3.phpt b/ext/standard/tests/array/array_slice_variation3.phpt index bdcb7591a2..32bfc045c6 100644 --- a/ext/standard/tests/array/array_slice_variation3.phpt +++ b/ext/standard/tests/array/array_slice_variation3.phpt @@ -82,7 +82,7 @@ foreach($inputs as $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : usage variations *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_slice_variation5.phpt b/ext/standard/tests/array/array_slice_variation5.phpt index ed5c82f18f..fb632c2bf9 100644 --- a/ext/standard/tests/array/array_slice_variation5.phpt +++ b/ext/standard/tests/array/array_slice_variation5.phpt @@ -28,7 +28,7 @@ var_dump(array_slice($input, -PHP_INT_MAX)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : usage variations *** -- $offset is -7 -- diff --git a/ext/standard/tests/array/array_slice_variation6.phpt b/ext/standard/tests/array/array_slice_variation6.phpt index e32abfcbce..c1a673a8f7 100644 --- a/ext/standard/tests/array/array_slice_variation6.phpt +++ b/ext/standard/tests/array/array_slice_variation6.phpt @@ -29,7 +29,7 @@ var_dump(array_slice($input, $offset, -PHP_INT_MAX)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : usage variations *** -- $length is -6 -- diff --git a/ext/standard/tests/array/array_slice_variation7.phpt b/ext/standard/tests/array/array_slice_variation7.phpt index abf517d1f2..fd0bfd822d 100644 --- a/ext/standard/tests/array/array_slice_variation7.phpt +++ b/ext/standard/tests/array/array_slice_variation7.phpt @@ -111,7 +111,7 @@ foreach($inputs as $type => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : usage variations *** -- Iteration 1 : key type is int -- diff --git a/ext/standard/tests/array/array_slice_variation8.phpt b/ext/standard/tests/array/array_slice_variation8.phpt index aece410c02..011a50f9dd 100644 --- a/ext/standard/tests/array/array_slice_variation8.phpt +++ b/ext/standard/tests/array/array_slice_variation8.phpt @@ -26,7 +26,7 @@ var_dump(array_slice($input[2], 1, 2)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : usage variations *** -- Slice a two-dimensional array -- diff --git a/ext/standard/tests/array/array_slice_variation9.phpt b/ext/standard/tests/array/array_slice_variation9.phpt index 7ae9238d47..ecd787a069 100644 --- a/ext/standard/tests/array/array_slice_variation9.phpt +++ b/ext/standard/tests/array/array_slice_variation9.phpt @@ -30,7 +30,7 @@ var_dump(array_slice($input, 1, 2, true)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : usage variations *** -- Array of referenced variables ($preserve_keys = default) -- diff --git a/ext/standard/tests/array/array_sum_basic.phpt b/ext/standard/tests/array/array_sum_basic.phpt index c178853d75..ecbc15fae6 100644 --- a/ext/standard/tests/array/array_sum_basic.phpt +++ b/ext/standard/tests/array/array_sum_basic.phpt @@ -26,7 +26,7 @@ var_dump( array_sum($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_sum() : basic functionality *** -- array_sum() with integer array entries -- int(15) diff --git a/ext/standard/tests/array/array_sum_variation2.phpt b/ext/standard/tests/array/array_sum_variation2.phpt index 56d9131493..e746238155 100644 --- a/ext/standard/tests/array/array_sum_variation2.phpt +++ b/ext/standard/tests/array/array_sum_variation2.phpt @@ -36,7 +36,7 @@ var_dump( array_sum($mixed_int_value) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_sum() : different integer array *** -- Sum of Integer array -- int(-573) diff --git a/ext/standard/tests/array/array_sum_variation3.phpt b/ext/standard/tests/array/array_sum_variation3.phpt index 9d32c2c386..7f1a756bec 100644 --- a/ext/standard/tests/array/array_sum_variation3.phpt +++ b/ext/standard/tests/array/array_sum_variation3.phpt @@ -42,7 +42,7 @@ var_dump( array_sum($float_input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_sum() : array with different float values *** -- simple float array -- float(1.3) diff --git a/ext/standard/tests/array/array_sum_variation4.phpt b/ext/standard/tests/array/array_sum_variation4.phpt index 4959deee7d..af03d7fb7b 100644 --- a/ext/standard/tests/array/array_sum_variation4.phpt +++ b/ext/standard/tests/array/array_sum_variation4.phpt @@ -25,7 +25,7 @@ var_dump( array_sum($float_input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_sum() : array with duplicate values *** -- With integer array -- int(117) diff --git a/ext/standard/tests/array/array_sum_variation5.phpt b/ext/standard/tests/array/array_sum_variation5.phpt index 9068c4565e..ee1c186c18 100644 --- a/ext/standard/tests/array/array_sum_variation5.phpt +++ b/ext/standard/tests/array/array_sum_variation5.phpt @@ -31,7 +31,7 @@ var_dump( array_sum($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_sum() : array with elements as reference *** int(305) Done diff --git a/ext/standard/tests/array/array_sum_variation6.phpt b/ext/standard/tests/array/array_sum_variation6.phpt index ba67cfd499..950f2e2a20 100644 --- a/ext/standard/tests/array/array_sum_variation6.phpt +++ b/ext/standard/tests/array/array_sum_variation6.phpt @@ -24,7 +24,7 @@ echo "-- with string keys --\n"; var_dump( array_sum($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_sum() : with associative array *** -- with numeric keys -- float(32.56) diff --git a/ext/standard/tests/array/array_sum_variation7.phpt b/ext/standard/tests/array/array_sum_variation7.phpt index d30987535b..fbc426902f 100644 --- a/ext/standard/tests/array/array_sum_variation7.phpt +++ b/ext/standard/tests/array/array_sum_variation7.phpt @@ -67,7 +67,7 @@ echo "-- array with mixed values --\n"; var_dump( array_sum($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_sum() : array with unexpected entries *** -- empty array -- int(0) diff --git a/ext/standard/tests/array/array_udiff_assoc_variation.phpt b/ext/standard/tests/array/array_udiff_assoc_variation.phpt index 465c5008fd..f824244f6f 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation.phpt @@ -25,7 +25,7 @@ var_dump( array_udiff_assoc($arr1, $arr2, $arr3, $arr4, $key_compare_function) ) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_udiff_assoc() : variation - testing with multiple array arguments *** array(2) { [4]=> diff --git a/ext/standard/tests/array/array_udiff_assoc_variation5.phpt b/ext/standard/tests/array/array_udiff_assoc_variation5.phpt index 6b7f014467..5eb21cd723 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation5.phpt @@ -38,7 +38,7 @@ var_dump(array_udiff_assoc($arr1, $arr2, 'too_few_parameters')); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_udiff_assoc() : usage variation - differing comparison functions*** -- comparison function with an incorrect return value -- diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt index bf2c0f3d2d..f8ca5300ca 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt @@ -37,7 +37,7 @@ var_dump(array_udiff_uassoc($arr1, $arr2, 'too_few_parameters', 'too_few_paramet ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_udiff_uassoc() : usage variation - differing comparison functions*** -- comparison function with an incorrect return value -- diff --git a/ext/standard/tests/array/array_udiff_variation5.phpt b/ext/standard/tests/array/array_udiff_variation5.phpt index ce6362fc08..a391cb4eb6 100644 --- a/ext/standard/tests/array/array_udiff_variation5.phpt +++ b/ext/standard/tests/array/array_udiff_variation5.phpt @@ -38,7 +38,7 @@ var_dump(array_udiff($arr1, $arr2, 'too_few_parameters')); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_udiff() : usage variation *** -- comparison function with an incorrect return value -- diff --git a/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt b/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt index f0c7ecc802..076dbf16fb 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt @@ -25,7 +25,7 @@ var_dump( array_uintersect_assoc($arr1, $arr2, $arr3, $arr4, $data_compare_funct ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_uintersect_assoc() : basic functionality - testing with multiple array arguments *** array(2) { ["one"]=> diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt index bebe5b52c9..802934b37d 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt @@ -38,7 +38,7 @@ var_dump(array_uintersect_assoc($arr1, $arr2, 'too_few_parameters')); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_uintersect_assoc() : usage variation - differing comparison functions*** -- comparison function with an incorrect return value -- diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt index a5317c1c0d..782821f4a7 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt @@ -37,7 +37,7 @@ var_dump(array_uintersect_uassoc($arr1, $arr2, 'too_few_parameters', 'too_few_pa ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_uintersect_uassoc() : usage variation - incorrect callbacks *** -- comparison function with an incorrect return value -- diff --git a/ext/standard/tests/array/array_uintersect_variation5.phpt b/ext/standard/tests/array/array_uintersect_variation5.phpt index 642ebc0077..04051dbf5e 100644 --- a/ext/standard/tests/array/array_uintersect_variation5.phpt +++ b/ext/standard/tests/array/array_uintersect_variation5.phpt @@ -38,7 +38,7 @@ var_dump(array_uintersect($arr1, $arr2, 'too_few_parameters')); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_uintersect() : usage variation - differing comparison functions*** -- comparison function with an incorrect return value -- diff --git a/ext/standard/tests/array/array_unique_basic.phpt b/ext/standard/tests/array/array_unique_basic.phpt index 58d3acf1be..91532db8c7 100644 --- a/ext/standard/tests/array/array_unique_basic.phpt +++ b/ext/standard/tests/array/array_unique_basic.phpt @@ -23,7 +23,7 @@ var_dump( array_unique($input) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unique() : basic functionality *** array(2) { [0]=> diff --git a/ext/standard/tests/array/array_unique_variation2.phpt b/ext/standard/tests/array/array_unique_variation2.phpt index 62dfab4568..470cd284d0 100644 --- a/ext/standard/tests/array/array_unique_variation2.phpt +++ b/ext/standard/tests/array/array_unique_variation2.phpt @@ -80,7 +80,7 @@ foreach($inputs as $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unique() : Passing different arrays to $input argument *** -- Iteration 1 -- array(2) { diff --git a/ext/standard/tests/array/array_unique_variation5.phpt b/ext/standard/tests/array/array_unique_variation5.phpt index 5e3f7c36d0..acb94b4db0 100644 --- a/ext/standard/tests/array/array_unique_variation5.phpt +++ b/ext/standard/tests/array/array_unique_variation5.phpt @@ -20,7 +20,7 @@ var_dump( array_unique($input) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unique() : array with duplicate keys for $input argument *** array(3) { [1]=> diff --git a/ext/standard/tests/array/array_unique_variation6.phpt b/ext/standard/tests/array/array_unique_variation6.phpt index 15a46518b7..65bdb421a5 100644 --- a/ext/standard/tests/array/array_unique_variation6.phpt +++ b/ext/standard/tests/array/array_unique_variation6.phpt @@ -33,7 +33,7 @@ var_dump( array_unique($input, SORT_STRING) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unique() : array with reference variables for $input argument *** array(2) { [0]=> diff --git a/ext/standard/tests/array/array_unique_variation7.phpt b/ext/standard/tests/array/array_unique_variation7.phpt index e998a73c6c..4135f98d97 100644 --- a/ext/standard/tests/array/array_unique_variation7.phpt +++ b/ext/standard/tests/array/array_unique_variation7.phpt @@ -20,7 +20,7 @@ var_dump( array_unique($input) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unique() : array with binary data for $input argument *** array(3) { [0]=> diff --git a/ext/standard/tests/array/array_unique_variation9.phpt b/ext/standard/tests/array/array_unique_variation9.phpt index bbbbf0ec8a..aa0830100d 100644 --- a/ext/standard/tests/array/array_unique_variation9.phpt +++ b/ext/standard/tests/array/array_unique_variation9.phpt @@ -79,7 +79,7 @@ $a = array ( print_r(array_unique($a)); ?> ---EXPECTF-- +--EXPECT-- Array ( [0] => acls_channel diff --git a/ext/standard/tests/array/array_unshift_basic1.phpt b/ext/standard/tests/array/array_unshift_basic1.phpt index 97ea895547..c041a47756 100644 --- a/ext/standard/tests/array/array_unshift_basic1.phpt +++ b/ext/standard/tests/array/array_unshift_basic1.phpt @@ -36,7 +36,7 @@ var_dump($temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unshift() : basic functionality with default key array *** int(3) array(3) { diff --git a/ext/standard/tests/array/array_unshift_basic2.phpt b/ext/standard/tests/array/array_unshift_basic2.phpt index e4fd2e00ab..eec6412042 100644 --- a/ext/standard/tests/array/array_unshift_basic2.phpt +++ b/ext/standard/tests/array/array_unshift_basic2.phpt @@ -36,7 +36,7 @@ var_dump($temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unshift() : basic functionality with associative array *** int(5) array(5) { diff --git a/ext/standard/tests/array/array_unshift_variation3.phpt b/ext/standard/tests/array/array_unshift_variation3.phpt index 286cb290b8..9e955f7ca0 100644 --- a/ext/standard/tests/array/array_unshift_variation3.phpt +++ b/ext/standard/tests/array/array_unshift_variation3.phpt @@ -72,7 +72,7 @@ foreach($arrays as $array) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unshift() : different arrays for $array argument *** -- Iteration 1 -- int(3) diff --git a/ext/standard/tests/array/array_unshift_variation6.phpt b/ext/standard/tests/array/array_unshift_variation6.phpt index 47da53be96..1660442094 100644 --- a/ext/standard/tests/array/array_unshift_variation6.phpt +++ b/ext/standard/tests/array/array_unshift_variation6.phpt @@ -73,7 +73,7 @@ var_dump($temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unshift() : two dimensional arrays for $array argument *** int(4) array(4) { diff --git a/ext/standard/tests/array/array_unshift_variation7.phpt b/ext/standard/tests/array/array_unshift_variation7.phpt index 9a94eca9d1..a54e2ce9f5 100644 --- a/ext/standard/tests/array/array_unshift_variation7.phpt +++ b/ext/standard/tests/array/array_unshift_variation7.phpt @@ -54,7 +54,7 @@ foreach($vars as $var) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unshift() : double quoted strings for $var argument *** -- Iteration 1 -- int(5) diff --git a/ext/standard/tests/array/array_unshift_variation8.phpt b/ext/standard/tests/array/array_unshift_variation8.phpt index a64349c866..a184ec44c2 100644 --- a/ext/standard/tests/array/array_unshift_variation8.phpt +++ b/ext/standard/tests/array/array_unshift_variation8.phpt @@ -54,7 +54,7 @@ foreach($vars as $var) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unshift() : single quoted strings for $var argument *** -- Iteration 1 -- int(5) diff --git a/ext/standard/tests/array/array_unshift_variation9.phpt b/ext/standard/tests/array/array_unshift_variation9.phpt index b6440f899e..89d867df92 100644 --- a/ext/standard/tests/array/array_unshift_variation9.phpt +++ b/ext/standard/tests/array/array_unshift_variation9.phpt @@ -94,7 +94,7 @@ foreach($vars as $var) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unshift() : heredoc strings for $var argument *** -- Iteration 1 -- int(5) diff --git a/ext/standard/tests/array/array_user_key_compare.phpt b/ext/standard/tests/array/array_user_key_compare.phpt index 933e6d679a..69bc37f48a 100644 --- a/ext/standard/tests/array/array_user_key_compare.phpt +++ b/ext/standard/tests/array/array_user_key_compare.phpt @@ -15,5 +15,5 @@ uksort($arr, "array_compare"); var_dump($a); ?> ---EXPECTF-- +--EXPECT-- string(1) "B" diff --git a/ext/standard/tests/array/array_values.phpt b/ext/standard/tests/array/array_values.phpt Binary files differindex e5e46ca3f7..ba24e90eb5 100644 --- a/ext/standard/tests/array/array_values.phpt +++ b/ext/standard/tests/array/array_values.phpt diff --git a/ext/standard/tests/array/array_values_basic.phpt b/ext/standard/tests/array/array_values_basic.phpt index 9cbdf07b81..a26a767b40 100644 --- a/ext/standard/tests/array/array_values_basic.phpt +++ b/ext/standard/tests/array/array_values_basic.phpt @@ -23,7 +23,7 @@ var_dump( array_values($input) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_values() : basic functionality *** array(5) { [0]=> diff --git a/ext/standard/tests/array/array_values_variation3.phpt b/ext/standard/tests/array/array_values_variation3.phpt index 5c74c0d47d..d036cfdebe 100644 --- a/ext/standard/tests/array/array_values_variation3.phpt +++ b/ext/standard/tests/array/array_values_variation3.phpt @@ -103,7 +103,7 @@ foreach($inputs as $key => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_values() : usage variations *** -- Iteration 1: int data -- diff --git a/ext/standard/tests/array/array_values_variation4.phpt b/ext/standard/tests/array/array_values_variation4.phpt index 9c35331fdd..3fac7b44c9 100644 --- a/ext/standard/tests/array/array_values_variation4.phpt +++ b/ext/standard/tests/array/array_values_variation4.phpt @@ -32,7 +32,7 @@ var_dump(array_values($input)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_values() : usage variations *** -- Array values of a two-dimensional array -- diff --git a/ext/standard/tests/array/array_values_variation5.phpt b/ext/standard/tests/array/array_values_variation5.phpt index d65b4674d3..4fc4b011cf 100644 --- a/ext/standard/tests/array/array_values_variation5.phpt +++ b/ext/standard/tests/array/array_values_variation5.phpt @@ -26,7 +26,7 @@ echo key($input) . " => " . current ($input) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_values() : usage variations *** -- Call array_values() -- diff --git a/ext/standard/tests/array/array_values_variation6.phpt b/ext/standard/tests/array/array_values_variation6.phpt index 8c4479ca6f..b4ead80b3e 100644 --- a/ext/standard/tests/array/array_values_variation6.phpt +++ b/ext/standard/tests/array/array_values_variation6.phpt @@ -30,7 +30,7 @@ var_dump($result1); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_values() : usage variations *** -- $input is an array made up of referenced variables: -- diff --git a/ext/standard/tests/array/array_values_variation7.phpt b/ext/standard/tests/array/array_values_variation7.phpt index 660809357d..cfa600c3c5 100644 --- a/ext/standard/tests/array/array_values_variation7.phpt +++ b/ext/standard/tests/array/array_values_variation7.phpt @@ -26,7 +26,7 @@ var_dump(array_values($input)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_values() : usage variations *** -- $input argument: -- diff --git a/ext/standard/tests/array/array_walk_object2.phpt b/ext/standard/tests/array/array_walk_object2.phpt index 61d0529753..97606a6592 100644 --- a/ext/standard/tests/array/array_walk_object2.phpt +++ b/ext/standard/tests/array/array_walk_object2.phpt @@ -77,7 +77,7 @@ var_dump( array_walk($input, "callback_protected")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk() : array of objects *** -- For private member -- value : int(3) diff --git a/ext/standard/tests/array/array_walk_recursive.phpt b/ext/standard/tests/array/array_walk_recursive.phpt index c3b37c321c..c8523055e9 100644 --- a/ext/standard/tests/array/array_walk_recursive.phpt +++ b/ext/standard/tests/array/array_walk_recursive.phpt @@ -15,7 +15,7 @@ var_dump (array_walk_recursive ($arr, 'foo')); var_dump (array_walk_recursive ($arr, 'bar')); ?> ---EXPECTF-- +--EXPECT-- 1 foo 2 foo 3 foo diff --git a/ext/standard/tests/array/array_walk_recursive_object2.phpt b/ext/standard/tests/array/array_walk_recursive_object2.phpt index aa12fe869a..87d8e49d95 100644 --- a/ext/standard/tests/array/array_walk_recursive_object2.phpt +++ b/ext/standard/tests/array/array_walk_recursive_object2.phpt @@ -79,7 +79,7 @@ var_dump( array_walk_recursive($input, "callback_protected")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk_recursive() : array of objects *** -- For private member -- value : int(3) diff --git a/ext/standard/tests/array/array_walk_recursive_variation3.phpt b/ext/standard/tests/array/array_walk_recursive_variation3.phpt index 9abdc0b5c2..96c93d6f35 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation3.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation3.phpt @@ -61,7 +61,7 @@ for($count = 0; $count < count($input_values); $count++) { } echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk_recursive() : 'input' array with different values*** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_walk_recursive_variation4.phpt b/ext/standard/tests/array/array_walk_recursive_variation4.phpt index 4db34979a4..a7cf93bd9a 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation4.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation4.phpt @@ -40,7 +40,7 @@ var_dump( array_walk_recursive( $input, "callback")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk_recursive() : array with subarray *** int(0) int(1) diff --git a/ext/standard/tests/array/array_walk_recursive_variation5.phpt b/ext/standard/tests/array/array_walk_recursive_variation5.phpt index 688da57f01..4db5989582 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation5.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation5.phpt @@ -40,7 +40,7 @@ var_dump( array_walk_recursive($input, "callback")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk_recursive() : array with references *** int(0) int(10) diff --git a/ext/standard/tests/array/array_walk_recursive_variation6.phpt b/ext/standard/tests/array/array_walk_recursive_variation6.phpt index 747eb7403c..fdda065904 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation6.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation6.phpt @@ -81,7 +81,7 @@ var_dump( array_walk_recursive($input, "for_mixed")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk_recursive() : 'input' as an associative array *** -- Associative array with numeric keys -- int(1) diff --git a/ext/standard/tests/array/array_walk_recursive_variation9.phpt b/ext/standard/tests/array/array_walk_recursive_variation9.phpt index f18fe248c1..780d779a7e 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation9.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation9.phpt @@ -50,7 +50,7 @@ var_dump( array_walk_recursive($input, 'callback_two_parameter', 10)); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk_recursive() : callback function variation *** -- callback function with both parameters -- int(0) diff --git a/ext/standard/tests/array/array_walk_variation3.phpt b/ext/standard/tests/array/array_walk_variation3.phpt index 9ff7d5dfac..964853705c 100644 --- a/ext/standard/tests/array/array_walk_variation3.phpt +++ b/ext/standard/tests/array/array_walk_variation3.phpt @@ -61,7 +61,7 @@ for($count = 0; $count < count($input_values); $count++) { } echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk() : 'input' array with different values*** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_walk_variation4.phpt b/ext/standard/tests/array/array_walk_variation4.phpt index 868732daaf..c495f2acfc 100644 --- a/ext/standard/tests/array/array_walk_variation4.phpt +++ b/ext/standard/tests/array/array_walk_variation4.phpt @@ -40,7 +40,7 @@ var_dump( array_walk( $input, "callback")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk() : array with subarray *** int(0) array(0) { diff --git a/ext/standard/tests/array/array_walk_variation5.phpt b/ext/standard/tests/array/array_walk_variation5.phpt index b5d262a733..c80cfba44f 100644 --- a/ext/standard/tests/array/array_walk_variation5.phpt +++ b/ext/standard/tests/array/array_walk_variation5.phpt @@ -40,7 +40,7 @@ var_dump( array_walk($input, "callback")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk() : array with references *** int(0) int(10) diff --git a/ext/standard/tests/array/array_walk_variation6.phpt b/ext/standard/tests/array/array_walk_variation6.phpt index c1f23233ec..5392618c17 100644 --- a/ext/standard/tests/array/array_walk_variation6.phpt +++ b/ext/standard/tests/array/array_walk_variation6.phpt @@ -81,7 +81,7 @@ var_dump( array_walk($input, "for_mixed")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk() : 'input' as an associative array *** -- Associative array with numeric keys -- int(1) diff --git a/ext/standard/tests/array/array_walk_variation9.phpt b/ext/standard/tests/array/array_walk_variation9.phpt index 37077841af..3af6316c12 100644 --- a/ext/standard/tests/array/array_walk_variation9.phpt +++ b/ext/standard/tests/array/array_walk_variation9.phpt @@ -50,7 +50,7 @@ var_dump( array_walk($input, 'callback_two_parameter', 10)); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk() : callback function variation *** -- callback function with both parameters -- int(0) diff --git a/ext/standard/tests/array/arsort_basic.phpt b/ext/standard/tests/array/arsort_basic.phpt index 24799ab771..598fe6aab3 100644 --- a/ext/standard/tests/array/arsort_basic.phpt +++ b/ext/standard/tests/array/arsort_basic.phpt @@ -75,7 +75,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() : basic functionality *** -- Testing arsort() by supplying string array, 'flag' value is default -- diff --git a/ext/standard/tests/array/arsort_variation10.phpt b/ext/standard/tests/array/arsort_variation10.phpt index ec483df3ad..0520e455c6 100644 --- a/ext/standard/tests/array/arsort_variation10.phpt +++ b/ext/standard/tests/array/arsort_variation10.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() : usage variations *** -- Testing arsort() by supplying octal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/arsort_variation11.phpt b/ext/standard/tests/array/arsort_variation11.phpt Binary files differindex 0ab1c8abf5..b669cf078f 100644 --- a/ext/standard/tests/array/arsort_variation11.phpt +++ b/ext/standard/tests/array/arsort_variation11.phpt diff --git a/ext/standard/tests/array/arsort_variation4.phpt b/ext/standard/tests/array/arsort_variation4.phpt index a76a180f40..b52d3a16a2 100644 --- a/ext/standard/tests/array/arsort_variation4.phpt +++ b/ext/standard/tests/array/arsort_variation4.phpt @@ -41,7 +41,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() :usage variations *** -- Testing arsort() by supplying reference variable array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/arsort_variation5.phpt b/ext/standard/tests/array/arsort_variation5.phpt index 187d43c482..b7adf76eab 100644 --- a/ext/standard/tests/array/arsort_variation5.phpt +++ b/ext/standard/tests/array/arsort_variation5.phpt @@ -62,7 +62,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() : usage variations *** -- Testing arsort() by supplying various string arrays -- diff --git a/ext/standard/tests/array/arsort_variation6.phpt b/ext/standard/tests/array/arsort_variation6.phpt index 687b20a714..ff85223ef4 100644 --- a/ext/standard/tests/array/arsort_variation6.phpt +++ b/ext/standard/tests/array/arsort_variation6.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() : usage variations *** -- Testing arsort() by supplying hexadecimal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/arsort_variation7.phpt b/ext/standard/tests/array/arsort_variation7.phpt index dc661b572e..d65f11ce98 100644 --- a/ext/standard/tests/array/arsort_variation7.phpt +++ b/ext/standard/tests/array/arsort_variation7.phpt @@ -41,7 +41,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() : usage variations *** -- Testing arsort() by supplying bool value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/arsort_variation8.phpt b/ext/standard/tests/array/arsort_variation8.phpt index c2473160c9..d190408d54 100644 --- a/ext/standard/tests/array/arsort_variation8.phpt +++ b/ext/standard/tests/array/arsort_variation8.phpt @@ -57,7 +57,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() : usage variations *** -- Testing arsort() by supplying various arrays containing sub arrays -- diff --git a/ext/standard/tests/array/arsort_variation9.phpt b/ext/standard/tests/array/arsort_variation9.phpt index 1e319e783c..61c532e4d8 100644 --- a/ext/standard/tests/array/arsort_variation9.phpt +++ b/ext/standard/tests/array/arsort_variation9.phpt @@ -49,7 +49,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() : usage variations *** -- Testing arsort() by supplying various arrays with key values -- diff --git a/ext/standard/tests/array/asort_basic.phpt b/ext/standard/tests/array/asort_basic.phpt index b80d31d37f..03c696499b 100644 --- a/ext/standard/tests/array/asort_basic.phpt +++ b/ext/standard/tests/array/asort_basic.phpt @@ -75,7 +75,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() : basic functionality *** -- Testing asort() by supplying string array, 'flag' value is default -- diff --git a/ext/standard/tests/array/asort_variation10.phpt b/ext/standard/tests/array/asort_variation10.phpt index f51945bf9e..793315e999 100644 --- a/ext/standard/tests/array/asort_variation10.phpt +++ b/ext/standard/tests/array/asort_variation10.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() : usage variations *** -- Testing asort() by supplying octal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/asort_variation11.phpt b/ext/standard/tests/array/asort_variation11.phpt Binary files differindex 013865f2c2..a1db5cbdf7 100644 --- a/ext/standard/tests/array/asort_variation11.phpt +++ b/ext/standard/tests/array/asort_variation11.phpt diff --git a/ext/standard/tests/array/asort_variation4.phpt b/ext/standard/tests/array/asort_variation4.phpt index 9fd76009ff..088e58a3da 100644 --- a/ext/standard/tests/array/asort_variation4.phpt +++ b/ext/standard/tests/array/asort_variation4.phpt @@ -41,7 +41,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() :usage variations *** -- Testing asort() by supplying reference variable array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/asort_variation5.phpt b/ext/standard/tests/array/asort_variation5.phpt index 3d6a12ef27..e416a59ca6 100644 --- a/ext/standard/tests/array/asort_variation5.phpt +++ b/ext/standard/tests/array/asort_variation5.phpt @@ -62,7 +62,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() : usage variations *** -- Testing asort() by supplying various string arrays -- diff --git a/ext/standard/tests/array/asort_variation6.phpt b/ext/standard/tests/array/asort_variation6.phpt index 117f30d38b..a25e96fd64 100644 --- a/ext/standard/tests/array/asort_variation6.phpt +++ b/ext/standard/tests/array/asort_variation6.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() : usage variations *** -- Testing asort() by supplying hexadecimal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/asort_variation7.phpt b/ext/standard/tests/array/asort_variation7.phpt index c078eb042c..a32c0de859 100644 --- a/ext/standard/tests/array/asort_variation7.phpt +++ b/ext/standard/tests/array/asort_variation7.phpt @@ -41,7 +41,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() : usage variations *** -- Testing asort() by supplying bool value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/asort_variation8.phpt b/ext/standard/tests/array/asort_variation8.phpt index 561cc7d708..b097346dff 100644 --- a/ext/standard/tests/array/asort_variation8.phpt +++ b/ext/standard/tests/array/asort_variation8.phpt @@ -57,7 +57,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() : usage variations *** -- Testing asort() by supplying various arrays containing sub arrays -- diff --git a/ext/standard/tests/array/asort_variation9.phpt b/ext/standard/tests/array/asort_variation9.phpt index 85ef679daa..f3c27ef94a 100644 --- a/ext/standard/tests/array/asort_variation9.phpt +++ b/ext/standard/tests/array/asort_variation9.phpt @@ -49,7 +49,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() : usage variations *** -- Testing asort() by supplying various arrays with key values -- diff --git a/ext/standard/tests/array/bug29253.phpt b/ext/standard/tests/array/bug29253.phpt index 4be9839221..4a1a90ebea 100644 --- a/ext/standard/tests/array/bug29253.phpt +++ b/ext/standard/tests/array/bug29253.phpt @@ -7,7 +7,7 @@ $gg = 'afad'; var_dump(@array_diff_assoc($GLOBALS, $zz)); var_dump($gg); ?> ---EXPECTF-- +--EXPECT-- array(0) { } string(4) "afad" diff --git a/ext/standard/tests/array/bug34066.phpt b/ext/standard/tests/array/bug34066.phpt index 023f4176fc..eb5b85e700 100644 --- a/ext/standard/tests/array/bug34066.phpt +++ b/ext/standard/tests/array/bug34066.phpt @@ -265,7 +265,7 @@ function gen_xml($val, $key, $prefix) } echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- gen_xml(prefix=/Docs/) gen_xml(prefix=/Docs/@) /Docs/@Version=1.0 diff --git a/ext/standard/tests/array/bug34066_1.phpt b/ext/standard/tests/array/bug34066_1.phpt index 6d0f7f84e9..12aa35c347 100644 --- a/ext/standard/tests/array/bug34066_1.phpt +++ b/ext/standard/tests/array/bug34066_1.phpt @@ -265,7 +265,7 @@ function gen_xml($val, $key, $prefix) } echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- gen_xml(prefix=/Docs/) /Docs/Version=1.0 gen_xml(prefix=/Docs/) end diff --git a/ext/standard/tests/array/bug48854.phpt b/ext/standard/tests/array/bug48854.phpt index 7aaade03a4..ed5b8e1ad1 100644 --- a/ext/standard/tests/array/bug48854.phpt +++ b/ext/standard/tests/array/bug48854.phpt @@ -22,7 +22,7 @@ $merged = array_merge_recursive($array1, $array2); var_dump($array1, $array2); ?> ---EXPECTF-- +--EXPECT-- array(2) { ["friends"]=> int(5) diff --git a/ext/standard/tests/array/bug50006.phpt b/ext/standard/tests/array/bug50006.phpt index 948866361a..2ae15eab33 100644 --- a/ext/standard/tests/array/bug50006.phpt +++ b/ext/standard/tests/array/bug50006.phpt @@ -20,7 +20,7 @@ function magic_sort_cmp($a, $b) { } ?> ---EXPECTF-- +--EXPECT-- Array ( [foo] => 0 diff --git a/ext/standard/tests/array/bug50006_1.phpt b/ext/standard/tests/array/bug50006_1.phpt index 3df67f3a4b..9db2c7796f 100644 --- a/ext/standard/tests/array/bug50006_1.phpt +++ b/ext/standard/tests/array/bug50006_1.phpt @@ -20,7 +20,7 @@ function magic_sort_cmp($a, $b) { } ?> ---EXPECTF-- +--EXPECT-- Array ( [0] => foo diff --git a/ext/standard/tests/array/bug50006_2.phpt b/ext/standard/tests/array/bug50006_2.phpt index 48bb751703..a501986981 100644 --- a/ext/standard/tests/array/bug50006_2.phpt +++ b/ext/standard/tests/array/bug50006_2.phpt @@ -20,7 +20,7 @@ function magic_sort_cmp($a, $b) { } ?> ---EXPECTF-- +--EXPECT-- Array ( [2] => foo diff --git a/ext/standard/tests/array/bug52719.phpt b/ext/standard/tests/array/bug52719.phpt index 078c53d225..b3f0a31101 100644 --- a/ext/standard/tests/array/bug52719.phpt +++ b/ext/standard/tests/array/bug52719.phpt @@ -11,5 +11,5 @@ array_walk_recursive( ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/ext/standard/tests/array/compact_basic.phpt b/ext/standard/tests/array/compact_basic.phpt index 53a946e12a..4d9aab0689 100644 --- a/ext/standard/tests/array/compact_basic.phpt +++ b/ext/standard/tests/array/compact_basic.phpt @@ -34,7 +34,7 @@ var_dump (compact(array("g"))); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing compact() : basic functionality *** array(6) { ["a"]=> diff --git a/ext/standard/tests/array/compact_variation2.phpt b/ext/standard/tests/array/compact_variation2.phpt index 79db8ab047..91806bc0c8 100644 --- a/ext/standard/tests/array/compact_variation2.phpt +++ b/ext/standard/tests/array/compact_variation2.phpt @@ -23,7 +23,7 @@ f(); ?> ==Done== ---EXPECTF-- +--EXPECT-- *** Testing compact() : usage variations - variables outside of current scope *** array(2) { ["b"]=> diff --git a/ext/standard/tests/array/count_basic.phpt b/ext/standard/tests/array/count_basic.phpt index 45f63d6a49..010d6cdf3c 100644 --- a/ext/standard/tests/array/count_basic.phpt +++ b/ext/standard/tests/array/count_basic.phpt @@ -31,7 +31,7 @@ var_dump(count($array_multi, 1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing count() : basic functionality *** -- One Dimensional Array: -- diff --git a/ext/standard/tests/array/current_basic.phpt b/ext/standard/tests/array/current_basic.phpt index cec6959778..f2a6aad78e 100644 --- a/ext/standard/tests/array/current_basic.phpt +++ b/ext/standard/tests/array/current_basic.phpt @@ -23,7 +23,7 @@ next($array); var_dump(current($array)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing current() : basic functionality *** string(4) "zero" string(3) "one" diff --git a/ext/standard/tests/array/current_variation3.phpt b/ext/standard/tests/array/current_variation3.phpt index bab5e6e0c5..decb043116 100644 --- a/ext/standard/tests/array/current_variation3.phpt +++ b/ext/standard/tests/array/current_variation3.phpt @@ -30,7 +30,7 @@ echo "\$array2: "; var_dump(current($array2)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing current() : usage variations *** -- Initial position of internal pointer -- diff --git a/ext/standard/tests/array/current_variation4.phpt b/ext/standard/tests/array/current_variation4.phpt index 741fced2e7..5862a86129 100644 --- a/ext/standard/tests/array/current_variation4.phpt +++ b/ext/standard/tests/array/current_variation4.phpt @@ -46,7 +46,7 @@ var_dump(current($multi_array[3][3][3])); var_dump(current($multi_array[3][3][3][1])); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing current() : usage variations *** -- Two Dimensional Array -- diff --git a/ext/standard/tests/array/current_variation5.phpt b/ext/standard/tests/array/current_variation5.phpt index 9e7c9e8d9d..d49353c24f 100644 --- a/ext/standard/tests/array/current_variation5.phpt +++ b/ext/standard/tests/array/current_variation5.phpt @@ -41,7 +41,7 @@ current_variation5($a); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- *** Testing current() : usage variations *** -- Function: reference parameter -- diff --git a/ext/standard/tests/array/end_basic.phpt b/ext/standard/tests/array/end_basic.phpt index 5a6606d381..2e92587068 100644 --- a/ext/standard/tests/array/end_basic.phpt +++ b/ext/standard/tests/array/end_basic.phpt @@ -29,7 +29,7 @@ $array[2] = 'foo'; var_dump(end($array)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing end() : basic functionality *** -- Initial Position: -- diff --git a/ext/standard/tests/array/end_variation2.phpt b/ext/standard/tests/array/end_variation2.phpt index 180f7cdfbd..ea9c336ac0 100644 --- a/ext/standard/tests/array/end_variation2.phpt +++ b/ext/standard/tests/array/end_variation2.phpt @@ -25,7 +25,7 @@ echo "\n-- Pass a sub-array as \$array_arg --\n"; var_dump(end($array_arg[0])); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing end() : usage variations *** -- Pass a two-dimensional array as $array_arg -- diff --git a/ext/standard/tests/array/end_variation3.phpt b/ext/standard/tests/array/end_variation3.phpt index cd1e2d0ec5..cbc30212cd 100644 --- a/ext/standard/tests/array/end_variation3.phpt +++ b/ext/standard/tests/array/end_variation3.phpt @@ -29,7 +29,7 @@ echo "\$array2: "; var_dump(current($array2)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing end() : usage variations *** -- Initial position of internal pointer -- diff --git a/ext/standard/tests/array/extract_variation10.phpt b/ext/standard/tests/array/extract_variation10.phpt index 6e4565dc8c..2170b4f6b4 100644 --- a/ext/standard/tests/array/extract_variation10.phpt +++ b/ext/standard/tests/array/extract_variation10.phpt @@ -9,5 +9,5 @@ extract($a, EXTR_REFS); $a['foo'] = 'changed.foo'; var_dump($nonref); ?> ---EXPECTF-- +--EXPECT-- string(12) "original.foo" diff --git a/ext/standard/tests/array/extract_variation11.phpt b/ext/standard/tests/array/extract_variation11.phpt index dfab4ddbba..039d474f89 100644 --- a/ext/standard/tests/array/extract_variation11.phpt +++ b/ext/standard/tests/array/extract_variation11.phpt @@ -9,5 +9,5 @@ extract($a, EXTR_OVERWRITE|EXTR_REFS); $foo = 'changed.foo'; var_dump($a['foo']); ?> ---EXPECTF-- +--EXPECT-- string(11) "changed.foo" diff --git a/ext/standard/tests/array/extract_variation2.phpt b/ext/standard/tests/array/extract_variation2.phpt index 570e75f076..5483fa0c9d 100644 --- a/ext/standard/tests/array/extract_variation2.phpt +++ b/ext/standard/tests/array/extract_variation2.phpt @@ -33,7 +33,7 @@ foreach ( $mixed_array as $sub_array ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- -- Iteration 0 -- int(0) int(0) diff --git a/ext/standard/tests/array/extract_variation3.phpt b/ext/standard/tests/array/extract_variation3.phpt index 2dcb775fe7..1a6a088646 100644 --- a/ext/standard/tests/array/extract_variation3.phpt +++ b/ext/standard/tests/array/extract_variation3.phpt @@ -33,7 +33,7 @@ foreach ( $mixed_array as $sub_array ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- -- Iteration 0 -- int(0) int(0) diff --git a/ext/standard/tests/array/extract_variation4.phpt b/ext/standard/tests/array/extract_variation4.phpt index 11528f4b87..31adb6e814 100644 --- a/ext/standard/tests/array/extract_variation4.phpt +++ b/ext/standard/tests/array/extract_variation4.phpt @@ -33,7 +33,7 @@ foreach ( $mixed_array as $sub_array ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- -- Iteration 0 -- int(0) int(0) diff --git a/ext/standard/tests/array/extract_variation5.phpt b/ext/standard/tests/array/extract_variation5.phpt index 4a3e95bbb7..f4455e9e57 100644 --- a/ext/standard/tests/array/extract_variation5.phpt +++ b/ext/standard/tests/array/extract_variation5.phpt @@ -32,7 +32,7 @@ foreach ( $mixed_array as $sub_array ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- -- Iteration 0 -- int(0) int(0) diff --git a/ext/standard/tests/array/extract_variation6.phpt b/ext/standard/tests/array/extract_variation6.phpt index 7eac67e16e..0c2243949a 100644 --- a/ext/standard/tests/array/extract_variation6.phpt +++ b/ext/standard/tests/array/extract_variation6.phpt @@ -16,7 +16,7 @@ var_dump($a); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(1) string(3) "aaa" int(1) diff --git a/ext/standard/tests/array/extract_variation7.phpt b/ext/standard/tests/array/extract_variation7.phpt index 653941dc9b..8104450df2 100644 --- a/ext/standard/tests/array/extract_variation7.phpt +++ b/ext/standard/tests/array/extract_variation7.phpt @@ -15,7 +15,7 @@ var_dump ( extract($b, EXTR_PREFIX_ALL, "diff")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing for EXTR_PREFIX_ALL called twice with same prefix string *** int(5) int(11) diff --git a/ext/standard/tests/array/extract_variation8.phpt b/ext/standard/tests/array/extract_variation8.phpt index 0d15fd494e..de9271a1cb 100644 --- a/ext/standard/tests/array/extract_variation8.phpt +++ b/ext/standard/tests/array/extract_variation8.phpt @@ -18,7 +18,7 @@ var_dump ( extract($var1)); echo "\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Testing for Numerical prefixes *** int(3) int(1) diff --git a/ext/standard/tests/array/in_array_variation1.phpt b/ext/standard/tests/array/in_array_variation1.phpt index 470738bcf5..45f18d0a10 100644 --- a/ext/standard/tests/array/in_array_variation1.phpt +++ b/ext/standard/tests/array/in_array_variation1.phpt @@ -61,7 +61,7 @@ foreach($arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing in_array() with different needle values *** -- Iteration 1 -- bool(false) diff --git a/ext/standard/tests/array/in_array_variation2.phpt b/ext/standard/tests/array/in_array_variation2.phpt index ee1267f4e2..1f42bb3f07 100644 --- a/ext/standard/tests/array/in_array_variation2.phpt +++ b/ext/standard/tests/array/in_array_variation2.phpt @@ -49,7 +49,7 @@ foreach($array_type as $type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing in_array() with different haystack values *** -- Iteration 1 -- bool(true) diff --git a/ext/standard/tests/array/in_array_variation4.phpt b/ext/standard/tests/array/in_array_variation4.phpt index 789dbd6923..8301571940 100644 --- a/ext/standard/tests/array/in_array_variation4.phpt +++ b/ext/standard/tests/array/in_array_variation4.phpt @@ -58,7 +58,7 @@ var_dump( in_array('123abc', array(123), TRUE) ); // false in strict mode echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing resource type with in_array() *** bool(true) bool(false) diff --git a/ext/standard/tests/array/key_basic.phpt b/ext/standard/tests/array/key_basic.phpt index 8fdca1966c..c626fd6872 100644 --- a/ext/standard/tests/array/key_basic.phpt +++ b/ext/standard/tests/array/key_basic.phpt @@ -30,7 +30,7 @@ next($array); var_dump(key($array)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing key() : basic functionality *** -- Initial Position: -- diff --git a/ext/standard/tests/array/key_exists_basic.phpt b/ext/standard/tests/array/key_exists_basic.phpt index 40d982da21..ebb5c25dd2 100644 --- a/ext/standard/tests/array/key_exists_basic.phpt +++ b/ext/standard/tests/array/key_exists_basic.phpt @@ -9,7 +9,7 @@ echo "*** test key_exists() by calling it with its expected arguments ***\n"; $a = array('bar' => 1); var_dump(key_exists('bar', $a)); var_dump(key_exists('foo', $a)); ---EXPECTF-- +--EXPECT-- *** test key_exists() by calling it with its expected arguments *** bool(true) bool(false) diff --git a/ext/standard/tests/array/key_exists_variation1.phpt b/ext/standard/tests/array/key_exists_variation1.phpt index 94ea8d45f7..65031f8240 100644 --- a/ext/standard/tests/array/key_exists_variation1.phpt +++ b/ext/standard/tests/array/key_exists_variation1.phpt @@ -9,7 +9,7 @@ echo "*** test key_exists() by calling it with its expected arguments ***\n"; $a = array('bar' => 1, 'foo' => array('bar' => 2, 'baz' => 3)); var_dump(key_exists('baz', $a)); var_dump(key_exists('baz', $a['foo'])); ---EXPECTF-- +--EXPECT-- *** test key_exists() by calling it with its expected arguments *** bool(false) bool(true) diff --git a/ext/standard/tests/array/key_exists_variation2.phpt b/ext/standard/tests/array/key_exists_variation2.phpt index 5f5ab86a4f..3409f36455 100644 --- a/ext/standard/tests/array/key_exists_variation2.phpt +++ b/ext/standard/tests/array/key_exists_variation2.phpt @@ -55,7 +55,7 @@ var_dump(key_exists(0, $h)); $i = array('foo' => 'baz', $st); var_dump(key_exists(0, $i)); ---EXPECTF-- +--EXPECT-- *** test key_exists() by using mixed type of arrays *** bool(false) integer diff --git a/ext/standard/tests/array/key_variation2.phpt b/ext/standard/tests/array/key_variation2.phpt index 35389062bb..912f9a69cb 100644 --- a/ext/standard/tests/array/key_variation2.phpt +++ b/ext/standard/tests/array/key_variation2.phpt @@ -104,7 +104,7 @@ foreach($inputs as $key => $input) { }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing key() : usage variations *** -- Iteration 1 : int data -- diff --git a/ext/standard/tests/array/key_variation3.phpt b/ext/standard/tests/array/key_variation3.phpt index a231917814..916e99af38 100644 --- a/ext/standard/tests/array/key_variation3.phpt +++ b/ext/standard/tests/array/key_variation3.phpt @@ -31,7 +31,7 @@ echo "\$array2: "; var_dump(key($array2)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing key() : usage variations *** -- Initial position of internal pointer -- diff --git a/ext/standard/tests/array/key_variation4.phpt b/ext/standard/tests/array/key_variation4.phpt index 147d55aa13..6698d6385a 100644 --- a/ext/standard/tests/array/key_variation4.phpt +++ b/ext/standard/tests/array/key_variation4.phpt @@ -45,7 +45,7 @@ var_dump(key($multi_array[3][3][3])); var_dump(key($multi_array[3][3][3][1])); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing key() : usage variations *** -- Two Dimensional Array -- diff --git a/ext/standard/tests/array/krsort_basic.phpt b/ext/standard/tests/array/krsort_basic.phpt index 27361eb96d..6a3a40e3ad 100644 --- a/ext/standard/tests/array/krsort_basic.phpt +++ b/ext/standard/tests/array/krsort_basic.phpt @@ -75,7 +75,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : basic functionality *** -- Testing krsort() by supplying string array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/krsort_variation10.phpt b/ext/standard/tests/array/krsort_variation10.phpt index f56d2870b8..467fb88e4d 100644 --- a/ext/standard/tests/array/krsort_variation10.phpt +++ b/ext/standard/tests/array/krsort_variation10.phpt @@ -54,7 +54,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying heredoc string array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/krsort_variation11.phpt b/ext/standard/tests/array/krsort_variation11.phpt index 0cfa4821a2..f16e438335 100644 --- a/ext/standard/tests/array/krsort_variation11.phpt +++ b/ext/standard/tests/array/krsort_variation11.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying boolean value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/krsort_variation3.phpt b/ext/standard/tests/array/krsort_variation3.phpt index 8f411a9739..0707c610cb 100644 --- a/ext/standard/tests/array/krsort_variation3.phpt +++ b/ext/standard/tests/array/krsort_variation3.phpt @@ -57,7 +57,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying various integer/float arrays -- diff --git a/ext/standard/tests/array/krsort_variation4.phpt b/ext/standard/tests/array/krsort_variation4.phpt index 3df924ac82..5643b39f58 100644 --- a/ext/standard/tests/array/krsort_variation4.phpt +++ b/ext/standard/tests/array/krsort_variation4.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying octal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/krsort_variation5.phpt b/ext/standard/tests/array/krsort_variation5.phpt index 0fa1e9c68f..2fa16c6e73 100644 --- a/ext/standard/tests/array/krsort_variation5.phpt +++ b/ext/standard/tests/array/krsort_variation5.phpt @@ -62,7 +62,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying various string arrays -- diff --git a/ext/standard/tests/array/krsort_variation6.phpt b/ext/standard/tests/array/krsort_variation6.phpt index 167d0ee7d6..72f4e41720 100644 --- a/ext/standard/tests/array/krsort_variation6.phpt +++ b/ext/standard/tests/array/krsort_variation6.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying hexadecimal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/krsort_variation7.phpt b/ext/standard/tests/array/krsort_variation7.phpt index 9ba3fc5447..b0512935dc 100644 --- a/ext/standard/tests/array/krsort_variation7.phpt +++ b/ext/standard/tests/array/krsort_variation7.phpt @@ -54,7 +54,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying various arrays containing sub arrays -- diff --git a/ext/standard/tests/array/krsort_variation8.phpt b/ext/standard/tests/array/krsort_variation8.phpt Binary files differindex f5a40cbeed..3dd33157ec 100644 --- a/ext/standard/tests/array/krsort_variation8.phpt +++ b/ext/standard/tests/array/krsort_variation8.phpt diff --git a/ext/standard/tests/array/krsort_variation9.phpt b/ext/standard/tests/array/krsort_variation9.phpt index 1b8ae5dd36..f3e510f8be 100644 --- a/ext/standard/tests/array/krsort_variation9.phpt +++ b/ext/standard/tests/array/krsort_variation9.phpt @@ -48,7 +48,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying various arrays with/without key values -- diff --git a/ext/standard/tests/array/ksort_basic.phpt b/ext/standard/tests/array/ksort_basic.phpt index dd9f7a2158..59241bb6c8 100644 --- a/ext/standard/tests/array/ksort_basic.phpt +++ b/ext/standard/tests/array/ksort_basic.phpt @@ -73,7 +73,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : basic functionality *** -- Testing ksort() by supplying string array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/ksort_variation10.phpt b/ext/standard/tests/array/ksort_variation10.phpt index 051bc30615..844685b36a 100644 --- a/ext/standard/tests/array/ksort_variation10.phpt +++ b/ext/standard/tests/array/ksort_variation10.phpt @@ -39,7 +39,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying octal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/ksort_variation11.phpt b/ext/standard/tests/array/ksort_variation11.phpt index 347df65c4f..758821303b 100644 --- a/ext/standard/tests/array/ksort_variation11.phpt +++ b/ext/standard/tests/array/ksort_variation11.phpt @@ -54,7 +54,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying heredoc string array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/ksort_variation3.phpt b/ext/standard/tests/array/ksort_variation3.phpt index 4029b9b8d3..691672f780 100644 --- a/ext/standard/tests/array/ksort_variation3.phpt +++ b/ext/standard/tests/array/ksort_variation3.phpt @@ -57,7 +57,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying various integer/float arrays -- diff --git a/ext/standard/tests/array/ksort_variation4.phpt b/ext/standard/tests/array/ksort_variation4.phpt index d6b3f482bf..46e330229e 100644 --- a/ext/standard/tests/array/ksort_variation4.phpt +++ b/ext/standard/tests/array/ksort_variation4.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying boolean value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/ksort_variation5.phpt b/ext/standard/tests/array/ksort_variation5.phpt index 6e6a38b0a5..bc0c4be3b8 100644 --- a/ext/standard/tests/array/ksort_variation5.phpt +++ b/ext/standard/tests/array/ksort_variation5.phpt @@ -62,7 +62,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying various string arrays -- diff --git a/ext/standard/tests/array/ksort_variation6.phpt b/ext/standard/tests/array/ksort_variation6.phpt index 1243ab1236..32fd973d8f 100644 --- a/ext/standard/tests/array/ksort_variation6.phpt +++ b/ext/standard/tests/array/ksort_variation6.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying hexadecimal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/ksort_variation7.phpt b/ext/standard/tests/array/ksort_variation7.phpt index a0f454bbd1..18dc3a03ab 100644 --- a/ext/standard/tests/array/ksort_variation7.phpt +++ b/ext/standard/tests/array/ksort_variation7.phpt @@ -54,7 +54,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying various arrays containing sub arrays -- diff --git a/ext/standard/tests/array/ksort_variation8.phpt b/ext/standard/tests/array/ksort_variation8.phpt Binary files differindex f827883ce9..ca9dfdbe9e 100644 --- a/ext/standard/tests/array/ksort_variation8.phpt +++ b/ext/standard/tests/array/ksort_variation8.phpt diff --git a/ext/standard/tests/array/ksort_variation9.phpt b/ext/standard/tests/array/ksort_variation9.phpt index 8aa1e2f29d..e78ea3bef0 100644 --- a/ext/standard/tests/array/ksort_variation9.phpt +++ b/ext/standard/tests/array/ksort_variation9.phpt @@ -47,7 +47,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying various arrays with/without key values -- diff --git a/ext/standard/tests/array/natcasesort_basic.phpt b/ext/standard/tests/array/natcasesort_basic.phpt index 2c173a6bec..ba23353503 100644 --- a/ext/standard/tests/array/natcasesort_basic.phpt +++ b/ext/standard/tests/array/natcasesort_basic.phpt @@ -23,7 +23,7 @@ var_dump($array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : basic functionality *** -- Before sorting: -- diff --git a/ext/standard/tests/array/natcasesort_variation10.phpt b/ext/standard/tests/array/natcasesort_variation10.phpt index cffa007b74..15fbfd911b 100644 --- a/ext/standard/tests/array/natcasesort_variation10.phpt +++ b/ext/standard/tests/array/natcasesort_variation10.phpt @@ -28,7 +28,7 @@ echo key($array_arg) . " => " . current ($array_arg) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variations *** -- Initial Position of Internal Pointer: -- diff --git a/ext/standard/tests/array/natcasesort_variation11.phpt b/ext/standard/tests/array/natcasesort_variation11.phpt index 98158f15d0..ac19cb3950 100644 --- a/ext/standard/tests/array/natcasesort_variation11.phpt +++ b/ext/standard/tests/array/natcasesort_variation11.phpt @@ -112,7 +112,7 @@ foreach($inputs as $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variations *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/natcasesort_variation3.phpt b/ext/standard/tests/array/natcasesort_variation3.phpt index 452e886995..be7495418d 100644 --- a/ext/standard/tests/array/natcasesort_variation3.phpt +++ b/ext/standard/tests/array/natcasesort_variation3.phpt @@ -42,7 +42,7 @@ foreach ($inputs as $array_arg) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variation *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/natcasesort_variation4.phpt b/ext/standard/tests/array/natcasesort_variation4.phpt index d7dee1e8e7..472cfe1dc4 100644 --- a/ext/standard/tests/array/natcasesort_variation4.phpt +++ b/ext/standard/tests/array/natcasesort_variation4.phpt @@ -33,7 +33,7 @@ foreach ($inputs as $array_arg) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variation *** bool(true) array(11) { diff --git a/ext/standard/tests/array/natcasesort_variation5.phpt b/ext/standard/tests/array/natcasesort_variation5.phpt index 867d0b89e4..71559afa23 100644 --- a/ext/standard/tests/array/natcasesort_variation5.phpt +++ b/ext/standard/tests/array/natcasesort_variation5.phpt @@ -19,7 +19,7 @@ var_dump($unsorted_hex_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variation *** bool(true) array(11) { diff --git a/ext/standard/tests/array/natcasesort_variation6.phpt b/ext/standard/tests/array/natcasesort_variation6.phpt index 1d151d80d3..e87fb27a64 100644 --- a/ext/standard/tests/array/natcasesort_variation6.phpt +++ b/ext/standard/tests/array/natcasesort_variation6.phpt @@ -29,7 +29,7 @@ var_dump($array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variation *** -- Initial test -- diff --git a/ext/standard/tests/array/natcasesort_variation7.phpt b/ext/standard/tests/array/natcasesort_variation7.phpt index 91be7e262f..713f7c959c 100644 --- a/ext/standard/tests/array/natcasesort_variation7.phpt +++ b/ext/standard/tests/array/natcasesort_variation7.phpt @@ -22,7 +22,7 @@ var_dump($array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variations *** array(5) { [0]=> diff --git a/ext/standard/tests/array/natcasesort_variation8.phpt b/ext/standard/tests/array/natcasesort_variation8.phpt index fbced4a229..48f347837c 100644 --- a/ext/standard/tests/array/natcasesort_variation8.phpt +++ b/ext/standard/tests/array/natcasesort_variation8.phpt @@ -20,7 +20,7 @@ var_dump($unsorted_oct_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variation *** bool(true) array(9) { diff --git a/ext/standard/tests/array/natcasesort_variation9.phpt b/ext/standard/tests/array/natcasesort_variation9.phpt Binary files differindex cc40378238..dc5b5f4203 100644 --- a/ext/standard/tests/array/natcasesort_variation9.phpt +++ b/ext/standard/tests/array/natcasesort_variation9.phpt diff --git a/ext/standard/tests/array/next_basic.phpt b/ext/standard/tests/array/next_basic.phpt index fe8b70c88b..e502d8646e 100644 --- a/ext/standard/tests/array/next_basic.phpt +++ b/ext/standard/tests/array/next_basic.phpt @@ -24,7 +24,7 @@ echo key($array) . " => " . current($array) . "\n"; var_dump(next($array)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing next() : basic functionality *** 0 => zero string(3) "one" diff --git a/ext/standard/tests/array/next_variation2.phpt b/ext/standard/tests/array/next_variation2.phpt index e7505096d9..1ecde7efce 100644 --- a/ext/standard/tests/array/next_variation2.phpt +++ b/ext/standard/tests/array/next_variation2.phpt @@ -26,7 +26,7 @@ echo "\n-- Pass a sub-array as \$array_arg --\n"; var_dump(next($array_arg[0])); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing next() : usage variations *** -- Pass a two-dimensional array as $array_arg -- diff --git a/ext/standard/tests/array/prev_basic.phpt b/ext/standard/tests/array/prev_basic.phpt index 8c1450dd3c..f3c91cafc3 100644 --- a/ext/standard/tests/array/prev_basic.phpt +++ b/ext/standard/tests/array/prev_basic.phpt @@ -34,7 +34,7 @@ for ($i = $length; $i > 0; $i--) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing prev() : basic functionality *** 2 => two string(3) "one" diff --git a/ext/standard/tests/array/prev_variation2.phpt b/ext/standard/tests/array/prev_variation2.phpt index 0ce087781e..8e8ee4d673 100644 --- a/ext/standard/tests/array/prev_variation2.phpt +++ b/ext/standard/tests/array/prev_variation2.phpt @@ -30,7 +30,7 @@ echo "\n-- Pass a sub-array as \$array_arg --\n"; var_dump(prev($array_arg[0])); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing prev() : usage variations *** -- Pass a two-dimensional array as $array_arg -- diff --git a/ext/standard/tests/array/range.phpt b/ext/standard/tests/array/range.phpt index 9fd0f5ed45..ebb496c74a 100644 --- a/ext/standard/tests/array/range.phpt +++ b/ext/standard/tests/array/range.phpt @@ -48,7 +48,7 @@ var_dump( range("abcd", "mnop", 2) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing range() function on basic operations *** -- Integers as Low and High -- diff --git a/ext/standard/tests/array/range_variation.phpt b/ext/standard/tests/array/range_variation.phpt index e97d918d9b..f7fc9e0815 100644 --- a/ext/standard/tests/array/range_variation.phpt +++ b/ext/standard/tests/array/range_variation.phpt @@ -22,7 +22,7 @@ var_dump( range( 1, 5, array(1, 2) ) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing range() with various low and high values *** -- creating an array with low = 'ABCD' and high = 'ABCD' -- array(1) { diff --git a/ext/standard/tests/array/range_variation1.phpt b/ext/standard/tests/array/range_variation1.phpt index 6e57f73127..0747fab336 100644 --- a/ext/standard/tests/array/range_variation1.phpt +++ b/ext/standard/tests/array/range_variation1.phpt @@ -20,7 +20,7 @@ var_dump( range(-2147483649, -2147483647) ); echo "\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Testing max/outof range values *** array(2) { [0]=> diff --git a/ext/standard/tests/array/range_variation1_64bit.phpt b/ext/standard/tests/array/range_variation1_64bit.phpt index a14dae987f..555dbc2e1a 100644 --- a/ext/standard/tests/array/range_variation1_64bit.phpt +++ b/ext/standard/tests/array/range_variation1_64bit.phpt @@ -20,7 +20,7 @@ var_dump( range(-2147483649, -2147483647) ); echo "\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Testing max/outof range values *** array(2) { [0]=> diff --git a/ext/standard/tests/array/reset_basic.phpt b/ext/standard/tests/array/reset_basic.phpt index d376e68a21..52e3cf55f4 100644 --- a/ext/standard/tests/array/reset_basic.phpt +++ b/ext/standard/tests/array/reset_basic.phpt @@ -28,7 +28,7 @@ echo "\n-- Call to reset() --\n"; var_dump(reset($array)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing reset() : basic functionality *** -- Initial Position: -- diff --git a/ext/standard/tests/array/reset_variation2.phpt b/ext/standard/tests/array/reset_variation2.phpt index 1384affa94..6ecc1ad683 100644 --- a/ext/standard/tests/array/reset_variation2.phpt +++ b/ext/standard/tests/array/reset_variation2.phpt @@ -23,7 +23,7 @@ unset($array[0]); var_dump(reset($array)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing reset() : usage variations *** -- Initial Position: -- diff --git a/ext/standard/tests/array/reset_variation3.phpt b/ext/standard/tests/array/reset_variation3.phpt index 29f965abe1..7ac859c1c3 100644 --- a/ext/standard/tests/array/reset_variation3.phpt +++ b/ext/standard/tests/array/reset_variation3.phpt @@ -39,7 +39,7 @@ echo "\$array2: "; var_dump(current($array2)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing reset() : usage variations *** -- Initial position of internal pointer -- diff --git a/ext/standard/tests/array/rsort_basic.phpt b/ext/standard/tests/array/rsort_basic.phpt index 34fcbb7034..724aa2d3a8 100644 --- a/ext/standard/tests/array/rsort_basic.phpt +++ b/ext/standard/tests/array/rsort_basic.phpt @@ -71,7 +71,7 @@ var_dump( $temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : basic functionality *** -- Testing rsort() by supplying string array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/rsort_variation10.phpt b/ext/standard/tests/array/rsort_variation10.phpt index ccf886b070..bcb184e84e 100644 --- a/ext/standard/tests/array/rsort_variation10.phpt +++ b/ext/standard/tests/array/rsort_variation10.phpt @@ -34,7 +34,7 @@ var_dump($temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- Sort flag = default -- diff --git a/ext/standard/tests/array/rsort_variation11.phpt b/ext/standard/tests/array/rsort_variation11.phpt Binary files differindex a2f0fdc3e4..076a906599 100644 --- a/ext/standard/tests/array/rsort_variation11.phpt +++ b/ext/standard/tests/array/rsort_variation11.phpt diff --git a/ext/standard/tests/array/rsort_variation3.phpt b/ext/standard/tests/array/rsort_variation3.phpt index f8c002a6f7..6f92407587 100644 --- a/ext/standard/tests/array/rsort_variation3.phpt +++ b/ext/standard/tests/array/rsort_variation3.phpt @@ -60,7 +60,7 @@ foreach ($various_arrays as $array) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/rsort_variation4.phpt b/ext/standard/tests/array/rsort_variation4.phpt index 226284d329..08ce8a66d5 100644 --- a/ext/standard/tests/array/rsort_variation4.phpt +++ b/ext/standard/tests/array/rsort_variation4.phpt @@ -35,7 +35,7 @@ var_dump( $temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- 'flag' value is defualt -- diff --git a/ext/standard/tests/array/rsort_variation5.phpt b/ext/standard/tests/array/rsort_variation5.phpt index c0184e83b9..62e9f10aef 100644 --- a/ext/standard/tests/array/rsort_variation5.phpt +++ b/ext/standard/tests/array/rsort_variation5.phpt @@ -52,7 +52,7 @@ foreach ($various_arrays as $array) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/rsort_variation6.phpt b/ext/standard/tests/array/rsort_variation6.phpt index 559a1ebaf7..d593573adb 100644 --- a/ext/standard/tests/array/rsort_variation6.phpt +++ b/ext/standard/tests/array/rsort_variation6.phpt @@ -34,7 +34,7 @@ var_dump($temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- 'flag' value is defualt -- diff --git a/ext/standard/tests/array/rsort_variation7.phpt b/ext/standard/tests/array/rsort_variation7.phpt index a996bf6db3..14eab635d0 100644 --- a/ext/standard/tests/array/rsort_variation7.phpt +++ b/ext/standard/tests/array/rsort_variation7.phpt @@ -39,7 +39,7 @@ var_dump($temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- 'flag' value is defualt -- diff --git a/ext/standard/tests/array/rsort_variation8.phpt b/ext/standard/tests/array/rsort_variation8.phpt index a4f94b5f0f..28bfe2c5a5 100644 --- a/ext/standard/tests/array/rsort_variation8.phpt +++ b/ext/standard/tests/array/rsort_variation8.phpt @@ -51,7 +51,7 @@ foreach ($various_arrays as $array) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/rsort_variation9.phpt b/ext/standard/tests/array/rsort_variation9.phpt index 023d401314..9d0d917b88 100644 --- a/ext/standard/tests/array/rsort_variation9.phpt +++ b/ext/standard/tests/array/rsort_variation9.phpt @@ -54,7 +54,7 @@ foreach ($various_arrays as $array) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/sizeof_basic2.phpt b/ext/standard/tests/array/sizeof_basic2.phpt index b56682c31a..bbcbe11091 100644 --- a/ext/standard/tests/array/sizeof_basic2.phpt +++ b/ext/standard/tests/array/sizeof_basic2.phpt @@ -67,7 +67,7 @@ var_dump( sizeof($mixed_array, COUNT_RECURSIVE) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sizeof() : basic functionality *** -- Testing sizeof() with integer array in default, COUNT_NORMAL, COUNT_RECURSIVE modes -- default mode: int(4) diff --git a/ext/standard/tests/array/sizeof_object1.phpt b/ext/standard/tests/array/sizeof_object1.phpt index e040585585..43b49e5693 100644 --- a/ext/standard/tests/array/sizeof_object1.phpt +++ b/ext/standard/tests/array/sizeof_object1.phpt @@ -35,7 +35,7 @@ var_dump( sizeof($obj, COUNT_RECURSIVE) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sizeof() : object functionality *** -- Testing sizeof() with an object which implements Countable interface -- -- Testing sizeof() in default mode -- diff --git a/ext/standard/tests/array/sizeof_variation2.phpt b/ext/standard/tests/array/sizeof_variation2.phpt index a224579780..8bd74a0207 100644 --- a/ext/standard/tests/array/sizeof_variation2.phpt +++ b/ext/standard/tests/array/sizeof_variation2.phpt @@ -59,7 +59,7 @@ for($i = 0; $i < count($values); $i++) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sizeof() : usage variations *** --- Testing sizeof() with different array values for 'var' argument --- -- Iteration 1 -- diff --git a/ext/standard/tests/array/sizeof_variation3.phpt b/ext/standard/tests/array/sizeof_variation3.phpt index ba8afb83e6..b78b620d7d 100644 --- a/ext/standard/tests/array/sizeof_variation3.phpt +++ b/ext/standard/tests/array/sizeof_variation3.phpt @@ -25,7 +25,7 @@ var_dump( sizeof($array4, COUNT_RECURSIVE) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sizeof() : usage variations *** -- Testing sizeof() for infinite recursion with arrays as argument in COUNT_RECURSIVE mode -- int(13) diff --git a/ext/standard/tests/array/sort_basic.phpt b/ext/standard/tests/array/sort_basic.phpt index 460b572fc1..df37b2d1d5 100644 --- a/ext/standard/tests/array/sort_basic.phpt +++ b/ext/standard/tests/array/sort_basic.phpt @@ -76,7 +76,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : basic functionality *** -- Testing sort() by supplying string array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/sort_variation10.phpt b/ext/standard/tests/array/sort_variation10.phpt index 0a5a58044a..9f76968a03 100644 --- a/ext/standard/tests/array/sort_variation10.phpt +++ b/ext/standard/tests/array/sort_variation10.phpt @@ -38,7 +38,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** -- Testing sort() by supplying octal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/sort_variation11.phpt b/ext/standard/tests/array/sort_variation11.phpt Binary files differindex bcab4bc998..4faec0196b 100644 --- a/ext/standard/tests/array/sort_variation11.phpt +++ b/ext/standard/tests/array/sort_variation11.phpt diff --git a/ext/standard/tests/array/sort_variation4.phpt b/ext/standard/tests/array/sort_variation4.phpt index 82e3d9708f..f4f6d783c1 100644 --- a/ext/standard/tests/array/sort_variation4.phpt +++ b/ext/standard/tests/array/sort_variation4.phpt @@ -41,7 +41,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() :usage variations *** -- Testing sort() by supplying reference variable array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/sort_variation5.phpt b/ext/standard/tests/array/sort_variation5.phpt index a06c22c751..0395d0c97f 100644 --- a/ext/standard/tests/array/sort_variation5.phpt +++ b/ext/standard/tests/array/sort_variation5.phpt @@ -56,7 +56,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** -- Testing sort() by supplying various string arrays -- diff --git a/ext/standard/tests/array/sort_variation6.phpt b/ext/standard/tests/array/sort_variation6.phpt index 7a93f0e5fe..cf094e864b 100644 --- a/ext/standard/tests/array/sort_variation6.phpt +++ b/ext/standard/tests/array/sort_variation6.phpt @@ -37,7 +37,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** -- Testing sort() by supplying hexadecimal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/sort_variation7.phpt b/ext/standard/tests/array/sort_variation7.phpt index 19d888a76a..f61ee46e54 100644 --- a/ext/standard/tests/array/sort_variation7.phpt +++ b/ext/standard/tests/array/sort_variation7.phpt @@ -41,7 +41,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** -- Testing sort() by supplying bool value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/sort_variation8.phpt b/ext/standard/tests/array/sort_variation8.phpt index 9a330313f9..17228f28ac 100644 --- a/ext/standard/tests/array/sort_variation8.phpt +++ b/ext/standard/tests/array/sort_variation8.phpt @@ -55,7 +55,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** -- Testing sort() by supplying various arrays containing sub arrays -- diff --git a/ext/standard/tests/array/sort_variation9.phpt b/ext/standard/tests/array/sort_variation9.phpt index faab1666c4..53e5679600 100644 --- a/ext/standard/tests/array/sort_variation9.phpt +++ b/ext/standard/tests/array/sort_variation9.phpt @@ -52,7 +52,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** -- Testing sort() by supplying various arrays with key values -- diff --git a/ext/standard/tests/array/uasort_basic1.phpt b/ext/standard/tests/array/uasort_basic1.phpt index 70dd04c0c9..c0dfefd836 100644 --- a/ext/standard/tests/array/uasort_basic1.phpt +++ b/ext/standard/tests/array/uasort_basic1.phpt @@ -55,7 +55,7 @@ var_dump($string_key_arg); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : basic functionality *** -- Numeric array with default keys -- bool(true) diff --git a/ext/standard/tests/array/uasort_basic2.phpt b/ext/standard/tests/array/uasort_basic2.phpt index c5ca0f13c8..de0275c15a 100644 --- a/ext/standard/tests/array/uasort_basic2.phpt +++ b/ext/standard/tests/array/uasort_basic2.phpt @@ -49,7 +49,7 @@ var_dump($int_values3); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : basic functionality with duplicate values *** -- Numeric array with increasing values -- bool(true) diff --git a/ext/standard/tests/array/uasort_object1.phpt b/ext/standard/tests/array/uasort_object1.phpt index 5d5b0b52c2..020b0d3c0b 100644 --- a/ext/standard/tests/array/uasort_object1.phpt +++ b/ext/standard/tests/array/uasort_object1.phpt @@ -92,7 +92,7 @@ var_dump($array_arg); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : object functionality *** bool(true) array(4) { diff --git a/ext/standard/tests/array/uasort_variation10.phpt b/ext/standard/tests/array/uasort_variation10.phpt index e0c5e72f7e..15b62930c3 100644 --- a/ext/standard/tests/array/uasort_variation10.phpt +++ b/ext/standard/tests/array/uasort_variation10.phpt @@ -55,7 +55,7 @@ var_dump($array_arg); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : 'array_arg' with elements as reference *** -- Sorting 'array_arg' containing different references -- bool(true) diff --git a/ext/standard/tests/array/uasort_variation11.phpt b/ext/standard/tests/array/uasort_variation11.phpt index 50357dec5c..c0afb8df5f 100644 --- a/ext/standard/tests/array/uasort_variation11.phpt +++ b/ext/standard/tests/array/uasort_variation11.phpt @@ -47,7 +47,7 @@ var_dump($array_arg); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : sorting different associative arrays *** -- Array with duplicate keys -- bool(true) diff --git a/ext/standard/tests/array/uasort_variation3.phpt b/ext/standard/tests/array/uasort_variation3.phpt Binary files differindex 9147d59916..8fe5f27821 100644 --- a/ext/standard/tests/array/uasort_variation3.phpt +++ b/ext/standard/tests/array/uasort_variation3.phpt diff --git a/ext/standard/tests/array/uasort_variation4.phpt b/ext/standard/tests/array/uasort_variation4.phpt index 8f0a2db077..613edd4684 100644 --- a/ext/standard/tests/array/uasort_variation4.phpt +++ b/ext/standard/tests/array/uasort_variation4.phpt @@ -67,7 +67,7 @@ var_dump($empty_array); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : different numeric arrays as 'array_arg' *** -- Sorting Integer array -- bool(true) diff --git a/ext/standard/tests/array/uasort_variation6.phpt b/ext/standard/tests/array/uasort_variation6.phpt index 1c0b927764..46d5e24aa4 100644 --- a/ext/standard/tests/array/uasort_variation6.phpt +++ b/ext/standard/tests/array/uasort_variation6.phpt @@ -50,7 +50,7 @@ var_dump( uasort($temp_array, 'cmp_function') ); // expecting: bool(true) var_dump($temp_array); ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : sorting array having different subarrays *** bool(true) array(8) { diff --git a/ext/standard/tests/array/uasort_variation7.phpt b/ext/standard/tests/array/uasort_variation7.phpt index e37d9efe6b..48028dbcd8 100644 --- a/ext/standard/tests/array/uasort_variation7.phpt +++ b/ext/standard/tests/array/uasort_variation7.phpt @@ -39,7 +39,7 @@ var_dump($array_arg); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : anonymous function as 'cmp_function' *** -- Anonymous 'cmp_function' with parameters passed by value -- bool(true) diff --git a/ext/standard/tests/array/uasort_variation9.phpt b/ext/standard/tests/array/uasort_variation9.phpt index 85578b0207..b8c5598d84 100644 --- a/ext/standard/tests/array/uasort_variation9.phpt +++ b/ext/standard/tests/array/uasort_variation9.phpt @@ -46,7 +46,7 @@ var_dump($string_values); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : 'cmp_function' with reference arguments *** -- Passing integer values to 'cmp_function' -- bool(true) diff --git a/ext/standard/tests/array/usort_basic.phpt b/ext/standard/tests/array/usort_basic.phpt index eaf30188de..64351f707c 100644 --- a/ext/standard/tests/array/usort_basic.phpt +++ b/ext/standard/tests/array/usort_basic.phpt @@ -54,7 +54,7 @@ var_dump( usort($string_key_arg, 'cmp') ); var_dump($string_key_arg); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing usort() : basic functionality *** -- Numeric array with default keys -- diff --git a/ext/standard/tests/array/usort_variation10.phpt b/ext/standard/tests/array/usort_variation10.phpt index b343419ce1..0aeed40292 100644 --- a/ext/standard/tests/array/usort_variation10.phpt +++ b/ext/standard/tests/array/usort_variation10.phpt @@ -42,7 +42,7 @@ var_dump( usort($array_arg, 'cmp') ); var_dump($array_arg); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing usort() : usage variation *** -- Array with duplicate keys -- diff --git a/ext/standard/tests/array/usort_variation3.phpt b/ext/standard/tests/array/usort_variation3.phpt index 3758fe9c9a..5d21776060 100644 --- a/ext/standard/tests/array/usort_variation3.phpt +++ b/ext/standard/tests/array/usort_variation3.phpt @@ -75,7 +75,7 @@ echo "\n-- Sorted array after usort() function call --\n"; var_dump($array_arg); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing usort() : usage variation *** bool(true) diff --git a/ext/standard/tests/array/usort_variation4.phpt b/ext/standard/tests/array/usort_variation4.phpt index 36624b7c3c..a5d14daab2 100644 --- a/ext/standard/tests/array/usort_variation4.phpt +++ b/ext/standard/tests/array/usort_variation4.phpt @@ -67,7 +67,7 @@ var_dump( usort($empty_array, 'cmp_function') ); var_dump($empty_array); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing usort() : usage variation *** -- Sorting Integer array -- diff --git a/ext/standard/tests/array/usort_variation6.phpt b/ext/standard/tests/array/usort_variation6.phpt index 3eb2eaa852..10b1e9929d 100644 --- a/ext/standard/tests/array/usort_variation6.phpt +++ b/ext/standard/tests/array/usort_variation6.phpt @@ -54,7 +54,7 @@ echo "-- Array after call to usort() --\n"; var_dump($array_args[5]); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing usort() : usage variation *** -- Pass usort() a two-dimensional array -- diff --git a/ext/standard/tests/array/usort_variation7.phpt b/ext/standard/tests/array/usort_variation7.phpt index 171e751df2..55c4efa037 100644 --- a/ext/standard/tests/array/usort_variation7.phpt +++ b/ext/standard/tests/array/usort_variation7.phpt @@ -38,7 +38,7 @@ var_dump( usort($array_arg, $cmp_function) ); var_dump($array_arg); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing usort() : usage variation *** -- Anonymous 'cmp_function' with parameters passed by value -- diff --git a/ext/standard/tests/array/usort_variation9.phpt b/ext/standard/tests/array/usort_variation9.phpt index 6a067992e7..977c709149 100644 --- a/ext/standard/tests/array/usort_variation9.phpt +++ b/ext/standard/tests/array/usort_variation9.phpt @@ -46,7 +46,7 @@ var_dump( usort($array_arg, 'cmp_function') ); var_dump($array_arg); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing usort() : usage variation *** -- Sorting $array_arg containing different references -- diff --git a/ext/standard/tests/assert/assert_basic1.phpt b/ext/standard/tests/assert/assert_basic1.phpt index 8aed519246..e803bb0ccc 100644 --- a/ext/standard/tests/assert/assert_basic1.phpt +++ b/ext/standard/tests/assert/assert_basic1.phpt @@ -22,7 +22,7 @@ var_dump($r2=assert($sa)); //Non string assert var_dump($r2=assert(0)); var_dump($r2=assert(1)); ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/assert/assert_basic4.phpt b/ext/standard/tests/assert/assert_basic4.phpt index 2f11234594..6c2baab437 100644 --- a/ext/standard/tests/assert/assert_basic4.phpt +++ b/ext/standard/tests/assert/assert_basic4.phpt @@ -24,7 +24,7 @@ echo "Initial values: ini.get(\"assert.bail\") => [".ini_get("assert.bail")."]\n echo "Initial values: ini.get(\"assert.quiet_eval\") => [".ini_get("assert.quiet_eval")."]\n"; echo "Initial values: ini.get(\"assert.callback\") => [".ini_get("assert.callback")."]\n\n"; ---EXPECTF-- +--EXPECT-- Initial values: assert_options(ASSERT_ACTIVE) => [0] Initial values: assert_options(ASSERT_WARNING) => [0] Initial values: assert_options(ASSERT_BAIL) => [0] diff --git a/ext/standard/tests/class_object/class_exists_basic_001.phpt b/ext/standard/tests/class_object/class_exists_basic_001.phpt index 208a895e6b..6d24ef979f 100644 --- a/ext/standard/tests/class_object/class_exists_basic_001.phpt +++ b/ext/standard/tests/class_object/class_exists_basic_001.phpt @@ -31,7 +31,7 @@ var_dump( class_exists('stdclass') ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing class_exists() : basic functionality *** Calling class_exists() on non-existent class with autoload explicitly enabled: In autoload(C) diff --git a/ext/standard/tests/class_object/class_exists_variation_003.phpt b/ext/standard/tests/class_object/class_exists_variation_003.phpt index 0745601452..72182c8cbb 100644 --- a/ext/standard/tests/class_object/class_exists_variation_003.phpt +++ b/ext/standard/tests/class_object/class_exists_variation_003.phpt @@ -13,6 +13,6 @@ var_dump(class_exists('casesensitivitytest')); echo "Done" ?> ---EXPECTF-- +--EXPECT-- bool(true) Done
\ No newline at end of file diff --git a/ext/standard/tests/class_object/forward_static_call_001.phpt b/ext/standard/tests/class_object/forward_static_call_001.phpt index 2b3a8dd059..0fac78f4ea 100644 --- a/ext/standard/tests/class_object/forward_static_call_001.phpt +++ b/ext/standard/tests/class_object/forward_static_call_001.phpt @@ -58,7 +58,7 @@ C::test3(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- A - B diff --git a/ext/standard/tests/class_object/forward_static_call_003.phpt b/ext/standard/tests/class_object/forward_static_call_003.phpt index 2ea102e5d2..ea56f8d2e7 100644 --- a/ext/standard/tests/class_object/forward_static_call_003.phpt +++ b/ext/standard/tests/class_object/forward_static_call_003.phpt @@ -39,7 +39,7 @@ C::test(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- A - B diff --git a/ext/standard/tests/class_object/get_class_methods_basic_001.phpt b/ext/standard/tests/class_object/get_class_methods_basic_001.phpt index b2b87af4ec..7d2151c9de 100644 --- a/ext/standard/tests/class_object/get_class_methods_basic_001.phpt +++ b/ext/standard/tests/class_object/get_class_methods_basic_001.phpt @@ -35,7 +35,7 @@ var_dump( get_class_methods("NonExistent") ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_class_methods() : basic functionality *** Argument is class name: array(3) { diff --git a/ext/standard/tests/class_object/get_class_methods_basic_002.phpt b/ext/standard/tests/class_object/get_class_methods_basic_002.phpt index 441bb45d6d..387cfd88fc 100644 --- a/ext/standard/tests/class_object/get_class_methods_basic_002.phpt +++ b/ext/standard/tests/class_object/get_class_methods_basic_002.phpt @@ -66,7 +66,7 @@ X::testFromX(); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- Accessing D from global scope: array(4) { [0]=> diff --git a/ext/standard/tests/class_object/get_class_methods_basic_003.phpt b/ext/standard/tests/class_object/get_class_methods_basic_003.phpt index b64f702b85..c74acccdc2 100644 --- a/ext/standard/tests/class_object/get_class_methods_basic_003.phpt +++ b/ext/standard/tests/class_object/get_class_methods_basic_003.phpt @@ -40,7 +40,7 @@ var_dump(get_class_methods("C")); C::testFromC(); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- Accessing I from global scope: array(1) { [0]=> diff --git a/ext/standard/tests/class_object/get_class_methods_variation_002.phpt b/ext/standard/tests/class_object/get_class_methods_variation_002.phpt index 60b944c69c..7dee5140a3 100644 --- a/ext/standard/tests/class_object/get_class_methods_variation_002.phpt +++ b/ext/standard/tests/class_object/get_class_methods_variation_002.phpt @@ -18,7 +18,7 @@ var_dump( get_class_methods('CasesensitivitytesT') ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_class_methods() : usage variations *** array(1) { [0]=> diff --git a/ext/standard/tests/class_object/get_class_variation_002.phpt b/ext/standard/tests/class_object/get_class_variation_002.phpt index 1ee3529818..640bbb7f88 100644 --- a/ext/standard/tests/class_object/get_class_variation_002.phpt +++ b/ext/standard/tests/class_object/get_class_variation_002.phpt @@ -13,6 +13,6 @@ var_dump(get_class(new casesensitivitytest)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- string(19) "caseSensitivityTest" Done
\ No newline at end of file diff --git a/ext/standard/tests/class_object/get_class_vars_variation2.phpt b/ext/standard/tests/class_object/get_class_vars_variation2.phpt index fad5716745..726bb53ea1 100644 --- a/ext/standard/tests/class_object/get_class_vars_variation2.phpt +++ b/ext/standard/tests/class_object/get_class_vars_variation2.phpt @@ -75,7 +75,7 @@ echo "\n-- From a child's static context --\n"; Child::testStatic(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing get_class_vars() : testing visibility -- From global context -- diff --git a/ext/standard/tests/class_object/get_declared_classes_variation1.phpt b/ext/standard/tests/class_object/get_declared_classes_variation1.phpt index 3853bb6229..60a46c37d0 100644 --- a/ext/standard/tests/class_object/get_declared_classes_variation1.phpt +++ b/ext/standard/tests/class_object/get_declared_classes_variation1.phpt @@ -25,7 +25,7 @@ var_dump(in_array('AutoLoaded', get_declared_classes())); echo "\nDONE\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_declared_classes() : testing autoloaded classes *** -- before instance is declared -- diff --git a/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt b/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt index 12c92df7fa..219dde98ac 100644 --- a/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt +++ b/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt @@ -25,7 +25,7 @@ var_dump(in_array('AutoInterface', get_declared_interfaces())); echo "\nDONE\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_declared_interfaces() : autoloading of interfaces *** -- before interface is used -- diff --git a/ext/standard/tests/class_object/get_declared_traits_variation1.phpt b/ext/standard/tests/class_object/get_declared_traits_variation1.phpt index 6ea3edfa79..4cb848d398 100644 --- a/ext/standard/tests/class_object/get_declared_traits_variation1.phpt +++ b/ext/standard/tests/class_object/get_declared_traits_variation1.phpt @@ -29,7 +29,7 @@ var_dump(in_array('AutoTrait', get_declared_traits())); echo "\nDONE\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_declared_traits() : testing autoloaded traits *** -- before instance is declared -- diff --git a/ext/standard/tests/class_object/get_object_vars_basic_001.phpt b/ext/standard/tests/class_object/get_object_vars_basic_001.phpt index 38ed74fb07..dde26e1a21 100644 --- a/ext/standard/tests/class_object/get_object_vars_basic_001.phpt +++ b/ext/standard/tests/class_object/get_object_vars_basic_001.phpt @@ -58,7 +58,7 @@ A::test($b); echo "\n---( Unrelated class: )---\n"; X::test($b); ?> ---EXPECTF-- +--EXPECT-- ---( Global scope: )--- array(1) { diff --git a/ext/standard/tests/class_object/get_object_vars_basic_002.phpt b/ext/standard/tests/class_object/get_object_vars_basic_002.phpt index 910926bc1f..8d7c45958e 100644 --- a/ext/standard/tests/class_object/get_object_vars_basic_002.phpt +++ b/ext/standard/tests/class_object/get_object_vars_basic_002.phpt @@ -37,7 +37,7 @@ echo "\n---( Superclass: )---\n"; $b->testA($b); ?> ---EXPECTF-- +--EXPECT-- ---( Declaring class: )--- B::testB diff --git a/ext/standard/tests/class_object/get_object_vars_variation_001.phpt b/ext/standard/tests/class_object/get_object_vars_variation_001.phpt index 89fbc53e93..d0bf806763 100644 --- a/ext/standard/tests/class_object/get_object_vars_variation_001.phpt +++ b/ext/standard/tests/class_object/get_object_vars_variation_001.phpt @@ -15,6 +15,6 @@ Class A { $a = new A; var_dump(get_object_vars($a)); ?> ---EXPECTF-- +--EXPECT-- array(0) { }
\ No newline at end of file diff --git a/ext/standard/tests/class_object/get_object_vars_variation_002.phpt b/ext/standard/tests/class_object/get_object_vars_variation_002.phpt index 73478de79a..ef227cd8a2 100644 --- a/ext/standard/tests/class_object/get_object_vars_variation_002.phpt +++ b/ext/standard/tests/class_object/get_object_vars_variation_002.phpt @@ -23,7 +23,7 @@ $arr['val'] = 'changed.val'; var_dump($arr, $obj, $a); ?> ---EXPECTF-- +--EXPECT-- array(0) { } array(2) { diff --git a/ext/standard/tests/class_object/get_parent_class_variation_001.phpt b/ext/standard/tests/class_object/get_parent_class_variation_001.phpt index 6f2e32805b..7ffff750b2 100644 --- a/ext/standard/tests/class_object/get_parent_class_variation_001.phpt +++ b/ext/standard/tests/class_object/get_parent_class_variation_001.phpt @@ -20,7 +20,7 @@ var_dump(get_parent_class(new CasesensitivitytestCHILD)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_parent_class() : variation *** string(19) "caseSensitivityTest" string(19) "caseSensitivityTest" diff --git a/ext/standard/tests/class_object/interface_exists_variation3.phpt b/ext/standard/tests/class_object/interface_exists_variation3.phpt index 5119945bac..f6ec16d63d 100644 --- a/ext/standard/tests/class_object/interface_exists_variation3.phpt +++ b/ext/standard/tests/class_object/interface_exists_variation3.phpt @@ -23,7 +23,7 @@ var_dump(interface_exists("AutoInterface", true)); echo "\nDONE\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing interface_exists() : autoloaded interface *** -- no autoloading -- diff --git a/ext/standard/tests/class_object/interface_exists_variation4.phpt b/ext/standard/tests/class_object/interface_exists_variation4.phpt index ca787396f7..4b61269664 100644 --- a/ext/standard/tests/class_object/interface_exists_variation4.phpt +++ b/ext/standard/tests/class_object/interface_exists_variation4.phpt @@ -19,7 +19,7 @@ var_dump(interface_exists("AutoInterface")); echo "\nDONE\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing interface_exists() : test autoload default value *** bool(true) diff --git a/ext/standard/tests/class_object/is_a.phpt b/ext/standard/tests/class_object/is_a.phpt index 99794cafb2..644df705c7 100644 --- a/ext/standard/tests/class_object/is_a.phpt +++ b/ext/standard/tests/class_object/is_a.phpt @@ -81,7 +81,7 @@ $t->test(); ?> ---EXPECTF-- +--EXPECT-- >>> With Defined class is_a( OBJECT:base, base) = yes is_a( STRING:base, base) = no diff --git a/ext/standard/tests/class_object/is_a_variation_003.phpt b/ext/standard/tests/class_object/is_a_variation_003.phpt index 16ec1a6622..5cf33ebdd2 100644 --- a/ext/standard/tests/class_object/is_a_variation_003.phpt +++ b/ext/standard/tests/class_object/is_a_variation_003.phpt @@ -17,7 +17,7 @@ var_dump(is_a(new caseSensitivityTestChild, 'caseSensitivityTEST')); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_a() : usage variations *** bool(true) Done diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt index d4aef12349..3497ecc1f8 100644 --- a/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt @@ -19,7 +19,7 @@ var_dump(is_subclass_of('caseSensitivityTestCHILD', 'caseSensitivityTEST')); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing is_subclass_of() : usage variations *** *** Testing is_a() : usage variations *** bool(true) diff --git a/ext/standard/tests/class_object/method_exists_basic_001.phpt b/ext/standard/tests/class_object/method_exists_basic_001.phpt index 2f11e4c46e..44eaefbf56 100644 --- a/ext/standard/tests/class_object/method_exists_basic_001.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_001.phpt @@ -49,7 +49,7 @@ foreach ($methods as $method) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- ---(Using string class name)--- Does C::inherit_pub exist? bool(true) diff --git a/ext/standard/tests/class_object/method_exists_basic_002.phpt b/ext/standard/tests/class_object/method_exists_basic_002.phpt index f6b62aa265..6a17786b32 100644 --- a/ext/standard/tests/class_object/method_exists_basic_002.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_002.phpt @@ -22,7 +22,7 @@ var_dump(method_exists(new stdclass, "nonexistent")); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- ---(Internal classes, using string class name)--- Does exception::getmessage exist? bool(true) Does stdclass::nonexistent exist? bool(false) diff --git a/ext/standard/tests/class_object/method_exists_basic_003.phpt b/ext/standard/tests/class_object/method_exists_basic_003.phpt index 3ac1795149..c10763267c 100644 --- a/ext/standard/tests/class_object/method_exists_basic_003.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_003.phpt @@ -16,7 +16,7 @@ var_dump(method_exists('UndefC', 'func')); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- In autoload(UndefC) bool(false) Done diff --git a/ext/standard/tests/class_object/method_exists_variation_003.phpt b/ext/standard/tests/class_object/method_exists_variation_003.phpt index debe5a35e9..f82dc01b9c 100644 --- a/ext/standard/tests/class_object/method_exists_variation_003.phpt +++ b/ext/standard/tests/class_object/method_exists_variation_003.phpt @@ -19,7 +19,7 @@ var_dump(method_exists('casesensiTivitytest', 'myMetHOD')); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing method_exists() : variation *** bool(true) bool(true) diff --git a/ext/standard/tests/class_object/property_exists_variation1.phpt b/ext/standard/tests/class_object/property_exists_variation1.phpt index 1830440621..1a9ff32659 100644 --- a/ext/standard/tests/class_object/property_exists_variation1.phpt +++ b/ext/standard/tests/class_object/property_exists_variation1.phpt @@ -22,7 +22,7 @@ var_dump(property_exists("AutoTest", "foo")); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing property_exists() : class auto loading *** testing property in autoloaded class diff --git a/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt b/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt index 6a8e55bda0..6548c32687 100644 --- a/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt +++ b/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt @@ -13,6 +13,6 @@ var_dump(trait_exists('casesensitivitytest')); echo "Done" ?> ---EXPECTF-- +--EXPECT-- bool(true) Done
\ No newline at end of file diff --git a/ext/standard/tests/class_object/trait_exists_basic_001.phpt b/ext/standard/tests/class_object/trait_exists_basic_001.phpt index 6e1d45227d..d587ec7d78 100644 --- a/ext/standard/tests/class_object/trait_exists_basic_001.phpt +++ b/ext/standard/tests/class_object/trait_exists_basic_001.phpt @@ -33,7 +33,7 @@ var_dump( trait_exists('MyTrait') ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing trait_exists() : basic functionality *** Calling trait_exists() on non-existent trait with autoload explicitly enabled: In autoload(C) diff --git a/ext/standard/tests/crypt/bcrypt_invalid_algorithm.phpt b/ext/standard/tests/crypt/bcrypt_invalid_algorithm.phpt index 58504e4604..b8db266b3d 100644 --- a/ext/standard/tests/crypt/bcrypt_invalid_algorithm.phpt +++ b/ext/standard/tests/crypt/bcrypt_invalid_algorithm.phpt @@ -6,7 +6,7 @@ var_dump(crypt("test", "$23$04$1234567890123456789012345")); var_dump(crypt("test", "$20$04$1234567890123456789012345")); var_dump(crypt("test", "$2g$04$1234567890123456789012345")); ?> ---EXPECTF-- +--EXPECT-- string(2) "*0" string(2) "*0" string(2) "*0" diff --git a/ext/standard/tests/crypt/bcrypt_invalid_cost.phpt b/ext/standard/tests/crypt/bcrypt_invalid_cost.phpt index f5ae7c8291..03c36b175b 100644 --- a/ext/standard/tests/crypt/bcrypt_invalid_cost.phpt +++ b/ext/standard/tests/crypt/bcrypt_invalid_cost.phpt @@ -10,7 +10,7 @@ var_dump(crypt("test", "$2a$03$1234567891234567891234567")); var_dump(crypt("test", "$2a$32$1234567891234567891234567")); var_dump(crypt("test", "$2a$40$1234567891234567891234567")); ?> ---EXPECTF-- +--EXPECT-- string(2) "*0" string(2) "*0" string(2) "*0" diff --git a/ext/standard/tests/dir/dir_bug73971.phpt b/ext/standard/tests/dir/dir_bug73971.phpt index 86cb29ac58..3649b74329 100644 --- a/ext/standard/tests/dir/dir_bug73971.phpt +++ b/ext/standard/tests/dir/dir_bug73971.phpt @@ -39,7 +39,7 @@ $filename = $base . DIRECTORY_SEPARATOR . str_repeat('テスト', 48); rmdir($filename); rmdir($base); ?> ---EXPECTF-- +--EXPECT-- string(432) "テストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテスト" test dir() diff --git a/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt index bde6d6f1c8..513a22b0cc 100644 --- a/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt @@ -45,7 +45,7 @@ foreach($entries as $entry) { $path = dirname(__FILE__) . '/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™readdir_variation2'; rmdir($path); ?> ---EXPECTF-- +--EXPECT-- *** Testing readdir() : usage variations *** -- Pass an empty directory to readdir() -- diff --git a/ext/standard/tests/dir/readdir_variation2.phpt b/ext/standard/tests/dir/readdir_variation2.phpt index c689ed90ee..ac6d37aa15 100644 --- a/ext/standard/tests/dir/readdir_variation2.phpt +++ b/ext/standard/tests/dir/readdir_variation2.phpt @@ -39,7 +39,7 @@ foreach($entries as $entry) { $path = dirname(__FILE__) . '/readdir_variation2'; rmdir($path); ?> ---EXPECTF-- +--EXPECT-- *** Testing readdir() : usage variations *** -- Pass an empty directory to readdir() -- diff --git a/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt index a00e83769f..2d1e6a6fba 100644 --- a/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt @@ -57,7 +57,7 @@ $path_sub = $path_top . '/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™sub_folder'; rmdir($path_sub); rmdir($path_top); ?> ---EXPECTF-- +--EXPECT-- *** Testing readdir() : usage variations *** array(5) { [0]=> diff --git a/ext/standard/tests/dir/readdir_variation3.phpt b/ext/standard/tests/dir/readdir_variation3.phpt index 4e73e741ec..8925b20ab4 100644 --- a/ext/standard/tests/dir/readdir_variation3.phpt +++ b/ext/standard/tests/dir/readdir_variation3.phpt @@ -51,7 +51,7 @@ $path_sub = $path_top . '/sub_folder'; rmdir($path_sub); rmdir($path_top); ?> ---EXPECTF-- +--EXPECT-- *** Testing readdir() : usage variations *** array(5) { [0]=> diff --git a/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt index db5de28302..f439920ada 100644 --- a/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt @@ -67,7 +67,7 @@ closedir(); $dir_path = dirname(__FILE__) . "/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™readdir_variation6"; rmdir($dir_path); ?> ---EXPECTF-- +--EXPECT-- *** Testing readdir() : usage variations *** -- Reading Directory Contents with Previous Handle -- diff --git a/ext/standard/tests/dir/readdir_variation6.phpt b/ext/standard/tests/dir/readdir_variation6.phpt index eec673e73c..0da7fbd8be 100644 --- a/ext/standard/tests/dir/readdir_variation6.phpt +++ b/ext/standard/tests/dir/readdir_variation6.phpt @@ -61,7 +61,7 @@ closedir(); $dir_path = dirname(__FILE__) . "/readdir_variation6"; rmdir($dir_path); ?> ---EXPECTF-- +--EXPECT-- *** Testing readdir() : usage variations *** -- Reading Directory Contents with Previous Handle -- diff --git a/ext/standard/tests/dir/scandir_basic-win32-mb.phpt b/ext/standard/tests/dir/scandir_basic-win32-mb.phpt index a089a0afa3..f1cc3e11c8 100644 --- a/ext/standard/tests/dir/scandir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_basic-win32-mb.phpt @@ -43,7 +43,7 @@ delete_files($directory, 3, "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™file"); $directory = dirname(__FILE__) . '/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™scandir_basic'; rmdir($directory); ?> ---EXPECTF-- +--EXPECT-- *** Testing scandir() : basic functionality *** -- scandir() with mandatory arguments -- diff --git a/ext/standard/tests/dir/scandir_basic.phpt b/ext/standard/tests/dir/scandir_basic.phpt index 7a044da529..668f659851 100644 --- a/ext/standard/tests/dir/scandir_basic.phpt +++ b/ext/standard/tests/dir/scandir_basic.phpt @@ -37,7 +37,7 @@ delete_files($directory, 3); $directory = dirname(__FILE__) . '/scandir_basic'; rmdir($directory); ?> ---EXPECTF-- +--EXPECT-- *** Testing scandir() : basic functionality *** -- scandir() with mandatory arguments -- diff --git a/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt index b031a91505..e30994261f 100644 --- a/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt @@ -52,7 +52,7 @@ delete_files($dir, 2, "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™file"); $dir = dirname(__FILE__) . '/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™scandir_variation10'; rmdir($dir); ?> ---EXPECTF-- +--EXPECT-- SCANDIR_SORT_ASCENDING: 0 SCANDIR_SORT_DESCENDING: 1 SCANDIR_SORT_NONE: 2 diff --git a/ext/standard/tests/dir/scandir_variation10.phpt b/ext/standard/tests/dir/scandir_variation10.phpt index 412836b2ba..958079dcb9 100644 --- a/ext/standard/tests/dir/scandir_variation10.phpt +++ b/ext/standard/tests/dir/scandir_variation10.phpt @@ -46,7 +46,7 @@ delete_files($dir, 2); $dir = dirname(__FILE__) . '/scandir_variation10'; rmdir($dir); ?> ---EXPECTF-- +--EXPECT-- SCANDIR_SORT_ASCENDING: 0 SCANDIR_SORT_DESCENDING: 1 SCANDIR_SORT_NONE: 2 diff --git a/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt index 4c85dd75cf..73064d779f 100644 --- a/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt @@ -71,7 +71,7 @@ $dir_path = dirname(__FILE__); rmdir("$dir_path/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™level_one/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™level_two"); rmdir("$dir_path/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™level_one"); ?> ---EXPECTF-- +--EXPECT-- *** Testing scandir() : usage variations *** -- $path = './ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™level_one': -- diff --git a/ext/standard/tests/dir/scandir_variation4.phpt b/ext/standard/tests/dir/scandir_variation4.phpt index f756cf1ee6..09dedfffd2 100644 --- a/ext/standard/tests/dir/scandir_variation4.phpt +++ b/ext/standard/tests/dir/scandir_variation4.phpt @@ -65,7 +65,7 @@ $dir_path = dirname(__FILE__); rmdir("$dir_path/level_one/level_two"); rmdir("$dir_path/level_one"); ?> ---EXPECTF-- +--EXPECT-- *** Testing scandir() : usage variations *** -- $path = './level_one': -- diff --git a/ext/standard/tests/dir/scandir_variation7.phpt b/ext/standard/tests/dir/scandir_variation7.phpt index c7f77651d3..6ef4b67ce9 100644 --- a/ext/standard/tests/dir/scandir_variation7.phpt +++ b/ext/standard/tests/dir/scandir_variation7.phpt @@ -74,7 +74,7 @@ foreach ($permission_values as $perm) { $dir_path = dirname(__FILE__) . "/scandir_variation7"; rmdir($dir_path); ?> ---EXPECTF-- +--EXPECT-- *** Testing scandir() : usage variations *** -- Iteration 1 -- diff --git a/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt index 686eca43a6..031b4389af 100644 --- a/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt @@ -43,7 +43,7 @@ delete_files($dir, 2, "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™file"); $dir = dirname(__FILE__) . '/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™scandir_variation9'; rmdir($dir); ?> ---EXPECTF-- +--EXPECT-- *** Testing scandir() : usage variations *** array(4) { [0]=> diff --git a/ext/standard/tests/dir/scandir_variation9.phpt b/ext/standard/tests/dir/scandir_variation9.phpt index 2b1904c98f..0435a8c3f3 100644 --- a/ext/standard/tests/dir/scandir_variation9.phpt +++ b/ext/standard/tests/dir/scandir_variation9.phpt @@ -37,7 +37,7 @@ delete_files($dir, 2); $dir = dirname(__FILE__) . '/scandir_variation9'; rmdir($dir); ?> ---EXPECTF-- +--EXPECT-- *** Testing scandir() : usage variations *** array(4) { [0]=> diff --git a/ext/standard/tests/file/006_basic.phpt b/ext/standard/tests/file/006_basic.phpt index 213442c15f..73a70e358f 100644 --- a/ext/standard/tests/file/006_basic.phpt +++ b/ext/standard/tests/file/006_basic.phpt @@ -49,7 +49,7 @@ echo "Done\n"; unlink(dirname(__FILE__)."/perm.tmp"); rmdir(dirname(__FILE__)."/perm"); ?> ---EXPECTF-- +--EXPECT-- *** Testing fileperms(), chmod() with files and dirs *** bool(true) 100755 diff --git a/ext/standard/tests/file/006_variation1.phpt b/ext/standard/tests/file/006_variation1.phpt index b752d21fea..7ede7b8bbc 100644 --- a/ext/standard/tests/file/006_variation1.phpt +++ b/ext/standard/tests/file/006_variation1.phpt @@ -61,7 +61,7 @@ chmod(dirname(__FILE__)."/006_variation1", 0777); unlink(dirname(__FILE__)."/006_variation1.tmp"); rmdir(dirname(__FILE__)."/006_variation1"); ?> ---EXPECTF-- +--EXPECT-- *** Testing fileperms() & chmod() : usage variations *** -- Testing all permission from octal 0000 to octal 0777 on file and dir -- -- Iteration 1 -- diff --git a/ext/standard/tests/file/basename_bug66395-win32.phpt b/ext/standard/tests/file/basename_bug66395-win32.phpt index a9580dc09e..b4ad18dd28 100644 --- a/ext/standard/tests/file/basename_bug66395-win32.phpt +++ b/ext/standard/tests/file/basename_bug66395-win32.phpt @@ -10,7 +10,7 @@ echo basename("y:file.txt", ".txt") . "\n"; echo basename("notdriveletter:file.txt") . "\n"; ?> ==DONE== ---EXPECTF-- +--EXPECT-- file.txt file.txt file diff --git a/ext/standard/tests/file/basename_bug66395_variation2-win32.phpt b/ext/standard/tests/file/basename_bug66395_variation2-win32.phpt index 0ebe996cd5..4dc05dbeb1 100644 --- a/ext/standard/tests/file/basename_bug66395_variation2-win32.phpt +++ b/ext/standard/tests/file/basename_bug66395_variation2-win32.phpt @@ -20,7 +20,7 @@ echo basename("a:\\b:\\c:d:hello\\world:c:\$DATA") . "\n"; echo basename("a:\\b:\\c:d:hello\\d:world:c:\$DATA") . "\n"; ?> ==DONE== ---EXPECTF-- +--EXPECT-- y y notdriveletter:file.txt diff --git a/ext/standard/tests/file/bug35781.phpt b/ext/standard/tests/file/bug35781.phpt index 5dc684a65d..cc3ae14e4c 100644 --- a/ext/standard/tests/file/bug35781.phpt +++ b/ext/standard/tests/file/bug35781.phpt @@ -18,7 +18,7 @@ var_dump(file_get_contents($filename)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(15) "Guvf vf n grfg " Done diff --git a/ext/standard/tests/file/bug38450.phpt b/ext/standard/tests/file/bug38450.phpt index 2b59f50750..1de5d7f89b 100644 --- a/ext/standard/tests/file/bug38450.phpt +++ b/ext/standard/tests/file/bug38450.phpt @@ -101,7 +101,7 @@ var_dump($myvar); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(12) "constructor!" line1 line2 diff --git a/ext/standard/tests/file/bug38450_1.phpt b/ext/standard/tests/file/bug38450_1.phpt index 07ca7166f3..e4f1af68f8 100644 --- a/ext/standard/tests/file/bug38450_1.phpt +++ b/ext/standard/tests/file/bug38450_1.phpt @@ -101,7 +101,7 @@ var_dump($myvar); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(12) "constructor!" line1 line2 diff --git a/ext/standard/tests/file/bug39551.phpt b/ext/standard/tests/file/bug39551.phpt index c047a306ec..e03a2bf931 100644 --- a/ext/standard/tests/file/bug39551.phpt +++ b/ext/standard/tests/file/bug39551.phpt @@ -20,5 +20,5 @@ stream_get_contents($s); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/ext/standard/tests/file/bug39673.phpt b/ext/standard/tests/file/bug39673.phpt index 00c29b28da..820664184f 100644 --- a/ext/standard/tests/file/bug39673.phpt +++ b/ext/standard/tests/file/bug39673.phpt @@ -28,7 +28,7 @@ foreach ($offsets as $offset) { @unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(1) int(13824) int(0) diff --git a/ext/standard/tests/file/bug41815.phpt b/ext/standard/tests/file/bug41815.phpt index f77468d96d..5dbafac225 100644 --- a/ext/standard/tests/file/bug41815.phpt +++ b/ext/standard/tests/file/bug41815.phpt @@ -22,6 +22,6 @@ fclose($reader); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- OK Done diff --git a/ext/standard/tests/file/bug44034.phpt b/ext/standard/tests/file/bug44034.phpt index 863bf57e05..887b9eb08e 100644 --- a/ext/standard/tests/file/bug44034.phpt +++ b/ext/standard/tests/file/bug44034.phpt @@ -15,7 +15,7 @@ foreach($urls as $url) { var_dump(file($url, FILE_IGNORE_NEW_LINES)); } ?> ---EXPECTF-- +--EXPECT-- data://text/plain,foo\r\nbar\r\n array(2) { [0]=> diff --git a/ext/standard/tests/file/bug46347.phpt b/ext/standard/tests/file/bug46347.phpt index e942c71ba3..903a6e35cc 100644 --- a/ext/standard/tests/file/bug46347.phpt +++ b/ext/standard/tests/file/bug46347.phpt @@ -17,7 +17,7 @@ var_dump(parse_ini_file($file)); <?php unlink(__DIR__.'/parse.ini'); ?> ---EXPECTF-- +--EXPECT-- array(1) { ["part1.*.part2"]=> string(1) "1" diff --git a/ext/standard/tests/file/bug49047.phpt b/ext/standard/tests/file/bug49047.phpt index d0805a16fd..6fc8a11e23 100644 --- a/ext/standard/tests/file/bug49047.phpt +++ b/ext/standard/tests/file/bug49047.phpt @@ -13,5 +13,5 @@ if ($t2 != $t) echo "failed (got $t2, expecting $t)\n"; rmdir($testdir); echo "Ok."; ?> ---EXPECTF-- +--EXPECT-- Ok. diff --git a/ext/standard/tests/file/bug51094.phpt b/ext/standard/tests/file/bug51094.phpt index f35dfb6d54..aa6ed93f50 100644 --- a/ext/standard/tests/file/bug51094.phpt +++ b/ext/standard/tests/file/bug51094.phpt @@ -13,7 +13,7 @@ $ini = parse_ini_string('ini=ini"raw', null, INI_SCANNER_RAW); var_dump($ini['ini']); $ini = parse_ini_string("ini=\r\niniraw", null, INI_SCANNER_RAW); var_dump($ini['ini']); ---EXPECTF-- +--EXPECT-- string(7) "ini;raw" string(4) ""ini" string(3) "ini" diff --git a/ext/standard/tests/file/bug63512.phpt b/ext/standard/tests/file/bug63512.phpt index 049db26588..34c55d4ceb 100644 --- a/ext/standard/tests/file/bug63512.phpt +++ b/ext/standard/tests/file/bug63512.phpt @@ -13,7 +13,7 @@ $array = parse_ini_string(' d = INSTALL_ROOT "INSTALL_ROOT"', false, INI_SCANNER_RAW); var_dump($array); ---EXPECTF-- +--EXPECT-- array(7) { ["int"]=> string(3) "123" diff --git a/ext/standard/tests/file/bug65272.phpt b/ext/standard/tests/file/bug65272.phpt index 3a772a8037..c6c6aa136e 100644 --- a/ext/standard/tests/file/bug65272.phpt +++ b/ext/standard/tests/file/bug65272.phpt @@ -23,7 +23,7 @@ echo "Done\n"; $file = dirname(__FILE__)."/flock_bug65272.dat"; unlink($file); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(false) int(1) diff --git a/ext/standard/tests/file/chmod_variation2-win32-mb.phpt b/ext/standard/tests/file/chmod_variation2-win32-mb.phpt index abfb3e6f4c..f990b5b56b 100644 --- a/ext/standard/tests/file/chmod_variation2-win32-mb.phpt +++ b/ext/standard/tests/file/chmod_variation2-win32-mb.phpt @@ -52,7 +52,7 @@ rmdir($test_dirname); unlink($filepath); ?> ---EXPECTF-- +--EXPECT-- chmod() on a path containing .. and . bool(true) bool(true) diff --git a/ext/standard/tests/file/chmod_variation2-win32.phpt b/ext/standard/tests/file/chmod_variation2-win32.phpt index bc379ffcf7..9689852f51 100644 --- a/ext/standard/tests/file/chmod_variation2-win32.phpt +++ b/ext/standard/tests/file/chmod_variation2-win32.phpt @@ -52,7 +52,7 @@ rmdir($test_dirname); unlink($filepath); ?> ---EXPECTF-- +--EXPECT-- chmod() on a path containing .. and . bool(true) bool(true) diff --git a/ext/standard/tests/file/chroot_001.phpt b/ext/standard/tests/file/chroot_001.phpt index b42b17b892..7fda0b3654 100644 --- a/ext/standard/tests/file/chroot_001.phpt +++ b/ext/standard/tests/file/chroot_001.phpt @@ -23,7 +23,7 @@ var_dump(realpath(".")); <?php rmdir("chroot_001_x"); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(false) diff --git a/ext/standard/tests/file/copy_variation10.phpt b/ext/standard/tests/file/copy_variation10.phpt index c5cbc84254..b4aa19d1c2 100644 --- a/ext/standard/tests/file/copy_variation10.phpt +++ b/ext/standard/tests/file/copy_variation10.phpt @@ -29,7 +29,7 @@ echo "*** Done ***\n"; unlink(dirname(__FILE__)."/copy_variation10.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Test copy(): Trying to create a copy of file with the same source name *** bool(false) bool(true) diff --git a/ext/standard/tests/file/copy_variation18.phpt b/ext/standard/tests/file/copy_variation18.phpt index 53467af8a3..564b34bf0c 100644 --- a/ext/standard/tests/file/copy_variation18.phpt +++ b/ext/standard/tests/file/copy_variation18.phpt @@ -49,7 +49,7 @@ unlink(dirname(__FILE__)."/copy_copy_variation18.tmp"); unlink(dirname(__FILE__)."/copy_variation18.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Test copy() function: stat of file before and after copy *** Copy operation => bool(true) Comparing the stats of file before and after copy operation => bool(true) diff --git a/ext/standard/tests/file/copy_variation3.phpt b/ext/standard/tests/file/copy_variation3.phpt index 56f797bc95..181da9a5f9 100644 --- a/ext/standard/tests/file/copy_variation3.phpt +++ b/ext/standard/tests/file/copy_variation3.phpt @@ -75,7 +75,7 @@ echo "*** Done ***\n"; unlink(dirname(__FILE__)."/copy_variation3.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Test copy() function: destination file names containing whitespaces *** Size of the source file before copy operation => int(1500) diff --git a/ext/standard/tests/file/copy_variation8.phpt b/ext/standard/tests/file/copy_variation8.phpt index 63f57f3a25..805fa9dd13 100644 --- a/ext/standard/tests/file/copy_variation8.phpt +++ b/ext/standard/tests/file/copy_variation8.phpt @@ -75,7 +75,7 @@ rmdir($base_dir); echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing copy() function: copying links across different directories *** -- Iteration 1 -- diff --git a/ext/standard/tests/file/dirname_basic-win32.phpt b/ext/standard/tests/file/dirname_basic-win32.phpt index 61a6e33f5a..f3b3902b0d 100644 --- a/ext/standard/tests/file/dirname_basic-win32.phpt +++ b/ext/standard/tests/file/dirname_basic-win32.phpt @@ -58,7 +58,7 @@ foreach ($paths as $path) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing dirname() : basic functionality *** string(0) "" string(1) "." diff --git a/ext/standard/tests/file/dirname_basic.phpt b/ext/standard/tests/file/dirname_basic.phpt index 8f1944e2c7..ba131d1662 100644 --- a/ext/standard/tests/file/dirname_basic.phpt +++ b/ext/standard/tests/file/dirname_basic.phpt @@ -58,7 +58,7 @@ foreach ($paths as $path) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing dirname() : basic functionality *** string(0) "" string(1) "." diff --git a/ext/standard/tests/file/fflush_basic.phpt b/ext/standard/tests/file/fflush_basic.phpt index f375c4f079..962c774637 100644 --- a/ext/standard/tests/file/fflush_basic.phpt +++ b/ext/standard/tests/file/fflush_basic.phpt @@ -44,7 +44,7 @@ $filename = "$file_path/fflush_basic.tmp"; unlink($filename); ?> ---EXPECTF-- +--EXPECT-- *** Testing fflush(): writing to a file and reading the contents *** int(63) bool(true) diff --git a/ext/standard/tests/file/fflush_variation1-win32-mb.phpt b/ext/standard/tests/file/fflush_variation1-win32-mb.phpt index 80b8dedb65..12c34cb2f5 100644 --- a/ext/standard/tests/file/fflush_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/fflush_variation1-win32-mb.phpt @@ -63,7 +63,7 @@ foreach( $file_types as $type ) { echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fflush(): with various types of files *** -- Iteration 1 with file containing empty Data-- -- File opened in w mode -- diff --git a/ext/standard/tests/file/fflush_variation1-win32.phpt b/ext/standard/tests/file/fflush_variation1-win32.phpt index 0b6b096a34..109e531b95 100644 --- a/ext/standard/tests/file/fflush_variation1-win32.phpt +++ b/ext/standard/tests/file/fflush_variation1-win32.phpt @@ -63,7 +63,7 @@ foreach( $file_types as $type ) { echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fflush(): with various types of files *** -- Iteration 1 with file containing empty Data-- -- File opened in w mode -- diff --git a/ext/standard/tests/file/fflush_variation1.phpt b/ext/standard/tests/file/fflush_variation1.phpt index 2ecf7ea919..4b77195a0e 100644 --- a/ext/standard/tests/file/fflush_variation1.phpt +++ b/ext/standard/tests/file/fflush_variation1.phpt @@ -64,7 +64,7 @@ foreach( $file_types as $type ) { echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fflush(): with various types of files *** -- Iteration 1 with file containing empty Data-- -- File opened in w mode -- diff --git a/ext/standard/tests/file/fflush_variation2.phpt b/ext/standard/tests/file/fflush_variation2.phpt index 651c716439..9dfa17c43c 100644 --- a/ext/standard/tests/file/fflush_variation2.phpt +++ b/ext/standard/tests/file/fflush_variation2.phpt @@ -65,7 +65,7 @@ foreach( $file_types as $type ) { echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fflush(): with soft links to files opened in diff modes *** -- Iteration 1 with file containing empty data -- -- link opened in w mode -- diff --git a/ext/standard/tests/file/fflush_variation3.phpt b/ext/standard/tests/file/fflush_variation3.phpt index 6dfd49bc40..0f27413930 100644 --- a/ext/standard/tests/file/fflush_variation3.phpt +++ b/ext/standard/tests/file/fflush_variation3.phpt @@ -65,7 +65,7 @@ foreach( $file_types as $type ) { echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fflush(): with hard links to files opened in diff modes *** -- Iteration 1 with file containing empty data -- bool(true) diff --git a/ext/standard/tests/file/fflush_variation4.phpt b/ext/standard/tests/file/fflush_variation4.phpt index f98616c3d8..ce6536ae2f 100644 --- a/ext/standard/tests/file/fflush_variation4.phpt +++ b/ext/standard/tests/file/fflush_variation4.phpt @@ -40,7 +40,7 @@ foreach( $file_modes as $mode ) { echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fflush(): with file handles of files opened in various read modes *** -- Iteration 1 with file opened in r mode -- bool(true) diff --git a/ext/standard/tests/file/fgetc_variation1.phpt b/ext/standard/tests/file/fgetc_variation1.phpt index 03258cac5d..c86241a976 100644 --- a/ext/standard/tests/file/fgetc_variation1.phpt +++ b/ext/standard/tests/file/fgetc_variation1.phpt @@ -46,7 +46,7 @@ echo "Done\n"; <?php unlink( dirname(__FILE__)."/fgetc_variation1.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetc() : usage variations *** -- Testing fgetc() with file whose file pointer is pointing to EOF -- -- File opened in mode : r -- diff --git a/ext/standard/tests/file/fgetc_variation3.phpt b/ext/standard/tests/file/fgetc_variation3.phpt index 64efaa6cfd..fcea7f0d86 100644 --- a/ext/standard/tests/file/fgetc_variation3.phpt +++ b/ext/standard/tests/file/fgetc_variation3.phpt @@ -49,7 +49,7 @@ foreach ($file_modes as $file_mode ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetc() with file opened in write only mode *** -- File opened in mode : w -- bool(true) diff --git a/ext/standard/tests/file/fgetc_variation4.phpt b/ext/standard/tests/file/fgetc_variation4.phpt index cb6f0cdce5..7c4ea4fa0f 100644 --- a/ext/standard/tests/file/fgetc_variation4.phpt +++ b/ext/standard/tests/file/fgetc_variation4.phpt @@ -50,7 +50,7 @@ foreach ($file_modes as $file_mode ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetc() : usage variations *** -- Testing fgetc() with files opened with different read modes -- -- File opened in mode : a+ -- diff --git a/ext/standard/tests/file/fgets_basic.phpt b/ext/standard/tests/file/fgets_basic.phpt index 9865f1fc9a..60a57a8dae 100644 --- a/ext/standard/tests/file/fgets_basic.phpt +++ b/ext/standard/tests/file/fgets_basic.phpt @@ -49,7 +49,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : basic functionality *** -- Testing fgets() with file opened using mode r -- diff --git a/ext/standard/tests/file/fgets_variation1.phpt b/ext/standard/tests/file/fgets_variation1.phpt index 68a20e8992..a51ca6c81c 100644 --- a/ext/standard/tests/file/fgets_variation1.phpt +++ b/ext/standard/tests/file/fgets_variation1.phpt @@ -48,7 +48,7 @@ foreach ($file_modes as $file_mode ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() with file opened in write only mode *** -- File opened in mode : w -- bool(true) diff --git a/ext/standard/tests/file/fgets_variation3.phpt b/ext/standard/tests/file/fgets_variation3.phpt index b39ba0c6af..09b20fcb23 100644 --- a/ext/standard/tests/file/fgets_variation3.phpt +++ b/ext/standard/tests/file/fgets_variation3.phpt @@ -63,7 +63,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : usage variations *** -- Testing fgets() with file opened using mode w+ -- diff --git a/ext/standard/tests/file/fgets_variation4-win32-mb.phpt b/ext/standard/tests/file/fgets_variation4-win32-mb.phpt index b5786df58c..40223d3cdf 100644 --- a/ext/standard/tests/file/fgets_variation4-win32-mb.phpt +++ b/ext/standard/tests/file/fgets_variation4-win32-mb.phpt @@ -65,7 +65,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : usage variations *** -- Testing fgets() with file opened using mode w+ -- diff --git a/ext/standard/tests/file/fgets_variation4-win32.phpt b/ext/standard/tests/file/fgets_variation4-win32.phpt index 6d2bbf6caf..c95ca287bd 100644 --- a/ext/standard/tests/file/fgets_variation4-win32.phpt +++ b/ext/standard/tests/file/fgets_variation4-win32.phpt @@ -65,7 +65,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : usage variations *** -- Testing fgets() with file opened using mode w+ -- diff --git a/ext/standard/tests/file/fgets_variation4.phpt b/ext/standard/tests/file/fgets_variation4.phpt index 4ffa3f1975..1843c2e8b5 100644 --- a/ext/standard/tests/file/fgets_variation4.phpt +++ b/ext/standard/tests/file/fgets_variation4.phpt @@ -65,7 +65,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : usage variations *** -- Testing fgets() with file opened using mode w+ -- diff --git a/ext/standard/tests/file/fgets_variation5.phpt b/ext/standard/tests/file/fgets_variation5.phpt index 4a1ed9f039..1907f541e2 100644 --- a/ext/standard/tests/file/fgets_variation5.phpt +++ b/ext/standard/tests/file/fgets_variation5.phpt @@ -54,7 +54,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : usage variations *** -- Testing fgets() with file opened using mode w+ -- diff --git a/ext/standard/tests/file/fgets_variation6-win32.phpt b/ext/standard/tests/file/fgets_variation6-win32.phpt index 0334050aaa..fa01154bcf 100644 --- a/ext/standard/tests/file/fgets_variation6-win32.phpt +++ b/ext/standard/tests/file/fgets_variation6-win32.phpt @@ -61,7 +61,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : usage variations *** -- Testing fgets() with file opened using mode w+ -- diff --git a/ext/standard/tests/file/fgets_variation6.phpt b/ext/standard/tests/file/fgets_variation6.phpt index 69215d9020..52da7094dd 100644 --- a/ext/standard/tests/file/fgets_variation6.phpt +++ b/ext/standard/tests/file/fgets_variation6.phpt @@ -61,7 +61,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : usage variations *** -- Testing fgets() with file opened using mode w+ -- diff --git a/ext/standard/tests/file/fgetss1.phpt b/ext/standard/tests/file/fgetss1.phpt index 58dd00c11a..66985453df 100644 --- a/ext/standard/tests/file/fgetss1.phpt +++ b/ext/standard/tests/file/fgetss1.phpt @@ -36,7 +36,7 @@ echo "Done\n"; $filename = dirname(__FILE__)."/fgetss1.html"; unlink($filename); ?> ---EXPECTF-- +--EXPECT-- string(21) "askasdfasdf<b>aaaaaa " string(6) "dddddd" diff --git a/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt b/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt index 7edf7bcbd1..783e6c3edd 100644 --- a/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt +++ b/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt @@ -76,7 +76,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : basic operations *** -- Testing fgetss() with file opened using w+ mode -- diff --git a/ext/standard/tests/file/fgetss_basic2-win32.phpt b/ext/standard/tests/file/fgetss_basic2-win32.phpt index ca6f40cb94..1fac3afb15 100644 --- a/ext/standard/tests/file/fgetss_basic2-win32.phpt +++ b/ext/standard/tests/file/fgetss_basic2-win32.phpt @@ -76,7 +76,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : basic operations *** -- Testing fgetss() with file opened using w+ mode -- diff --git a/ext/standard/tests/file/fgetss_basic2.phpt b/ext/standard/tests/file/fgetss_basic2.phpt index 86be24810e..8ce08bbd81 100644 --- a/ext/standard/tests/file/fgetss_basic2.phpt +++ b/ext/standard/tests/file/fgetss_basic2.phpt @@ -74,7 +74,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : basic operations *** -- Testing fgetss() with file opened using w+ mode -- diff --git a/ext/standard/tests/file/fgetss_variation1.phpt b/ext/standard/tests/file/fgetss_variation1.phpt index 5a0556a198..51c15fff96 100644 --- a/ext/standard/tests/file/fgetss_variation1.phpt +++ b/ext/standard/tests/file/fgetss_variation1.phpt @@ -73,7 +73,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : usage variations *** -- Testing fgetss() with file opened using w mode -- diff --git a/ext/standard/tests/file/fgetss_variation2.phpt b/ext/standard/tests/file/fgetss_variation2.phpt index a436e8c4b3..aef653a406 100644 --- a/ext/standard/tests/file/fgetss_variation2.phpt +++ b/ext/standard/tests/file/fgetss_variation2.phpt @@ -69,7 +69,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : usage variations *** -- Testing fgetss() with file opened using r mode -- diff --git a/ext/standard/tests/file/fgetss_variation3.phpt b/ext/standard/tests/file/fgetss_variation3.phpt index e6f63c310f..9a771aa442 100644 --- a/ext/standard/tests/file/fgetss_variation3.phpt +++ b/ext/standard/tests/file/fgetss_variation3.phpt @@ -76,7 +76,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : usage variations *** -- Testing fgetss() with file opened using w+ mode -- diff --git a/ext/standard/tests/file/fgetss_variation4.phpt b/ext/standard/tests/file/fgetss_variation4.phpt index b93bc6afd0..dd497a4d0c 100644 --- a/ext/standard/tests/file/fgetss_variation4.phpt +++ b/ext/standard/tests/file/fgetss_variation4.phpt @@ -73,7 +73,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : usage variations *** -- Testing fgetss() with file opened using r mode -- diff --git a/ext/standard/tests/file/fgetss_variation5.phpt b/ext/standard/tests/file/fgetss_variation5.phpt index c499d598b2..76a5f16458 100644 --- a/ext/standard/tests/file/fgetss_variation5.phpt +++ b/ext/standard/tests/file/fgetss_variation5.phpt @@ -77,7 +77,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : usage variations *** -- Testing fgetss() with file opened using w+ mode -- diff --git a/ext/standard/tests/file/file_basic.phpt b/ext/standard/tests/file/file_basic.phpt index 97a592fd0c..d271c216f6 100644 --- a/ext/standard/tests/file/file_basic.phpt +++ b/ext/standard/tests/file/file_basic.phpt @@ -28,7 +28,7 @@ foreach( $filetypes as $type ) { echo "\n--- Done ---"; ?> ---EXPECTF-- +--EXPECT-- *** Testing file() with basic types of files *** Array ( diff --git a/ext/standard/tests/file/file_exists_variation1.phpt b/ext/standard/tests/file/file_exists_variation1.phpt index 35c86a2808..2e8fd58d8e 100644 --- a/ext/standard/tests/file/file_exists_variation1.phpt +++ b/ext/standard/tests/file/file_exists_variation1.phpt @@ -20,7 +20,7 @@ var_dump(file_exists('|')); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing file_exists() : usage variations *** bool(false) bool(false) diff --git a/ext/standard/tests/file/file_get_contents_basic.phpt b/ext/standard/tests/file/file_get_contents_basic.phpt index 413909b450..267f86e3f6 100644 --- a/ext/standard/tests/file/file_get_contents_basic.phpt +++ b/ext/standard/tests/file/file_get_contents_basic.phpt @@ -30,7 +30,7 @@ delete_files($file_path, 1); echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing the basic functionality of the file_get_contents() function *** -- Testing with simple valid data file -- string(100) "text text text text text text text text text text text text text text text text text text text text " diff --git a/ext/standard/tests/file/file_get_contents_file_put_contents_basic.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_basic.phpt index edfad0d945..3d5a688b9b 100644 --- a/ext/standard/tests/file/file_get_contents_file_put_contents_basic.phpt +++ b/ext/standard/tests/file/file_get_contents_file_put_contents_basic.phpt @@ -39,7 +39,7 @@ $file_path = dirname(__FILE__); unlink($file_path."/file_put_contents.tmp"); unlink($file_path."/file_put_contents1.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing the basic functionality of file_put_contents() and file_get_contents() functions *** -- Testing with simple valid data file -- string(100) "text text text text text text text text text text text text text text text text text text text text " diff --git a/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt index 1bac1c9864..694f930352 100644 --- a/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt +++ b/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt @@ -41,7 +41,7 @@ echo "--- Done ---"; $file_path = dirname(__FILE__); unlink($file_path."/file_put_contents_variation1.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing with variations in the arguments values *** string(100) "text text text text text text text text text text text text text text text text text text text text " string(100) "text text text text text text text text text text text text text text text text text text text text " diff --git a/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt index fc2281dca0..63fe4ea365 100644 --- a/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt +++ b/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt @@ -46,7 +46,7 @@ $file_path = dirname(__FILE__); unlink($file_path."/file_get_contents_variation2/file_get_contents_variation2.tmp"); rmdir($file_path."/file_get_contents_variation2"); ?> ---EXPECTF-- +--EXPECT-- *** Testing with variation in use_include_path argument *** string(240) "text text text text text text text text text text text text text text text text text text text text 22222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222221 Data1 in an array2 Data2 in an array" string(240) "text text text text text text text text text text text text text text text text text text text text 22222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222221 Data1 in an array2 Data2 in an array" diff --git a/ext/standard/tests/file/file_get_contents_variation9.phpt b/ext/standard/tests/file/file_get_contents_variation9.phpt index 7e500e8c56..09d33f9f32 100644 --- a/ext/standard/tests/file/file_get_contents_variation9.phpt +++ b/ext/standard/tests/file/file_get_contents_variation9.phpt @@ -46,7 +46,7 @@ unlink($filename); echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing file_get_contents() : variation *** string(330) "Here is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of data" string(330) "Here is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of data" diff --git a/ext/standard/tests/file/file_put_contents_variation1.phpt b/ext/standard/tests/file/file_put_contents_variation1.phpt index 35d193095c..a0d275ccc5 100644 --- a/ext/standard/tests/file/file_put_contents_variation1.phpt +++ b/ext/standard/tests/file/file_put_contents_variation1.phpt @@ -32,7 +32,7 @@ unlink($filename); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing file_put_contents() : variation *** int(25) int(18) diff --git a/ext/standard/tests/file/file_variation.phpt b/ext/standard/tests/file/file_variation.phpt index 506575fde7..9629d37aa9 100644 --- a/ext/standard/tests/file/file_variation.phpt +++ b/ext/standard/tests/file/file_variation.phpt @@ -64,7 +64,7 @@ unlink($file_path."/file3_variation.tmp"); rmdir($file_path."/file_variation"); ?> ---EXPECTF-- +--EXPECT-- *** Using various flags values with different data in a file --Iteration 1 -- array(1) { diff --git a/ext/standard/tests/file/file_variation9.phpt b/ext/standard/tests/file/file_variation9.phpt index 9ddd1e6209..623fa56409 100644 --- a/ext/standard/tests/file/file_variation9.phpt +++ b/ext/standard/tests/file/file_variation9.phpt @@ -32,7 +32,7 @@ foreach ($contents as $content) { echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing file() : variation *** array(2) { [0]=> diff --git a/ext/standard/tests/file/filesize_variation1-win32-mb.phpt b/ext/standard/tests/file/filesize_variation1-win32-mb.phpt index 14975feb49..d4ec8e571e 100644 --- a/ext/standard/tests/file/filesize_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/filesize_variation1-win32-mb.phpt @@ -29,7 +29,7 @@ for($size = 1; $size <10000; $size = $size+1000) echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing filesize(): usage variations *** *** Checking filesize() with different size of files *** int(1024) diff --git a/ext/standard/tests/file/filesize_variation1-win32.phpt b/ext/standard/tests/file/filesize_variation1-win32.phpt index e9ff053361..3c2841afe0 100644 --- a/ext/standard/tests/file/filesize_variation1-win32.phpt +++ b/ext/standard/tests/file/filesize_variation1-win32.phpt @@ -29,7 +29,7 @@ for($size = 1; $size <10000; $size = $size+1000) echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing filesize(): usage variations *** *** Checking filesize() with different size of files *** int(1024) diff --git a/ext/standard/tests/file/filesize_variation2-win32.phpt b/ext/standard/tests/file/filesize_variation2-win32.phpt index 544e3aa408..7322b78aae 100644 --- a/ext/standard/tests/file/filesize_variation2-win32.phpt +++ b/ext/standard/tests/file/filesize_variation2-win32.phpt @@ -64,7 +64,7 @@ unlink($file_path."/filesize_variation2/filesize_variation2_sub/filesize_variati rmdir($file_path."/filesize_variation2/filesize_variation2_sub"); rmdir($file_path."/filesize_variation2"); ?> ---EXPECTF-- +--EXPECT-- *** Testing filesize(): usage variations *** *** Testing size of a dir, sub-dir and file with filesize() *** diff --git a/ext/standard/tests/file/filesize_variation4-win32.phpt b/ext/standard/tests/file/filesize_variation4-win32.phpt index 5f20f4210d..5b6aec9fe9 100644 --- a/ext/standard/tests/file/filesize_variation4-win32.phpt +++ b/ext/standard/tests/file/filesize_variation4-win32.phpt @@ -83,7 +83,7 @@ $file_path = dirname(__FILE__); unlink($file_path."/filesize_variation4.tmp"); unlink($file_path."/filesize_variation4_empty.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing filesize(): usage variations *** *** Testing filesize() with data written using different file modes and by creating holes in file *** diff --git a/ext/standard/tests/file/filesize_variation4.phpt b/ext/standard/tests/file/filesize_variation4.phpt index 29f85fc243..ffea82c234 100644 --- a/ext/standard/tests/file/filesize_variation4.phpt +++ b/ext/standard/tests/file/filesize_variation4.phpt @@ -85,7 +85,7 @@ $file_path = dirname(__FILE__); unlink($file_path."/filesize_variation4.tmp"); unlink($file_path."/filesize_variation4_empty.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing filesize(): usage variations *** *** Testing filesize() with data written using different file modes and by creating holes in file *** diff --git a/ext/standard/tests/file/filetype_basic.phpt b/ext/standard/tests/file/filetype_basic.phpt index 4a6d3b2bc2..0cb1e7361a 100644 --- a/ext/standard/tests/file/filetype_basic.phpt +++ b/ext/standard/tests/file/filetype_basic.phpt @@ -15,7 +15,7 @@ print( filetype(".") )."\n"; echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing filetype() with files and dirs *** file dir diff --git a/ext/standard/tests/file/filetype_variation.phpt b/ext/standard/tests/file/filetype_variation.phpt index 3308cee20d..e09af42570 100644 --- a/ext/standard/tests/file/filetype_variation.phpt +++ b/ext/standard/tests/file/filetype_variation.phpt @@ -61,7 +61,7 @@ unlink($file3); echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing filetype() with various types *** -- Checking with files -- file diff --git a/ext/standard/tests/file/filetype_variation2.phpt b/ext/standard/tests/file/filetype_variation2.phpt index 125b48c02c..b6a2961843 100644 --- a/ext/standard/tests/file/filetype_variation2.phpt +++ b/ext/standard/tests/file/filetype_variation2.phpt @@ -23,7 +23,7 @@ echo "-- Checking for char --\n"; print( filetype("/dev/null") )."\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- -- Checking for char -- char ===DONE=== diff --git a/ext/standard/tests/file/filetype_variation3.phpt b/ext/standard/tests/file/filetype_variation3.phpt index 9a1a68f784..5b453d7788 100644 --- a/ext/standard/tests/file/filetype_variation3.phpt +++ b/ext/standard/tests/file/filetype_variation3.phpt @@ -23,7 +23,7 @@ echo "-- Checking for block --\n"; print( filetype("/dev/ram0") )."\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- -- Checking for block -- block ===DONE=== diff --git a/ext/standard/tests/file/flock_basic.phpt b/ext/standard/tests/file/flock_basic.phpt index d218cee5ef..bb27cb439f 100644 --- a/ext/standard/tests/file/flock_basic.phpt +++ b/ext/standard/tests/file/flock_basic.phpt @@ -30,7 +30,7 @@ rmdir("$file_path/dir"); echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing flock() fun with file and dir *** bool(true) bool(true) diff --git a/ext/standard/tests/file/flock_variation.phpt b/ext/standard/tests/file/flock_variation.phpt index af67ab402a..02cb0ff282 100644 --- a/ext/standard/tests/file/flock_variation.phpt +++ b/ext/standard/tests/file/flock_variation.phpt @@ -64,7 +64,7 @@ fclose($fp); echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing flock() fun with the various operation and wouldblock values *** --- Outer iteration 0 --- diff --git a/ext/standard/tests/file/fopen_variation5.phpt b/ext/standard/tests/file/fopen_variation5.phpt index 1fccbb70a9..ecfac73007 100644 --- a/ext/standard/tests/file/fopen_variation5.phpt +++ b/ext/standard/tests/file/fopen_variation5.phpt @@ -123,7 +123,7 @@ function test_fopen($mode) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- --- testing include path --- diff --git a/ext/standard/tests/file/fopen_variation6.phpt b/ext/standard/tests/file/fopen_variation6.phpt index 3a99212afe..258fa7f073 100644 --- a/ext/standard/tests/file/fopen_variation6.phpt +++ b/ext/standard/tests/file/fopen_variation6.phpt @@ -37,7 +37,7 @@ unlink($absfile); unlink($relfile); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing fopen() : variation *** This is an absolute file This is a relative file diff --git a/ext/standard/tests/file/fopen_variation8.phpt b/ext/standard/tests/file/fopen_variation8.phpt index eecaec7b4c..02637c2106 100644 --- a/ext/standard/tests/file/fopen_variation8.phpt +++ b/ext/standard/tests/file/fopen_variation8.phpt @@ -122,7 +122,7 @@ function test_fopen($mode) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- --- testing include path --- diff --git a/ext/standard/tests/file/fpassthru_basic.phpt b/ext/standard/tests/file/fpassthru_basic.phpt index 8924b27dd2..7389bd2105 100644 --- a/ext/standard/tests/file/fpassthru_basic.phpt +++ b/ext/standard/tests/file/fpassthru_basic.phpt @@ -62,7 +62,7 @@ echo "*** Done ***\n"; <?php unlink(dirname(__FILE__)."/passthru.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Test basic functionality of fpassthru() function *** -- Before seek operation -- diff --git a/ext/standard/tests/file/fpassthru_variation.phpt b/ext/standard/tests/file/fpassthru_variation.phpt index 749eefb4c8..2c9e6e6cd3 100644 --- a/ext/standard/tests/file/fpassthru_variation.phpt +++ b/ext/standard/tests/file/fpassthru_variation.phpt @@ -71,7 +71,7 @@ unlink($file_name); echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fpassthru() function with files *** --- Testing with different offsets --- diff --git a/ext/standard/tests/file/fread_basic.phpt b/ext/standard/tests/file/fread_basic.phpt index 44e534241c..4cdeffb5ab 100644 --- a/ext/standard/tests/file/fread_basic.phpt +++ b/ext/standard/tests/file/fread_basic.phpt @@ -99,7 +99,7 @@ $file_content_types = array("numeric","text","text_with_new_line","alphanumeric" } // end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() basic operations *** -- Testing fread) with file having data of type numeric -- diff --git a/ext/standard/tests/file/fread_variation1.phpt b/ext/standard/tests/file/fread_variation1.phpt index c46dbe2a3c..b782536a57 100644 --- a/ext/standard/tests/file/fread_variation1.phpt +++ b/ext/standard/tests/file/fread_variation1.phpt @@ -104,7 +104,7 @@ foreach($file_content_types as $file_content_type) { echo"Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() : usage variations *** -- Testing fread() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fread_variation2.phpt b/ext/standard/tests/file/fread_variation2.phpt index 23813a6672..9375b7a1db 100644 --- a/ext/standard/tests/file/fread_variation2.phpt +++ b/ext/standard/tests/file/fread_variation2.phpt @@ -103,7 +103,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() : usage variations *** -- Testing fread() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fread_variation3-win32-mb.phpt b/ext/standard/tests/file/fread_variation3-win32-mb.phpt index a39842ce5b..537b525f76 100644 --- a/ext/standard/tests/file/fread_variation3-win32-mb.phpt +++ b/ext/standard/tests/file/fread_variation3-win32-mb.phpt @@ -109,7 +109,7 @@ foreach($file_content_types as $file_content_type) { echo"Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() : usage variations *** -- Testing fread() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fread_variation3-win32.phpt b/ext/standard/tests/file/fread_variation3-win32.phpt index 5491555d1f..295663c539 100644 --- a/ext/standard/tests/file/fread_variation3-win32.phpt +++ b/ext/standard/tests/file/fread_variation3-win32.phpt @@ -109,7 +109,7 @@ foreach($file_content_types as $file_content_type) { echo"Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() : usage variations *** -- Testing fread() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fread_variation3.phpt b/ext/standard/tests/file/fread_variation3.phpt index 949e7b8869..5d66b54bec 100644 --- a/ext/standard/tests/file/fread_variation3.phpt +++ b/ext/standard/tests/file/fread_variation3.phpt @@ -109,7 +109,7 @@ foreach($file_content_types as $file_content_type) { echo"Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() : usage variations *** -- Testing fread() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fread_variation4-win32.phpt b/ext/standard/tests/file/fread_variation4-win32.phpt index 77d733a50e..6601f5aebc 100644 --- a/ext/standard/tests/file/fread_variation4-win32.phpt +++ b/ext/standard/tests/file/fread_variation4-win32.phpt @@ -107,7 +107,7 @@ foreach($file_content_types as $file_content_type) { echo"Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() : usage variations *** -- Testing fread() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fread_variation4.phpt b/ext/standard/tests/file/fread_variation4.phpt index fdff8de704..fb290b104c 100644 --- a/ext/standard/tests/file/fread_variation4.phpt +++ b/ext/standard/tests/file/fread_variation4.phpt @@ -107,7 +107,7 @@ foreach($file_content_types as $file_content_type) { echo"Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() : usage variations *** -- Testing fread() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fscanf_variation1.phpt b/ext/standard/tests/file/fscanf_variation1.phpt index b0c41e5f84..64d778916f 100644 --- a/ext/standard/tests/file/fscanf_variation1.phpt +++ b/ext/standard/tests/file/fscanf_variation1.phpt @@ -38,7 +38,7 @@ $file_path = dirname(__FILE__); $filename = "$file_path/fscanf_variation1.tmp"; unlink($filename); ?> ---EXPECTF-- +--EXPECT-- *** Testing fscanf(): for its return type without third argument *** bool(true) array(1) { diff --git a/ext/standard/tests/file/fscanf_variation55.phpt b/ext/standard/tests/file/fscanf_variation55.phpt index 1777f797b2..a0f9b709e8 100644 --- a/ext/standard/tests/file/fscanf_variation55.phpt +++ b/ext/standard/tests/file/fscanf_variation55.phpt @@ -94,7 +94,7 @@ $file_path = dirname(__FILE__); $filename = "$file_path/fscanf_variation55.tmp"; unlink($filename); ?> ---EXPECTF-- +--EXPECT-- *** Test fscanf(): tracking file pointer along with reading data from file *** *** File opened in r mode *** diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt index a9a54aba14..4a14b334b6 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt @@ -60,7 +60,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : basic operations *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt index 1bd95c3450..fda4de5f40 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt @@ -71,7 +71,7 @@ foreach($file_content_types as $file_content_type){ } //end of File content type loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : basic operations *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt index e25ebe0946..58bb65ef86 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt @@ -71,7 +71,7 @@ foreach($file_content_types as $file_content_type){ } //end of File content type loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : basic operations *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt index ede0c43245..6974b5262e 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type){ } //end of File content type loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : basic operations *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt index 7f6b2b4a8b..5c96fa0275 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt @@ -59,7 +59,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : default whence & all r and a modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt index cb51150dcf..e30a6bba06 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt @@ -68,7 +68,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : default whence & all w and x modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt index c2179fcaee..4957868723 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt @@ -68,7 +68,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : default whence & all w and x modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt index 4b84d409f2..7dc9256340 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt @@ -60,7 +60,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_SET & all r and a modes *** *** Testing fseek() with whence = SEEK_SET *** diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt index 1bb55b53b3..aa6e5f4104 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_SET & all w and x modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt index 3c84f3eb7c..71573087ee 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_SET & all w and x modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt index 75f281291d..ff1d8c8710 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt @@ -59,7 +59,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_CUR & all r and a modes *** -- File having data of type text_with_new_line -- -- File opened in mode r -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt index 8c84e7e386..02c230f819 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_CUR & all w and x modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt index 4de9b3f688..18821c86f2 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_CUR & all w and x modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt index f0e8e4619f..49deec5a15 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt @@ -60,7 +60,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_END & all r and a modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt index c6ba6c430f..2503422195 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt @@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_END & all r and a modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt index b4a0fa97f3..144d9f6d1b 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt @@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_END & all r and a modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_variation3.phpt b/ext/standard/tests/file/fseek_variation3.phpt index edb0b3a3b0..99d6077b41 100644 --- a/ext/standard/tests/file/fseek_variation3.phpt +++ b/ext/standard/tests/file/fseek_variation3.phpt @@ -39,7 +39,7 @@ unlink($outputfile); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek() : variation - beyond file boundaries *** --- fseek beyond start of file --- int(-1) diff --git a/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt b/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt index 36994cb182..e097b342f4 100644 --- a/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt @@ -68,7 +68,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation1-win32.phpt b/ext/standard/tests/file/ftruncate_variation1-win32.phpt index dbf1896d27..58dfd296ed 100644 --- a/ext/standard/tests/file/ftruncate_variation1-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation1-win32.phpt @@ -68,7 +68,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation1.phpt b/ext/standard/tests/file/ftruncate_variation1.phpt index cf51e2092c..c6d28d7e6d 100644 --- a/ext/standard/tests/file/ftruncate_variation1.phpt +++ b/ext/standard/tests/file/ftruncate_variation1.phpt @@ -68,7 +68,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation2-win32.phpt b/ext/standard/tests/file/ftruncate_variation2-win32.phpt index 7b2e0b42ee..535881206a 100644 --- a/ext/standard/tests/file/ftruncate_variation2-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation2-win32.phpt @@ -69,7 +69,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation2.phpt b/ext/standard/tests/file/ftruncate_variation2.phpt index e01a167a38..2b907f595b 100644 --- a/ext/standard/tests/file/ftruncate_variation2.phpt +++ b/ext/standard/tests/file/ftruncate_variation2.phpt @@ -69,7 +69,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation3-win32.phpt b/ext/standard/tests/file/ftruncate_variation3-win32.phpt index d9aa40e6e7..4eba4a7a08 100644 --- a/ext/standard/tests/file/ftruncate_variation3-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation3-win32.phpt @@ -68,7 +68,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation3.phpt b/ext/standard/tests/file/ftruncate_variation3.phpt index cdbeb8e57f..27fbe33bbc 100644 --- a/ext/standard/tests/file/ftruncate_variation3.phpt +++ b/ext/standard/tests/file/ftruncate_variation3.phpt @@ -68,7 +68,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation5-win32.phpt b/ext/standard/tests/file/ftruncate_variation5-win32.phpt index eb45ffcdac..64bed969c9 100644 --- a/ext/standard/tests/file/ftruncate_variation5-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation5-win32.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation5.phpt b/ext/standard/tests/file/ftruncate_variation5.phpt index 5d282d13de..0716693cd1 100644 --- a/ext/standard/tests/file/ftruncate_variation5.phpt +++ b/ext/standard/tests/file/ftruncate_variation5.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation6-win32.phpt b/ext/standard/tests/file/ftruncate_variation6-win32.phpt index 0815092e2b..4b88ee8dd6 100644 --- a/ext/standard/tests/file/ftruncate_variation6-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation6-win32.phpt @@ -74,7 +74,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation6.phpt b/ext/standard/tests/file/ftruncate_variation6.phpt index e9d5eb3c94..69dee82b70 100644 --- a/ext/standard/tests/file/ftruncate_variation6.phpt +++ b/ext/standard/tests/file/ftruncate_variation6.phpt @@ -74,7 +74,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation7-win32.phpt b/ext/standard/tests/file/ftruncate_variation7-win32.phpt index dc3a4cc10b..09158ca490 100644 --- a/ext/standard/tests/file/ftruncate_variation7-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation7-win32.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation7.phpt b/ext/standard/tests/file/ftruncate_variation7.phpt index 5b38adf8bf..0ee558f0f9 100644 --- a/ext/standard/tests/file/ftruncate_variation7.phpt +++ b/ext/standard/tests/file/ftruncate_variation7.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/fwrite_basic-win32-mb.phpt b/ext/standard/tests/file/fwrite_basic-win32-mb.phpt index a65d81efb8..cdc5d86ff9 100644 --- a/ext/standard/tests/file/fwrite_basic-win32-mb.phpt +++ b/ext/standard/tests/file/fwrite_basic-win32-mb.phpt @@ -75,7 +75,7 @@ foreach($file_content_types as $file_content_type) { } // end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() basic operations *** -- Testing fwrite() with file having data of type numeric -- diff --git a/ext/standard/tests/file/fwrite_basic-win32.phpt b/ext/standard/tests/file/fwrite_basic-win32.phpt index 81d9360276..d21887873e 100644 --- a/ext/standard/tests/file/fwrite_basic-win32.phpt +++ b/ext/standard/tests/file/fwrite_basic-win32.phpt @@ -75,7 +75,7 @@ foreach($file_content_types as $file_content_type) { } // end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() basic operations *** -- Testing fwrite() with file having data of type numeric -- diff --git a/ext/standard/tests/file/fwrite_basic.phpt b/ext/standard/tests/file/fwrite_basic.phpt index c568b7c874..b0cb93212b 100644 --- a/ext/standard/tests/file/fwrite_basic.phpt +++ b/ext/standard/tests/file/fwrite_basic.phpt @@ -75,7 +75,7 @@ foreach($file_content_types as $file_content_type) { } // end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() basic operations *** -- Testing fwrite() with file having data of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt b/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt index e43a04dfd6..79a5cf1d9c 100644 --- a/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt @@ -78,7 +78,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation1-win32.phpt b/ext/standard/tests/file/fwrite_variation1-win32.phpt index 1091aeb60b..644e71c44b 100644 --- a/ext/standard/tests/file/fwrite_variation1-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation1-win32.phpt @@ -78,7 +78,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation1.phpt b/ext/standard/tests/file/fwrite_variation1.phpt index 44f69392e4..f6cf927621 100644 --- a/ext/standard/tests/file/fwrite_variation1.phpt +++ b/ext/standard/tests/file/fwrite_variation1.phpt @@ -76,7 +76,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation2-win32.phpt b/ext/standard/tests/file/fwrite_variation2-win32.phpt index 8545db9691..a2e2d8d9e9 100644 --- a/ext/standard/tests/file/fwrite_variation2-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation2-win32.phpt @@ -87,7 +87,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation2.phpt b/ext/standard/tests/file/fwrite_variation2.phpt index 34804b6959..47a352e28a 100644 --- a/ext/standard/tests/file/fwrite_variation2.phpt +++ b/ext/standard/tests/file/fwrite_variation2.phpt @@ -86,7 +86,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation3-win32.phpt b/ext/standard/tests/file/fwrite_variation3-win32.phpt index 125f88df7e..b04ffd75ba 100644 --- a/ext/standard/tests/file/fwrite_variation3-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation3-win32.phpt @@ -79,7 +79,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation3.phpt b/ext/standard/tests/file/fwrite_variation3.phpt index 7d635fdae9..ca60ef438e 100644 --- a/ext/standard/tests/file/fwrite_variation3.phpt +++ b/ext/standard/tests/file/fwrite_variation3.phpt @@ -80,7 +80,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation4-win32.phpt b/ext/standard/tests/file/fwrite_variation4-win32.phpt index ed2114e272..247ee4e13a 100644 --- a/ext/standard/tests/file/fwrite_variation4-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation4-win32.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation4.phpt b/ext/standard/tests/file/fwrite_variation4.phpt index eefc2f8837..701950dc65 100644 --- a/ext/standard/tests/file/fwrite_variation4.phpt +++ b/ext/standard/tests/file/fwrite_variation4.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/is_dir_basic.phpt b/ext/standard/tests/file/is_dir_basic.phpt index 7265d50e6d..c3d659b564 100644 --- a/ext/standard/tests/file/is_dir_basic.phpt +++ b/ext/standard/tests/file/is_dir_basic.phpt @@ -31,7 +31,7 @@ $dir_name = $file_path."/is_dir_basic"; rmdir($dir_name); ?> ---EXPECTF-- +--EXPECT-- *** Testing is_dir(): basic functionality *** bool(true) bool(true) diff --git a/ext/standard/tests/file/is_dir_variation1.phpt b/ext/standard/tests/file/is_dir_variation1.phpt index 1a0b55669f..96bafacfda 100644 --- a/ext/standard/tests/file/is_dir_variation1.phpt +++ b/ext/standard/tests/file/is_dir_variation1.phpt @@ -32,7 +32,7 @@ $dir_name = $file_path."/is_dir_variation1"; rmdir($dir_name."/is_dir_variation1_sub"); rmdir($dir_name); ?> ---EXPECTF-- +--EXPECT-- -- Testing is_dir() with an empty dir -- bool(true) -- Testing is_dir() with a subdir in base dir -- diff --git a/ext/standard/tests/file/is_executable_basic-win32-mb.phpt b/ext/standard/tests/file/is_executable_basic-win32-mb.phpt index eb71c63bd3..e681ad6324 100644 --- a/ext/standard/tests/file/is_executable_basic-win32-mb.phpt +++ b/ext/standard/tests/file/is_executable_basic-win32-mb.phpt @@ -35,7 +35,7 @@ delete_file($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_executable(): basic functionality *** -- Changing mode of file to 0 -- bool(false) diff --git a/ext/standard/tests/file/is_executable_basic-win32.phpt b/ext/standard/tests/file/is_executable_basic-win32.phpt index 1462368b8a..7096285ef1 100644 --- a/ext/standard/tests/file/is_executable_basic-win32.phpt +++ b/ext/standard/tests/file/is_executable_basic-win32.phpt @@ -35,7 +35,7 @@ delete_file($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_executable(): basic functionality *** -- Changing mode of file to 0 -- bool(false) diff --git a/ext/standard/tests/file/is_executable_basic.phpt b/ext/standard/tests/file/is_executable_basic.phpt index c0a04e64bb..a93cd6920c 100644 --- a/ext/standard/tests/file/is_executable_basic.phpt +++ b/ext/standard/tests/file/is_executable_basic.phpt @@ -47,7 +47,7 @@ delete_file($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_executable(): basic functionality *** -- Changing mode of file to 0 -- bool(false) diff --git a/ext/standard/tests/file/is_executable_variation2.phpt b/ext/standard/tests/file/is_executable_variation2.phpt index fc804d652a..6edd2dd744 100644 --- a/ext/standard/tests/file/is_executable_variation2.phpt +++ b/ext/standard/tests/file/is_executable_variation2.phpt @@ -80,7 +80,7 @@ echo "Done\n"; <?php rmdir(dirname(__FILE__)."/is_executable_variation2/"); ?> ---EXPECTF-- +--EXPECT-- *** Testing is_executable(): usage variations *** *** Testing is_executable() on directory without execute permission *** diff --git a/ext/standard/tests/file/is_file_basic.phpt b/ext/standard/tests/file/is_file_basic.phpt index f8c06a0f04..7b8e778a7f 100644 --- a/ext/standard/tests/file/is_file_basic.phpt +++ b/ext/standard/tests/file/is_file_basic.phpt @@ -35,7 +35,7 @@ $file_path = dirname(__FILE__); $file_name = $file_path."/is_file_basic.tmp"; unlink($file_name); ?> ---EXPECTF-- +--EXPECT-- *** Testing is_file(): basic functionality *** bool(true) bool(false) diff --git a/ext/standard/tests/file/is_file_variation1.phpt b/ext/standard/tests/file/is_file_variation1.phpt index 92bff954c6..e3c230b26c 100644 --- a/ext/standard/tests/file/is_file_variation1.phpt +++ b/ext/standard/tests/file/is_file_variation1.phpt @@ -43,7 +43,7 @@ unlink($file_path."/is_file_variation1.tmp"); echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- -- Testing is_file() with file containing data -- bool(true) diff --git a/ext/standard/tests/file/is_file_variation2.phpt b/ext/standard/tests/file/is_file_variation2.phpt index dbe74da617..7ab44da7ff 100644 --- a/ext/standard/tests/file/is_file_variation2.phpt +++ b/ext/standard/tests/file/is_file_variation2.phpt @@ -38,7 +38,7 @@ unlink($file_path."/is_file_variation2_link.tmp"); unlink($file_path."/is_file_variation2.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing is_file() with links *** bool(true) bool(true) diff --git a/ext/standard/tests/file/is_readable_basic-win32-mb.phpt b/ext/standard/tests/file/is_readable_basic-win32-mb.phpt index 2950dfa590..d10342b5e3 100644 --- a/ext/standard/tests/file/is_readable_basic-win32-mb.phpt +++ b/ext/standard/tests/file/is_readable_basic-win32-mb.phpt @@ -37,7 +37,7 @@ delete_file($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_readable(): basic functionality *** -- Changing mode of file to 0 -- bool(true) diff --git a/ext/standard/tests/file/is_readable_basic-win32.phpt b/ext/standard/tests/file/is_readable_basic-win32.phpt index 67f57686fc..d4e0538d79 100644 --- a/ext/standard/tests/file/is_readable_basic-win32.phpt +++ b/ext/standard/tests/file/is_readable_basic-win32.phpt @@ -37,7 +37,7 @@ delete_file($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_readable(): basic functionality *** -- Changing mode of file to 0 -- bool(true) diff --git a/ext/standard/tests/file/is_readable_basic.phpt b/ext/standard/tests/file/is_readable_basic.phpt index 4d5febfb3d..2bca150744 100644 --- a/ext/standard/tests/file/is_readable_basic.phpt +++ b/ext/standard/tests/file/is_readable_basic.phpt @@ -47,7 +47,7 @@ delete_file($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_readable(): basic functionality *** -- Changing mode of file to 0 -- bool(false) diff --git a/ext/standard/tests/file/is_readable_variation2.phpt b/ext/standard/tests/file/is_readable_variation2.phpt index e1faf55997..ac54735b19 100644 --- a/ext/standard/tests/file/is_readable_variation2.phpt +++ b/ext/standard/tests/file/is_readable_variation2.phpt @@ -79,7 +79,7 @@ echo "Done\n"; <?php rmdir(dirname(__FILE__)."/is_readable_variation2/"); ?> ---EXPECTF-- +--EXPECT-- *** Testing is_readable(): usage variations *** *** Testing is_readable() on directory without read permission *** diff --git a/ext/standard/tests/file/is_writable_basic.phpt b/ext/standard/tests/file/is_writable_basic.phpt index 86599b473b..6c447f4256 100644 --- a/ext/standard/tests/file/is_writable_basic.phpt +++ b/ext/standard/tests/file/is_writable_basic.phpt @@ -47,7 +47,7 @@ delete_file($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_writable(): basic functionality *** -- Changing mode of file to 0 -- bool(false) diff --git a/ext/standard/tests/file/is_writable_variation2.phpt b/ext/standard/tests/file/is_writable_variation2.phpt index f56219ce40..efe35a0335 100644 --- a/ext/standard/tests/file/is_writable_variation2.phpt +++ b/ext/standard/tests/file/is_writable_variation2.phpt @@ -85,7 +85,7 @@ echo "Done\n"; <?php rmdir(dirname(__FILE__)."/is_writable_variation2/"); ?> ---EXPECTF-- +--EXPECT-- *** Testing is_writable(): usage variations *** *** Testing is_writable() on directory without write permission *** diff --git a/ext/standard/tests/file/lchgrp_basic.phpt b/ext/standard/tests/file/lchgrp_basic.phpt index 1713bef9b4..c844471240 100644 --- a/ext/standard/tests/file/lchgrp_basic.phpt +++ b/ext/standard/tests/file/lchgrp_basic.phpt @@ -28,7 +28,7 @@ unlink($filename); unlink($symlink); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/lchown_basic.phpt b/ext/standard/tests/file/lchown_basic.phpt index f2aff597c5..57476131c7 100644 --- a/ext/standard/tests/file/lchown_basic.phpt +++ b/ext/standard/tests/file/lchown_basic.phpt @@ -35,7 +35,7 @@ unlink($filename); unlink($symlink); ?> ---EXPECTF-- +--EXPECT-- *** Testing lchown() : basic functionality *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation1.phpt b/ext/standard/tests/file/lstat_stat_variation1.phpt index 30ce9b7217..cf8213a8e4 100644 --- a/ext/standard/tests/file/lstat_stat_variation1.phpt +++ b/ext/standard/tests/file/lstat_stat_variation1.phpt @@ -51,7 +51,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation1a.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() for files after being renamed *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation10.phpt b/ext/standard/tests/file/lstat_stat_variation10.phpt index 51ebc25e71..fe36697237 100644 --- a/ext/standard/tests/file/lstat_stat_variation10.phpt +++ b/ext/standard/tests/file/lstat_stat_variation10.phpt @@ -49,7 +49,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); rmdir("$file_path/lstat_stat_variation10"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() on directory after using is_dir() on it *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation11.phpt b/ext/standard/tests/file/lstat_stat_variation11.phpt index a75504b479..08a51c8423 100644 --- a/ext/standard/tests/file/lstat_stat_variation11.phpt +++ b/ext/standard/tests/file/lstat_stat_variation11.phpt @@ -50,7 +50,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation11.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() on a file after using is_file() on it *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation12.phpt b/ext/standard/tests/file/lstat_stat_variation12.phpt index 8e1edd66c7..3051210001 100644 --- a/ext/standard/tests/file/lstat_stat_variation12.phpt +++ b/ext/standard/tests/file/lstat_stat_variation12.phpt @@ -56,7 +56,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation12_link.tmp"); unlink("$file_path/lstat_stat_variation12.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() on a link after using is_link() on it *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation13.phpt b/ext/standard/tests/file/lstat_stat_variation13.phpt index 288e0b5ecf..e190f465aa 100644 --- a/ext/standard/tests/file/lstat_stat_variation13.phpt +++ b/ext/standard/tests/file/lstat_stat_variation13.phpt @@ -49,7 +49,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation13.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Checking stat() on a file opened using read/write mode *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation14.phpt b/ext/standard/tests/file/lstat_stat_variation14.phpt index 517f77e3f5..a515058421 100644 --- a/ext/standard/tests/file/lstat_stat_variation14.phpt +++ b/ext/standard/tests/file/lstat_stat_variation14.phpt @@ -52,7 +52,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation14_hard.tmp"); unlink("$file_path/lstat_stat_variation14.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Checking lstat() and stat() on hard link *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation15.phpt b/ext/standard/tests/file/lstat_stat_variation15.phpt index 8b67338abb..6a8dcb7146 100644 --- a/ext/standard/tests/file/lstat_stat_variation15.phpt +++ b/ext/standard/tests/file/lstat_stat_variation15.phpt @@ -54,7 +54,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation15_link.tmp"); unlink("$file_path/lstat_stat_variation15.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing lstat() on a link after changing its access permission *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation16.phpt b/ext/standard/tests/file/lstat_stat_variation16.phpt index 9f1276548f..31c0e13ee6 100644 --- a/ext/standard/tests/file/lstat_stat_variation16.phpt +++ b/ext/standard/tests/file/lstat_stat_variation16.phpt @@ -48,7 +48,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation16.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing lstat() on a file after changing its access permission *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation17.phpt b/ext/standard/tests/file/lstat_stat_variation17.phpt index f2306de792..78d4090870 100644 --- a/ext/standard/tests/file/lstat_stat_variation17.phpt +++ b/ext/standard/tests/file/lstat_stat_variation17.phpt @@ -47,7 +47,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); rmdir("$file_path/lstat_stat_variation17"); ?> ---EXPECTF-- +--EXPECT-- *** Testing lstat() on a dir after changing its access permission *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation2.phpt b/ext/standard/tests/file/lstat_stat_variation2.phpt index e7d704a20b..9f9e75ba2b 100644 --- a/ext/standard/tests/file/lstat_stat_variation2.phpt +++ b/ext/standard/tests/file/lstat_stat_variation2.phpt @@ -52,7 +52,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); rmdir("$file_path/lstat_stat_variation1a"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() for directory after being renamed *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation21.phpt b/ext/standard/tests/file/lstat_stat_variation21.phpt index 8620ab00d7..833cf1dabb 100644 --- a/ext/standard/tests/file/lstat_stat_variation21.phpt +++ b/ext/standard/tests/file/lstat_stat_variation21.phpt @@ -55,7 +55,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation21.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() on file by truncating it to given size *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation4.phpt b/ext/standard/tests/file/lstat_stat_variation4.phpt index 259beca006..1fccb95816 100644 --- a/ext/standard/tests/file/lstat_stat_variation4.phpt +++ b/ext/standard/tests/file/lstat_stat_variation4.phpt @@ -55,7 +55,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation4.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() for file after using touch() on the file *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation5.phpt b/ext/standard/tests/file/lstat_stat_variation5.phpt index d0c096ef19..b828c855a3 100644 --- a/ext/standard/tests/file/lstat_stat_variation5.phpt +++ b/ext/standard/tests/file/lstat_stat_variation5.phpt @@ -56,7 +56,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); rmdir("$file_path/lstat_stat_variation5"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() for directory after using touch() on the directory *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation6.phpt b/ext/standard/tests/file/lstat_stat_variation6.phpt index 7e557d034a..3d5cc218ab 100644 --- a/ext/standard/tests/file/lstat_stat_variation6.phpt +++ b/ext/standard/tests/file/lstat_stat_variation6.phpt @@ -69,7 +69,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation6.tmp"); unlink("$file_path/lstat_stat_variation_link6.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing lstat() for link after using touch() on the link *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation7.phpt b/ext/standard/tests/file/lstat_stat_variation7.phpt index 5a1e1c3994..8aa11a3443 100644 --- a/ext/standard/tests/file/lstat_stat_variation7.phpt +++ b/ext/standard/tests/file/lstat_stat_variation7.phpt @@ -48,7 +48,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation7.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() on file after data is written in it *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation8.phpt b/ext/standard/tests/file/lstat_stat_variation8.phpt index b0f170d1f2..d799befd60 100644 --- a/ext/standard/tests/file/lstat_stat_variation8.phpt +++ b/ext/standard/tests/file/lstat_stat_variation8.phpt @@ -53,7 +53,7 @@ unlink("$file_path/lstat_stat_variation8/lstat_stat_variation8a.tmp"); rmdir("$file_path/lstat_stat_variation8/lstat_stat_variation8_subdir/"); rmdir("$file_path/lstat_stat_variation8"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() on dir after subdir and file is created in it *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation9.phpt b/ext/standard/tests/file/lstat_stat_variation9.phpt index 63c6ff8a76..3c30ae914e 100644 --- a/ext/standard/tests/file/lstat_stat_variation9.phpt +++ b/ext/standard/tests/file/lstat_stat_variation9.phpt @@ -59,7 +59,7 @@ $file_path = dirname(__FILE__); $dirname = "$file_path/lstat_stat_variation9"; rmdir($dirname); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() for comparing stats after the deletion of subdir and file *** bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir-001.phpt b/ext/standard/tests/file/mkdir-001.phpt index d1a7cebfa7..23823b2ae7 100644 --- a/ext/standard/tests/file/mkdir-001.phpt +++ b/ext/standard/tests/file/mkdir-001.phpt @@ -20,7 +20,7 @@ var_dump(rmdir(dirname(__FILE__)."/mkdir-001")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir-003.phpt b/ext/standard/tests/file/mkdir-003.phpt index fdd49f340f..fe14bef23d 100644 --- a/ext/standard/tests/file/mkdir-003.phpt +++ b/ext/standard/tests/file/mkdir-003.phpt @@ -17,7 +17,7 @@ var_dump(rmdir(dirname(__FILE__)."/mkdir-003")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir-004.phpt b/ext/standard/tests/file/mkdir-004.phpt index 45c275106a..51e4e55617 100644 --- a/ext/standard/tests/file/mkdir-004.phpt +++ b/ext/standard/tests/file/mkdir-004.phpt @@ -17,7 +17,7 @@ var_dump(rmdir("/testdir")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir-005.phpt b/ext/standard/tests/file/mkdir-005.phpt index af2387ca73..161f8d0630 100644 --- a/ext/standard/tests/file/mkdir-005.phpt +++ b/ext/standard/tests/file/mkdir-005.phpt @@ -18,7 +18,7 @@ var_dump(rmdir("./testdir")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir_rmdir_variation1.phpt b/ext/standard/tests/file/mkdir_rmdir_variation1.phpt index 5dc7a7a4d3..7a1a5c7583 100644 --- a/ext/standard/tests/file/mkdir_rmdir_variation1.phpt +++ b/ext/standard/tests/file/mkdir_rmdir_variation1.phpt @@ -38,7 +38,7 @@ for($mode = 0000; $mode <= 0777; $mode++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mkdir() and rmdir() for different permissions *** -- Changing mode of directory to 0 -- bool(true) diff --git a/ext/standard/tests/file/parse_ini_file.phpt b/ext/standard/tests/file/parse_ini_file.phpt index db14c7a9b4..439fcaf301 100644 --- a/ext/standard/tests/file/parse_ini_file.phpt +++ b/ext/standard/tests/file/parse_ini_file.phpt @@ -217,7 +217,7 @@ echo "*** Done **\n"; <?php unlink(dirname(__FILE__)."/parse.ini"); ?> ---EXPECTF-- +--EXPECT-- *** Test parse_ini_file() function: with various keys and values given in parse.ini file *** -- ini file without process_sections optional arg -- Array diff --git a/ext/standard/tests/file/pathinfo_basic1-win32.phpt b/ext/standard/tests/file/pathinfo_basic1-win32.phpt index f783a6b179..2adf90bc94 100644 --- a/ext/standard/tests/file/pathinfo_basic1-win32.phpt +++ b/ext/standard/tests/file/pathinfo_basic1-win32.phpt @@ -71,7 +71,7 @@ foreach($paths as $path) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing basic functions of pathinfo() *** -- Iteration 1 -- string(0) "" diff --git a/ext/standard/tests/file/pathinfo_basic1.phpt b/ext/standard/tests/file/pathinfo_basic1.phpt index c57774a141..ed2a138c1f 100644 --- a/ext/standard/tests/file/pathinfo_basic1.phpt +++ b/ext/standard/tests/file/pathinfo_basic1.phpt @@ -71,7 +71,7 @@ foreach($paths as $path) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing basic functions of pathinfo() *** -- Iteration 1 -- string(0) "" diff --git a/ext/standard/tests/file/pathinfo_basic2.phpt b/ext/standard/tests/file/pathinfo_basic2.phpt index 3ec7eec358..4087c6d445 100644 --- a/ext/standard/tests/file/pathinfo_basic2.phpt +++ b/ext/standard/tests/file/pathinfo_basic2.phpt @@ -48,7 +48,7 @@ foreach($paths as $path) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing basic functions of pathinfo() *** -- Iteration 1 -- string(1) "." diff --git a/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt b/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt index 7e0a0e0c54..b321ba3f38 100644 --- a/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt +++ b/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt @@ -59,7 +59,7 @@ var_dump( is_int($return_value_pclose) ); echo "\n--- Done ---"; ?> ---EXPECTF-- +--EXPECT-- *** Testing popen(): reading from the pipe *** Sample String ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™ *** Testing popen(): writing to the pipe *** diff --git a/ext/standard/tests/file/popen_pclose_basic-win32.phpt b/ext/standard/tests/file/popen_pclose_basic-win32.phpt index 6351d866f3..ea82c7781f 100644 --- a/ext/standard/tests/file/popen_pclose_basic-win32.phpt +++ b/ext/standard/tests/file/popen_pclose_basic-win32.phpt @@ -59,7 +59,7 @@ var_dump( is_int($return_value_pclose) ); echo "\n--- Done ---"; ?> ---EXPECTF-- +--EXPECT-- *** Testing popen(): reading from the pipe *** Sample String *** Testing popen(): writing to the pipe *** diff --git a/ext/standard/tests/file/popen_pclose_basic.phpt b/ext/standard/tests/file/popen_pclose_basic.phpt index 55a87bb02a..812a24e5ff 100644 --- a/ext/standard/tests/file/popen_pclose_basic.phpt +++ b/ext/standard/tests/file/popen_pclose_basic.phpt @@ -72,7 +72,7 @@ unlink($dirpath."/popen_basic1.tmp"); rmdir($dirpath); ?> ---EXPECTF-- +--EXPECT-- *** Testing popen() and pclose() with different processes *** -- Testing popen(): reading from the pipe -- popen_basic.tmp diff --git a/ext/standard/tests/file/readfile_variation2.phpt b/ext/standard/tests/file/readfile_variation2.phpt index 0c43bf5661..2fe1475501 100644 --- a/ext/standard/tests/file/readfile_variation2.phpt +++ b/ext/standard/tests/file/readfile_variation2.phpt @@ -64,7 +64,7 @@ echo "Done\n"; $file_path = dirname(__FILE__); unlink("$file_path/readfile_variation2.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing readfile() on soft link *** bool(true) line diff --git a/ext/standard/tests/file/rename_variation1-win32.phpt b/ext/standard/tests/file/rename_variation1-win32.phpt index 0955096d76..519801fbda 100644 --- a/ext/standard/tests/file/rename_variation1-win32.phpt +++ b/ext/standard/tests/file/rename_variation1-win32.phpt @@ -63,7 +63,7 @@ unlink($file_path."/rename_variation_link.tmp"); unlink($file_path."/rename_variation.tmp"); rmdir($file_path."/rename_variation_dir"); ?> ---EXPECTF-- +--EXPECT-- *** Testing rename() : renaming directory across directories *** -- Iteration 1 -- bool(true) diff --git a/ext/standard/tests/file/rename_variation1.phpt b/ext/standard/tests/file/rename_variation1.phpt index 54338d7460..74c5988491 100644 --- a/ext/standard/tests/file/rename_variation1.phpt +++ b/ext/standard/tests/file/rename_variation1.phpt @@ -54,7 +54,7 @@ echo "Done\n"; $file_path = dirname(__FILE__); rmdir($file_path."/rename_variation1_dir"); ?> ---EXPECTF-- +--EXPECT-- *** Testing rename() : renaming directory across directories *** -- Iteration 1 -- bool(true) diff --git a/ext/standard/tests/file/rename_variation2-win32.phpt b/ext/standard/tests/file/rename_variation2-win32.phpt index 9627a9fa53..193bb28f1f 100644 --- a/ext/standard/tests/file/rename_variation2-win32.phpt +++ b/ext/standard/tests/file/rename_variation2-win32.phpt @@ -49,7 +49,7 @@ unlink($file_path."/rename_variation2_link.tmp"); unlink($file_path."/rename_variation2.tmp"); rmdir($file_path."/rename_variation2_dir"); ?> ---EXPECTF-- +--EXPECT-- *** Testing rename() by renaming a file and directory to numeric name *** bool(true) bool(false) diff --git a/ext/standard/tests/file/rename_variation2.phpt b/ext/standard/tests/file/rename_variation2.phpt index 1e0a5d9edd..c4b575e922 100644 --- a/ext/standard/tests/file/rename_variation2.phpt +++ b/ext/standard/tests/file/rename_variation2.phpt @@ -52,7 +52,7 @@ $file_path = dirname(__FILE__); unlink($file_path."/rename_variation2.tmp"); rmdir($file_path."/rename_variation2_dir"); ?> ---EXPECTF-- +--EXPECT-- *** Testing rename() on soft links *** bool(true) bool(true) diff --git a/ext/standard/tests/file/rename_variation3.phpt b/ext/standard/tests/file/rename_variation3.phpt index 7c47040729..d76cdd09ef 100644 --- a/ext/standard/tests/file/rename_variation3.phpt +++ b/ext/standard/tests/file/rename_variation3.phpt @@ -47,7 +47,7 @@ $file_path = dirname(__FILE__); unlink($file_path."/rename_variation3_hard_link1.tmp"); rmdir($file_path."/rename_variation3_dir"); ?> ---EXPECTF-- +--EXPECT-- *** Testing rename() on hard links *** bool(true) bool(true) diff --git a/ext/standard/tests/file/rename_variation4.phpt b/ext/standard/tests/file/rename_variation4.phpt index 69753bc322..b6cab73d60 100644 --- a/ext/standard/tests/file/rename_variation4.phpt +++ b/ext/standard/tests/file/rename_variation4.phpt @@ -40,7 +40,7 @@ echo "Done\n"; $file_path = dirname(__FILE__); rmdir($file_path."/12345"); ?> ---EXPECTF-- +--EXPECT-- *** Testing rename() by renaming a file, link and directory to numeric name *** bool(true) bool(false) diff --git a/ext/standard/tests/file/stat_variation1-win32-mb.phpt b/ext/standard/tests/file/stat_variation1-win32-mb.phpt index dcba28698f..d49f5244f7 100644 --- a/ext/standard/tests/file/stat_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/stat_variation1-win32-mb.phpt @@ -77,7 +77,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/stat_variation1a_ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.tmp"); rmdir("$file_path/stat_variation1a_ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat(): on file and directory ater renaming them *** -- Testing stat() for files after being renamed -- bool(true) diff --git a/ext/standard/tests/file/stat_variation1-win32.phpt b/ext/standard/tests/file/stat_variation1-win32.phpt index abbc88f945..0dcf271d99 100644 --- a/ext/standard/tests/file/stat_variation1-win32.phpt +++ b/ext/standard/tests/file/stat_variation1-win32.phpt @@ -77,7 +77,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/stat_variation1a.tmp"); rmdir("$file_path/stat_variation1a"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat(): on file and directory ater renaming them *** -- Testing stat() for files after being renamed -- bool(true) diff --git a/ext/standard/tests/file/stat_variation2-win32.phpt b/ext/standard/tests/file/stat_variation2-win32.phpt index 2bd9f80c50..b6a9300bb4 100644 --- a/ext/standard/tests/file/stat_variation2-win32.phpt +++ b/ext/standard/tests/file/stat_variation2-win32.phpt @@ -54,7 +54,7 @@ echo "\n*** Done ***"; $file_path = dirname(__FILE__); unlink("$file_path/stat_variation2.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat(): writing to a file *** -- Testing stat() on file after data is written in it -- bool(true) diff --git a/ext/standard/tests/file/stat_variation3-win32.phpt b/ext/standard/tests/file/stat_variation3-win32.phpt index e248116486..e472a006ed 100644 --- a/ext/standard/tests/file/stat_variation3-win32.phpt +++ b/ext/standard/tests/file/stat_variation3-win32.phpt @@ -65,7 +65,7 @@ echo "\n*** Done ***"; $file_path = dirname(__FILE__); rmdir("$file_path/stat_variation3"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat(): with creating & deleting subdir/file *** -- Testing stat() on dir after subdir and file is created in it -- diff --git a/ext/standard/tests/file/stat_variation4-win32.phpt b/ext/standard/tests/file/stat_variation4-win32.phpt index a0ffed285f..0b3c66ad5c 100644 --- a/ext/standard/tests/file/stat_variation4-win32.phpt +++ b/ext/standard/tests/file/stat_variation4-win32.phpt @@ -75,7 +75,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/stat_variation4.tmp"); rmdir("$file_path/stat_variation4"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat(): on file and directory after accessing it with is_dir() and is_file() functions *** -- Testing on Directory -- diff --git a/ext/standard/tests/file/stat_variation5-win32.phpt b/ext/standard/tests/file/stat_variation5-win32.phpt index 038b9b64eb..a28cc76d54 100644 --- a/ext/standard/tests/file/stat_variation5-win32.phpt +++ b/ext/standard/tests/file/stat_variation5-win32.phpt @@ -55,7 +55,7 @@ echo "\n*** Done ***"; $file_path = dirname(__FILE__); unlink("$file_path/stat_variation5.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat(): on a file with read/write permission *** bool(true) diff --git a/ext/standard/tests/file/stat_variation6-win32.phpt b/ext/standard/tests/file/stat_variation6-win32.phpt index 3dae75b2e6..d30b8fd8d7 100644 --- a/ext/standard/tests/file/stat_variation6-win32.phpt +++ b/ext/standard/tests/file/stat_variation6-win32.phpt @@ -74,7 +74,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/stat_variation6.tmp"); rmdir("$file_path/stat_variation6"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() on file with miscelleneous file permission and content *** bool(true) diff --git a/ext/standard/tests/file/stat_variation8-win32.phpt b/ext/standard/tests/file/stat_variation8-win32.phpt index 079bd0d73a..23d0159e79 100644 --- a/ext/standard/tests/file/stat_variation8-win32.phpt +++ b/ext/standard/tests/file/stat_variation8-win32.phpt @@ -66,7 +66,7 @@ echo "\n*** Done ***"; $file_path = dirname(__FILE__); unlink("$file_path/stat_variation8.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat(): on file by truncating it to given size *** bool(true) bool(true) diff --git a/ext/standard/tests/file/stream_rfc2397_003.phpt b/ext/standard/tests/file/stream_rfc2397_003.phpt index 7cc31fe599..c92142d22a 100644 --- a/ext/standard/tests/file/stream_rfc2397_003.phpt +++ b/ext/standard/tests/file/stream_rfc2397_003.phpt @@ -30,7 +30,7 @@ foreach($streams as $original => $stream) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- string(12) "A brief note" string(40) "select_vcount,fcol_from_fieldtable/local" string(13) "foobar foobar" diff --git a/ext/standard/tests/file/stream_rfc2397_004.phpt b/ext/standard/tests/file/stream_rfc2397_004.phpt index 1a8da936b3..0f64ec16af 100644 --- a/ext/standard/tests/file/stream_rfc2397_004.phpt +++ b/ext/standard/tests/file/stream_rfc2397_004.phpt @@ -22,7 +22,7 @@ foreach($streams as $stream) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- string(5) ";test" string(4) "test" string(4) "test" diff --git a/ext/standard/tests/file/stream_rfc2397_005.phpt b/ext/standard/tests/file/stream_rfc2397_005.phpt index 8fa1c16b0c..e2d58b4424 100644 --- a/ext/standard/tests/file/stream_rfc2397_005.phpt +++ b/ext/standard/tests/file/stream_rfc2397_005.phpt @@ -25,7 +25,7 @@ foreach($streams as $stream) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- string(12) "A brief note" string(40) "select_vcount,fcol_from_fieldtable/local" string(13) "foobar foobar" diff --git a/ext/standard/tests/file/stream_rfc2397_007.phpt b/ext/standard/tests/file/stream_rfc2397_007.phpt index b62f19cd37..48c7cdb3f1 100644 --- a/ext/standard/tests/file/stream_rfc2397_007.phpt +++ b/ext/standard/tests/file/stream_rfc2397_007.phpt @@ -81,7 +81,7 @@ foreach($streams as $stream) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- ===data:,012345=== int(0) bool(false) diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt index 21c9b57654..dc353e5097 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt @@ -113,7 +113,7 @@ unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Accessing and updating data of file through soft link *** bool(true) diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt index f58937cd12..74f03e2097 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt @@ -91,7 +91,7 @@ unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Accessing and updating data of file through hard link *** -- Access data of the file through the hard link -- diff --git a/ext/standard/tests/file/touch_variation1.phpt b/ext/standard/tests/file/touch_variation1.phpt index dba41a6077..18f9d033b8 100644 --- a/ext/standard/tests/file/touch_variation1.phpt +++ b/ext/standard/tests/file/touch_variation1.phpt @@ -29,7 +29,7 @@ var_dump(fileatime($filename)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(true) int(101) int(101) diff --git a/ext/standard/tests/file/umask_variation1.phpt b/ext/standard/tests/file/umask_variation1.phpt index 29fe92e556..b44e1ef3c9 100644 --- a/ext/standard/tests/file/umask_variation1.phpt +++ b/ext/standard/tests/file/umask_variation1.phpt @@ -57,7 +57,7 @@ for($mask = 0000; $mask <= 0350; $mask++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing umask() on file and directory *** -- Setting umask to 000 -- File permission : 666 diff --git a/ext/standard/tests/file/umask_variation2.phpt b/ext/standard/tests/file/umask_variation2.phpt index 85b1a67f53..bb2dbb3255 100644 --- a/ext/standard/tests/file/umask_variation2.phpt +++ b/ext/standard/tests/file/umask_variation2.phpt @@ -57,7 +57,7 @@ for($mask = 0351; $mask <= 0777; $mask++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing umask() on file and directory *** -- Setting umask to 351 -- File permission : 426 diff --git a/ext/standard/tests/file/unlink_basic.phpt b/ext/standard/tests/file/unlink_basic.phpt index 97e6aa6dfd..172ad0551a 100644 --- a/ext/standard/tests/file/unlink_basic.phpt +++ b/ext/standard/tests/file/unlink_basic.phpt @@ -32,7 +32,7 @@ var_dump( file_exists($filename) ); // confirm file doesnt exist echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing unlink() on a file *** bool(true) bool(false) diff --git a/ext/standard/tests/file/unlink_variation2.phpt b/ext/standard/tests/file/unlink_variation2.phpt index 0068dbfe17..0044cbe303 100644 --- a/ext/standard/tests/file/unlink_variation2.phpt +++ b/ext/standard/tests/file/unlink_variation2.phpt @@ -24,7 +24,7 @@ fclose($fp); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing unlink() on a file which is in use *** bool(true) bool(false) diff --git a/ext/standard/tests/file/unlink_variation3.phpt b/ext/standard/tests/file/unlink_variation3.phpt index 96f21b2cc7..b332ab7b27 100644 --- a/ext/standard/tests/file/unlink_variation3.phpt +++ b/ext/standard/tests/file/unlink_variation3.phpt @@ -45,7 +45,7 @@ var_dump( file_exists($filename) ); // confirm file is deleted echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing unlink() on soft and hard links *** -- Testing unlink() on soft link -- bool(true) diff --git a/ext/standard/tests/file/unlink_variation5.phpt b/ext/standard/tests/file/unlink_variation5.phpt index 51bb2c7b93..071b14086a 100644 --- a/ext/standard/tests/file/unlink_variation5.phpt +++ b/ext/standard/tests/file/unlink_variation5.phpt @@ -34,7 +34,7 @@ for($mode = 0000; $mode <= 0777; $mode++ ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing unlink() on a file *** File permission : 0 bool(true) diff --git a/ext/standard/tests/file/unlink_variation6.phpt b/ext/standard/tests/file/unlink_variation6.phpt index ede9ada092..558d32a483 100644 --- a/ext/standard/tests/file/unlink_variation6.phpt +++ b/ext/standard/tests/file/unlink_variation6.phpt @@ -33,7 +33,7 @@ function f_exists($file) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing unlink() : variation: contexts and relative files *** subdir/testfile.txt exists bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_bug30730.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_bug30730.phpt index 5ea66058ea..53b6f40b19 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_bug30730.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_bug30730.phpt @@ -35,7 +35,7 @@ var_dump(rmdir($dest_dir)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt index 6eb484fcd0..6285e1a6ac 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt @@ -25,7 +25,7 @@ unlink($testFile); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Generating a file with a path length of 259 characters... Opening file... OK ===DONE=== diff --git a/ext/standard/tests/filters/bug50363.phpt b/ext/standard/tests/filters/bug50363.phpt index 3395edebc4..c6fd0dc079 100644 --- a/ext/standard/tests/filters/bug50363.phpt +++ b/ext/standard/tests/filters/bug50363.phpt @@ -12,6 +12,6 @@ rewind($b); fpassthru($b); ?> ---EXPECTF-- +--EXPECT-- Sauvegarderéussi(e) não NÃO Sauvegarderéussi(e) não NÃO diff --git a/ext/standard/tests/filters/stream_filter_remove_basic.phpt b/ext/standard/tests/filters/stream_filter_remove_basic.phpt index 6ca84fef41..3744b72467 100644 --- a/ext/standard/tests/filters/stream_filter_remove_basic.phpt +++ b/ext/standard/tests/filters/stream_filter_remove_basic.phpt @@ -39,7 +39,7 @@ $file = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'streamfilterTest.txt'; unlink( $file ); ?> ---EXPECTF-- +--EXPECT-- *** Testing stream_filter_remove() : basic functionality *** bool(true) Grfgvat gur ebg13 svygre juvpu fuvsgf fbzr guvatf nebhaq. diff --git a/ext/standard/tests/general_functions/boolval.phpt b/ext/standard/tests/general_functions/boolval.phpt index 9d0eac4ebd..3c998520ff 100644 --- a/ext/standard/tests/general_functions/boolval.phpt +++ b/ext/standard/tests/general_functions/boolval.phpt @@ -15,7 +15,7 @@ Testing boolval() var_dump(boolval(new stdClass())); var_dump(boolval(STDIN)); ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/bug34794.phpt b/ext/standard/tests/general_functions/bug34794.phpt index 1b25bc28c4..fb95a6267f 100644 --- a/ext/standard/tests/general_functions/bug34794.phpt +++ b/ext/standard/tests/general_functions/bug34794.phpt @@ -26,7 +26,7 @@ proc_close($process2); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Opening process 1 Opening process 2 Closing process 1 diff --git a/ext/standard/tests/general_functions/bug36011.phpt b/ext/standard/tests/general_functions/bug36011.phpt index 08a45014f2..248608e008 100644 --- a/ext/standard/tests/general_functions/bug36011.phpt +++ b/ext/standard/tests/general_functions/bug36011.phpt @@ -37,7 +37,7 @@ TestClass::whee5(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- TestClass::test() TestClass::test() TestClass::test() diff --git a/ext/standard/tests/general_functions/bug40398.phpt b/ext/standard/tests/general_functions/bug40398.phpt index 11fdde2c51..e92be5bedc 100644 --- a/ext/standard/tests/general_functions/bug40398.phpt +++ b/ext/standard/tests/general_functions/bug40398.phpt @@ -74,7 +74,7 @@ new Derived_6('6'); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Base::__construct(1) Base::__construct(2) Base::__construct(3) diff --git a/ext/standard/tests/general_functions/bug40752.phpt b/ext/standard/tests/general_functions/bug40752.phpt index 30ed8a4aa7..9500573e8d 100644 --- a/ext/standard/tests/general_functions/bug40752.phpt +++ b/ext/standard/tests/general_functions/bug40752.phpt @@ -22,7 +22,7 @@ unlink($file); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(1) { ["foo"]=> array(1) { diff --git a/ext/standard/tests/general_functions/bug41445.phpt b/ext/standard/tests/general_functions/bug41445.phpt index 23888df7d7..000e9d347d 100644 --- a/ext/standard/tests/general_functions/bug41445.phpt +++ b/ext/standard/tests/general_functions/bug41445.phpt @@ -35,7 +35,7 @@ var_dump(parse_ini_file($file)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(2) { ["001099030277"]=> array(1) { diff --git a/ext/standard/tests/general_functions/bug41445_1.phpt b/ext/standard/tests/general_functions/bug41445_1.phpt index 4698de436a..120d9400b6 100644 --- a/ext/standard/tests/general_functions/bug41445_1.phpt +++ b/ext/standard/tests/general_functions/bug41445_1.phpt @@ -25,7 +25,7 @@ var_dump(parse_ini_file($file)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(3) { ["2454.33"]=> array(1) { diff --git a/ext/standard/tests/general_functions/bug44667.phpt b/ext/standard/tests/general_functions/bug44667.phpt index 49183cc580..53290a7a30 100644 --- a/ext/standard/tests/general_functions/bug44667.phpt +++ b/ext/standard/tests/general_functions/bug44667.phpt @@ -28,6 +28,6 @@ echo "Result is: ", $result, "\n"; echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Result is: Hello Done diff --git a/ext/standard/tests/general_functions/bug48660.phpt b/ext/standard/tests/general_functions/bug48660.phpt index 4c1492a18d..d92958fc42 100644 --- a/ext/standard/tests/general_functions/bug48660.phpt +++ b/ext/standard/tests/general_functions/bug48660.phpt @@ -25,7 +25,7 @@ var_dump(parse_ini_file($ini_location, true, INI_SCANNER_NORMAL)); ?> --CLEAN-- <?php @unlink(dirname(__FILE__) . '/bug48660.tmp'); ?> ---EXPECTF-- +--EXPECT-- array(1) { ["cases"]=> array(5) { diff --git a/ext/standard/tests/general_functions/bug49692.phpt b/ext/standard/tests/general_functions/bug49692.phpt index 80a1612d9e..4512732caf 100644 --- a/ext/standard/tests/general_functions/bug49692.phpt +++ b/ext/standard/tests/general_functions/bug49692.phpt @@ -8,7 +8,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com> var_dump(parse_ini_file('bug49692.ini', true)); ?> ---EXPECTF-- +--EXPECT-- array(1) { ["sitemap"]=> array(2) { diff --git a/ext/standard/tests/general_functions/bug66094.phpt b/ext/standard/tests/general_functions/bug66094.phpt index 8b33a4f4c3..ecc13ab07a 100644 --- a/ext/standard/tests/general_functions/bug66094.phpt +++ b/ext/standard/tests/general_functions/bug66094.phpt @@ -7,6 +7,6 @@ register_tick_function($closure = function () { echo "Tick!\n"; }); unregister_tick_function($closure); echo "done"; ?> ---EXPECTF-- +--EXPECT-- Tick! done diff --git a/ext/standard/tests/general_functions/closures_001.phpt b/ext/standard/tests/general_functions/closures_001.phpt index b4fc898fd2..3a077f2db6 100644 --- a/ext/standard/tests/general_functions/closures_001.phpt +++ b/ext/standard/tests/general_functions/closures_001.phpt @@ -6,6 +6,6 @@ register_shutdown_function(function () { echo "Hello World!\n"; }); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done Hello World! diff --git a/ext/standard/tests/general_functions/connection_aborted.phpt b/ext/standard/tests/general_functions/connection_aborted.phpt index 79618c2aa1..5932095f09 100644 --- a/ext/standard/tests/general_functions/connection_aborted.phpt +++ b/ext/standard/tests/general_functions/connection_aborted.phpt @@ -6,5 +6,5 @@ marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao p <?php var_dump(connection_aborted()); ?> ---EXPECTF-- +--EXPECT-- int(0) diff --git a/ext/standard/tests/general_functions/connection_status.phpt b/ext/standard/tests/general_functions/connection_status.phpt index 5e0677fe27..97e0f05684 100644 --- a/ext/standard/tests/general_functions/connection_status.phpt +++ b/ext/standard/tests/general_functions/connection_status.phpt @@ -6,5 +6,5 @@ marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao p <?php var_dump(connection_status() == CONNECTION_NORMAL); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt b/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt index 7d2a029b47..5254e5d57a 100644 --- a/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt +++ b/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt @@ -29,7 +29,7 @@ foreach ($data AS $value) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing escapeshellcmd() basic operations *** -- Test 1 -- string(5) "^"abc" diff --git a/ext/standard/tests/general_functions/get_cfg_var_basic.phpt b/ext/standard/tests/general_functions/get_cfg_var_basic.phpt index 3fb0056553..541865a7b3 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_basic.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_basic.phpt @@ -17,7 +17,7 @@ var_dump(get_cfg_var( 'session.serialize_handler' ) ); var_dump(get_cfg_var( 'session.save_handler' ) ); ?> ---EXPECTF-- +--EXPECT-- *** Test by calling method or function with its expected arguments *** string(1) "0" string(3) "php" diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation2.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation2.phpt index 68495a13d9..195affe4fc 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation2.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation2.phpt @@ -27,7 +27,7 @@ foreach ( $variation_array as $var ) { var_dump(get_cfg_var( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with boolean values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation3.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation3.phpt index d1fb5e7dda..1a99242ba6 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation3.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation3.phpt @@ -32,7 +32,7 @@ foreach ( $variation_array as $var ) { var_dump(get_cfg_var( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with emptyUnsetUndefNull values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation4.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation4.phpt index 8dac4f8a40..03270ce3f4 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation4.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation4.phpt @@ -28,7 +28,7 @@ foreach ( $variation_array as $var ) { var_dump(get_cfg_var( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with float values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation5.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation5.phpt index 392abb32c5..d2a90bce05 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation5.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation5.phpt @@ -27,7 +27,7 @@ foreach ( $variation_array as $var ) { var_dump(get_cfg_var( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with int values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation7.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation7.phpt index 3b5b08c6d5..d6bdf693e8 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation7.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation7.phpt @@ -31,7 +31,7 @@ foreach ( $variation_array as $var ) { var_dump(get_cfg_var( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with unknown string values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt index f743e7456c..b273e512d0 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt @@ -11,5 +11,5 @@ echo "*** Test by calling method or function with deprecated option ***\n"; var_dump(get_cfg_var( 'magic_quotes_gpc' ) ); ?> ---EXPECTF-- +--EXPECT-- Fatal error: Directive 'magic_quotes_gpc' is no longer available in PHP in Unknown on line 0 diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt index 6e0ffc51f0..00a24597f8 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt @@ -30,7 +30,7 @@ foreach ( $variation_array as $var ) { var_dump(get_cfg_var( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument with array of valid parameters *** string(1) "0" string(3) "php" diff --git a/ext/standard/tests/general_functions/get_defined_constants_basic.phpt b/ext/standard/tests/general_functions/get_defined_constants_basic.phpt index 544887129f..9de39c18d0 100644 --- a/ext/standard/tests/general_functions/get_defined_constants_basic.phpt +++ b/ext/standard/tests/general_functions/get_defined_constants_basic.phpt @@ -29,7 +29,7 @@ if ($n2 == $n1 + 1 && array_key_exists("USER_CONSTANT", $arr2)) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing get_defined_constants() : basic functionality *** string(5) "array" string(5) "array" diff --git a/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt b/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt index d87eb4c0c8..2dbe332ccc 100644 --- a/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt +++ b/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt @@ -16,7 +16,7 @@ var_dump(in_array("cos", $result)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Simple testcase for get_extension_funcs() function string(5) "array" bool(true) diff --git a/ext/standard/tests/general_functions/getenv.phpt b/ext/standard/tests/general_functions/getenv.phpt index 006378a337..bba12a905a 100644 --- a/ext/standard/tests/general_functions/getenv.phpt +++ b/ext/standard/tests/general_functions/getenv.phpt @@ -10,7 +10,7 @@ var_dump(getenv()["FOO"]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(3) "bar" string(3) "bar" Done diff --git a/ext/standard/tests/general_functions/getservbyname_variation10.phpt b/ext/standard/tests/general_functions/getservbyname_variation10.phpt index c7ed144f10..4779efdcaf 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation10.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation10.phpt @@ -32,7 +32,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $service, $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 2 with emptyUnsetUndefNull values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation11.phpt b/ext/standard/tests/general_functions/getservbyname_variation11.phpt index 3c410c55b6..3478c36eb6 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation11.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation11.phpt @@ -21,7 +21,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $service, $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 2 with float values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation12.phpt b/ext/standard/tests/general_functions/getservbyname_variation12.phpt index 7e5323cca8..37a54ce32a 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation12.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation12.phpt @@ -21,7 +21,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $service, $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 2 with int values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation14.phpt b/ext/standard/tests/general_functions/getservbyname_variation14.phpt index d93b53ece4..986d7d5973 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation14.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation14.phpt @@ -25,7 +25,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $service, $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 2 with string values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation2.phpt b/ext/standard/tests/general_functions/getservbyname_variation2.phpt index 877c1d12af..7c00b1e7f7 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation2.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation2.phpt @@ -21,7 +21,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $var , $protocol ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with boolean values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation3.phpt b/ext/standard/tests/general_functions/getservbyname_variation3.phpt index d34259d2a2..6602ce0bfc 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation3.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation3.phpt @@ -26,7 +26,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $var , $protocol ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with emptyUnsetUndefNull values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation4.phpt b/ext/standard/tests/general_functions/getservbyname_variation4.phpt index 6033c94363..6c8de4b875 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation4.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation4.phpt @@ -22,7 +22,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $var , $protocol ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with float values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation5.phpt b/ext/standard/tests/general_functions/getservbyname_variation5.phpt index 1d3b8f6d74..f06a6ec884 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation5.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation5.phpt @@ -21,7 +21,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $var , $protocol ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with int values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation7.phpt b/ext/standard/tests/general_functions/getservbyname_variation7.phpt index a0e223c50d..5fb67cb84e 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation7.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation7.phpt @@ -25,7 +25,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $var , $protocol ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with string values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation9.phpt b/ext/standard/tests/general_functions/getservbyname_variation9.phpt index eef2744c26..720dbf0fbc 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation9.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation9.phpt @@ -26,7 +26,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $service, $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 2 with boolean values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt index 440443bca2..6265d0a373 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt @@ -179,7 +179,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt index 18b05b6a97..ba3a0dbfec 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt @@ -187,7 +187,7 @@ foreach ($types as $type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation3.phpt b/ext/standard/tests/general_functions/gettype_settype_variation3.phpt index f00d04ef88..29c1463fb1 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation3.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation3.phpt @@ -184,7 +184,7 @@ foreach ($types as $type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt index 6ff891391f..6f7cc23df4 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt @@ -209,7 +209,7 @@ foreach ($types as $type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation5.phpt b/ext/standard/tests/general_functions/gettype_settype_variation5.phpt index 7c43b8e318..9af1bfbaa8 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation5.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation5.phpt @@ -179,7 +179,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation6.phpt b/ext/standard/tests/general_functions/gettype_settype_variation6.phpt index 9e5ce2e600..5217121385 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation6.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation6.phpt @@ -181,7 +181,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation7.phpt b/ext/standard/tests/general_functions/gettype_settype_variation7.phpt index c4246b4204..8431cb802f 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation7.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation7.phpt @@ -179,7 +179,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation8.phpt b/ext/standard/tests/general_functions/gettype_settype_variation8.phpt index 5e568fe7aa..e64dd08b80 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation8.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation8.phpt @@ -179,7 +179,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/intval_binary_prefix.phpt b/ext/standard/tests/general_functions/intval_binary_prefix.phpt index e5b8214881..47b8d05386 100644 --- a/ext/standard/tests/general_functions/intval_binary_prefix.phpt +++ b/ext/standard/tests/general_functions/intval_binary_prefix.phpt @@ -65,7 +65,7 @@ foreach ($badInputs as $input) { print '--- Done ---'; ?> ---EXPECTF-- +--EXPECT-- --- Good Inputs - Base = 0 --- int(2147483647) int(2147483647) diff --git a/ext/standard/tests/general_functions/is_callable_basic2.phpt b/ext/standard/tests/general_functions/is_callable_basic2.phpt index 1e6b2a97cc..06941832db 100644 --- a/ext/standard/tests/general_functions/is_callable_basic2.phpt +++ b/ext/standard/tests/general_functions/is_callable_basic2.phpt @@ -125,7 +125,7 @@ foreach($objects as $object) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing is_callable() on objects *** ** Testing behavior of is_callable() on static methods ** diff --git a/ext/standard/tests/general_functions/is_callable_variation1.phpt b/ext/standard/tests/general_functions/is_callable_variation1.phpt index cd76f161ed..022c5a4549 100644 --- a/ext/standard/tests/general_functions/is_callable_variation1.phpt +++ b/ext/standard/tests/general_functions/is_callable_variation1.phpt @@ -60,7 +60,7 @@ check_iscallable($undef_functions); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing is_callable() on undefined functions *** -- Iteration 1 -- bool(false) diff --git a/ext/standard/tests/general_functions/parse_ini_basic.phpt b/ext/standard/tests/general_functions/parse_ini_basic.phpt index 0c0591e7eb..f5a18c457e 100644 --- a/ext/standard/tests/general_functions/parse_ini_basic.phpt +++ b/ext/standard/tests/general_functions/parse_ini_basic.phpt @@ -14,7 +14,7 @@ var_dump(parse_ini_file($ini_file, 1)); echo "Done.\n"; ?> ---EXPECTF-- +--EXPECT-- array(26) { ["basic"]=> array(15) { diff --git a/ext/standard/tests/general_functions/parse_ini_booleans.phpt b/ext/standard/tests/general_functions/parse_ini_booleans.phpt index 7b012c50f6..530e186a99 100644 --- a/ext/standard/tests/general_functions/parse_ini_booleans.phpt +++ b/ext/standard/tests/general_functions/parse_ini_booleans.phpt @@ -10,7 +10,7 @@ var_dump(parse_ini_file($ini_file, 1)); echo "Done.\n"; ?> ---EXPECTF-- +--EXPECT-- array(3) { ["error_reporting values"]=> array(6) { diff --git a/ext/standard/tests/general_functions/parse_ini_string_001.phpt b/ext/standard/tests/general_functions/parse_ini_string_001.phpt index c5e70cb900..e5e402b8fc 100644 --- a/ext/standard/tests/general_functions/parse_ini_string_001.phpt +++ b/ext/standard/tests/general_functions/parse_ini_string_001.phpt @@ -207,7 +207,7 @@ print_r($ini_array); echo "*** Done **\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test parse_ini_string() function: with various keys and values given in string *** -- ini string without process_sections optional arg -- Array diff --git a/ext/standard/tests/general_functions/parse_ini_string_003.phpt b/ext/standard/tests/general_functions/parse_ini_string_003.phpt index 570570dbfe..9c0b1308d1 100644 --- a/ext/standard/tests/general_functions/parse_ini_string_003.phpt +++ b/ext/standard/tests/general_functions/parse_ini_string_003.phpt @@ -17,7 +17,7 @@ var_dump(parse_ini_string($contents, false, INI_SCANNER_TYPED)); ?> Done ---EXPECTF-- +--EXPECT-- array(4) { ["foo"]=> int(1) diff --git a/ext/standard/tests/general_functions/proc_nice_basic-win.phpt b/ext/standard/tests/general_functions/proc_nice_basic-win.phpt index 157ad74783..539eea202e 100644 --- a/ext/standard/tests/general_functions/proc_nice_basic-win.phpt +++ b/ext/standard/tests/general_functions/proc_nice_basic-win.phpt @@ -86,7 +86,7 @@ foreach ($p as $test => $data) { print (($wp = get_priority_from_wmic()) === $data[0] ? 'Passed' : 'Failed (' . $wp . ')') . PHP_EOL; } ?> ---EXPECTF-- +--EXPECT-- Testing 'Idle' (10): Passed Testing 'Below normal' (5): Passed Testing 'Normal' (0): Passed diff --git a/ext/standard/tests/general_functions/proc_nice_basic.phpt b/ext/standard/tests/general_functions/proc_nice_basic.phpt index 12469bf4eb..d14a5f62a9 100644 --- a/ext/standard/tests/general_functions/proc_nice_basic.phpt +++ b/ext/standard/tests/general_functions/proc_nice_basic.phpt @@ -28,5 +28,5 @@ if(substr(strtoupper(PHP_OS), 0, 3) == 'WIN') die('skip. not for Windows'); $niceAfter = getNice($pid); var_dump($niceBefore == ($niceAfter - $delta)); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/standard/tests/general_functions/proc_nice_variation2.phpt b/ext/standard/tests/general_functions/proc_nice_variation2.phpt index 42cbf9e00f..f1f93be221 100644 --- a/ext/standard/tests/general_functions/proc_nice_variation2.phpt +++ b/ext/standard/tests/general_functions/proc_nice_variation2.phpt @@ -29,7 +29,7 @@ foreach ( $variation_array as $var ) { var_dump(proc_nice( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with boolean values *** bool(true) bool(true) diff --git a/ext/standard/tests/general_functions/proc_open_pipes2.phpt b/ext/standard/tests/general_functions/proc_open_pipes2.phpt index a232d53dd7..bc8f29b6fe 100644 --- a/ext/standard/tests/general_functions/proc_open_pipes2.phpt +++ b/ext/standard/tests/general_functions/proc_open_pipes2.phpt @@ -22,7 +22,7 @@ include dirname(__FILE__) . "/proc_open_pipes.inc"; unlink_sleep_script(); ?> ---EXPECTF-- +--EXPECT-- int(0) array(0) { } diff --git a/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt b/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt index eb5187b205..08ac2f1d01 100644 --- a/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt +++ b/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt @@ -35,7 +35,7 @@ var_dump(putenv('FOO=°¡a°¡°¡°¡°¡'), getenv("FOO")); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(true) string(2) "°¡" bool(true) diff --git a/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt b/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt index 70f5d08cea..76c6db5468 100644 --- a/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt +++ b/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt @@ -24,7 +24,7 @@ var_dump(putenv('FOO=å•Šaå•Šå•Šå•Šå•Š'), getenv("FOO")); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(true) string(3) "å•Š" bool(true) diff --git a/ext/standard/tests/general_functions/var_export_basic8.phpt b/ext/standard/tests/general_functions/var_export_basic8.phpt index 6e6263d2ad..f71c095f96 100644 --- a/ext/standard/tests/general_functions/var_export_basic8.phpt +++ b/ext/standard/tests/general_functions/var_export_basic8.phpt @@ -28,7 +28,7 @@ var_export($b); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- -- Var export on a simple object -- stdClass::__set_state(array( 'a' => 1, diff --git a/ext/standard/tests/general_functions/var_export_bug66179.phpt b/ext/standard/tests/general_functions/var_export_bug66179.phpt index 15952199e5..07ca3c5571 100644 --- a/ext/standard/tests/general_functions/var_export_bug66179.phpt +++ b/ext/standard/tests/general_functions/var_export_bug66179.phpt @@ -19,7 +19,7 @@ var_export(10000000000000000.0); echo PHP_EOL; ?> ---EXPECTF-- +--EXPECT-- 1.0 123.0 -1.0 diff --git a/ext/standard/tests/image/getimagesize_jpgapp.phpt b/ext/standard/tests/image/getimagesize_jpgapp.phpt index 8e179d2551..c3ebcef282 100644 --- a/ext/standard/tests/image/getimagesize_jpgapp.phpt +++ b/ext/standard/tests/image/getimagesize_jpgapp.phpt @@ -30,7 +30,7 @@ foreach ($arr as $key => $value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- APP1 - length: 1717; md5: 02cbf4ba6640c131422483138c968516 APP2 - length: 7275; md5: f5036ccca2031e8bf932bcbd4aca4355 APP13 - length: 42; md5: 2202998bd05e78bcb419f08c070d6f61 diff --git a/ext/standard/tests/image/getimagesize_variation4.phpt b/ext/standard/tests/image/getimagesize_variation4.phpt index 8fa690c27f..8c37da7665 100644 --- a/ext/standard/tests/image/getimagesize_variation4.phpt +++ b/ext/standard/tests/image/getimagesize_variation4.phpt @@ -19,7 +19,7 @@ var_dump( getimagesize(dirname(__FILE__)."/test13pix.swf", $info) ); var_dump( $info ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing getimagesize() : variation *** array(5) { [0]=> diff --git a/ext/standard/tests/image/getimagesize_variation_005.phpt b/ext/standard/tests/image/getimagesize_variation_005.phpt index 6f0ad8f190..f5f2b83da2 100644 --- a/ext/standard/tests/image/getimagesize_variation_005.phpt +++ b/ext/standard/tests/image/getimagesize_variation_005.phpt @@ -19,7 +19,7 @@ var_dump( getimagesize(dirname(__FILE__)."/test13pix.swf", $info) ); var_dump( $info ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing getimagesize() : basic functionality *** array(5) { [0]=> diff --git a/ext/standard/tests/image/iptcembed_001.phpt b/ext/standard/tests/image/iptcembed_001.phpt index feadddea1b..a8ca381ce8 100644 --- a/ext/standard/tests/image/iptcembed_001.phpt +++ b/ext/standard/tests/image/iptcembed_001.phpt @@ -13,6 +13,6 @@ unlink($file); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(false) Done diff --git a/ext/standard/tests/mail/bug69874.phpt b/ext/standard/tests/mail/bug69874.phpt index a952a73bdc..14a4b452df 100644 --- a/ext/standard/tests/mail/bug69874.phpt +++ b/ext/standard/tests/mail/bug69874.phpt @@ -32,7 +32,7 @@ unlink($outFile); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing mail() : send email without additional headers *** bool(true) To: user@company.com diff --git a/ext/standard/tests/math/abs_basic.phpt b/ext/standard/tests/math/abs_basic.phpt index 0f6ecbc09b..bc62b38752 100644 --- a/ext/standard/tests/math/abs_basic.phpt +++ b/ext/standard/tests/math/abs_basic.phpt @@ -32,7 +32,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing abs() : basic functionality *** int(23) int(23) diff --git a/ext/standard/tests/math/atan2_basic.phpt b/ext/standard/tests/math/atan2_basic.phpt index 65a0622c6a..8312bb2890 100644 --- a/ext/standard/tests/math/atan2_basic.phpt +++ b/ext/standard/tests/math/atan2_basic.phpt @@ -38,7 +38,7 @@ for ($i = 0; $i < count($valuesy); $i++) { } } ?> ---EXPECTF-- +--EXPECT-- Y:23 X:23 float(0.78539816339745) Y:23 X:-23 float(2.3561944901923) Y:23 X:23.45 float(0.77571063007847) diff --git a/ext/standard/tests/math/base_convert_basic.phpt b/ext/standard/tests/math/base_convert_basic.phpt index 69a2667a24..0da1d1f77c 100644 --- a/ext/standard/tests/math/base_convert_basic.phpt +++ b/ext/standard/tests/math/base_convert_basic.phpt @@ -29,7 +29,7 @@ for ($f= 0; $f < count($frombase); $f++) { } ?> ---EXPECTF-- +--EXPECT-- ...from base is 2 ......to base is 2 .........value= 10 res = 10 diff --git a/ext/standard/tests/math/bindec_basic.phpt b/ext/standard/tests/math/bindec_basic.phpt index 9fcca4a7ee..d746b8a1ca 100644 --- a/ext/standard/tests/math/bindec_basic.phpt +++ b/ext/standard/tests/math/bindec_basic.phpt @@ -33,7 +33,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- int(455) int(0) int(32766) diff --git a/ext/standard/tests/math/bindec_basic_64bit.phpt b/ext/standard/tests/math/bindec_basic_64bit.phpt index 949c19eea3..3641f0bc41 100644 --- a/ext/standard/tests/math/bindec_basic_64bit.phpt +++ b/ext/standard/tests/math/bindec_basic_64bit.phpt @@ -33,7 +33,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- int(455) int(0) int(32766) diff --git a/ext/standard/tests/math/ceil_basic.phpt b/ext/standard/tests/math/ceil_basic.phpt index e90afd3388..922d0b14f0 100644 --- a/ext/standard/tests/math/ceil_basic.phpt +++ b/ext/standard/tests/math/ceil_basic.phpt @@ -43,7 +43,7 @@ for ($i = 0; $i < count($values); $i++) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing ceil() : basic functionality *** float(0) float(0) diff --git a/ext/standard/tests/math/decbin_basic.phpt b/ext/standard/tests/math/decbin_basic.phpt index 572a04245e..00ed582559 100644 --- a/ext/standard/tests/math/decbin_basic.phpt +++ b/ext/standard/tests/math/decbin_basic.phpt @@ -23,7 +23,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ---EXPECTF-- +--EXPECT-- string(4) "1010" string(12) "111101101110" string(12) "111101101110" diff --git a/ext/standard/tests/math/dechex_basic.phpt b/ext/standard/tests/math/dechex_basic.phpt index ac53a97b34..c842bf7984 100644 --- a/ext/standard/tests/math/dechex_basic.phpt +++ b/ext/standard/tests/math/dechex_basic.phpt @@ -22,7 +22,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- string(1) "a" string(3) "f6e" string(3) "f6e" diff --git a/ext/standard/tests/math/decoct_basic.phpt b/ext/standard/tests/math/decoct_basic.phpt index 3a5011b973..a3dd741b41 100644 --- a/ext/standard/tests/math/decoct_basic.phpt +++ b/ext/standard/tests/math/decoct_basic.phpt @@ -22,7 +22,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- string(2) "12" string(4) "7556" string(4) "7556" diff --git a/ext/standard/tests/math/exp_basic.phpt b/ext/standard/tests/math/exp_basic.phpt index 135705507c..21f7413d82 100644 --- a/ext/standard/tests/math/exp_basic.phpt +++ b/ext/standard/tests/math/exp_basic.phpt @@ -27,7 +27,7 @@ foreach($values as $value) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- -- Iteration 1 -- float(22026.465794807) diff --git a/ext/standard/tests/math/expm1_basic.phpt b/ext/standard/tests/math/expm1_basic.phpt index 320b01a27d..7853aeb20c 100644 --- a/ext/standard/tests/math/expm1_basic.phpt +++ b/ext/standard/tests/math/expm1_basic.phpt @@ -34,7 +34,7 @@ foreach($values as $value) { }; ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing expm1() : basic functionality *** -- Iteration 1 -- diff --git a/ext/standard/tests/math/floor_basic.phpt b/ext/standard/tests/math/floor_basic.phpt index 2b6d2f75c8..034f55f00e 100644 --- a/ext/standard/tests/math/floor_basic.phpt +++ b/ext/standard/tests/math/floor_basic.phpt @@ -39,7 +39,7 @@ foreach($values as $value) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing floor() : basic functionality *** -- floor 0 -- diff --git a/ext/standard/tests/math/fmod_basic.phpt b/ext/standard/tests/math/fmod_basic.phpt index c29abca9d2..003a49498e 100644 --- a/ext/standard/tests/math/fmod_basic.phpt +++ b/ext/standard/tests/math/fmod_basic.phpt @@ -38,7 +38,7 @@ for ($i = 0; $i < count($values1); $i++) { } } ?> ---EXPECTF-- +--EXPECT-- iteration 0 float(0) diff --git a/ext/standard/tests/math/hexdec_basic.phpt b/ext/standard/tests/math/hexdec_basic.phpt index 1c42ae7e40..796c4e9bae 100644 --- a/ext/standard/tests/math/hexdec_basic.phpt +++ b/ext/standard/tests/math/hexdec_basic.phpt @@ -29,7 +29,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- int(18433668) int(126895953) float(142929835591) diff --git a/ext/standard/tests/math/hexdec_basic_64bit.phpt b/ext/standard/tests/math/hexdec_basic_64bit.phpt index f1a2028b5c..8c2942fb71 100644 --- a/ext/standard/tests/math/hexdec_basic_64bit.phpt +++ b/ext/standard/tests/math/hexdec_basic_64bit.phpt @@ -34,7 +34,7 @@ foreach($values as $value) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing hexdec() : basic functionality *** -- hexdec 1194684 -- diff --git a/ext/standard/tests/math/intdiv_64bit.phpt b/ext/standard/tests/math/intdiv_64bit.phpt index c674dd3b85..acc7f4ef98 100644 --- a/ext/standard/tests/math/intdiv_64bit.phpt +++ b/ext/standard/tests/math/intdiv_64bit.phpt @@ -11,5 +11,5 @@ if (PHP_INT_SIZE !== 8) { // (int)(PHP_INT_MAX / 3) gives a different result var_dump(intdiv(PHP_INT_MAX, 3)); ?> ---EXPECTF-- +--EXPECT-- int(3074457345618258602)
\ No newline at end of file diff --git a/ext/standard/tests/math/is_finite_basic.phpt b/ext/standard/tests/math/is_finite_basic.phpt index 85d2685273..3b80c969d9 100644 --- a/ext/standard/tests/math/is_finite_basic.phpt +++ b/ext/standard/tests/math/is_finite_basic.phpt @@ -22,7 +22,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/math/is_infinite_basic.phpt b/ext/standard/tests/math/is_infinite_basic.phpt index ca79922287..2ae5679285 100644 --- a/ext/standard/tests/math/is_infinite_basic.phpt +++ b/ext/standard/tests/math/is_infinite_basic.phpt @@ -22,7 +22,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/math/is_nan_basic.phpt b/ext/standard/tests/math/is_nan_basic.phpt index fb10737cea..a7998e1314 100644 --- a/ext/standard/tests/math/is_nan_basic.phpt +++ b/ext/standard/tests/math/is_nan_basic.phpt @@ -25,7 +25,7 @@ for ($i = 0; $i < count($values); $i++) { ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/math/log1p_basic.phpt b/ext/standard/tests/math/log1p_basic.phpt index b28941860f..b6d14a26e7 100644 --- a/ext/standard/tests/math/log1p_basic.phpt +++ b/ext/standard/tests/math/log1p_basic.phpt @@ -35,7 +35,7 @@ foreach($values as $value) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing log1p() : basic functionality *** LOG1p tests diff --git a/ext/standard/tests/math/log_basic.phpt b/ext/standard/tests/math/log_basic.phpt index e2f9c9fe7d..1b0b628d51 100644 --- a/ext/standard/tests/math/log_basic.phpt +++ b/ext/standard/tests/math/log_basic.phpt @@ -30,7 +30,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ---EXPECTF-- +--EXPECT-- LOG tests...no base float(3.1354942159291) float(NAN) diff --git a/ext/standard/tests/math/mt_rand_basic.phpt b/ext/standard/tests/math/mt_rand_basic.phpt index 0f7b8a8b6e..5ffa059c3f 100644 --- a/ext/standard/tests/math/mt_rand_basic.phpt +++ b/ext/standard/tests/math/mt_rand_basic.phpt @@ -79,7 +79,7 @@ for ($x = 0; $x < count($min); $x++) { } } ?> ---EXPECTF-- +--EXPECT-- mt_rand() tests with default min and max value (i.e 0 thru 2147483647) PASSED: range min = 0 max = 2147483647 diff --git a/ext/standard/tests/math/mt_rand_value.phpt b/ext/standard/tests/math/mt_rand_value.phpt index cf7b9f00b6..ab6d732709 100644 --- a/ext/standard/tests/math/mt_rand_value.phpt +++ b/ext/standard/tests/math/mt_rand_value.phpt @@ -37,7 +37,7 @@ echo $x.PHP_EOL; */ ?> ---EXPECTF-- +--EXPECT-- 1614640687 1711027313 857485497 diff --git a/ext/standard/tests/math/mt_srand_basic.phpt b/ext/standard/tests/math/mt_srand_basic.phpt index e28b1b9eae..a3a34ab73b 100644 --- a/ext/standard/tests/math/mt_srand_basic.phpt +++ b/ext/standard/tests/math/mt_srand_basic.phpt @@ -13,7 +13,7 @@ var_dump(mt_srand(true)); var_dump(mt_srand(false)); var_dump(mt_srand(NULL)); ?> ---EXPECTF-- +--EXPECT-- NULL NULL NULL diff --git a/ext/standard/tests/math/number_format_basic.phpt b/ext/standard/tests/math/number_format_basic.phpt index 7f5f4beb25..330a71b4a7 100644 --- a/ext/standard/tests/math/number_format_basic.phpt +++ b/ext/standard/tests/math/number_format_basic.phpt @@ -39,7 +39,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- number_format tests.....default string(5) "1,235" string(6) "-1,235" diff --git a/ext/standard/tests/math/number_format_multichar.phpt b/ext/standard/tests/math/number_format_multichar.phpt index ae36d12c73..2141cc20a4 100644 --- a/ext/standard/tests/math/number_format_multichar.phpt +++ b/ext/standard/tests/math/number_format_multichar.phpt @@ -33,7 +33,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- number_format tests.....multiple character decimal point string(13) "1 234·57" string(14) "-1 234·57" diff --git a/ext/standard/tests/math/octdec_basic.phpt b/ext/standard/tests/math/octdec_basic.phpt index 8fd57ecfef..ff584f2514 100644 --- a/ext/standard/tests/math/octdec_basic.phpt +++ b/ext/standard/tests/math/octdec_basic.phpt @@ -29,7 +29,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- int(14489) int(253) int(36947879) diff --git a/ext/standard/tests/math/octdec_basic_64bit.phpt b/ext/standard/tests/math/octdec_basic_64bit.phpt index 98996dc182..c77ca722bb 100644 --- a/ext/standard/tests/math/octdec_basic_64bit.phpt +++ b/ext/standard/tests/math/octdec_basic_64bit.phpt @@ -33,7 +33,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing octdec() : basic functionality *** int(14489) int(253) diff --git a/ext/standard/tests/math/pi_basic.phpt b/ext/standard/tests/math/pi_basic.phpt index fec5691371..b4d6c8ebe9 100644 --- a/ext/standard/tests/math/pi_basic.phpt +++ b/ext/standard/tests/math/pi_basic.phpt @@ -9,6 +9,6 @@ echo M_PI, "\n"; // N.B pi() ignores all specified arguments no error // messages are produced if arguments are spcified. ?> ---EXPECTF-- +--EXPECT-- 3.1415926535898 3.1415926535898 diff --git a/ext/standard/tests/math/pow_basic_64bit.phpt b/ext/standard/tests/math/pow_basic_64bit.phpt index 898f6efa33..fd583a0243 100644 --- a/ext/standard/tests/math/pow_basic_64bit.phpt +++ b/ext/standard/tests/math/pow_basic_64bit.phpt @@ -47,7 +47,7 @@ foreach($bases as $base) { } ?> ===Done=== ---EXPECTF-- +--EXPECT-- Base = 23 ..... Exponent = 0 Result = 1 ..... Exponent = 1 Result = 23 diff --git a/ext/standard/tests/math/round_basic.phpt b/ext/standard/tests/math/round_basic.phpt index d4b94ec056..72ab13fc3e 100644 --- a/ext/standard/tests/math/round_basic.phpt +++ b/ext/standard/tests/math/round_basic.phpt @@ -45,7 +45,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing round() : basic functionality *** round: 123456789 ...with precision 2-> float(123456789) diff --git a/ext/standard/tests/math/srand_basic.phpt b/ext/standard/tests/math/srand_basic.phpt index b56ad10ac0..a3788cdf45 100644 --- a/ext/standard/tests/math/srand_basic.phpt +++ b/ext/standard/tests/math/srand_basic.phpt @@ -21,7 +21,7 @@ var_dump(srand(false)); var_dump(srand(NULL)); ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing srand() : basic functionality *** NULL NULL diff --git a/ext/standard/tests/misc/get_browser_basic.phpt b/ext/standard/tests/misc/get_browser_basic.phpt index 60638e005e..69db7345a5 100644 --- a/ext/standard/tests/misc/get_browser_basic.phpt +++ b/ext/standard/tests/misc/get_browser_basic.phpt @@ -33,7 +33,7 @@ for( $x = 0; $x < 20; $x++) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing get_browser() : basic functionality *** array(35) { ["browser_name_regex"]=> diff --git a/ext/standard/tests/misc/get_browser_variation1.phpt b/ext/standard/tests/misc/get_browser_variation1.phpt index ac485155a9..6cc77e6765 100644 --- a/ext/standard/tests/misc/get_browser_variation1.phpt +++ b/ext/standard/tests/misc/get_browser_variation1.phpt @@ -34,7 +34,7 @@ for( $x = 20; $x < $count; $x++) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing get_browser() : variation functionality: extra browser names *** array(35) { ["browser_name_regex"]=> diff --git a/ext/standard/tests/network/http-stream.phpt b/ext/standard/tests/network/http-stream.phpt index 1186060096..45c5cb636b 100644 --- a/ext/standard/tests/network/http-stream.phpt +++ b/ext/standard/tests/network/http-stream.phpt @@ -20,5 +20,5 @@ $e = $d->load("http://127.0.0.1:12342/news.rss"); echo "ALIVE\n"; http_server_kill($pid); ?> ---EXPECTF-- +--EXPECT-- ALIVE diff --git a/ext/standard/tests/serialize/bug26762.phpt b/ext/standard/tests/serialize/bug26762.phpt index dd779780f4..74aeb46e80 100644 --- a/ext/standard/tests/serialize/bug26762.phpt +++ b/ext/standard/tests/serialize/bug26762.phpt @@ -22,5 +22,5 @@ catch (Exception $e) { } ?> ---EXPECTF-- +--EXPECT-- string(3) "FOO" diff --git a/ext/standard/tests/serialize/bug64354_1.phpt b/ext/standard/tests/serialize/bug64354_1.phpt index e85749bcbe..ae6f0383d2 100644 --- a/ext/standard/tests/serialize/bug64354_1.phpt +++ b/ext/standard/tests/serialize/bug64354_1.phpt @@ -20,6 +20,6 @@ try { var_dump($e->getMessage()); } ?> ---EXPECTF-- +--EXPECT-- string(6) "Failed" string(6) "Failed" diff --git a/ext/standard/tests/serialize/bug64354_2.phpt b/ext/standard/tests/serialize/bug64354_2.phpt index 41a455b54a..a9a252d09a 100644 --- a/ext/standard/tests/serialize/bug64354_2.phpt +++ b/ext/standard/tests/serialize/bug64354_2.phpt @@ -20,5 +20,5 @@ try { var_dump($e->getMessage()); } ?> ---EXPECTF-- +--EXPECT-- string(6) "Failed" diff --git a/ext/standard/tests/serialize/bug64354_3.phpt b/ext/standard/tests/serialize/bug64354_3.phpt index 3ce61152d6..c7eea59be5 100644 --- a/ext/standard/tests/serialize/bug64354_3.phpt +++ b/ext/standard/tests/serialize/bug64354_3.phpt @@ -25,5 +25,5 @@ try { var_dump($e->getMessage()); } ?> ---EXPECTF-- +--EXPECT-- string(6) "Failed" diff --git a/ext/standard/tests/serialize/bug68594.phpt b/ext/standard/tests/serialize/bug68594.phpt index 60fc7a76ab..fbf9310d0b 100644 --- a/ext/standard/tests/serialize/bug68594.phpt +++ b/ext/standard/tests/serialize/bug68594.phpt @@ -19,5 +19,5 @@ for ($i=4; $i<100; $i++) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== diff --git a/ext/standard/tests/serialize/bug68976.phpt b/ext/standard/tests/serialize/bug68976.phpt index a79a953a4a..15bad692ed 100644 --- a/ext/standard/tests/serialize/bug68976.phpt +++ b/ext/standard/tests/serialize/bug68976.phpt @@ -26,7 +26,7 @@ for($i = 0; $i < 5; $i++) { var_dump($data); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- array(2) { [0]=> object(evilClass)#1 (0) { diff --git a/ext/standard/tests/serialize/bug71940.phpt b/ext/standard/tests/serialize/bug71940.phpt index c391ba6603..75d227d7c4 100644 --- a/ext/standard/tests/serialize/bug71940.phpt +++ b/ext/standard/tests/serialize/bug71940.phpt @@ -43,7 +43,7 @@ $serialized = serialize([$entry1, $entry2]); print_r(unserialize($serialized)); ?> ---EXPECTF-- +--EXPECT-- Array ( [0] => Entry Object diff --git a/ext/standard/tests/serialize/bug72229.phpt b/ext/standard/tests/serialize/bug72229.phpt index 17c393c7d4..68727ad104 100644 --- a/ext/standard/tests/serialize/bug72229.phpt +++ b/ext/standard/tests/serialize/bug72229.phpt @@ -22,7 +22,7 @@ print_r($Obj1); $Obj2->arr2[0] = 50; print_r($Obj2); ?> ---EXPECTF-- +--EXPECT-- C1 Object ( [arr1] => Array diff --git a/ext/standard/tests/serialize/serialization_arrays_001.phpt b/ext/standard/tests/serialize/serialization_arrays_001.phpt index 51acfc4b46..4b142344f9 100644 --- a/ext/standard/tests/serialize/serialization_arrays_001.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_001.phpt @@ -35,7 +35,7 @@ var_dump($arr_asso); echo "\nDone"; ?> ---EXPECTF-- +--EXPECT-- --- Testing Circular reference of an array --- -- Normal array -- string(238) "a:7:{i:0;i:0;i:1;i:1;i:2;i:-2;i:3;d:3.333333000000000101437080957111902534961700439453125;i:4;s:1:"a";i:5;a:0:{}i:6;a:7:{i:0;i:0;i:1;i:1;i:2;i:-2;i:3;d:3.333333000000000101437080957111902534961700439453125;i:4;s:1:"a";i:5;a:0:{}i:6;R:8;}}" diff --git a/ext/standard/tests/serialize/serialization_arrays_002.phpt b/ext/standard/tests/serialize/serialization_arrays_002.phpt index c62ff6a91c..b7348b969b 100644 --- a/ext/standard/tests/serialize/serialization_arrays_002.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_002.phpt @@ -100,7 +100,7 @@ check($a); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --- No references: diff --git a/ext/standard/tests/serialize/serialization_arrays_003.phpt b/ext/standard/tests/serialize/serialization_arrays_003.phpt index 8d664fccf3..08f5ead4e5 100644 --- a/ext/standard/tests/serialize/serialization_arrays_003.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_003.phpt @@ -70,7 +70,7 @@ check($a); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --- 0 refs external: diff --git a/ext/standard/tests/serialize/serialization_arrays_004.phpt b/ext/standard/tests/serialize/serialization_arrays_004.phpt index 55d849c972..7ebacce98d 100644 --- a/ext/standard/tests/serialize/serialization_arrays_004.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_004.phpt @@ -51,7 +51,7 @@ check($a); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --- 1 refs container: array(3) { [0]=> diff --git a/ext/standard/tests/serialize/serialization_arrays_005.phpt b/ext/standard/tests/serialize/serialization_arrays_005.phpt index 10e33129f8..a22c04b8be 100644 --- a/ext/standard/tests/serialize/serialization_arrays_005.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_005.phpt @@ -78,7 +78,7 @@ $a[1] = &$c; check($c); ?> ---EXPECTF-- +--EXPECT-- --- Nested array references 1 element in containing array: array(3) { [0]=> diff --git a/ext/standard/tests/serialize/serialization_miscTypes_001.phpt b/ext/standard/tests/serialize/serialization_miscTypes_001.phpt Binary files differindex 548a67345f..0d800d1516 100644 --- a/ext/standard/tests/serialize/serialization_miscTypes_001.phpt +++ b/ext/standard/tests/serialize/serialization_miscTypes_001.phpt diff --git a/ext/standard/tests/serialize/serialization_objects_004.phpt b/ext/standard/tests/serialize/serialization_objects_004.phpt index 6b826a398b..ec3713e844 100644 --- a/ext/standard/tests/serialize/serialization_objects_004.phpt +++ b/ext/standard/tests/serialize/serialization_objects_004.phpt @@ -39,7 +39,7 @@ var_dump(serialize(array($x, $x))); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- string(37) "a:2:{i:0;O:8:"stdClass":0:{}i:1;r:2;}" string(22) "a:2:{i:0;i:1;i:1;i:1;}" string(30) "a:2:{i:0;s:1:"a";i:1;s:1:"a";}" diff --git a/ext/standard/tests/serialize/serialization_objects_010.phpt b/ext/standard/tests/serialize/serialization_objects_010.phpt index 0fbf0723df..25a7f24d27 100644 --- a/ext/standard/tests/serialize/serialization_objects_010.phpt +++ b/ext/standard/tests/serialize/serialization_objects_010.phpt @@ -32,6 +32,6 @@ try { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- C::serialize() must return a string or NULL Done
\ No newline at end of file diff --git a/ext/standard/tests/serialize/serialization_precision_001.phpt b/ext/standard/tests/serialize/serialization_precision_001.phpt index eb633beb74..0be0c68a89 100644 --- a/ext/standard/tests/serialize/serialization_precision_001.phpt +++ b/ext/standard/tests/serialize/serialization_precision_001.phpt @@ -17,5 +17,5 @@ serialize_precision=10 var_dump(serialize(0.1)); ?> ---EXPECTF-- +--EXPECT-- string(6) "d:0.1;"
\ No newline at end of file diff --git a/ext/standard/tests/serialize/serialization_precision_002.phpt b/ext/standard/tests/serialize/serialization_precision_002.phpt index 653fabea36..91091e72a2 100644 --- a/ext/standard/tests/serialize/serialization_precision_002.phpt +++ b/ext/standard/tests/serialize/serialization_precision_002.phpt @@ -17,5 +17,5 @@ serialize_precision=75 var_dump(serialize(0.1)); ?> ---EXPECTF-- +--EXPECT-- string(60) "d:0.1000000000000000055511151231257827021181583404541015625;"
\ No newline at end of file diff --git a/ext/standard/tests/streams/bug48309.phpt b/ext/standard/tests/streams/bug48309.phpt index bb2d9d28f7..300926be51 100644 --- a/ext/standard/tests/streams/bug48309.phpt +++ b/ext/standard/tests/streams/bug48309.phpt @@ -24,7 +24,7 @@ echo "\n"; var_dump(stream_get_contents($tmp)); ?> ---EXPECTF-- +--EXPECT-- -- stream_copy_to_stream() -- te string(2) "st" diff --git a/ext/standard/tests/streams/bug49936.phpt b/ext/standard/tests/streams/bug49936.phpt index d98db1d799..dccf87474c 100644 --- a/ext/standard/tests/streams/bug49936.phpt +++ b/ext/standard/tests/streams/bug49936.phpt @@ -15,7 +15,7 @@ var_dump(@opendir($dir)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(false) bool(false) ===DONE=== diff --git a/ext/standard/tests/streams/bug67626.phpt b/ext/standard/tests/streams/bug67626.phpt index 67c2c3f8e0..fefe6c1f0a 100644 --- a/ext/standard/tests/streams/bug67626.phpt +++ b/ext/standard/tests/streams/bug67626.phpt @@ -40,6 +40,6 @@ try { echo $e->getMessage(); } ?> ---EXPECTF-- +--EXPECT-- stream_read_exception stream_write_exception
\ No newline at end of file diff --git a/ext/standard/tests/streams/bug70198.phpt b/ext/standard/tests/streams/bug70198.phpt index bfba808769..fd02b8c0bc 100644 --- a/ext/standard/tests/streams/bug70198.phpt +++ b/ext/standard/tests/streams/bug70198.phpt @@ -55,7 +55,7 @@ proc_close($srv_proc); unlink($srv_fl); ?> ==DONE== ---EXPECTF-- +--EXPECT-- int(0) ==DONE== diff --git a/ext/standard/tests/streams/bug71245.phpt b/ext/standard/tests/streams/bug71245.phpt index e1d82f65f9..c9cad0c6d7 100644 --- a/ext/standard/tests/streams/bug71245.phpt +++ b/ext/standard/tests/streams/bug71245.phpt @@ -18,7 +18,7 @@ $context = stream_context_create($httpContext); $headers = ["Host: bad.com"]; print_r(stream_context_get_options($context)); ?> ---EXPECTF-- +--EXPECT-- Array ( [http] => Array diff --git a/ext/standard/tests/streams/bug71323.phpt b/ext/standard/tests/streams/bug71323.phpt index 29d784719f..12d06cd874 100644 --- a/ext/standard/tests/streams/bug71323.phpt +++ b/ext/standard/tests/streams/bug71323.phpt @@ -8,7 +8,7 @@ $file = 'data:text/plain;z=y;uri=eviluri;mediatype=wut?;mediatype2=hello,somedat $meta = stream_get_meta_data(fopen($file, "r")); var_dump($meta); ?> ---EXPECTF-- +--EXPECT-- array(10) { ["mediatype"]=> string(10) "text/plain" diff --git a/ext/standard/tests/streams/bug72853.phpt b/ext/standard/tests/streams/bug72853.phpt index 48bd60e7a6..8de0264ac0 100644 --- a/ext/standard/tests/streams/bug72853.phpt +++ b/ext/standard/tests/streams/bug72853.phpt @@ -24,7 +24,7 @@ while ($outs = fgets($pipes[1], 1024)) { var_dump(stream_get_meta_data($pipes[1])); proc_close($p); ?> ---EXPECTF-- +--EXPECT-- array(7) { ["timed_out"]=> bool(false) diff --git a/ext/standard/tests/streams/bug74090.phpt b/ext/standard/tests/streams/bug74090.phpt index 370dd13f1b..47efc2c7cd 100644 --- a/ext/standard/tests/streams/bug74090.phpt +++ b/ext/standard/tests/streams/bug74090.phpt @@ -17,6 +17,6 @@ var_dump(strlen($ret) > 0); stream_socket_shutdown($fd,STREAM_SHUT_RDWR);
?>
==DONE==
---EXPECTF--
+--EXPECT--
bool(true)
==DONE==
diff --git a/ext/standard/tests/streams/user_streams_consumed_bug.phpt b/ext/standard/tests/streams/user_streams_consumed_bug.phpt index 147a7bd0a7..ebfa1f095d 100644 --- a/ext/standard/tests/streams/user_streams_consumed_bug.phpt +++ b/ext/standard/tests/streams/user_streams_consumed_bug.phpt @@ -24,7 +24,7 @@ stream_filter_append(STDOUT, "intercept_filter"); $out = fwrite(STDOUT, "Goodbye\n"); var_dump($out); ---EXPECTF-- +--EXPECT-- Hello int(6) Goodbye diff --git a/ext/standard/tests/strings/005.phpt b/ext/standard/tests/strings/005.phpt index a69ff49425..ebfbe221d8 100644 --- a/ext/standard/tests/strings/005.phpt +++ b/ext/standard/tests/strings/005.phpt @@ -16,7 +16,7 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- hello int(8192) bool(false) diff --git a/ext/standard/tests/strings/addcslashes_002.phpt b/ext/standard/tests/strings/addcslashes_002.phpt index eb46803bbe..fa5b3028fb 100644 --- a/ext/standard/tests/strings/addcslashes_002.phpt +++ b/ext/standard/tests/strings/addcslashes_002.phpt @@ -24,7 +24,7 @@ var_dump( addcslashes($obj, "b") ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing addcslashes() with ASCII code between 0 and 31 *** string(44) "goodyear12345NULL\000truefalse\a\v\f\b\n\r\t" diff --git a/ext/standard/tests/strings/addcslashes_003.phpt b/ext/standard/tests/strings/addcslashes_003.phpt Binary files differindex f1d658135b..7c97adfa2d 100644 --- a/ext/standard/tests/strings/addcslashes_003.phpt +++ b/ext/standard/tests/strings/addcslashes_003.phpt diff --git a/ext/standard/tests/strings/addslashes_basic.phpt b/ext/standard/tests/strings/addslashes_basic.phpt index 0912d34e48..eeb5627067 100644 --- a/ext/standard/tests/strings/addslashes_basic.phpt +++ b/ext/standard/tests/strings/addslashes_basic.phpt @@ -29,7 +29,7 @@ foreach( $str_array as $str ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing addslashes() : basic functionality *** string(16) "How\'s everybody" string(17) "Are you \"JOHN\"?" diff --git a/ext/standard/tests/strings/basename_basic.phpt b/ext/standard/tests/strings/basename_basic.phpt Binary files differindex fa0d410e5f..31299276b3 100644 --- a/ext/standard/tests/strings/basename_basic.phpt +++ b/ext/standard/tests/strings/basename_basic.phpt diff --git a/ext/standard/tests/strings/basename_invalid_path.phpt b/ext/standard/tests/strings/basename_invalid_path.phpt index b632efa845..8928fa1aeb 100644 --- a/ext/standard/tests/strings/basename_invalid_path.phpt +++ b/ext/standard/tests/strings/basename_invalid_path.phpt @@ -17,6 +17,6 @@ var_dump(basename(chr(-1))); echo "Done\n"; ---EXPECTF-- +--EXPECT-- string(0) "" Done diff --git a/ext/standard/tests/strings/basename_variation.phpt b/ext/standard/tests/strings/basename_variation.phpt index 1efd8c701a..a0e8ebc744 100644 --- a/ext/standard/tests/strings/basename_variation.phpt +++ b/ext/standard/tests/strings/basename_variation.phpt @@ -86,7 +86,7 @@ check_basename( $file_path_variations ); echo "Done\n"; ---EXPECTF-- +--EXPECT-- *** Testing possible variations in path and suffix *** --Iteration 1-- diff --git a/ext/standard/tests/strings/bug38322.phpt b/ext/standard/tests/strings/bug38322.phpt index 79f66f1fa0..fd7165894c 100644 --- a/ext/standard/tests/strings/bug38322.phpt +++ b/ext/standard/tests/strings/bug38322.phpt @@ -8,6 +8,6 @@ var_dump(sscanf("a ",'%1$s',$str)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(1) Done diff --git a/ext/standard/tests/strings/bug39032.phpt b/ext/standard/tests/strings/bug39032.phpt index dbd39ec9d8..1628b9df7d 100644 --- a/ext/standard/tests/strings/bug39032.phpt +++ b/ext/standard/tests/strings/bug39032.phpt @@ -10,7 +10,7 @@ var_dump(strcspn(chr(1),"qweqwe")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(1) int(0) int(1) diff --git a/ext/standard/tests/strings/bug39621.phpt b/ext/standard/tests/strings/bug39621.phpt Binary files differindex 1a33147b68..f1973eeaf4 100644 --- a/ext/standard/tests/strings/bug39621.phpt +++ b/ext/standard/tests/strings/bug39621.phpt diff --git a/ext/standard/tests/strings/bug40637.phpt b/ext/standard/tests/strings/bug40637.phpt index 5669083aa6..bdd5a0f816 100644 --- a/ext/standard/tests/strings/bug40637.phpt +++ b/ext/standard/tests/strings/bug40637.phpt @@ -8,6 +8,6 @@ var_dump(strip_tags($html)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(4) "Text" Done diff --git a/ext/standard/tests/strings/bug42107.phpt b/ext/standard/tests/strings/bug42107.phpt index d97f8917e2..aa39da801e 100644 --- a/ext/standard/tests/strings/bug42107.phpt +++ b/ext/standard/tests/strings/bug42107.phpt @@ -15,7 +15,7 @@ var_dump(sscanf('one two', '%1$d %2$d')); var_dump(sscanf('one two', '%1$d')); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(3) "one" diff --git a/ext/standard/tests/strings/bug43957.phpt b/ext/standard/tests/strings/bug43957.phpt index 0380787b73..b74b83a137 100644 --- a/ext/standard/tests/strings/bug43957.phpt +++ b/ext/standard/tests/strings/bug43957.phpt @@ -4,5 +4,5 @@ Bug #43957 (utf8_decode() bogus conversion on multibyte indicator near end of st <?php echo utf8_decode('abc'.chr(0xe0)); ?> ---EXPECTF-- +--EXPECT-- abc? diff --git a/ext/standard/tests/strings/bug53319.phpt b/ext/standard/tests/strings/bug53319.phpt index 0bcc06d5ec..bae7e88b9e 100644 --- a/ext/standard/tests/strings/bug53319.phpt +++ b/ext/standard/tests/strings/bug53319.phpt @@ -10,7 +10,7 @@ var_dump(strip_tags($str)); var_dump(strip_tags('<a/b>', '<a>')); ?> ---EXPECTF-- +--EXPECT-- string(47) "USD<input type="text"/>CDN<input type="text" />" bool(true) string(6) "USDCDN" diff --git a/ext/standard/tests/strings/bug64879.phpt b/ext/standard/tests/strings/bug64879.phpt index 1df90c6d85..ac19ce6a04 100644 --- a/ext/standard/tests/strings/bug64879.phpt +++ b/ext/standard/tests/strings/bug64879.phpt @@ -8,5 +8,5 @@ quoted_printable_encode(str_repeat("\xf4", 100000)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/ext/standard/tests/strings/bug65769.phpt b/ext/standard/tests/strings/bug65769.phpt index 1a81d487c9..2c8b2b801b 100644 --- a/ext/standard/tests/strings/bug65769.phpt +++ b/ext/standard/tests/strings/bug65769.phpt @@ -31,7 +31,7 @@ foreach ($locales as $locale) { ?> +++DONE+++ ---EXPECTF-- +--EXPECT-- string(19) "Swedish_Sweden.1252" string(1) "," string(1) " " diff --git a/ext/standard/tests/strings/bug65947.phpt b/ext/standard/tests/strings/bug65947.phpt index 956aa6049a..2656a1b7f1 100644 --- a/ext/standard/tests/strings/bug65947.phpt +++ b/ext/standard/tests/strings/bug65947.phpt @@ -13,5 +13,5 @@ if ($filename != $b2) print "BUG"; else print "OKEY"; ---EXPECTF-- +--EXPECT-- OKEY diff --git a/ext/standard/tests/strings/bug68710.phpt b/ext/standard/tests/strings/bug68710.phpt index 729a12011b..5eeb09b3d6 100644 --- a/ext/standard/tests/strings/bug68710.phpt +++ b/ext/standard/tests/strings/bug68710.phpt @@ -21,5 +21,5 @@ for ($i=4; $i<100; $i++) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== diff --git a/ext/standard/tests/strings/bug70720.phpt b/ext/standard/tests/strings/bug70720.phpt index 6cdc600c2d..d7f64e0874 100644 --- a/ext/standard/tests/strings/bug70720.phpt +++ b/ext/standard/tests/strings/bug70720.phpt @@ -9,7 +9,7 @@ var_dump(strip_tags('<?xml $xml->test(); ?> this is a test')); /* "->" case in HTML */ var_dump(strip_tags("<span class=sf-dump-> this is a test</span>")); ?> ---EXPECTF-- +--EXPECT-- string(15) " this is a test" string(15) " this is a test" string(15) " this is a test" diff --git a/ext/standard/tests/strings/chop_basic.phpt b/ext/standard/tests/strings/chop_basic.phpt Binary files differindex 99a03cb0f1..7b68ca28d0 100644 --- a/ext/standard/tests/strings/chop_basic.phpt +++ b/ext/standard/tests/strings/chop_basic.phpt diff --git a/ext/standard/tests/strings/chop_variation3.phpt b/ext/standard/tests/strings/chop_variation3.phpt Binary files differindex 9509fb80a4..36f81d34c8 100644 --- a/ext/standard/tests/strings/chop_variation3.phpt +++ b/ext/standard/tests/strings/chop_variation3.phpt diff --git a/ext/standard/tests/strings/chop_variation4.phpt b/ext/standard/tests/strings/chop_variation4.phpt Binary files differindex cd269dfa58..2d67ed06e1 100644 --- a/ext/standard/tests/strings/chop_variation4.phpt +++ b/ext/standard/tests/strings/chop_variation4.phpt diff --git a/ext/standard/tests/strings/chop_variation5.phpt b/ext/standard/tests/strings/chop_variation5.phpt index 8f283e3c3f..7d915c2c86 100644 --- a/ext/standard/tests/strings/chop_variation5.phpt +++ b/ext/standard/tests/strings/chop_variation5.phpt @@ -25,7 +25,7 @@ echo "*** Testing chop() : with miscellaneous arguments ***\n"; echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing chop() : with miscellaneous arguments *** string(9) "chop test" string(12) "chop test " diff --git a/ext/standard/tests/strings/chr_basic.phpt b/ext/standard/tests/strings/chr_basic.phpt index 378b4027a1..bce4184d42 100644 --- a/ext/standard/tests/strings/chr_basic.phpt +++ b/ext/standard/tests/strings/chr_basic.phpt @@ -16,7 +16,7 @@ echo "World"; echo "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing chr() : basic functionality *** Hello World diff --git a/ext/standard/tests/strings/chr_variation1.phpt b/ext/standard/tests/strings/chr_variation1.phpt index 03adc49d47..3da03316c9 100644 --- a/ext/standard/tests/strings/chr_variation1.phpt +++ b/ext/standard/tests/strings/chr_variation1.phpt @@ -78,7 +78,7 @@ fclose($file_handle); //closing the file handle ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing chr() function: with unexpected inputs for 'ascii' argument *** -- Iteration 1 -- string(2) "00" diff --git a/ext/standard/tests/strings/chunk_split_basic.phpt b/ext/standard/tests/strings/chunk_split_basic.phpt index 14ad782ac0..da4720a187 100644 --- a/ext/standard/tests/strings/chunk_split_basic.phpt +++ b/ext/standard/tests/strings/chunk_split_basic.phpt @@ -37,7 +37,7 @@ var_dump( chunk_split($str) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing chunk_split() : basic functionality *** -- Testing chunk_split() with all possible arguments -- string(15) "Te##st##in##g##" diff --git a/ext/standard/tests/strings/chunk_split_variation10.phpt b/ext/standard/tests/strings/chunk_split_variation10.phpt index 36b9fe8a05..99bb623c33 100644 --- a/ext/standard/tests/strings/chunk_split_variation10.phpt +++ b/ext/standard/tests/strings/chunk_split_variation10.phpt @@ -51,7 +51,7 @@ for($count = 0; $count < count($values); $count++) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing chunk_split() : different single quoted strings as 'ending' *** -- Iteration 0 -- string(73) "This is to test chunk_split() with various 'single quoted' ending string." diff --git a/ext/standard/tests/strings/chunk_split_variation11.phpt b/ext/standard/tests/strings/chunk_split_variation11.phpt index 418e607f4c..c08a0c3d88 100644 --- a/ext/standard/tests/strings/chunk_split_variation11.phpt +++ b/ext/standard/tests/strings/chunk_split_variation11.phpt @@ -43,7 +43,7 @@ for($count = 0; $count < count($values); $count++) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing chunk_split() : different values for 'ending' with heredoc 'str'*** -- Iteration 1 -- string(113) "This is heredoc string with and diff --git a/ext/standard/tests/strings/chunk_split_variation12.phpt b/ext/standard/tests/strings/chunk_split_variation12.phpt index e90287546a..6a025f1abb 100644 --- a/ext/standard/tests/strings/chunk_split_variation12.phpt +++ b/ext/standard/tests/strings/chunk_split_variation12.phpt @@ -83,7 +83,7 @@ foreach($heredoc_arr as $value) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing chunk_split() : different heredoc strings for 'ending' argument *** -- Iteration 1 -- string(102) "This is str to check with heredoc ending.This contains, diff --git a/ext/standard/tests/strings/chunk_split_variation13.phpt b/ext/standard/tests/strings/chunk_split_variation13.phpt index 3cbcbe466d..38b8f9568a 100644 --- a/ext/standard/tests/strings/chunk_split_variation13.phpt +++ b/ext/standard/tests/strings/chunk_split_variation13.phpt @@ -28,7 +28,7 @@ for($count = 0; $count < count($values); $count++) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing chunk_split() : default 'chunklen' with long string 'str' *** -- Iteration 0 -- string(85) "1234567890123456789012345678901234567890123456789012345678901234567890123456 diff --git a/ext/standard/tests/strings/chunk_split_variation4.phpt b/ext/standard/tests/strings/chunk_split_variation4.phpt index cfa62698b9..9f9a8b75ba 100644 --- a/ext/standard/tests/strings/chunk_split_variation4.phpt +++ b/ext/standard/tests/strings/chunk_split_variation4.phpt @@ -84,7 +84,7 @@ foreach($heredoc_arr as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing chunk_split() : heredoc strings as 'str' argument *** -- Iteration 1 -- string(2) " diff --git a/ext/standard/tests/strings/chunk_split_variation6.phpt b/ext/standard/tests/strings/chunk_split_variation6.phpt index 705bb31fca..ccfc08a569 100644 --- a/ext/standard/tests/strings/chunk_split_variation6.phpt +++ b/ext/standard/tests/strings/chunk_split_variation6.phpt @@ -45,7 +45,7 @@ for($count = 0;$count < count($values);$count++) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing chunk_split() : with different single quoted 'str' *** -- Iteration 0 -- string(3) "):(" diff --git a/ext/standard/tests/strings/chunk_split_variation7.phpt b/ext/standard/tests/strings/chunk_split_variation7.phpt Binary files differindex a27ff3cacd..0cd3bec922 100644 --- a/ext/standard/tests/strings/chunk_split_variation7.phpt +++ b/ext/standard/tests/strings/chunk_split_variation7.phpt diff --git a/ext/standard/tests/strings/chunk_split_variation9.phpt b/ext/standard/tests/strings/chunk_split_variation9.phpt Binary files differindex 5601bbc1e2..c7989b0539 100644 --- a/ext/standard/tests/strings/chunk_split_variation9.phpt +++ b/ext/standard/tests/strings/chunk_split_variation9.phpt diff --git a/ext/standard/tests/strings/convert_cyr_string_basic.phpt b/ext/standard/tests/strings/convert_cyr_string_basic.phpt index e29ad330ce..e38fb3f639 100644 --- a/ext/standard/tests/strings/convert_cyr_string_basic.phpt +++ b/ext/standard/tests/strings/convert_cyr_string_basic.phpt @@ -26,7 +26,7 @@ for ($i = 128; $i < 256; $i++) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing convert_cyr_string() : basic functionality *** -- First try some simple English text -- diff --git a/ext/standard/tests/strings/convert_uudecode_basic.phpt b/ext/standard/tests/strings/convert_uudecode_basic.phpt index 6e334a9815..1d7e373512 100644 --- a/ext/standard/tests/strings/convert_uudecode_basic.phpt +++ b/ext/standard/tests/strings/convert_uudecode_basic.phpt @@ -48,7 +48,7 @@ echo "TEST PASSED\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing convert_uudecode() : basic functionality *** TEST PASSED ===DONE=== diff --git a/ext/standard/tests/strings/count_chars_basic.phpt b/ext/standard/tests/strings/count_chars_basic.phpt index f28fa63b20..f74496214a 100644 --- a/ext/standard/tests/strings/count_chars_basic.phpt +++ b/ext/standard/tests/strings/count_chars_basic.phpt @@ -23,7 +23,7 @@ var_dump(bin2hex(count_chars($string, 4))); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing count_chars() : basic functionality *** array(256) { [0]=> diff --git a/ext/standard/tests/strings/crc32_basic.phpt b/ext/standard/tests/strings/crc32_basic.phpt index 52a3f89f4a..3aa780d113 100644 --- a/ext/standard/tests/strings/crc32_basic.phpt +++ b/ext/standard/tests/strings/crc32_basic.phpt @@ -34,7 +34,7 @@ printf("%u\n", crc32($str) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing crc32() : basic functionality *** bool(true) 256895812 diff --git a/ext/standard/tests/strings/crc32_variation2.phpt b/ext/standard/tests/strings/crc32_variation2.phpt index 6d57a94453..7473194f1b 100644 --- a/ext/standard/tests/strings/crc32_variation2.phpt +++ b/ext/standard/tests/strings/crc32_variation2.phpt @@ -72,7 +72,7 @@ foreach($string_array as $str) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing crc32() : with different strings in single quotes *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/crc32_variation4.phpt b/ext/standard/tests/strings/crc32_variation4.phpt index 35c3b0a719..00b47dc190 100644 --- a/ext/standard/tests/strings/crc32_variation4.phpt +++ b/ext/standard/tests/strings/crc32_variation4.phpt @@ -88,7 +88,7 @@ foreach($heredoc_strings as $str) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing crc32() : with different heredoc strings *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/crypt_sha256.phpt b/ext/standard/tests/strings/crypt_sha256.phpt index a29bbf3c88..37bc31bd8b 100644 --- a/ext/standard/tests/strings/crypt_sha256.phpt +++ b/ext/standard/tests/strings/crypt_sha256.phpt @@ -59,6 +59,6 @@ Expected: <$t[2]> Got <$res>\n"; } echo "Passes.";?> ---EXPECTF-- +--EXPECT-- Passes. diff --git a/ext/standard/tests/strings/crypt_sha512.phpt b/ext/standard/tests/strings/crypt_sha512.phpt index 3d51f4aafa..615376e6b2 100644 --- a/ext/standard/tests/strings/crypt_sha512.phpt +++ b/ext/standard/tests/strings/crypt_sha512.phpt @@ -60,6 +60,6 @@ Got <$res>\n"; } echo "Passes."; ?> ---EXPECTF-- +--EXPECT-- Passes. diff --git a/ext/standard/tests/strings/crypt_variation1.phpt b/ext/standard/tests/strings/crypt_variation1.phpt index 6e0d3fe121..3315f035ed 100644 --- a/ext/standard/tests/strings/crypt_variation1.phpt +++ b/ext/standard/tests/strings/crypt_variation1.phpt @@ -17,7 +17,7 @@ $b = str_repeat("A", 4096); echo crypt("A", "$5$" . $b)."\n"; ?> ---EXPECTF-- +--EXPECT-- $5$AAAAAAAAAAAAAAAA$frotiiztWZiwcncxnY5tWG9Ida2WOZEximjLXCleQu6 $5$AAAAAAAAAAAAAAAA$frotiiztWZiwcncxnY5tWG9Ida2WOZEximjLXCleQu6 $5$AAAAAAAAAAAAAAAA$frotiiztWZiwcncxnY5tWG9Ida2WOZEximjLXCleQu6 diff --git a/ext/standard/tests/strings/explode.phpt b/ext/standard/tests/strings/explode.phpt index 4c7a3fe45a..20c2a25470 100644 --- a/ext/standard/tests/strings/explode.phpt +++ b/ext/standard/tests/strings/explode.phpt @@ -32,7 +32,7 @@ var_dump(explode(":","a lazy dog:jumps:over:",-40000000000000)); var_dump(explode(":^:","a lazy dog:^:jumps::over:^:",-1)); var_dump(explode(":^:","a lazy dog:^:jumps::over:^:",-2)); ?> ---EXPECTF-- +--EXPECT-- array ( 0 => 'a', 1 => 'b' . "\0" . 'd', diff --git a/ext/standard/tests/strings/explode_bug.phpt b/ext/standard/tests/strings/explode_bug.phpt index 9766f0b8f4..22d92ea7f5 100644 --- a/ext/standard/tests/strings/explode_bug.phpt +++ b/ext/standard/tests/strings/explode_bug.phpt @@ -8,7 +8,7 @@ memory_limit=256M $res = explode(str_repeat("A",145999999),1); var_dump($res); ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> string(1) "1" diff --git a/ext/standard/tests/strings/fprintf_variation_001.phpt b/ext/standard/tests/strings/fprintf_variation_001.phpt index f08d5cbee7..3a935107a7 100644 --- a/ext/standard/tests/strings/fprintf_variation_001.phpt +++ b/ext/standard/tests/strings/fprintf_variation_001.phpt @@ -38,7 +38,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() with floats *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/fprintf_variation_002.phpt b/ext/standard/tests/strings/fprintf_variation_002.phpt index fb3ab6c14a..49e62e2b74 100644 --- a/ext/standard/tests/strings/fprintf_variation_002.phpt +++ b/ext/standard/tests/strings/fprintf_variation_002.phpt @@ -38,7 +38,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() with integers *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/fprintf_variation_003.phpt b/ext/standard/tests/strings/fprintf_variation_003.phpt index c312c49d67..b4860879b0 100644 --- a/ext/standard/tests/strings/fprintf_variation_003.phpt +++ b/ext/standard/tests/strings/fprintf_variation_003.phpt @@ -33,7 +33,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() with binary *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt index 448f5281d5..ba8e525c3f 100644 --- a/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt +++ b/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt @@ -33,7 +33,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() with binary *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_005.phpt b/ext/standard/tests/strings/fprintf_variation_005.phpt index 75636ac98e..0967b77cd8 100644 --- a/ext/standard/tests/strings/fprintf_variation_005.phpt +++ b/ext/standard/tests/strings/fprintf_variation_005.phpt @@ -32,7 +32,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for scientific type *** 0.000000e+0 diff --git a/ext/standard/tests/strings/fprintf_variation_006.phpt b/ext/standard/tests/strings/fprintf_variation_006.phpt index d7a3278577..8a66fb9fb4 100644 --- a/ext/standard/tests/strings/fprintf_variation_006.phpt +++ b/ext/standard/tests/strings/fprintf_variation_006.phpt @@ -33,7 +33,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for unsigned integers *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt index d68683e3ee..fe4cc91dd7 100644 --- a/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt +++ b/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt @@ -33,7 +33,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for unsigned integers *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_007.phpt b/ext/standard/tests/strings/fprintf_variation_007.phpt index cb09084b73..16d39bbde3 100644 --- a/ext/standard/tests/strings/fprintf_variation_007.phpt +++ b/ext/standard/tests/strings/fprintf_variation_007.phpt @@ -33,7 +33,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for octals *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt index c8481e9fd2..55cd946a3b 100644 --- a/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt +++ b/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt @@ -33,7 +33,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for octals *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_008.phpt b/ext/standard/tests/strings/fprintf_variation_008.phpt index f91e7a1a99..d2187c7ccd 100644 --- a/ext/standard/tests/strings/fprintf_variation_008.phpt +++ b/ext/standard/tests/strings/fprintf_variation_008.phpt @@ -34,7 +34,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for hexadecimals *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt index f619510227..9d326a91c1 100644 --- a/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt +++ b/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt @@ -34,7 +34,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for hexadecimals *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_009.phpt b/ext/standard/tests/strings/fprintf_variation_009.phpt index 40f36bb5f0..e36c0e8c0f 100644 --- a/ext/standard/tests/strings/fprintf_variation_009.phpt +++ b/ext/standard/tests/strings/fprintf_variation_009.phpt @@ -38,7 +38,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for string types *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/get_html_translation_table_basic3.phpt b/ext/standard/tests/strings/get_html_translation_table_basic3.phpt index 4e1cdddd29..9fe832eab2 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic3.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic3.phpt @@ -33,7 +33,7 @@ var_dump( $tt ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_html_translation_table() : basic functionality *** -- with table = HTML_SPECIALCHARS & quote_style = ENT_COMPAT -- array(4) { diff --git a/ext/standard/tests/strings/get_html_translation_table_basic4.phpt b/ext/standard/tests/strings/get_html_translation_table_basic4.phpt index 1a908efdb4..7ff0aa9a41 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic4.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic4.phpt @@ -24,7 +24,7 @@ var_dump( $tt ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_html_translation_table() : basic functionality/Windows-1252 *** -- with table = HTML_ENTITIES -- array(125) { diff --git a/ext/standard/tests/strings/get_meta_tags.phpt b/ext/standard/tests/strings/get_meta_tags.phpt index f086b99b76..1fb9bf41a1 100644 --- a/ext/standard/tests/strings/get_meta_tags.phpt +++ b/ext/standard/tests/strings/get_meta_tags.phpt @@ -55,7 +55,7 @@ foreach ($array as $html) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(4) { ["author"]=> string(4) "name" diff --git a/ext/standard/tests/strings/hebrev_basic.phpt b/ext/standard/tests/strings/hebrev_basic.phpt index 2f53c6fc29..5cdd86ca36 100644 --- a/ext/standard/tests/strings/hebrev_basic.phpt +++ b/ext/standard/tests/strings/hebrev_basic.phpt @@ -17,7 +17,7 @@ var_dump(hebrev($hebrew_text, 15)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing hebrev() : basic functionality *** string(109) ".The hebrev function converts logical Hebrew text to visual text .The function tries to avoid breaking words diff --git a/ext/standard/tests/strings/hebrevc_basic.phpt b/ext/standard/tests/strings/hebrevc_basic.phpt index 9d9a7137c2..2eaa6d712c 100644 --- a/ext/standard/tests/strings/hebrevc_basic.phpt +++ b/ext/standard/tests/strings/hebrevc_basic.phpt @@ -17,7 +17,7 @@ var_dump(hebrevc($hebrew_text, 15)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing hebrevc() : basic functionality *** string(239) ".The hebrevc function converts logical Hebrew text to visual text<br /> ) This function is similar to hebrev() with the difference that it converts newlines<br /> diff --git a/ext/standard/tests/strings/hex2bin_basic.phpt b/ext/standard/tests/strings/hex2bin_basic.phpt index 8f3437d5e5..c8c54d24b1 100644 --- a/ext/standard/tests/strings/hex2bin_basic.phpt +++ b/ext/standard/tests/strings/hex2bin_basic.phpt @@ -11,7 +11,7 @@ var_dump(bin2hex(hex2bin('123abc')) == '123abc'); var_dump(bin2hex(hex2bin('FFFFFF')) == 'ffffff'); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/strings/htmlentities-utf-2.phpt b/ext/standard/tests/strings/htmlentities-utf-2.phpt index 81c974cbf8..e6aa817276 100644 --- a/ext/standard/tests/strings/htmlentities-utf-2.phpt +++ b/ext/standard/tests/strings/htmlentities-utf-2.phpt @@ -17,7 +17,7 @@ foreach($strings as $string) { var_dump(bin2hex($ent_encoded)); } ?> ---EXPECTF-- +--EXPECT-- string(8) "266c743b" string(8) "266c743b" string(0) "" diff --git a/ext/standard/tests/strings/htmlentities-utf.phpt b/ext/standard/tests/strings/htmlentities-utf.phpt index 0dc5b8030c..dafec86b9a 100644 --- a/ext/standard/tests/strings/htmlentities-utf.phpt +++ b/ext/standard/tests/strings/htmlentities-utf.phpt @@ -17,7 +17,7 @@ foreach($strings as $string) { var_dump(bin2hex($ent_encoded)); } ?> ---EXPECTF-- +--EXPECT-- string(8) "266c743b" string(8) "266c743b" string(0) "" diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt index dc027398d5..9dba3c87c5 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt @@ -29,7 +29,7 @@ var_dump( htmlspecialchars_decode($double_quote_string, ENT_QUOTES) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing htmlspecialchars_decode() : basic functionality *** string(92) "Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. " double quoted string "" string(92) "Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. " double quoted string "" diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt index b36556f1a2..007ff9e209 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt @@ -71,7 +71,7 @@ for($index =0; $index < count($res_heredoc_strings); $index ++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing htmlspecialchars_decode() : usage variations *** -- Iteration 1 -- string(0) "" diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt index e51e904fea..95889b3527 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt @@ -35,7 +35,7 @@ foreach($values as $value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing htmlspecialchars_decode() : usage variations *** -- Iteration 1 -- string(90) "Roy's height > Sam's \$height... 1111 ≈ 0000 = 0000... " double quote string "" diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt index 307cfe6d90..ad86639576 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt @@ -34,7 +34,7 @@ foreach($strings as $value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing htmlspecialchars_decode() : usage variations *** -- Iteration 1 -- string(89) "Roy's height > Sam's $height... 1111 ≈ 0000 = 0000... " double quote string "" diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt Binary files differindex 7b1295c54e..eb94c9f5ca 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt diff --git a/ext/standard/tests/strings/http_build_query_variation1.phpt b/ext/standard/tests/strings/http_build_query_variation1.phpt index 56d81c9fdd..4a70404ce0 100644 --- a/ext/standard/tests/strings/http_build_query_variation1.phpt +++ b/ext/standard/tests/strings/http_build_query_variation1.phpt @@ -25,6 +25,6 @@ $obj->sort = 'desc,name'; echo http_build_query($obj) . PHP_EOL; echo http_build_query(new UrlBuilder()); ?> ---EXPECTF-- +--EXPECT-- name=homepage&page=1&sort=desc%2Cname name=homepage&page=1 diff --git a/ext/standard/tests/strings/http_build_query_variation2.phpt b/ext/standard/tests/strings/http_build_query_variation2.phpt index ca1d8f459a..689db9e1fa 100644 --- a/ext/standard/tests/strings/http_build_query_variation2.phpt +++ b/ext/standard/tests/strings/http_build_query_variation2.phpt @@ -34,6 +34,6 @@ $mDimensional = array( echo http_build_query($mDimensional) . PHP_EOL; echo http_build_query($mDimensional, 'prefix_'); ?> ---EXPECTF-- +--EXPECT-- 0=20&5=13&9%5B1%5D=val1&9%5B3%5D=val2&9%5Bstring%5D=string&name=homepage&page=10&sort%5B0%5D=desc&sort%5Badmin%5D%5B0%5D=admin1&sort%5Badmin%5D%5Badmin2%5D%5Bwho%5D=admin2&sort%5Badmin%5D%5Badmin2%5D%5B2%5D=test prefix_0=20&prefix_5=13&prefix_9%5B1%5D=val1&prefix_9%5B3%5D=val2&prefix_9%5Bstring%5D=string&name=homepage&page=10&sort%5B0%5D=desc&sort%5Badmin%5D%5B0%5D=admin1&sort%5Badmin%5D%5Badmin2%5D%5Bwho%5D=admin2&sort%5Badmin%5D%5Badmin2%5D%5B2%5D=test diff --git a/ext/standard/tests/strings/http_build_query_variation3.phpt b/ext/standard/tests/strings/http_build_query_variation3.phpt index 350f3c8661..d6d50d1e85 100644 --- a/ext/standard/tests/strings/http_build_query_variation3.phpt +++ b/ext/standard/tests/strings/http_build_query_variation3.phpt @@ -18,6 +18,6 @@ $oDimensional = array( echo http_build_query($oDimensional, '', ini_get('arg_separator.output'), PHP_QUERY_RFC1738) . PHP_EOL; echo http_build_query($oDimensional, '', ini_get('arg_separator.output'), PHP_QUERY_RFC3986); ?> ---EXPECTF-- +--EXPECT-- name=main+page&sort=desc%2Cadmin&equation=10+%2B+10+-+5 name=main%20page&sort=desc%2Cadmin&equation=10%20%2B%2010%20-%205 diff --git a/ext/standard/tests/strings/join_basic.phpt b/ext/standard/tests/strings/join_basic.phpt index 164c4613a0..1bf9a89c9a 100644 --- a/ext/standard/tests/strings/join_basic.phpt +++ b/ext/standard/tests/strings/join_basic.phpt @@ -34,7 +34,7 @@ var_dump( join($glue, $pieces) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing join() : basic functionality *** string(7) "1,2,3,4" string(30) "Red, Green, Blue, Black, White" diff --git a/ext/standard/tests/strings/join_variation6.phpt b/ext/standard/tests/strings/join_variation6.phpt Binary files differindex 621b69521c..412f36cda0 100644 --- a/ext/standard/tests/strings/join_variation6.phpt +++ b/ext/standard/tests/strings/join_variation6.phpt diff --git a/ext/standard/tests/strings/md5_basic1.phpt b/ext/standard/tests/strings/md5_basic1.phpt index af91ade73f..86377e227d 100644 --- a/ext/standard/tests/strings/md5_basic1.phpt +++ b/ext/standard/tests/strings/md5_basic1.phpt @@ -11,7 +11,7 @@ echo "*** Testing md5() : basic functionality ***\n"; var_dump(md5("apple")); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing md5() : basic functionality *** string(32) "1f3870be274f6c49b3e31a0c6728957f" ===DONE=== diff --git a/ext/standard/tests/strings/moneyformat.phpt b/ext/standard/tests/strings/moneyformat.phpt index 39245772bc..8adc2e3ade 100644 --- a/ext/standard/tests/strings/moneyformat.phpt +++ b/ext/standard/tests/strings/moneyformat.phpt @@ -15,5 +15,5 @@ if (setlocale(LC_MONETARY, 'en_US') === false) { setlocale(LC_MONETARY, 'en_US'); var_dump( money_format("X%nY", 3.1415)); ?> ---EXPECTF-- +--EXPECT-- string(7) "X$3.14Y" diff --git a/ext/standard/tests/strings/nl2br_variation1.phpt b/ext/standard/tests/strings/nl2br_variation1.phpt index ab15ca1fe4..21268d0329 100644 --- a/ext/standard/tests/strings/nl2br_variation1.phpt +++ b/ext/standard/tests/strings/nl2br_variation1.phpt @@ -45,7 +45,7 @@ foreach( $strings as $str ){ } echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing nl2br() : usage variations *** -- Iteration 1 -- string(17) "Hello<br /> diff --git a/ext/standard/tests/strings/nl2br_variation2.phpt b/ext/standard/tests/strings/nl2br_variation2.phpt index a4423df319..79be6f5f03 100644 --- a/ext/standard/tests/strings/nl2br_variation2.phpt +++ b/ext/standard/tests/strings/nl2br_variation2.phpt @@ -43,7 +43,7 @@ foreach( $strings as $str ){ } echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing nl2br() : usage variations *** -- Iteration 1 -- string(2) "\n" diff --git a/ext/standard/tests/strings/nl2br_variation3.phpt b/ext/standard/tests/strings/nl2br_variation3.phpt index b1341d13d6..587518d1ee 100644 --- a/ext/standard/tests/strings/nl2br_variation3.phpt +++ b/ext/standard/tests/strings/nl2br_variation3.phpt @@ -34,7 +34,7 @@ var_dump(nl2br($heredoc_str2) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing nl2br() : usage variations *** string(147) "<br /> <br /> diff --git a/ext/standard/tests/strings/nl2br_variation4.phpt b/ext/standard/tests/strings/nl2br_variation4.phpt index 63931afaf0..04244dccce 100644 --- a/ext/standard/tests/strings/nl2br_variation4.phpt +++ b/ext/standard/tests/strings/nl2br_variation4.phpt @@ -28,7 +28,7 @@ foreach( $strings as $str ){ } echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing nl2br() : usage variations *** string(29) "<html>Hello<br />world</html>" string(19) "<html><br /></html>" diff --git a/ext/standard/tests/strings/nl_langinfo_basic.phpt b/ext/standard/tests/strings/nl_langinfo_basic.phpt index 370177ba8a..7502e2d471 100644 --- a/ext/standard/tests/strings/nl_langinfo_basic.phpt +++ b/ext/standard/tests/strings/nl_langinfo_basic.phpt @@ -27,7 +27,7 @@ var_dump(nl_langinfo(RADIXCHAR)); setlocale(LC_ALL, $original); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing nl_langinfo() : basic functionality *** string(3) "Mon" string(9) "Wednesday" diff --git a/ext/standard/tests/strings/number_format_basic.phpt b/ext/standard/tests/strings/number_format_basic.phpt index 94b8482eef..0e467b70d0 100644 --- a/ext/standard/tests/strings/number_format_basic.phpt +++ b/ext/standard/tests/strings/number_format_basic.phpt @@ -48,7 +48,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing number_format() : basic functionality *** -- number_format tests.....default -- diff --git a/ext/standard/tests/strings/pack.phpt b/ext/standard/tests/strings/pack.phpt index 449451c1aa..97a6a687c5 100644 --- a/ext/standard/tests/strings/pack.phpt +++ b/ext/standard/tests/strings/pack.phpt @@ -97,7 +97,7 @@ print_r(unpack("v", pack("v", -1000))); print_r(unpack("v", pack("v", -64434))); print_r(unpack("v", pack("v", -65535))); ?> ---EXPECTF-- +--EXPECT-- Array ( [1] => h diff --git a/ext/standard/tests/strings/pack64.phpt b/ext/standard/tests/strings/pack64.phpt index 9bc24928fe..cccdc1ba6e 100644 --- a/ext/standard/tests/strings/pack64.phpt +++ b/ext/standard/tests/strings/pack64.phpt @@ -32,7 +32,7 @@ print_r(unpack("q", pack("q", 0x8000000000000002))); print_r(unpack("q", pack("q", -1))); print_r(unpack("q", pack("q", 0x8000000000000000))); ?> ---EXPECTF-- +--EXPECT-- Array ( [1] => 281474976710654 diff --git a/ext/standard/tests/strings/pack_float.phpt b/ext/standard/tests/strings/pack_float.phpt index 088b508bc0..4cfeb92e4b 100644 --- a/ext/standard/tests/strings/pack_float.phpt +++ b/ext/standard/tests/strings/pack_float.phpt @@ -113,7 +113,7 @@ var_dump( ); ?> ---EXPECTF-- +--EXPECT-- string(6) "pack e" string(16) "0000000000000000" string(16) "0000000000000000" diff --git a/ext/standard/tests/strings/printf_basic1.phpt b/ext/standard/tests/strings/printf_basic1.phpt index e6fd1d991f..db6edf6374 100644 --- a/ext/standard/tests/strings/printf_basic1.phpt +++ b/ext/standard/tests/strings/printf_basic1.phpt @@ -41,7 +41,7 @@ var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using string format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/printf_basic2.phpt b/ext/standard/tests/strings/printf_basic2.phpt index 195f7cb58f..f57b263fbf 100644 --- a/ext/standard/tests/strings/printf_basic2.phpt +++ b/ext/standard/tests/strings/printf_basic2.phpt @@ -41,7 +41,7 @@ var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using integer format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/printf_basic3.phpt b/ext/standard/tests/strings/printf_basic3.phpt index 1e51d41fc5..2fd6050da2 100644 --- a/ext/standard/tests/strings/printf_basic3.phpt +++ b/ext/standard/tests/strings/printf_basic3.phpt @@ -55,7 +55,7 @@ var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using float format *** -- Calling printf() with no arguments-- diff --git a/ext/standard/tests/strings/printf_basic4.phpt b/ext/standard/tests/strings/printf_basic4.phpt index 9de0497674..da8f29e795 100644 --- a/ext/standard/tests/strings/printf_basic4.phpt +++ b/ext/standard/tests/strings/printf_basic4.phpt @@ -40,7 +40,7 @@ echo "\n"; var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using bool format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/printf_basic5.phpt b/ext/standard/tests/strings/printf_basic5.phpt index 57b17d4945..3cdcc1abf4 100644 --- a/ext/standard/tests/strings/printf_basic5.phpt +++ b/ext/standard/tests/strings/printf_basic5.phpt @@ -40,7 +40,7 @@ echo "\n"; var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using char format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/printf_basic6.phpt b/ext/standard/tests/strings/printf_basic6.phpt index 95b9d4a042..b3872efdd0 100644 --- a/ext/standard/tests/strings/printf_basic6.phpt +++ b/ext/standard/tests/strings/printf_basic6.phpt @@ -39,7 +39,7 @@ echo "\n"; var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using exponential format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/printf_basic7.phpt b/ext/standard/tests/strings/printf_basic7.phpt index a43fcf2da1..f7e0d2b4f6 100644 --- a/ext/standard/tests/strings/printf_basic7.phpt +++ b/ext/standard/tests/strings/printf_basic7.phpt @@ -47,7 +47,7 @@ var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using unsigned format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/printf_basic8.phpt b/ext/standard/tests/strings/printf_basic8.phpt index 4127bc637f..626797ffbf 100644 --- a/ext/standard/tests/strings/printf_basic8.phpt +++ b/ext/standard/tests/strings/printf_basic8.phpt @@ -46,7 +46,7 @@ var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using octal format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/printf_basic9.phpt b/ext/standard/tests/strings/printf_basic9.phpt index 9b441b2ccf..db1ebba2f7 100644 --- a/ext/standard/tests/strings/printf_basic9.phpt +++ b/ext/standard/tests/strings/printf_basic9.phpt @@ -56,7 +56,7 @@ var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using hexadecimal format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/quoted_printable_decode_basic.phpt b/ext/standard/tests/strings/quoted_printable_decode_basic.phpt index 5b15388d08..d58d3f9056 100644 --- a/ext/standard/tests/strings/quoted_printable_decode_basic.phpt +++ b/ext/standard/tests/strings/quoted_printable_decode_basic.phpt @@ -19,7 +19,7 @@ var_dump(bin2hex(quoted_printable_decode($str))); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing quoted_printable_decode() : basic functionality *** string(76) "fa776f772d666163746f72c1d0d5ddc5ceced9c50a20d4cfd2c7cfd7d9c520d0d2cfc5cbd4d9" ===DONE=== diff --git a/ext/standard/tests/strings/quotemeta_basic.phpt b/ext/standard/tests/strings/quotemeta_basic.phpt index 9a2f23c464..413ae21fd2 100644 --- a/ext/standard/tests/strings/quotemeta_basic.phpt +++ b/ext/standard/tests/strings/quotemeta_basic.phpt @@ -15,7 +15,7 @@ var_dump(quotemeta("(100 + 50) * 10")); var_dump(quotemeta("\+*?[^]($)")); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing quotemeta() : basic functionality *** string(20) "Hello how are you \?" string(19) "\(100 \+ 50\) \* 10" diff --git a/ext/standard/tests/strings/setlocale_variation3.phpt b/ext/standard/tests/strings/setlocale_variation3.phpt index 44cbe1bda7..2b12d26d14 100644 --- a/ext/standard/tests/strings/setlocale_variation3.phpt +++ b/ext/standard/tests/strings/setlocale_variation3.phpt @@ -53,7 +53,7 @@ if($locale_info_before == $locale_info_after){ echo "\nDone\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing setlocale() : usage variations - setting system locale = 0 *** Locale info, before setting the locale array(18) { diff --git a/ext/standard/tests/strings/setlocale_variation4.phpt b/ext/standard/tests/strings/setlocale_variation4.phpt index 7b27c106d9..47ae8fcc97 100644 --- a/ext/standard/tests/strings/setlocale_variation4.phpt +++ b/ext/standard/tests/strings/setlocale_variation4.phpt @@ -51,7 +51,7 @@ if($locale_info_before != $locale_info_after){ echo "\nDone\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing setlocale() : usage variations - Setting system locale = null *** Locale info, before setting the locale array(18) { diff --git a/ext/standard/tests/strings/setlocale_variation5.phpt b/ext/standard/tests/strings/setlocale_variation5.phpt index 40eda3780b..85d06e1a74 100644 --- a/ext/standard/tests/strings/setlocale_variation5.phpt +++ b/ext/standard/tests/strings/setlocale_variation5.phpt @@ -55,7 +55,7 @@ if($locale_info_before != $locale_info_after){ echo "\nDone\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing setlocale() : usage variations - setting system locale = "" *** Locale info, before setting the locale array(18) { diff --git a/ext/standard/tests/strings/show_source_basic.phpt b/ext/standard/tests/strings/show_source_basic.phpt index cfd998fe96..c4c2bd83f2 100644 --- a/ext/standard/tests/strings/show_source_basic.phpt +++ b/ext/standard/tests/strings/show_source_basic.phpt @@ -19,7 +19,7 @@ if ( $foo == 'bar' ) show_source(__FILE__); ?> ---EXPECTF-- +--EXPECT-- *** Test by calling method or function with its expected arguments *** <code><span style="color: #000000"> <span style="color: #0000BB"><?php<br /></span><span style="color: #007700">echo </span><span style="color: #DD0000">"*** Test by calling method or function with its expected arguments ***\n"</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$foo </span><span style="color: #007700">= </span><span style="color: #DD0000">'bar'</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">"something "</span><span style="color: #007700">.</span><span style="color: #0000BB">$foo</span><span style="color: #007700">.</span><span style="color: #DD0000">"\n"</span><span style="color: #007700">;<br /><br />if ( </span><span style="color: #0000BB">$foo </span><span style="color: #007700">== </span><span style="color: #DD0000">'bar' </span><span style="color: #007700">) <br />{<br /> </span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">'baz'</span><span style="color: #007700">;<br />}<br /><br /> </span><span style="color: #FF8000">/* some code here */<br /> <br /></span><span style="color: #0000BB">show_source</span><span style="color: #007700">(</span><span style="color: #0000BB">__FILE__</span><span style="color: #007700">);<br /><br /></span><span style="color: #0000BB">?><br /></span> diff --git a/ext/standard/tests/strings/show_source_variation1.phpt b/ext/standard/tests/strings/show_source_variation1.phpt index a9993ed457..568b842338 100644 --- a/ext/standard/tests/strings/show_source_variation1.phpt +++ b/ext/standard/tests/strings/show_source_variation1.phpt @@ -19,7 +19,7 @@ echo $baz; show_source(__FILE__); echo $foo; ?> ---EXPECTF-- +--EXPECT-- *** Test by calling method or function with its expected arguments and php output *** baz <code><span style="color: #000000"> diff --git a/ext/standard/tests/strings/show_source_variation2.phpt b/ext/standard/tests/strings/show_source_variation2.phpt index 06ef66c2d2..8224d0eee6 100644 --- a/ext/standard/tests/strings/show_source_variation2.phpt +++ b/ext/standard/tests/strings/show_source_variation2.phpt @@ -19,7 +19,7 @@ $source = show_source(__FILE__, true); var_dump($source); ?> ---EXPECTF-- +--EXPECT-- *** Test by calling method or function with its expected arguments and output to variable *** string(1987) "<code><span style="color: #000000"> <span style="color: #0000BB"><?php<br /></span><span style="color: #007700">echo </span><span style="color: #DD0000">"*** Test by calling method or function with its expected arguments and output to variable ***\n"</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$foo </span><span style="color: #007700">= </span><span style="color: #DD0000">'bar'</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">"something "</span><span style="color: #007700">.</span><span style="color: #0000BB">$foo</span><span style="color: #007700">.</span><span style="color: #DD0000">"\n"</span><span style="color: #007700">;<br /><br />if ( </span><span style="color: #0000BB">$foo </span><span style="color: #007700">== </span><span style="color: #DD0000">'bar' </span><span style="color: #007700">) <br />{<br /> </span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">"baz\n"</span><span style="color: #007700">;<br />}<br /><br /> </span><span style="color: #FF8000">/* some code here */ <br /></span><span style="color: #0000BB">$source </span><span style="color: #007700">= </span><span style="color: #0000BB">show_source</span><span style="color: #007700">(</span><span style="color: #0000BB">__FILE__</span><span style="color: #007700">, </span><span style="color: #0000BB">true</span><span style="color: #007700">);<br /><br /></span><span style="color: #0000BB">var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$source</span><span style="color: #007700">);<br /></span><span style="color: #0000BB">?><br /></span> diff --git a/ext/standard/tests/strings/similar_text_basic.phpt b/ext/standard/tests/strings/similar_text_basic.phpt index 37b6527180..ad8807f102 100644 --- a/ext/standard/tests/strings/similar_text_basic.phpt +++ b/ext/standard/tests/strings/similar_text_basic.phpt @@ -27,7 +27,7 @@ similar_text("abcdefghabcdef", "zzzzabcdefggg", $percent); var_dump($percent); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- int(3) int(0) int(1) diff --git a/ext/standard/tests/strings/sprintf_basic1.phpt b/ext/standard/tests/strings/sprintf_basic1.phpt index b1c6194f06..18317373f4 100644 --- a/ext/standard/tests/strings/sprintf_basic1.phpt +++ b/ext/standard/tests/strings/sprintf_basic1.phpt @@ -32,7 +32,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using string format *** string(6) "format" string(13) "arg1 argument" diff --git a/ext/standard/tests/strings/sprintf_basic2.phpt b/ext/standard/tests/strings/sprintf_basic2.phpt index 94b177f5a3..16c035f34b 100644 --- a/ext/standard/tests/strings/sprintf_basic2.phpt +++ b/ext/standard/tests/strings/sprintf_basic2.phpt @@ -33,7 +33,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using integer format *** string(6) "format" string(3) "111" diff --git a/ext/standard/tests/strings/sprintf_basic3.phpt b/ext/standard/tests/strings/sprintf_basic3.phpt index 52582abbe1..e6cd477bfa 100644 --- a/ext/standard/tests/strings/sprintf_basic3.phpt +++ b/ext/standard/tests/strings/sprintf_basic3.phpt @@ -41,7 +41,7 @@ var_dump( sprintf($format33, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using float format *** string(6) "format" string(9) "11.110000" diff --git a/ext/standard/tests/strings/sprintf_basic4.phpt b/ext/standard/tests/strings/sprintf_basic4.phpt index ee0a4b5654..5dd5dd26b6 100644 --- a/ext/standard/tests/strings/sprintf_basic4.phpt +++ b/ext/standard/tests/strings/sprintf_basic4.phpt @@ -33,7 +33,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using bool format *** string(6) "format" string(1) "1" diff --git a/ext/standard/tests/strings/sprintf_basic5.phpt b/ext/standard/tests/strings/sprintf_basic5.phpt index 7f06cbe47e..8ccb899b2f 100644 --- a/ext/standard/tests/strings/sprintf_basic5.phpt +++ b/ext/standard/tests/strings/sprintf_basic5.phpt @@ -33,7 +33,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using char format *** string(6) "format" string(1) "A" diff --git a/ext/standard/tests/strings/sprintf_basic6.phpt b/ext/standard/tests/strings/sprintf_basic6.phpt index c6d691cec5..882aacc107 100644 --- a/ext/standard/tests/strings/sprintf_basic6.phpt +++ b/ext/standard/tests/strings/sprintf_basic6.phpt @@ -32,7 +32,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using exponential format *** string(6) "format" string(11) "1.000000e+3" diff --git a/ext/standard/tests/strings/sprintf_basic7.phpt b/ext/standard/tests/strings/sprintf_basic7.phpt index 56bae8bd8d..9554ca1f59 100644 --- a/ext/standard/tests/strings/sprintf_basic7.phpt +++ b/ext/standard/tests/strings/sprintf_basic7.phpt @@ -39,7 +39,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using unsigned format *** string(6) "format" string(10) "4294966185" diff --git a/ext/standard/tests/strings/sprintf_basic7_64bit.phpt b/ext/standard/tests/strings/sprintf_basic7_64bit.phpt index 035661db61..b00c05bc8f 100644 --- a/ext/standard/tests/strings/sprintf_basic7_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_basic7_64bit.phpt @@ -35,7 +35,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using unsigned format *** string(6) "format" string(20) "18446744073709550505" diff --git a/ext/standard/tests/strings/sprintf_basic8.phpt b/ext/standard/tests/strings/sprintf_basic8.phpt index 925689939c..538122101d 100644 --- a/ext/standard/tests/strings/sprintf_basic8.phpt +++ b/ext/standard/tests/strings/sprintf_basic8.phpt @@ -38,7 +38,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using octal format *** string(6) "format" string(2) "21" diff --git a/ext/standard/tests/strings/sprintf_basic8_64bit.phpt b/ext/standard/tests/strings/sprintf_basic8_64bit.phpt index 9c7e1e6535..2facb3f896 100644 --- a/ext/standard/tests/strings/sprintf_basic8_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_basic8_64bit.phpt @@ -34,7 +34,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using octal format *** string(6) "format" string(2) "21" diff --git a/ext/standard/tests/strings/sprintf_basic9.phpt b/ext/standard/tests/strings/sprintf_basic9.phpt index 1e16bf810c..9271bf92c9 100644 --- a/ext/standard/tests/strings/sprintf_basic9.phpt +++ b/ext/standard/tests/strings/sprintf_basic9.phpt @@ -42,7 +42,7 @@ var_dump( sprintf($format33, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using hexadecimal format *** string(6) "format" string(1) "b" diff --git a/ext/standard/tests/strings/sprintf_variation10.phpt b/ext/standard/tests/strings/sprintf_variation10.phpt index 3880b212df..2b338b238a 100644 --- a/ext/standard/tests/strings/sprintf_variation10.phpt +++ b/ext/standard/tests/strings/sprintf_variation10.phpt @@ -52,7 +52,7 @@ foreach($integer_values as $int_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : float formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation12.phpt b/ext/standard/tests/strings/sprintf_variation12.phpt index b1b186c449..b11e5f5eb2 100644 --- a/ext/standard/tests/strings/sprintf_variation12.phpt +++ b/ext/standard/tests/strings/sprintf_variation12.phpt @@ -48,7 +48,7 @@ foreach($array_values as $array_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : float formats with arrays *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation13.phpt b/ext/standard/tests/strings/sprintf_variation13.phpt index 60ae89c610..ce1567a24d 100644 --- a/ext/standard/tests/strings/sprintf_variation13.phpt +++ b/ext/standard/tests/strings/sprintf_variation13.phpt @@ -53,7 +53,7 @@ foreach($string_values as $string_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : float formats with strings *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation14.phpt b/ext/standard/tests/strings/sprintf_variation14.phpt index 40704d2899..8c1278e9e0 100644 --- a/ext/standard/tests/strings/sprintf_variation14.phpt +++ b/ext/standard/tests/strings/sprintf_variation14.phpt @@ -37,7 +37,7 @@ foreach($boolean_values as $boolean_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : float formats with boolean values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation15.phpt b/ext/standard/tests/strings/sprintf_variation15.phpt Binary files differindex 3769ae90d9..1ec44a6d03 100644 --- a/ext/standard/tests/strings/sprintf_variation15.phpt +++ b/ext/standard/tests/strings/sprintf_variation15.phpt diff --git a/ext/standard/tests/strings/sprintf_variation16.phpt b/ext/standard/tests/strings/sprintf_variation16.phpt index 57965315ee..c89b651fdf 100644 --- a/ext/standard/tests/strings/sprintf_variation16.phpt +++ b/ext/standard/tests/strings/sprintf_variation16.phpt @@ -48,7 +48,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : string formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation18.phpt b/ext/standard/tests/strings/sprintf_variation18.phpt index 960bcd0e78..40fc7d9757 100644 --- a/ext/standard/tests/strings/sprintf_variation18.phpt +++ b/ext/standard/tests/strings/sprintf_variation18.phpt @@ -47,7 +47,7 @@ foreach($array_values as $array_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : string formats with array values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation19.phpt b/ext/standard/tests/strings/sprintf_variation19.phpt index fb3f90585e..916896e5fa 100644 --- a/ext/standard/tests/strings/sprintf_variation19.phpt +++ b/ext/standard/tests/strings/sprintf_variation19.phpt @@ -51,7 +51,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : string formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation20.phpt b/ext/standard/tests/strings/sprintf_variation20.phpt index fc82fefa2a..6ac7cbb18a 100644 --- a/ext/standard/tests/strings/sprintf_variation20.phpt +++ b/ext/standard/tests/strings/sprintf_variation20.phpt @@ -37,7 +37,7 @@ foreach($boolean_values as $boolean_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : string formats with boolean values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation21.phpt b/ext/standard/tests/strings/sprintf_variation21.phpt Binary files differindex 20aa1e9d58..083f3827fe 100644 --- a/ext/standard/tests/strings/sprintf_variation21.phpt +++ b/ext/standard/tests/strings/sprintf_variation21.phpt diff --git a/ext/standard/tests/strings/sprintf_variation22.phpt b/ext/standard/tests/strings/sprintf_variation22.phpt Binary files differindex 8684765250..ef92e521e8 100644 --- a/ext/standard/tests/strings/sprintf_variation22.phpt +++ b/ext/standard/tests/strings/sprintf_variation22.phpt diff --git a/ext/standard/tests/strings/sprintf_variation24.phpt b/ext/standard/tests/strings/sprintf_variation24.phpt Binary files differindex 6bb3e0e370..3d874b5cbd 100644 --- a/ext/standard/tests/strings/sprintf_variation24.phpt +++ b/ext/standard/tests/strings/sprintf_variation24.phpt diff --git a/ext/standard/tests/strings/sprintf_variation25.phpt b/ext/standard/tests/strings/sprintf_variation25.phpt Binary files differindex 456344c3f0..1525a41cd5 100644 --- a/ext/standard/tests/strings/sprintf_variation25.phpt +++ b/ext/standard/tests/strings/sprintf_variation25.phpt diff --git a/ext/standard/tests/strings/sprintf_variation26.phpt b/ext/standard/tests/strings/sprintf_variation26.phpt Binary files differindex b5881ea5ea..580796add0 100644 --- a/ext/standard/tests/strings/sprintf_variation26.phpt +++ b/ext/standard/tests/strings/sprintf_variation26.phpt diff --git a/ext/standard/tests/strings/sprintf_variation27.phpt b/ext/standard/tests/strings/sprintf_variation27.phpt Binary files differindex 88602dbdb2..01bb956384 100644 --- a/ext/standard/tests/strings/sprintf_variation27.phpt +++ b/ext/standard/tests/strings/sprintf_variation27.phpt diff --git a/ext/standard/tests/strings/sprintf_variation28.phpt b/ext/standard/tests/strings/sprintf_variation28.phpt index e295fc8181..1474aad1bd 100644 --- a/ext/standard/tests/strings/sprintf_variation28.phpt +++ b/ext/standard/tests/strings/sprintf_variation28.phpt @@ -57,7 +57,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : octal formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation28_64bit.phpt b/ext/standard/tests/strings/sprintf_variation28_64bit.phpt index f4d8125e98..c13d5b9b8c 100644 --- a/ext/standard/tests/strings/sprintf_variation28_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation28_64bit.phpt @@ -53,7 +53,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : octal formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation29.phpt b/ext/standard/tests/strings/sprintf_variation29.phpt index 87ee835b76..641db49518 100644 --- a/ext/standard/tests/strings/sprintf_variation29.phpt +++ b/ext/standard/tests/strings/sprintf_variation29.phpt @@ -47,7 +47,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : octal formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation29_64bit.phpt b/ext/standard/tests/strings/sprintf_variation29_64bit.phpt index 53b4561375..6e7303521c 100644 --- a/ext/standard/tests/strings/sprintf_variation29_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation29_64bit.phpt @@ -43,7 +43,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : octal formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation3.phpt b/ext/standard/tests/strings/sprintf_variation3.phpt index 2649c1e8ed..ab4fbb1caf 100644 --- a/ext/standard/tests/strings/sprintf_variation3.phpt +++ b/ext/standard/tests/strings/sprintf_variation3.phpt @@ -50,7 +50,7 @@ foreach($valid_ints as $int_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : integer formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation31.phpt b/ext/standard/tests/strings/sprintf_variation31.phpt index a081273a22..59a9cfcbc1 100644 --- a/ext/standard/tests/strings/sprintf_variation31.phpt +++ b/ext/standard/tests/strings/sprintf_variation31.phpt @@ -46,7 +46,7 @@ foreach($array_values as $array_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : octal formats with array values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation32.phpt b/ext/standard/tests/strings/sprintf_variation32.phpt index 6caf8ee6a3..ee72d0521c 100644 --- a/ext/standard/tests/strings/sprintf_variation32.phpt +++ b/ext/standard/tests/strings/sprintf_variation32.phpt @@ -52,7 +52,7 @@ foreach($string_values as $string_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : octal formats with string values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation33.phpt b/ext/standard/tests/strings/sprintf_variation33.phpt index e903108f9e..acd4781c02 100644 --- a/ext/standard/tests/strings/sprintf_variation33.phpt +++ b/ext/standard/tests/strings/sprintf_variation33.phpt @@ -37,7 +37,7 @@ foreach($boolean_values as $boolean_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : octal formats with boolean values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation34.phpt b/ext/standard/tests/strings/sprintf_variation34.phpt index db905ebd18..ce2d01ca12 100644 --- a/ext/standard/tests/strings/sprintf_variation34.phpt +++ b/ext/standard/tests/strings/sprintf_variation34.phpt @@ -57,7 +57,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : hexa formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation34_64bit.phpt b/ext/standard/tests/strings/sprintf_variation34_64bit.phpt index a4914664a2..2d095cd739 100644 --- a/ext/standard/tests/strings/sprintf_variation34_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation34_64bit.phpt @@ -53,7 +53,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : hexa formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation35.phpt b/ext/standard/tests/strings/sprintf_variation35.phpt index ca6ba891dd..c658a767bf 100644 --- a/ext/standard/tests/strings/sprintf_variation35.phpt +++ b/ext/standard/tests/strings/sprintf_variation35.phpt @@ -52,7 +52,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : hexa formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation35_64bit.phpt b/ext/standard/tests/strings/sprintf_variation35_64bit.phpt index 09ae50498e..64beaf1368 100644 --- a/ext/standard/tests/strings/sprintf_variation35_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation35_64bit.phpt @@ -48,7 +48,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : hexa formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation37.phpt b/ext/standard/tests/strings/sprintf_variation37.phpt index d1ecbfc0dc..4406be95d9 100644 --- a/ext/standard/tests/strings/sprintf_variation37.phpt +++ b/ext/standard/tests/strings/sprintf_variation37.phpt @@ -45,7 +45,7 @@ foreach($array_values as $array_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : hexa formats with array values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation38.phpt b/ext/standard/tests/strings/sprintf_variation38.phpt index f9b4a7f6ab..79948b24af 100644 --- a/ext/standard/tests/strings/sprintf_variation38.phpt +++ b/ext/standard/tests/strings/sprintf_variation38.phpt @@ -51,7 +51,7 @@ foreach($string_values as $string_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : hexa formats with string values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation39.phpt b/ext/standard/tests/strings/sprintf_variation39.phpt index dac4346176..f3d0f8c21d 100644 --- a/ext/standard/tests/strings/sprintf_variation39.phpt +++ b/ext/standard/tests/strings/sprintf_variation39.phpt @@ -37,7 +37,7 @@ foreach($boolean_values as $boolean_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : hexa formats with boolean values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation4.phpt b/ext/standard/tests/strings/sprintf_variation4.phpt index 7fc66f910e..848e26de13 100644 --- a/ext/standard/tests/strings/sprintf_variation4.phpt +++ b/ext/standard/tests/strings/sprintf_variation4.phpt @@ -52,7 +52,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : integer formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation40.phpt b/ext/standard/tests/strings/sprintf_variation40.phpt index 774650a32c..65f78fa7a2 100644 --- a/ext/standard/tests/strings/sprintf_variation40.phpt +++ b/ext/standard/tests/strings/sprintf_variation40.phpt @@ -58,7 +58,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation40_64bit.phpt b/ext/standard/tests/strings/sprintf_variation40_64bit.phpt index fffe6155fe..e4d36f439f 100644 --- a/ext/standard/tests/strings/sprintf_variation40_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation40_64bit.phpt @@ -54,7 +54,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation41.phpt b/ext/standard/tests/strings/sprintf_variation41.phpt index 219ea0f025..713df9a2a3 100644 --- a/ext/standard/tests/strings/sprintf_variation41.phpt +++ b/ext/standard/tests/strings/sprintf_variation41.phpt @@ -56,7 +56,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation41_64bit.phpt b/ext/standard/tests/strings/sprintf_variation41_64bit.phpt index 1435d02cb2..79e6275fcb 100644 --- a/ext/standard/tests/strings/sprintf_variation41_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation41_64bit.phpt @@ -52,7 +52,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation43.phpt b/ext/standard/tests/strings/sprintf_variation43.phpt index 86527a52d4..a828e6b892 100644 --- a/ext/standard/tests/strings/sprintf_variation43.phpt +++ b/ext/standard/tests/strings/sprintf_variation43.phpt @@ -47,7 +47,7 @@ foreach($array_values as $array_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with array values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation44.phpt b/ext/standard/tests/strings/sprintf_variation44.phpt index fd4e0bc5a6..73e786e3df 100644 --- a/ext/standard/tests/strings/sprintf_variation44.phpt +++ b/ext/standard/tests/strings/sprintf_variation44.phpt @@ -60,7 +60,7 @@ foreach($string_values as $string_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with string values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation44_64bit.phpt b/ext/standard/tests/strings/sprintf_variation44_64bit.phpt index 096e7e6499..1be1db709c 100644 --- a/ext/standard/tests/strings/sprintf_variation44_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation44_64bit.phpt @@ -56,7 +56,7 @@ foreach($string_values as $string_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with string values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation45.phpt b/ext/standard/tests/strings/sprintf_variation45.phpt index e8219fc95e..85dcfceab7 100644 --- a/ext/standard/tests/strings/sprintf_variation45.phpt +++ b/ext/standard/tests/strings/sprintf_variation45.phpt @@ -37,7 +37,7 @@ foreach($boolean_values as $boolean_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with boolean values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation46.phpt b/ext/standard/tests/strings/sprintf_variation46.phpt index 9b8892d7d0..11bdb23cf6 100644 --- a/ext/standard/tests/strings/sprintf_variation46.phpt +++ b/ext/standard/tests/strings/sprintf_variation46.phpt @@ -51,7 +51,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : scientific formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation47.phpt b/ext/standard/tests/strings/sprintf_variation47.phpt index 4a100ef7dc..78d68fa4f4 100644 --- a/ext/standard/tests/strings/sprintf_variation47.phpt +++ b/ext/standard/tests/strings/sprintf_variation47.phpt @@ -53,7 +53,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : scientific formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation49.phpt b/ext/standard/tests/strings/sprintf_variation49.phpt index 554b43ac1e..d4807b1a2a 100644 --- a/ext/standard/tests/strings/sprintf_variation49.phpt +++ b/ext/standard/tests/strings/sprintf_variation49.phpt @@ -48,7 +48,7 @@ foreach($array_values as $array_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : scientific formats with array values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation4_64bit.phpt b/ext/standard/tests/strings/sprintf_variation4_64bit.phpt index 21bb391b2e..a5fd306fd5 100644 --- a/ext/standard/tests/strings/sprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation4_64bit.phpt @@ -48,7 +48,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : integer formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation50.phpt b/ext/standard/tests/strings/sprintf_variation50.phpt index 62bae0e22a..fc27b2c932 100644 --- a/ext/standard/tests/strings/sprintf_variation50.phpt +++ b/ext/standard/tests/strings/sprintf_variation50.phpt @@ -53,7 +53,7 @@ foreach($string_values as $string_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : scientific formats with string values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation51.phpt b/ext/standard/tests/strings/sprintf_variation51.phpt index d988aa70ef..9ee693e142 100644 --- a/ext/standard/tests/strings/sprintf_variation51.phpt +++ b/ext/standard/tests/strings/sprintf_variation51.phpt @@ -37,7 +37,7 @@ foreach($boolean_values as $boolean_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : scientific formats with boolean values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation53.phpt b/ext/standard/tests/strings/sprintf_variation53.phpt index 427d0d9364..87c91389e6 100644 --- a/ext/standard/tests/strings/sprintf_variation53.phpt +++ b/ext/standard/tests/strings/sprintf_variation53.phpt @@ -32,7 +32,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : with white spaces in format strings *** string(4) "1234" string(4) "1234" diff --git a/ext/standard/tests/strings/sprintf_variation6.phpt b/ext/standard/tests/strings/sprintf_variation6.phpt index 362c90d0a7..c41db4e637 100644 --- a/ext/standard/tests/strings/sprintf_variation6.phpt +++ b/ext/standard/tests/strings/sprintf_variation6.phpt @@ -48,7 +48,7 @@ foreach($array_types as $arr) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : integer formats with arrays *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation7.phpt b/ext/standard/tests/strings/sprintf_variation7.phpt index 30e9aa54f1..b7ce8d94d2 100644 --- a/ext/standard/tests/strings/sprintf_variation7.phpt +++ b/ext/standard/tests/strings/sprintf_variation7.phpt @@ -37,7 +37,7 @@ foreach($boolean_values as $boolean_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : integer formats with boolean values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation8.phpt b/ext/standard/tests/strings/sprintf_variation8.phpt index 9bec938836..7fd608b819 100644 --- a/ext/standard/tests/strings/sprintf_variation8.phpt +++ b/ext/standard/tests/strings/sprintf_variation8.phpt @@ -54,7 +54,7 @@ foreach($string_values as $string_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : integer formats with string values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation9.phpt b/ext/standard/tests/strings/sprintf_variation9.phpt index 6511d1ad6e..6be495aa42 100644 --- a/ext/standard/tests/strings/sprintf_variation9.phpt +++ b/ext/standard/tests/strings/sprintf_variation9.phpt @@ -64,7 +64,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : float formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/str_replace_array_refs.phpt b/ext/standard/tests/strings/str_replace_array_refs.phpt index 102bcfa8fe..f45ea59c64 100644 --- a/ext/standard/tests/strings/str_replace_array_refs.phpt +++ b/ext/standard/tests/strings/str_replace_array_refs.phpt @@ -11,7 +11,7 @@ $numeric = &$ref['numeric']; var_dump(str_replace(array_keys($data), $data, "a numeric")); var_dump($numeric); var_dump($data['numeric']); ---EXPECTF-- +--EXPECT-- string(3) "b 1" int(1) int(1) diff --git a/ext/standard/tests/strings/str_replace_array_refs2.phpt b/ext/standard/tests/strings/str_replace_array_refs2.phpt index 788c738344..2050711493 100644 --- a/ext/standard/tests/strings/str_replace_array_refs2.phpt +++ b/ext/standard/tests/strings/str_replace_array_refs2.phpt @@ -22,6 +22,6 @@ $array = ['x' => 'property']; $array = $closure($array, ['x'], 'a'); var_dump(str_replace(array_keys($array), $array, "x property")); ---EXPECTF-- +--EXPECT-- string(10) "a property" string(10) "a property" diff --git a/ext/standard/tests/strings/str_rot13_basic.phpt b/ext/standard/tests/strings/str_rot13_basic.phpt index 321a2bf1b7..696d380932 100644 --- a/ext/standard/tests/strings/str_rot13_basic.phpt +++ b/ext/standard/tests/strings/str_rot13_basic.phpt @@ -37,7 +37,7 @@ if (strcmp($str, $decode) == 0) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing str_rot13() : basic functionality *** Basic tests diff --git a/ext/standard/tests/strings/str_split_basic.phpt b/ext/standard/tests/strings/str_split_basic.phpt index 3a38b9d544..72617cea9e 100644 --- a/ext/standard/tests/strings/str_split_basic.phpt +++ b/ext/standard/tests/strings/str_split_basic.phpt @@ -26,7 +26,7 @@ var_dump( str_split($str) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing str_split() : basic functionality *** -- With all possible arguments -- array(5) { diff --git a/ext/standard/tests/strings/str_split_variation3.phpt b/ext/standard/tests/strings/str_split_variation3.phpt Binary files differindex 1e7be76c3a..cbdad94854 100644 --- a/ext/standard/tests/strings/str_split_variation3.phpt +++ b/ext/standard/tests/strings/str_split_variation3.phpt diff --git a/ext/standard/tests/strings/str_split_variation4.phpt b/ext/standard/tests/strings/str_split_variation4.phpt index 617e932a52..e06c7025d6 100644 --- a/ext/standard/tests/strings/str_split_variation4.phpt +++ b/ext/standard/tests/strings/str_split_variation4.phpt @@ -43,7 +43,7 @@ for($count = 0; $count < count($values); $count++) { } echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing str_split() : single quoted strings for 'str' *** -- Iteration 1 -- array(1) { diff --git a/ext/standard/tests/strings/str_split_variation5.phpt b/ext/standard/tests/strings/str_split_variation5.phpt index 4e4df4f6c3..3f8e640f89 100644 --- a/ext/standard/tests/strings/str_split_variation5.phpt +++ b/ext/standard/tests/strings/str_split_variation5.phpt @@ -86,7 +86,7 @@ foreach($heredoc_array as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing str_split() : heredoc strings as 'str' argument *** -- Iteration 1 -- array(1) { diff --git a/ext/standard/tests/strings/strcspn_basic.phpt b/ext/standard/tests/strings/strcspn_basic.phpt index 232b105f88..7ed9847edf 100644 --- a/ext/standard/tests/strings/strcspn_basic.phpt +++ b/ext/standard/tests/strings/strcspn_basic.phpt @@ -33,7 +33,7 @@ var_dump( strcspn($str, $mask) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strcspn() : basic functionality *** int(2) int(2) diff --git a/ext/standard/tests/strings/strcspn_variation10.phpt b/ext/standard/tests/strings/strcspn_variation10.phpt index 37bb00ec14..c82d9970fa 100644 --- a/ext/standard/tests/strings/strcspn_variation10.phpt +++ b/ext/standard/tests/strings/strcspn_variation10.phpt @@ -63,7 +63,7 @@ foreach($strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strcspn() : with different mask strings and default start and len arguments *** -- Itearation 1 -- diff --git a/ext/standard/tests/strings/strcspn_variation11.phpt b/ext/standard/tests/strings/strcspn_variation11.phpt index 28f1dbe458..f970f6e3e9 100644 --- a/ext/standard/tests/strings/strcspn_variation11.phpt +++ b/ext/standard/tests/strings/strcspn_variation11.phpt @@ -77,7 +77,7 @@ foreach($strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strcspn() : with different start and default len values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strcspn_variation12.phpt b/ext/standard/tests/strings/strcspn_variation12.phpt index b6f8cac081..f187788d94 100644 --- a/ext/standard/tests/strings/strcspn_variation12.phpt +++ b/ext/standard/tests/strings/strcspn_variation12.phpt @@ -79,7 +79,7 @@ foreach($strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strcspn() : with different start and len values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strcspn_variation5.phpt b/ext/standard/tests/strings/strcspn_variation5.phpt Binary files differindex a3dfa5177f..9b40bad2d7 100644 --- a/ext/standard/tests/strings/strcspn_variation5.phpt +++ b/ext/standard/tests/strings/strcspn_variation5.phpt diff --git a/ext/standard/tests/strings/strcspn_variation6.phpt b/ext/standard/tests/strings/strcspn_variation6.phpt index 92fa3d0951..712f139c55 100644 --- a/ext/standard/tests/strings/strcspn_variation6.phpt +++ b/ext/standard/tests/strings/strcspn_variation6.phpt @@ -88,7 +88,7 @@ foreach($heredoc_strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strcspn() : with different mask strings *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strcspn_variation7.phpt b/ext/standard/tests/strings/strcspn_variation7.phpt index ae01f91be3..3c32fee7de 100644 --- a/ext/standard/tests/strings/strcspn_variation7.phpt +++ b/ext/standard/tests/strings/strcspn_variation7.phpt @@ -103,7 +103,7 @@ foreach($heredoc_strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strcspn() : with different start values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strcspn_variation8.phpt b/ext/standard/tests/strings/strcspn_variation8.phpt index 6b662ecdec..fff6e1ab0c 100644 --- a/ext/standard/tests/strings/strcspn_variation8.phpt +++ b/ext/standard/tests/strings/strcspn_variation8.phpt @@ -109,7 +109,7 @@ foreach($heredoc_strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strcspn() : with different start and len values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strcspn_variation9.phpt b/ext/standard/tests/strings/strcspn_variation9.phpt Binary files differindex e7650844da..d235dc4d19 100644 --- a/ext/standard/tests/strings/strcspn_variation9.phpt +++ b/ext/standard/tests/strings/strcspn_variation9.phpt diff --git a/ext/standard/tests/strings/strip_tags_basic1.phpt b/ext/standard/tests/strings/strip_tags_basic1.phpt index 6d98f47258..d6d5d6e479 100644 --- a/ext/standard/tests/strings/strip_tags_basic1.phpt +++ b/ext/standard/tests/strings/strip_tags_basic1.phpt @@ -42,7 +42,7 @@ foreach($string_array as $string) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : basic functionality *** -- Iteration 1 -- string(5) "hello" diff --git a/ext/standard/tests/strings/strip_tags_basic2.phpt b/ext/standard/tests/strings/strip_tags_basic2.phpt index 4d61c94b54..e9a48af79d 100644 --- a/ext/standard/tests/strings/strip_tags_basic2.phpt +++ b/ext/standard/tests/strings/strip_tags_basic2.phpt @@ -38,7 +38,7 @@ foreach($allowed_tags_array as $tags) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : basic functionality *** -- Iteration 1 -- string(33) "<html>helloworldOther text</html>" diff --git a/ext/standard/tests/strings/strip_tags_variation10.phpt b/ext/standard/tests/strings/strip_tags_variation10.phpt index a70695b456..eef338fa9c 100644 --- a/ext/standard/tests/strings/strip_tags_variation10.phpt +++ b/ext/standard/tests/strings/strip_tags_variation10.phpt @@ -38,7 +38,7 @@ foreach($single_quote_string as $string_value) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(51) "<html> \$ -> This represents the dollar sign</html>" diff --git a/ext/standard/tests/strings/strip_tags_variation11.phpt b/ext/standard/tests/strings/strip_tags_variation11.phpt index 3b47b5c6b1..e592166d5f 100644 --- a/ext/standard/tests/strings/strip_tags_variation11.phpt +++ b/ext/standard/tests/strings/strip_tags_variation11.phpt @@ -28,7 +28,7 @@ foreach($string_array as $string) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : obscure functionality *** -- Iteration 1 -- string(12) "hello world" diff --git a/ext/standard/tests/strings/strip_tags_variation4.phpt b/ext/standard/tests/strings/strip_tags_variation4.phpt index ab01979b78..2118d58959 100644 --- a/ext/standard/tests/strings/strip_tags_variation4.phpt +++ b/ext/standard/tests/strings/strip_tags_variation4.phpt @@ -45,7 +45,7 @@ foreach($strings as $string_value) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(32) "hello world... strip_tags_test" diff --git a/ext/standard/tests/strings/strip_tags_variation5.phpt b/ext/standard/tests/strings/strip_tags_variation5.phpt index 20b5693905..de8f3aa962 100644 --- a/ext/standard/tests/strings/strip_tags_variation5.phpt +++ b/ext/standard/tests/strings/strip_tags_variation5.phpt @@ -77,7 +77,7 @@ for($index =0; $index < count($res_heredoc_strings); $index ++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(0) "" diff --git a/ext/standard/tests/strings/strip_tags_variation6.phpt b/ext/standard/tests/strings/strip_tags_variation6.phpt index c838970868..b066e718b3 100644 --- a/ext/standard/tests/strings/strip_tags_variation6.phpt +++ b/ext/standard/tests/strings/strip_tags_variation6.phpt @@ -34,7 +34,7 @@ foreach($strings as $value) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(18) " I am html string " diff --git a/ext/standard/tests/strings/strip_tags_variation7.phpt b/ext/standard/tests/strings/strip_tags_variation7.phpt index 784122eaaf..5ff9177b18 100644 --- a/ext/standard/tests/strings/strip_tags_variation7.phpt +++ b/ext/standard/tests/strings/strip_tags_variation7.phpt @@ -43,7 +43,7 @@ foreach($strings as $string_value) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(43) "<abc>hello</abc> world... strip_tags_test" diff --git a/ext/standard/tests/strings/strip_tags_variation8.phpt b/ext/standard/tests/strings/strip_tags_variation8.phpt index 53482f7494..f3c5a17136 100644 --- a/ext/standard/tests/strings/strip_tags_variation8.phpt +++ b/ext/standard/tests/strings/strip_tags_variation8.phpt @@ -38,7 +38,7 @@ foreach($quotes as $string_value) } echo "Done"; ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(33) "hello world... strip_tags_test " diff --git a/ext/standard/tests/strings/strip_tags_variation9.phpt b/ext/standard/tests/strings/strip_tags_variation9.phpt index 5edf078dc8..843653c208 100644 --- a/ext/standard/tests/strings/strip_tags_variation9.phpt +++ b/ext/standard/tests/strings/strip_tags_variation9.phpt @@ -36,7 +36,7 @@ foreach($double_quote_string as $string_value) } echo "Done"; ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(50) "<html> $ -> This represents the dollar sign</html>" diff --git a/ext/standard/tests/strings/stripos_basic1.phpt b/ext/standard/tests/strings/stripos_basic1.phpt index cffbdba1b5..a9424b60c3 100644 --- a/ext/standard/tests/strings/stripos_basic1.phpt +++ b/ext/standard/tests/strings/stripos_basic1.phpt @@ -32,7 +32,7 @@ var_dump( stripos($heredoc_str, $heredoc_str) ); var_dump( stripos("Hello, World", "ooo") ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: basic functionality *** -- With default arguments -- int(0) diff --git a/ext/standard/tests/strings/stripos_basic2.phpt b/ext/standard/tests/strings/stripos_basic2.phpt index 226d3f61d2..b2dbece174 100644 --- a/ext/standard/tests/strings/stripos_basic2.phpt +++ b/ext/standard/tests/strings/stripos_basic2.phpt @@ -43,7 +43,7 @@ var_dump( stripos("Hello, World", "o", -4) ); var_dump( stripos("Hello, World", "o", -3) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: basic functionality *** -- With all arguments -- int(0) diff --git a/ext/standard/tests/strings/stripos_variation1.phpt b/ext/standard/tests/strings/stripos_variation1.phpt index 7aeda4082c..ba02430c68 100644 --- a/ext/standard/tests/strings/stripos_variation1.phpt +++ b/ext/standard/tests/strings/stripos_variation1.phpt @@ -81,7 +81,7 @@ for($index=0; $index<count($needle); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: with double quoted strings *** -- Iteration 1 -- int(2) diff --git a/ext/standard/tests/strings/stripos_variation12.phpt b/ext/standard/tests/strings/stripos_variation12.phpt index bd0d8aeb8f..1e09b044ca 100644 --- a/ext/standard/tests/strings/stripos_variation12.phpt +++ b/ext/standard/tests/strings/stripos_variation12.phpt @@ -28,7 +28,7 @@ for($index = 0; $index < count($haystacks); $index++ ) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Test stripos() function: binary safe *** int(5) int(5) diff --git a/ext/standard/tests/strings/stripos_variation13.phpt b/ext/standard/tests/strings/stripos_variation13.phpt index 3c4508f083..694827051f 100644 --- a/ext/standard/tests/strings/stripos_variation13.phpt +++ b/ext/standard/tests/strings/stripos_variation13.phpt @@ -30,7 +30,7 @@ for($index = 0; $index < count($needles); $index++ ) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Test stripos() function: binary safe *** int(1) int(1) diff --git a/ext/standard/tests/strings/stripos_variation2.phpt b/ext/standard/tests/strings/stripos_variation2.phpt index c7f3db4005..97a9864509 100644 --- a/ext/standard/tests/strings/stripos_variation2.phpt +++ b/ext/standard/tests/strings/stripos_variation2.phpt @@ -83,7 +83,7 @@ for($index=0; $index<count($needle); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: with single quoted strings *** -- Iteration 1 -- int(2) diff --git a/ext/standard/tests/strings/stripos_variation3.phpt b/ext/standard/tests/strings/stripos_variation3.phpt index 40cdea48fe..fc678a7267 100644 --- a/ext/standard/tests/strings/stripos_variation3.phpt +++ b/ext/standard/tests/strings/stripos_variation3.phpt @@ -26,7 +26,7 @@ var_dump( stripos($multi_line_str, " ") ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: with heredoc strings *** -- With heredoc string containing multi lines -- int(14) diff --git a/ext/standard/tests/strings/stripos_variation4.phpt b/ext/standard/tests/strings/stripos_variation4.phpt index 8249ef0f60..5c4028ec45 100644 --- a/ext/standard/tests/strings/stripos_variation4.phpt +++ b/ext/standard/tests/strings/stripos_variation4.phpt @@ -28,7 +28,7 @@ var_dump( stripos($special_chars_str, "(special)") ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: with heredoc strings *** -- With heredoc string containing special chars -- int(0) diff --git a/ext/standard/tests/strings/stripos_variation5.phpt b/ext/standard/tests/strings/stripos_variation5.phpt index 900fe04bb7..8cfc3f9194 100644 --- a/ext/standard/tests/strings/stripos_variation5.phpt +++ b/ext/standard/tests/strings/stripos_variation5.phpt @@ -24,7 +24,7 @@ var_dump( stripos($control_char_str, "\t", 15) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: with heredoc strings *** -- With heredoc string containing escape characters -- int(12) diff --git a/ext/standard/tests/strings/stripos_variation6.phpt b/ext/standard/tests/strings/stripos_variation6.phpt index c69ee174d1..151b145229 100644 --- a/ext/standard/tests/strings/stripos_variation6.phpt +++ b/ext/standard/tests/strings/stripos_variation6.phpt @@ -25,7 +25,7 @@ var_dump( stripos($quote_char_str, 'things', 0) ); var_dump( stripos($quote_char_str, "things", 20) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: with heredoc strings *** -- With heredoc string containing quote & slash chars -- int(88) diff --git a/ext/standard/tests/strings/stripos_variation8.phpt b/ext/standard/tests/strings/stripos_variation8.phpt index cbf96bf12a..a0ae75dd1f 100644 --- a/ext/standard/tests/strings/stripos_variation8.phpt +++ b/ext/standard/tests/strings/stripos_variation8.phpt @@ -35,7 +35,7 @@ for($index = 0; $index < count($needles); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: strings repetitive chars *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/stripslashes_basic.phpt b/ext/standard/tests/strings/stripslashes_basic.phpt Binary files differindex 548aee5376..c7027e932f 100644 --- a/ext/standard/tests/strings/stripslashes_basic.phpt +++ b/ext/standard/tests/strings/stripslashes_basic.phpt diff --git a/ext/standard/tests/strings/stripslashes_variation2.phpt b/ext/standard/tests/strings/stripslashes_variation2.phpt Binary files differindex c86cd5890c..c3c58f9c42 100644 --- a/ext/standard/tests/strings/stripslashes_variation2.phpt +++ b/ext/standard/tests/strings/stripslashes_variation2.phpt diff --git a/ext/standard/tests/strings/stripslashes_variation3.phpt b/ext/standard/tests/strings/stripslashes_variation3.phpt index 2ccf97ffd2..830d798c4a 100644 --- a/ext/standard/tests/strings/stripslashes_variation3.phpt +++ b/ext/standard/tests/strings/stripslashes_variation3.phpt @@ -59,7 +59,7 @@ foreach( $str_array as $str ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripslashes() : with strings containing newline and tab characters *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/stripslashes_variation4.phpt b/ext/standard/tests/strings/stripslashes_variation4.phpt index eccca6a64d..d78076e22c 100644 --- a/ext/standard/tests/strings/stripslashes_variation4.phpt +++ b/ext/standard/tests/strings/stripslashes_variation4.phpt @@ -38,7 +38,7 @@ foreach( $str_array as $arr ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripslashes() : with double dimensional arrays *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/stristr_basic.phpt b/ext/standard/tests/strings/stristr_basic.phpt index 0d2171496c..274438a86e 100644 --- a/ext/standard/tests/strings/stristr_basic.phpt +++ b/ext/standard/tests/strings/stristr_basic.phpt @@ -21,7 +21,7 @@ var_dump( stristr("Test String", "String", false) ); var_dump( stristr("Test String", "String", true) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing stristr() : basic functionality *** string(11) "Test string" string(6) "stRIng" diff --git a/ext/standard/tests/strings/strlen_basic.phpt b/ext/standard/tests/strings/strlen_basic.phpt index 3ed2b97e56..9e2605a670 100644 --- a/ext/standard/tests/strings/strlen_basic.phpt +++ b/ext/standard/tests/strings/strlen_basic.phpt @@ -15,7 +15,7 @@ var_dump(strlen("")); var_dump(strlen("\x90\x91\x00\x93\x94\x90\x91\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f")); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strlen() : basic functionality *** int(6) int(7) diff --git a/ext/standard/tests/strings/strnatcmp_leftalign.phpt b/ext/standard/tests/strings/strnatcmp_leftalign.phpt index 70d469dfa2..fde2f164b9 100644 --- a/ext/standard/tests/strings/strnatcmp_leftalign.phpt +++ b/ext/standard/tests/strings/strnatcmp_leftalign.phpt @@ -21,7 +21,7 @@ $str2 = " 00"; var_dump( strnatcmp( $str1, $str2) ); ?> ---EXPECTF-- +--EXPECT-- -- Testing strnatcmp() function whitespace, left-align, digit -- -- Leading whitespace, digits, string 1 longer -- int(1) diff --git a/ext/standard/tests/strings/strncasecmp_variation1.phpt b/ext/standard/tests/strings/strncasecmp_variation1.phpt index bcc6ad3d06..eabc164481 100644 --- a/ext/standard/tests/strings/strncasecmp_variation1.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation1.phpt @@ -23,7 +23,7 @@ for($ASCII = 97; $ASCII <= 122; $ASCII++) { } echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncasecmp() function: with alphabets *** -- Passing upper-case letters for 'str1' -- int(0) diff --git a/ext/standard/tests/strings/strncasecmp_variation3.phpt b/ext/standard/tests/strings/strncasecmp_variation3.phpt index 8409260b2e..5db892cfa1 100644 --- a/ext/standard/tests/strings/strncasecmp_variation3.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation3.phpt @@ -20,7 +20,7 @@ for($len = strlen($str1); $len >= 0; $len--) { } echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncasecmp() function: with different lengths *** int(0) int(0) diff --git a/ext/standard/tests/strings/strncasecmp_variation6.phpt b/ext/standard/tests/strings/strncasecmp_variation6.phpt index 56276e9554..5c6bdf6d22 100644 --- a/ext/standard/tests/strings/strncasecmp_variation6.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation6.phpt @@ -31,7 +31,7 @@ var_dump( strncasecmp($str1, $str2, 8) ); //comparing all the 8-bits; expected: echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncasecmp() function: with binary inputs *** -- Checking with all 256 characters given, in binary format -- diff --git a/ext/standard/tests/strings/strncasecmp_variation7.phpt b/ext/standard/tests/strings/strncasecmp_variation7.phpt index e22fad7659..0c711ea42f 100644 --- a/ext/standard/tests/strings/strncasecmp_variation7.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation7.phpt @@ -20,7 +20,7 @@ var_dump( strncasecmp($str3, "Hello,world", 12) ); echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncasecmp() function: with null terminated strings and binary inputs *** int(5) int(-119) diff --git a/ext/standard/tests/strings/strncasecmp_variation9.phpt b/ext/standard/tests/strings/strncasecmp_variation9.phpt index 0d713032e0..9841bb4e47 100644 --- a/ext/standard/tests/strings/strncasecmp_variation9.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation9.phpt @@ -73,7 +73,7 @@ for($index1 = 0; $index1 < count($strings); $index1++) { } echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncasecmp() function: with here-doc strings *** int(0) int(63) diff --git a/ext/standard/tests/strings/strncmp_variation6.phpt b/ext/standard/tests/strings/strncmp_variation6.phpt index b3b918920e..e34d42cefc 100644 --- a/ext/standard/tests/strings/strncmp_variation6.phpt +++ b/ext/standard/tests/strings/strncmp_variation6.phpt @@ -32,7 +32,7 @@ var_dump( strncmp($str1, $str2, 8) ); //comparing all the 8-bits; expected: int echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncmp() function: with binary inputs *** -- Checking with all 256 characters given, in binary format -- diff --git a/ext/standard/tests/strings/strncmp_variation7.phpt b/ext/standard/tests/strings/strncmp_variation7.phpt index 35d11d981a..6634b22c4e 100644 --- a/ext/standard/tests/strings/strncmp_variation7.phpt +++ b/ext/standard/tests/strings/strncmp_variation7.phpt @@ -18,7 +18,7 @@ var_dump( strncmp($str1, $str2, 12) ); //expected: int(5); echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncmp() function: Checking with the null terminated strings *** int(5) *** Done *** diff --git a/ext/standard/tests/strings/strncmp_variation9.phpt b/ext/standard/tests/strings/strncmp_variation9.phpt index 282f241849..1c83e80f09 100644 --- a/ext/standard/tests/strings/strncmp_variation9.phpt +++ b/ext/standard/tests/strings/strncmp_variation9.phpt @@ -52,7 +52,7 @@ for($index1 = 0; $index1 < count($strings); $index1++) { } echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncmp() function: with different input strings *** int(0) int(0) diff --git a/ext/standard/tests/strings/strrchr.phpt b/ext/standard/tests/strings/strrchr.phpt index 5a1fe12a82..e98119ad8b 100644 --- a/ext/standard/tests/strings/strrchr.phpt +++ b/ext/standard/tests/strings/strrchr.phpt @@ -12,7 +12,7 @@ var_dump(strrchr("test".chr(0)."string", "t")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/strings/strrchr_basic.phpt b/ext/standard/tests/strings/strrchr_basic.phpt index b5bfe2d9c2..5c3be8c121 100644 --- a/ext/standard/tests/strings/strrchr_basic.phpt +++ b/ext/standard/tests/strings/strrchr_basic.phpt @@ -37,7 +37,7 @@ var_dump( strrchr("Hello, World", "ooo") ); var_dump( strrchr("Hello, World", "Zzzz") ); //non-existent needle in haystack echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrchr() function: basic functionality *** string(12) "Hello, World" string(12) "Hello, World" diff --git a/ext/standard/tests/strings/strrchr_variation1.phpt b/ext/standard/tests/strings/strrchr_variation1.phpt Binary files differindex 91290ecf93..0cfcf25be1 100644 --- a/ext/standard/tests/strings/strrchr_variation1.phpt +++ b/ext/standard/tests/strings/strrchr_variation1.phpt diff --git a/ext/standard/tests/strings/strrchr_variation12.phpt b/ext/standard/tests/strings/strrchr_variation12.phpt Binary files differindex c31e0c86ce..a17902604a 100644 --- a/ext/standard/tests/strings/strrchr_variation12.phpt +++ b/ext/standard/tests/strings/strrchr_variation12.phpt diff --git a/ext/standard/tests/strings/strrchr_variation2.phpt b/ext/standard/tests/strings/strrchr_variation2.phpt index 0b15ceeeb2..f5ec1259e7 100644 --- a/ext/standard/tests/strings/strrchr_variation2.phpt +++ b/ext/standard/tests/strings/strrchr_variation2.phpt @@ -81,7 +81,7 @@ for($index=0; $index<count($needle); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrchr() function: with various single quoted strings *** -- Iteration 1 -- string(22) "lo123456he \x234 \101 " diff --git a/ext/standard/tests/strings/strrchr_variation3.phpt b/ext/standard/tests/strings/strrchr_variation3.phpt index 1d0aa30091..947d613ee2 100644 --- a/ext/standard/tests/strings/strrchr_variation3.phpt +++ b/ext/standard/tests/strings/strrchr_variation3.phpt @@ -32,7 +32,7 @@ foreach($needles as $needle) { echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrchr() function: with heredoc strings *** string(19) "ing heredoc syntax." bool(false) diff --git a/ext/standard/tests/strings/strrchr_variation4.phpt b/ext/standard/tests/strings/strrchr_variation4.phpt index 8b2c10bf25..8c385e5cb8 100644 --- a/ext/standard/tests/strings/strrchr_variation4.phpt +++ b/ext/standard/tests/strings/strrchr_variation4.phpt @@ -38,7 +38,7 @@ foreach($needles as $needle) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrchr() function: with heredoc strings *** string(24) "!$#$^^&*(special) chars." diff --git a/ext/standard/tests/strings/strrchr_variation5.phpt b/ext/standard/tests/strings/strrchr_variation5.phpt index 1ef23911e9..6d768e06bb 100644 --- a/ext/standard/tests/strings/strrchr_variation5.phpt +++ b/ext/standard/tests/strings/strrchr_variation5.phpt @@ -32,7 +32,7 @@ foreach($needles as $needle) { echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrchr() function: with heredoc strings *** string(32) " st
ch
using scape \seque diff --git a/ext/standard/tests/strings/strrchr_variation6.phpt b/ext/standard/tests/strings/strrchr_variation6.phpt index ba0ffadbd7..fff943b179 100644 --- a/ext/standard/tests/strings/strrchr_variation6.phpt +++ b/ext/standard/tests/strings/strrchr_variation6.phpt @@ -32,7 +32,7 @@ foreach($needles as $needle) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrchr() function: with heredoc strings *** string(3) "te'" string(32) "" diff --git a/ext/standard/tests/strings/strrchr_variation7.phpt b/ext/standard/tests/strings/strrchr_variation7.phpt index ed5acdc045..d60b2e6711 100644 --- a/ext/standard/tests/strings/strrchr_variation7.phpt +++ b/ext/standard/tests/strings/strrchr_variation7.phpt @@ -32,7 +32,7 @@ foreach($needles as $needle) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrchr() function: with heredoc strings *** bool(false) bool(false) diff --git a/ext/standard/tests/strings/strrchr_variation8.phpt b/ext/standard/tests/strings/strrchr_variation8.phpt index 3e298a0b3a..31a727ed6f 100644 --- a/ext/standard/tests/strings/strrchr_variation8.phpt +++ b/ext/standard/tests/strings/strrchr_variation8.phpt @@ -30,7 +30,7 @@ foreach($needles as $needle) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrchr() function: with heredoc strings *** bool(false) bool(false) diff --git a/ext/standard/tests/strings/strrev_basic.phpt b/ext/standard/tests/strings/strrev_basic.phpt index 2cde4cdf89..390b78648b 100644 --- a/ext/standard/tests/strings/strrev_basic.phpt +++ b/ext/standard/tests/strings/strrev_basic.phpt @@ -32,7 +32,7 @@ var_dump( strrev('Hello, World\n') ); var_dump( strrev($heredoc) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrev() : basic functionality *** string(12) "dlroW ,olleH" string(12) "dlroW ,olleH" diff --git a/ext/standard/tests/strings/strrev_variation1.phpt b/ext/standard/tests/strings/strrev_variation1.phpt Binary files differindex f2334f5a53..ce0588d750 100644 --- a/ext/standard/tests/strings/strrev_variation1.phpt +++ b/ext/standard/tests/strings/strrev_variation1.phpt diff --git a/ext/standard/tests/strings/strrev_variation2.phpt b/ext/standard/tests/strings/strrev_variation2.phpt Binary files differindex 41e54d53c6..87c64ec794 100644 --- a/ext/standard/tests/strings/strrev_variation2.phpt +++ b/ext/standard/tests/strings/strrev_variation2.phpt diff --git a/ext/standard/tests/strings/strrev_variation3.phpt b/ext/standard/tests/strings/strrev_variation3.phpt Binary files differindex 8ab3e25b66..af1d276ea6 100644 --- a/ext/standard/tests/strings/strrev_variation3.phpt +++ b/ext/standard/tests/strings/strrev_variation3.phpt diff --git a/ext/standard/tests/strings/strripos_variation1.phpt b/ext/standard/tests/strings/strripos_variation1.phpt index b8a8943d09..5eb2fdfe0c 100644 --- a/ext/standard/tests/strings/strripos_variation1.phpt +++ b/ext/standard/tests/strings/strripos_variation1.phpt @@ -74,7 +74,7 @@ foreach ($needles as $needle) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strripos() function: with double quoted strings *** -- Iteration 1 -- int(28) diff --git a/ext/standard/tests/strings/strripos_variation4.phpt b/ext/standard/tests/strings/strripos_variation4.phpt index c355330cab..ef872d7c76 100644 --- a/ext/standard/tests/strings/strripos_variation4.phpt +++ b/ext/standard/tests/strings/strripos_variation4.phpt @@ -28,7 +28,7 @@ var_dump( strripos($special_chars_str, "(speCIal)") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strripos() function: with heredoc strings *** -- With heredoc string containing special chars -- int(0) diff --git a/ext/standard/tests/strings/strripos_variation5.phpt b/ext/standard/tests/strings/strripos_variation5.phpt index 5f6df79903..7530a9f446 100644 --- a/ext/standard/tests/strings/strripos_variation5.phpt +++ b/ext/standard/tests/strings/strripos_variation5.phpt @@ -24,7 +24,7 @@ var_dump( strripos($control_char_str, "\t", 15) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strripos() function: with heredoc strings *** -- With heredoc string containing escape characters -- int(13) diff --git a/ext/standard/tests/strings/strrpos_basic1.phpt b/ext/standard/tests/strings/strrpos_basic1.phpt index 26497fb3ff..e8fc24ade3 100644 --- a/ext/standard/tests/strings/strrpos_basic1.phpt +++ b/ext/standard/tests/strings/strrpos_basic1.phpt @@ -30,7 +30,7 @@ var_dump( strrpos($heredoc_str, $heredoc_str) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: basic functionality *** -- With default arguments -- int(0) diff --git a/ext/standard/tests/strings/strrpos_basic2.phpt b/ext/standard/tests/strings/strrpos_basic2.phpt index a65bbf3fd2..4698aafebf 100644 --- a/ext/standard/tests/strings/strrpos_basic2.phpt +++ b/ext/standard/tests/strings/strrpos_basic2.phpt @@ -32,7 +32,7 @@ var_dump( strrpos("Hello, World", "o", 6) ); var_dump( strrpos("Hello, World", "o", 10) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: basic functionality *** -- With all arguments -- int(0) diff --git a/ext/standard/tests/strings/strrpos_variation1.phpt b/ext/standard/tests/strings/strrpos_variation1.phpt index a7ef3e9b05..6f94bd84ca 100644 --- a/ext/standard/tests/strings/strrpos_variation1.phpt +++ b/ext/standard/tests/strings/strrpos_variation1.phpt @@ -72,7 +72,7 @@ for($index=0; $index<count($needle); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: with double quoted strings *** -- Iteration 1 -- int(28) diff --git a/ext/standard/tests/strings/strrpos_variation12.phpt b/ext/standard/tests/strings/strrpos_variation12.phpt index 87ac3b2f84..b46f2e98ef 100644 --- a/ext/standard/tests/strings/strrpos_variation12.phpt +++ b/ext/standard/tests/strings/strrpos_variation12.phpt @@ -28,7 +28,7 @@ for($index = 0; $index < count($haystacks); $index++ ) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Test strrpos() function: binary safe *** int(5) int(5) diff --git a/ext/standard/tests/strings/strrpos_variation13.phpt b/ext/standard/tests/strings/strrpos_variation13.phpt index f85c3c454f..2772a2315a 100644 --- a/ext/standard/tests/strings/strrpos_variation13.phpt +++ b/ext/standard/tests/strings/strrpos_variation13.phpt @@ -30,7 +30,7 @@ for($index = 0; $index < count($needles); $index++ ) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Test strrpos() function: binary safe *** int(1) int(1) diff --git a/ext/standard/tests/strings/strrpos_variation2.phpt b/ext/standard/tests/strings/strrpos_variation2.phpt index 53645866be..2f4540f1c2 100644 --- a/ext/standard/tests/strings/strrpos_variation2.phpt +++ b/ext/standard/tests/strings/strrpos_variation2.phpt @@ -73,7 +73,7 @@ for($index=0; $index<count($needle); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: with single quoted strings *** -- Iteration 1 -- int(32) diff --git a/ext/standard/tests/strings/strrpos_variation3.phpt b/ext/standard/tests/strings/strrpos_variation3.phpt index a0a0d270e8..a920225947 100644 --- a/ext/standard/tests/strings/strrpos_variation3.phpt +++ b/ext/standard/tests/strings/strrpos_variation3.phpt @@ -26,7 +26,7 @@ var_dump( strrpos($multi_line_str, " ") ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: with heredoc strings *** -- With heredoc string containing multi lines -- int(44) diff --git a/ext/standard/tests/strings/strrpos_variation4.phpt b/ext/standard/tests/strings/strrpos_variation4.phpt index 1ccf529856..40ac17affe 100644 --- a/ext/standard/tests/strings/strrpos_variation4.phpt +++ b/ext/standard/tests/strings/strrpos_variation4.phpt @@ -28,7 +28,7 @@ var_dump( strrpos($special_chars_str, "(special)") ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: with heredoc strings *** -- With heredoc string containing special chars -- int(0) diff --git a/ext/standard/tests/strings/strrpos_variation5.phpt b/ext/standard/tests/strings/strrpos_variation5.phpt index f9537da0e2..0d985d86b4 100644 --- a/ext/standard/tests/strings/strrpos_variation5.phpt +++ b/ext/standard/tests/strings/strrpos_variation5.phpt @@ -24,7 +24,7 @@ var_dump( strrpos($control_char_str, "\t", 15) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: with heredoc strings *** -- With heredoc string containing escape characters -- int(13) diff --git a/ext/standard/tests/strings/strrpos_variation6.phpt b/ext/standard/tests/strings/strrpos_variation6.phpt index c879a91209..ba5c5a1a40 100644 --- a/ext/standard/tests/strings/strrpos_variation6.phpt +++ b/ext/standard/tests/strings/strrpos_variation6.phpt @@ -25,7 +25,7 @@ var_dump( strrpos($quote_char_str, 'things', 0) ); var_dump( strrpos($quote_char_str, "things", 20) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: with heredoc strings *** -- With heredoc string containing quote & slash chars -- int(88) diff --git a/ext/standard/tests/strings/strrpos_variation7.phpt b/ext/standard/tests/strings/strrpos_variation7.phpt index 239dc246bc..9c487d1e62 100644 --- a/ext/standard/tests/strings/strrpos_variation7.phpt +++ b/ext/standard/tests/strings/strrpos_variation7.phpt @@ -22,7 +22,7 @@ var_dump( strrpos($empty_string, NULL) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: with heredoc strings *** -- With empty heredoc string -- bool(false) diff --git a/ext/standard/tests/strings/strrpos_variation8.phpt b/ext/standard/tests/strings/strrpos_variation8.phpt index eac7d8ff83..d69e49f1d4 100644 --- a/ext/standard/tests/strings/strrpos_variation8.phpt +++ b/ext/standard/tests/strings/strrpos_variation8.phpt @@ -24,7 +24,7 @@ for($offset = -1; $offset <= strlen($haystack); $offset++ ) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: strings repetitive chars *** -- Iteration 1 -- int(4) diff --git a/ext/standard/tests/strings/strspn_basic.phpt b/ext/standard/tests/strings/strspn_basic.phpt index d9b1a33881..dd43470826 100644 --- a/ext/standard/tests/strings/strspn_basic.phpt +++ b/ext/standard/tests/strings/strspn_basic.phpt @@ -33,7 +33,7 @@ var_dump( strspn($str, $mask) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strspn() : basic functionality *** int(11) int(11) diff --git a/ext/standard/tests/strings/strspn_variation10.phpt b/ext/standard/tests/strings/strspn_variation10.phpt index 318d16ccfb..6c87eb01db 100644 --- a/ext/standard/tests/strings/strspn_variation10.phpt +++ b/ext/standard/tests/strings/strspn_variation10.phpt @@ -65,7 +65,7 @@ foreach($strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strspn() : with different mask strings and default start and len arguments *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strspn_variation11.phpt b/ext/standard/tests/strings/strspn_variation11.phpt index 209981e69a..8f85e979a7 100644 --- a/ext/standard/tests/strings/strspn_variation11.phpt +++ b/ext/standard/tests/strings/strspn_variation11.phpt @@ -77,7 +77,7 @@ foreach($strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strspn() : with different start and default len values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strspn_variation12.phpt b/ext/standard/tests/strings/strspn_variation12.phpt index 9e2eaf010d..df353ec040 100644 --- a/ext/standard/tests/strings/strspn_variation12.phpt +++ b/ext/standard/tests/strings/strspn_variation12.phpt @@ -79,7 +79,7 @@ foreach($strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strspn() : with different start and len values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strspn_variation5.phpt b/ext/standard/tests/strings/strspn_variation5.phpt Binary files differindex 514af55319..04ac841ef7 100644 --- a/ext/standard/tests/strings/strspn_variation5.phpt +++ b/ext/standard/tests/strings/strspn_variation5.phpt diff --git a/ext/standard/tests/strings/strspn_variation6.phpt b/ext/standard/tests/strings/strspn_variation6.phpt index 413198d1c0..3e039909e0 100644 --- a/ext/standard/tests/strings/strspn_variation6.phpt +++ b/ext/standard/tests/strings/strspn_variation6.phpt @@ -90,7 +90,7 @@ foreach($heredoc_strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strspn() : with different mask strings *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strspn_variation7.phpt b/ext/standard/tests/strings/strspn_variation7.phpt index d0ebee3c92..b3a4dbe7c3 100644 --- a/ext/standard/tests/strings/strspn_variation7.phpt +++ b/ext/standard/tests/strings/strspn_variation7.phpt @@ -103,7 +103,7 @@ foreach($heredoc_strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strspn() : with different start values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strspn_variation8.phpt b/ext/standard/tests/strings/strspn_variation8.phpt index 3e9e9ddd8c..0033aea837 100644 --- a/ext/standard/tests/strings/strspn_variation8.phpt +++ b/ext/standard/tests/strings/strspn_variation8.phpt @@ -111,7 +111,7 @@ foreach($heredoc_strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strspn() : with different start and len values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strspn_variation9.phpt b/ext/standard/tests/strings/strspn_variation9.phpt Binary files differindex 14af0ca0af..5ec2330e25 100644 --- a/ext/standard/tests/strings/strspn_variation9.phpt +++ b/ext/standard/tests/strings/strspn_variation9.phpt diff --git a/ext/standard/tests/strings/strtok_basic.phpt b/ext/standard/tests/strings/strtok_basic.phpt index 6ba48f41e3..3cb687295e 100644 --- a/ext/standard/tests/strings/strtok_basic.phpt +++ b/ext/standard/tests/strings/strtok_basic.phpt @@ -31,7 +31,7 @@ for( $i = 2; $i <=7; $i++ ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtok() : basic functionality *** The Input string is: diff --git a/ext/standard/tests/strings/strtok_variation3.phpt b/ext/standard/tests/strings/strtok_variation3.phpt index 3026d86a01..d26947afde 100644 --- a/ext/standard/tests/strings/strtok_variation3.phpt +++ b/ext/standard/tests/strings/strtok_variation3.phpt @@ -67,7 +67,7 @@ foreach($heredoc_strings as $string) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtok() : with heredoc strings *** --- Iteration 1 --- diff --git a/ext/standard/tests/strings/strtok_variation4.phpt b/ext/standard/tests/strings/strtok_variation4.phpt index 6f4fa6621b..5db1d39650 100644 --- a/ext/standard/tests/strings/strtok_variation4.phpt +++ b/ext/standard/tests/strings/strtok_variation4.phpt @@ -41,7 +41,7 @@ foreach( $strings_with_nulls as $string ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtok() : with embedded nulls in the strings *** --- Iteration 1 --- diff --git a/ext/standard/tests/strings/strtok_variation5.phpt b/ext/standard/tests/strings/strtok_variation5.phpt index c49f7ded9f..699c7a9695 100644 --- a/ext/standard/tests/strings/strtok_variation5.phpt +++ b/ext/standard/tests/strings/strtok_variation5.phpt @@ -57,7 +57,7 @@ foreach( $string_array as $string ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtok() : with miscellaneous inputs *** --- Iteration 1 --- diff --git a/ext/standard/tests/strings/strtok_variation6.phpt b/ext/standard/tests/strings/strtok_variation6.phpt index 73ea3667eb..4b379ec86f 100644 --- a/ext/standard/tests/strings/strtok_variation6.phpt +++ b/ext/standard/tests/strings/strtok_variation6.phpt @@ -47,7 +47,7 @@ foreach( $string_array as $string ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtok() : with invalid escape sequences in token *** --- Iteration 1 --- diff --git a/ext/standard/tests/strings/strtok_variation7.phpt b/ext/standard/tests/strings/strtok_variation7.phpt index 28cbf7d917..9a88c93668 100644 --- a/ext/standard/tests/strings/strtok_variation7.phpt +++ b/ext/standard/tests/strings/strtok_variation7.phpt @@ -37,7 +37,7 @@ for( $count = 1; $count <=10; $count++ ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtok() : with modification of input string in between tokenising *** *** Testing strtok() when string being tokenised is prefixed with another string in between the process *** diff --git a/ext/standard/tests/strings/strtr_basic.phpt b/ext/standard/tests/strings/strtr_basic.phpt index 2892ab0082..8f4ccdc326 100644 --- a/ext/standard/tests/strings/strtr_basic.phpt +++ b/ext/standard/tests/strings/strtr_basic.phpt @@ -37,7 +37,7 @@ var_dump( strtr('test strtr', $trans2_arr) ); var_dump( strtr($heredoc_str, $trans1_arr) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtr() : basic functionality *** string(10) "TesT sTrTr" string(10) "TesT sTrTr" diff --git a/ext/standard/tests/strings/strtr_variation1.phpt b/ext/standard/tests/strings/strtr_variation1.phpt index 640194fd48..44326ad4aa 100644 --- a/ext/standard/tests/strings/strtr_variation1.phpt +++ b/ext/standard/tests/strings/strtr_variation1.phpt @@ -56,7 +56,7 @@ for($index = 0; $index < count($str_arr); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtr() : numeric & regular double quoted strings *** -- Iteration 1 -- string(3) "abc" diff --git a/ext/standard/tests/strings/strtr_variation2.phpt b/ext/standard/tests/strings/strtr_variation2.phpt index 5772f01fc4..1ca96af3bf 100644 --- a/ext/standard/tests/strings/strtr_variation2.phpt +++ b/ext/standard/tests/strings/strtr_variation2.phpt @@ -60,7 +60,7 @@ for($index = 0; $index < count($str_arr); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtr() : string containing special chars for 'str' arg *** -- Iteration 1 -- string(1) "s" diff --git a/ext/standard/tests/strings/strtr_variation3.phpt b/ext/standard/tests/strings/strtr_variation3.phpt index fe546dc8ce..9feb237645 100644 --- a/ext/standard/tests/strings/strtr_variation3.phpt +++ b/ext/standard/tests/strings/strtr_variation3.phpt @@ -65,7 +65,7 @@ for($index = 0; $index < count($str_arr); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtr() : string containing escape sequences for 'str' arg *** -- Iteration 1 -- string(9) "SesSTsttE" diff --git a/ext/standard/tests/strings/strtr_variation4.phpt b/ext/standard/tests/strings/strtr_variation4.phpt index faec849830..899a17af85 100644 --- a/ext/standard/tests/strings/strtr_variation4.phpt +++ b/ext/standard/tests/strings/strtr_variation4.phpt @@ -53,7 +53,7 @@ for($index = 0; $index < count($str_arr); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtr() : empty string & null for 'str' arg *** -- Iteration 1 -- string(0) "" diff --git a/ext/standard/tests/strings/strval_basic.phpt b/ext/standard/tests/strings/strval_basic.phpt index c099058b99..70a12c7f36 100644 --- a/ext/standard/tests/strings/strval_basic.phpt +++ b/ext/standard/tests/strings/strval_basic.phpt @@ -47,7 +47,7 @@ foreach($values as $value) { }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strval() : basic variations *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strval_variation2.phpt b/ext/standard/tests/strings/strval_variation2.phpt index da74973c5e..beeb8c9283 100644 --- a/ext/standard/tests/strings/strval_variation2.phpt +++ b/ext/standard/tests/strings/strval_variation2.phpt @@ -61,7 +61,7 @@ echo "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strval() : usage variations - Pass all valid char codes *** 000102030405060708090a0b0c0d0e0f 101112131415161718191a1b1c1d1e1f diff --git a/ext/standard/tests/strings/substr_count_basic.phpt b/ext/standard/tests/strings/substr_count_basic.phpt index c7c96fd55b..a3b3553dfc 100644 --- a/ext/standard/tests/strings/substr_count_basic.phpt +++ b/ext/standard/tests/strings/substr_count_basic.phpt @@ -24,7 +24,7 @@ var_dump(substr_count($a, "bca", -200, -50)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- ***Testing basic operations *** bool(false) bool(false) diff --git a/ext/standard/tests/strings/substr_count_variation_002.phpt b/ext/standard/tests/strings/substr_count_variation_002.phpt index f8b62bd837..a1310a22b5 100644 --- a/ext/standard/tests/strings/substr_count_variation_002.phpt +++ b/ext/standard/tests/strings/substr_count_variation_002.phpt @@ -34,7 +34,7 @@ var_dump(substr_count($str, "0")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing possible variations *** -- complex strings containing other than 7-bit chars -- diff --git a/ext/standard/tests/strings/substr_replace_array.phpt b/ext/standard/tests/strings/substr_replace_array.phpt index dbb8b17147..240e8c108c 100644 --- a/ext/standard/tests/strings/substr_replace_array.phpt +++ b/ext/standard/tests/strings/substr_replace_array.phpt @@ -9,7 +9,7 @@ $newarr = substr_replace($arr, 'zzz', 0, -2); print_r($newarr); ?> ---EXPECTF-- +--EXPECT-- Array ( [abc] => zzzkk diff --git a/ext/standard/tests/strings/ucwords_basic.phpt b/ext/standard/tests/strings/ucwords_basic.phpt index bba0d9bc4a..b0e3be80a7 100644 --- a/ext/standard/tests/strings/ucwords_basic.phpt +++ b/ext/standard/tests/strings/ucwords_basic.phpt @@ -41,7 +41,7 @@ for($index = 0; $index < count($str_array); $index++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ucwords() : basic functionality *** -- Iteration 1 -- string(15) "Testing Ucwords" diff --git a/ext/standard/tests/strings/ucwords_variation2.phpt b/ext/standard/tests/strings/ucwords_variation2.phpt index 4c24d97a0d..b224caf491 100644 --- a/ext/standard/tests/strings/ucwords_variation2.phpt +++ b/ext/standard/tests/strings/ucwords_variation2.phpt @@ -69,7 +69,7 @@ for($index =0; $index < count($heredoc_strings); $index ++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ucwords() : usage variations *** -- Iteration 1 -- string(0) "" diff --git a/ext/standard/tests/strings/ucwords_variation3.phpt b/ext/standard/tests/strings/ucwords_variation3.phpt index e6f7c405ac..8b38bb9401 100644 --- a/ext/standard/tests/strings/ucwords_variation3.phpt +++ b/ext/standard/tests/strings/ucwords_variation3.phpt @@ -56,7 +56,7 @@ for($index = 0; $index < count($str_array); $index++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ucwords() : usage variations *** -- Iteration 1 -- string(18) "Testing Ucwords" diff --git a/ext/standard/tests/strings/ucwords_variation4.phpt b/ext/standard/tests/strings/ucwords_variation4.phpt index 2e7092da73..023efd3d46 100644 --- a/ext/standard/tests/strings/ucwords_variation4.phpt +++ b/ext/standard/tests/strings/ucwords_variation4.phpt @@ -63,7 +63,7 @@ for($index = 0; $index < count($str_array); $index++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ucwords() : usage variations *** -- Iteration 1 -- string(18) "Testing Ucwords" diff --git a/ext/standard/tests/strings/unpack_bug68225.phpt b/ext/standard/tests/strings/unpack_bug68225.phpt index 7f8cdd4701..8d96369691 100644 --- a/ext/standard/tests/strings/unpack_bug68225.phpt +++ b/ext/standard/tests/strings/unpack_bug68225.phpt @@ -16,7 +16,7 @@ var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- array(1) { ["a"]=> int(1) diff --git a/ext/standard/tests/strings/vfprintf_basic.phpt b/ext/standard/tests/strings/vfprintf_basic.phpt index 8189aaf0b0..5ba2b91007 100644 --- a/ext/standard/tests/strings/vfprintf_basic.phpt +++ b/ext/standard/tests/strings/vfprintf_basic.phpt @@ -50,7 +50,7 @@ $file = 'vfprintf_test.txt'; unlink( $file ); ?> ---EXPECTF-- +--EXPECT-- *** Testing vfprintf() : basic functionality *** string(17) "Foo is 30 and bar" int(17) diff --git a/ext/standard/tests/strings/vfprintf_variation1.phpt b/ext/standard/tests/strings/vfprintf_variation1.phpt index 316e55ce2e..0d3e70b3fe 100644 --- a/ext/standard/tests/strings/vfprintf_variation1.phpt +++ b/ext/standard/tests/strings/vfprintf_variation1.phpt @@ -63,7 +63,7 @@ $file = 'vfprintf_test.txt'; unlink( $file ); ?> ---EXPECTF-- +--EXPECT-- *** Testing vfprintf() : variation functionality *** string(6) "format" int(6) diff --git a/ext/standard/tests/strings/vfprintf_variation9.phpt b/ext/standard/tests/strings/vfprintf_variation9.phpt Binary files differindex 8481b41ade..120e947259 100644 --- a/ext/standard/tests/strings/vfprintf_variation9.phpt +++ b/ext/standard/tests/strings/vfprintf_variation9.phpt diff --git a/ext/standard/tests/strings/vprintf_basic7_64bit.phpt b/ext/standard/tests/strings/vprintf_basic7_64bit.phpt index ac8a5f0dc5..564e6f1168 100644 --- a/ext/standard/tests/strings/vprintf_basic7_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_basic7_64bit.phpt @@ -35,7 +35,7 @@ echo "\n"; var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing vprintf() : basic functionality - using unsigned format *** 18446744073709550505 int(20) diff --git a/ext/standard/tests/strings/vprintf_variation12_64bit.phpt b/ext/standard/tests/strings/vprintf_variation12_64bit.phpt index 32dc01bfc1..0101f49e50 100644 --- a/ext/standard/tests/strings/vprintf_variation12_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation12_64bit.phpt @@ -80,7 +80,7 @@ foreach($args_array as $args) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing vprintf() : octal formats and non-octal values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vprintf_variation15_64bit.phpt index 0475d12e69..97bc9dcd8c 100644 --- a/ext/standard/tests/strings/vprintf_variation15_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation15_64bit.phpt @@ -50,7 +50,7 @@ foreach($formats as $format) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing vprintf() : unsigned formats and unsigned values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vprintf_variation9.phpt b/ext/standard/tests/strings/vprintf_variation9.phpt Binary files differindex 5ad2db2afa..14609374a8 100644 --- a/ext/standard/tests/strings/vprintf_variation9.phpt +++ b/ext/standard/tests/strings/vprintf_variation9.phpt diff --git a/ext/standard/tests/strings/vsprintf_basic1.phpt b/ext/standard/tests/strings/vsprintf_basic1.phpt index 6639ac3da2..960fcadc3a 100644 --- a/ext/standard/tests/strings/vsprintf_basic1.phpt +++ b/ext/standard/tests/strings/vsprintf_basic1.phpt @@ -25,7 +25,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using string format *** string(3) "one" string(7) "one two" diff --git a/ext/standard/tests/strings/vsprintf_basic2.phpt b/ext/standard/tests/strings/vsprintf_basic2.phpt index 3e78aab761..bd1c3dd519 100644 --- a/ext/standard/tests/strings/vsprintf_basic2.phpt +++ b/ext/standard/tests/strings/vsprintf_basic2.phpt @@ -28,7 +28,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using integer format *** string(3) "111" string(7) "111 222" diff --git a/ext/standard/tests/strings/vsprintf_basic3.phpt b/ext/standard/tests/strings/vsprintf_basic3.phpt index bbb6a3267c..fd0289ede8 100644 --- a/ext/standard/tests/strings/vsprintf_basic3.phpt +++ b/ext/standard/tests/strings/vsprintf_basic3.phpt @@ -34,7 +34,7 @@ var_dump( vsprintf($format33,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using float format *** string(9) "11.110000" string(9) "11.110000" diff --git a/ext/standard/tests/strings/vsprintf_basic4.phpt b/ext/standard/tests/strings/vsprintf_basic4.phpt index a82df93ad3..15f4a1a680 100644 --- a/ext/standard/tests/strings/vsprintf_basic4.phpt +++ b/ext/standard/tests/strings/vsprintf_basic4.phpt @@ -24,7 +24,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using bool format *** string(1) "1" string(3) "1 0" diff --git a/ext/standard/tests/strings/vsprintf_basic5.phpt b/ext/standard/tests/strings/vsprintf_basic5.phpt index a4a43d0521..3cb5ab15a1 100644 --- a/ext/standard/tests/strings/vsprintf_basic5.phpt +++ b/ext/standard/tests/strings/vsprintf_basic5.phpt @@ -24,7 +24,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using char format *** string(1) "A" string(3) "A B" diff --git a/ext/standard/tests/strings/vsprintf_basic6.phpt b/ext/standard/tests/strings/vsprintf_basic6.phpt index f6f6ed58a4..74dec1ce74 100644 --- a/ext/standard/tests/strings/vsprintf_basic6.phpt +++ b/ext/standard/tests/strings/vsprintf_basic6.phpt @@ -24,7 +24,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using exponential format *** string(11) "1.000000e+3" string(23) "1.000000e+3 2.000000e+3" diff --git a/ext/standard/tests/strings/vsprintf_basic7.phpt b/ext/standard/tests/strings/vsprintf_basic7.phpt index c477a20ee7..bb4bc246fe 100644 --- a/ext/standard/tests/strings/vsprintf_basic7.phpt +++ b/ext/standard/tests/strings/vsprintf_basic7.phpt @@ -28,7 +28,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using unsigned format *** string(10) "4294966185" string(21) "4294966185 4293732729" diff --git a/ext/standard/tests/strings/vsprintf_basic7_64bit.phpt b/ext/standard/tests/strings/vsprintf_basic7_64bit.phpt index ce26d246d3..fa040715df 100644 --- a/ext/standard/tests/strings/vsprintf_basic7_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_basic7_64bit.phpt @@ -28,7 +28,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using unsigned format *** string(20) "18446744073709550505" string(41) "18446744073709550505 18446744073708317049" diff --git a/ext/standard/tests/strings/vsprintf_basic8.phpt b/ext/standard/tests/strings/vsprintf_basic8.phpt index cd2929e007..3cc02c2e62 100644 --- a/ext/standard/tests/strings/vsprintf_basic8.phpt +++ b/ext/standard/tests/strings/vsprintf_basic8.phpt @@ -24,7 +24,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using octal format *** string(2) "21" string(6) "21 347" diff --git a/ext/standard/tests/strings/vsprintf_basic9.phpt b/ext/standard/tests/strings/vsprintf_basic9.phpt index 42012a5c8f..571d9ac2de 100644 --- a/ext/standard/tests/strings/vsprintf_basic9.phpt +++ b/ext/standard/tests/strings/vsprintf_basic9.phpt @@ -34,7 +34,7 @@ var_dump( vsprintf($format33,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using hexadecimal format *** string(1) "b" string(1) "B" diff --git a/ext/standard/tests/strings/vsprintf_variation10.phpt b/ext/standard/tests/strings/vsprintf_variation10.phpt Binary files differindex 42ba2679f1..9678398058 100644 --- a/ext/standard/tests/strings/vsprintf_variation10.phpt +++ b/ext/standard/tests/strings/vsprintf_variation10.phpt diff --git a/ext/standard/tests/strings/vsprintf_variation11.phpt b/ext/standard/tests/strings/vsprintf_variation11.phpt index 4cc5b02922..3d5eb1cfc3 100644 --- a/ext/standard/tests/strings/vsprintf_variation11.phpt +++ b/ext/standard/tests/strings/vsprintf_variation11.phpt @@ -56,7 +56,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : octal formats with octal values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt index 841d104b81..6d9c4c4b79 100644 --- a/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt @@ -56,7 +56,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : octal formats with octal values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation12.phpt b/ext/standard/tests/strings/vsprintf_variation12.phpt index ab67cc82f9..8437487904 100644 --- a/ext/standard/tests/strings/vsprintf_variation12.phpt +++ b/ext/standard/tests/strings/vsprintf_variation12.phpt @@ -78,7 +78,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : octal formats and non-octal values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt index 530f05b13f..17698497e2 100644 --- a/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt @@ -78,7 +78,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : octal formats and non-octal values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation13.phpt b/ext/standard/tests/strings/vsprintf_variation13.phpt index b617975759..6be9d4a9a8 100644 --- a/ext/standard/tests/strings/vsprintf_variation13.phpt +++ b/ext/standard/tests/strings/vsprintf_variation13.phpt @@ -56,7 +56,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : hexa formats with hexa values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt index 8d2533a8fc..59efbf9d22 100644 --- a/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt @@ -56,7 +56,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : hexa formats with hexa values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation14.phpt b/ext/standard/tests/strings/vsprintf_variation14.phpt index bfe816ee1f..d63165046c 100644 --- a/ext/standard/tests/strings/vsprintf_variation14.phpt +++ b/ext/standard/tests/strings/vsprintf_variation14.phpt @@ -79,7 +79,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : hexa formats and non-hexa values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation14_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation14_64bit.phpt index f1940ef2ee..5f31e385ec 100644 --- a/ext/standard/tests/strings/vsprintf_variation14_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation14_64bit.phpt @@ -79,7 +79,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : hexa formats and non-hexa values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt index af55ce966f..35a78200a6 100644 --- a/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt @@ -48,7 +48,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : unsigned formats and unsigned values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation16.phpt b/ext/standard/tests/strings/vsprintf_variation16.phpt index 01bcc662d5..8fb03d609d 100644 --- a/ext/standard/tests/strings/vsprintf_variation16.phpt +++ b/ext/standard/tests/strings/vsprintf_variation16.phpt @@ -71,7 +71,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : unsigned formats and signed & other types of values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt index 91a69c7e70..b138c32614 100644 --- a/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt @@ -71,7 +71,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : unsigned formats and signed & other types of values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation17.phpt b/ext/standard/tests/strings/vsprintf_variation17.phpt index 88cacdd49a..81dec4d89c 100644 --- a/ext/standard/tests/strings/vsprintf_variation17.phpt +++ b/ext/standard/tests/strings/vsprintf_variation17.phpt @@ -44,7 +44,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : scientific formats and scientific values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation18.phpt b/ext/standard/tests/strings/vsprintf_variation18.phpt index 3d1aeba335..87ba0440e4 100644 --- a/ext/standard/tests/strings/vsprintf_variation18.phpt +++ b/ext/standard/tests/strings/vsprintf_variation18.phpt @@ -67,7 +67,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : scientific formats and non-scientific values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation19.phpt b/ext/standard/tests/strings/vsprintf_variation19.phpt index 8d475b75a3..de56405eed 100644 --- a/ext/standard/tests/strings/vsprintf_variation19.phpt +++ b/ext/standard/tests/strings/vsprintf_variation19.phpt @@ -53,7 +53,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : with white spaces in format strings *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt index 69145ba963..9385a6e67f 100644 --- a/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt @@ -53,7 +53,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : with white spaces in format strings *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation3.phpt b/ext/standard/tests/strings/vsprintf_variation3.phpt index 2932e15f18..e71bf1c178 100644 --- a/ext/standard/tests/strings/vsprintf_variation3.phpt +++ b/ext/standard/tests/strings/vsprintf_variation3.phpt @@ -53,7 +53,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : int formats with int values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation4.phpt b/ext/standard/tests/strings/vsprintf_variation4.phpt index e3e6737b82..3decee6310 100644 --- a/ext/standard/tests/strings/vsprintf_variation4.phpt +++ b/ext/standard/tests/strings/vsprintf_variation4.phpt @@ -71,7 +71,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : int formats and non-integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt index c6b6db572c..83f0327423 100644 --- a/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt @@ -71,7 +71,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : int formats and non-integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation5.phpt b/ext/standard/tests/strings/vsprintf_variation5.phpt index b2bd0d5b79..42db3d4405 100644 --- a/ext/standard/tests/strings/vsprintf_variation5.phpt +++ b/ext/standard/tests/strings/vsprintf_variation5.phpt @@ -53,7 +53,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : int formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation6.phpt b/ext/standard/tests/strings/vsprintf_variation6.phpt index 00f9467cf9..f638e51726 100644 --- a/ext/standard/tests/strings/vsprintf_variation6.phpt +++ b/ext/standard/tests/strings/vsprintf_variation6.phpt @@ -67,7 +67,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : float formats and non-float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation9.phpt b/ext/standard/tests/strings/vsprintf_variation9.phpt Binary files differindex c16531b2f5..dcc1102ea0 100644 --- a/ext/standard/tests/strings/vsprintf_variation9.phpt +++ b/ext/standard/tests/strings/vsprintf_variation9.phpt diff --git a/ext/standard/tests/strings/wordwrap_basic.phpt b/ext/standard/tests/strings/wordwrap_basic.phpt index 84a7f7335c..1760a9cc77 100644 --- a/ext/standard/tests/strings/wordwrap_basic.phpt +++ b/ext/standard/tests/strings/wordwrap_basic.phpt @@ -35,7 +35,7 @@ $cut = false; var_dump( wordwrap($str, $width, $break, $cut) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing wordwrap() : basic functionality *** string(96) "The quick brown foooooooooox jummmmmmmmmmmmped over the lazzzzzzzzzzzy doooooooooooooooooooooog." diff --git a/ext/standard/tests/strings/wordwrap_variation5.phpt b/ext/standard/tests/strings/wordwrap_variation5.phpt index b0911a899c..ebfffe4040 100644 --- a/ext/standard/tests/strings/wordwrap_variation5.phpt +++ b/ext/standard/tests/strings/wordwrap_variation5.phpt @@ -40,7 +40,7 @@ var_dump( wordwrap($str, $width, $break1, $cut) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing wordwrap() : usage variations *** -- Testing wordwrap() with default break value and single space as value -- diff --git a/ext/standard/tests/time/strptime_basic.phpt b/ext/standard/tests/time/strptime_basic.phpt index 30e3e82cc7..8fbe37cd82 100644 --- a/ext/standard/tests/time/strptime_basic.phpt +++ b/ext/standard/tests/time/strptime_basic.phpt @@ -35,7 +35,7 @@ var_dump(strptime($str, '%A %B %e %R')); setlocale(LC_ALL, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strptime() : basic functionality *** array(9) { ["tm_sec"]=> diff --git a/ext/standard/tests/url/base64_decode_basic_001.phpt b/ext/standard/tests/url/base64_decode_basic_001.phpt index e1469c37e8..516666c53c 100644 --- a/ext/standard/tests/url/base64_decode_basic_001.phpt +++ b/ext/standard/tests/url/base64_decode_basic_001.phpt @@ -16,7 +16,7 @@ var_dump(bin2hex(base64_decode($allbase64, true))); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- Decode an input string containing the whole base64 alphabet: string(98) "00108310518720928b30d38f41149351559761969b71d79f8218a39259a7a29aabb2dbafc31cb3d35db7e39ebbf3dfbf55" string(98) "00108310518720928b30d38f41149351559761969b71d79f8218a39259a7a29aabb2dbafc31cb3d35db7e39ebbf3dfbf55" diff --git a/ext/standard/tests/url/base64_decode_basic_002.phpt b/ext/standard/tests/url/base64_decode_basic_002.phpt index 1289894f4a..c6afffd389 100644 --- a/ext/standard/tests/url/base64_decode_basic_002.phpt +++ b/ext/standard/tests/url/base64_decode_basic_002.phpt @@ -29,7 +29,7 @@ var_dump(base64_decode($badChars, true)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- Decode 'hello world!': string(12) "hello world!" string(12) "hello world!" diff --git a/ext/standard/tests/url/base64_decode_basic_003.phpt b/ext/standard/tests/url/base64_decode_basic_003.phpt index 0407926b02..3bcd51e192 100644 --- a/ext/standard/tests/url/base64_decode_basic_003.phpt +++ b/ext/standard/tests/url/base64_decode_basic_003.phpt @@ -38,7 +38,7 @@ foreach ($data as $a) { } echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Test base64_decode (output as JSON): base64 "" non-strict "" strict "" base64 "=" non-strict "" strict false diff --git a/ext/standard/tests/url/base64_encode_basic_001.phpt b/ext/standard/tests/url/base64_encode_basic_001.phpt index 6ab57f4c55..6f5e0a28da 100644 --- a/ext/standard/tests/url/base64_encode_basic_001.phpt +++ b/ext/standard/tests/url/base64_encode_basic_001.phpt @@ -22,7 +22,7 @@ for ($i=0; $i<256; $i++) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing base64_encode() : basic functionality *** 0x0: AA== 0x1: AQ== diff --git a/ext/standard/tests/url/base64_encode_basic_002.phpt b/ext/standard/tests/url/base64_encode_basic_002.phpt index cff8f41425..e2304ec06e 100644 --- a/ext/standard/tests/url/base64_encode_basic_002.phpt +++ b/ext/standard/tests/url/base64_encode_basic_002.phpt @@ -42,7 +42,7 @@ foreach($values as $str) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing base64_encode() : basic functionality *** --- Testing base64_encode() with binary string input --- diff --git a/ext/standard/tests/url/bug53248.phpt b/ext/standard/tests/url/bug53248.phpt index 5e31c510df..5cff9f1c47 100644 --- a/ext/standard/tests/url/bug53248.phpt +++ b/ext/standard/tests/url/bug53248.phpt @@ -7,6 +7,6 @@ var_dump(rawurlencode('A1_-.~')); var_dump(rawurldecode('%41%31%5F%2D%2E%7E')); ?> ---EXPECTF-- +--EXPECT-- string(6) "A1_-.~" string(6) "A1_-.~"
\ No newline at end of file diff --git a/ext/standard/tests/url/bug54180.phpt b/ext/standard/tests/url/bug54180.phpt index 2e64e27d07..815784c28d 100644 --- a/ext/standard/tests/url/bug54180.phpt +++ b/ext/standard/tests/url/bug54180.phpt @@ -7,7 +7,7 @@ var_dump(parse_url("http://example.com/path/script.html?t=1#fragment?data")); var_dump(parse_url("http://example.com/path/script.html#fragment?data")); ?> ---EXPECTF-- +--EXPECT-- array(5) { ["scheme"]=> string(4) "http" diff --git a/ext/standard/tests/url/get_headers_error_003.phpt b/ext/standard/tests/url/get_headers_error_003.phpt index 6c8878513c..81265eecc9 100644 --- a/ext/standard/tests/url/get_headers_error_003.phpt +++ b/ext/standard/tests/url/get_headers_error_003.phpt @@ -22,7 +22,7 @@ echo $headers["X-Request-Method"]."\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- HEAD HEAD Done diff --git a/ext/standard/tests/url/parse_url_basic_001.phpt b/ext/standard/tests/url/parse_url_basic_001.phpt index bd4bea5b9c..e963da377c 100644 --- a/ext/standard/tests/url/parse_url_basic_001.phpt +++ b/ext/standard/tests/url/parse_url_basic_001.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37: array(1) { ["path"]=> diff --git a/ext/standard/tests/url/parse_url_basic_002.phpt b/ext/standard/tests/url/parse_url_basic_002.phpt index eae78febed..fafc877502 100644 --- a/ext/standard/tests/url/parse_url_basic_002.phpt +++ b/ext/standard/tests/url/parse_url_basic_002.phpt @@ -21,7 +21,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : NULL --> http://64.246.30.37 : string(4) "http" --> http://64.246.30.37/ : string(4) "http" diff --git a/ext/standard/tests/url/parse_url_basic_003.phpt b/ext/standard/tests/url/parse_url_basic_003.phpt index 0ce27b7a2c..76f70da4d8 100644 --- a/ext/standard/tests/url/parse_url_basic_003.phpt +++ b/ext/standard/tests/url/parse_url_basic_003.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : NULL --> http://64.246.30.37 : string(12) "64.246.30.37" --> http://64.246.30.37/ : string(12) "64.246.30.37" diff --git a/ext/standard/tests/url/parse_url_basic_004.phpt b/ext/standard/tests/url/parse_url_basic_004.phpt index 92d690ae1d..5dda51372a 100644 --- a/ext/standard/tests/url/parse_url_basic_004.phpt +++ b/ext/standard/tests/url/parse_url_basic_004.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : NULL --> http://64.246.30.37 : NULL --> http://64.246.30.37/ : NULL diff --git a/ext/standard/tests/url/parse_url_basic_005.phpt b/ext/standard/tests/url/parse_url_basic_005.phpt index 68162594f1..65ae06a469 100644 --- a/ext/standard/tests/url/parse_url_basic_005.phpt +++ b/ext/standard/tests/url/parse_url_basic_005.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : NULL --> http://64.246.30.37 : NULL --> http://64.246.30.37/ : NULL diff --git a/ext/standard/tests/url/parse_url_basic_006.phpt b/ext/standard/tests/url/parse_url_basic_006.phpt index 2628559ee5..3f06a50aef 100644 --- a/ext/standard/tests/url/parse_url_basic_006.phpt +++ b/ext/standard/tests/url/parse_url_basic_006.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : NULL --> http://64.246.30.37 : NULL --> http://64.246.30.37/ : NULL diff --git a/ext/standard/tests/url/parse_url_basic_007.phpt b/ext/standard/tests/url/parse_url_basic_007.phpt index 15935bb663..67827e05c0 100644 --- a/ext/standard/tests/url/parse_url_basic_007.phpt +++ b/ext/standard/tests/url/parse_url_basic_007.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : string(12) "64.246.30.37" --> http://64.246.30.37 : NULL --> http://64.246.30.37/ : string(1) "/" diff --git a/ext/standard/tests/url/parse_url_basic_008.phpt b/ext/standard/tests/url/parse_url_basic_008.phpt index 48ea6b92b2..f2b64da280 100644 --- a/ext/standard/tests/url/parse_url_basic_008.phpt +++ b/ext/standard/tests/url/parse_url_basic_008.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : NULL --> http://64.246.30.37 : NULL --> http://64.246.30.37/ : NULL diff --git a/ext/standard/tests/url/parse_url_basic_009.phpt b/ext/standard/tests/url/parse_url_basic_009.phpt index 19527d87ef..c38a69d0dd 100644 --- a/ext/standard/tests/url/parse_url_basic_009.phpt +++ b/ext/standard/tests/url/parse_url_basic_009.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : NULL --> http://64.246.30.37 : NULL --> http://64.246.30.37/ : NULL diff --git a/ext/standard/tests/url/parse_url_basic_010.phpt b/ext/standard/tests/url/parse_url_basic_010.phpt index 3bb2dba142..ff509e9744 100644 --- a/ext/standard/tests/url/parse_url_basic_010.phpt +++ b/ext/standard/tests/url/parse_url_basic_010.phpt @@ -19,7 +19,7 @@ foreach(get_defined_constants() as $constantName => $constantValue) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- PHP_URL_SCHEME: 0 PHP_URL_HOST: 1 PHP_URL_PORT: 2 diff --git a/ext/standard/tests/url/parse_url_unterminated.phpt b/ext/standard/tests/url/parse_url_unterminated.phpt index bb0e096856..00cdeab9a9 100644 --- a/ext/standard/tests/url/parse_url_unterminated.phpt +++ b/ext/standard/tests/url/parse_url_unterminated.phpt @@ -22,7 +22,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37: array(1) { ["path"]=> diff --git a/ext/sysvmsg/tests/004.phpt b/ext/sysvmsg/tests/004.phpt index 39467d7444..bae72ee0a3 100644 --- a/ext/sysvmsg/tests/004.phpt +++ b/ext/sysvmsg/tests/004.phpt @@ -39,7 +39,7 @@ if (!msg_remove_queue($q)) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Set mode: bool(true) Did really work: diff --git a/ext/tidy/tests/030.phpt b/ext/tidy/tests/030.phpt index 46809a91c7..f29d6ee01f 100644 --- a/ext/tidy/tests/030.phpt +++ b/ext/tidy/tests/030.phpt @@ -20,7 +20,7 @@ var_dump($c['indent']); var_dump($c['indent-attributes']); var_dump($c['indent-spaces']); ?> ---EXPECTF-- +--EXPECT-- int(1) bool(true) int(3) diff --git a/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_001.phpt b/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_001.phpt index fc166e2fc6..3d2a37e64f 100644 --- a/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_001.phpt +++ b/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_001.phpt @@ -30,7 +30,7 @@ array_walk($tokens, function($tk) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- L1: T_OPEN_TAG <?php L2: T_STRING X diff --git a/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_002.phpt b/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_002.phpt index 3dd8e14d84..b2c9f1cf68 100644 --- a/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_002.phpt +++ b/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_002.phpt @@ -23,7 +23,7 @@ array_walk($tokens, function($tk) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- L1: T_OPEN_TAG <?php L2: T_CLASS class diff --git a/ext/wddx/tests/bug68996.phpt b/ext/wddx/tests/bug68996.phpt index fc4ecbc731..cba4b3f194 100644 --- a/ext/wddx/tests/bug68996.phpt +++ b/ext/wddx/tests/bug68996.phpt @@ -10,6 +10,6 @@ if (getenv("USE_ZEND_ALLOC") !== "0") echo wddx_serialize_value("\xfc\x63") . "\n"; echo wddx_serialize_value([ "\xfc\x63" => "foo" ]) . "\n"; ?> ---EXPECTF-- +--EXPECT-- <wddxPacket version='1.0'><header/><data><string></string></data></wddxPacket> <wddxPacket version='1.0'><header/><data><struct><var name=''><string>foo</string></var></struct></data></wddxPacket> diff --git a/ext/wddx/tests/bug70661.phpt b/ext/wddx/tests/bug70661.phpt index e068c20a7a..b5629c85d6 100644 --- a/ext/wddx/tests/bug70661.phpt +++ b/ext/wddx/tests/bug70661.phpt @@ -53,7 +53,7 @@ function ptr2str($ptr) } ?> DONE ---EXPECTF-- +--EXPECT-- array(1) { [0]=> array(1) { diff --git a/ext/wddx/tests/bug71587.phpt b/ext/wddx/tests/bug71587.phpt index 3fdfc35c16..ce46d5ec7e 100644 --- a/ext/wddx/tests/bug71587.phpt +++ b/ext/wddx/tests/bug71587.phpt @@ -29,7 +29,7 @@ foreach($wddx as $k=>$v) ?> DONE ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(8) "manhluat" diff --git a/ext/wddx/tests/bug73065.phpt b/ext/wddx/tests/bug73065.phpt index aa301aa838..ebf14858eb 100644 --- a/ext/wddx/tests/bug73065.phpt +++ b/ext/wddx/tests/bug73065.phpt @@ -81,7 +81,7 @@ for($i=1;$i<=5;$i++) { } ?> DONE ---EXPECTF-- +--EXPECT-- array(0) { } array(0) { diff --git a/ext/wddx/tests/bug73631.phpt b/ext/wddx/tests/bug73631.phpt index 1fcde72dfe..b3604b7349 100644 --- a/ext/wddx/tests/bug73631.phpt +++ b/ext/wddx/tests/bug73631.phpt @@ -14,5 +14,5 @@ EOF; $wddx = wddx_deserialize($xml); var_dump($wddx); ?> ---EXPECTF-- +--EXPECT-- int(1234) diff --git a/ext/wddx/tests/bug74145.phpt b/ext/wddx/tests/bug74145.phpt index a99a1178ca..16e49d4eb8 100644 --- a/ext/wddx/tests/bug74145.phpt +++ b/ext/wddx/tests/bug74145.phpt @@ -11,6 +11,6 @@ $wddx = wddx_deserialize($data); var_dump($wddx); ?> DONE ---EXPECTF-- +--EXPECT-- NULL DONE
\ No newline at end of file diff --git a/ext/xml/tests/bug50576.phpt b/ext/xml/tests/bug50576.phpt index fd3d0cbb4a..152206a951 100644 --- a/ext/xml/tests/bug50576.phpt +++ b/ext/xml/tests/bug50576.phpt @@ -34,7 +34,7 @@ xml_parse($xml_parser, $XML); xml_parser_free($xml_parser); ?> ---EXPECTF-- +--EXPECT-- Index array Array ( diff --git a/ext/xmlreader/tests/008.phpt b/ext/xmlreader/tests/008.phpt index 2dbb5e7c87..967cbbd389 100644 --- a/ext/xmlreader/tests/008.phpt +++ b/ext/xmlreader/tests/008.phpt @@ -65,7 +65,7 @@ if ($reader->isValid()) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- file DTD: ok string DTD: ok ===DONE=== diff --git a/ext/xmlreader/tests/009.phpt b/ext/xmlreader/tests/009.phpt index 613ef678cb..684d6143f8 100644 --- a/ext/xmlreader/tests/009.phpt +++ b/ext/xmlreader/tests/009.phpt @@ -23,6 +23,6 @@ echo $reader->getAttribute('num'); echo "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- book 2 ===DONE=== diff --git a/ext/xmlreader/tests/010.phpt b/ext/xmlreader/tests/010.phpt index a107c7441f..7a10096b83 100644 --- a/ext/xmlreader/tests/010.phpt +++ b/ext/xmlreader/tests/010.phpt @@ -22,6 +22,6 @@ echo $reader->getAttributeNs('isbn', 'uri'); echo "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- prefix:books 12isbn ===DONE=== diff --git a/ext/xmlreader/tests/bug70309.phpt b/ext/xmlreader/tests/bug70309.phpt index 021d346bda..aa49051593 100644 --- a/ext/xmlreader/tests/bug70309.phpt +++ b/ext/xmlreader/tests/bug70309.phpt @@ -39,5 +39,5 @@ $doc->setRelaxNGSchema('http://docs.oasis-open.org/docbook/rng/5.0/docbook.rng') while (@$doc->read() !== false); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== diff --git a/ext/xmlrpc/tests/bug38431.phpt b/ext/xmlrpc/tests/bug38431.phpt index 288fe1041d..8cc9eeaf97 100644 --- a/ext/xmlrpc/tests/bug38431.phpt +++ b/ext/xmlrpc/tests/bug38431.phpt @@ -16,7 +16,7 @@ var_dump(xmlrpc_get_type($var)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(5) "array" string(5) "array" string(5) "array" diff --git a/ext/xmlrpc/tests/bug40576.phpt b/ext/xmlrpc/tests/bug40576.phpt index 404aba32ba..fedf53ee84 100644 --- a/ext/xmlrpc/tests/bug40576.phpt +++ b/ext/xmlrpc/tests/bug40576.phpt @@ -19,7 +19,7 @@ var_dump(xmlrpc_encode("1.22222222222222222222222")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(125) "<?xml version="1.0" encoding="utf-8"?> <params> <param> diff --git a/ext/xmlrpc/tests/bug40576_64bit.phpt b/ext/xmlrpc/tests/bug40576_64bit.phpt index bb4cbe7843..74f8f0cbea 100644 --- a/ext/xmlrpc/tests/bug40576_64bit.phpt +++ b/ext/xmlrpc/tests/bug40576_64bit.phpt @@ -19,7 +19,7 @@ var_dump(xmlrpc_encode("1.22222222222222222222222")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(125) "<?xml version="1.0" encoding="utf-8"?> <params> <param> diff --git a/ext/xmlrpc/tests/bug42736.phpt b/ext/xmlrpc/tests/bug42736.phpt index b9a46cff5c..1dfe1c65f1 100644 --- a/ext/xmlrpc/tests/bug42736.phpt +++ b/ext/xmlrpc/tests/bug42736.phpt @@ -28,7 +28,7 @@ var_dump($response); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(402) "<?xml version="1.0" encoding="iso-8859-1"?> <methodResponse> <params> diff --git a/ext/xmlrpc/tests/bug47818.phpt b/ext/xmlrpc/tests/bug47818.phpt index a2944d8ec2..a074cd831e 100644 --- a/ext/xmlrpc/tests/bug47818.phpt +++ b/ext/xmlrpc/tests/bug47818.phpt @@ -36,6 +36,6 @@ $method = $x->getMethod(); print "Global scope: $method\n"; ?> ---EXPECTF-- +--EXPECT-- Inside impl(): add Global scope: add diff --git a/ext/xmlrpc/tests/bug70728.phpt b/ext/xmlrpc/tests/bug70728.phpt index 72f72f85b0..52e1aa9843 100644 --- a/ext/xmlrpc/tests/bug70728.phpt +++ b/ext/xmlrpc/tests/bug70728.phpt @@ -13,7 +13,7 @@ $obj->scalar = 0x1122334455; var_dump(xmlrpc_encode($obj)); var_dump($obj); ?> ---EXPECTF-- +--EXPECT-- string(135) "<?xml version="1.0" encoding="utf-8"?> <params> <param> diff --git a/ext/xmlrpc/tests/bug70728_64bit.phpt b/ext/xmlrpc/tests/bug70728_64bit.phpt index 3ed5093918..b5e96a9d88 100644 --- a/ext/xmlrpc/tests/bug70728_64bit.phpt +++ b/ext/xmlrpc/tests/bug70728_64bit.phpt @@ -13,7 +13,7 @@ $obj->scalar = 0x1122334455; var_dump(xmlrpc_encode($obj)); var_dump($obj); ?> ---EXPECTF-- +--EXPECT-- string(135) "<?xml version="1.0" encoding="utf-8"?> <params> <param> diff --git a/ext/xmlrpc/tests/bug71501.phpt b/ext/xmlrpc/tests/bug71501.phpt index 950d21d6d4..5f54186f76 100644 --- a/ext/xmlrpc/tests/bug71501.phpt +++ b/ext/xmlrpc/tests/bug71501.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xmlrpc")) print "skip"; $params = 'Lê Trung Hiếu'; echo xmlrpc_encode_request('foo', $params, ['encoding' => 'UTF-8', 'escaping' => 'markup']); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0" encoding="UTF-8"?> <methodCall> <methodName>foo</methodName> diff --git a/ext/xmlrpc/tests/bug72155.phpt b/ext/xmlrpc/tests/bug72155.phpt index 5a71423dce..40c6c56237 100644 --- a/ext/xmlrpc/tests/bug72155.phpt +++ b/ext/xmlrpc/tests/bug72155.phpt @@ -15,7 +15,7 @@ $var0 = fopen($fl,"r"); $var1 = xmlrpc_encode($var0); var_dump($var1); ?> ---EXPECTF-- +--EXPECT-- string(109) "<?xml version="1.0" encoding="utf-8"?> <params> <param> diff --git a/ext/xmlrpc/tests/bug72647.phpt b/ext/xmlrpc/tests/bug72647.phpt index 9334cbda51..6e80b23cf9 100644 --- a/ext/xmlrpc/tests/bug72647.phpt +++ b/ext/xmlrpc/tests/bug72647.phpt @@ -13,7 +13,7 @@ unset($v); echo xmlrpc_encode($ar); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0" encoding="utf-8"?> <params> <param> diff --git a/ext/xmlrpc/tests/bug74975.phpt b/ext/xmlrpc/tests/bug74975.phpt index 8f6a9dfb13..46a5af28e2 100644 --- a/ext/xmlrpc/tests/bug74975.phpt +++ b/ext/xmlrpc/tests/bug74975.phpt @@ -32,7 +32,7 @@ echo xmlrpc_encode([ ]); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0" encoding="utf-8"?> <params> <param> diff --git a/ext/xmlwriter/tests/bug39504.phpt b/ext/xmlwriter/tests/bug39504.phpt index af97f81ed5..4b6ceda4fd 100644 --- a/ext/xmlwriter/tests/bug39504.phpt +++ b/ext/xmlwriter/tests/bug39504.phpt @@ -28,7 +28,7 @@ $xw->endDocument(); print $xw->flush(true); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE root [<!ENTITY ent2 "val2">]><root/> diff --git a/ext/xmlwriter/tests/bug41287.phpt b/ext/xmlwriter/tests/bug41287.phpt index 72b6720f1d..3bdc63cd93 100644 --- a/ext/xmlwriter/tests/bug41287.phpt +++ b/ext/xmlwriter/tests/bug41287.phpt @@ -31,7 +31,7 @@ $xw->endElement(); $xw->endDocument(); print $xw->flush(true); ?> ---EXPECTF-- +--EXPECT-- <?xml version="1.0"?> <test:test xmlns:test="urn:x-test:"> <test:foo></test:foo> diff --git a/ext/xsl/tests/bug53965.phpt b/ext/xsl/tests/bug53965.phpt index 8de777ed63..40ce0a62f1 100644 --- a/ext/xsl/tests/bug53965.phpt +++ b/ext/xsl/tests/bug53965.phpt @@ -20,7 +20,7 @@ $proc->importStyleSheet($xsl); echo $proc->transformToXML($xml); ?> ---EXPECTF-- +--EXPECT-- Hey! Welcome to Nicolas Eliaszewicz's sweet CD collection! <h1>Fight for your mind</h1><h2>by Ben Harper - 1995</h2><hr> diff --git a/ext/xsl/tests/xsltprocessor_getParameter-invalidparam.phpt b/ext/xsl/tests/xsltprocessor_getParameter-invalidparam.phpt index 19f7791032..858cd93119 100644 --- a/ext/xsl/tests/xsltprocessor_getParameter-invalidparam.phpt +++ b/ext/xsl/tests/xsltprocessor_getParameter-invalidparam.phpt @@ -10,7 +10,7 @@ Check xsltprocessor::getParameter with undefined parameter <?php include dirname(__FILE__) .'/prepare.inc'; var_dump($proc->getParameter('', 'doesnotexist')); ---EXPECTF-- +--EXPECT-- bool(false) --CREDITS-- Christian Weiske, cweiske@php.net diff --git a/ext/xsl/tests/xsltprocessor_hasExsltSupport.phpt b/ext/xsl/tests/xsltprocessor_hasExsltSupport.phpt index 2267129307..74cd38951e 100644 --- a/ext/xsl/tests/xsltprocessor_hasExsltSupport.phpt +++ b/ext/xsl/tests/xsltprocessor_hasExsltSupport.phpt @@ -9,5 +9,5 @@ Rodrigo Prado de Jesus <royopa [at] gmail [dot] com> $proc = new XSLTProcessor(); var_dump($proc->hasExsltSupport()); ?> ---EXPECTF-- +--EXPECT-- bool(true)
\ No newline at end of file diff --git a/ext/xsl/tests/xsltprocessor_hasExsltSupport_wrongparam_001.phpt b/ext/xsl/tests/xsltprocessor_hasExsltSupport_wrongparam_001.phpt index 107157fa28..d7f82a18b4 100644 --- a/ext/xsl/tests/xsltprocessor_hasExsltSupport_wrongparam_001.phpt +++ b/ext/xsl/tests/xsltprocessor_hasExsltSupport_wrongparam_001.phpt @@ -9,5 +9,5 @@ Rodrigo Prado de Jesus <royopa [at] gmail [dot] com> $proc = new XSLTProcessor(); var_dump($proc->hasExsltSupport('stringValue')); ?> ---EXPECTF-- +--EXPECT-- bool(true)
\ No newline at end of file diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-allfuncs.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-allfuncs.phpt index 1f0453ec84..be67f2261b 100644 --- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-allfuncs.phpt +++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-allfuncs.phpt @@ -22,7 +22,7 @@ var_dump($proc->transformToXml($dom)); //var_dump($proc->registerPHPFunctions(array())); //var_dump($proc->transformToXml($dom)); ---EXPECTF-- +--EXPECT-- NULL string(18) "This Is An Example" --CREDITS-- diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array-multiple.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array-multiple.phpt index a5f23735c9..6147819269 100644 --- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array-multiple.phpt +++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array-multiple.phpt @@ -24,7 +24,7 @@ var_dump($proc->registerPHPFunctions(array('strpos', 'ucwords'))); var_dump($proc->registerPHPFunctions(array('strrev', 'array_key_exists'))); var_dump($proc->registerPHPFunctions(array())); var_dump($proc->transformToXml($dom)); ---EXPECTF-- +--EXPECT-- NULL NULL NULL diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array.phpt index 0e467aabaa..90e5788350 100644 --- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array.phpt +++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array.phpt @@ -18,7 +18,7 @@ if(!$phpfuncxsl) { $proc->importStylesheet($phpfuncxsl); var_dump($proc->registerPHPFunctions(array('ucwords'))); var_dump($proc->transformToXml($dom)); ---EXPECTF-- +--EXPECT-- NULL string(18) "This Is An Example" --CREDITS-- diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-null.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-null.phpt index f74d785042..80016e425b 100644 --- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-null.phpt +++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-null.phpt @@ -23,7 +23,7 @@ $proc->importStylesheet($phpfuncxsl); var_dump($proc->registerPHPFunctions('ucwords')); var_dump($proc->registerPHPFunctions(null)); var_dump($proc->transformToXml($dom)); ---EXPECTF-- +--EXPECT-- NULL NULL string(18) "This Is An Example" diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string-multiple.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string-multiple.phpt index f15c08d327..31e2edea51 100644 --- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string-multiple.phpt +++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string-multiple.phpt @@ -23,7 +23,7 @@ $proc->importStylesheet($phpfuncxsl); var_dump($proc->registerPHPFunctions('ucwords')); var_dump($proc->registerPHPFunctions('strpos')); var_dump($proc->transformToXml($dom)); ---EXPECTF-- +--EXPECT-- NULL NULL string(18) "This Is An Example" diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string.phpt index 5fbba909b1..d9408630e7 100644 --- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string.phpt +++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string.phpt @@ -18,7 +18,7 @@ if(!$phpfuncxsl) { $proc->importStylesheet($phpfuncxsl); var_dump($proc->registerPHPFunctions('ucwords')); var_dump($proc->transformToXml($dom)); ---EXPECTF-- +--EXPECT-- NULL string(18) "This Is An Example" --CREDITS-- diff --git a/ext/xsl/tests/xsltprocessor_transformToURI.phpt b/ext/xsl/tests/xsltprocessor_transformToURI.phpt index 27ed4e2975..f2fe9bdb57 100644 --- a/ext/xsl/tests/xsltprocessor_transformToURI.phpt +++ b/ext/xsl/tests/xsltprocessor_transformToURI.phpt @@ -49,5 +49,5 @@ $proc->importStyleSheet($xsldoc); var_dump($proc->transformToURI($xsldoc, 'php://output')); ?> ---EXPECTF-- +--EXPECT-- int(56)
\ No newline at end of file diff --git a/ext/zip/tests/bug53885.phpt b/ext/zip/tests/bug53885.phpt index 1b3fcb9e4b..5db2367c30 100644 --- a/ext/zip/tests/bug53885.phpt +++ b/ext/zip/tests/bug53885.phpt @@ -20,5 +20,5 @@ $nx->statName("a",ZIPARCHIVE::FL_UNCHANGED); $fname = dirname(__FILE__)."/test53885.zip"; unlink($fname); ?> ---EXPECTF-- +--EXPECT-- ==DONE== diff --git a/ext/zip/tests/bug64342_1-mb.phpt b/ext/zip/tests/bug64342_1-mb.phpt index caac92d0f9..4ba564ee1e 100644 --- a/ext/zip/tests/bug64342_1-mb.phpt +++ b/ext/zip/tests/bug64342_1-mb.phpt @@ -29,7 +29,7 @@ if ($zip->status == ZIPARCHIVE::ER_OK) { } @unlink($file); ?> ---EXPECTF-- +--EXPECT-- failed 0 bar 1 foobar/ diff --git a/ext/zip/tests/bug64342_1.phpt b/ext/zip/tests/bug64342_1.phpt index 06b0b92cab..1463170e7e 100644 --- a/ext/zip/tests/bug64342_1.phpt +++ b/ext/zip/tests/bug64342_1.phpt @@ -29,7 +29,7 @@ if ($zip->status == ZIPARCHIVE::ER_OK) { } @unlink($file); ?> ---EXPECTF-- +--EXPECT-- failed 0 bar 1 foobar/ diff --git a/ext/zip/tests/bug7658.phpt b/ext/zip/tests/bug7658.phpt index 56fd00fbab..6a873c2043 100644 --- a/ext/zip/tests/bug7658.phpt +++ b/ext/zip/tests/bug7658.phpt @@ -50,6 +50,6 @@ var_dump($ar); unset($zip); unlink($file); ?> ---EXPECTF-- +--EXPECT-- array(0) { } diff --git a/ext/zip/tests/oo_addemptydir.phpt b/ext/zip/tests/oo_addemptydir.phpt index cb57b5b212..7e739008cc 100644 --- a/ext/zip/tests/oo_addemptydir.phpt +++ b/ext/zip/tests/oo_addemptydir.phpt @@ -28,7 +28,7 @@ if ($zip->status == ZIPARCHIVE::ER_OK) { } @unlink($file); ?> ---EXPECTF-- +--EXPECT-- 0 bar 1 foobar/ 2 foobar/baz diff --git a/ext/zip/tests/oo_addfile.phpt b/ext/zip/tests/oo_addfile.phpt index ab79780999..2c85255068 100644 --- a/ext/zip/tests/oo_addfile.phpt +++ b/ext/zip/tests/oo_addfile.phpt @@ -29,7 +29,7 @@ if ($zip->status == ZIPARCHIVE::ER_OK) { } @unlink($file); ?> ---EXPECTF-- +--EXPECT-- 0 bar 1 foobar/ 2 foobar/baz diff --git a/ext/zip/tests/oo_addglob.phpt b/ext/zip/tests/oo_addglob.phpt index ad8f8780de..d9fab95060 100644 --- a/ext/zip/tests/oo_addglob.phpt +++ b/ext/zip/tests/oo_addglob.phpt @@ -42,7 +42,7 @@ unlink($dirname . '__tmp_oo_addglob.zip'); unlink($dirname . 'foo.txt'); unlink($dirname . 'bar.baz'); ?> ---EXPECTF-- +--EXPECT-- 0 bar 1 foobar/ 2 foobar/baz diff --git a/ext/zip/tests/oo_addpattern.phpt b/ext/zip/tests/oo_addpattern.phpt index 4e1cab4ad9..ce31dd26d6 100644 --- a/ext/zip/tests/oo_addpattern.phpt +++ b/ext/zip/tests/oo_addpattern.phpt @@ -42,7 +42,7 @@ unlink($dirname . '__tmp_oo_addpattern.zip'); unlink($dirname . 'foo.txt'); unlink($dirname . 'bar.txt'); ?> ---EXPECTF-- +--EXPECT-- 0 bar 1 foobar/ 2 foobar/baz diff --git a/ext/zip/tests/oo_close.phpt b/ext/zip/tests/oo_close.phpt index ea67dcddfc..d2b743db9c 100644 --- a/ext/zip/tests/oo_close.phpt +++ b/ext/zip/tests/oo_close.phpt @@ -21,5 +21,5 @@ if ($zip->status == ZIPARCHIVE::ER_OK) { echo "failed\n"; } ?> ---EXPECTF-- +--EXPECT-- ok diff --git a/ext/zip/tests/oo_count.phpt b/ext/zip/tests/oo_count.phpt index f6d1613a39..7d646ceacf 100644 --- a/ext/zip/tests/oo_count.phpt +++ b/ext/zip/tests/oo_count.phpt @@ -19,7 +19,7 @@ if (!$zip->open($file)) { var_dump($zip->numFiles, count($zip), $zip->numFiles == count($zip)); ?> Done ---EXPECTF-- +--EXPECT-- int(4) int(4) bool(true) diff --git a/ext/zip/tests/oo_delete.phpt b/ext/zip/tests/oo_delete.phpt index 69c6151d5c..ccc75b4867 100644 --- a/ext/zip/tests/oo_delete.phpt +++ b/ext/zip/tests/oo_delete.phpt @@ -71,7 +71,7 @@ if (file_exists($file)) { unlink($file); } ?> ---EXPECTF-- +--EXPECT-- ok ok ok diff --git a/ext/zip/tests/oo_ext_zip.phpt b/ext/zip/tests/oo_ext_zip.phpt index 739a671e0b..bebce8cf16 100644 --- a/ext/zip/tests/oo_ext_zip.phpt +++ b/ext/zip/tests/oo_ext_zip.phpt @@ -20,7 +20,7 @@ class myZip extends ZipArchive { $z = new myZip; ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> int(1) diff --git a/ext/zip/tests/oo_externalattributes.phpt b/ext/zip/tests/oo_externalattributes.phpt index 1ee209e069..8f53e99a61 100644 --- a/ext/zip/tests/oo_externalattributes.phpt +++ b/ext/zip/tests/oo_externalattributes.phpt @@ -44,7 +44,7 @@ $zip->close(); $name = __DIR__ . '/withattr.zip'; @unlink($name); ?> ---EXPECTF-- +--EXPECT-- == Set bool(true) bool(true) diff --git a/ext/zip/tests/oo_extract.phpt b/ext/zip/tests/oo_extract.phpt index 1e4d6b25f6..755d7ae906 100644 --- a/ext/zip/tests/oo_extract.phpt +++ b/ext/zip/tests/oo_extract.phpt @@ -67,7 +67,7 @@ if (!file_exists($dirname . '__oo_extract_tmp/foo')) { rmdir_rf($dirname . '__oo_extract_tmp'); ?> ---EXPECTF-- +--EXPECT-- blabla laber rababer sülz bar diff --git a/ext/zip/tests/oo_getnameindex.phpt b/ext/zip/tests/oo_getnameindex.phpt index cd4c9dbe30..9f501204fa 100644 --- a/ext/zip/tests/oo_getnameindex.phpt +++ b/ext/zip/tests/oo_getnameindex.phpt @@ -40,7 +40,7 @@ var_dump($zip->getNameIndex(3)); $zip->close(); ?> ---EXPECTF-- +--EXPECT-- string(10) "entry1.txt" string(10) "entry2.txt" string(15) "dir/entry2d.txt" diff --git a/ext/zip/tests/oo_namelocate.phpt b/ext/zip/tests/oo_namelocate.phpt index bbe7ec55d9..ea800130a8 100644 --- a/ext/zip/tests/oo_namelocate.phpt +++ b/ext/zip/tests/oo_namelocate.phpt @@ -39,7 +39,7 @@ var_dump($zip->locateName('enTRy2d.txt', ZIPARCHIVE::FL_NOCASE|ZIPARCHIVE::FL_NO $zip->close(); ?> ---EXPECTF-- +--EXPECT-- int(0) bool(false) int(1) diff --git a/ext/zip/tests/oo_rename.phpt b/ext/zip/tests/oo_rename.phpt index 98489ae256..dbb80fa1e2 100644 --- a/ext/zip/tests/oo_rename.phpt +++ b/ext/zip/tests/oo_rename.phpt @@ -48,7 +48,7 @@ $zip->close(); @unlink($file); ?> ---EXPECTF-- +--EXPECT-- 0 entry1.txt 1 entry2.txt 2 dir/entry2.txt diff --git a/ext/zip/tests/oo_setcomment.phpt b/ext/zip/tests/oo_setcomment.phpt index 89d6e8ef6b..f6469c9524 100644 --- a/ext/zip/tests/oo_setcomment.phpt +++ b/ext/zip/tests/oo_setcomment.phpt @@ -55,7 +55,7 @@ $zip->close(); @unlink($file); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/zlib/tests/bug61443.phpt b/ext/zlib/tests/bug61443.phpt index ea2fa68c89..6d562fe995 100644 --- a/ext/zlib/tests/bug61443.phpt +++ b/ext/zlib/tests/bug61443.phpt @@ -10,6 +10,6 @@ ob_start(); echo "foo\n"; ob_get_clean(); if(!headers_sent()) ini_set('zlib.output_compression', true); echo "end\n"; ?> DONE ---EXPECTF-- +--EXPECT-- end DONE diff --git a/ext/zlib/tests/bug73944.phpt b/ext/zlib/tests/bug73944.phpt index 6d1e5e5b91..61be632b5c 100644 --- a/ext/zlib/tests/bug73944.phpt +++ b/ext/zlib/tests/bug73944.phpt @@ -14,6 +14,6 @@ $b = inflate_add($in, file_get_contents(__DIR__.'/bug73944_fixture2')); echo '2 block: '.($b === false ? 'failed' : strlen($b)).PHP_EOL; ?> ---EXPECTF-- +--EXPECT-- 1 block: 32768 2 block: 32768 diff --git a/ext/zlib/tests/deflate_add_basic.phpt b/ext/zlib/tests/deflate_add_basic.phpt index 05fcb037bd..288b04a24d 100644 --- a/ext/zlib/tests/deflate_add_basic.phpt +++ b/ext/zlib/tests/deflate_add_basic.phpt @@ -66,5 +66,5 @@ foreach ($modes as $modeKey => $mode) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== diff --git a/ext/zlib/tests/deflate_add_buffer_full.phpt b/ext/zlib/tests/deflate_add_buffer_full.phpt index a2b3fc4ab0..d89d240ea2 100644 --- a/ext/zlib/tests/deflate_add_buffer_full.phpt +++ b/ext/zlib/tests/deflate_add_buffer_full.phpt @@ -46,7 +46,7 @@ $deflated = deflate_add( echo bin2hex(substr($deflated, strlen($deflated) - 4)) . "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- 0000ffff 0000ffff 0000ffff diff --git a/ext/zlib/tests/deflate_init_reuse.phpt b/ext/zlib/tests/deflate_init_reuse.phpt index b351f496f7..310b781820 100644 --- a/ext/zlib/tests/deflate_init_reuse.phpt +++ b/ext/zlib/tests/deflate_init_reuse.phpt @@ -24,5 +24,5 @@ $compressed .= deflate_add($resource, "", ZLIB_FINISH); assert($uncompressed === zlib_decode($compressed)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== diff --git a/ext/zlib/tests/gzcompress_variation1.phpt b/ext/zlib/tests/gzcompress_variation1.phpt index 7a8457c24f..0d4b4c0abb 100644 --- a/ext/zlib/tests/gzcompress_variation1.phpt +++ b/ext/zlib/tests/gzcompress_variation1.phpt @@ -25,7 +25,7 @@ var_dump(md5(gzcompress($output))); ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing gzcompress() : variation *** -- Testing multiple compression -- diff --git a/ext/zlib/tests/gzencode_variation2-win32.phpt b/ext/zlib/tests/gzencode_variation2-win32.phpt index e46ee23523..8d5d583caa 100644 --- a/ext/zlib/tests/gzencode_variation2-win32.phpt +++ b/ext/zlib/tests/gzencode_variation2-win32.phpt @@ -35,7 +35,7 @@ var_dump(bin2hex(gzencode($data, -1, FORCE_DEFLATE))); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing gzencode() : variation *** -- Testing with each encoding_mode -- diff --git a/ext/zlib/tests/gzencode_variation2.phpt b/ext/zlib/tests/gzencode_variation2.phpt index de63b7170f..765ce00ea4 100644 --- a/ext/zlib/tests/gzencode_variation2.phpt +++ b/ext/zlib/tests/gzencode_variation2.phpt @@ -30,7 +30,7 @@ var_dump(bin2hex(gzencode($data, -1, FORCE_DEFLATE))); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing gzencode() : variation *** -- Testing with each encoding_mode -- diff --git a/ext/zlib/tests/gzfile_variation15.phpt b/ext/zlib/tests/gzfile_variation15.phpt index 08360da54d..feee0a8d6c 100644 --- a/ext/zlib/tests/gzfile_variation15.phpt +++ b/ext/zlib/tests/gzfile_variation15.phpt @@ -79,7 +79,7 @@ function test_gzfile() { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- array(1) { [0]=> string(22) "This is a file in dir2" diff --git a/ext/zlib/tests/gzopen_basic.phpt b/ext/zlib/tests/gzopen_basic.phpt index e3697731d8..8743c61aeb 100644 --- a/ext/zlib/tests/gzopen_basic.phpt +++ b/ext/zlib/tests/gzopen_basic.phpt @@ -34,7 +34,7 @@ gzclose($h); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing gzopen() : basic functionality *** When you're taught through feelings Destiny flying high above diff --git a/ext/zlib/tests/gzopen_variation6.phpt b/ext/zlib/tests/gzopen_variation6.phpt index 9fe3f24b47..f26d5a20e2 100644 --- a/ext/zlib/tests/gzopen_variation6.phpt +++ b/ext/zlib/tests/gzopen_variation6.phpt @@ -40,7 +40,7 @@ unlink($absfile); unlink($relfile); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing gzopen() : variation *** This is an absolute file This is a relative file diff --git a/ext/zlib/tests/gzpassthru_basic.phpt b/ext/zlib/tests/gzpassthru_basic.phpt index 931c2b22cd..59094efbe8 100644 --- a/ext/zlib/tests/gzpassthru_basic.phpt +++ b/ext/zlib/tests/gzpassthru_basic.phpt @@ -20,7 +20,7 @@ gzclose($h); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- When you're taught through feelings Destiny flying high above all I know is that you can realize it diff --git a/ext/zlib/tests/inflate_add_basic.phpt b/ext/zlib/tests/inflate_add_basic.phpt index ff0458e9ef..1331eabcca 100644 --- a/ext/zlib/tests/inflate_add_basic.phpt +++ b/ext/zlib/tests/inflate_add_basic.phpt @@ -69,5 +69,5 @@ foreach ($modes as $modeKey => $mode) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== diff --git a/ext/zlib/tests/inflate_init_reuse.phpt b/ext/zlib/tests/inflate_init_reuse.phpt index a6b8a309c0..e1b8294cbc 100644 --- a/ext/zlib/tests/inflate_init_reuse.phpt +++ b/ext/zlib/tests/inflate_init_reuse.phpt @@ -28,5 +28,5 @@ $inflated .= inflate_add($resource, "", ZLIB_FINISH); assert($inflated === $uncompressed); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== diff --git a/ext/zlib/tests/ob_002.phpt b/ext/zlib/tests/ob_002.phpt index 53cf25ceb1..3b7681b43a 100644 --- a/ext/zlib/tests/ob_002.phpt +++ b/ext/zlib/tests/ob_002.phpt @@ -13,6 +13,6 @@ HTTP_ACCEPT_ENCODING=gzip ini_set("zlib.output_compression", 0); echo "hi\n"; ?> ---EXPECTF-- +--EXPECT-- hi diff --git a/ext/zlib/tests/ob_005.phpt b/ext/zlib/tests/ob_005.phpt index 19793936f9..9333245fe7 100644 --- a/ext/zlib/tests/ob_005.phpt +++ b/ext/zlib/tests/ob_005.phpt @@ -17,6 +17,6 @@ ob_start("ob_gzhandler"); ini_set("zlib.output_compression", 0); echo "hi\n"; ?> ---EXPECTF-- +--EXPECT-- hi --EXPECTHEADERS-- diff --git a/ext/zlib/tests/ob_gzhandler_legacy_002.phpt b/ext/zlib/tests/ob_gzhandler_legacy_002.phpt index dad282188e..217a0d2e35 100644 --- a/ext/zlib/tests/ob_gzhandler_legacy_002.phpt +++ b/ext/zlib/tests/ob_gzhandler_legacy_002.phpt @@ -19,6 +19,6 @@ if (false !== ob_gzhandler("", PHP_OUTPUT_HANDLER_START)) { } echo "hi\n"; ?> ---EXPECTF-- +--EXPECT-- hi --EXPECTHEADERS-- diff --git a/sapi/cgi/tests/005-win32.phpt b/sapi/cgi/tests/005-win32.phpt index b7efb9b500..855dc57de3 100644 --- a/sapi/cgi/tests/005-win32.phpt +++ b/sapi/cgi/tests/005-win32.phpt @@ -22,7 +22,7 @@ var_dump(`$php -n -f "wrong" -a`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(51) "Interactive mode enabled No input file specified. diff --git a/sapi/cgi/tests/005.phpt b/sapi/cgi/tests/005.phpt index 259005f3d9..c36d5939c7 100644 --- a/sapi/cgi/tests/005.phpt +++ b/sapi/cgi/tests/005.phpt @@ -22,7 +22,7 @@ var_dump(`$php -n -f 'wrong' -a`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(51) "No input file specified. Interactive mode enabled diff --git a/sapi/cgi/tests/007.phpt b/sapi/cgi/tests/007.phpt index 841137a046..1c8b0eb1c5 100644 --- a/sapi/cgi/tests/007.phpt +++ b/sapi/cgi/tests/007.phpt @@ -14,7 +14,7 @@ var_dump(`"$php" -n -s -w -l`); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- string(25) "No input file specified. " string(49) "No syntax errors detected in Standard input code diff --git a/sapi/cgi/tests/bug75574_utf8_win.phpt b/sapi/cgi/tests/bug75574_utf8_win.phpt index f674168e03..f250de9102 100644 --- a/sapi/cgi/tests/bug75574_utf8_win.phpt +++ b/sapi/cgi/tests/bug75574_utf8_win.phpt @@ -29,7 +29,7 @@ unlink($fn); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(true) string(3) "啊" ===DONE=== diff --git a/sapi/cli/tests/002-win32.phpt b/sapi/cli/tests/002-win32.phpt index 5a00c67f74..6176625c5b 100644 --- a/sapi/cli/tests/002-win32.phpt +++ b/sapi/cli/tests/002-win32.phpt @@ -16,7 +16,7 @@ var_dump(`$php -n -r "var_dump('hello');"`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(18) "string(5) "hello" " Done diff --git a/sapi/cli/tests/002.phpt b/sapi/cli/tests/002.phpt index be2b6331b3..c67b93eba2 100644 --- a/sapi/cli/tests/002.phpt +++ b/sapi/cli/tests/002.phpt @@ -16,7 +16,7 @@ var_dump(`$php -n -r 'var_dump("hello");'`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(18) "string(5) "hello" " Done diff --git a/sapi/cli/tests/003-2.phpt b/sapi/cli/tests/003-2.phpt index 2ed9b07db4..24c3b591cc 100644 --- a/sapi/cli/tests/003-2.phpt +++ b/sapi/cli/tests/003-2.phpt @@ -17,7 +17,7 @@ var_dump(`"$php" -nd max_execution_time=500 -r 'var_dump(ini_get("max_execution_ ?> ===DONE=== ---EXPECTF-- +--EXPECT-- string(16) "string(3) "111" " string(16) "string(3) "500" diff --git a/sapi/cli/tests/003.phpt b/sapi/cli/tests/003.phpt index d62360e1f6..aff5a845b8 100644 --- a/sapi/cli/tests/003.phpt +++ b/sapi/cli/tests/003.phpt @@ -19,7 +19,7 @@ var_dump(`$php -n -d upload_tmp_dir=/test/path -d max_execution_time=555 -r 'var echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(16) "string(3) "111" " string(16) "string(3) "500" diff --git a/sapi/cli/tests/004.phpt b/sapi/cli/tests/004.phpt index 0248525dab..1a5473987f 100644 --- a/sapi/cli/tests/004.phpt +++ b/sapi/cli/tests/004.phpt @@ -15,7 +15,7 @@ var_dump(`$php -n --rf phpinfo`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(45) "Exception: Function unknown() does not exist " string(42) "Exception: Function echo() does not exist diff --git a/sapi/cli/tests/005.phpt b/sapi/cli/tests/005.phpt index 0790904f8c..2a4b8d955d 100644 --- a/sapi/cli/tests/005.phpt +++ b/sapi/cli/tests/005.phpt @@ -15,7 +15,7 @@ var_dump(`"$php" -n --rc exception`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(40) "Exception: Class unknown does not exist " string(183) "Class [ <internal:Core> class stdClass ] { diff --git a/sapi/cli/tests/007.phpt b/sapi/cli/tests/007.phpt index 0bf40703d9..d50c38149a 100644 --- a/sapi/cli/tests/007.phpt +++ b/sapi/cli/tests/007.phpt @@ -40,7 +40,7 @@ var_dump(`echo "<?php /* comment */ class test {\n // comment \n function foo() echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(81) " <?php class test { public $var = "test"; private $pri; function foo() { } } ?> diff --git a/sapi/cli/tests/009.phpt b/sapi/cli/tests/009.phpt index 33f859fb38..5e72e39f03 100644 --- a/sapi/cli/tests/009.phpt +++ b/sapi/cli/tests/009.phpt @@ -12,7 +12,7 @@ var_dump(`$php -n -r "echo hello;" -a`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(57) "Either execute direct code, process stdin or use a file. " string(57) "Either execute direct code, process stdin or use a file. diff --git a/sapi/cli/tests/010-2.phpt b/sapi/cli/tests/010-2.phpt index bd33d2cc94..cec29c6b4a 100644 --- a/sapi/cli/tests/010-2.phpt +++ b/sapi/cli/tests/010-2.phpt @@ -27,7 +27,7 @@ var_dump(`cat "$filename_txt" | "$php" -n -R "var_dump(1);"`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(21) "int(1) int(1) int(1) diff --git a/sapi/cli/tests/010.phpt b/sapi/cli/tests/010.phpt index 77c76c1940..198eef4bed 100644 --- a/sapi/cli/tests/010.phpt +++ b/sapi/cli/tests/010.phpt @@ -38,7 +38,7 @@ var_dump(`cat "$filename_txt" | "$php" -n -F "$filename"`); @unlink(__DIR__."/010.test.php"); @unlink(__DIR__."/010.test.txt"); ?> ---EXPECTF-- +--EXPECT-- string(25) " string(10) "test hello" diff --git a/sapi/cli/tests/012-2.phpt b/sapi/cli/tests/012-2.phpt index 34be936708..da73fa9b26 100644 --- a/sapi/cli/tests/012-2.phpt +++ b/sapi/cli/tests/012-2.phpt @@ -27,7 +27,7 @@ var_dump(`"$php" -n -l -r "echo 9;"`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(57) "Either execute direct code, process stdin or use a file. " string(57) "Either execute direct code, process stdin or use a file. diff --git a/sapi/cli/tests/012.phpt b/sapi/cli/tests/012.phpt index c1e4f6a63a..90527143e5 100644 --- a/sapi/cli/tests/012.phpt +++ b/sapi/cli/tests/012.phpt @@ -18,7 +18,7 @@ var_dump(`"$php" -n -r '' -r ''`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(32) "You can use -R or -F only once. " string(32) "You can use -R or -F only once. diff --git a/sapi/cli/tests/013.phpt b/sapi/cli/tests/013.phpt index 99bfe5e7bb..af5a82ecd7 100644 --- a/sapi/cli/tests/013.phpt +++ b/sapi/cli/tests/013.phpt @@ -23,7 +23,7 @@ var_dump(`cat "$filename_txt" | "$php" -n -B 'var_dump("start");' -E 'var_dump(" echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(18) "string(5) "start" " string(16) "string(3) "end" diff --git a/sapi/cli/tests/014.phpt b/sapi/cli/tests/014.phpt index e8c5203f67..84c6d16204 100644 --- a/sapi/cli/tests/014.phpt +++ b/sapi/cli/tests/014.phpt @@ -34,7 +34,7 @@ var_dump(`"$php" -n -s unknown`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(1478) "<code><span style="color: #000000"> <br /><span style="color: #0000BB"><?php<br />$test </span><span style="color: #007700">= </span><span style="color: #DD0000">"var"</span><span style="color: #007700">; </span><span style="color: #FF8000">//var<br />/* test class */<br /></span><span style="color: #007700">class </span><span style="color: #0000BB">test </span><span style="color: #007700">{<br /> private </span><span style="color: #0000BB">$var </span><span style="color: #007700">= array();<br /><br /> public static function </span><span style="color: #0000BB">foo</span><span style="color: #007700">(</span><span style="color: #0000BB">Test $arg</span><span style="color: #007700">) {<br /> echo </span><span style="color: #DD0000">"hello"</span><span style="color: #007700">;<br /> </span><span style="color: #0000BB">var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">);<br /> }<br />}<br /><br /></span><span style="color: #0000BB">$o </span><span style="color: #007700">= new </span><span style="color: #0000BB">test</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">?><br /></span> </span> diff --git a/sapi/cli/tests/016.phpt b/sapi/cli/tests/016.phpt index 9c28d15a30..cbedb1e7ac 100644 --- a/sapi/cli/tests/016.phpt +++ b/sapi/cli/tests/016.phpt @@ -59,7 +59,7 @@ foreach ($codes as $key => $code) { echo "\nDone\n"; ?> ---EXPECTF-- +--EXPECT-- -------------- Snippet no. 1: -------------- diff --git a/sapi/cli/tests/017.phpt b/sapi/cli/tests/017.phpt index dbddb283a4..a19d0a6bd3 100644 --- a/sapi/cli/tests/017.phpt +++ b/sapi/cli/tests/017.phpt @@ -59,7 +59,7 @@ foreach ($codes as $key => $code) { echo "\nDone\n"; ?> ---EXPECTF-- +--EXPECT-- -------------- Snippet no. 1: -------------- diff --git a/sapi/cli/tests/021.phpt b/sapi/cli/tests/021.phpt index 2ddd688903..cd27715334 100644 --- a/sapi/cli/tests/021.phpt +++ b/sapi/cli/tests/021.phpt @@ -35,7 +35,7 @@ echo "\nDone\n"; <?php unlink(__DIR__.'/021.tmp.php'); ?> ---EXPECTF-- +--EXPECT-- ola 2 adeus diff --git a/sapi/cli/tests/023.phpt b/sapi/cli/tests/023.phpt index 91674e321e..09b256a9af 100644 --- a/sapi/cli/tests/023.phpt +++ b/sapi/cli/tests/023.phpt @@ -41,6 +41,6 @@ proc_close($proc); <?php unlink(__DIR__ . "/023.ini"); ?> ---EXPECTF-- +--EXPECT-- string(3) "40M" string(0) "" diff --git a/sapi/cli/tests/bug61679.phpt b/sapi/cli/tests/bug61679.phpt index 819ce2fa89..3ba36d572c 100644 --- a/sapi/cli/tests/bug61679.phpt +++ b/sapi/cli/tests/bug61679.phpt @@ -39,5 +39,5 @@ HEADER fclose($fp); ?> ---EXPECTF-- +--EXPECT-- HTTP/1.1 501 Not Implemented diff --git a/sapi/cli/tests/bug61977.phpt b/sapi/cli/tests/bug61977.phpt index 218641a511..b23f0e28f6 100644 --- a/sapi/cli/tests/bug61977.phpt +++ b/sapi/cli/tests/bug61977.phpt @@ -43,7 +43,7 @@ HEADER; test_mimetypes($mimetypes); ?> ---EXPECTF-- +--EXPECT-- foo.html => Content-Type: text/html; charset=UTF-8 foo.htm => Content-Type: text/html; charset=UTF-8 foo.svg => Content-Type: image/svg+xml diff --git a/sapi/cli/tests/bug64544.phpt b/sapi/cli/tests/bug64544.phpt index cc49545c16..33a6e16a10 100644 --- a/sapi/cli/tests/bug64544.phpt +++ b/sapi/cli/tests/bug64544.phpt @@ -15,6 +15,6 @@ var_dump(getenv("HOME")); putenv("FOO=BAR"); var_dump(getenv("FOO")); ?> ---EXPECTF-- +--EXPECT-- string(4) "/tmp" string(3) "BAR" diff --git a/sapi/cli/tests/bug66606_1.phpt b/sapi/cli/tests/bug66606_1.phpt index ad35038bae..3cda764e61 100644 --- a/sapi/cli/tests/bug66606_1.phpt +++ b/sapi/cli/tests/bug66606_1.phpt @@ -12,6 +12,6 @@ include "php_cli_server.inc"; php_cli_server_start('var_dump($_SERVER["CONTENT_TYPE"], $_SERVER["CONTENT_LENGTH"])'); echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS); ?> ---EXPECTF-- +--EXPECT-- NULL NULL diff --git a/sapi/cli/tests/bug74600.phpt b/sapi/cli/tests/bug74600.phpt index 0ca7be95a7..eee222aaa3 100644 --- a/sapi/cli/tests/bug74600.phpt +++ b/sapi/cli/tests/bug74600.phpt @@ -33,6 +33,6 @@ proc_close($proc); <?php unlink(__DIR__ . "/bug74600.ini"); ?> ---EXPECTF-- +--EXPECT-- string(4) "okey" string(0) "" diff --git a/sapi/cli/tests/cli_process_title_unix.phpt b/sapi/cli/tests/cli_process_title_unix.phpt index 659299c1fc..418433d8f2 100644 --- a/sapi/cli/tests/cli_process_title_unix.phpt +++ b/sapi/cli/tests/cli_process_title_unix.phpt @@ -47,7 +47,7 @@ else echo "Actually loaded from get: $read_title\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing setting the process title *** Successfully set title Successfully verified title using ps diff --git a/sapi/cli/tests/cli_process_title_windows.phpt b/sapi/cli/tests/cli_process_title_windows.phpt index 91bac579e8..677f43fd8b 100644 --- a/sapi/cli/tests/cli_process_title_windows.phpt +++ b/sapi/cli/tests/cli_process_title_windows.phpt @@ -66,7 +66,7 @@ else echo "Actually loaded from get: $read_title\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing setting the process title *** Successfully set title Successfully verified title using get-process diff --git a/sapi/cli/tests/php_cli_server_003.phpt b/sapi/cli/tests/php_cli_server_003.phpt index d1e95fe6aa..d8fb8461be 100644 --- a/sapi/cli/tests/php_cli_server_003.phpt +++ b/sapi/cli/tests/php_cli_server_003.phpt @@ -13,6 +13,6 @@ php_cli_server_start('chdir(__DIR__); echo "okey";'); var_dump(file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS)); var_dump(file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS)); ?> ---EXPECTF-- +--EXPECT-- string(4) "okey" string(4) "okey" diff --git a/sapi/cli/tests/php_cli_server_016.phpt b/sapi/cli/tests/php_cli_server_016.phpt index f15aff1240..513d7ec027 100644 --- a/sapi/cli/tests/php_cli_server_016.phpt +++ b/sapi/cli/tests/php_cli_server_016.phpt @@ -42,5 +42,5 @@ HEADER fclose($fp); ?> ---EXPECTF-- +--EXPECT-- HTTP/1.1 404 Not Found diff --git a/sapi/fpm/tests/013.phpt b/sapi/fpm/tests/013.phpt index d28f3e4e00..8477d02821 100644 --- a/sapi/fpm/tests/013.phpt +++ b/sapi/fpm/tests/013.phpt @@ -43,7 +43,7 @@ if (is_resource($fpm)) { ?> Done ---EXPECTF-- +--EXPECT-- Started Done --CLEAN-- diff --git a/sapi/fpm/tests/014.phpt b/sapi/fpm/tests/014.phpt index 56e24715a8..89c935153c 100644 --- a/sapi/fpm/tests/014.phpt +++ b/sapi/fpm/tests/014.phpt @@ -43,7 +43,7 @@ if (is_resource($fpm)) { ?> Done ---EXPECTF-- +--EXPECT-- Started Done --CLEAN-- diff --git a/sapi/phpdbg/tests/basic_run.phpt b/sapi/phpdbg/tests/basic_run.phpt index beb19b535a..130dc14110 100644 --- a/sapi/phpdbg/tests/basic_run.phpt +++ b/sapi/phpdbg/tests/basic_run.phpt @@ -3,6 +3,6 @@ Basic run --PHPDBG-- r q ---EXPECTF-- +--EXPECT-- prompt> [Nothing to execute!] prompt> diff --git a/sapi/phpdbg/tests/delimiter.phpt b/sapi/phpdbg/tests/delimiter.phpt index da5f681783..bf9cb598aa 100644 --- a/sapi/phpdbg/tests/delimiter.phpt +++ b/sapi/phpdbg/tests/delimiter.phpt @@ -2,6 +2,6 @@ Test # delimiter parsing and execution --PHPDBG-- ev 1 + 3 # ev 2 ** 3#q ---EXPECTF-- +--EXPECT-- prompt> 4 8 diff --git a/sapi/phpdbg/tests/stdin_001.phpt b/sapi/phpdbg/tests/stdin_001.phpt index 2f93a2d956..977e445045 100644 --- a/sapi/phpdbg/tests/stdin_001.phpt +++ b/sapi/phpdbg/tests/stdin_001.phpt @@ -11,7 +11,7 @@ r c r q ---EXPECTF-- +--EXPECT-- prompt> [Successful compilation of stdin input] prompt> [Breakpoint #0 added at Standard input code:3] prompt> [Breakpoint #0 at Standard input code:3, hits: 1] diff --git a/tests/basic/bug31875.phpt b/tests/basic/bug31875.phpt index 78085d766b..65f68b9af3 100644 --- a/tests/basic/bug31875.phpt +++ b/tests/basic/bug31875.phpt @@ -17,7 +17,7 @@ var_dump(in_array($disabled_function, $functions['internal'])); $functions = get_defined_functions(true); var_dump(in_array($disabled_function, $functions['internal'])); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(false) diff --git a/tests/basic/bug61000.phpt b/tests/basic/bug61000.phpt index 8149d68e94..01e27bfd9b 100644 --- a/tests/basic/bug61000.phpt +++ b/tests/basic/bug61000.phpt @@ -10,7 +10,7 @@ a[a][]=foo&a[a][b][c]=bar <?php print_r($_GET); print_r($_POST); ---EXPECTF-- +--EXPECT-- Array ( ) diff --git a/tests/basic/bug71273.phpt b/tests/basic/bug71273.phpt index d0cd72577e..3db4454605 100644 --- a/tests/basic/bug71273.phpt +++ b/tests/basic/bug71273.phpt @@ -16,6 +16,6 @@ Bug #71273 A wrong ext directory setup in php.ini leads to crash var_dump(preg_match(",.+a[\\/].+[\\/]w.php_kartoffelbrei.dll.+,s", $out)); ?> ==DONE== ---EXPECTF-- +--EXPECT-- int(1) ==DONE== diff --git a/tests/basic/rfc1867_boundary_1.phpt b/tests/basic/rfc1867_boundary_1.phpt index bea825e797..014bae897e 100644 --- a/tests/basic/rfc1867_boundary_1.phpt +++ b/tests/basic/rfc1867_boundary_1.phpt @@ -14,7 +14,7 @@ Content-Disposition: form-data; name="foobar" var_dump($_FILES); var_dump($_POST); ?> ---EXPECTF-- +--EXPECT-- array(0) { } array(1) { diff --git a/tests/basic/rfc1867_boundary_2.phpt b/tests/basic/rfc1867_boundary_2.phpt index b59fc6db98..775488999e 100644 --- a/tests/basic/rfc1867_boundary_2.phpt +++ b/tests/basic/rfc1867_boundary_2.phpt @@ -14,7 +14,7 @@ Content-Disposition: form-data; name="foobar" var_dump($_FILES); var_dump($_POST); ?> ---EXPECTF-- +--EXPECT-- array(0) { } array(1) { diff --git a/tests/basic/rfc1867_file_upload_disabled.phpt b/tests/basic/rfc1867_file_upload_disabled.phpt index 1e1a747372..ab6ddc1861 100644 --- a/tests/basic/rfc1867_file_upload_disabled.phpt +++ b/tests/basic/rfc1867_file_upload_disabled.phpt @@ -23,7 +23,7 @@ foo var_dump($_FILES); var_dump($_POST); ?> ---EXPECTF-- +--EXPECT-- array(0) { } array(2) { diff --git a/tests/basic/rfc1867_malicious_input.phpt b/tests/basic/rfc1867_malicious_input.phpt index 98ed47ca20..333e8894c5 100644 --- a/tests/basic/rfc1867_malicious_input.phpt +++ b/tests/basic/rfc1867_malicious_input.phpt @@ -16,7 +16,7 @@ Content-Type: text/plain-file1 var_dump($_FILES); var_dump($_POST); ?> ---EXPECTF-- +--EXPECT-- array(0) { } array(0) { diff --git a/tests/classes/__call_003.phpt b/tests/classes/__call_003.phpt index c7aa95cb04..9ecc0701f0 100644 --- a/tests/classes/__call_003.phpt +++ b/tests/classes/__call_003.phpt @@ -21,7 +21,7 @@ Force pass-by-reference to __call var_dump($a, $b); ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> string(8) "original" diff --git a/tests/classes/__call_004.phpt b/tests/classes/__call_004.phpt index 0c1f378b8a..a9997bf132 100644 --- a/tests/classes/__call_004.phpt +++ b/tests/classes/__call_004.phpt @@ -26,7 +26,7 @@ class B extends A { $b = new B(); $b->test(); ?> ---EXPECTF-- +--EXPECT-- In B::__call(test1, array(1,a)) object(B)#1 (0) { } diff --git a/tests/classes/__set__get_004.phpt b/tests/classes/__set__get_004.phpt index 523cccee1e..86fc094f87 100644 --- a/tests/classes/__set__get_004.phpt +++ b/tests/classes/__set__get_004.phpt @@ -31,7 +31,7 @@ var_dump($foo->bar->baz); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- string(5) "Check" string(5) "Check" ===DONE=== diff --git a/tests/classes/array_conversion_keys.phpt b/tests/classes/array_conversion_keys.phpt index e3bd7e0331..6c642f1f85 100644 --- a/tests/classes/array_conversion_keys.phpt +++ b/tests/classes/array_conversion_keys.phpt @@ -10,7 +10,7 @@ class foo } var_export((array) new foo); ?> ---EXPECTF-- +--EXPECT-- array ( '' . "\0" . 'foo' . "\0" . 'private' => 'private', '' . "\0" . '*' . "\0" . 'protected' => 'protected', diff --git a/tests/classes/autoload_007.phpt b/tests/classes/autoload_007.phpt index ba542a1450..4ea1f6de17 100644 --- a/tests/classes/autoload_007.phpt +++ b/tests/classes/autoload_007.phpt @@ -10,5 +10,5 @@ spl_autoload_register(function ($name) { $a = new stdClass; var_dump($a instanceof UndefC); ?> ---EXPECTF-- +--EXPECT-- bool(false) diff --git a/tests/classes/autoload_008.phpt b/tests/classes/autoload_008.phpt index 1f3f075843..905fcaadf4 100644 --- a/tests/classes/autoload_008.phpt +++ b/tests/classes/autoload_008.phpt @@ -21,5 +21,5 @@ catch (Exception $e) { echo "In Exception catch block. Autoload should not have been triggered.\n"; } ?> ---EXPECTF-- +--EXPECT-- In Exception catch block. Autoload should not have been triggered. diff --git a/tests/classes/autoload_013.phpt b/tests/classes/autoload_013.phpt index 5349a7b1f7..c85c18ec15 100644 --- a/tests/classes/autoload_013.phpt +++ b/tests/classes/autoload_013.phpt @@ -14,6 +14,6 @@ catch (ReflectionException $e) { echo $e->getMessage(); } ?> ---EXPECTF-- +--EXPECT-- In autoload: string(6) "UndefC" Class UndefC does not exist diff --git a/tests/classes/autoload_014.phpt b/tests/classes/autoload_014.phpt index 1903c38ab8..827224aaa5 100644 --- a/tests/classes/autoload_014.phpt +++ b/tests/classes/autoload_014.phpt @@ -14,6 +14,6 @@ catch (ReflectionException $e) { echo $e->getMessage(); } ?> ---EXPECTF-- +--EXPECT-- In autoload: string(6) "UndefC" Class UndefC does not exist diff --git a/tests/classes/autoload_015.phpt b/tests/classes/autoload_015.phpt index 6f9e9322ea..9f023d5be5 100644 --- a/tests/classes/autoload_015.phpt +++ b/tests/classes/autoload_015.phpt @@ -14,6 +14,6 @@ catch (ReflectionException $e) { echo $e->getMessage(); } ?> ---EXPECTF-- +--EXPECT-- In autoload: string(6) "UndefC" Class UndefC does not exist diff --git a/tests/classes/autoload_016.phpt b/tests/classes/autoload_016.phpt index 239a770a97..ceb8ce6bbc 100644 --- a/tests/classes/autoload_016.phpt +++ b/tests/classes/autoload_016.phpt @@ -15,6 +15,6 @@ $rc->getProperty("UndefC::p"); echo $e->getMessage(); } ?> ---EXPECTF-- +--EXPECT-- In autoload: string(6) "undefc" Class undefc does not exist diff --git a/tests/classes/autoload_017.phpt b/tests/classes/autoload_017.phpt index 14c4c2a677..a1485f3aeb 100644 --- a/tests/classes/autoload_017.phpt +++ b/tests/classes/autoload_017.phpt @@ -15,6 +15,6 @@ try { echo $e->getMessage(); } ?> ---EXPECTF-- +--EXPECT-- In autoload: string(6) "UndefI" Interface UndefI does not exist diff --git a/tests/classes/autoload_018.phpt b/tests/classes/autoload_018.phpt index 2099499e11..53792d6f6b 100644 --- a/tests/classes/autoload_018.phpt +++ b/tests/classes/autoload_018.phpt @@ -18,7 +18,7 @@ spl_autoload_register(function ($name) { var_dump(class_exists('UndefinedClass0')); ?> ---EXPECTF-- +--EXPECT-- IN: autoload(UndefinedClass0) IN: autoload(UndefinedClass1) IN: autoload(UndefinedClass2) diff --git a/tests/classes/autoload_019.phpt b/tests/classes/autoload_019.phpt index b9bcd6e6d1..aefb6f8253 100644 --- a/tests/classes/autoload_019.phpt +++ b/tests/classes/autoload_019.phpt @@ -9,5 +9,5 @@ spl_autoload_register(function ($name) { class_exists("unDefinedClass"); ?> ---EXPECTF-- +--EXPECT-- autoload unDefinedClass diff --git a/tests/classes/class_stdclass.phpt b/tests/classes/class_stdclass.phpt index 5e3422aeae..a8c12715e2 100644 --- a/tests/classes/class_stdclass.phpt +++ b/tests/classes/class_stdclass.phpt @@ -9,6 +9,6 @@ echo get_class($obj)."\n"; echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- stdClass Done diff --git a/tests/classes/constants_basic_003.phpt b/tests/classes/constants_basic_003.phpt index 052af8573e..cceabd8d7d 100644 --- a/tests/classes/constants_basic_003.phpt +++ b/tests/classes/constants_basic_003.phpt @@ -21,7 +21,7 @@ Ensure class properties and constants can be defined in terms of constants that var_dump(B::ca); var_dump(B::cc); ?> ---EXPECTF-- +--EXPECT-- string(12) "hello from A" string(12) "hello from C" string(12) "hello from A" diff --git a/tests/classes/constants_basic_005.phpt b/tests/classes/constants_basic_005.phpt index c840f5385a..a97be1004a 100644 --- a/tests/classes/constants_basic_005.phpt +++ b/tests/classes/constants_basic_005.phpt @@ -10,7 +10,7 @@ Test constants with default values based on other constants. } var_dump(C::CONST_1, C::CONST_2); ?> ---EXPECTF-- +--EXPECT-- string(5) "hello" string(5) "hello" diff --git a/tests/classes/constants_basic_006.phpt b/tests/classes/constants_basic_006.phpt index 73cf0ef3a9..904593ea9b 100644 --- a/tests/classes/constants_basic_006.phpt +++ b/tests/classes/constants_basic_006.phpt @@ -19,7 +19,7 @@ Ensure class constants are not evaluated when a class is looked up to resolve in var_dump(C::X, C::$a, D::X, D::$a, E::X, E::$a); ?> ---EXPECTF-- +--EXPECT-- string(5) "hello" array(2) { ["nasty"]=> diff --git a/tests/classes/constants_error_002.phpt b/tests/classes/constants_error_002.phpt index 63aa22109c..c6b3b7b6b3 100644 --- a/tests/classes/constants_error_002.phpt +++ b/tests/classes/constants_error_002.phpt @@ -8,5 +8,5 @@ Error case: class constant as an array } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== diff --git a/tests/classes/constants_visibility_001.phpt b/tests/classes/constants_visibility_001.phpt index 37a0154d92..a5eeb47f37 100644 --- a/tests/classes/constants_visibility_001.phpt +++ b/tests/classes/constants_visibility_001.phpt @@ -17,7 +17,7 @@ A::staticConstDump(); (new A())->constDump(); ?> ---EXPECTF-- +--EXPECT-- string(11) "publicConst" string(11) "publicConst" string(11) "publicConst" diff --git a/tests/classes/ctor_dtor.phpt b/tests/classes/ctor_dtor.phpt index 3f57a312e4..bcac143025 100644 --- a/tests/classes/ctor_dtor.phpt +++ b/tests/classes/ctor_dtor.phpt @@ -29,7 +29,7 @@ $t = new late(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- early::__construct early::__construct early::__destruct diff --git a/tests/classes/ctor_dtor_inheritance.phpt b/tests/classes/ctor_dtor_inheritance.phpt index fc43727d2a..78d4efb32f 100644 --- a/tests/classes/ctor_dtor_inheritance.phpt +++ b/tests/classes/ctor_dtor_inheritance.phpt @@ -52,7 +52,7 @@ unset($t); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Testing class base base::__construct base Object diff --git a/tests/classes/destructor_and_exceptions.phpt b/tests/classes/destructor_and_exceptions.phpt index 8100c92465..0da6e642af 100644 --- a/tests/classes/destructor_and_exceptions.phpt +++ b/tests/classes/destructor_and_exceptions.phpt @@ -51,7 +51,7 @@ catch(FatalException $e) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- FailClass::__destruct Caught: FailClass FatalException::__construct diff --git a/tests/classes/destructor_visibility_003.phpt b/tests/classes/destructor_visibility_003.phpt index 4f75166940..c0235cd1e3 100644 --- a/tests/classes/destructor_visibility_003.phpt +++ b/tests/classes/destructor_visibility_003.phpt @@ -21,6 +21,6 @@ unset($obj); // Derived::__destruct is being called not Base::__destruct ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Derived::__destruct ===DONE=== diff --git a/tests/classes/factory_and_singleton_009.phpt b/tests/classes/factory_and_singleton_009.phpt index 9134245a17..c1cfcbdcdf 100644 --- a/tests/classes/factory_and_singleton_009.phpt +++ b/tests/classes/factory_and_singleton_009.phpt @@ -13,7 +13,7 @@ $obj = new test; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== Warning: Call to protected test::__destruct() from context '' during shutdown ignored in Unknown on line 0 diff --git a/tests/classes/factory_and_singleton_010.phpt b/tests/classes/factory_and_singleton_010.phpt index bd7e7e32b7..9466fe55e4 100644 --- a/tests/classes/factory_and_singleton_010.phpt +++ b/tests/classes/factory_and_singleton_010.phpt @@ -13,7 +13,7 @@ $obj = new test; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== Warning: Call to private test::__destruct() from context '' during shutdown ignored in Unknown on line 0 diff --git a/tests/classes/final.phpt b/tests/classes/final.phpt index f82087749b..0e100d2304 100644 --- a/tests/classes/final.phpt +++ b/tests/classes/final.phpt @@ -23,7 +23,7 @@ $t2->show(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Call to function first::show() Call to function second::show() Done diff --git a/tests/classes/interface_constant_inheritance_004.phpt b/tests/classes/interface_constant_inheritance_004.phpt index f055929578..7f2d3e514f 100644 --- a/tests/classes/interface_constant_inheritance_004.phpt +++ b/tests/classes/interface_constant_inheritance_004.phpt @@ -14,5 +14,5 @@ class C implements IA, IB { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/interface_doubled.phpt b/tests/classes/interface_doubled.phpt index bcf2fbda8f..e36a3c4553 100644 --- a/tests/classes/interface_doubled.phpt +++ b/tests/classes/interface_doubled.phpt @@ -153,7 +153,7 @@ echo $t->test('if_e'); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- class_a is_a(class_a, if_a) yes is_a(class_a, if_b) no diff --git a/tests/classes/interface_implemented.phpt b/tests/classes/interface_implemented.phpt index f0507dea1c..fd303e0913 100644 --- a/tests/classes/interface_implemented.phpt +++ b/tests/classes/interface_implemented.phpt @@ -59,7 +59,7 @@ $t = new derived_d(); $t->test(); ?> ---EXPECTF-- +--EXPECT-- is_a(base, base) = yes is_a(base, derived_a) = no is_a(base, derived_b) = no diff --git a/tests/classes/interface_optional_arg_003.phpt b/tests/classes/interface_optional_arg_003.phpt index ece436b484..8685e3d0f1 100644 --- a/tests/classes/interface_optional_arg_003.phpt +++ b/tests/classes/interface_optional_arg_003.phpt @@ -13,5 +13,5 @@ class C implements I { $c = new C; $c->f(); ?> ---EXPECTF-- +--EXPECT-- int(2) diff --git a/tests/classes/iterators_004.phpt b/tests/classes/iterators_004.phpt index df76c7fe31..dc5a07a603 100644 --- a/tests/classes/iterators_004.phpt +++ b/tests/classes/iterators_004.phpt @@ -51,7 +51,7 @@ foreach($obj as $v => $w) { print "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 1st try 2nd try object:max=>3 diff --git a/tests/classes/iterators_008.phpt b/tests/classes/iterators_008.phpt index da59ec3aaa..13a8b165cd 100644 --- a/tests/classes/iterators_008.phpt +++ b/tests/classes/iterators_008.phpt @@ -34,7 +34,7 @@ class D extends C implements Iterator { foreach (new D as $x) {} ?> ---EXPECTF-- +--EXPECT-- D::rewind(2) D::valid(2) D::current(2) diff --git a/tests/classes/method_call_variation_001.phpt b/tests/classes/method_call_variation_001.phpt index 7950b7deb3..e4e269f070 100644 --- a/tests/classes/method_call_variation_001.phpt +++ b/tests/classes/method_call_variation_001.phpt @@ -20,7 +20,7 @@ In $a->$b[Y]() and $a->X[Y]() both $a->$b[Y] and $a->X[Y] represent a global fun $c->functions[0](5, 6); $c->functions[1][2][3][4](7, 8); ?> ---EXPECTF-- +--EXPECT-- Called global foo(1, 2) Called global foo(3, 4) Called global foo(5, 6) diff --git a/tests/classes/private_006.phpt b/tests/classes/private_006.phpt index a51c9e70dc..9b90c9c1a7 100644 --- a/tests/classes/private_006.phpt +++ b/tests/classes/private_006.phpt @@ -32,7 +32,7 @@ class fail extends third { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Call show() Call show() Call show() diff --git a/tests/classes/private_006b.phpt b/tests/classes/private_006b.phpt index 22c3cfd80b..272a334bfa 100644 --- a/tests/classes/private_006b.phpt +++ b/tests/classes/private_006b.phpt @@ -33,7 +33,7 @@ $t3->do_show(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Call show() Call show() Done diff --git a/tests/classes/private_007.phpt b/tests/classes/private_007.phpt index f773cc8ed2..53bc7be059 100644 --- a/tests/classes/private_007.phpt +++ b/tests/classes/private_007.phpt @@ -22,7 +22,7 @@ Foo::priv(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Bar::priv() Foo::priv() Done diff --git a/tests/classes/private_007b.phpt b/tests/classes/private_007b.phpt index cbd0e756de..62a65f4cee 100644 --- a/tests/classes/private_007b.phpt +++ b/tests/classes/private_007b.phpt @@ -23,7 +23,7 @@ $obj->priv(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Bar::priv() Foo::priv() Done diff --git a/tests/classes/private_members.phpt b/tests/classes/private_members.phpt index 7ee6d69cf8..5ab448e437 100644 --- a/tests/classes/private_members.phpt +++ b/tests/classes/private_members.phpt @@ -51,7 +51,7 @@ unset($t); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- derived::__construct(begin) base::__construct(begin) base::test diff --git a/tests/classes/private_members_serialization.phpt b/tests/classes/private_members_serialization.phpt index c8dd3ab248..c196f7d8f9 100644 --- a/tests/classes/private_members_serialization.phpt +++ b/tests/classes/private_members_serialization.phpt @@ -19,5 +19,5 @@ class bar extends foo var_dump(str_replace("\0", '\0', serialize(new bar()))); ?> ---EXPECTF-- +--EXPECT-- string(114) "O:3:"bar":3:{s:12:"\0foo\0private";s:7:"private";s:12:"\0*\0protected";s:9:"protected";s:6:"public";s:6:"public";}" diff --git a/tests/classes/property_override_privateStatic_private.phpt b/tests/classes/property_override_privateStatic_private.phpt index ddd2e5d1ac..b2985add7d 100644 --- a/tests/classes/property_override_privateStatic_private.phpt +++ b/tests/classes/property_override_privateStatic_private.phpt @@ -27,7 +27,7 @@ Redeclare inherited private static property as private. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p diff --git a/tests/classes/property_override_privateStatic_privateStatic.phpt b/tests/classes/property_override_privateStatic_privateStatic.phpt index d7d645fd0a..f435516a3f 100644 --- a/tests/classes/property_override_privateStatic_privateStatic.phpt +++ b/tests/classes/property_override_privateStatic_privateStatic.phpt @@ -26,7 +26,7 @@ Redeclare inherited private static property as private static. B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) diff --git a/tests/classes/property_override_privateStatic_protected.phpt b/tests/classes/property_override_privateStatic_protected.phpt index d4732166c6..fac66c32bb 100644 --- a/tests/classes/property_override_privateStatic_protected.phpt +++ b/tests/classes/property_override_privateStatic_protected.phpt @@ -27,7 +27,7 @@ Redeclare inherited private static property as protected. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p diff --git a/tests/classes/property_override_privateStatic_protectedStatic.phpt b/tests/classes/property_override_privateStatic_protectedStatic.phpt index 169ff9a377..08c0b22704 100644 --- a/tests/classes/property_override_privateStatic_protectedStatic.phpt +++ b/tests/classes/property_override_privateStatic_protectedStatic.phpt @@ -26,7 +26,7 @@ Redeclare inherited private static property as protected static. B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) diff --git a/tests/classes/property_override_privateStatic_public.phpt b/tests/classes/property_override_privateStatic_public.phpt index 033eb75231..7242371003 100644 --- a/tests/classes/property_override_privateStatic_public.phpt +++ b/tests/classes/property_override_privateStatic_public.phpt @@ -27,7 +27,7 @@ Redeclare inherited private static property as public. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p diff --git a/tests/classes/property_override_privateStatic_publicStatic.phpt b/tests/classes/property_override_privateStatic_publicStatic.phpt index 5f2b6bf4a8..1fe43fb619 100644 --- a/tests/classes/property_override_privateStatic_publicStatic.phpt +++ b/tests/classes/property_override_privateStatic_publicStatic.phpt @@ -26,7 +26,7 @@ Redeclare inherited private static property as public static. B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) diff --git a/tests/classes/property_override_private_private.phpt b/tests/classes/property_override_private_private.phpt index 2b263eeb67..2d45f33430 100644 --- a/tests/classes/property_override_private_private.phpt +++ b/tests/classes/property_override_private_private.phpt @@ -28,7 +28,7 @@ Redeclare inherited private property as private. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p diff --git a/tests/classes/property_override_private_privateStatic.phpt b/tests/classes/property_override_private_privateStatic.phpt index 606ed21d08..1bc3c9fe52 100644 --- a/tests/classes/property_override_private_privateStatic.phpt +++ b/tests/classes/property_override_private_privateStatic.phpt @@ -28,7 +28,7 @@ Redeclare inherited private property as private static. $b->showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p (static) diff --git a/tests/classes/property_override_private_protected.phpt b/tests/classes/property_override_private_protected.phpt index b84ed6787e..d284272d02 100644 --- a/tests/classes/property_override_private_protected.phpt +++ b/tests/classes/property_override_private_protected.phpt @@ -28,7 +28,7 @@ Redeclare inherited private property as protected. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p diff --git a/tests/classes/property_override_private_protectedStatic.phpt b/tests/classes/property_override_private_protectedStatic.phpt index 1bb303dab7..c7c54eab95 100644 --- a/tests/classes/property_override_private_protectedStatic.phpt +++ b/tests/classes/property_override_private_protectedStatic.phpt @@ -28,7 +28,7 @@ Redeclare inherited private property as protected static. $b->showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p (static) diff --git a/tests/classes/property_override_private_public.phpt b/tests/classes/property_override_private_public.phpt index badbe91d50..6468432d18 100644 --- a/tests/classes/property_override_private_public.phpt +++ b/tests/classes/property_override_private_public.phpt @@ -28,7 +28,7 @@ Redeclare inherited private property as public. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p diff --git a/tests/classes/property_override_private_publicStatic.phpt b/tests/classes/property_override_private_publicStatic.phpt index 9fc58ece4a..4057f83390 100644 --- a/tests/classes/property_override_private_publicStatic.phpt +++ b/tests/classes/property_override_private_publicStatic.phpt @@ -28,7 +28,7 @@ Redeclare inherited private property as public static. $b->showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p (static) diff --git a/tests/classes/property_override_protectedStatic_protectedStatic.phpt b/tests/classes/property_override_protectedStatic_protectedStatic.phpt index 16f1100947..d2d1c0c379 100644 --- a/tests/classes/property_override_protectedStatic_protectedStatic.phpt +++ b/tests/classes/property_override_protectedStatic_protectedStatic.phpt @@ -26,7 +26,7 @@ Redeclare inherited protected static property as protected static. B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) diff --git a/tests/classes/property_override_protectedStatic_publicStatic.phpt b/tests/classes/property_override_protectedStatic_publicStatic.phpt index e437c5f30f..29b67655ff 100644 --- a/tests/classes/property_override_protectedStatic_publicStatic.phpt +++ b/tests/classes/property_override_protectedStatic_publicStatic.phpt @@ -26,7 +26,7 @@ Redeclare inherited protected static property as public static. B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) diff --git a/tests/classes/property_override_protected_protected.phpt b/tests/classes/property_override_protected_protected.phpt index c4b0d438c0..096f53d515 100644 --- a/tests/classes/property_override_protected_protected.phpt +++ b/tests/classes/property_override_protected_protected.phpt @@ -28,7 +28,7 @@ Redeclare inherited protected property as protected. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p B::p B::p diff --git a/tests/classes/property_override_protected_public.phpt b/tests/classes/property_override_protected_public.phpt index 4702f9a0cf..c2db91b14c 100644 --- a/tests/classes/property_override_protected_public.phpt +++ b/tests/classes/property_override_protected_public.phpt @@ -28,7 +28,7 @@ Redeclare inherited protected property as public. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p B::p B::p diff --git a/tests/classes/property_override_publicStatic_publicStatic.phpt b/tests/classes/property_override_publicStatic_publicStatic.phpt index 9a86867040..8d0f9ad079 100644 --- a/tests/classes/property_override_publicStatic_publicStatic.phpt +++ b/tests/classes/property_override_publicStatic_publicStatic.phpt @@ -26,7 +26,7 @@ Redeclare inherited public static property as public static. B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) diff --git a/tests/classes/property_override_public_public.phpt b/tests/classes/property_override_public_public.phpt index 893fe5d048..3abfe24e29 100644 --- a/tests/classes/property_override_public_public.phpt +++ b/tests/classes/property_override_public_public.phpt @@ -28,7 +28,7 @@ Redeclare inherited public property as public. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p B::p B::p diff --git a/tests/classes/static_properties_001.phpt b/tests/classes/static_properties_001.phpt index e14d87d7ab..e5e545fa22 100644 --- a/tests/classes/static_properties_001.phpt +++ b/tests/classes/static_properties_001.phpt @@ -15,7 +15,7 @@ var_dump(test::$ar); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(0) { } array(1) { diff --git a/tests/classes/static_properties_004.phpt b/tests/classes/static_properties_004.phpt index b0fc2ccebc..7d5363f9fc 100644 --- a/tests/classes/static_properties_004.phpt +++ b/tests/classes/static_properties_004.phpt @@ -19,7 +19,7 @@ D::$p =& $ref; var_dump(C::$p, D::$p, E::$p); ?> ==Done== ---EXPECTF-- +--EXPECT-- Inherited static properties refer to the same value across classes: string(8) "original" string(8) "original" diff --git a/tests/classes/static_properties_undeclared_isset.phpt b/tests/classes/static_properties_undeclared_isset.phpt index 83fb7711c5..c8097f6e10 100644 --- a/tests/classes/static_properties_undeclared_isset.phpt +++ b/tests/classes/static_properties_undeclared_isset.phpt @@ -5,5 +5,5 @@ Issetting a non-existent static property Class C {} var_dump(isset(C::$p)); ?> ---EXPECTF-- +--EXPECT-- bool(false) diff --git a/tests/classes/tostring_002.phpt b/tests/classes/tostring_002.phpt index eb1bea5447..627cbb359c 100644 --- a/tests/classes/tostring_002.phpt +++ b/tests/classes/tostring_002.phpt @@ -23,7 +23,7 @@ $o = new Test; ?> ====DONE==== ---EXPECTF-- +--EXPECT-- Hello ====DONE==== Hello diff --git a/tests/classes/tostring_004.phpt b/tests/classes/tostring_004.phpt index 48e8668235..fffc1f8635 100644 --- a/tests/classes/tostring_004.phpt +++ b/tests/classes/tostring_004.phpt @@ -34,7 +34,7 @@ echo "\nTry 2:\n"; printf($obj . "\n"); ?> ---EXPECTF-- +--EXPECT-- Object with no __toString(): Try 1: Error: 4096 - Object of class stdClass could not be converted to string diff --git a/tests/classes/unset_properties.phpt b/tests/classes/unset_properties.phpt index 264e720c9e..8683155e35 100644 --- a/tests/classes/unset_properties.phpt +++ b/tests/classes/unset_properties.phpt @@ -127,7 +127,7 @@ echo "\n\n"; ?> ---EXPECTF-- +--EXPECT-- publicProperty set true __isset "publicProperty" diff --git a/tests/classes/visibility_000c.phpt b/tests/classes/visibility_000c.phpt index c651b05d75..d1a7c9f1e1 100644 --- a/tests/classes/visibility_000c.phpt +++ b/tests/classes/visibility_000c.phpt @@ -27,5 +27,5 @@ class fail extends same { echo "Done\n"; // shouldn't be displayed ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/visibility_001c.phpt b/tests/classes/visibility_001c.phpt index a9a5896695..956c6762df 100644 --- a/tests/classes/visibility_001c.phpt +++ b/tests/classes/visibility_001c.phpt @@ -27,5 +27,5 @@ class fail extends same { echo "Done\n"; // shouldn't be displayed ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/visibility_002c.phpt b/tests/classes/visibility_002c.phpt index 308c9057db..64560171cc 100644 --- a/tests/classes/visibility_002c.phpt +++ b/tests/classes/visibility_002c.phpt @@ -27,5 +27,5 @@ class fail extends same { echo "Done\n"; // shouldn't be displayed ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/visibility_003a.phpt b/tests/classes/visibility_003a.phpt index 176cc4a906..17f5b49eb9 100644 --- a/tests/classes/visibility_003a.phpt +++ b/tests/classes/visibility_003a.phpt @@ -27,5 +27,5 @@ class fail extends same { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/visibility_003c.phpt b/tests/classes/visibility_003c.phpt index 27e2bc2bf5..7ac3239f59 100644 --- a/tests/classes/visibility_003c.phpt +++ b/tests/classes/visibility_003c.phpt @@ -27,5 +27,5 @@ class fail extends same { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/visibility_004a.phpt b/tests/classes/visibility_004a.phpt index 717f971999..a6acb40569 100644 --- a/tests/classes/visibility_004a.phpt +++ b/tests/classes/visibility_004a.phpt @@ -27,5 +27,5 @@ class fail extends same { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/visibility_004b.phpt b/tests/classes/visibility_004b.phpt index 1ede33450a..9e416fc6ae 100644 --- a/tests/classes/visibility_004b.phpt +++ b/tests/classes/visibility_004b.phpt @@ -27,5 +27,5 @@ class fail extends same { echo "Done\n"; // shouldn't be displayed ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/visibility_004c.phpt b/tests/classes/visibility_004c.phpt index e4f94a3567..abe25b1b39 100644 --- a/tests/classes/visibility_004c.phpt +++ b/tests/classes/visibility_004c.phpt @@ -27,5 +27,5 @@ class fail extends same { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/func/bug64523.phpt b/tests/func/bug64523.phpt index e0092ada64..88adc43959 100644 --- a/tests/func/bug64523.phpt +++ b/tests/func/bug64523.phpt @@ -6,5 +6,5 @@ error_reporting = E_ALL ^ E_NOTICE ^ E_STRICT ^ E_DEPRECATED <?php echo ini_get('error_reporting'); ?> ---EXPECTF-- +--EXPECT-- 22519 diff --git a/tests/lang/038.phpt b/tests/lang/038.phpt index 195050b2fb..8e06bdd354 100644 --- a/tests/lang/038.phpt +++ b/tests/lang/038.phpt @@ -35,7 +35,7 @@ catch (Exception $e) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- string(15) "Error2Exception" string(5) "fopen" ===DONE=== diff --git a/tests/lang/039.phpt b/tests/lang/039.phpt index aa4b591649..b353e0fa4b 100644 --- a/tests/lang/039.phpt +++ b/tests/lang/039.phpt @@ -40,6 +40,6 @@ catch (Exception $e) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Catchable ===DONE=== diff --git a/tests/lang/bug35382.phpt b/tests/lang/bug35382.phpt index 69190d4c95..c2295c3440 100644 --- a/tests/lang/bug35382.phpt +++ b/tests/lang/bug35382.phpt @@ -5,5 +5,5 @@ Bug #35382 (Comment in end of file produces fatal error) eval("echo 'Hello'; // comment"); echo " World"; //last line comment ---EXPECTF-- +--EXPECT-- Hello World diff --git a/tests/lang/bug73172.phpt b/tests/lang/bug73172.phpt index 369d293cac..34435e5058 100644 --- a/tests/lang/bug73172.phpt +++ b/tests/lang/bug73172.phpt @@ -9,5 +9,5 @@ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "bug73172.inc"; ?> ==DONE== ---EXPECTF-- +--EXPECT-- ==DONE== diff --git a/tests/lang/compare_objects_basic2.phpt b/tests/lang/compare_objects_basic2.phpt index 7e4786cd28..e822f1e4ee 100644 --- a/tests/lang/compare_objects_basic2.phpt +++ b/tests/lang/compare_objects_basic2.phpt @@ -18,7 +18,7 @@ $obj2 = new DateTime(("2009-02-12 12:47:41 GMT")); var_dump($obj1 == $obj2); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Simple test comparing two objects with different compare callback handler bool(false) ===DONE=== diff --git a/tests/lang/engine_assignExecutionOrder_007.phpt b/tests/lang/engine_assignExecutionOrder_007.phpt index 51966e01f8..d66773f024 100644 --- a/tests/lang/engine_assignExecutionOrder_007.phpt +++ b/tests/lang/engine_assignExecutionOrder_007.phpt @@ -11,7 +11,7 @@ $o->a = new $a[$i=2][++$i]; $o->a->b = new $a[$i=2][++$i]; print_r($o); ?> ---EXPECTF-- +--EXPECT-- Array ( [2] => Array diff --git a/tests/lang/engine_assignExecutionOrder_009.phpt b/tests/lang/engine_assignExecutionOrder_009.phpt index e1d5b71c69..62b3327e06 100644 --- a/tests/lang/engine_assignExecutionOrder_009.phpt +++ b/tests/lang/engine_assignExecutionOrder_009.phpt @@ -22,7 +22,7 @@ var_dump($a[$i=1][++$i] <= $a[++$i][++$i]); var_dump($a[$i=1][++$i] > $a[++$i][++$i]); var_dump($a[$i=1][++$i] >= $a[++$i][++$i]); ?> ---EXPECTF-- +--EXPECT-- Function call args: f(0) f(1) bool(true) f(0) f(1) bool(true) diff --git a/tests/lang/foreachLoop.010.phpt b/tests/lang/foreachLoop.010.phpt index c021a80c39..2ff0a7b61f 100644 --- a/tests/lang/foreachLoop.010.phpt +++ b/tests/lang/foreachLoop.010.phpt @@ -34,7 +34,7 @@ foreach ($a as $v) { } ?> ---EXPECTF-- +--EXPECT-- int(1) int(2) int(3) diff --git a/tests/lang/foreachLoop.011.phpt b/tests/lang/foreachLoop.011.phpt index 6ceebd8a50..eeb08596cb 100644 --- a/tests/lang/foreachLoop.011.phpt +++ b/tests/lang/foreachLoop.011.phpt @@ -21,7 +21,7 @@ foreach ($a as $v) { } ?> ---EXPECTF-- +--EXPECT-- Change from array to non iterable: int(1) diff --git a/tests/lang/foreachLoop.012.phpt b/tests/lang/foreachLoop.012.phpt index 3652a71aed..be72ae0e30 100644 --- a/tests/lang/foreachLoop.012.phpt +++ b/tests/lang/foreachLoop.012.phpt @@ -68,7 +68,7 @@ withRefValue(3, $transform); withRefValue(4, $transform); ?> ---EXPECTF-- +--EXPECT-- Popping elements off end of an unreferenced array ---( Array with 1 element(s): )--- diff --git a/tests/lang/foreachLoop.014.phpt b/tests/lang/foreachLoop.014.phpt index 770ee9f92e..9d45eb8244 100644 --- a/tests/lang/foreachLoop.014.phpt +++ b/tests/lang/foreachLoop.014.phpt @@ -70,7 +70,7 @@ withRefValue(3, $transform); withRefValue(4, $transform); ?> ---EXPECTF-- +--EXPECT-- Popping elements off end of a referenced array ---( Array with 1 element(s): )--- --> State of referenced array before loop: diff --git a/tests/lang/foreachLoop.017.phpt b/tests/lang/foreachLoop.017.phpt index 987fe3cb27..bbc21adaa3 100644 --- a/tests/lang/foreachLoop.017.phpt +++ b/tests/lang/foreachLoop.017.phpt @@ -6,6 +6,6 @@ $a = array ( "\x90" => 10 ); foreach ($a as $val=>$key) echo $key; echo "\nDone\n"; ?> ---EXPECTF-- +--EXPECT-- 10 Done diff --git a/tests/lang/foreachLoopIteratorAggregate.002.phpt b/tests/lang/foreachLoopIteratorAggregate.002.phpt index 6cad8e29b6..23f04feed2 100644 --- a/tests/lang/foreachLoopIteratorAggregate.002.phpt +++ b/tests/lang/foreachLoopIteratorAggregate.002.phpt @@ -45,7 +45,7 @@ f("bad4"); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- 30: Objects returned by bad1::getIterator() must be traversable or implement interface Iterator 30: Objects returned by bad2::getIterator() must be traversable or implement interface Iterator 30: Objects returned by bad3::getIterator() must be traversable or implement interface Iterator diff --git a/tests/lang/foreachLoopIteratorAggregate.003.phpt b/tests/lang/foreachLoopIteratorAggregate.003.phpt index 0a0e23c51a..cb3586c005 100644 --- a/tests/lang/foreachLoopIteratorAggregate.003.phpt +++ b/tests/lang/foreachLoopIteratorAggregate.003.phpt @@ -73,7 +73,7 @@ foreach (new A3 as $k=>$v) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- -----( A1: )----- --> EnglishMealIterator::rewind (0) --> EnglishMealIterator::valid (0) diff --git a/tests/lang/foreachLoopObjects.001.phpt b/tests/lang/foreachLoopObjects.001.phpt index da025a537f..985a00784a 100644 --- a/tests/lang/foreachLoopObjects.001.phpt +++ b/tests/lang/foreachLoopObjects.001.phpt @@ -34,7 +34,7 @@ foreach (new C as $k => $v) { echo "\nCheck key and value after the loop.\n"; var_dump($k, $v); ?> ---EXPECTF-- +--EXPECT-- Simple loop. diff --git a/tests/lang/func_get_arg.005.phpt b/tests/lang/func_get_arg.005.phpt index 31f5ffce70..9da14eb6f3 100644 --- a/tests/lang/func_get_arg.005.phpt +++ b/tests/lang/func_get_arg.005.phpt @@ -14,6 +14,6 @@ $a = "original.a"; $ref =& $a; refVal($a); ?> ---EXPECTF-- +--EXPECT-- string(10) "original.a" string(10) "original.a" diff --git a/tests/lang/func_get_args.004.phpt b/tests/lang/func_get_args.004.phpt index 384d99a818..bafd9539ea 100644 --- a/tests/lang/func_get_args.004.phpt +++ b/tests/lang/func_get_args.004.phpt @@ -29,7 +29,7 @@ $b = 'original.b'; refVal($b, $b); var_dump($b); ?> ---EXPECTF-- +--EXPECT-- -- Val, Ref -- string(10) "original.a" diff --git a/tests/lang/func_num_args.004.phpt b/tests/lang/func_num_args.004.phpt index 8bdc6f07f6..d8142c9e7e 100644 --- a/tests/lang/func_num_args.004.phpt +++ b/tests/lang/func_num_args.004.phpt @@ -29,7 +29,7 @@ $b = 'original.b'; refVal($b, $b); var_dump($b); ?> ---EXPECTF-- +--EXPECT-- -- Val, Ref -- diff --git a/tests/lang/passByReference_008.phpt b/tests/lang/passByReference_008.phpt index 31f0260c5d..c7623fb73a 100644 --- a/tests/lang/passByReference_008.phpt +++ b/tests/lang/passByReference_008.phpt @@ -25,7 +25,7 @@ $b = 'original.b'; refVal($b, $b); var_dump($b); ?> ---EXPECTF-- +--EXPECT-- -- Val, Ref -- diff --git a/tests/lang/passByReference_009.phpt b/tests/lang/passByReference_009.phpt index 941c361dbc..b1b0c358ee 100644 --- a/tests/lang/passByReference_009.phpt +++ b/tests/lang/passByReference_009.phpt @@ -20,5 +20,5 @@ Assignement as argument foo2($x, $x, $x = 1); echo $x; // 2 ?> ---EXPECTF-- +--EXPECT-- 1012 diff --git a/tests/lang/static_variation_001.phpt b/tests/lang/static_variation_001.phpt index a08c53fef7..3c540368ed 100644 --- a/tests/lang/static_variation_001.phpt +++ b/tests/lang/static_variation_001.phpt @@ -45,7 +45,7 @@ eval(' function f3() { static $c = array(1,2,3); var_dump($c); }'); f3(); ?> ---EXPECTF-- +--EXPECT-- array(3) { [0]=> int(1) diff --git a/tests/lang/static_variation_002.phpt b/tests/lang/static_variation_002.phpt index 54567de768..2be680822e 100644 --- a/tests/lang/static_variation_002.phpt +++ b/tests/lang/static_variation_002.phpt @@ -33,7 +33,7 @@ $e = new E; $e->f(); ?> ---EXPECTF-- +--EXPECT-- array(3) { [0]=> int(1) diff --git a/tests/lang/string/unicode_escape_legacy.phpt b/tests/lang/string/unicode_escape_legacy.phpt index 7b4bc299ea..9d3f40215e 100644 --- a/tests/lang/string/unicode_escape_legacy.phpt +++ b/tests/lang/string/unicode_escape_legacy.phpt @@ -8,7 +8,7 @@ var_dump("\u"); var_dump("\u202e"); var_dump("\ufoobar"); ---EXPECTF-- +--EXPECT-- string(2) "\u" string(6) "\u202e" string(8) "\ufoobar" diff --git a/tests/lang/string_decimals_001.phpt b/tests/lang/string_decimals_001.phpt index daa063bb26..8313a66369 100644 --- a/tests/lang/string_decimals_001.phpt +++ b/tests/lang/string_decimals_001.phpt @@ -16,7 +16,7 @@ test("9.9."); test("9.9.9"); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- --> Testing ..9: int(0) 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: " diff --git a/tests/run-test/test009.phpt b/tests/run-test/test009.phpt index 650686f690..f3d0491e7c 100644 --- a/tests/run-test/test009.phpt +++ b/tests/run-test/test009.phpt @@ -6,7 +6,7 @@ class Foo {} $foo = new Foo; print_r($foo); ?> ---EXPECTF-- +--EXPECT-- Foo Object ( ) diff --git a/tests/strings/offsets_chaining_1.phpt b/tests/strings/offsets_chaining_1.phpt index eecdfb9637..040a0970a9 100644 --- a/tests/strings/offsets_chaining_1.phpt +++ b/tests/strings/offsets_chaining_1.phpt @@ -7,6 +7,6 @@ error_reporting=E_ALL | E_DEPRECATED $string = "foobar"; var_dump($string[0][0][0][0]); ?> ---EXPECTF-- +--EXPECT-- string(1) "f" diff --git a/tests/strings/offsets_chaining_2.phpt b/tests/strings/offsets_chaining_2.phpt index 07f67f0fd0..a7dbdcd9df 100644 --- a/tests/strings/offsets_chaining_2.phpt +++ b/tests/strings/offsets_chaining_2.phpt @@ -7,6 +7,6 @@ error_reporting=E_ALL | E_DEPRECATED $string = "foobar"; var_dump($string{0}{0}[0][0]); ?> ---EXPECTF-- +--EXPECT-- string(1) "f" diff --git a/tests/strings/offsets_chaining_3.phpt b/tests/strings/offsets_chaining_3.phpt index 23b8e70179..2d43451cb1 100644 --- a/tests/strings/offsets_chaining_3.phpt +++ b/tests/strings/offsets_chaining_3.phpt @@ -7,6 +7,6 @@ error_reporting=E_ALL | E_DEPRECATED $string = "foobar"; var_dump(isset($string[0][0][0][0])); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/tests/strings/offsets_chaining_4.phpt b/tests/strings/offsets_chaining_4.phpt index 79b95c135b..f612c40671 100644 --- a/tests/strings/offsets_chaining_4.phpt +++ b/tests/strings/offsets_chaining_4.phpt @@ -7,6 +7,6 @@ error_reporting=E_ALL | E_DEPRECATED $string = "foobar"; var_dump(isset($string{0}{0}[0][0])); ?> ---EXPECTF-- +--EXPECT-- bool(true) |