diff --git a/Zend/tests/010.phpt b/Zend/tests/010.phpt index 45e18329146..8f5fa5a052e 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 6ad8af109d0..c3d171c2d25 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 bf7ed391edf..1742d4b408c 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 4ed154f6f65..b79f060f4fe 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 ac4d72ce1d1..86f678634b6 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 8d12aea11d2..315d1e86e28 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 7e9bc25d8f3..24b08fbf8e2 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 109b2ce9952..cf879c00868 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 1cbaf81a9fb..fdb8915267e 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 72ba3d61b7f..b66be660d70 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 cacac47857c..195a6054b2c 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 7c8a86be48c..66685a78d9a 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 e448a417f65..c2913db5b40 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 599b3e1604f..379ea9b3e95 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 667c55b4fc6..73c685d2c84 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 38e9a39c338..97dd6ce86cb 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 d37ebbcbd89..17187abe64c 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 e682765e538..ddee1b92de2 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 911ee0bb8e6..1fcd41a7f12 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 787362acc4d..a12c5aaa4ad 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 205fd1c696f..8141f178c6b 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 347eb555715..b3a237016fa 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 8dda17028a1..fe269c03642 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 1237357ccaf..36a6fc6ab99 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 3bae8064b96..db3a67bee6c 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 c16399abbcb..1987fa9b45d 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 89da67b1959..e73bca12ace 100644 --- a/Zend/tests/bug32290.phpt +++ b/Zend/tests/bug32290.phpt @@ -96,7 +96,7 @@ var_dump($x->doSomethingStatic(1)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===A=== TestB::doSomething(1) TestA::doSomething(2) diff --git a/Zend/tests/bug33771.phpt b/Zend/tests/bug33771.phpt index 72d953c9fa8..f1b42ce7c8b 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 6f7477a9ebc..5ca5fd8368e 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 7caac215e05..f9ad1cec4ea 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 0751cbd6904..3ce2ad6514d 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 adecf3e39a7..2cf2d1d6a55 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 3c8a98bddcf..8926173aeea 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 7526d802ab5..d4e62779e9b 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 fe41bffff6c..06e10d78fa0 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 4196fc77f37..aafce9b9446 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 c0fd69abf94..fba320bb134 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 2e156ad7f35..4582057d986 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 067e892e662..a69838aa6d4 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 9a6dade9e1a..74dfb5c5a3a 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 2f171fe4554..77944ca198e 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 1d0c1ce87c1..66239120a49 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 137a43fcaaa..fcd602cacf4 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 0f36ac5d886..2ccba5ff082 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--

Welcome

---EXPECTF-- +--EXPECT--

Welcome chris

diff --git a/Zend/tests/bug60536_004.phpt b/Zend/tests/bug60536_004.phpt index a8f4d8b9d43..a78cecc30f3 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 1ba22a97526..c007e0ae189 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 24c69ae792e..0409d679506 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 e6b0e60ff3c..db25c83466d 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 5efff9e5bd8..c5b2c80871b 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 31294f33e8d..4318a5091c9 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 03a4b80b4bc..737b2fd46af 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 6cb5392cef3..b4018e96a2f 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 677b2750f21..c10a518376b 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 99003e6045d..5e0815240d3 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 af7a5ab1d0b..d800605ac8c 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 c92e994b940..b3aff293a03 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 9eb5afcad8c..72f242f9954 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 33c36850c06..ece96a88ad0 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 e1884d9dac4..1bfc38ae098 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 d31a1d2c6e8..3c8dcc79c82 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 42066f3c2ec..1f43c082f0e 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 3e88b2e6d67..c67e68e4ac8 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 9a77f62f56b..567bb9e01f4 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 e66d2929711..1dd91efb9b8 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 9604bf5b9f4..ac30636ded6 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 75ab09d1b5e..66cec7c3c34 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 f4d3626e45a..555e7762271 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 c2782ff1c99..1c3bfb737da 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 38e55b16d55..72a460abaae 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 8a1fc6f0297..456bcf4a5b5 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 74083f73bc3..68fd29c6875 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 77d7ce6906b..ca87efec4b8 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 4b24c85d162..cabd99bfaca 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 8fdef135dc0..b8da50049af 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 c6276be47b6..c309e3c533a 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 2985e6a8db2..4e2542b7c02 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 af40193fbaa..111115a44ae 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 5e5009c323d..33c883f5f42 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 72c80b0afc1..e5cdb344ef8 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 d1c716cebc3..654f8252e0e 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 5fa264a11e5..4f0b34b25f9 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 5ecb1a60672..d228b707d4d 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 49e175dd214..721844085a4 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 011e6fdea9a..25c8de3e58f 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 d5d2bf38d37..088264176b4 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 175ea37e809..e81e0a26532 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 09b7690d3cf..affc4967165 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 12b1db57bae..eb3711af111 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 8f6572ef017..34f6eb5966f 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 137a6cabb4c..964b746d0e8 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 cc99bc6230e..6b228e522bd 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 05a5d927fa4..6f9f11870ef 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 1a7be521b26..0ec1aac2c16 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 6b273208aa7..58c05e55530 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 188c70ab18d..7ed0460eeef 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 58c4b15e3aa..a79d4311b56 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 d5f0233aecc..e5b9111f782 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 02e2739de7e..194fc93de7c 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 0d3e32af145..d1815ff1836 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 a2a3d0ca209..78745219ba4 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 62f326c0531..808a07046f8 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 199afd0b503..15e33b8a94f 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 73d5eacdf6e..727e11cc457 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 dd307c99d8a..06bce25d709 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 6aae0ba24bb..036ffa7445d 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 92b22531a45..d75670c7ecc 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 7741ed036ca..e4259649ebf 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 589d90316b2..6b14c33081b 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 5dc90f288a3..90b864f79b8 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 1c60ffc273b..0379dd26e3c 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 48937de39e4..3abb3a25072 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 a082f9ddbb9..6a7dc79b74b 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 d63824017ec..8e459a636f5 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 38963870a06..b3889b0bae0 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 45d20ad0d83..53308286339 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 334d09ac364..8205435a5f6 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 5105629cbea..b1d6daeb9d1 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 43218b1b05a..a267291886d 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 1a7b0fc371a..05830f80ede 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 508a7867a46..ad92fcfddc6 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 350f720648d..07d8a092151 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 d9b56495e9f..0764e495f74 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 48a43a3ca38..40a6dff9ec2 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 ea0bd847606..6bac3fe339b 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 d693f80a52e..f37fd870bf1 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 10bebc25fc0..3c244d61819 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 a173c7103e0..07ebbb64ce2 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 fc9955e28a0..5dd237a244c 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 51f1cac4960..225ebff10fe 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 9c754a698d6..2c789848529 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 f0adc1f088e..b60539e7f86 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 80f22eda225..7c6afe70b74 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 20a2fd83bbc..f22649dceab 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 4fca6ddd72b..9dbc496cc0d 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 4e9fe1f7c83..a7a787e568f 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 6baeba00bdd..9583ef25470 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 00647a5c709..a01ccd7ca9d 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 2ac03061203..c6ef2d8614d 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 ba293a24684..0c21012ca89 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 f19c6aada85..4c5fa3248e1 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 1683ffe6384..154a78a849a 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 65ef97ab436..a7f5b42e67f 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 c591cfa2309..a99ea4dd222 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 5547695f72b..ff4ad7451c6 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 6eb0f000c90..3f2c812a4cb 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 84bcdb6916c..3d35989a9a1 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 301a6fc8308..87f1ea2ac92 100644 --- a/Zend/tests/ns_059.phpt +++ b/Zend/tests/ns_059.phpt @@ -4,6 +4,6 @@ ---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 461199febed..29dd54428b8 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 8968e35d6cb..c0dcde39398 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 0f85498e2c9..af02d91b720 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 ca5b4b8cde0..98ea982940c 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 e5e3ecadb2e..52a5e9fed92 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 9bf8a89da76..f9bfeeac3e5 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 c65a5ba3f8d..41fedb55053 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 9364f0a2e52..cd98db40e72 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 1e4e5131a59..1493ec0bece 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 47cbb791df3..8cf6f5164c4 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 2ec0939088e..cbf3ed5fd34 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 2f3ff02b1cd..8d0ed0862fc 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 cf59200b81a..72b973d0f2f 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 0abf2f98102..83ddb805613 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 466b3f1c089..e1195ce883e 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 62a35159553..da0d06cd253 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 612caa0662f..c5a3e60fbb1 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 78abe7d1bc5..25130c538b7 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 605b1d8e9e4..2a699d8df54 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 56a34640678..b3b5bfaca51 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 ac86692880d..5e7965d6dc5 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 e0b5286e4f5..58faf9f290f 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 0bbea110055..464d9783a44 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 64712d40a4f..ab913d8b05c 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 aa7f03dcb8a..890147dc4af 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 251af29711b..65f8e2fee5b 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 d189ca70c18..3c5d461be1c 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 e8195c4749c..951344ffbb9 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 51badc5a4c7..d258e439811 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 d892112416e..cd8176ca3b0 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 d093f2952d9..bd11858ee07 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 77d4429f43a..d3b7a644207 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 4df307ab8df..31e9da99dba 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 20eaeb35c25..13319949f4d 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 5a32359bb55..b51a8329ac8 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 3b65d0123a2..082022cc791 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 e55c8d84aa9..477d267e290 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 481dd64ec7b..af854a79e28 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 a55cbbed342..91eba5705b5 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 c9c26ad7704..90dd8ca92dd 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 f58c2a428e6..c96f314c93c 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 a34f3f217f0..fc21e558b95 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 80a81958d3f..d2f3f0ff59c 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 41d0e8802b9..694ca85b5d9 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 fdd2351023b..0b5918c614a 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 0c3f597a0a5..db0605fc05b 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 c54477ff8cc..07a576f2e51 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 24e468d335c..610d701872b 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 c2fd55df27b..7671d05df58 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 8529ff78657..9f4115fee6e 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 3d478f461ae..641bb254420 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 79efcb3de8c..07904fb158f 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 7ec8ec82db4..4d285eedb8d 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 eb8d0966a1c..05318e0774f 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 dafeb6bbe04..9ff21c3e8b7 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 dab6af6a581..f09fa1fed22 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 ad33c681317..fc3520c84c3 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 f53e6b5bc1e..58113465e0d 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 6ba262848d7..6711de77334 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 8b70bbae1a4..a9e7c9a56b2 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 2982d9b2afd..b9076c6b52d 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 8611a205cff..b213bb11dd2 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 2af05b6c65c..7337ee4379a 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 3e4c693afb0..deb7a8c976e 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 a42d633f47e..997bdf77b44 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 ce29db7e753..f90f1f14c46 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 61fe1aa5b19..ba61ee582ad 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 9b8ab1520fb..0798ca48ed5 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 7d8bcbd1892..5dbf396e638 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 e1a521dff96..c61135e9e25 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 0cf4054fa4c..bccf0089316 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 8aa1c636b76..8fd0e98c050 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 3f37cbac199..991cf5e8912 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 f0a3bafa5e5..9c61a22bc39 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 d392b2e78a9..20ef277770c 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 7f4bca59660..56e25b241ca 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 a0a64f63433..4d80a280b02 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 456f235ef78..f8ca5b9da59 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 73fbc82179d..c451a281ffe 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 58e96b3c66a..049374ba409 100644 --- a/ext/bcmath/tests/bcpow_variation001.phpt +++ b/ext/bcmath/tests/bcpow_variation001.phpt @@ -8,5 +8,5 @@ bcmath.scale=0 ---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 2a7b8db5e50..1e6dd372a5e 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 0db6cff9f28..117756f1d16 100644 --- a/ext/bcmath/tests/bcscale_variation002.phpt +++ b/ext/bcmath/tests/bcscale_variation002.phpt @@ -8,5 +8,5 @@ bcmath.scale=-2 ---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 5e9ec1edb98..67d1efc2eac 100644 --- a/ext/bcmath/tests/bcsqrt_variation001.phpt +++ b/ext/bcmath/tests/bcsqrt_variation001.phpt @@ -8,5 +8,5 @@ bcmath.scale=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 af7f7d44fdc..929790d16a6 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 9f01109a71c..2443563533c 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 2d54cf22be2..a4648451aaa 100644 --- a/ext/calendar/tests/jdtounix_error1.phpt +++ b/ext/calendar/tests/jdtounix_error1.phpt @@ -10,5 +10,5 @@ date.timezone=UTC ---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 2a18b82abdc..bf3712d9dab 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 2505428d21a..188a86ce402 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 94ae22da1ad..a73d06816bf 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 a9da6c932ad..3128feec6ce 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 49167eb34db..d4577b51fb9 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 f0d8af8abc0..041343770e8 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 baa75c8d4ea..52ca3897490 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 866f3725997..f50328079ec 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 5ab4bd6dc22..87cfc6fc004 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 c41d97291b3..cc2067580ae 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 b9241adc943..2e447955410 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 f74c13f967b..abe74a05679 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 b48ab94450f..7ad64d83696 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 4ae5bc31886..529c23876f8 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 0e1c50379b2..159ba911b18 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 049580db1b7..73e127356cb 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 306949130d7..527d22f821c 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 318737f4f4c..4122737d035 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 66ef6f344cb..c966132d163 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 c94be3e6df1..f937e07020c 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 b45aac6d455..171959d9442 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 03471f1bda4..f8dee30808c 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 8f8b3fed103..5e87d65374f 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 327a497e9f6..263909a9d3e 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 d425b4c7c32..eb733c1d2ab 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 be6c0affd2f..08dcf81126a 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 91c8ef54072..9c4a3062344 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 39eff9a9568..ac14004e1ee 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 061cc1ce9ae..b2cbe2933c3 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 25e3d17f87e..30dfb4c931b 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 49cb26fbdda..17df251e236 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 a882c960205..e2223c7223b 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 c216e4da4a9..5d620d71126 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 7b90e4fd086..fb872357fa3 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 d6dc84ac507..21e040dcc23 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 647f8519b1b..2a1296bdb1c 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 0f57c45a664..ccf882a1910 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 3a4a66ac7b9..a75e3d5181a 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 73e377eed15..cfc6b386bfe 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 7b7201b1400..f44e8db5151 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 55d9a81cbc1..4287f477ee2 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 4a469ae0372..daa68dad6a1 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 6ffdb9c5eda..ba706333e86 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 bb8423b1eee..ba4222b640b 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 305c123e27a..24a662b4cb4 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 635e4818dc5..0d40e4294c1 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 a257cd3f4a2..d3cf1c98d80 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 9357feb1e45..5a8a2396da8 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 3e4509e345a..9a25698e49e 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 0c279921598..cdd99d10783 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 179115d23d4..562846cfd5c 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 963755b3582..d220729fe03 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 1e7b7bd4b47..458c54be113 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 2c9960ced2b..282643a95d0 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 4707bcebff4..f843edb0dcf 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 85a73fa7971..f0faad68f5e 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 4af59948be9..e113d130a15 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 bbeecb6b878..8690597ae80 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 e6988d6de18..be8646ea99d 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 5a18e972945..c40d1e96676 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 0f346cf3fac..ff8a906eba4 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 24aa83c6206..84f1a171595 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 4921b69bdd4..3feea499054 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 } ?> ===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 69aef4b8250..186fa66dfa7 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 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 9c5967db8fe..07cbad4b7a8 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 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 08dc7a10059..b520db6c705 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 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 200db765dce..4d90ebfd371 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 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 e48a5ba70d3..5d37297bb23 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 echo "Data: $alldata"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing curl_setopt($ch, CURLOPT_WRITEFUNCTION, ); *** 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 4e33082409d..22be2b8b16b 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 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 f136880dff7..94afa73e26f 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 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 6d09517e8de..4e9233c080c 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 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 e8e43e5686f..00ad7c9b1d3 100644 --- a/ext/curl/tests/curl_basic_015.phpt +++ b/ext/curl/tests/curl_basic_015.phpt @@ -11,6 +11,6 @@ Jean-Marc Fontaine 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 dc0bee926bb..2dd06c778af 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 } ?> ===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 5c085c1c935..46b80ed982e 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 ?> ===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 2c58500ef79..fde4dccb3db 100644 --- a/ext/curl/tests/curl_basic_019.phpt +++ b/ext/curl/tests/curl_basic_019.phpt @@ -19,7 +19,7 @@ Jean-Marc Fontaine 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 1227ad3261d..99ac93d1927 100644 --- a/ext/curl/tests/curl_basic_020.phpt +++ b/ext/curl/tests/curl_basic_020.phpt @@ -17,7 +17,7 @@ Jean-Marc Fontaine 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 e803d98837c..46d21cd81b9 100644 --- a/ext/curl/tests/curl_basic_021.phpt +++ b/ext/curl/tests/curl_basic_021.phpt @@ -17,6 +17,6 @@ Jean-Marc Fontaine 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 1a6ff41699d..6aeb669abf8 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 aafa41ee2e6..0f1cf9dfd78 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 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 6e8214ad2b1..6b2136bda23 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 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 c690180a55a..cad1be98658 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 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 e92603324ee..939ee7381b9 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 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 0a5c2a25e6d..e33857d57e6 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 ?> ===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 6334d2a4b86..23813d32c2d 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 cdb7de374d5..c48c76db225 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 da4522192dd..8978e2650e7 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 01e6af9e8c9..36b5febf508 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 31d670ae0d8..f63a710ae9b 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 1fcdfe95582..9842aeda336 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 190fe9d9c03..9c0f7ddebac 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 fffe9f1fbb7..8af4dde635c 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 ac330acaee2..becaebd6cc4 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 91476cdaffd..1db23c7b923 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 f8a0de311b4..f103f439666 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 2be6cf773d3..8b1750ee22f 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 33e1fc79107..fb64575cc99 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 ff42de5dea1..2172a200680 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 46001ad8f0b..f870cef7bc1 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 22006d1ae83..cd02bafd558 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 a295b915ced..5d1219a87af 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 8c8b14f12cb..fb8db122dc9 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 d9625eedc0c..c2b208f0df0 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 afc2ed64b28..7857e166bc4 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 396bff91963..885a17debd3 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 cef6621a75d..0ddd74b14e3 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 f19f23d97b1..ecb0890bb19 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 d0a453fd9df..71ce3d30187 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 8fe53d69f84..c5f1b90ef22 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 a4bf4aa27fb..72d27fbd2c5 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 bee395aa968..7a8c0bb63d8 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 abde292775d..f018eb4297d 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 41b1a78d75c..30ff1259559 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 ee8a0db9a35..0f3edb33e22 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 052524d5a44..277a6b29655 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 7989470cda9..8ead020c01b 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 cdedb44e7a2..ef6caf0f231 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 bd95fecd089..0dde746c270 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 f4f479fe041..4f3825ac882 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 a78557df55e..aa15ef93df5 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 a312b52260c..f82303f31e5 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 78c0fb2a602..e3af51d7678 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 9565cb2dfbf..4f3b51d5b1c 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 37cab2055e9..a5f21abf859 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 2c456ba6e3a..dd7f9032c5b 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 7364a806122..9818c88ce7b 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 78ede1387cc..735df6ad18c 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 3fd82504156..30dbb693e70 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 780d0fa7625..9a8a07ce5ab 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 7180d2f37f5..c4638c94b33 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 d03a814d882..872ceb4f3e0 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 9b6f5455258..fcd7037868f 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 3c881edeec8..a86c78144e6 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 2a2ee5ff214..dc9ad22ea8b 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 14a3d832bb4..38d7ed76e25 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 64802125f6a..831a862d0c8 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 fbd5c6d856e..73003fb6899 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 b2f4b8232ff..5c835c35f3b 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 dc55efb0ae8..dc2a84a9b1a 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 9a1745c9acf..318bf3d629e 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 768fe46b6a2..801dd4e97de 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 dc8daba533a..2764ce8dba9 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 038b94ce08d..42e0ebf60dc 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 42f38939e85..ec6fb16350d 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 0e12704945b..00e96261987 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 44b6d112e4d..35ca37ae982 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 4df725187de..73956cc46a8 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 7e18d2da415..7e74bab621e 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 6e9c2ec83b3..3993ca6a8bd 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 1d22be8c8c1..fe8aefeb9f5 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 67bd2f41825..00d836dcbeb 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 07319ab4e12..dcccfaccb64 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 c0c9c66c56d..9c1a025d477 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 e01660193f1..24546ee2ad7 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 1442da4426f..8983cc4e2d6 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 f77352ef8fa..7e86036adab 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 2e9154cebe8..6df429b3a97 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 f987d2134d9..bd3b6d57796 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 f7d68632087..7001237d0ab 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 92719ac650f..59c1681cd76 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 e4524a86590..9cf29a2fc85 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 5c03a3bb714..64943ce864c 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 b0c56a127bb..dac3ecfe99c 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 9ba714750e4..78af097cbd1 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 59057aa1736..0d3f6b06329 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 161a80d511d..bc02e275afd 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 2796c22d5bf..5eedb7a3f60 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 883e34887be..cd48a162af9 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 f36d0a189e1..49fe1c1f1c4 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 af8089f9809..2dd50931e63 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 c3510f1e649..e5f2f6d7189 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 4476da20dd8..474c56c2135 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 b6a0bd94f7a..1a7ea5e4cfd 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 ad0b8fd9562..1aeab06c5c5 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 64835500c42..3bb8e69823b 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 ecc8389cb13..992a900532d 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) { ---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 18ac0ec4610..9f08311e804 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) { ---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 ca876f82d7c..1fdb353e6ed 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) { ---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 54bb475e9ec..ec5f98aed1f 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) { ---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 7d95385fe38..2a80161d08e 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) { ---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 80f62eab5b4..2f7d1307507 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) { ---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 ce9be2770ba..e42e03b7e93 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) { ---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 a1535675b85..163828203d1 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) { ---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 b79cc71f82f..4e97819a59a 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) { ---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 12bf3df866f..2f9469299b8 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) { ---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 de27dd8df4d..d090f495bd9 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) { ---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 8c4e248bc86..5fb4728fbff 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) { ---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 64e6835f969..fbe2512c1d6 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 51c4ac954de..cfc68bdaa8f 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 384a9ca4af7..724b9808e38 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 c756f1665a8..e1540f97c41 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-- \ 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 27424c35e44..e02c2a97a23 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 5a4857d6770..16fa55e40db 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-- diff --git a/ext/dom/tests/DOMComment_insertData_error1.phpt b/ext/dom/tests/DOMComment_insertData_error1.phpt index 56922ac5185..bd72642e338 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 d2affa89e7c..0ead9624b84 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 2963cb1e068..0d1b1a9c9c0 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-- diff --git a/ext/dom/tests/DOMComment_replaceData_error1.phpt b/ext/dom/tests/DOMComment_replaceData_error1.phpt index 4ae4cb61da8..16ea993e344 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 89614f9756a..7dc8f1e9b91 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 c84689ad8e2..819306566cc 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 bf71d554aac..da2a967c3ae 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 ff81343cc98..a5f3dcd0411 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 4f4ddf1765a..2a3316ecc8b 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--   diff --git a/ext/dom/tests/DOMDocument_loadHTML_basic.phpt b/ext/dom/tests/DOMDocument_loadHTML_basic.phpt index 616d1d83715..839bd0f9234 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("

Test

"); echo $doc->saveHTML(); ?> ---EXPECTF-- +--EXPECT--

Test

diff --git a/ext/dom/tests/DOMDocument_relaxNGValidateSource_basic.phpt b/ext/dom/tests/DOMDocument_relaxNGValidateSource_basic.phpt index 93b9cf71737..94f86eb9d2f 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 76a64425ceb..7a08f37fa5c 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 dd0824b0d11..c38ea896334 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) This is the title diff --git a/ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt b/ext/dom/tests/DOMDocument_saveHTMLFile_formatOutput.phpt index 5aece3780aa..7471a6e60c3 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) diff --git a/ext/dom/tests/DOMDocument_saveHTML_basic.phpt b/ext/dom/tests/DOMDocument_saveHTML_basic.phpt index 76f1ed0abfa..c8ce0602f20 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-- This is the title diff --git a/ext/dom/tests/DOMDocument_saveHTML_variant1.phpt b/ext/dom/tests/DOMDocument_saveHTML_variant1.phpt index d1691138ae1..c5728860c8e 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-- This is the title This is the title diff --git a/ext/dom/tests/DOMDocument_saveHTML_variant2.phpt b/ext/dom/tests/DOMDocument_saveHTML_variant2.phpt index 54ccda1fa57..86b150d5195 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--

Hi.
there

Hi.
there

diff --git a/ext/dom/tests/DOMDocument_save_basic.phpt b/ext/dom/tests/DOMDocument_save_basic.phpt index c7d1ead24b4..e477a1758d1 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 10f748cc483..09cc9950497 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 7c0eec8ddd9..21979b0bbed 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 dd4ec960d28..39dd70ee88d 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 8e804bea92c..39366eaab11 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 3b19ea46145..880aae9d7c7 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-- diff --git a/ext/dom/tests/DOMImplementation_createDocument_basic.phpt b/ext/dom/tests/DOMImplementation_createDocument_basic.phpt index 78d20aeee5f..e501cd29e3d 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-- diff --git a/ext/dom/tests/DOMImplementation_hasFeature_basic.phpt b/ext/dom/tests/DOMImplementation_hasFeature_basic.phpt index b53e912b779..8efb23c8afa 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 656dd4859ef..f226455ca96 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 6af6e3ecb28..69edc860e42 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) "The Grapes of Wrath" diff --git a/ext/dom/tests/DOMNode_C14N_basic.phpt b/ext/dom/tests/DOMNode_C14N_basic.phpt index 52a47a15d27..bbfd7bcefb2 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) "The Grapes of Wrath" diff --git a/ext/dom/tests/DOMNode_cloneNode_basic.phpt b/ext/dom/tests/DOMNode_cloneNode_basic.phpt index cba3c17a2cd..ef66626ad8e 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 3f57681c3e0..f74d5d7cc92 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 7c14ffab909..b422a5dbef5 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 5c1d714e121..a62dafd109b 100644 --- a/ext/dom/tests/DOMNode_hasChildNodes.phpt +++ b/ext/dom/tests/DOMNode_hasChildNodes.phpt @@ -33,7 +33,7 @@ $dom->loadXML(''); var_dump($dom->documentElement->hasChildNodes()); ?> ---EXPECTF-- +--EXPECT-- Document has child nodes diff --git a/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt b/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt index 3a6f6b42188..470921cfee3 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 d371aaf045f..04a881e56ca 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-- Add new node B diff --git a/ext/dom/tests/DOMNode_insertBefore_error1.phpt b/ext/dom/tests/DOMNode_insertBefore_error1.phpt index d655479d004..72c1a5ba5cf 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 e413fb033a4..7e15c47f13d 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 fb0977488e6..e1399f959d8 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 3ebf4ae7d2e..b899c36a5ad 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 a250bff03eb..9683088680f 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 b5fc8931636..1ec561003e3 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 012302bc3e1..7e7ddec16eb 100644 --- a/ext/dom/tests/bug54601.phpt +++ b/ext/dom/tests/bug54601.phpt @@ -22,7 +22,7 @@ print $doc->saveXML(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- DOMDocumentType footextbartext diff --git a/ext/dom/tests/canonicalization.phpt b/ext/dom/tests/canonicalization.phpt index cf1a81f24a9..167f094ff89 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-- diff --git a/ext/dom/tests/dom_comment_basic.phpt b/ext/dom/tests/dom_comment_basic.phpt index 3a6970562b3..ecabe733343 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 1f30e7c7ea4..d44babdeaaa 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 453cc88495a..185d39c1d50 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 b3f17791a3b..d738b96eca6 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 38d9ed21997..8b6c1704343 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 96eb3010e03..9fbf48b2ecb 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 78d3b8929fc..504df2b042a 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 4eea7470b80..4078649edf3 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 e56062a534d..8a675ea75ad 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 0c3c641388f..e6caa697c4e 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 5179fd44977..7dab9e18394 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 4fdd2be272f..1d999866970 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 5535259cd85..4a22c5419d5 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 cf4809f0932..3a3891d72c8 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 7d1b008d5a0..ff65b36b3de 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 649c6e409d3..d8d118540e5 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 38d15e7d0ac..7cfc557fcb0 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 364f9024f12..37481813a9c 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 0f6fd0e60f0..114b8f097f8 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 a179f3ea35b..36b0423471c 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 eacacf5b3e2..8c5d9db9107 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 2adc6ed9772..c9141a39569 100644 --- a/ext/filter/tests/bug49274.phpt +++ b/ext/filter/tests/bug49274.phpt @@ -6,5 +6,5 @@ ---EXPECTF-- +--EXPECT-- bool(false) diff --git a/ext/filter/tests/bug50158.phpt b/ext/filter/tests/bug50158.phpt index d41dfd56c0d..8b29e72b2db 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 09e84fd0532..91889f1980b 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 3ab0990dd33..fd634334bb3 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 4298d505d3f..b281db4f493 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 562fbf1ebbd..11fce112326 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 565008ba5a7..22e4dc87029 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 ff695c4d5bd..29b1f918e37 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 39aeb766fb9..3424bb83445 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 34a6d58e071..8adc3892286 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 9867b7469a8..7e938f4bb17 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 f80564565da..85c72fe8604 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 791c59c2301..f00a4aae4e2 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 7e492c38dae..eb9e8293fd9 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 feb10267c23..08348d0012b 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 a6d162c3db8..368a08a2422 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) ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/gd/tests/bug48732-mb.phpt b/ext/gd/tests/bug48732-mb.phpt index 42871ee206c..8e937bfe8eb 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-- ---EXPECTF-- +--EXPECT-- Left Bottom: (0, 46) diff --git a/ext/gd/tests/bug48732.phpt b/ext/gd/tests/bug48732.phpt index 38dc861a9d6..5e77e061036 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-- ---EXPECTF-- +--EXPECT-- Left Bottom: (0, 46) diff --git a/ext/gd/tests/bug49600.phpt b/ext/gd/tests/bug49600.phpt index 068f8f36a87..1f767f6f972 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 8e86f41764a..69496e011ba 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 5dd77fe67b3..1d72e734a95 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 af2df41820d..c6a50ba48b3 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 dfbd4b49ec9..2cef56cc324 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 f1f66bf26d0..8d574e0559b 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 e6983b7516a..41582492b0c 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 9af0f186008..0a939bd85f0 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 5aafc31e767..28bb3ed1734 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 fe98642dbb8..df4996332dc 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 7c130841573..66209f47d80 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 8dad8bd1153..6bde8fe54ad 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 25b28214854..22efeb60e95 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 794abb3d719..27cdaeb5f78 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 bc939c97998..48b096cb267 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 1d188121b6f..46e8878d9d9 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 472a10d8640..71eddd9ff4f 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 c26fa68cf2d..0db589bdf67 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 687d148be5d..bcba260b9a4 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 84f8858a9ae..a0ad74a5f53 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 0b79e78d1b2..246e3ba7d21 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 56396860b42..de16b65d9e5 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 2c8e5612fe5..6d0048026da 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 eac7ff3fc75..95d6e7e3e66 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 45349b43797..8bc1854e041 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")) { ---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 56b5ca3dfee..54e23a78ace 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 5ded1ac5a5c..6978feb65b8 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 ba9257d1c25..9a067d73aef 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 cd1af4de099..411b5d033da 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 b16927d20ed..f655421904f 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 9a2bc01016c..2e088cebe62 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 7a8ffde6a15..06b5dac2cd0 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 592d6aee9ae..d1ad9961f48 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 ad4e754e550..327cb582812 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 5b69115b129..b4ddf64a0f9 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 81b3a11f706..78177cda501 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 ebfc7e6ee1b..4b44c1266e2 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 35314f1e690..094a050e5a4 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 79f6ad51799..afa6d67446e 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 e5d6271f69a..f4f8d7fb9ba 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 1017f8e3b6f..88f4903ca36 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 78dfaa0db1e..5a6ee82d9f2 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 70fba3843e6..b046c46b551 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 0e5a26c16a1..37cd161e02c 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 cf816c3670e..48693f1ed08 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 0de2c49a200..872e5987be0 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 b2b2911f8a0..b2278ea7e62 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 4d9fffab7ab..67882552896 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 ea7dbd50987..152feedc394 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 c7fcba39d02..1a182afdd94 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 0bfb59b48e8..c86bca9fba9 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 f060444741a..2a98ff30cd5 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 c91f4b8b327..34b802120a3 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 7be709a66f8..be6b1221ced 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 4e8d0962445..d474eb2b70c 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 ef7b28a5465..f90aae011f8 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 30cc8cc0ae5..f1482730c37 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 9d8ea644428..04c1c1cee4f 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 684b05970a4..da4880a97b6 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 2bf4f556a86..9d551219eca 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 fe90081e79b..2063ae22773 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 a10b9deb89b..e0b83d8190b 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 1e6af7b909a..4aeec2330d8 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 71cb665849b..3bcc4299064 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 d5709173502..0917f68a2f9 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 0be9bfa4093..9cd7f350dcc 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 a26b39209f2..b84eceb07b1 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 0fc3d52a8cd..0b963d55de7 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 038a2554195..7839d2e4242 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 5cac5ce59cc..12168f3ccaa 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 b562b616c8e..48ecdc5d7bd 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 01a307f4a3a..48c4b388303 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 4f30b25901c..f3af6b92cec 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 48bd7ad5240..97ca58e07d9 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 111438ddc48..b8d3fcc3e42 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 4b8773f93d9..ccb6389110a 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 80ed051c9a6..03a61d8645d 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 d4d1748f298..68df624de1f 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 ddac8963c37..6b5c72589b6 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 cf254bfc18b..6d9f58b9670 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 f8c8d135f3a..4994ecf4b0d 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 6d4082c2b73..064efa76ae5 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 aa9a63f93d2..99fc5f79548 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 b1d70bc4c7a..d45e51f6836 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 f9deecc4699..bb60a104adc 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 7fe855d1dc9..265d67299cf 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 d03e83a8a9e..7330a56a2a1 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 5379de4cb59..86b17b56130 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 fd843a62c67..2c579931ca4 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 c380432d1be..b831a7f1643 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 dcf6c0bb65d..c1687856478 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 1a673e5d155..9434158106c 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 72debf7d05e..ab8c8df7235 100644 --- a/ext/mbstring/tests/bug52931.phpt +++ b/ext/mbstring/tests/bug52931.phpt @@ -17,7 +17,7 @@ var_dump(strripos($string, '')); var_dump(mb_strripos($string, '')); ?> ---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 7dce14a7adf..f6be08bf336 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 df9e789be6c..3709dc2bb27 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 8173a20f68d..87689d450ae 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) ---EXPECTF-- +--EXPECT-- bool(false) diff --git a/ext/mbstring/tests/mb_chr_ord.phpt b/ext/mbstring/tests/mb_chr_ord.phpt index 153699b1b09..f2d42fa682b 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 5bb78df0284..b41c717873c 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 0060a71808d..19626795eb9 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 0487a194f22..4aa1323adb0 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 cd52fa526d4..3e05b776110 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 b2f0c8b7d17..f43717327c4 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 668ae8bfea6..de2a8481723 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 dffb4196628..51ad6c22a10 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 c035acc0183..f730a637d32 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 3077bcbd5d4..7172dd2a750 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 7f7d6dfc93f..80c879e38ca 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 c26d82ead51..0a7eb53d77b 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 eb8fea2b9b3..4f9a6a6026a 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 45d361c598d..4f5171623c8 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 e061d8f7cc2..5a2fb6cb378 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 76a6cc5066f..a9399da3917 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 6214f3069ca..0e62b881b4b 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 efa11ad47ec..b254cbc712e 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 c9e1ff84fc2..d63a2eaf6cc 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 b330323c7ef..09fc7e352bc 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 9de0388f436..aac9fc020f9 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 cb5089679b9..6205ecac487 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 6d9cba72fef..4f727094b15 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 99256e1ec48..bf918df1825 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 f08b508798e..007430b2629 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 f0cb0fa47c8..de77f392250 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 8f5abe7269e..739671b6c4c 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 d6d6b75d236..8842e7a3d18 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 c4d1d7830aa..13cd4a7f25c 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 21c9f956fb1..0a98d2051b1 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 f0ba2bc0a23..702bdda1470 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 f9599d995f3..375520af880 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 4978d0ce57b..b6c97b324ad 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 2f74dff64bc..7c4ebc9a4e4 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 43eb0aebd89..6008be5a117 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 ---EXPECTF-- +--EXPECT-- string(12) "836583588367" diff --git a/ext/mbstring/tests/zend_multibyte-06.phpt b/ext/mbstring/tests/zend_multibyte-06.phpt index 71e5c903b97..c75c0b8cb2d 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 ad70b853aff..498170e747a 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 35246bcdca3..b24ed25fb21 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 7f1d91e294f..a9b0920184f 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 aaece46fafe..5a8dcae0c1c 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 63d5b43cfc9..2e2089d4b2a 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 4896a786a8d..ad58e7af27f 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 e433351e01c..cbb1cccf960 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 e82ca65859c..78079293484 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 3b93b0a2070..1792fec6a26 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 ebf8d76daf8..2d8c6500ecf 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 6d75bde7319..421899d10a6 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 30044dc4fbf..2015f2ef6aa 100644 --- a/ext/mysqli/tests/014.phpt +++ b/ext/mysqli/tests/014.phpt @@ -80,7 +80,7 @@ mysqli autocommit/commit/rollback ---EXPECTF-- +--EXPECT-- Num_of_rows=1 array(2) { [0]=> diff --git a/ext/mysqli/tests/015.phpt b/ext/mysqli/tests/015.phpt index 227a142d6a5..de950b00f72 100644 --- a/ext/mysqli/tests/015.phpt +++ b/ext/mysqli/tests/015.phpt @@ -78,7 +78,7 @@ mysqli autocommit/commit/rollback with innodb ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(1) "1" diff --git a/ext/mysqli/tests/016.phpt b/ext/mysqli/tests/016.phpt index 143143c8f5a..60170a727e0 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 3c5530c03a5..06f03c0cf1d 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 60765299594..2011ae630d6 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 997dee65177..14b8dcbdba6 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 d773defb260..d6427e78150 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 c3a9901e4f5..964e38330e1 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 bd2625ad618..6f55d03716b 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 3d268749b92..0c75488dd69 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 d6e9d6ed55c..a05acb825b6 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 a6a0c4f205c..8c5b6aa23cf 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 bfb7ea35bf0..fa02853a191 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 da6708c0ace..c4852ac91d3 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 78f710db8cd..0d7899d177f 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 c83cbc3c169..c195173188e 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 7b4590f99c8..b790f628397 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 cd7b9ef0095..cfd5235e2b8 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 48007cee6c5..9af81ea12a6 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 ac2de197bb8..33c5dbbc56a 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 c40035d9c81..78b3206af4e 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 c3bb7285c8e..b5baf194427 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 f3bbe346fac..1c751413069 100644 --- a/ext/mysqli/tests/bug42378.phpt +++ b/ext/mysqli/tests/bug42378.phpt @@ -184,7 +184,7 @@ memory_limit=83886080 ---EXPECTF-- +--EXPECT-- FLOAT FORMAT(col1, 0) FLOAT diff --git a/ext/mysqli/tests/bug44897.phpt b/ext/mysqli/tests/bug44897.phpt index 84c245d0fc7..89853a3acf4 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 b4c115d4ccf..f7ace737d80 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 c377171b7b5..a1c77ac2d87 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 76901390cbb..94bf4236dc1 100644 --- a/ext/mysqli/tests/bug48909.phpt +++ b/ext/mysqli/tests/bug48909.phpt @@ -42,5 +42,5 @@ require_once('skipifconnectfailure.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 55b74ce017b..059d9865844 100644 --- a/ext/mysqli/tests/bug49027.phpt +++ b/ext/mysqli/tests/bug49027.phpt @@ -50,7 +50,7 @@ require_once('skipifconnectfailure.inc'); ---EXPECTF-- +--EXPECT-- array(1) { [0]=> string(2) "42" diff --git a/ext/mysqli/tests/bug49442.phpt b/ext/mysqli/tests/bug49442.phpt index dce7b33cb72..f20cbb1b118 100644 --- a/ext/mysqli/tests/bug49442.phpt +++ b/ext/mysqli/tests/bug49442.phpt @@ -108,7 +108,7 @@ mysqli.max_persistent=1 ---EXPECTF-- +--EXPECT-- array(2) { ["id"]=> string(2) "97" diff --git a/ext/mysqli/tests/bug50772.phpt b/ext/mysqli/tests/bug50772.phpt index eecef84ad2e..6d0ee6c24c3 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 02328a5be88..c57a7b36d30 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 8e3bd59ba53..815f79013a9 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 463efd6d4e7..7e4758887f1 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 78c9a2c40e3..b031909aa24 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 efc67308b6a..e18eed7f99c 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 a10c604fdd6..6ea62065b9c 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 52e42b61775..54ddf6943c6 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 8c0027f9e66..9cb5f457267 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 58b2d2fa82b..f36c2bf6e76 100644 --- a/ext/mysqli/tests/bug67839.phpt +++ b/ext/mysqli/tests/bug67839.phpt @@ -64,5 +64,5 @@ precision=5 ---EXPECTF-- +--EXPECT-- 1: 9.9999: 9.9999 diff --git a/ext/mysqli/tests/bug68077.phpt b/ext/mysqli/tests/bug68077.phpt index 0652e68c9b2..f9fb962e777 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 aa8662badf7..6987789d360 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 ---EXPECTF-- +--EXPECT-- OK \ No newline at end of file diff --git a/ext/mysqli/tests/bug72489.phpt b/ext/mysqli/tests/bug72489.phpt index 4e8fb3f4e5c..744a504c8dc 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 6de73761f41..5fb978feb13 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 7ce311eb777..9de75ecd2b5 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 a771c9a8524..940357ad04f 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 a08f897ef9f..95c3bb34263 100644 --- a/ext/mysqli/tests/mysqli_affected_rows.phpt +++ b/ext/mysqli/tests/mysqli_affected_rows.phpt @@ -131,5 +131,5 @@ mysqli_affected_rows() ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt index 2b9b549cb47..7a6a5be9965 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 ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_autocommit.phpt b/ext/mysqli/tests/mysqli_autocommit.phpt index fdbedc5fb6d..cc41786bdb6 100644 --- a/ext/mysqli/tests/mysqli_autocommit.phpt +++ b/ext/mysqli/tests/mysqli_autocommit.phpt @@ -143,5 +143,5 @@ mysqli_autocommit() ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_autocommit_oo.phpt b/ext/mysqli/tests/mysqli_autocommit_oo.phpt index 5f61915e206..7c616aab500 100644 --- a/ext/mysqli/tests/mysqli_autocommit_oo.phpt +++ b/ext/mysqli/tests/mysqli_autocommit_oo.phpt @@ -133,5 +133,5 @@ mysqli->autocommit() ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_change_user.phpt b/ext/mysqli/tests/mysqli_change_user.phpt index a7ae1d66908..7b9f23cf9ed 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 7d1c3981423..00fa9f0af66 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) { ---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 e40154ce10e..fa8c66f56b0 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?"); ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_change_user_old.phpt b/ext/mysqli/tests/mysqli_change_user_old.phpt index 96357ebf511..cf53016f59d 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 34a3e51bb19..5203381088e 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 6a37b6b44af..577673f0b5f 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 ed3330e0643..12370b18cc8 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)) ---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 0adaf52b851..614aa7a0237 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 82be2c46837..855141e40dd 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')) { ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_character_set_name.phpt b/ext/mysqli/tests/mysqli_character_set_name.phpt index 8d21b561e01..90dd46fa734 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 1a81bdcb394..5d303fd503d 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 db1d3444c76..9247721e43c 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 75a8e8cfcbc..ee2765c4dce 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 937137564ef..a300fb83149 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 49189bbab12..305d5edf888 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 ea64ae8065a..27ae3a928a5 100644 --- a/ext/mysqli/tests/mysqli_commit.phpt +++ b/ext/mysqli/tests/mysqli_commit.phpt @@ -73,5 +73,5 @@ if (!have_innodb($link)) ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_connect_errno.phpt b/ext/mysqli/tests/mysqli_connect_errno.phpt index a7f90f15272..c2d22ee8eaa 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 79ac3f1f795..dca311ea939 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 7f049b052f2..d60ff3876a8 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 2809a3feda6..97ca40c61cf 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 42113aef2b7..6f1cd5faa74 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 e51325a2137..28aaa582ada 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 bcf00672d6c..d644bf92047 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 f46aec9359c..333aaa10c03 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) ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_explain_metadata.phpt b/ext/mysqli/tests/mysqli_explain_metadata.phpt index 8f4a7cc8c53..157559b340f 100644 --- a/ext/mysqli/tests/mysqli_explain_metadata.phpt +++ b/ext/mysqli/tests/mysqli_explain_metadata.phpt @@ -159,5 +159,5 @@ if (!$IS_MYSQLND) ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt index 2fb82819396..171a1a4010b 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'); ---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 82e4d7b6665..ccd94043a17 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'); ---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 d9bdcfad372..586bfb03b3c 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 ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt index ce7e82dc08f..09ff9d193d7 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'); ---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 e234a28fe5e..f55a32b9519 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); ---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 d02c02c7659..70464ffb513 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'); ---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 f5a0b7bc950..4862b7a220b 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 bb3f5cc1f19..ffb9e954cca 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 e2dff9befba..0b3d772d5c0 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 ---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 5862c0aaa18..9fb1040580b 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 64eba16679d..80875a44e60 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')) { ---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 4897063c12b..549d9c8a72a 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 2c3c0f806d7..0dd72913425 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'); ---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 7fbefeb8535..28313670ad3 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 a7f785302b5..d1eb116cb0c 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'); ---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 b30c4a3801f..30b95748b3d 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 2b70fda3edc..b0076c18590 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 d60ffd9fbe7..21851d6b301 100644 --- a/ext/mysqli/tests/mysqli_info.phpt +++ b/ext/mysqli/tests/mysqli_info.phpt @@ -94,5 +94,5 @@ require_once('skipifconnectfailure.inc'); ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_init.phpt b/ext/mysqli/tests/mysqli_init.phpt index 1abb7ca37ed..c6774c311f4 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 e858ca06895..12c858fbe45 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 c7f38fa0fc3..2833f3fb18c 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 ---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 e42d3b31f34..85a36981b5d 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 1d1b3c917f0..a00ab15948f 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 653c6720772..465f9fee970 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 4b0c947191d..7b987130462 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) ---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 9457adfb5df..d7b4b6b13e0 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 3016e200d72..760da471dd9 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 afed773b017..1461933015f 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 1453d663baa..9af480e003a 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 f8d8d7e8bd5..b60bb3662b5 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 ---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 ee9e1f9cc6d..960c4a2635c 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 ---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 c550f0f4950..c821177eebb 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 734029acb11..ac17c22b84d 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 e23a5f696fc..2ecd838592c 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 d6d6c092b94..0c3bedf5b50 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 e45de69edaf..b10706aa04a 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'); ---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 730dc8403b3..cb5699fc1e3 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 4f4e671f3bb..1df5cc87602 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 67c4442d284..20384d9a0f0 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)); ---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 208056fc471..14bf97c6358 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)); ---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 7fa5523661e..cff45e06d4c 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)); ---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 0f7a5083b88..537ac7292f0 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)); ---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 945e1eaed7b..85ac847666b 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)); ---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 a121d5fb8f4..47535f937ec 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 ae4986e0b13..9e1562dba0e 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 3f3bce32926..b43b6b24783 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 7f05a20d2f5..606d3802852 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 2abae55c1e7..8463cc58b8f 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 d58885e986a..92937a15ce6 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'); ---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 0d5e8f9bec3..e05843e5b76 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"); ---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 5b53a06222c..b3d60380cb4 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'); ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt b/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt index d7a78f1cf06..5ad6f583e79 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'); ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt b/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt index 39c602034dc..0daab8b11a8 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'); ---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 97b15242dcb..a8a18ace858 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'); ---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 29a5ee3fbd3..5800a9bcc0e 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 ---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 58626be6723..e7b581f8157 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'); ---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 daab40c5068..2e3df083b7c 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'); ---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 acf0d0be2d2..3818b6ccfd8 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'); ---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 68ec601e102..64b0b192ff2 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 ---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 56508533ba2..6d096531e80 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'); ---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 3380f0edbb7..957044cd674 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 29e3947a784..f9ab2675026 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 35433b136af..293761bb846 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 2a2914ad88b..49ca6f6bff9 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 ---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 0cbc05f6c72..14333e7665b 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'); ---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 84998b9423a..00bde682841 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 ---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 6c476f7e9d3..87dd01223f0 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 ---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 046f90438e4..a717bee50da 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() ---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 c86a385bee6..9bfd7d69580 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 ---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 c057f7d9fb1..658f7da77f5 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')) ---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 7b6d3c26a0a..7d215585938 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 ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_multires.phpt b/ext/mysqli/tests/mysqli_stmt_multires.phpt index 28cf5e38f44..b95bfd7f91e 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 a7dad1b47c2..44c1f1bdcc5 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. ---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 a1fc2007fe0..eeb74d90931 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')) ---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 95d2302f4c4..07acb041b5e 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 ---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 aa292a91987..89b8ed3bf87 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'); ---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 2dec703b990..58d588ac493 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 ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_thread_safe.phpt b/ext/mysqli/tests/mysqli_thread_safe.phpt index 0777c2abd7b..2f6a87ba425 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 4a73e0ffc83..c1d7c21b193 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 8d9a21b697f..fe73d0e7974 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 2911229175b..cd1677e8c09 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=== ---EXPECTF-- +--EXPECT-- ===DONE=== diff --git a/ext/oci8/tests/b47243_2.phpt b/ext/oci8/tests/b47243_2.phpt index ae96953d7bf..6552c5b11c6 100644 --- a/ext/oci8/tests/b47243_2.phpt +++ b/ext/oci8/tests/b47243_2.phpt @@ -22,5 +22,5 @@ oci_free_statement($s); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== diff --git a/ext/oci8/tests/b47243_3.phpt b/ext/oci8/tests/b47243_3.phpt index cc57c20d631..9f2570bd1b9 100644 --- a/ext/oci8/tests/b47243_3.phpt +++ b/ext/oci8/tests/b47243_3.phpt @@ -23,5 +23,5 @@ oci_close($c); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== diff --git a/ext/oci8/tests/bind_boolean_1.phpt b/ext/oci8/tests/bind_boolean_1.phpt index 49ac03c8825..ad22fe055cf 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=== ---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 9ff09551afe..8c86d4dfae4 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 af0ad4e682c..e967767d6e8 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 b8f2284830a..161f87440e6 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 646b3317a1b..e3ea6c20c92 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 4c6c07e3c04..90e7679371d 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=== ---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 9e55b3b1ff7..9a80a4cc82f 100644 --- a/ext/oci8/tests/bind_misccoltypes.phpt +++ b/ext/oci8/tests/bind_misccoltypes.phpt @@ -270,7 +270,7 @@ oci_close($c); ?> ===DONE=== ---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 e4edc93299c..df1d0204cbf 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=== ---EXPECTF-- +--EXPECT-- Test 1 array(1) { [0]=> diff --git a/ext/oci8/tests/bind_sqltafc.phpt b/ext/oci8/tests/bind_sqltafc.phpt index 8d2ce2ae61b..8243851eb3e 100644 --- a/ext/oci8/tests/bind_sqltafc.phpt +++ b/ext/oci8/tests/bind_sqltafc.phpt @@ -89,7 +89,7 @@ oci_close($c); ?> ===DONE=== ---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 aabf9bda5c5..a5c6d77b67f 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=== ---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 47d08d2bc37..f65099f7522 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=== ---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 ac8518e791b..dfefe3d7ed0 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=== ---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 63953884718..e2910670886 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 a1eeafc7610..aba25579ccd 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 e0fbba816ab..0664510146e 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 d9b54e295f0..f83aff17bc6 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 d430474fab6..a741e24ad12 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 71854f3d46a..3386fb4177c 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 604b57f262d..462b8df8614 100644 --- a/ext/oci8/tests/bug46994.phpt +++ b/ext/oci8/tests/bug46994.phpt @@ -71,7 +71,7 @@ oci_close($c); ?> ===DONE=== ---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 0990a95f3bb..3fc1702da53 100644 --- a/ext/oci8/tests/bug47281.phpt +++ b/ext/oci8/tests/bug47281.phpt @@ -59,7 +59,7 @@ oci8_test_sql_execute($c, $stmtarray); ?> ===DONE=== ---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 4b4e92ede65..687655fe8c5 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=== ---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 223faa5cad3..361781516ba 100644 --- a/ext/oci8/tests/bug68298.phpt +++ b/ext/oci8/tests/bug68298.phpt @@ -38,7 +38,7 @@ oci8_test_sql_execute($c, $stmtarray); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- array(1) { ["COL1"]=> array(2) { diff --git a/ext/oci8/tests/bug70700.phpt b/ext/oci8/tests/bug70700.phpt index 17a143a9322..40c8c12b451 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 5978e04ecef..b294b46dadb 100644 --- a/ext/oci8/tests/bug71422.phpt +++ b/ext/oci8/tests/bug71422.phpt @@ -49,7 +49,7 @@ oci8_test_sql_execute($c, $stmtarray); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- array(1) { ["RAW_QUERY"]=> string(3) "Foo" diff --git a/ext/oci8/tests/bug74625.phpt b/ext/oci8/tests/bug74625.phpt index df9440e42af..f3bc7ac60a8 100644 --- a/ext/oci8/tests/bug74625.phpt +++ b/ext/oci8/tests/bug74625.phpt @@ -49,7 +49,7 @@ oci8_test_sql_execute($c, $stmtarray); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- array(5) { [0]=> int(-2) diff --git a/ext/oci8/tests/close.phpt b/ext/oci8/tests/close.phpt index 55bb4ea3642..aed90fcaa71 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 ef4018118e3..dad1376e2d8 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 70a6d2b096e..4d85fe5e699 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 d265d1da9f1..ae0f8f45192 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 7d05c114118..e9d205e0c54 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 f645cf80ff3..5860bbd5d78 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=== ---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 05c2269ae0b..74028f794e1 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 --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 eaace0fa084..b69b6a03fd9 100644 --- a/ext/oci8/tests/dbmsoutput.phpt +++ b/ext/oci8/tests/dbmsoutput.phpt @@ -132,7 +132,7 @@ oci8_test_sql_execute($c, $stmtarray); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Test 1 array(1) { [0]=> diff --git a/ext/oci8/tests/define5.phpt b/ext/oci8/tests/define5.phpt index 978d66b2607..774bac2344a 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 cc07e2ea94f..d174ef9155a 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 c01c144d236..1db9ef10a6e 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 bf074971781..cc1fdd18545 100644 --- a/ext/oci8/tests/dupcolnames.phpt +++ b/ext/oci8/tests/dupcolnames.phpt @@ -59,7 +59,7 @@ oci8_test_sql_execute($c, $stmtarray); ?> ===DONE=== ---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 ad56e8aefad..b0c53408c33 100644 --- a/ext/oci8/tests/error_set.phpt +++ b/ext/oci8/tests/error_set.phpt @@ -53,7 +53,7 @@ var_dump($r); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Test 1 bool(false) 24960 diff --git a/ext/oci8/tests/fetch.phpt b/ext/oci8/tests/fetch.phpt index b968ae4bf6e..6fdec313f18 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 b8155b170b0..00e747cc357 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 b8155b170b0..00e747cc357 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 4c0be1cc079..de35c017c94 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 1d4a8df7b7c..7c3b5ea83c1 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=== ---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 d82fd30e41c..28e1a2e72d8 100644 --- a/ext/oci8/tests/fetch_all5.phpt +++ b/ext/oci8/tests/fetch_all5.phpt @@ -58,7 +58,7 @@ oci_close($c); ?> ===DONE=== ---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 d90c4d95dcb..5235dac8a00 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 40bc4f893ca..1b5176974a9 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 860a5fbb34e..16dff5fc665 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=== ---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 0fc4815893d..9f1cb07829f 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=== ---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 05ae5e68579..c1babc94557 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=== ---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 663d630dfbe..578dc7f49ff 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=== ---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 cac0a5d1c0b..6533ba0a042 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=== ---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 8c9808d96c3..188201f4258 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=== ---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 54b8295cf92..1e82745967d 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=== ---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 665f773b573..ab82423e472 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=== ---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 b20b8dd3970..0eafa00aa52 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=== ---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 15b2efaef0d..393ff2fb0fb 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=== ---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 3cfa0967a21..faaed0b18e2 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=== ---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 d2dcbea6c78..92965130bce 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=== ---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 7dbcecbfe9d..5f668f6f01a 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=== ---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 4793a6c8820..bdd352154b3 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=== ---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 ccdb6f54903..ce44b00a332 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=== ---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 cbc2389e468..b89d399ab45 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=== ---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 dbd8f3ef3a2..82548d42d45 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=== ---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 981f4945e24..e925f8ca991 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=== ---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 d9c0705b554..107a2c4adcb 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=== ---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 247803581d2..7e4aaadd92d 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=== ---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 5acdd518e58..4a1b1e0a458 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=== ---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 2fba79813e8..f11e7821950 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=== ---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 352cd503372..797fe8ef68c 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=== ---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 85b230e9000..a99dd79833e 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 d7fd21b961c..ec7ff750665 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 39d27fd4a3a..276a31b86ee 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 4cd159510b2..7f0d233e076 100644 --- a/ext/oci8/tests/lob_043.phpt +++ b/ext/oci8/tests/lob_043.phpt @@ -80,7 +80,7 @@ oci_close($c); ?> ===DONE=== ---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 28599cc33b5..6adbb6fa64a 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=== ---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 be3e53453d4..abb2815975a 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 9a07fb5ac0b..d43a8c9f439 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 e27ea6d47de..4d119bcb1d2 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 d774b4d7249..a66cd723570 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 34a19ca693e..05862e89430 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 29cdd944020..ed71240a95d 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 a0d65a30c35..720ba8d0713 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 3c341c8cb45..a779bba3408 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 8f9672df506..309497e6c6b 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 2e5d7a9adda..c965e5c4b71 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 ---EXPECTF-- +--EXPECT-- diff --git a/ext/opcache/tests/opt/sccp_023.phpt b/ext/opcache/tests/opt/sccp_023.phpt index 0a25424edae..d327d6279e3 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 020973368e9..8f46dab830b 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 d4b2d391a03..8ecb87cd4f1 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 87fad9843e6..83aa302100a 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 2eef8c5bdc6..b7df0dcd8f2 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 7895e2f3de3..8bafedbab41 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 47fda89f7b6..2f5ca2007ec 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 5211c23d20d..e528b43cada 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 3b273998d00..d1065f66a7e 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 da99779143d..80280d1e15c 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 fa450318c29..daf7cb6aa0f 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 0a19686af1b..19701af3811 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 0ab321c73a7..e3ec128fdfd 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 65d0977674f..356e22549f2 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 c0e02ba0cc7..6d111052ce9 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 c031ea2fee0..0ca8fb7db3b 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 a3c78cfab0b..6682b72bd1a 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 8cd98362df9..db0800791b9 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 d84dc47d771..b6b4b35d62a 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 9a8099a33ce..d85f9ba83a1 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 5b41af3efcb..ad74b51fb4d 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 e676ddfb999..a626e21f957 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 6fe41f80e8c..bfc2d3ce8d0 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 3ec4dce2363..991e068f63c 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 ece9dd2eee7..24d038970dd 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 e8ba2645507..b51205bb539 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 a09d7e87807..76182e17d5a 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 f8ec86498da..15d0598e0fb 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 3cec8833f85..ce61b7b7feb 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 b650606df30..86b006295d6 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 beacdf6b8dc..cf28868086e 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 acf6cc05e18..a7a26dbf65b 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 48f911e5e3b..ee699942a87 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 438e05159f2..106b9282968 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 11361d1b32d..606b561126f 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 a16b4fbe718..793581ecd9b 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 25a5424b8e2..130fbf31a28 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 16c50b54e5e..a5f582d5d24 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 117662af6b9..66f4d6c2727 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 12c56e0b76c..17b256f9c4a 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 8838a005008..1ff33e96e78 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 d1ce7abc4e0..fa673ac935e 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 20c4a96be48..773bad30537 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 9edcf73596e..b0de5c92ad9 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 ddf54a0aaf6..8538033f526 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 977a67ea101..3bfc9942fed 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 bd469d3346a..f79c3628c64 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 092857c57ea..4d57d9f7ee3 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 6780bfba1b5..01973eaa329 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 01d290a1b96..45778871dbf 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 556b48b8c1d..adcee00d9ee 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 ac79e0bfaf6..d99cc63212d 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 be990b3b199..d0dea337d11 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 3deb2892ee3..431073753fa 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 c9d39af522d..d30a8e462f7 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 0e41be3859b..0a6885cf7c3 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 93184289108..447af58517a 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 b9084f63e3a..2245459b94b 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 4a3a618854d..527d9544deb 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 896519f8ab0..ec4c9586cce 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 e23aac2a553..b2dee60d74e 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 f001eec7d03..3a90244365d 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 90dc4c20f46..d5d4539fcc0 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 5455c664c00..30f856efc87 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 d5387e6c6f6..ddfd139d942 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 794d307873e..d840f222f1a 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 1d2b96805a1..a6f55f59387 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 29b16748ffb..1d2acfdc69b 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 25281fe31c4..1d9558bf660 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 9efba0d537d..8a1362599b2 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 14f81a66f11..8c8922f20bf 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 20add5a11e8..133d42215d1 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 9a73f1b2969..925290e7343 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 cdbc02b645d..a39fff5c816 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 2d939635c81..464d2b422dc 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 7db5ec35ec6..9fd9bf9b261 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 108a7c3984a..d852af01fd1 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 cc13ec03d36..b85ba236f87 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 312deddb81c..b812bf7bb54 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 4d0868ae7d4..f7c6d0b2d00 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 a59a6b0cc2e..1d65e4486ca 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 3fd9827ff2c..1cd24f0dbff 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 587ac9f2e29..4cb5c642590 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 4528213f11e..f7dede52eff 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 b970c4ef94e..db38c6904f4 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 93e1fbf1a22..dca3b2305b0 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 2e800535562..2dc00e012b7 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 364a8d976ee..e1ca9e1e162 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 a508459e55e..6a7de2c22a3 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 49bd5551ac7..8ab2c98b4c4 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 313b20d1894..0ce9e1e5391 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 f327aa40897..6398a839285 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 d59c9303284..880f10b8759 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 f8340f77534..437ea7a458e 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 0ac614e4cc3..3f63ffcb01c 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 ba5142a0c86..12cf0516478 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 43006c6d58b..13b90347888 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 530170d5766..896d9cd2a3e 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 dbff9c4b953..0187858f8b8 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 c0737b2ecc3..79a036ca8f2 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 dd4920e39dd..1dd3ca0fa6a 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 70b2f3fa250..4c3716de4bf 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 9421f62eea4..95d7754ca5a 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 1c62d77314e..42f01d53324 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 ae7e7fc4242..dfdd308e5b5 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 f809e02b11a..3e25f85b7ac 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 aea272b1d29..6b4e4d225f4 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 54b433f3ccc..dd9c47bc37f 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 fa4b122ef28..d996dbc3b6a 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 10ce72f8c6d..a7b40b461c2 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 17e2412de10..e93bf78a137 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 e58d4a65782..02f8c682b20 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 22c6b66c985..7fb9fe51edc 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 f97bd1bbe2e..50d5864d8fb 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 3f3bf966b9f..9ae279eaba5 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 088b4ed5e12..397d2e7b9fa 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 ac8e35fe604..695a678da1d 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 23ee8ee20f7..7b4b3f74f2c 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 abb6bc73e17..b356f7dfc8e 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 d0abc6ff8c9..4389276195c 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 0f27222de90..5ac2644bee4 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 4bb070f40d7..a403a3929eb 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 ab9b99fc6c9..4066db6a8f5 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 26a92f01b4a..dac53dbea7f 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 d92317f8d00..1ee83fde4f7 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 27a28b9bb83..9f17e9f61b5 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 22ae7c6724d..54a5ef840bb 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 41391058ddf..d79b6b72cea 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 b2981ec0bcf..925665e42bd 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 e22ffba0412..e531a2f7d44 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 40706ecaa30..92ac6a668e1 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 d102a055b08..a40e453d8d4 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 4214cd9be09..f91eceecdfa 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 4ab4566f001..1b5b3c05aa8 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 bb7e5e87e75..e83855f2185 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 59dbda38bac..ecb4213ad56 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 3dbbb1ffffd..b00ea50cf01 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 fd36b57b76c..7a71df8c68d 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 28da3b54bff..ebd519171a7 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 3df1e4f2bdc..b0b133d8704 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 abd5e8cea71..de614648a72 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 c35e3637ac0..efcce00e3de 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 70ccdd0cd3c..da6f3cf0fbd 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 101cc73cb04..8cdaae16e6c 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 7d5b5db8900..df9d1c76cfd 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 5803347988f..eef0a9f9668 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 faa787fd544..622630c0572 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 963a9b45a07..b8ebd4137db 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 087f822777f..95aa7b08875 100644 --- a/ext/phar/tests/028.phpt +++ b/ext/phar/tests/028.phpt @@ -32,7 +32,7 @@ include $pname . '/a.php'; ===DONE=== --CLEAN-- ---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 e1e94dba80d..14df993e1b9 100644 --- a/ext/phar/tests/030.phpt +++ b/ext/phar/tests/030.phpt @@ -37,7 +37,7 @@ echo $e->getMessage(),"\n"; ---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 091ed326a89..a3d90a1b3e8 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 84d4203e10b..31baa82394d 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 85bf1780aa4..4b0cd382601 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 cc8f4384638..1bf979efad2 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 7a8e9235a3d..4cd238d6547 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 3d5b7fe7841..660776af054 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 --FILE_EXTERNAL-- files/write10.phar ---EXPECTF-- +--EXPECT-- string(214) "getStub()); diff --git a/ext/phar/tests/cache_list/copyonwrite11.phar.phpt b/ext/phar/tests/cache_list/copyonwrite11.phar.phpt index c3851e64948..eae6a8e26e8 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 --FILE_EXTERNAL-- files/write11.phar ---EXPECTF-- +--EXPECT-- string(174) "getStub()); diff --git a/ext/phar/tests/cache_list/copyonwrite13.phar.phpt b/ext/phar/tests/cache_list/copyonwrite13.phar.phpt index fc47174d2bd..bbb3ab5aa97 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 --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 11201ac989d..9e10b31591b 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 --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 6e46289227d..a74439ddebe 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 --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 f17784c355f..5e8744e9f3d 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 --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 3e65f5a124f..751194b330a 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 --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 acce57415c6..aa0c9653ee6 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 --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 8960ea7171f..6b32520f2da 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 --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 7cba216395f..141f9c9ad79 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 --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 292e5af668f..c6025fd125f 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 --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 69197f2b4b9..3bf0e11c3d1 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 --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 b661cb61c1b..13cae01e85a 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 --FILE_EXTERNAL-- files/write25.phar ---EXPECTF-- +--EXPECT-- bool(false) bool(true) --FILE_EXTERNAL-- files/write9.phar ---EXPECTF-- +--EXPECT-- string(188) "getStub()); diff --git a/ext/phar/tests/cache_list/frontcontroller24.phpt b/ext/phar/tests/cache_list/frontcontroller24.phpt index 561826bd784..cd7c990c29d 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 a8779392b6d..3ec1d52d54a 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 86a1c1444c1..b7d12701075 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-- ---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 2a3ec8b8245..e9e2c05b9e9 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-- ---EXPECTF-- +--EXPECT-- extra ===DONE=== diff --git a/ext/phar/tests/phar_magic.phpt b/ext/phar/tests/phar_magic.phpt index f6a0a675ef0..c2b25685f18 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 $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 3c842fabeda..f651a525635 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 ca3abddfce6..0869828f8fe 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 d36c083dff3..b7a1c420f15 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 c650a3ceff7..cb17a601e4b 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 3f52227194f..f6bf3f23a01 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 55e7435f951..8a23e7de84a 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 af02012573e..4bd04dec375 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()); ---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 6d4c7328622..97c3cbb7caa 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()); ---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 d03d6f1a989..1a539ac803c 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()); ---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 0e167012b76..278137c6768 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()); ---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 d531393281b..9ed19966b37 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 19cf953197b..ef348563f16 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 48a58c0d097..23e7042fa47 100644 --- a/ext/phar/tests/pharfileinfo_destruct.phpt +++ b/ext/phar/tests/pharfileinfo_destruct.phpt @@ -21,5 +21,5 @@ unset($b); ===DONE=== --CLEAN-- ---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 29223e49e33..1054cb1f667 100644 --- a/ext/phar/tests/tar/033.phpt +++ b/ext/phar/tests/tar/033.phpt @@ -39,7 +39,7 @@ try { ---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 e8f0ecf0613..8620ca05207 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-- ---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 1bb336f96ca..11a36fd9300 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 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 7d6ea89fd05..93d515280af 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 0941bb6e614..3ff2346f67e 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-- ---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 d6b0a8f4cf4..7632bd03b37 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 47dddac4877..97b9e19d6e2 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)); ---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 cd94a97515b..5835a2e1efb 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 b57b7c0cac0..0f464a5b89e 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 ad3aa311ea2..93ac96fb718 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 62ed3c9ebd1..1f57690d235 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 729abc5f540..0bf8ed54805 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 ---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 204ebe8d073..7a185828f65 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 bcba3943857..b466bbb5c48 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 8e43e1a1528..dac4e475f27 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 da3751fea45..28958c6bc5e 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 b8e50bad4d1..6832abb9239 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 49e98ec8eb9..721ca3c4758 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 4806fcfb4d6..818ac73b9e4 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 986b0be62c8..8539e47e7a5 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 77505a64f7a..bf0c5f448de 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 a4ebe63395c..1bb485f40fe 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 76dff4e4c03..8164b1d44c2 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 efbf64a4b75..f11721a77e0 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 324614275ff..88c67c51414 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 a3ebc8cc5da..89f50853295 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 da999341e5d..8664b0dd10e 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 7290f07dc3c..472af330286 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 8a92ef627ef..348248607a0 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 b7eaa2103f7..6b0d0d78879 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 5d43921c60d..d91bfbafb11 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 cbd7319731e..3a51990cf61 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 2abdcdb57b5..a5c3ef13e1b 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 06db60b8ec8..e750682ab62 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 5f1e7a2faa9..ed6950fce3e 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 6e051113d5f..cbed1252fa2 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 9abdcc801a8..a9c0cd42252 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 e19db811881..d29436b734a 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 42136003e71..147d868c94f 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 328a7c3e697..8fa08869da6 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 158413f158f..e99d30840b9 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 6e6d4341c85..1c4cfc6106f 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 0ff2523d6ff..aa3af85c1e5 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 81614bd9f80..9a8e252cc70 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 fa4ee482b25..1c8d08175d2 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 88c4cd509ae..3101a7a6aea 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 d6dda7c2a39..e21656b7b25 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 2da09449ff2..8bf2841043d 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 6ebcfa99a9e..5b8c92010e8 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 2eaacb67f86..7d7e61335d9 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 94fcf00ece9..538a26c5a58 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 af43fcefa4f..5babb546ae4 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 a1464a5ab99..d82519e4f44 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 fab6387e05e..cafdd2e37c9 100644 --- a/ext/reflection/tests/ReflectionClass_toString_001.phpt +++ b/ext/reflection/tests/ReflectionClass_toString_001.phpt @@ -8,7 +8,7 @@ Steve Seear $rc = new ReflectionClass("ReflectionClass"); echo $rc; ?> ---EXPECTF-- +--EXPECT-- Class [ 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 0e2e8a3681f..eab542e005c 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 367de45fff5..ee44f24cdfc 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 786be050c17..e78a28a5516 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 7c36b8e63bc..ae546b40f37 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 7b37b939e41..f8d476ae462 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 d6d2c24b857..220c16f9cb1 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 c4889b12bc5..8bbbfa516fc 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 98125cba652..bb0543d098a 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 c97c41c738b..c7d63446e58 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 4719571124f..94fbc3daec7 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 3d151bc7d5f..7f9bc1f35c9 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 6479ec90ed7..8a56c9f64eb 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 ef605aad843..48778f83c2f 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 4b8a6ec221c..c362704b1cf 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 066bca70ee5..60a95dc8868 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 e89066a7eaa..59832c2d026 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 4cb08fcb671..390df504db1 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 942bea2dc23..da08cc62881 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 8bdbc6ad868..aa0bc0aa7cc 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 6c154558e91..654a76aae06 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 d61480377c5..65339e308a1 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 38137551fce..4c99444e30b 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 3b486a60fde..ccb87254663 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 2735a741e2d..bc1f6c7e864 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 18a49046dc7..f919b7424a7 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 68781d2aba1..09a309e67c3 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 1ed675f029e..79d2d8352e3 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 8a7a6044e1b..20fdb68dddd 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 bb93b91280c..ea3e3967ca9 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 f8c0a0a2bce..31aa7c94e38 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 a5ddd4096cf..731e25996f8 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 [ array $x = Array ] diff --git a/ext/reflection/tests/bug60367.phpt b/ext/reflection/tests/bug60367.phpt index 5c4a0989797..3834445733b 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 8c4059abf4d..ed83e486d8e 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 6cc7e6755cd..c79f20f79c1 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 e8b080f5cbb..65eb5c86f7f 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 4483dc06e3c..6e8dc71fcb0 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 1b8e1c4d0af..c67d9571e1b 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 807aea1f385..a09447bc052 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 218c629cdbf..204c5e0e154 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 3dbf859523e..3a95c9f8f6f 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 56b235af55f..064f29a0d2d 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 38a3796b686..f6f641d94eb 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 2780d7b7e2c..b0ed3a1a17b 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 80941828c87..06711727cfa 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 03a9ae74d9a..3e377f35b53 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 7dc54638795..fcf5e59b602 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 c75cb88d1c4..3ceb3e299ef 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 09bfa203ef6..6329d292264 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 588b1fecfb6..40032088fe8 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 b692bce2c5a..388befdaf3b 100644 --- a/ext/session/tests/bug71974.phpt +++ b/ext/session/tests/bug71974.phpt @@ -17,7 +17,7 @@ ob_start(); session_start() ?> abc ---EXPECTF-- +--EXPECT-- abc diff --git a/ext/session/tests/bug72940.phpt b/ext/session/tests/bug72940.phpt index 4d53bc098e2..d8f8c35bf45 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 5a0eda71f7f..fdd6054f8a2 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 b9736a912b8..b5a12ae4c19 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 71664859379..6da766cd864 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 9d0ba27fea1..8c5f2692eec 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 f17f4711a90..20835e6365f 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 c243c1f1156..8e107956d43 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 559a89143c1..bfc2f684273 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 c72d3ba9270..f032ad469ea 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 a58a5624834..ab045e00fae 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 9bde83ce0a4..4d1107281eb 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 ed4618a04e4..9442faf2381 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 fb3ea73058d..9a6b929ca24 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 f8aa24305ae..07144aa4f53 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 dd88438e151..9afb0a38e06 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 b2d06b1abb3..dc37e089dc7 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 1a9b6879008..8343ab9c946 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 81642754f09..ee9f892bf0c 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 c72c65bac9b..40f49a46a49 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 41c79c3e512..a5b147e5043 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 47b2441b302..3cdbbfe707e 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 89af6ebb21c..bf6b0307d8c 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 d7639fadb17..b4854552aad 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 04cfe4439db..a7ffb364be7 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 5d328550eae..ca4d330e677 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 bb921a56b17..6d5f816cdea 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 852d2f9578e..32a9679e20d 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 e6404eb70e5..aeb0fe38a00 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 3fd42e46d72..595bc5c3c50 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 8c3a9bbcd16..50cefe28120 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 84bfeba7401..536a9d31a59 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 1fb7f8fe870..a2ddc7af34b 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 7fa3657694a..2be99e2adda 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 ba689cef02c..a96367c13ad 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 3bef51be4ff..146984175eb 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 1f2a8b9e6a0..fb1673e0cec 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 6c9b29e3ec6..1cc6454d5ed 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 42895493a7b..76f21f4bca8 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 bbc987e3c84..edcadbf7bb0 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 56471cc7f33..639527a63f7 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 be079f33503..33101b5147a 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 d1f7e2f3865..f58514aa108 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 c4d1f2192db..9a16a2fc0e4 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 2e4d3bf5e86..7a19a5e93df 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 5c1fc2c701f..c01128031d7 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 5b32f5c2662..481f4876eaf 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 53452b45b94..e5a87370c3b 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 ac4f843caed..eb3bfc104ba 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 249b5730dfd..a8f5457f245 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 f1a7cb59d91..a6d78cf1343 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 b9e3bbb0dc9..955410a5eeb 100644 --- a/ext/simplexml/tests/025.phpt +++ b/ext/simplexml/tests/025.phpt @@ -48,7 +48,7 @@ var_dump($sxe->getDocNamespaces()); ?> ===DONE=== ---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 d6de94be3d1..7b6ca54183d 100644 --- a/ext/simplexml/tests/026.phpt +++ b/ext/simplexml/tests/026.phpt @@ -32,7 +32,7 @@ traverse_xml($people); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Jane diff --git a/ext/simplexml/tests/028.phpt b/ext/simplexml/tests/028.phpt index 753056b9ad8..9adb923ddc2 100644 --- a/ext/simplexml/tests/028.phpt +++ b/ext/simplexml/tests/028.phpt @@ -32,7 +32,7 @@ traverse_xml($people); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- diff --git a/ext/simplexml/tests/029.phpt b/ext/simplexml/tests/029.phpt index 86a4f308e3d..117e6b79395 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 48bc887ecc1..55e2bc186d6 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 f5d92b142bc..3d52a60a0c2 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 15c81b2a9a4..fc918798a52 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 52d1341ae5a..77abe3301dc 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 080a510837a..10bae9ca104 100644 --- a/ext/simplexml/tests/bug35785.phpt +++ b/ext/simplexml/tests/bug35785.phpt @@ -18,7 +18,7 @@ echo $xml->asXML(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- FooBar bool(false) diff --git a/ext/simplexml/tests/bug37386.phpt b/ext/simplexml/tests/bug37386.phpt index 06b69c4705a..92e8cef48bc 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-- node1node2 diff --git a/ext/simplexml/tests/bug37565.phpt b/ext/simplexml/tests/bug37565.phpt index 24500d09b1f..0af93deaf32 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 d2fcde11c2e..04ed8f28230 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) " Item Two diff --git a/ext/simplexml/tests/bug44478.phpt b/ext/simplexml/tests/bug44478.phpt index 17a26f949b9..377754f792e 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 b355c48696f..66344985563 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 712675c097a..e21a4ce7421 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 0438154823f..61b6316e6d5 100644 --- a/ext/simplexml/tests/bug46047.phpt +++ b/ext/simplexml/tests/bug46047.phpt @@ -15,7 +15,7 @@ $xml = new SimpleXMLElement(''); 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 0b81facf491..20d6060a365 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 25ea5343768..c1489ed375a 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 8dc6481f5dc..1442a0ed476 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 ac4bcd8bf7f..15b9a53aae4 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 302f351c10c..2ce1ca34880 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 8e2b92f2e8c..11938f355f4 100644 --- a/ext/snmp/tests/reflection.phpt +++ b/ext/snmp/tests/reflection.phpt @@ -21,7 +21,7 @@ reflection::export(new reflectionmethod('snmp', 'getError')); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Method [ public method __construct ] { - Parameters [5] { diff --git a/ext/soap/tests/bug68996.phpt b/ext/soap/tests/bug68996.phpt index e503d802395..5168e1fcfc6 100644 --- a/ext/soap/tests/bug68996.phpt +++ b/ext/soap/tests/bug68996.phpt @@ -38,7 +38,7 @@ $HTTP_RAW_POST_DATA = <<handle($HTTP_RAW_POST_DATA); ?> ---EXPECTF-- +--EXPECT-- some msg diff --git a/ext/sockets/tests/bug49341.phpt b/ext/sockets/tests/bug49341.phpt index 961b5e7bc8c..a73c4c1c632 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-- 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 816e5c11bb4..4c89dc42385 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 5a9275a26b1..e8499e021c1 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 7ea2df8e1c2..28cf36c3225 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 34d46d6f6f5..490bb7319ad 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 969a79eb2af..a11e0d77326 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 0f2311b9842..3f53dfc5a2a 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 4c446c82b9f..d2c75f7f09d 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 d4f22f68a1b..520f65e9cbd 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 7398d4b9d26..a35a524f359 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 0c75bf4c003..81ab6c09216 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 a1092c2fea1..709510d7cf6 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 b94b067f4d8..fa38d934254 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 396f89b491e..b14c9ab0132 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 0399b4948dd..fc8c4b7dcd9 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 b47b6bb4d06..72597ef12d1 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 d2799356370..fcfafefdb45 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 9ee2c6ee519..5e2a1108796 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); ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/spl/tests/SplFileInfo_getOwner_basic.phpt b/ext/spl/tests/SplFileInfo_getOwner_basic.phpt index 3df8e4858b1..97932b10ad4 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 af099076055..f6eb4104fec 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); ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/spl/tests/SplFileInfo_setInfoClass_error.phpt b/ext/spl/tests/SplFileInfo_setInfoClass_error.phpt index aa884b30a0b..a280a6e1474 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 2d8a9c80444..e4ea7fe8f12 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 84b54036986..28901050d30 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()); ---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 a8125a02571..585e0b6e39a 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('|')); ---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 efe765cbf84..32527a92388 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(',', '"')); ---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 960f36d63f6..f6a68ff1fae 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(',', '"', '"')); ---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 69089636c11..9614f91d414 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()); ---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 57832e7c30f..89983c377e4 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 3b1543d4dcf..4685c20b297 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 c10edbddc25..bfec39de32b 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 d8daca9a33d..af9f5f3ee81 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 c65686c61de..7e764858854 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 e179dbc8ece..c3f79c6882b 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 617f85e63c8..bc9f78a1ca3 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 172a1d97a49..5ad1d9258a7 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 d70105e034d..342a6b8bb24 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 b2e640c7acd..2692b2c48d3 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 ---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 338aa4b0b04..37b00991ffa 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 2ef1b2cd1a6..765635f5307 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 ---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 9fe5892113d..0984acccbf9 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 ---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 f192ccab455..a14166c35e3 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 1c7ec36363b..58ba46061bc 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 f0e1107d513..aaf38ac499c 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 35ba83d09f3..ec01f57e34b 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 d481d0c4ed6..7c506e12140 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 dd4abf3ffb6..67876330f55 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 932eaed712e..dccd26492f2 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 f7ac89442ed..53afecb58f4 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 b078c51ab2d..b9445d41193 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 f7d56eaf885..651c240303d 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 b23c1962244..2b67093da2a 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 1464e737614..cd1020c0cb7 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 023086d83a5..78f0adbdd12 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 62ad2ed4820..c959fb88e2b 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 1b4fd60f559..d23e819f1d5 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 1953643c84f..e20e9918d7b 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 203edb6fb85..6e447b6a63a 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 d7306c9c88c..74e3d65089f 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 1581589e43a..825c4d747cc 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 d019fc44008..ec699eb67d7 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 de4ce30f91f..204387da040 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=== ---EXPECTF-- +--EXPECT-- test Object ( [pub] => public diff --git a/ext/spl/tests/array_004.phpt b/ext/spl/tests/array_004.phpt index 0b80e5c89f2..c976bdd87b8 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 49f2838f777..2735432e267 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=== ---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 7d9bf6afc1c..edf2a922d6e 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=== ---EXPECTF-- +--EXPECT-- test Object ( [pub] => public diff --git a/ext/spl/tests/array_008.phpt b/ext/spl/tests/array_008.phpt index e7a618dda5e..01b2290e506 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=== ---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 1ac9d4f956a..4bf0b83c9c0 100644 --- a/ext/spl/tests/array_014.phpt +++ b/ext/spl/tests/array_014.phpt @@ -39,7 +39,7 @@ foreach($it as $v) ?> ===DONE=== ---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 8637c5c886a..0a6edea01cf 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=== ---EXPECTF-- +--EXPECT-- int(0) int(1) int(2) diff --git a/ext/spl/tests/array_018.phpt b/ext/spl/tests/array_018.phpt index 7c68a6280e6..9d20ae47a9e 100644 Binary files a/ext/spl/tests/array_018.phpt and b/ext/spl/tests/array_018.phpt differ diff --git a/ext/spl/tests/array_020.phpt b/ext/spl/tests/array_020.phpt index 4c6fe0df251..3258c7f16c0 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=== ---EXPECTF-- +--EXPECT-- ArrayIteratorEx::rewind ArrayIteratorEx::valid ArrayIteratorEx::current diff --git a/ext/spl/tests/bug31346.phpt b/ext/spl/tests/bug31346.phpt index e3bf51f57fb..b2d29905ac7 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 e66fa4d6ed5..188d2fba819 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 17439b49732..95a3da83cc5 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 ?> ===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 3cf3d8780c0..11fe80817ce 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 5c52763cd69..4b3e4675cc3 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 1fd3d199dc4..0b9aa82bc30 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 b3c4aa51bff..0c4ab93ff34 100644 --- a/ext/spl/tests/bug45216.phpt +++ b/ext/spl/tests/bug45216.phpt @@ -17,6 +17,6 @@ var_dump(fgetss($handle)); ---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 e32262a743f..8672f86eea2 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 54587fae1da..8817da0f1e4 100644 --- a/ext/spl/tests/bug52573.phpt +++ b/ext/spl/tests/bug52573.phpt @@ -9,7 +9,7 @@ var_dump($f->fscanf('fscanf(' ---EXPECTF-- +--EXPECT-- int(1) string(4) "test" array(1) { diff --git a/ext/spl/tests/bug53071.phpt b/ext/spl/tests/bug53071.phpt index a2983ed2b2f..ca394f54344 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 7cf179b3eb1..8fb86e8204d 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 70ba6e2036a..7ae74ce5597 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 288f49a4ecf..ffbbcc3220a 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 03dbbe346b6..fa8291228c0 100644 --- a/ext/spl/tests/bug61527.phpt +++ b/ext/spl/tests/bug61527.phpt @@ -64,7 +64,7 @@ var_dump($ai4->getChildren()); ?> ==DONE== ---EXPECTF-- +--EXPECT-- NULL NULL int(4) diff --git a/ext/spl/tests/bug61697.phpt b/ext/spl/tests/bug61697.phpt index 8cd38289efd..458bba66638 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 4e4be94491e..6fc17828ba9 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 d0d6a62451a..d2557622546 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 8ce0d7bc791..9a31cc5e945 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 e7b695bd82f..e02fb775c4a 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 fedfc869a81..3e4df51abe5 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 e2e61133f31..e97a403717f 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 b6f3848c36a..33d95f04c78 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 ba07b3da921..1f64f0fcac8 100644 --- a/ext/spl/tests/bug67805.phpt +++ b/ext/spl/tests/bug67805.phpt @@ -10,6 +10,6 @@ $line = $splFileObject->getCurrentLine(); var_dump($line === ' ---EXPECTF-- +--EXPECT-- bool(true) bool(true) diff --git a/ext/spl/tests/bug68479.phpt b/ext/spl/tests/bug68479.phpt index e4e7976a9bf..031857e7748 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 c1ac95257b1..ff58c7a046e 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 41f03efcb01..3b065b64738 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 d3dd76354a2..a253927d1db 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 3fd500736d7..541807ae16f 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 a379f8005e4..8789e91df2b 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 5b6587c6852..29b9dfc0614 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 2f03a3b031c..eafdb845411 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 4ffc2921e0c..507ed49f0ed 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 4ad0e4b772c..d9f19122839 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 52a335172fb..9278a115a3e 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 e27f23ca44a..4a18cf2322e 100644 --- a/ext/spl/tests/dllist_001.phpt +++ b/ext/spl/tests/dllist_001.phpt @@ -48,7 +48,7 @@ echo count($dll)."\n"; ?> ===DONE=== ---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 e956de60fd7..e1287718ded 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=== ---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 9a9556840fa..53dd7cb7524 100644 --- a/ext/spl/tests/dllist_003.phpt +++ b/ext/spl/tests/dllist_003.phpt @@ -28,7 +28,7 @@ var_dump($dll->count()); ?> ===DONE=== ---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 44d9611fca0..0a74d598921 100644 --- a/ext/spl/tests/dllist_004.phpt +++ b/ext/spl/tests/dllist_004.phpt @@ -46,7 +46,7 @@ echo count($stack)."\n"; ?> ===DONE=== ---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 33161ba17d0..2e2058f76a5 100644 --- a/ext/spl/tests/dllist_005.phpt +++ b/ext/spl/tests/dllist_005.phpt @@ -46,7 +46,7 @@ echo count($queue)."\n"; ?> ===DONE=== ---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 b4055dcb9ca..d5590642ea6 100644 --- a/ext/spl/tests/dllist_006.phpt +++ b/ext/spl/tests/dllist_006.phpt @@ -47,7 +47,7 @@ try { ?> ===DONE=== ---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 38f801fde78..d15e064ac4e 100644 --- a/ext/spl/tests/dllist_007.phpt +++ b/ext/spl/tests/dllist_007.phpt @@ -14,7 +14,7 @@ while ($a->valid()) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- int(1) NULL int(2) diff --git a/ext/spl/tests/dllist_013.phpt b/ext/spl/tests/dllist_013.phpt index b60f0639249..b9a4ef7648f 100644 --- a/ext/spl/tests/dllist_013.phpt +++ b/ext/spl/tests/dllist_013.phpt @@ -32,7 +32,7 @@ echo $dll->pop()."\n"; ?> ===DONE=== ---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 9bae68bf2ef..a52d2887d01 100644 --- a/ext/spl/tests/dllist_memleak.phpt +++ b/ext/spl/tests/dllist_memleak.phpt @@ -18,7 +18,7 @@ echo $dll->current()."\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- 1 3 ===DONE=== diff --git a/ext/spl/tests/fixedarray_001.phpt b/ext/spl/tests/fixedarray_001.phpt index 8276333e103..c85d9e8dccd 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 2521516c146..ade6b7decf2 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 69cec7528ec..33043a80e3a 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 cb62e0c2c9a..fb32c2fd52a 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 4d2624528b2..185b9d1acc7 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 9468d9626c3..a25e1dc6695 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 da4dde8ad2e..f9cfd68710c 100644 --- a/ext/spl/tests/heap_001.phpt +++ b/ext/spl/tests/heap_001.phpt @@ -38,7 +38,7 @@ echo $h2->extract()."\n"; ?> ===DONE=== ---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 387510f766b..578d15b21c0 100644 --- a/ext/spl/tests/heap_002.phpt +++ b/ext/spl/tests/heap_002.phpt @@ -36,7 +36,7 @@ echo $h->extract()."\n"; ?> ===DONE=== ---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 87f95e9a2b1..4a4bcff5ff8 100644 --- a/ext/spl/tests/heap_003.phpt +++ b/ext/spl/tests/heap_003.phpt @@ -29,7 +29,7 @@ foreach ($h as $out) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- 10 9 8 diff --git a/ext/spl/tests/heap_004.phpt b/ext/spl/tests/heap_004.phpt index 7b00ebfbff8..e493d20fac9 100644 --- a/ext/spl/tests/heap_004.phpt +++ b/ext/spl/tests/heap_004.phpt @@ -55,7 +55,7 @@ try { ?> ===DONE=== ---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 1291cda7706..8621f09aa45 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=== ---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 3218bdfb16e..41c7b846387 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=== ---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 e8d5c9997cf..27bd66edf1d 100644 --- a/ext/spl/tests/heap_007.phpt +++ b/ext/spl/tests/heap_007.phpt @@ -22,7 +22,7 @@ while ($h->valid()) { ?> ===DONE=== ---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 178f5462e40..3a746b2e6f5 100644 --- a/ext/spl/tests/heap_008.phpt +++ b/ext/spl/tests/heap_008.phpt @@ -13,7 +13,7 @@ var_dump($h); ?> ===DONE=== ---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 cd6a8d0ad95..4d6bdd593aa 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 7a91a9c0006..c2ea2bcd951 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 640ca9f9c29..cacf006c5a4 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=== ---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 39d1000f62d..b8013d7311e 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=== $key) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===EmptyIterator=== ===InfiniteIterator=== 2=>C diff --git a/ext/spl/tests/iterator_012.phpt b/ext/spl/tests/iterator_012.phpt index 81bc02f69c1..63a3fce8bf4 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=== ---EXPECTF-- +--EXPECT-- ===Current=== 0=>A ===Next=== diff --git a/ext/spl/tests/iterator_013.phpt b/ext/spl/tests/iterator_013.phpt index 119631c0003..6da31e391d9 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=== ---EXPECTF-- +--EXPECT-- ===Empty=== ===Append=== 0=>A diff --git a/ext/spl/tests/iterator_015.phpt b/ext/spl/tests/iterator_015.phpt index aa30f79e1f6..bce00ae4d56 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=== ---EXPECTF-- +--EXPECT--