diff options
| author | Gabriel Caruso <carusogabriel34@gmail.com> | 2018-02-19 05:59:41 -0300 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-02-20 21:53:48 +0100 |
| commit | ded3d984c6133b1f508ed84e96df3316e207c99b (patch) | |
| tree | 175c208197d72966fbeb22c1df9dac0a1a33124f /Zend | |
| parent | a00286921e8963d284a7a5db0c1fecffa6cb6b54 (diff) | |
| download | php-git-ded3d984c6133b1f508ed84e96df3316e207c99b.tar.gz | |
Use EXPECT instead of EXPECTF when possible
EXPECTF logic in run-tests.php is considerable, so let's avoid it.
Diffstat (limited to 'Zend')
228 files changed, 228 insertions, 228 deletions
diff --git a/Zend/tests/010.phpt b/Zend/tests/010.phpt index 45e1832914..8f5fa5a052 100644 --- a/Zend/tests/010.phpt +++ b/Zend/tests/010.phpt @@ -41,7 +41,7 @@ var_dump(get_parent_class(1)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) string(3) "foo" diff --git a/Zend/tests/ErrorException_getSeverity.phpt b/Zend/tests/ErrorException_getSeverity.phpt index 6ad8af109d..c3d171c2d2 100644 --- a/Zend/tests/ErrorException_getSeverity.phpt +++ b/Zend/tests/ErrorException_getSeverity.phpt @@ -862,7 +862,7 @@ try { } ?> ---EXPECTF-- +--EXPECT-- This exception severity is: 1bool(true) bool(true) bool(true) diff --git a/Zend/tests/abstract-static.phpt b/Zend/tests/abstract-static.phpt index bf7ed391ed..1742d4b408 100644 --- a/Zend/tests/abstract-static.phpt +++ b/Zend/tests/abstract-static.phpt @@ -8,6 +8,6 @@ abstract class TestClass } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== diff --git a/Zend/tests/access_modifiers_011.phpt b/Zend/tests/access_modifiers_011.phpt index 4ed154f6f6..b79f060f4f 100644 --- a/Zend/tests/access_modifiers_011.phpt +++ b/Zend/tests/access_modifiers_011.phpt @@ -32,7 +32,7 @@ echo $a->func1(),"\n"; echo $a->func2(),"\n"; ?> ---EXPECTF-- +--EXPECT-- var1 value var2 value in func1 diff --git a/Zend/tests/access_modifiers_012.phpt b/Zend/tests/access_modifiers_012.phpt index ac4d72ce1d..86f678634b 100644 --- a/Zend/tests/access_modifiers_012.phpt +++ b/Zend/tests/access_modifiers_012.phpt @@ -15,7 +15,7 @@ call_user_func(array($c, 'none')); call_user_func(array($c, 'prot')); call_user_func(array($c, 'priv')); ?> ---EXPECTF-- +--EXPECT-- In __call() for method none() In __call() for method prot() In __call() for method priv() diff --git a/Zend/tests/add_001.phpt b/Zend/tests/add_001.phpt index 8d12aea11d..315d1e86e2 100644 --- a/Zend/tests/add_001.phpt +++ b/Zend/tests/add_001.phpt @@ -29,7 +29,7 @@ var_dump($c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(3) { [0]=> int(1) diff --git a/Zend/tests/add_005.phpt b/Zend/tests/add_005.phpt index 7e9bc25d8f..24b08fbf8e 100644 --- a/Zend/tests/add_005.phpt +++ b/Zend/tests/add_005.phpt @@ -16,7 +16,7 @@ var_dump($c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- float(2834756759.1231) float(2834756759.1231) Done diff --git a/Zend/tests/and_001.phpt b/Zend/tests/and_001.phpt index 109b2ce995..cf879c0086 100644 --- a/Zend/tests/and_001.phpt +++ b/Zend/tests/and_001.phpt @@ -30,7 +30,7 @@ var_dump($s); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(3) "020" string(4) "pead" string(4) "pead" diff --git a/Zend/tests/anon/002.phpt b/Zend/tests/anon/002.phpt index 1cbaf81a9f..fdb8915267 100644 --- a/Zend/tests/anon/002.phpt +++ b/Zend/tests/anon/002.phpt @@ -15,7 +15,7 @@ $a = new class extends A implements B { }; var_dump($a instanceof A, $a instanceof B); ---EXPECTF-- +--EXPECT-- bool(true) bool(true) diff --git a/Zend/tests/anon/013.phpt b/Zend/tests/anon/013.phpt index 72ba3d61b7..b66be660d7 100644 --- a/Zend/tests/anon/013.phpt +++ b/Zend/tests/anon/013.phpt @@ -10,6 +10,6 @@ $foo = function() { $closure = Closure::bind($foo, $class, $class); var_dump($closure()); ?> ---EXPECTF-- +--EXPECT-- object(class@anonymous)#1 (0) { } diff --git a/Zend/tests/anon/014.phpt b/Zend/tests/anon/014.phpt index cacac47857..195a6054b2 100644 --- a/Zend/tests/anon/014.phpt +++ b/Zend/tests/anon/014.phpt @@ -12,5 +12,5 @@ $class = new class() { }; var_dump($class->run()); ?> ---EXPECTF-- +--EXPECT-- string(10) "Running..." diff --git a/Zend/tests/arg_unpack/by_ref.phpt b/Zend/tests/arg_unpack/by_ref.phpt index 7c8a86be48..66685a78d9 100644 --- a/Zend/tests/arg_unpack/by_ref.phpt +++ b/Zend/tests/arg_unpack/by_ref.phpt @@ -50,7 +50,7 @@ test2($a, $b, $c, $d, ...$array); var_dump($a, $b, $c, $d, $array); ?> ---EXPECTF-- +--EXPECT-- array(3) { [0]=> int(2) diff --git a/Zend/tests/arg_unpack/string_keys.phpt b/Zend/tests/arg_unpack/string_keys.phpt index e448a417f6..c2913db5b4 100644 --- a/Zend/tests/arg_unpack/string_keys.phpt +++ b/Zend/tests/arg_unpack/string_keys.phpt @@ -19,6 +19,6 @@ try { } ?> ---EXPECTF-- +--EXPECT-- string(36) "Cannot unpack array with string keys" string(42) "Cannot unpack Traversable with string keys" diff --git a/Zend/tests/argument_restriction_004.phpt b/Zend/tests/argument_restriction_004.phpt index 599b3e1604..379ea9b3e9 100644 --- a/Zend/tests/argument_restriction_004.phpt +++ b/Zend/tests/argument_restriction_004.phpt @@ -14,4 +14,4 @@ class Sub extends Base { } } ?> ---EXPECTF-- +--EXPECT-- diff --git a/Zend/tests/assert/expect_001.phpt b/Zend/tests/assert/expect_001.phpt index 667c55b4fc..73c685d2c8 100644 --- a/Zend/tests/assert/expect_001.phpt +++ b/Zend/tests/assert/expect_001.phpt @@ -8,5 +8,5 @@ assert.exception=1 assert(true); var_dump(true); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/Zend/tests/assert/expect_019.phpt b/Zend/tests/assert/expect_019.phpt index 38e9a39c33..97dd6ce86c 100644 --- a/Zend/tests/assert/expect_019.phpt +++ b/Zend/tests/assert/expect_019.phpt @@ -12,7 +12,7 @@ var_dump(\assert(true)); var_dump(assert(false)); var_dump(assert(true)); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/Zend/tests/assign_to_var_001.phpt b/Zend/tests/assign_to_var_001.phpt index d37ebbcbd8..17187abe64 100644 --- a/Zend/tests/assign_to_var_001.phpt +++ b/Zend/tests/assign_to_var_001.phpt @@ -12,7 +12,7 @@ var_dump($var1); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(2) int(2) Done diff --git a/Zend/tests/assign_to_var_002.phpt b/Zend/tests/assign_to_var_002.phpt index e682765e53..ddee1b92de 100644 --- a/Zend/tests/assign_to_var_002.phpt +++ b/Zend/tests/assign_to_var_002.phpt @@ -12,7 +12,7 @@ var_dump($var1); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(1) "g" string(1) "g" Done diff --git a/Zend/tests/assign_to_var_003.phpt b/Zend/tests/assign_to_var_003.phpt index 911ee0bb8e..1fcd41a7f1 100644 --- a/Zend/tests/assign_to_var_003.phpt +++ b/Zend/tests/assign_to_var_003.phpt @@ -12,7 +12,7 @@ var_dump($var1); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- NULL NULL Done diff --git a/Zend/tests/assign_to_var_004.phpt b/Zend/tests/assign_to_var_004.phpt index 787362acc4..a12c5aaa4a 100644 --- a/Zend/tests/assign_to_var_004.phpt +++ b/Zend/tests/assign_to_var_004.phpt @@ -15,7 +15,7 @@ var_dump($var2); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(5) "space" string(5) "space" string(5) "space" diff --git a/Zend/tests/bug22836.phpt b/Zend/tests/bug22836.phpt index 205fd1c696..8141f178c6 100644 --- a/Zend/tests/bug22836.phpt +++ b/Zend/tests/bug22836.phpt @@ -13,7 +13,7 @@ for ($i = 0; $i < 8; $i++) { $h =& f(); } ?> ---EXPECTF-- +--EXPECT-- string(3) "foo" 'foo' string(3) "foo" diff --git a/Zend/tests/bug26229.phpt b/Zend/tests/bug26229.phpt index 347eb55571..b3a237016f 100644 --- a/Zend/tests/bug26229.phpt +++ b/Zend/tests/bug26229.phpt @@ -24,6 +24,6 @@ catch(Exception $e) } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Objects returned by array_iterator::getIterator() must be traversable or implement interface Iterator ===DONE=== diff --git a/Zend/tests/bug26697.phpt b/Zend/tests/bug26697.phpt index 8dda17028a..fe269c0364 100644 --- a/Zend/tests/bug26697.phpt +++ b/Zend/tests/bug26697.phpt @@ -13,7 +13,7 @@ var_dump(class_exists('NotExistingClass')); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- {closure}(NotExistingClass) bool(false) {closure}(NotExistingClass), done diff --git a/Zend/tests/bug28442.phpt b/Zend/tests/bug28442.phpt index 1237357cca..36a6fc6ab9 100644 --- a/Zend/tests/bug28442.phpt +++ b/Zend/tests/bug28442.phpt @@ -45,7 +45,7 @@ var_dump(ClassC::$prop); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===INIT=== string(1) "A" string(1) "C" diff --git a/Zend/tests/bug29210.phpt b/Zend/tests/bug29210.phpt index 3bae8064b9..db3a67bee6 100644 --- a/Zend/tests/bug29210.phpt +++ b/Zend/tests/bug29210.phpt @@ -89,7 +89,7 @@ if (is_callable(array('test_class','test_func4'))) { $object = new foo(); $object->test(); ?> ---EXPECTF-- +--EXPECT-- test_func1 test_func2 test_func3 diff --git a/Zend/tests/bug29368.phpt b/Zend/tests/bug29368.phpt index c16399abbc..1987fa9b45 100644 --- a/Zend/tests/bug29368.phpt +++ b/Zend/tests/bug29368.phpt @@ -28,7 +28,7 @@ unset($bar); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Foo::__construct Caught exception! ===DONE=== diff --git a/Zend/tests/bug32290.phpt b/Zend/tests/bug32290.phpt index 89da67b195..e73bca12ac 100644 --- a/Zend/tests/bug32290.phpt +++ b/Zend/tests/bug32290.phpt @@ -96,7 +96,7 @@ var_dump($x->doSomethingStatic(1)); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- ===A=== TestB::doSomething(1) TestA::doSomething(2) diff --git a/Zend/tests/bug33771.phpt b/Zend/tests/bug33771.phpt index 72d953c9fa..f1b42ce7c8 100644 --- a/Zend/tests/bug33771.phpt +++ b/Zend/tests/bug33771.phpt @@ -33,7 +33,7 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(32767) int(32767) int(30719) diff --git a/Zend/tests/bug40815.phpt b/Zend/tests/bug40815.phpt index 6f7477a9eb..5ca5fd8368 100644 --- a/Zend/tests/bug40815.phpt +++ b/Zend/tests/bug40815.phpt @@ -14,5 +14,5 @@ set_exception_handler("ehandle::exh"); throw new Exception ("Whiii"); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- foo diff --git a/Zend/tests/bug41026.phpt b/Zend/tests/bug41026.phpt index 7caac215e0..f9ad1cec4e 100644 --- a/Zend/tests/bug41026.phpt +++ b/Zend/tests/bug41026.phpt @@ -20,7 +20,7 @@ try_class::main (); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done Warning: (Registered shutdown functions) Unable to call self::on_shutdown() - function does not exist in Unknown on line 0 diff --git a/Zend/tests/bug41075.phpt b/Zend/tests/bug41075.phpt index 0751cbd690..3ce2ad6514 100644 --- a/Zend/tests/bug41075.phpt +++ b/Zend/tests/bug41075.phpt @@ -26,6 +26,6 @@ try { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(40) "Creating default object from empty value" Done diff --git a/Zend/tests/bug43027.phpt b/Zend/tests/bug43027.phpt index adecf3e39a..2cf2d1d6a5 100644 --- a/Zend/tests/bug43027.phpt +++ b/Zend/tests/bug43027.phpt @@ -6,5 +6,5 @@ declare(ticks=1); namespace test; echo "ok\n"; ?> ---EXPECTF-- +--EXPECT-- ok diff --git a/Zend/tests/bug43200_2.phpt b/Zend/tests/bug43200_2.phpt index 3c8a98bddc..8926173aee 100644 --- a/Zend/tests/bug43200_2.phpt +++ b/Zend/tests/bug43200_2.phpt @@ -21,5 +21,5 @@ $o = new C(); $o->foo(); ?> ---EXPECTF-- +--EXPECT-- works diff --git a/Zend/tests/bug46196.phpt b/Zend/tests/bug46196.phpt index 7526d802ab..d4e62779e9 100644 --- a/Zend/tests/bug46196.phpt +++ b/Zend/tests/bug46196.phpt @@ -23,7 +23,7 @@ function myErrorHandler($errno, $errstr, $errfile, $errline) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing restore_error_handler() : error bug #46196 *** NULL bool(true) diff --git a/Zend/tests/bug46811.phpt b/Zend/tests/bug46811.phpt index fe41bffff6..06e10d78fa 100644 --- a/Zend/tests/bug46811.phpt +++ b/Zend/tests/bug46811.phpt @@ -7,7 +7,7 @@ arg_separator.output=& var_dump(ini_set("arg_separator.output", "")); var_dump(ini_get("arg_separator.output")); ?> ---EXPECTF-- +--EXPECT-- bool(false) string(1) "&" diff --git a/Zend/tests/bug47353.phpt b/Zend/tests/bug47353.phpt index 4196fc77f3..aafce9b944 100644 --- a/Zend/tests/bug47353.phpt +++ b/Zend/tests/bug47353.phpt @@ -22,5 +22,5 @@ $a = new A(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/Zend/tests/bug47981.phpt b/Zend/tests/bug47981.phpt index c0fd69abf9..fba320bb13 100644 --- a/Zend/tests/bug47981.phpt +++ b/Zend/tests/bug47981.phpt @@ -13,5 +13,5 @@ interface a{} class b implements a { function f($a=1) {}} class c extends b {function f() {}} ?> ---EXPECTF-- +--EXPECT-- string(60) "Declaration of c::f() should be compatible with b::f($a = 1)" diff --git a/Zend/tests/bug48215.phpt b/Zend/tests/bug48215.phpt index 2e156ad7f3..4582057d98 100644 --- a/Zend/tests/bug48215.phpt +++ b/Zend/tests/bug48215.phpt @@ -28,7 +28,7 @@ $b = new B(); $b->A(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- B::__construct A::__construct B::A diff --git a/Zend/tests/bug48770.phpt b/Zend/tests/bug48770.phpt index 067e892e66..a69838aa6d 100644 --- a/Zend/tests/bug48770.phpt +++ b/Zend/tests/bug48770.phpt @@ -49,5 +49,5 @@ $c = new C; $c->func('This should work!'); ?> ---EXPECTF-- +--EXPECT-- string(26) "A::func: This should work!" diff --git a/Zend/tests/bug53632.phpt b/Zend/tests/bug53632.phpt index 9a6dade9e1..74dfb5c5a3 100644 --- a/Zend/tests/bug53632.phpt +++ b/Zend/tests/bug53632.phpt @@ -6,5 +6,5 @@ $d = 2.2250738585072011e-308; echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/Zend/tests/bug53748.phpt b/Zend/tests/bug53748.phpt index 2f171fe455..77944ca198 100644 --- a/Zend/tests/bug53748.phpt +++ b/Zend/tests/bug53748.phpt @@ -30,7 +30,7 @@ $o= myHelloWorld::getInstance(array(1=>2)); $o= myHelloWorld::getInstance(array(1=>2)); ?> ---EXPECTF-- +--EXPECT-- int(1) int(2) array(1) { diff --git a/Zend/tests/bug54624.phpt b/Zend/tests/bug54624.phpt index 1d0c1ce87c..66239120a4 100644 --- a/Zend/tests/bug54624.phpt +++ b/Zend/tests/bug54624.phpt @@ -22,5 +22,5 @@ eval(' echo "DONE\n"; ?> ---EXPECTF-- +--EXPECT-- DONE diff --git a/Zend/tests/bug55156.phpt b/Zend/tests/bug55156.phpt index 137a43fcaa..fcd602cacf 100644 --- a/Zend/tests/bug55156.phpt +++ b/Zend/tests/bug55156.phpt @@ -26,7 +26,7 @@ namespace foo { } ?> ---EXPECTF-- +--EXPECT-- bool(false) string(12) "/** test1 */" string(12) "/** test2 */" diff --git a/Zend/tests/bug55445.phpt b/Zend/tests/bug55445.phpt index 0f36ac5d88..2ccba5ff08 100644 --- a/Zend/tests/bug55445.phpt +++ b/Zend/tests/bug55445.phpt @@ -4,5 +4,5 @@ Bug #55445 (Lexer error with short open tags) short_open_tag=0 --FILE-- <?php $u = "chris"; ?><p>Welcome <?= $u ?></p> ---EXPECTF-- +--EXPECT-- <p>Welcome chris</p> diff --git a/Zend/tests/bug60536_004.phpt b/Zend/tests/bug60536_004.phpt index a8f4d8b9d4..a78cecc30f 100644 --- a/Zend/tests/bug60536_004.phpt +++ b/Zend/tests/bug60536_004.phpt @@ -28,7 +28,7 @@ class Notice extends Base { } echo "POST-CLASS-GUARD2\n"; ?> ---EXPECTF-- +--EXPECT-- PRE-CLASS-GUARD POST-CLASS-GUARD POST-CLASS-GUARD2 diff --git a/Zend/tests/bug60536_005.phpt b/Zend/tests/bug60536_005.phpt index 1ba22a9752..c007e0ae18 100644 --- a/Zend/tests/bug60536_005.phpt +++ b/Zend/tests/bug60536_005.phpt @@ -27,7 +27,7 @@ class Notice extends Base { } echo "POST-CLASS-GUARD2\n"; ?> ---EXPECTF-- +--EXPECT-- PRE-CLASS-GUARD POST-CLASS-GUARD POST-CLASS-GUARD2 diff --git a/Zend/tests/bug61761.phpt b/Zend/tests/bug61761.phpt index 24c69ae792..0409d67950 100644 --- a/Zend/tests/bug61761.phpt +++ b/Zend/tests/bug61761.phpt @@ -15,5 +15,5 @@ class B extends A ?> ==DONE== ---EXPECTF-- +--EXPECT-- ==DONE== diff --git a/Zend/tests/bug62892.phpt b/Zend/tests/bug62892.phpt index e6b0e60ff3..db25c83466 100644 --- a/Zend/tests/bug62892.phpt +++ b/Zend/tests/bug62892.phpt @@ -16,6 +16,6 @@ $class = new \ReflectionClass('myClass'); var_dump($class->getTraitAliases()); ?> ---EXPECTF-- +--EXPECT-- array(0) { } diff --git a/Zend/tests/bug63055.phpt b/Zend/tests/bug63055.phpt index 5efff9e5bd..c5b2c80871 100644 --- a/Zend/tests/bug63055.phpt +++ b/Zend/tests/bug63055.phpt @@ -21,5 +21,5 @@ $matches[2] = $dummy; str_replace("foo", "bar", "foobar", $matches); echo "okey"; ?> ---EXPECTF-- +--EXPECT-- okey diff --git a/Zend/tests/bug63982.phpt b/Zend/tests/bug63982.phpt index 31294f33e8..4318a5091c 100644 --- a/Zend/tests/bug63982.phpt +++ b/Zend/tests/bug63982.phpt @@ -10,6 +10,6 @@ $test = new Test(); var_dump(isset($test->protectedProperty)); var_dump(isset($test->protectedProperty->foo)); ---EXPECTF-- +--EXPECT-- bool(false) bool(false) diff --git a/Zend/tests/bug64354.phpt b/Zend/tests/bug64354.phpt index 03a4b80b4b..737b2fd46a 100644 --- a/Zend/tests/bug64354.phpt +++ b/Zend/tests/bug64354.phpt @@ -20,5 +20,5 @@ try { var_dump($e->getMessage()); } ?> ---EXPECTF-- +--EXPECT-- string(9) "serialize" diff --git a/Zend/tests/bug64578.phpt b/Zend/tests/bug64578.phpt index 6cb5392cef..b4018e96a2 100644 --- a/Zend/tests/bug64578.phpt +++ b/Zend/tests/bug64578.phpt @@ -9,6 +9,6 @@ function x($s) { $s['a'] = 1; }; $y = '1'; x($y); print_r($y); ---EXPECTF-- +--EXPECT-- string(25) "Illegal string offset 'a'" 1 diff --git a/Zend/tests/bug65419.phpt b/Zend/tests/bug65419.phpt index 677b2750f2..c10a518376 100644 --- a/Zend/tests/bug65419.phpt +++ b/Zend/tests/bug65419.phpt @@ -18,6 +18,6 @@ class ghi ghi::def(); ?> ---EXPECTF-- +--EXPECT-- ghi ghi
\ No newline at end of file diff --git a/Zend/tests/bug66015.phpt b/Zend/tests/bug66015.phpt index 99003e6045..5e0815240d 100644 --- a/Zend/tests/bug66015.phpt +++ b/Zend/tests/bug66015.phpt @@ -25,7 +25,7 @@ $test = new Test(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- array ( 1 => 'first', 2 => 'second', diff --git a/Zend/tests/bug66218.phpt b/Zend/tests/bug66218.phpt index af7a5ab1d0..d800605ac8 100644 --- a/Zend/tests/bug66218.phpt +++ b/Zend/tests/bug66218.phpt @@ -16,6 +16,6 @@ foreach ($fcts as $fct) { } ?> Done ---EXPECTF-- +--EXPECT-- dl Ok Done diff --git a/Zend/tests/bug67368.phpt b/Zend/tests/bug67368.phpt index c92e994b94..b3aff293a0 100644 --- a/Zend/tests/bug67368.phpt +++ b/Zend/tests/bug67368.phpt @@ -8,5 +8,5 @@ class FooBar { const bar = ["bar" => 3]["bar"]; } echo "okey"; ---EXPECTF-- +--EXPECT-- okey diff --git a/Zend/tests/bug69221.phpt b/Zend/tests/bug69221.phpt index 9eb5afcad8..72f242f995 100644 --- a/Zend/tests/bug69221.phpt +++ b/Zend/tests/bug69221.phpt @@ -20,5 +20,5 @@ unset($gen1); foreach ($gen2 as $v) { var_dump($v); } ?> ---EXPECTF-- +--EXPECT-- int(1) diff --git a/Zend/tests/bug69955.phpt b/Zend/tests/bug69955.phpt index 33c36850c0..ece96a88ad 100644 --- a/Zend/tests/bug69955.phpt +++ b/Zend/tests/bug69955.phpt @@ -25,7 +25,7 @@ class C10 implements ArrayAccess $c10 = new C10; var_dump($c10[] += 5); ---EXPECTF-- +--EXPECT-- Inside C10::offsetGet NULL diff --git a/Zend/tests/bug70089.phpt b/Zend/tests/bug70089.phpt index e1884d9dac..1bfc38ae09 100644 --- a/Zend/tests/bug70089.phpt +++ b/Zend/tests/bug70089.phpt @@ -30,7 +30,7 @@ try { var_dump($e->getMessage()); } ?> ---EXPECTF-- +--EXPECT-- string(36) "Cannot use string offset as an array" string(27) "Cannot unset string offsets" string(41) "Only variables can be passed by reference" diff --git a/Zend/tests/bug70987.phpt b/Zend/tests/bug70987.phpt index d31a1d2c6e..3c8dcc79c8 100644 --- a/Zend/tests/bug70987.phpt +++ b/Zend/tests/bug70987.phpt @@ -11,5 +11,5 @@ $bar = function () { var_dump($bar->call(new foo)); ?> ---EXPECTF-- +--EXPECT-- string(3) "foo" diff --git a/Zend/tests/bug71756.phpt b/Zend/tests/bug71756.phpt index 42066f3c2e..1f43c082f0 100644 --- a/Zend/tests/bug71756.phpt +++ b/Zend/tests/bug71756.phpt @@ -20,7 +20,7 @@ function c ($option) { } a(array('bla' => 'false')); ?> ---EXPECTF-- +--EXPECT-- array(1) { ["bla"]=> string(7) "changed" diff --git a/Zend/tests/bug72594.phpt b/Zend/tests/bug72594.phpt index 3e88b2e6d6..c67e68e4ac 100644 --- a/Zend/tests/bug72594.phpt +++ b/Zend/tests/bug72594.phpt @@ -22,7 +22,7 @@ var_dump(get_object_vars($oldFoo)); $newFoo->bing($oldFoo); ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> string(4) "bing" diff --git a/Zend/tests/bug73753.phpt b/Zend/tests/bug73753.phpt index 9a77f62f56..567bb9e01f 100644 --- a/Zend/tests/bug73753.phpt +++ b/Zend/tests/bug73753.phpt @@ -25,5 +25,5 @@ function traverse($a) { $arr = array(1 => 'foo', 'b' => 'bar', 'baz'); var_dump(traverse($arr)); ?> ---EXPECTF-- +--EXPECT-- string(3) "baz" diff --git a/Zend/tests/bug74947.phpt b/Zend/tests/bug74947.phpt index e66d292971..1dd91efb9b 100644 --- a/Zend/tests/bug74947.phpt +++ b/Zend/tests/bug74947.phpt @@ -8,5 +8,5 @@ echo 200000000000000000000000000000000000000000000000000000000000000000000000000 echo -200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000; ?> ---EXPECTF-- +--EXPECT-- INF-INF diff --git a/Zend/tests/call_static_002.phpt b/Zend/tests/call_static_002.phpt index 9604bf5b9f..ac30636ded 100644 --- a/Zend/tests/call_static_002.phpt +++ b/Zend/tests/call_static_002.phpt @@ -19,7 +19,7 @@ call_user_func(array($a, 'aAa')); call_user_func(array('Foo', 'aAa')); ?> ---EXPECTF-- +--EXPECT-- nonstatic string(3) "aAa" static diff --git a/Zend/tests/cast_to_bool.phpt b/Zend/tests/cast_to_bool.phpt index 75ab09d1b5..66cec7c3c3 100644 --- a/Zend/tests/cast_to_bool.phpt +++ b/Zend/tests/cast_to_bool.phpt @@ -36,7 +36,7 @@ foreach ($vars as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(false) diff --git a/Zend/tests/class_alias_017.phpt b/Zend/tests/class_alias_017.phpt index f4d3626e45..555e776227 100644 --- a/Zend/tests/class_alias_017.phpt +++ b/Zend/tests/class_alias_017.phpt @@ -26,7 +26,7 @@ baz::test(); bar::test(); ?> ---EXPECTF-- +--EXPECT-- foo baz foo diff --git a/Zend/tests/class_constants_003.phpt b/Zend/tests/class_constants_003.phpt index c2782ff1c9..1c3bfb737d 100644 --- a/Zend/tests/class_constants_003.phpt +++ b/Zend/tests/class_constants_003.phpt @@ -27,7 +27,7 @@ unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(1) int(5) Done diff --git a/Zend/tests/class_name_as_scalar.phpt b/Zend/tests/class_name_as_scalar.phpt index 38e55b16d5..72a460abaa 100644 --- a/Zend/tests/class_name_as_scalar.phpt +++ b/Zend/tests/class_name_as_scalar.phpt @@ -51,7 +51,7 @@ namespace { } ?> ---EXPECTF-- +--EXPECT-- In NS string(11) "Foo\Bar\Moo" Top diff --git a/Zend/tests/class_properties_dynamic.phpt b/Zend/tests/class_properties_dynamic.phpt index 8a1fc6f029..456bcf4a5b 100644 --- a/Zend/tests/class_properties_dynamic.phpt +++ b/Zend/tests/class_properties_dynamic.phpt @@ -9,5 +9,5 @@ class Foo { } echo (new Foo)->bar; ?> ---EXPECTF-- +--EXPECT-- 3 diff --git a/Zend/tests/closure_024.phpt b/Zend/tests/closure_024.phpt index 74083f73bc..68fd29c687 100644 --- a/Zend/tests/closure_024.phpt +++ b/Zend/tests/closure_024.phpt @@ -18,7 +18,7 @@ echo $cc(10)."\n"; echo "Done.\n"; ?> ---EXPECTF-- +--EXPECT-- 11 11 12 diff --git a/Zend/tests/closure_036.phpt b/Zend/tests/closure_036.phpt index 77d7ce6906..ca87efec4b 100644 --- a/Zend/tests/closure_036.phpt +++ b/Zend/tests/closure_036.phpt @@ -27,7 +27,7 @@ var_dump($cb()); var_dump($cb2()); ?> ---EXPECTF-- +--EXPECT-- int(1) int(11) int(12)
\ No newline at end of file diff --git a/Zend/tests/closure_037.phpt b/Zend/tests/closure_037.phpt index 4b24c85d16..cabd99bfac 100644 --- a/Zend/tests/closure_037.phpt +++ b/Zend/tests/closure_037.phpt @@ -37,7 +37,7 @@ $closure = $b->getClosure(); $closure(); ?> Done. ---EXPECTF-- +--EXPECT-- 1 42 42 diff --git a/Zend/tests/closure_044.phpt b/Zend/tests/closure_044.phpt index 8fdef135dc..b8da50049a 100644 --- a/Zend/tests/closure_044.phpt +++ b/Zend/tests/closure_044.phpt @@ -39,7 +39,7 @@ $d = $nonstaticScoped->bindTo(new A, 'A'); $d(); echo "\n"; echo "Done.\n"; ---EXPECTF-- +--EXPECT-- Before binding bool(false) bool(false) diff --git a/Zend/tests/closure_045.phpt b/Zend/tests/closure_045.phpt index c6276be47b..c309e3c533 100644 --- a/Zend/tests/closure_045.phpt +++ b/Zend/tests/closure_045.phpt @@ -14,5 +14,5 @@ $a->bindTo(new A); echo "Done.\n"; ---EXPECTF-- +--EXPECT-- Done. diff --git a/Zend/tests/closure_046.phpt b/Zend/tests/closure_046.phpt index 2985e6a8db..4e2542b7c0 100644 --- a/Zend/tests/closure_046.phpt +++ b/Zend/tests/closure_046.phpt @@ -39,7 +39,7 @@ $d = $nonstaticScoped->bindTo(new B, "static"); $d(); echo "\n"; echo "Done.\n"; ---EXPECTF-- +--EXPECT-- Before binding bool(false) bool(false) diff --git a/Zend/tests/closures/closure_from_callable_reflection.phpt b/Zend/tests/closures/closure_from_callable_reflection.phpt index af40193fba..111115a44a 100644 --- a/Zend/tests/closures/closure_from_callable_reflection.phpt +++ b/Zend/tests/closures/closure_from_callable_reflection.phpt @@ -35,7 +35,7 @@ foreach ($callables as $callable) { } ?> ---EXPECTF-- +--EXPECT-- Bar int Bar diff --git a/Zend/tests/compare_002.phpt b/Zend/tests/compare_002.phpt index 5e5009c323..33c883f5f4 100644 --- a/Zend/tests/compare_002.phpt +++ b/Zend/tests/compare_002.phpt @@ -48,7 +48,7 @@ foreach($a as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} === array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} !== string(0) "" array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} !== int(1) diff --git a/Zend/tests/compound_assign_with_numeric_strings.phpt b/Zend/tests/compound_assign_with_numeric_strings.phpt index 72c80b0afc..e5cdb344ef 100644 --- a/Zend/tests/compound_assign_with_numeric_strings.phpt +++ b/Zend/tests/compound_assign_with_numeric_strings.phpt @@ -38,7 +38,7 @@ try{ $n = "-1"; $n %= $n; var_dump($n); ---EXPECTF-- +--EXPECT-- int(0) Exception: Bit shift by negative number diff --git a/Zend/tests/declare_005.phpt b/Zend/tests/declare_005.phpt index d1c716cebc..654f8252e0 100644 --- a/Zend/tests/declare_005.phpt +++ b/Zend/tests/declare_005.phpt @@ -12,6 +12,6 @@ foo(); } ?> ---EXPECTF-- +--EXPECT-- tick tick diff --git a/Zend/tests/div_001.phpt b/Zend/tests/div_001.phpt index 5fa264a11e..4f0b34b25f 100644 --- a/Zend/tests/div_001.phpt +++ b/Zend/tests/div_001.phpt @@ -25,7 +25,7 @@ var_dump($c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- float(394758.39454545) float(394758.39454545) float(394758.39454545) diff --git a/Zend/tests/double_to_string_64bit.phpt b/Zend/tests/double_to_string_64bit.phpt index 5ecb1a6067..d228b707d4 100644 --- a/Zend/tests/double_to_string_64bit.phpt +++ b/Zend/tests/double_to_string_64bit.phpt @@ -35,7 +35,7 @@ foreach ($doubles as $d) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(7) "2.9E+37" string(18) "290000000000000000" string(15) "290000000000000" diff --git a/Zend/tests/empty_str_offset.phpt b/Zend/tests/empty_str_offset.phpt index 49e175dd21..721844085a 100644 --- a/Zend/tests/empty_str_offset.phpt +++ b/Zend/tests/empty_str_offset.phpt @@ -54,7 +54,7 @@ var_dump(empty($str[$f])); print "done\n"; ?> ---EXPECTF-- +--EXPECT-- - empty --- bool(false) bool(true) diff --git a/Zend/tests/errmsg_024.phpt b/Zend/tests/errmsg_024.phpt index 011e6fdea9..25c8de3e58 100644 --- a/Zend/tests/errmsg_024.phpt +++ b/Zend/tests/errmsg_024.phpt @@ -13,5 +13,5 @@ class test extends test1 { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/Zend/tests/errmsg_040.phpt b/Zend/tests/errmsg_040.phpt index d5d2bf38d3..088264176b 100644 --- a/Zend/tests/errmsg_040.phpt +++ b/Zend/tests/errmsg_040.phpt @@ -9,7 +9,7 @@ class test { var_dump(test::TEST); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(3) { [0]=> int(1) diff --git a/Zend/tests/error_reporting06.phpt b/Zend/tests/error_reporting06.phpt index 175ea37e80..e81e0a2653 100644 --- a/Zend/tests/error_reporting06.phpt +++ b/Zend/tests/error_reporting06.phpt @@ -25,6 +25,6 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(32767) Done diff --git a/Zend/tests/error_reporting07.phpt b/Zend/tests/error_reporting07.phpt index 09b7690d3c..affc496716 100644 --- a/Zend/tests/error_reporting07.phpt +++ b/Zend/tests/error_reporting07.phpt @@ -25,6 +25,6 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(32767) Done diff --git a/Zend/tests/error_reporting10.phpt b/Zend/tests/error_reporting10.phpt index 12b1db57ba..eb3711af11 100644 --- a/Zend/tests/error_reporting10.phpt +++ b/Zend/tests/error_reporting10.phpt @@ -29,7 +29,7 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(32767) int(32759) Done diff --git a/Zend/tests/exception_handler_001.phpt b/Zend/tests/exception_handler_001.phpt index 8f6572ef01..34f6eb5966 100644 --- a/Zend/tests/exception_handler_001.phpt +++ b/Zend/tests/exception_handler_001.phpt @@ -16,5 +16,5 @@ throw new test(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(12) "test thrown!" diff --git a/Zend/tests/exception_handler_003.phpt b/Zend/tests/exception_handler_003.phpt index 137a6cabb4..964b746d0e 100644 --- a/Zend/tests/exception_handler_003.phpt +++ b/Zend/tests/exception_handler_003.phpt @@ -20,5 +20,5 @@ throw new Exception(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(17) "Exception thrown!" diff --git a/Zend/tests/exception_handler_005.phpt b/Zend/tests/exception_handler_005.phpt index cc99bc6230..6b228e522b 100644 --- a/Zend/tests/exception_handler_005.phpt +++ b/Zend/tests/exception_handler_005.phpt @@ -19,5 +19,5 @@ throw new excEption(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(25) "foo1(): Exception thrown!" diff --git a/Zend/tests/exception_handler_006.phpt b/Zend/tests/exception_handler_006.phpt index 05a5d927fa..6f9f11870e 100644 --- a/Zend/tests/exception_handler_006.phpt +++ b/Zend/tests/exception_handler_006.phpt @@ -21,5 +21,5 @@ throw new excEption(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(24) "foo(): Exception thrown!" diff --git a/Zend/tests/foreach_list_002.phpt b/Zend/tests/foreach_list_002.phpt index 1a7be521b2..0ec1aac2c1 100644 --- a/Zend/tests/foreach_list_002.phpt +++ b/Zend/tests/foreach_list_002.phpt @@ -14,7 +14,7 @@ foreach($array as list(, $a)) { } ?> ---EXPECTF-- +--EXPECT-- int(1) int(3) string(1) "b" diff --git a/Zend/tests/foreach_reference.phpt b/Zend/tests/foreach_reference.phpt index 6b273208aa..58c05e5553 100644 --- a/Zend/tests/foreach_reference.phpt +++ b/Zend/tests/foreach_reference.phpt @@ -16,7 +16,7 @@ var_dump($a); var_dump(array_reverse($array)); ?> ---EXPECTF-- +--EXPECT-- array(4) { [0]=> string(1) "a" diff --git a/Zend/tests/foreach_unset_globals.phpt b/Zend/tests/foreach_unset_globals.phpt index 188c70ab18..7ed0460eee 100644 --- a/Zend/tests/foreach_unset_globals.phpt +++ b/Zend/tests/foreach_unset_globals.phpt @@ -11,7 +11,7 @@ foreach ($arr as $key => $val) { var_dump($arr); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(2) { ["a"]=> int(1) diff --git a/Zend/tests/gc_031.phpt b/Zend/tests/gc_031.phpt index 58c4b15e3a..a79d4311b5 100644 --- a/Zend/tests/gc_031.phpt +++ b/Zend/tests/gc_031.phpt @@ -7,5 +7,5 @@ zend.enable_gc=0 gc_collect_cycles(); echo "DONE\n"; ?> ---EXPECTF-- +--EXPECT-- DONE diff --git a/Zend/tests/generators/bug74157.phpt b/Zend/tests/generators/bug74157.phpt index d5f0233aec..e5b9111f78 100644 --- a/Zend/tests/generators/bug74157.phpt +++ b/Zend/tests/generators/bug74157.phpt @@ -15,7 +15,7 @@ foreach (a(range(1, 3)) as $a) { var_dump($a); } ?> ---EXPECTF-- +--EXPECT-- int(1) int(2) int(3) diff --git a/Zend/tests/generators/finally/return_return.phpt b/Zend/tests/generators/finally/return_return.phpt index 02e2739de7..194fc93de7 100644 --- a/Zend/tests/generators/finally/return_return.phpt +++ b/Zend/tests/generators/finally/return_return.phpt @@ -27,7 +27,7 @@ $gen = gen(); $gen->rewind(); // force run ?> ---EXPECTF-- +--EXPECT-- before return before return in inner finally outer finally run diff --git a/Zend/tests/generators/get_return.phpt b/Zend/tests/generators/get_return.phpt index 0d3e32af14..d1815ff183 100644 --- a/Zend/tests/generators/get_return.phpt +++ b/Zend/tests/generators/get_return.phpt @@ -68,7 +68,7 @@ $gen = gen6(); var_dump($gen->getReturn()); ?> ---EXPECTF-- +--EXPECT-- int(42) int(24) int(42) diff --git a/Zend/tests/get_class_methods_001.phpt b/Zend/tests/get_class_methods_001.phpt index a2a3d0ca20..78745219ba 100644 --- a/Zend/tests/get_class_methods_001.phpt +++ b/Zend/tests/get_class_methods_001.phpt @@ -26,7 +26,7 @@ var_dump(get_class_methods('Y')); Y::test(); ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> string(1) "a" diff --git a/Zend/tests/get_class_methods_002.phpt b/Zend/tests/get_class_methods_002.phpt index 62f326c053..808a07046f 100644 --- a/Zend/tests/get_class_methods_002.phpt +++ b/Zend/tests/get_class_methods_002.phpt @@ -23,7 +23,7 @@ class B implements A { new B; ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(1) "a" diff --git a/Zend/tests/get_defined_vars.phpt b/Zend/tests/get_defined_vars.phpt index 199afd0b50..15e33b8a94 100644 --- a/Zend/tests/get_defined_vars.phpt +++ b/Zend/tests/get_defined_vars.phpt @@ -64,7 +64,7 @@ func1(); echo "\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Displaying various variables through the array captured by the get_defined_vars function call *** int(1) float(22.33) diff --git a/Zend/tests/grammar/regression_001.phpt b/Zend/tests/grammar/regression_001.phpt index 73d5eacdf6..727e11cc45 100644 --- a/Zend/tests/grammar/regression_001.phpt +++ b/Zend/tests/grammar/regression_001.phpt @@ -23,7 +23,7 @@ Foo:: echo "\nDone\n"; ---EXPECTF-- +--EXPECT-- Foo::function Foo::function diff --git a/Zend/tests/grammar/regression_002.phpt b/Zend/tests/grammar/regression_002.phpt index dd307c99d8..06bce25d70 100644 --- a/Zend/tests/grammar/regression_002.phpt +++ b/Zend/tests/grammar/regression_002.phpt @@ -15,7 +15,7 @@ var_dump(Foo:: CLASS); ---EXPECTF-- +--EXPECT-- string(3) "Foo" string(3) "Foo" string(3) "Foo" diff --git a/Zend/tests/grammar/regression_006.phpt b/Zend/tests/grammar/regression_006.phpt index 6aae0ba24b..036ffa7445 100644 --- a/Zend/tests/grammar/regression_006.phpt +++ b/Zend/tests/grammar/regression_006.phpt @@ -20,7 +20,7 @@ echo Obj:: USE, PHP_EOL; echo "\nDone\n"; ---EXPECTF-- +--EXPECT-- declare return function diff --git a/Zend/tests/grammar/regression_007.phpt b/Zend/tests/grammar/regression_007.phpt index 92b22531a4..d75670c7ec 100644 --- a/Zend/tests/grammar/regression_007.phpt +++ b/Zend/tests/grammar/regression_007.phpt @@ -29,7 +29,7 @@ var_dump(Foo::use); echo "\nDone\n"; ---EXPECTF-- +--EXPECT-- Foo::new Foo::new Foo::new diff --git a/Zend/tests/grammar/regression_008.phpt b/Zend/tests/grammar/regression_008.phpt index 7741ed036c..e4259649eb 100644 --- a/Zend/tests/grammar/regression_008.phpt +++ b/Zend/tests/grammar/regression_008.phpt @@ -14,7 +14,7 @@ echo "$friday->require ($friday->require) {$friday->require}", PHP_EOL; echo "\nDone\n"; ---EXPECTF-- +--EXPECT-- fun (fun) fun diff --git a/Zend/tests/grammar/regression_009.phpt b/Zend/tests/grammar/regression_009.phpt index 589d90316b..6b14c33081 100644 --- a/Zend/tests/grammar/regression_009.phpt +++ b/Zend/tests/grammar/regression_009.phpt @@ -13,6 +13,6 @@ class Foo echo PHP_EOL, "Done", PHP_EOL; ---EXPECTF-- +--EXPECT-- Done diff --git a/Zend/tests/grammar/regression_010.phpt b/Zend/tests/grammar/regression_010.phpt index 5dc90f288a..90b864f79b 100644 --- a/Zend/tests/grammar/regression_010.phpt +++ b/Zend/tests/grammar/regression_010.phpt @@ -9,6 +9,6 @@ class B implements\A {} echo "Done", PHP_EOL; ---EXPECTF-- +--EXPECT-- Done diff --git a/Zend/tests/grammar/regression_013.phpt b/Zend/tests/grammar/regression_013.phpt index 1c60ffc273..0379dd26e3 100644 --- a/Zend/tests/grammar/regression_013.phpt +++ b/Zend/tests/grammar/regression_013.phpt @@ -8,6 +8,6 @@ class A { function foo() { "{${$a}}"; } function list() {} } echo "Done", PHP_EOL; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/Zend/tests/grammar/semi_reserved_001.phpt b/Zend/tests/grammar/semi_reserved_001.phpt index 48937de39e..3abb3a2507 100644 --- a/Zend/tests/grammar/semi_reserved_001.phpt +++ b/Zend/tests/grammar/semi_reserved_001.phpt @@ -162,7 +162,7 @@ $obj->__NAMESPACE__(); echo "\nDone\n"; ---EXPECTF-- +--EXPECT-- Obj::empty Obj::callable Obj::class diff --git a/Zend/tests/grammar/semi_reserved_002.phpt b/Zend/tests/grammar/semi_reserved_002.phpt index a082f9ddbb..6a7dc79b74 100644 --- a/Zend/tests/grammar/semi_reserved_002.phpt +++ b/Zend/tests/grammar/semi_reserved_002.phpt @@ -160,7 +160,7 @@ Obj::__NAMESPACE__(); echo "\nDone\n"; ---EXPECTF-- +--EXPECT-- Obj::empty Obj::callable Obj::class diff --git a/Zend/tests/grammar/semi_reserved_003.phpt b/Zend/tests/grammar/semi_reserved_003.phpt index d63824017e..8e459a636f 100644 --- a/Zend/tests/grammar/semi_reserved_003.phpt +++ b/Zend/tests/grammar/semi_reserved_003.phpt @@ -165,7 +165,7 @@ echo $obj->__halt_compiler, PHP_EOL; echo "\nDone\n"; ?> ---EXPECTF-- +--EXPECT-- empty callable class diff --git a/Zend/tests/grammar/semi_reserved_004.phpt b/Zend/tests/grammar/semi_reserved_004.phpt index 38963870a0..b3889b0bae 100644 --- a/Zend/tests/grammar/semi_reserved_004.phpt +++ b/Zend/tests/grammar/semi_reserved_004.phpt @@ -162,7 +162,7 @@ echo Obj::$__halt_compiler, PHP_EOL; echo "\nDone\n"; ---EXPECTF-- +--EXPECT-- empty callable class diff --git a/Zend/tests/grammar/semi_reserved_005.phpt b/Zend/tests/grammar/semi_reserved_005.phpt index 45d20ad0d8..5330828633 100644 --- a/Zend/tests/grammar/semi_reserved_005.phpt +++ b/Zend/tests/grammar/semi_reserved_005.phpt @@ -158,7 +158,7 @@ echo Obj::__NAMESPACE__, PHP_EOL; echo "\nDone\n"; ---EXPECTF-- +--EXPECT-- empty callable trait diff --git a/Zend/tests/grammar/semi_reserved_006.phpt b/Zend/tests/grammar/semi_reserved_006.phpt index 334d09ac36..8205435a5f 100644 --- a/Zend/tests/grammar/semi_reserved_006.phpt +++ b/Zend/tests/grammar/semi_reserved_006.phpt @@ -59,7 +59,7 @@ Foo::farewell(); echo "\nDone\n"; ---EXPECTF-- +--EXPECT-- TraitA::catch TraitA::list TraitB::throw diff --git a/Zend/tests/grammar/semi_reserved_007.phpt b/Zend/tests/grammar/semi_reserved_007.phpt index 5105629cbe..b1d6daeb9d 100644 --- a/Zend/tests/grammar/semi_reserved_007.phpt +++ b/Zend/tests/grammar/semi_reserved_007.phpt @@ -26,7 +26,7 @@ new Bar; echo "\nDone\n"; ---EXPECTF-- +--EXPECT-- From Foo::__construct: self parent diff --git a/Zend/tests/grammar/semi_reserved_008.phpt b/Zend/tests/grammar/semi_reserved_008.phpt index 43218b1b05..a267291886 100644 --- a/Zend/tests/grammar/semi_reserved_008.phpt +++ b/Zend/tests/grammar/semi_reserved_008.phpt @@ -62,7 +62,7 @@ attempt(); echo PHP_EOL, "Done", PHP_EOL; ---EXPECTF-- +--EXPECT-- TraitB::try Done diff --git a/Zend/tests/grammar/semi_reserved_009.phpt b/Zend/tests/grammar/semi_reserved_009.phpt index 1a7b0fc371..05830f80ed 100644 --- a/Zend/tests/grammar/semi_reserved_009.phpt +++ b/Zend/tests/grammar/semi_reserved_009.phpt @@ -19,7 +19,7 @@ Foo::try(); echo PHP_EOL, "Done", PHP_EOL; ---EXPECTF-- +--EXPECT-- TraitA::as Done diff --git a/Zend/tests/grammar/semi_reserved_010.phpt b/Zend/tests/grammar/semi_reserved_010.phpt index 508a7867a4..ad92fcfddc 100644 --- a/Zend/tests/grammar/semi_reserved_010.phpt +++ b/Zend/tests/grammar/semi_reserved_010.phpt @@ -25,7 +25,7 @@ Foo::insteadof(); echo PHP_EOL, "Done", PHP_EOL; ---EXPECTF-- +--EXPECT-- TraitB::insteadof Done diff --git a/Zend/tests/indirect_call_array_004.phpt b/Zend/tests/indirect_call_array_004.phpt index 350f720648..07d8a09215 100644 --- a/Zend/tests/indirect_call_array_004.phpt +++ b/Zend/tests/indirect_call_array_004.phpt @@ -61,7 +61,7 @@ catch (Exception $e) { } ?> ---EXPECTF-- +--EXPECT-- foo From foo::__callStatic: 123 diff --git a/Zend/tests/int_overflow_32bit.phpt b/Zend/tests/int_overflow_32bit.phpt index d9b56495e9..0764e495f7 100644 --- a/Zend/tests/int_overflow_32bit.phpt +++ b/Zend/tests/int_overflow_32bit.phpt @@ -20,7 +20,7 @@ foreach ($doubles as $d) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(-2147483648) int(-2147483647) int(-2147483638) diff --git a/Zend/tests/int_underflow_64bit.phpt b/Zend/tests/int_underflow_64bit.phpt index 48a43a3ca3..40a6dff9ec 100644 --- a/Zend/tests/int_underflow_64bit.phpt +++ b/Zend/tests/int_underflow_64bit.phpt @@ -20,7 +20,7 @@ foreach ($doubles as $d) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(-9223372036854775808) int(-9223372036854775808) int(-9223372036854775808) diff --git a/Zend/tests/inter_04.phpt b/Zend/tests/inter_04.phpt index ea0bd84760..6bac3fe339 100644 --- a/Zend/tests/inter_04.phpt +++ b/Zend/tests/inter_04.phpt @@ -17,5 +17,5 @@ interface c extends a, b { echo "done!\n"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/Zend/tests/isset_str_offset.phpt b/Zend/tests/isset_str_offset.phpt index d693f80a52..f37fd870bf 100644 --- a/Zend/tests/isset_str_offset.phpt +++ b/Zend/tests/isset_str_offset.phpt @@ -51,7 +51,7 @@ var_dump(isset($str[$f])); print "done\n"; ?> ---EXPECTF-- +--EXPECT-- - isset --- bool(true) bool(false) diff --git a/Zend/tests/jump12.phpt b/Zend/tests/jump12.phpt index 10bebc25fc..3c244d6181 100644 --- a/Zend/tests/jump12.phpt +++ b/Zend/tests/jump12.phpt @@ -13,7 +13,7 @@ c: print "ok!\n"; goto b; ?> ---EXPECTF-- +--EXPECT-- ok! ok! ok! diff --git a/Zend/tests/list/list_reference_001.phpt b/Zend/tests/list/list_reference_001.phpt index a173c7103e..07ebbb64ce 100644 --- a/Zend/tests/list/list_reference_001.phpt +++ b/Zend/tests/list/list_reference_001.phpt @@ -26,7 +26,7 @@ $arr = array("one" => 1, "two" => array(2)); var_dump($a, $b, $c); var_dump($arr); ?> ---EXPECTF-- +--EXPECT-- int(1) int(2) array(2) { diff --git a/Zend/tests/list/list_reference_004.phpt b/Zend/tests/list/list_reference_004.phpt index fc9955e28a..5dd237a244 100644 --- a/Zend/tests/list/list_reference_004.phpt +++ b/Zend/tests/list/list_reference_004.phpt @@ -9,7 +9,7 @@ foreach ($coords as [&$x, $y]) { } var_dump($coords); ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> array(2) { diff --git a/Zend/tests/list/list_reference_007.phpt b/Zend/tests/list/list_reference_007.phpt index 51f1cac496..225ebff10f 100644 --- a/Zend/tests/list/list_reference_007.phpt +++ b/Zend/tests/list/list_reference_007.phpt @@ -29,7 +29,7 @@ $a = new StorageRef(['one' => 1, 'two' => 2]); var_dump($a); ?> ---EXPECTF-- +--EXPECT-- object(StorageRef)#1 (1) { ["s":"StorageRef":private]=> array(2) { diff --git a/Zend/tests/list/list_reference_008.phpt b/Zend/tests/list/list_reference_008.phpt index 9c754a698d..2c78984852 100644 --- a/Zend/tests/list/list_reference_008.phpt +++ b/Zend/tests/list/list_reference_008.phpt @@ -34,7 +34,7 @@ var_dump($a, $b); $a++; $b++; var_dump($ref); ?> ---EXPECTF-- +--EXPECT-- int(1) int(1) array(2) { diff --git a/Zend/tests/list/list_reference_009.phpt b/Zend/tests/list/list_reference_009.phpt index f0adc1f088..b60539e7f8 100644 --- a/Zend/tests/list/list_reference_009.phpt +++ b/Zend/tests/list/list_reference_009.phpt @@ -18,7 +18,7 @@ $ary = [[0, 1]]; ] = $ary[0]; var_dump($ary, $a, $b); ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> array(2) { diff --git a/Zend/tests/list_keyed_non_literals.phpt b/Zend/tests/list_keyed_non_literals.phpt index 80f22eda22..7c6afe70b7 100644 --- a/Zend/tests/list_keyed_non_literals.phpt +++ b/Zend/tests/list_keyed_non_literals.phpt @@ -24,7 +24,7 @@ list( var_dump($one, $two, $three); ?> ---EXPECTF-- +--EXPECT-- string(3) "one" string(3) "two" string(5) "three" diff --git a/Zend/tests/lsb_001.phpt b/Zend/tests/lsb_001.phpt index 20a2fd83bb..f22649dcea 100644 --- a/Zend/tests/lsb_001.phpt +++ b/Zend/tests/lsb_001.phpt @@ -48,7 +48,7 @@ echo ChildClass2::testClassConst() . "\n"; echo ChildClass2::testStaticFunction() . "\n"; ?> ==DONE== ---EXPECTF-- +--EXPECT-- TestClassStatic TestClassConst TestClassFunction diff --git a/Zend/tests/lsb_002.phpt b/Zend/tests/lsb_002.phpt index 4fca6ddd72..9dbc496cc0 100644 --- a/Zend/tests/lsb_002.phpt +++ b/Zend/tests/lsb_002.phpt @@ -53,7 +53,7 @@ echo $childClass2->testClassConst() . "\n"; echo $childClass2->testStaticFunction() . "\n"; ?> ==DONE== ---EXPECTF-- +--EXPECT-- TestClassStatic TestClassConst TestClassFunction diff --git a/Zend/tests/lsb_003.phpt b/Zend/tests/lsb_003.phpt index 4e9fe1f7c8..a7a787e568 100644 --- a/Zend/tests/lsb_003.phpt +++ b/Zend/tests/lsb_003.phpt @@ -18,7 +18,7 @@ echo get_class($testClass) . "\n"; echo get_class($childClass) . "\n"; ?> ==DONE== ---EXPECTF-- +--EXPECT-- TestClass ChildClass ==DONE== diff --git a/Zend/tests/lsb_004.phpt b/Zend/tests/lsb_004.phpt index 6baeba00bd..9583ef2547 100644 --- a/Zend/tests/lsb_004.phpt +++ b/Zend/tests/lsb_004.phpt @@ -15,7 +15,7 @@ echo TestClass::getClassName() . "\n"; echo ChildClass::getClassName() . "\n"; ?> ==DONE== ---EXPECTF-- +--EXPECT-- TestClass ChildClass ==DONE== diff --git a/Zend/tests/lsb_005.phpt b/Zend/tests/lsb_005.phpt index 00647a5c70..a01ccd7ca9 100644 --- a/Zend/tests/lsb_005.phpt +++ b/Zend/tests/lsb_005.phpt @@ -36,7 +36,7 @@ TestA::test(); ?> ==DONE== ---EXPECTF-- +--EXPECT-- TestA TestB TestC diff --git a/Zend/tests/lsb_010.phpt b/Zend/tests/lsb_010.phpt index 2ac0306120..c6ef2d8614 100644 --- a/Zend/tests/lsb_010.phpt +++ b/Zend/tests/lsb_010.phpt @@ -29,7 +29,7 @@ unset($foo); unset($fooChild); ?> ---EXPECTF-- +--EXPECT-- Foo::__construct FooChild::__construct Foo::__destruct diff --git a/Zend/tests/lsb_015.phpt b/Zend/tests/lsb_015.phpt index ba293a2468..0c21012ca8 100644 --- a/Zend/tests/lsb_015.phpt +++ b/Zend/tests/lsb_015.phpt @@ -68,7 +68,7 @@ echo "via B:\n"; B::myCatch(); ?> ==DONE== ---EXPECTF-- +--EXPECT-- via A: A A diff --git a/Zend/tests/lsb_016.phpt b/Zend/tests/lsb_016.phpt index f19c6aada8..4c5fa3248e 100644 --- a/Zend/tests/lsb_016.phpt +++ b/Zend/tests/lsb_016.phpt @@ -34,7 +34,7 @@ $o->a = "b"; echo $o->a; ?> ==DONE== ---EXPECTF-- +--EXPECT-- TestChild TestChild TestChild diff --git a/Zend/tests/lsb_019.phpt b/Zend/tests/lsb_019.phpt index 1683ffe638..154a78a849 100644 --- a/Zend/tests/lsb_019.phpt +++ b/Zend/tests/lsb_019.phpt @@ -39,7 +39,7 @@ echo ChildClass1::testStaticFunction() . "\n"; echo ChildClass2::testStaticVar() . "\n"; echo ChildClass2::testStaticFunction() . "\n"; ?> ---EXPECTF-- +--EXPECT-- TestClassStatic TestClassFunction ChildClassStatic diff --git a/Zend/tests/lsb_020.phpt b/Zend/tests/lsb_020.phpt index 65ef97ab43..a7f5b42e67 100644 --- a/Zend/tests/lsb_020.phpt +++ b/Zend/tests/lsb_020.phpt @@ -39,7 +39,7 @@ echo ChildClass1::testStaticFunction() . "\n"; echo ChildClass2::testStaticVar() . "\n"; echo ChildClass2::testStaticFunction() . "\n"; ?> ---EXPECTF-- +--EXPECT-- TestClassStatic TestClassFunction ChildClassStatic diff --git a/Zend/tests/lsb_021.phpt b/Zend/tests/lsb_021.phpt index c591cfa230..a99ea4dd22 100644 --- a/Zend/tests/lsb_021.phpt +++ b/Zend/tests/lsb_021.phpt @@ -35,7 +35,7 @@ C::testForward(); C::testNoForward(); ?> ---EXPECTF-- +--EXPECT-- C C C diff --git a/Zend/tests/methods-on-non-objects-usort.phpt b/Zend/tests/methods-on-non-objects-usort.phpt index 5547695f72..ff4ad7451c 100644 --- a/Zend/tests/methods-on-non-objects-usort.phpt +++ b/Zend/tests/methods-on-non-objects-usort.phpt @@ -19,7 +19,7 @@ usort($list, function($a, $b) use ($comparator) { var_dump($list); echo "Alive\n"; ?> ---EXPECTF-- +--EXPECT-- int(0) string(43) "Call to a member function compare() on null" int(0) diff --git a/Zend/tests/not_001.phpt b/Zend/tests/not_001.phpt index 6eb0f000c9..3f2c812a4c 100644 --- a/Zend/tests/not_001.phpt +++ b/Zend/tests/not_001.phpt @@ -16,7 +16,7 @@ var_dump(bin2hex($s1)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(-24) string(8) "8c90929a" Done diff --git a/Zend/tests/nowdoc_011.phpt b/Zend/tests/nowdoc_011.phpt index 84bcdb6916..3d35989a9a 100644 --- a/Zend/tests/nowdoc_011.phpt +++ b/Zend/tests/nowdoc_011.phpt @@ -16,5 +16,5 @@ THISMUSTNOTERROR; print e::E . "\n"; ?> ---EXPECTF-- +--EXPECT-- If you DON'T see this, something's wrong. diff --git a/Zend/tests/ns_059.phpt b/Zend/tests/ns_059.phpt index 301a6fc830..87f1ea2ac9 100644 --- a/Zend/tests/ns_059.phpt +++ b/Zend/tests/ns_059.phpt @@ -4,6 +4,6 @@ <?php const C = array(); var_dump(C); ---EXPECTF-- +--EXPECT-- array(0) { } diff --git a/Zend/tests/ns_089.phpt b/Zend/tests/ns_089.phpt index c752eafb34..bb83ae7361 100644 --- a/Zend/tests/ns_089.phpt +++ b/Zend/tests/ns_089.phpt @@ -43,7 +43,7 @@ namespace Fiz\Biz\Buz { var_dump(BAR); } ---EXPECTF-- +--EXPECT-- Foo\Bar\Baz\A::__construct Foo\Bar\Baz\B::__construct Foo\Bar\Baz\C::__construct diff --git a/Zend/tests/ns_090.phpt b/Zend/tests/ns_090.phpt index 608d3fcf8e..8511f1c803 100644 --- a/Zend/tests/ns_090.phpt +++ b/Zend/tests/ns_090.phpt @@ -34,7 +34,7 @@ namespace Fiz\Biz\Buz { var_dump(BAR); } ---EXPECTF-- +--EXPECT-- Foo\Bar\Baz\A::__construct Foo\Bar\Baz\B::__construct Foo\Bar\Baz\C::__construct diff --git a/Zend/tests/ns_091.phpt b/Zend/tests/ns_091.phpt index b7eadeb10d..5732e7e50e 100644 --- a/Zend/tests/ns_091.phpt +++ b/Zend/tests/ns_091.phpt @@ -15,6 +15,6 @@ namespace Fiz\Biz\Buz { new B; } ---EXPECTF-- +--EXPECT-- Foo\Bar\A::__construct Foo\Bar\Baz\B::__construct
\ No newline at end of file diff --git a/Zend/tests/ns_093.phpt b/Zend/tests/ns_093.phpt index e0b3e6a1d1..6e0b937963 100644 --- a/Zend/tests/ns_093.phpt +++ b/Zend/tests/ns_093.phpt @@ -22,6 +22,6 @@ use Foo\Bar\ echo "\nDone\n"; ---EXPECTF-- +--EXPECT-- Done
\ No newline at end of file diff --git a/Zend/tests/ns_095.phpt b/Zend/tests/ns_095.phpt index 9c4496473d..2e1c0e229e 100644 --- a/Zend/tests/ns_095.phpt +++ b/Zend/tests/ns_095.phpt @@ -36,7 +36,7 @@ namespace Baz { echo "\nDone\n"; } ?> ---EXPECTF-- +--EXPECT-- string(14) "Foo\Bar\ClassA" string(14) "Foo\Bar\ClassB" diff --git a/Zend/tests/object_types/return_type_reflection.phpt b/Zend/tests/object_types/return_type_reflection.phpt index 461199febe..29dd54428b 100644 --- a/Zend/tests/object_types/return_type_reflection.phpt +++ b/Zend/tests/object_types/return_type_reflection.phpt @@ -22,7 +22,7 @@ var_dump($returnTypeTwo->isBuiltin(), (string)$returnTypeTwo); $returnTypea = (new ReflectionFunction('a'))->getReturnType(); var_dump($returnTypea->isBuiltin(), (string)$returnTypea); ---EXPECTF-- +--EXPECT-- bool(true) string(6) "object" bool(true) diff --git a/Zend/tests/object_types/type_hint_reflection.phpt b/Zend/tests/object_types/type_hint_reflection.phpt index 8968e35d6c..c0dcde3939 100644 --- a/Zend/tests/object_types/type_hint_reflection.phpt +++ b/Zend/tests/object_types/type_hint_reflection.phpt @@ -22,7 +22,7 @@ var_dump($typeHintTwo->isBuiltin(), (string)$typeHintTwo); $typeHinta = (new ReflectionFunction('a'))->getParameters()[0]->getType(); var_dump($typeHinta->isBuiltin(), (string)$typeHinta); ---EXPECTF-- +--EXPECT-- bool(true) string(6) "object" bool(true) diff --git a/Zend/tests/objects_010.phpt b/Zend/tests/objects_010.phpt index 0f85498e2c..af02d91b72 100644 --- a/Zend/tests/objects_010.phpt +++ b/Zend/tests/objects_010.phpt @@ -12,5 +12,5 @@ class test { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/Zend/tests/objects_018.phpt b/Zend/tests/objects_018.phpt index ca5b4b8cde..98ea982940 100644 --- a/Zend/tests/objects_018.phpt +++ b/Zend/tests/objects_018.phpt @@ -17,5 +17,5 @@ interface Itest3 extends Itest, Itest2 { echo "done!\n"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/Zend/tests/objects_032.phpt b/Zend/tests/objects_032.phpt index e5e3ecadb2..52a5e9fed9 100644 --- a/Zend/tests/objects_032.phpt +++ b/Zend/tests/objects_032.phpt @@ -26,7 +26,7 @@ var_dump($a); ?> ==DONE== ---EXPECTF-- +--EXPECT-- object(A)#1 (1) { ["foo"]=> array(1) { diff --git a/Zend/tests/offset_bool.phpt b/Zend/tests/offset_bool.phpt index 9bf8a89da7..f9bfeeac3e 100644 --- a/Zend/tests/offset_bool.phpt +++ b/Zend/tests/offset_bool.phpt @@ -24,7 +24,7 @@ var_dump($bool[$arr]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- NULL NULL NULL diff --git a/Zend/tests/offset_long.phpt b/Zend/tests/offset_long.phpt index c65a5ba3f8..41fedb5505 100644 --- a/Zend/tests/offset_long.phpt +++ b/Zend/tests/offset_long.phpt @@ -24,7 +24,7 @@ var_dump($long[$arr]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- NULL NULL NULL diff --git a/Zend/tests/offset_null.phpt b/Zend/tests/offset_null.phpt index 9364f0a2e5..cd98db40e7 100644 --- a/Zend/tests/offset_null.phpt +++ b/Zend/tests/offset_null.phpt @@ -24,7 +24,7 @@ var_dump($null[$arr]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- NULL NULL NULL diff --git a/Zend/tests/or_001.phpt b/Zend/tests/or_001.phpt index 1e4e5131a5..1493ec0bec 100644 --- a/Zend/tests/or_001.phpt +++ b/Zend/tests/or_001.phpt @@ -21,7 +21,7 @@ var_dump($s); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(8) "3337>755" string(8) "3337>755" string(4) "wou" diff --git a/Zend/tests/return_types/022.phpt b/Zend/tests/return_types/022.phpt index 47cbb791df..8cf6f5164c 100644 --- a/Zend/tests/return_types/022.phpt +++ b/Zend/tests/return_types/022.phpt @@ -13,5 +13,5 @@ $test = function() use($foo) : Closure { $callable = $test(); var_dump($callable()); ---EXPECTF-- +--EXPECT-- string(3) "bar" diff --git a/Zend/tests/return_types/return_reference_separation.phpt b/Zend/tests/return_types/return_reference_separation.phpt index 2ec0939088..cbf3ed5fd3 100644 --- a/Zend/tests/return_types/return_reference_separation.phpt +++ b/Zend/tests/return_types/return_reference_separation.phpt @@ -25,7 +25,7 @@ var_dump(test3($a)); var_dump($a); ?> ---EXPECTF-- +--EXPECT-- string(3) "123" int(123) string(3) "123" diff --git a/Zend/tests/return_types/rfc002.phpt b/Zend/tests/return_types/rfc002.phpt index 2f3ff02b1c..8d0ed0862f 100644 --- a/Zend/tests/return_types/rfc002.phpt +++ b/Zend/tests/return_types/rfc002.phpt @@ -9,5 +9,5 @@ function answer(): int { var_dump(answer()); ---EXPECTF-- +--EXPECT-- int(42) diff --git a/Zend/tests/settype_bool.phpt b/Zend/tests/settype_bool.phpt index cf59200b81..72b973d0f2 100644 --- a/Zend/tests/settype_bool.phpt +++ b/Zend/tests/settype_bool.phpt @@ -36,7 +36,7 @@ foreach ($vars as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(false) diff --git a/Zend/tests/settype_null.phpt b/Zend/tests/settype_null.phpt index 0abf2f9810..83ddb80561 100644 --- a/Zend/tests/settype_null.phpt +++ b/Zend/tests/settype_null.phpt @@ -36,7 +36,7 @@ foreach ($vars as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- NULL NULL NULL diff --git a/Zend/tests/traits/bug55554c.phpt b/Zend/tests/traits/bug55554c.phpt index 466b3f1c08..e1195ce883 100644 --- a/Zend/tests/traits/bug55554c.phpt +++ b/Zend/tests/traits/bug55554c.phpt @@ -42,5 +42,5 @@ echo "ReportCollision: "; $o = new ReportCollision; ---EXPECTF-- +--EXPECT-- ReportCollision: New constructor executed diff --git a/Zend/tests/traits/bug60217a.phpt b/Zend/tests/traits/bug60217a.phpt index 62a3515955..da0d06cd25 100644 --- a/Zend/tests/traits/bug60217a.phpt +++ b/Zend/tests/traits/bug60217a.phpt @@ -22,5 +22,5 @@ class C { $o = new C; $o->foo(); ---EXPECTF-- +--EXPECT-- C::foo() works. diff --git a/Zend/tests/traits/bug61998.phpt b/Zend/tests/traits/bug61998.phpt index 612caa0662..c5a3e60fbb 100644 --- a/Zend/tests/traits/bug61998.phpt +++ b/Zend/tests/traits/bug61998.phpt @@ -57,7 +57,7 @@ $b->func2(); //from Bar $b->newFunc2(); //from T2 $b->newFunc3(); //from T2 $b->func3(); //from Bar ---EXPECTF-- +--EXPECT-- From T1 From Foo From T1 diff --git a/Zend/tests/traits/bugs/abstract-methods02.phpt b/Zend/tests/traits/bugs/abstract-methods02.phpt index 78abe7d1bc..25130c538b 100644 --- a/Zend/tests/traits/bugs/abstract-methods02.phpt +++ b/Zend/tests/traits/bugs/abstract-methods02.phpt @@ -22,5 +22,5 @@ class TraitsTest { $test = new TraitsTest(); $test->hello(); ?> ---EXPECTF-- +--EXPECT-- Hello
\ No newline at end of file diff --git a/Zend/tests/traits/bugs/abstract-methods03.phpt b/Zend/tests/traits/bugs/abstract-methods03.phpt index 605b1d8e9e..2a699d8df5 100644 --- a/Zend/tests/traits/bugs/abstract-methods03.phpt +++ b/Zend/tests/traits/bugs/abstract-methods03.phpt @@ -18,5 +18,5 @@ class TraitsTest { $test = new TraitsTest(); $test->hello(); ?> ---EXPECTF-- +--EXPECT-- Hello
\ No newline at end of file diff --git a/Zend/tests/traits/bugs/abstract-methods04.phpt b/Zend/tests/traits/bugs/abstract-methods04.phpt index 56a3464067..b3b5bfaca5 100644 --- a/Zend/tests/traits/bugs/abstract-methods04.phpt +++ b/Zend/tests/traits/bugs/abstract-methods04.phpt @@ -32,5 +32,5 @@ $test = new TraitsTest2(); $test->hello(); ?> ---EXPECTF-- +--EXPECT-- HelloHello
\ No newline at end of file diff --git a/Zend/tests/traits/bugs/alias-semantics.phpt b/Zend/tests/traits/bugs/alias-semantics.phpt index ac86692880..5e7965d6dc 100644 --- a/Zend/tests/traits/bugs/alias-semantics.phpt +++ b/Zend/tests/traits/bugs/alias-semantics.phpt @@ -19,5 +19,5 @@ $test->a(); $test->b(); ?> ---EXPECTF-- +--EXPECT-- AA
\ No newline at end of file diff --git a/Zend/tests/traits/bugs/alias-semantics02.phpt b/Zend/tests/traits/bugs/alias-semantics02.phpt index e0b5286e4f..58faf9f290 100644 --- a/Zend/tests/traits/bugs/alias-semantics02.phpt +++ b/Zend/tests/traits/bugs/alias-semantics02.phpt @@ -21,5 +21,5 @@ $test->a(); $test->b(); ?> ---EXPECTF-- +--EXPECT-- AA
\ No newline at end of file diff --git a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt index 0bbea11005..464d9783a4 100644 --- a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt +++ b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt @@ -27,5 +27,5 @@ class TraitsTest { $test = new TraitsTest(); $test->hello(); ?> ---EXPECTF-- +--EXPECT-- Hello
\ No newline at end of file diff --git a/Zend/tests/traits/conflict002.phpt b/Zend/tests/traits/conflict002.phpt index 64712d40a4..ab913d8b05 100644 --- a/Zend/tests/traits/conflict002.phpt +++ b/Zend/tests/traits/conflict002.phpt @@ -28,5 +28,5 @@ class TheWorldIsNotEnough { $o = new TheWorldIsNotEnough(); $o->sayHello(); // echos Hello Universe! ?> ---EXPECTF-- +--EXPECT-- Hello Universe!
\ No newline at end of file diff --git a/Zend/tests/traits/flattening001.phpt b/Zend/tests/traits/flattening001.phpt index aa7f03dcb8..890147dc4a 100644 --- a/Zend/tests/traits/flattening001.phpt +++ b/Zend/tests/traits/flattening001.phpt @@ -36,7 +36,7 @@ $o->setText('bar'); var_dump($o->getText()); ?> ---EXPECTF-- +--EXPECT-- string(4) "test" string(3) "foo" string(3) "bar"
\ No newline at end of file diff --git a/Zend/tests/traits/flattening002.phpt b/Zend/tests/traits/flattening002.phpt index 251af29711..65f8e2fee5 100644 --- a/Zend/tests/traits/flattening002.phpt +++ b/Zend/tests/traits/flattening002.phpt @@ -24,5 +24,5 @@ class MyHelloWorld extends Base { $o = new MyHelloWorld(); $o->sayHello(); ?> ---EXPECTF-- +--EXPECT-- Hello World!
\ No newline at end of file diff --git a/Zend/tests/traits/flattening003.phpt b/Zend/tests/traits/flattening003.phpt index d189ca70c1..3c5d461be1 100644 --- a/Zend/tests/traits/flattening003.phpt +++ b/Zend/tests/traits/flattening003.phpt @@ -28,5 +28,5 @@ $o = new MyHelloWorld(); $o->sayHello(); $o->sayWorld(); ?> ---EXPECTF-- +--EXPECT-- Hello World!
\ No newline at end of file diff --git a/Zend/tests/traits/inheritance001.phpt b/Zend/tests/traits/inheritance001.phpt index e8195c4749..951344ffbb 100644 --- a/Zend/tests/traits/inheritance001.phpt +++ b/Zend/tests/traits/inheritance001.phpt @@ -20,5 +20,5 @@ class TheWorldIsNotEnough { $o = new TheWorldIsNotEnough(); $o->sayHello(); // echos Hello Universe! ?> ---EXPECTF-- +--EXPECT-- Hello Universe!
\ No newline at end of file diff --git a/Zend/tests/traits/inheritance002.phpt b/Zend/tests/traits/inheritance002.phpt index 51badc5a4c..d258e43981 100644 --- a/Zend/tests/traits/inheritance002.phpt +++ b/Zend/tests/traits/inheritance002.phpt @@ -23,5 +23,5 @@ class MyHelloWorld extends Base { $o = new MyHelloWorld(); $o->sayHello(); ?> ---EXPECTF-- +--EXPECT-- World!
\ No newline at end of file diff --git a/Zend/tests/traits/language001.phpt b/Zend/tests/traits/language001.phpt index d892112416..cd8176ca3b 100644 --- a/Zend/tests/traits/language001.phpt +++ b/Zend/tests/traits/language001.phpt @@ -17,5 +17,5 @@ class TraitsTest { $test = new TraitsTest(); $test->hello(); ?> ---EXPECTF-- +--EXPECT-- Hello diff --git a/Zend/tests/traits/language002.phpt b/Zend/tests/traits/language002.phpt index d093f2952d..bd11858ee0 100644 --- a/Zend/tests/traits/language002.phpt +++ b/Zend/tests/traits/language002.phpt @@ -28,5 +28,5 @@ $o->sayHello(); $o->sayWorld(); $o->sayExclamationMark(); ?> ---EXPECTF-- +--EXPECT-- Hello World!
\ No newline at end of file diff --git a/Zend/tests/traits/language003.phpt b/Zend/tests/traits/language003.phpt index 77d4429f43..d3b7a64420 100644 --- a/Zend/tests/traits/language003.phpt +++ b/Zend/tests/traits/language003.phpt @@ -25,5 +25,5 @@ class MyHelloWorld { $o = new MyHelloWorld(); $o->saySomething(); ?> ---EXPECTF-- +--EXPECT-- Hello
\ No newline at end of file diff --git a/Zend/tests/traits/language004.phpt b/Zend/tests/traits/language004.phpt index 4df307ab8d..31e9da99db 100644 --- a/Zend/tests/traits/language004.phpt +++ b/Zend/tests/traits/language004.phpt @@ -27,5 +27,5 @@ $o = new MyHelloWorld(); $o->saySomething(); $o->sayWorld(); ?> ---EXPECTF-- +--EXPECT-- Hello World
\ No newline at end of file diff --git a/Zend/tests/traits/language005.phpt b/Zend/tests/traits/language005.phpt index 20eaeb35c2..13319949f4 100644 --- a/Zend/tests/traits/language005.phpt +++ b/Zend/tests/traits/language005.phpt @@ -36,5 +36,5 @@ $t->bigTalk(); $t->talk(); ?> ---EXPECTF-- +--EXPECT-- bAB
\ No newline at end of file diff --git a/Zend/tests/traits/language006.phpt b/Zend/tests/traits/language006.phpt index 5a32359bb5..b51a8329ac 100644 --- a/Zend/tests/traits/language006.phpt +++ b/Zend/tests/traits/language006.phpt @@ -27,5 +27,5 @@ $o->setWorld(' World!'); $o->sayHelloWorld(); ?> ---EXPECTF-- +--EXPECT-- Hello World!
\ No newline at end of file diff --git a/Zend/tests/traits/language007.phpt b/Zend/tests/traits/language007.phpt index 3b65d0123a..082022cc79 100644 --- a/Zend/tests/traits/language007.phpt +++ b/Zend/tests/traits/language007.phpt @@ -26,5 +26,5 @@ $o->sayHello(); $o->sayWorld(); ?> ---EXPECTF-- +--EXPECT-- Hello World!
\ No newline at end of file diff --git a/Zend/tests/traits/language009.phpt b/Zend/tests/traits/language009.phpt index e55c8d84aa..477d267e29 100644 --- a/Zend/tests/traits/language009.phpt +++ b/Zend/tests/traits/language009.phpt @@ -32,5 +32,5 @@ $t = new MyClass; $t->foo(); ?> ---EXPECTF-- +--EXPECT-- b
\ No newline at end of file diff --git a/Zend/tests/traits/language012.phpt b/Zend/tests/traits/language012.phpt index 481dd64ec7..af854a79e2 100644 --- a/Zend/tests/traits/language012.phpt +++ b/Zend/tests/traits/language012.phpt @@ -22,6 +22,6 @@ $o->inc(); $o->inc(); ?> ---EXPECTF-- +--EXPECT-- 1 2 diff --git a/Zend/tests/traits/language013.phpt b/Zend/tests/traits/language013.phpt index a55cbbed34..91eba5705b 100644 --- a/Zend/tests/traits/language013.phpt +++ b/Zend/tests/traits/language013.phpt @@ -30,7 +30,7 @@ $p->inc(); $p->inc(); ?> ---EXPECTF-- +--EXPECT-- 1 2 1 diff --git a/Zend/tests/traits/property001.phpt b/Zend/tests/traits/property001.phpt index c9c26ad770..90dd8ca92d 100644 --- a/Zend/tests/traits/property001.phpt +++ b/Zend/tests/traits/property001.phpt @@ -29,7 +29,7 @@ class TraitsTest2 { var_dump(property_exists('TraitsTest', 'foo')); var_dump(property_exists('TraitsTest2', 'foo')); ?> ---EXPECTF-- +--EXPECT-- PRE-CLASS-GUARD-TraitsTest PRE-CLASS-GUARD-TraitsTest2 bool(true) diff --git a/Zend/tests/traits/property002.phpt b/Zend/tests/traits/property002.phpt index f58c2a428e..c96f314c93 100644 --- a/Zend/tests/traits/property002.phpt +++ b/Zend/tests/traits/property002.phpt @@ -25,7 +25,7 @@ var_dump(property_exists('TraitsTest', 'world')); $t = new TraitsTest; $t->test(); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) hello World! diff --git a/Zend/tests/traits/property006.phpt b/Zend/tests/traits/property006.phpt index a34f3f217f..fc21e558b9 100644 --- a/Zend/tests/traits/property006.phpt +++ b/Zend/tests/traits/property006.phpt @@ -28,7 +28,7 @@ class Notice extends Base { } echo "POST-CLASS-GUARD2\n"; ?> ---EXPECTF-- +--EXPECT-- PRE-CLASS-GUARD POST-CLASS-GUARD POST-CLASS-GUARD2 diff --git a/Zend/tests/traits/property007.phpt b/Zend/tests/traits/property007.phpt index 80a81958d3..d2f3f0ff59 100644 --- a/Zend/tests/traits/property007.phpt +++ b/Zend/tests/traits/property007.phpt @@ -27,7 +27,7 @@ class Notice extends Base { } echo "POST-CLASS-GUARD2\n"; ?> ---EXPECTF-- +--EXPECT-- PRE-CLASS-GUARD POST-CLASS-GUARD POST-CLASS-GUARD2 diff --git a/Zend/tests/traits/property008.phpt b/Zend/tests/traits/property008.phpt index 41d0e8802b..694ca85b5d 100644 --- a/Zend/tests/traits/property008.phpt +++ b/Zend/tests/traits/property008.phpt @@ -40,7 +40,7 @@ $b = new SubclassB; var_dump($b); ?> ---EXPECTF-- +--EXPECT-- object(SubclassClassicInheritance)#1 (2) { ["hello":"SubclassClassicInheritance":private]=> int(0) diff --git a/Zend/tests/traits/property009.phpt b/Zend/tests/traits/property009.phpt index fdd2351023..0b5918c614 100644 --- a/Zend/tests/traits/property009.phpt +++ b/Zend/tests/traits/property009.phpt @@ -40,7 +40,7 @@ $b = new SubclassB; var_dump($b); ?> ---EXPECTF-- +--EXPECT-- object(SubclassClassicInheritance)#1 (1) { ["hello"]=> diff --git a/Zend/tests/try/catch_finally_001.phpt b/Zend/tests/try/catch_finally_001.phpt index 0c3f597a0a..db0605fc05 100644 --- a/Zend/tests/try/catch_finally_001.phpt +++ b/Zend/tests/try/catch_finally_001.phpt @@ -21,7 +21,7 @@ foo(); echo "\n"; foo(true); ?> ---EXPECTF-- +--EXPECT-- try finally end diff --git a/Zend/tests/try/catch_finally_002.phpt b/Zend/tests/try/catch_finally_002.phpt index c54477ff8c..07a576f2e5 100644 --- a/Zend/tests/try/catch_finally_002.phpt +++ b/Zend/tests/try/catch_finally_002.phpt @@ -15,7 +15,7 @@ function foo () { var_dump(foo()); ?> ---EXPECTF-- +--EXPECT-- try finally int(1) diff --git a/Zend/tests/try/catch_finally_003.phpt b/Zend/tests/try/catch_finally_003.phpt index 24e468d335..610d701872 100644 --- a/Zend/tests/try/catch_finally_003.phpt +++ b/Zend/tests/try/catch_finally_003.phpt @@ -32,7 +32,7 @@ function &bar($a) { var_dump(foo("para")); var_dump(bar("para")); ?> ---EXPECTF-- +--EXPECT-- string(3) "try" string(7) "finally" string(7) "finally" diff --git a/Zend/tests/try/catch_finally_005.phpt b/Zend/tests/try/catch_finally_005.phpt index c2fd55df27..7671d05df5 100644 --- a/Zend/tests/try/catch_finally_005.phpt +++ b/Zend/tests/try/catch_finally_005.phpt @@ -17,5 +17,5 @@ function foo ($a) { var_dump(foo("para")); ?> ---EXPECTF-- +--EXPECT-- int(3) diff --git a/Zend/tests/try/finally_goto_003.phpt b/Zend/tests/try/finally_goto_003.phpt index 8529ff7865..9f4115fee6 100644 --- a/Zend/tests/try/finally_goto_003.phpt +++ b/Zend/tests/try/finally_goto_003.phpt @@ -11,5 +11,5 @@ test: } echo "okey"; ?> ---EXPECTF-- +--EXPECT-- okey diff --git a/Zend/tests/try/try_catch_finally_001.phpt b/Zend/tests/try/try_catch_finally_001.phpt index 3d478f461a..641bb25442 100644 --- a/Zend/tests/try/try_catch_finally_001.phpt +++ b/Zend/tests/try/try_catch_finally_001.phpt @@ -32,5 +32,5 @@ function foo () { var_dump(foo()); ?> ---EXPECTF-- +--EXPECT-- 1234int(1) diff --git a/Zend/tests/try/try_catch_finally_002.phpt b/Zend/tests/try/try_catch_finally_002.phpt index 79efcb3de8..07904fb158 100644 --- a/Zend/tests/try/try_catch_finally_002.phpt +++ b/Zend/tests/try/try_catch_finally_002.phpt @@ -38,5 +38,5 @@ function foo () { var_dump(foo()); ?> ---EXPECTF-- +--EXPECT-- 123456int(7) diff --git a/Zend/tests/try/try_catch_finally_003.phpt b/Zend/tests/try/try_catch_finally_003.phpt index 7ec8ec82db..4d285eedb8 100644 --- a/Zend/tests/try/try_catch_finally_003.phpt +++ b/Zend/tests/try/try_catch_finally_003.phpt @@ -32,5 +32,5 @@ function foo () { var_dump(foo()); ?> ---EXPECTF-- +--EXPECT-- 1234int(4) diff --git a/Zend/tests/try/try_catch_finally_004.phpt b/Zend/tests/try/try_catch_finally_004.phpt index eb8d0966a1..05318e0774 100644 --- a/Zend/tests/try/try_catch_finally_004.phpt +++ b/Zend/tests/try/try_catch_finally_004.phpt @@ -24,7 +24,7 @@ try { } var_dump("end"); ?> ---EXPECTF-- +--EXPECT-- string(3) "try" string(7) "finally" string(8) "finally2" diff --git a/Zend/tests/try/try_catch_finally_005.phpt b/Zend/tests/try/try_catch_finally_005.phpt index dafeb6bbe0..9ff21c3e8b 100644 --- a/Zend/tests/try/try_catch_finally_005.phpt +++ b/Zend/tests/try/try_catch_finally_005.phpt @@ -39,7 +39,7 @@ for ($i = 0; $i < 3; $i ++) { } ?> ---EXPECTF-- +--EXPECT-- string(5) "break" string(9) "continue1" string(9) "continue1" diff --git a/Zend/tests/try/try_catch_finally_006.phpt b/Zend/tests/try/try_catch_finally_006.phpt index dab6af6a58..f09fa1fed2 100644 --- a/Zend/tests/try/try_catch_finally_006.phpt +++ b/Zend/tests/try/try_catch_finally_006.phpt @@ -28,7 +28,7 @@ var_dump(foo()); var_dump(foo(new Exception())); ?> ---EXPECTF-- +--EXPECT-- string(8) "finally1" string(8) "finally2" string(5) "label" diff --git a/Zend/tests/try/try_catch_finally_007.phpt b/Zend/tests/try/try_catch_finally_007.phpt index ad33c68131..fc3520c84c 100644 --- a/Zend/tests/try/try_catch_finally_007.phpt +++ b/Zend/tests/try/try_catch_finally_007.phpt @@ -34,7 +34,7 @@ var_dump(foo()); var_dump(foo(true)); ?> ---EXPECTF-- +--EXPECT-- string(8) "finally1" string(7) "catched" string(8) "finally2" diff --git a/Zend/tests/try/try_finally_006.phpt b/Zend/tests/try/try_finally_006.phpt index f53e6b5bc1..58113465e0 100644 --- a/Zend/tests/try/try_finally_006.phpt +++ b/Zend/tests/try/try_finally_006.phpt @@ -21,6 +21,6 @@ label: foo(); ?> ---EXPECTF-- +--EXPECT-- label okey diff --git a/Zend/tests/type_declarations/default_boolean_hint_values.phpt b/Zend/tests/type_declarations/default_boolean_hint_values.phpt index 6ba262848d..6711de7733 100644 --- a/Zend/tests/type_declarations/default_boolean_hint_values.phpt +++ b/Zend/tests/type_declarations/default_boolean_hint_values.phpt @@ -11,6 +11,6 @@ function foo(bool $x = true, bool $y = false) { foo(); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(false) diff --git a/Zend/tests/type_declarations/internal_function_strict_mode.phpt b/Zend/tests/type_declarations/internal_function_strict_mode.phpt index 8b70bbae1a..a9e7c9a56b 100644 --- a/Zend/tests/type_declarations/internal_function_strict_mode.phpt +++ b/Zend/tests/type_declarations/internal_function_strict_mode.phpt @@ -26,7 +26,7 @@ try { } ?> ---EXPECTF-- +--EXPECT-- *** Trying Ord With Integer *** Caught ord() expects parameter 1 to be string, int given *** Trying Array Map With Invalid Callback diff --git a/Zend/tests/type_declarations/scalar_constant_defaults.phpt b/Zend/tests/type_declarations/scalar_constant_defaults.phpt index 2982d9b2af..b9076c6b52 100644 --- a/Zend/tests/type_declarations/scalar_constant_defaults.phpt +++ b/Zend/tests/type_declarations/scalar_constant_defaults.phpt @@ -64,7 +64,7 @@ echo "Testing int with null null constant" . PHP_EOL; var_dump(int_val_default_null(null)); ?> ---EXPECTF-- +--EXPECT-- Testing int val int(10) Testing float val diff --git a/Zend/tests/type_declarations/scalar_strict_declaration_placement_005.phpt b/Zend/tests/type_declarations/scalar_strict_declaration_placement_005.phpt index 8611a205cf..b213bb11dd 100644 --- a/Zend/tests/type_declarations/scalar_strict_declaration_placement_005.phpt +++ b/Zend/tests/type_declarations/scalar_strict_declaration_placement_005.phpt @@ -10,5 +10,5 @@ namespace Foo; var_dump(strlen("abc")); ?> ---EXPECTF-- +--EXPECT-- int(3)
\ No newline at end of file diff --git a/Zend/tests/type_declarations/scalar_strict_declaration_placement_006.phpt b/Zend/tests/type_declarations/scalar_strict_declaration_placement_006.phpt index 2af05b6c65..7337ee4379 100644 --- a/Zend/tests/type_declarations/scalar_strict_declaration_placement_006.phpt +++ b/Zend/tests/type_declarations/scalar_strict_declaration_placement_006.phpt @@ -21,5 +21,5 @@ namespace Foo; var_dump(strlen("abc")); ?> ---EXPECTF-- +--EXPECT-- int(3)
\ No newline at end of file diff --git a/Zend/tests/type_declarations/scalar_strict_declaration_placement_007.phpt b/Zend/tests/type_declarations/scalar_strict_declaration_placement_007.phpt index 3e4c693afb..deb7a8c976 100644 --- a/Zend/tests/type_declarations/scalar_strict_declaration_placement_007.phpt +++ b/Zend/tests/type_declarations/scalar_strict_declaration_placement_007.phpt @@ -21,5 +21,5 @@ namespace Foo; var_dump(strlen("abc")); ?> ---EXPECTF-- +--EXPECT-- int(3)
\ No newline at end of file diff --git a/Zend/tests/type_declarations/strict_include_explicit_weak.phpt b/Zend/tests/type_declarations/strict_include_explicit_weak.phpt index a42d633f47..997bdf77b4 100644 --- a/Zend/tests/type_declarations/strict_include_explicit_weak.phpt +++ b/Zend/tests/type_declarations/strict_include_explicit_weak.phpt @@ -10,5 +10,5 @@ require 'strict_include_explicit_weak_2.inc'; // calls within that file should stay weak, despite being included by strict fille ?> ---EXPECTF-- +--EXPECT-- Success! diff --git a/Zend/tests/type_declarations/strict_include_weak.phpt b/Zend/tests/type_declarations/strict_include_weak.phpt index ce29db7e75..f90f1f14c4 100644 --- a/Zend/tests/type_declarations/strict_include_weak.phpt +++ b/Zend/tests/type_declarations/strict_include_weak.phpt @@ -10,5 +10,5 @@ require 'strict_include_weak_2.inc'; // calls within that file should stay weak, despite being included by strict file ?> ---EXPECTF-- +--EXPECT-- Success! diff --git a/Zend/tests/unexpected_ref_bug.phpt b/Zend/tests/unexpected_ref_bug.phpt index 61fe1aa5b1..ba61ee582a 100644 --- a/Zend/tests/unexpected_ref_bug.phpt +++ b/Zend/tests/unexpected_ref_bug.phpt @@ -14,5 +14,5 @@ $my_var=array(1,2,3); $data = call_user_func_array("implode",array(&$my_var, new StdClass())); echo "Done.\n"; ?> ---EXPECTF-- +--EXPECT-- Done. diff --git a/Zend/tests/unset_cv08.phpt b/Zend/tests/unset_cv08.phpt index 9b8ab1520f..0798ca48ed 100644 --- a/Zend/tests/unset_cv08.phpt +++ b/Zend/tests/unset_cv08.phpt @@ -9,7 +9,7 @@ echo $a; echo $b; echo "ok\n"; ?> ---EXPECTF-- +--EXPECT-- ok ok ok diff --git a/Zend/tests/use_const/shadow_core.phpt b/Zend/tests/use_const/shadow_core.phpt index 7d8bcbd189..5dbf396e63 100644 --- a/Zend/tests/use_const/shadow_core.phpt +++ b/Zend/tests/use_const/shadow_core.phpt @@ -11,6 +11,6 @@ var_dump(PHP_VERSION); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(42) Done diff --git a/Zend/tests/xor_001.phpt b/Zend/tests/xor_001.phpt index e1a521dff9..c61135e9e2 100644 --- a/Zend/tests/xor_001.phpt +++ b/Zend/tests/xor_001.phpt @@ -11,6 +11,6 @@ var_dump($c); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(1) Done diff --git a/Zend/tests/xor_002.phpt b/Zend/tests/xor_002.phpt index 0cf4054fa4..bccf008931 100644 --- a/Zend/tests/xor_002.phpt +++ b/Zend/tests/xor_002.phpt @@ -29,7 +29,7 @@ var_dump(bin2hex($s)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(6) "030107" string(6) "030107" string(8) "070a1e11" diff --git a/Zend/tests/xor_003.phpt b/Zend/tests/xor_003.phpt index 8aa1c636b7..8fd0e98c05 100644 --- a/Zend/tests/xor_003.phpt +++ b/Zend/tests/xor_003.phpt @@ -12,7 +12,7 @@ var_dump($f ^ $f); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(1) int(0) int(0) diff --git a/Zend/tests/zend_signed_multiply-32bit.phpt b/Zend/tests/zend_signed_multiply-32bit.phpt index 3f37cbac19..991cf5e891 100644 --- a/Zend/tests/zend_signed_multiply-32bit.phpt +++ b/Zend/tests/zend_signed_multiply-32bit.phpt @@ -8,7 +8,7 @@ var_dump(0x8000 * -0xffff); var_dump(0x8001 * 0xfffe); var_dump(0x8001 * -0xffff); ?> ---EXPECTF-- +--EXPECT-- int(-2147450880) int(2147483646) float(-2147516415) diff --git a/Zend/tests/zend_signed_multiply-64bit-2.phpt b/Zend/tests/zend_signed_multiply-64bit-2.phpt index f0a3bafa5e..9c61a22bc3 100644 --- a/Zend/tests/zend_signed_multiply-64bit-2.phpt +++ b/Zend/tests/zend_signed_multiply-64bit-2.phpt @@ -13,7 +13,7 @@ for($c = 0; $c <= 16; $c++) { echo "-----------\n"; } ?> ---EXPECTF-- +--EXPECT-- int(-16) int(-922337203685477580) float(1.4757395258968E+19) diff --git a/Zend/tests/zend_signed_multiply-64bit.phpt b/Zend/tests/zend_signed_multiply-64bit.phpt index d392b2e78a..20ef277770 100644 --- a/Zend/tests/zend_signed_multiply-64bit.phpt +++ b/Zend/tests/zend_signed_multiply-64bit.phpt @@ -8,7 +8,7 @@ var_dump(0x80000000 * -0xffffffff); var_dump(0x80000001 * 0xfffffffe); var_dump(0x80000001 * -0xffffffff); ?> ---EXPECTF-- +--EXPECT-- int(-9223372034707292160) int(9223372036854775806) float(-9.2233720390023E+18) diff --git a/Zend/tests/zend_strtod.phpt b/Zend/tests/zend_strtod.phpt index 7f4bca5966..56e25b241c 100644 --- a/Zend/tests/zend_strtod.phpt +++ b/Zend/tests/zend_strtod.phpt @@ -11,7 +11,7 @@ var_dump("123123139932690.21688500" - "11399327900000000.21688500"); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- float(-100) float(808792757210) float(-4.5646456464565E+27) |