From f6cc4ee4df8f8c203b1cf2649f5d16839fe3e34b Mon Sep 17 00:00:00 2001 From: Steph Fox Date: Mon, 26 May 2008 23:45:15 +0000 Subject: [PATCH] - killed off UEXPECT - Tony has a patch that should fix all these --- .../class_object/class_exists_basic_001.phpt | 4 +- .../class_exists_variation_001.phpt | 2 +- .../class_exists_variation_002.phpt | 2 +- .../class_exists_variation_003.phpt | 4 +- .../class_object/forward_static_call_001.phpt | 2 +- .../class_object/forward_static_call_003.phpt | 2 +- .../class_object/get_class_error_001.phpt | 2 +- .../get_class_methods_basic_001.phpt | 30 +---- .../get_class_methods_basic_002.phpt | 114 +----------------- .../get_class_methods_basic_003.phpt | 38 +----- .../get_class_methods_error_001.phpt | 2 +- .../get_class_methods_variation_001.phpt | 2 +- .../get_class_methods_variation_002.phpt | 11 +- .../class_object/get_class_variation_001.phpt | 97 +-------------- .../class_object/get_class_variation_002.phpt | 7 +- .../get_declared_classes_basic_001.phpt | 2 +- .../get_declared_classes_error_001.phpt | 2 +- .../get_declared_interfaces_basic_001.phpt | 2 +- .../get_declared_interfaces_error_001.phpt | 2 +- .../get_object_vars_basic_001.phpt | 51 +------- .../get_object_vars_basic_002.phpt | 29 +---- .../get_object_vars_error_001.phpt | 2 +- .../get_object_vars_variation_001.phpt | 4 +- .../get_object_vars_variation_002.phpt | 26 +--- .../get_object_vars_variation_003.phpt | 2 +- .../get_parent_class_error_001.phpt | 2 +- .../get_parent_class_variation_001.phpt | 9 +- .../get_parent_class_variation_002.phpt | 2 +- .../tests/class_object/is_a_error_001.phpt | 2 +- .../class_object/is_a_variation_001.phpt | 2 +- .../class_object/is_a_variation_002.phpt | 2 +- .../class_object/is_a_variation_003.phpt | 2 +- .../is_subclass_of_variation_001.phpt | 2 +- .../is_subclass_of_variation_002.phpt | 95 +-------------- .../is_subclass_of_variation_003.phpt | 4 +- .../class_object/method_exists_basic_001.phpt | 4 +- .../class_object/method_exists_basic_002.phpt | 4 +- .../class_object/method_exists_basic_003.phpt | 4 +- .../method_exists_variation_001.phpt | 2 +- .../method_exists_variation_002.phpt | 95 +-------------- .../method_exists_variation_003.phpt | 4 +- 41 files changed, 58 insertions(+), 618 deletions(-) diff --git a/ext/standard/tests/class_object/class_exists_basic_001.phpt b/ext/standard/tests/class_object/class_exists_basic_001.phpt index 4cb6cbd327..420310f6e8 100644 --- a/ext/standard/tests/class_object/class_exists_basic_001.phpt +++ b/ext/standard/tests/class_object/class_exists_basic_001.phpt @@ -31,7 +31,7 @@ var_dump( class_exists('stdclass') ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing class_exists() : basic functionality *** Calling class_exists() on non-existent class with autoload explicitly enabled: In __autoload(C) @@ -52,4 +52,4 @@ bool(false) Calling class_exists() on existing class with autoload unspecified: bool(true) -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/class_exists_variation_001.phpt b/ext/standard/tests/class_object/class_exists_variation_001.phpt index 496c2dbe87..9fb7e81c6c 100644 --- a/ext/standard/tests/class_object/class_exists_variation_001.phpt +++ b/ext/standard/tests/class_object/class_exists_variation_001.phpt @@ -184,4 +184,4 @@ bool(false) Arg value bool(false) -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/class_exists_variation_002.phpt b/ext/standard/tests/class_object/class_exists_variation_002.phpt index 63cfe03d51..0d8112471c 100644 --- a/ext/standard/tests/class_object/class_exists_variation_002.phpt +++ b/ext/standard/tests/class_object/class_exists_variation_002.phpt @@ -195,4 +195,4 @@ bool(false) Arg value bool(false) -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/class_exists_variation_003.phpt b/ext/standard/tests/class_object/class_exists_variation_003.phpt index 0745601452..c090841694 100644 --- a/ext/standard/tests/class_object/class_exists_variation_003.phpt +++ b/ext/standard/tests/class_object/class_exists_variation_003.phpt @@ -13,6 +13,6 @@ var_dump(class_exists('casesensitivitytest')); echo "Done" ?> ---EXPECTF-- +--EXPECT-- bool(true) -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/forward_static_call_001.phpt b/ext/standard/tests/class_object/forward_static_call_001.phpt index 2b3a8dd059..0fac78f4ea 100755 --- a/ext/standard/tests/class_object/forward_static_call_001.phpt +++ b/ext/standard/tests/class_object/forward_static_call_001.phpt @@ -58,7 +58,7 @@ C::test3(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- A - B diff --git a/ext/standard/tests/class_object/forward_static_call_003.phpt b/ext/standard/tests/class_object/forward_static_call_003.phpt index 2ea102e5d2..ea56f8d2e7 100755 --- a/ext/standard/tests/class_object/forward_static_call_003.phpt +++ b/ext/standard/tests/class_object/forward_static_call_003.phpt @@ -39,7 +39,7 @@ C::test(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- A - B diff --git a/ext/standard/tests/class_object/get_class_error_001.phpt b/ext/standard/tests/class_object/get_class_error_001.phpt index b563c31881..d3c19e609a 100644 --- a/ext/standard/tests/class_object/get_class_error_001.phpt +++ b/ext/standard/tests/class_object/get_class_error_001.phpt @@ -25,4 +25,4 @@ echo "Done"; Warning: Wrong parameter count for get_class() in %s on line 14 NULL -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_class_methods_basic_001.phpt b/ext/standard/tests/class_object/get_class_methods_basic_001.phpt index 4c95c8f607..85df7096dd 100644 --- a/ext/standard/tests/class_object/get_class_methods_basic_001.phpt +++ b/ext/standard/tests/class_object/get_class_methods_basic_001.phpt @@ -35,33 +35,7 @@ var_dump( get_class_methods("NonExistent") ); echo "Done"; ?> ---EXPECTF-- -*** Testing get_class_methods() : basic functionality *** -Argument is class name: -array(3) { - [0]=> - string(1) "f" - [1]=> - string(1) "g" - [2]=> - string(1) "h" -} -Argument is class instance: -array(3) { - [0]=> - string(1) "f" - [1]=> - string(1) "g" - [2]=> - string(1) "h" -} -Argument is name of class which has no methods: -array(0) { -} -Argument is non existent class: -NULL -Done ---UEXPECTF-- +--EXPECT-- *** Testing get_class_methods() : basic functionality *** Argument is class name: array(3) { @@ -86,4 +60,4 @@ array(0) { } Argument is non existent class: NULL -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_class_methods_basic_002.phpt b/ext/standard/tests/class_object/get_class_methods_basic_002.phpt index d223018391..45cadc924d 100644 --- a/ext/standard/tests/class_object/get_class_methods_basic_002.phpt +++ b/ext/standard/tests/class_object/get_class_methods_basic_002.phpt @@ -66,117 +66,7 @@ X::testFromX(); echo "Done"; ?> ---EXPECTF-- -Accessing D from global scope: -array(4) { - [0]=> - string(4) "pubD" - [1]=> - string(9) "testFromD" - [2]=> - string(4) "pubC" - [3]=> - string(9) "testFromC" -} -Accessing C from C: -array(4) { - [0]=> - string(5) "privC" - [1]=> - string(5) "protC" - [2]=> - string(4) "pubC" - [3]=> - string(9) "testFromC" -} -Accessing D from C: -array(7) { - [0]=> - string(5) "protD" - [1]=> - string(4) "pubD" - [2]=> - string(9) "testFromD" - [3]=> - string(5) "privC" - [4]=> - string(5) "protC" - [5]=> - string(4) "pubC" - [6]=> - string(9) "testFromC" -} -Accessing X from C: -array(2) { - [0]=> - string(4) "pubX" - [1]=> - string(9) "testFromX" -} -Accessing C from D: -array(3) { - [0]=> - string(5) "protC" - [1]=> - string(4) "pubC" - [2]=> - string(9) "testFromC" -} -Accessing D from D: -array(7) { - [0]=> - string(5) "privD" - [1]=> - string(5) "protD" - [2]=> - string(4) "pubD" - [3]=> - string(9) "testFromD" - [4]=> - string(5) "protC" - [5]=> - string(4) "pubC" - [6]=> - string(9) "testFromC" -} -Accessing X from D: -array(2) { - [0]=> - string(4) "pubX" - [1]=> - string(9) "testFromX" -} -Accessing C from X: -array(2) { - [0]=> - string(4) "pubC" - [1]=> - string(9) "testFromC" -} -Accessing D from X: -array(4) { - [0]=> - string(4) "pubD" - [1]=> - string(9) "testFromD" - [2]=> - string(4) "pubC" - [3]=> - string(9) "testFromC" -} -Accessing X from X: -array(4) { - [0]=> - string(5) "privX" - [1]=> - string(5) "protX" - [2]=> - string(4) "pubX" - [3]=> - string(9) "testFromX" -} -Done ---UEXPECTF-- +--EXPECT-- Accessing D from global scope: array(4) { [0]=> @@ -285,4 +175,4 @@ array(4) { [3]=> unicode(9) "testFromX" } -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_class_methods_basic_003.phpt b/ext/standard/tests/class_object/get_class_methods_basic_003.phpt index c9e7349f80..d4640c7c31 100644 --- a/ext/standard/tests/class_object/get_class_methods_basic_003.phpt +++ b/ext/standard/tests/class_object/get_class_methods_basic_003.phpt @@ -40,41 +40,7 @@ var_dump(get_class_methods("C")); C::testFromC(); echo "Done"; ?> ---EXPECTF-- -Accessing I from global scope: -array(1) { - [0]=> - string(4) "pubI" -} -Accessing C from global scope: -array(3) { - [0]=> - string(4) "pubI" - [1]=> - string(4) "pubC" - [2]=> - string(9) "testFromC" -} -Accessing I from C: -array(1) { - [0]=> - string(4) "pubI" -} -Accessing C from C: -array(5) { - [0]=> - string(4) "pubI" - [1]=> - string(5) "privC" - [2]=> - string(5) "protC" - [3]=> - string(4) "pubC" - [4]=> - string(9) "testFromC" -} -Done ---UEXPECTF-- +--EXPECT-- Accessing I from global scope: array(1) { [0]=> @@ -107,4 +73,4 @@ array(5) { [4]=> unicode(9) "testFromC" } -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_class_methods_error_001.phpt b/ext/standard/tests/class_object/get_class_methods_error_001.phpt index 6edb108032..d3a7601c46 100644 --- a/ext/standard/tests/class_object/get_class_methods_error_001.phpt +++ b/ext/standard/tests/class_object/get_class_methods_error_001.phpt @@ -38,4 +38,4 @@ NULL Warning: Wrong parameter count for get_class_methods() in %s on line 22 NULL -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_class_methods_variation_001.phpt b/ext/standard/tests/class_object/get_class_methods_variation_001.phpt index 644104fa41..bbc584aeac 100644 --- a/ext/standard/tests/class_object/get_class_methods_variation_001.phpt +++ b/ext/standard/tests/class_object/get_class_methods_variation_001.phpt @@ -174,4 +174,4 @@ NULL Arg value NULL -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_class_methods_variation_002.phpt b/ext/standard/tests/class_object/get_class_methods_variation_002.phpt index 6e40d902a5..2e433f10f3 100644 --- a/ext/standard/tests/class_object/get_class_methods_variation_002.phpt +++ b/ext/standard/tests/class_object/get_class_methods_variation_002.phpt @@ -18,17 +18,10 @@ var_dump( get_class_methods('CasesensitivitytesT') ); echo "Done"; ?> ---EXPECTF-- -*** Testing get_class_methods() : usage variations *** -array(1) { - [0]=> - string(8) "MyMeThOd" -} -Done ---UEXPECTF-- +--EXPECT-- *** Testing get_class_methods() : usage variations *** array(1) { [0]=> unicode(8) "MyMeThOd" } -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_class_variation_001.phpt b/ext/standard/tests/class_object/get_class_variation_001.phpt index 05cfcb11e0..af6fbc55eb 100644 --- a/ext/standard/tests/class_object/get_class_variation_001.phpt +++ b/ext/standard/tests/class_object/get_class_variation_001.phpt @@ -150,101 +150,6 @@ bool(false) Arg value: (type: boolean) bool(false) -Arg value: (type: string) -bool(false) - -Arg value: (type: string) -bool(false) - -Arg value: string (type: string) -bool(false) - -Arg value: string (type: string) -bool(false) - -Arg value: (type: NULL) -bool(false) - -Arg value: (type: NULL) -bool(false) -Done ---UEXPECTF-- -*** Testing get_class() : usage variations *** - -Notice: Undefined variable: undefined_var in %s on line 58 - -Notice: Undefined variable: unset_var in %s on line 61 - -Arg value: 0 (type: integer) -bool(false) - -Arg value: 1 (type: integer) -bool(false) - -Arg value: 12345 (type: integer) -bool(false) - -Arg value: -2345 (type: integer) -bool(false) - -Arg value: 10.5 (type: double) -bool(false) - -Arg value: -10.5 (type: double) -bool(false) - -Arg value: 101234567000 (type: double) -bool(false) - -Arg value: 1.07654321E-9 (type: double) -bool(false) - -Arg value: 0.5 (type: double) -bool(false) - -Notice: Array to string conversion in %s on line 67 - -Arg value: Array (type: array) -bool(false) - -Notice: Array to string conversion in %s on line 67 - -Arg value: Array (type: array) -bool(false) - -Notice: Array to string conversion in %s on line 67 - -Arg value: Array (type: array) -bool(false) - -Notice: Array to string conversion in %s on line 67 - -Arg value: Array (type: array) -bool(false) - -Notice: Array to string conversion in %s on line 67 - -Arg value: Array (type: array) -bool(false) - -Arg value: (type: NULL) -bool(false) - -Arg value: (type: NULL) -bool(false) - -Arg value: 1 (type: boolean) -bool(false) - -Arg value: (type: boolean) -bool(false) - -Arg value: 1 (type: boolean) -bool(false) - -Arg value: (type: boolean) -bool(false) - Arg value: (type: unicode) bool(false) @@ -262,4 +167,4 @@ bool(false) Arg value: (type: NULL) bool(false) -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_class_variation_002.phpt b/ext/standard/tests/class_object/get_class_variation_002.phpt index 911c6e799d..ea20bc27b1 100644 --- a/ext/standard/tests/class_object/get_class_variation_002.phpt +++ b/ext/standard/tests/class_object/get_class_variation_002.phpt @@ -13,9 +13,6 @@ var_dump(get_class(new casesensitivitytest)); echo "Done"; ?> ---EXPECTF-- -string(19) "caseSensitivityTest" -Done ---UEXPECTF-- +--EXPECT-- unicode(19) "caseSensitivityTest" -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt b/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt index 123e9772cc..711f53a1d4 100644 --- a/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt +++ b/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt @@ -44,4 +44,4 @@ bool(true) -- Ensure userspace interfaces are not listed -- bool(false) -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_declared_classes_error_001.phpt b/ext/standard/tests/class_object/get_declared_classes_error_001.phpt index 5dfa7d481e..d5b40beee8 100644 --- a/ext/standard/tests/class_object/get_declared_classes_error_001.phpt +++ b/ext/standard/tests/class_object/get_declared_classes_error_001.phpt @@ -24,4 +24,4 @@ echo "Done"; Warning: get_declared_classes() expects exactly 0 parameters, 1 given in %s on line 13 NULL -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt b/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt index a0ec715187..81c59d70ab 100644 --- a/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt +++ b/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt @@ -44,4 +44,4 @@ bool(false) -- Ensure userspace interfaces are listed -- bool(true) -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt b/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt index 6246d9c90f..2a7f308a34 100644 --- a/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt +++ b/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt @@ -24,4 +24,4 @@ echo "Done"; Warning: get_declared_interfaces() expects exactly 0 parameters, 1 given in %s on line 13 NULL -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_object_vars_basic_001.phpt b/ext/standard/tests/class_object/get_object_vars_basic_001.phpt index 20edaa1d43..99134eef67 100644 --- a/ext/standard/tests/class_object/get_object_vars_basic_001.phpt +++ b/ext/standard/tests/class_object/get_object_vars_basic_001.phpt @@ -58,54 +58,7 @@ A::test($b); echo "\n---( Unrelated class: )---\n"; X::test($b); ?> ---EXPECTF-- - ----( Global scope: )--- -array(1) { - ["pub"]=> - string(6) "B::pub" -} - ----( Declaring class: )--- -B::test -array(4) { - ["hiddenPriv"]=> - string(13) "B::hiddenPriv" - ["priv"]=> - string(7) "B::priv" - ["prot"]=> - string(7) "B::prot" - ["pub"]=> - string(6) "B::pub" -} - ----( Subclass: )--- -C::test -array(2) { - ["prot"]=> - string(7) "B::prot" - ["pub"]=> - string(6) "B::pub" -} - ----( Superclass: )--- -A::test -array(3) { - ["prot"]=> - string(7) "B::prot" - ["pub"]=> - string(6) "B::pub" - ["hiddenPriv"]=> - string(13) "A::hiddenPriv" -} - ----( Unrelated class: )--- -X::test -array(1) { - ["pub"]=> - string(6) "B::pub" -} ---UEXPECTF-- +--EXPECT-- ---( Global scope: )--- array(1) { @@ -151,4 +104,4 @@ X::test array(1) { [u"pub"]=> unicode(6) "B::pub" -} \ No newline at end of file +} diff --git a/ext/standard/tests/class_object/get_object_vars_basic_002.phpt b/ext/standard/tests/class_object/get_object_vars_basic_002.phpt index ef2482eca4..68a6c7e303 100644 --- a/ext/standard/tests/class_object/get_object_vars_basic_002.phpt +++ b/ext/standard/tests/class_object/get_object_vars_basic_002.phpt @@ -37,32 +37,7 @@ echo "\n---( Superclass: )---\n"; $b->testA($b); ?> ---EXPECTF-- - ----( Declaring class: )--- -B::testB -array(4) { - ["hiddenPriv"]=> - string(13) "B::hiddenPriv" - ["priv"]=> - string(7) "B::priv" - ["prot"]=> - string(7) "B::prot" - ["pub"]=> - string(6) "B::pub" -} - ----( Superclass: )--- -A::testA -array(3) { - ["prot"]=> - string(7) "B::prot" - ["pub"]=> - string(6) "B::pub" - ["hiddenPriv"]=> - string(13) "A::hiddenPriv" -} ---UEXPECTF-- +--EXPECT-- ---( Declaring class: )--- B::testB @@ -86,4 +61,4 @@ array(3) { unicode(6) "B::pub" [u"hiddenPriv"]=> unicode(13) "A::hiddenPriv" -} \ No newline at end of file +} diff --git a/ext/standard/tests/class_object/get_object_vars_error_001.phpt b/ext/standard/tests/class_object/get_object_vars_error_001.phpt index 67a2705d05..58ef3bc482 100644 --- a/ext/standard/tests/class_object/get_object_vars_error_001.phpt +++ b/ext/standard/tests/class_object/get_object_vars_error_001.phpt @@ -34,4 +34,4 @@ NULL Warning: Wrong parameter count for get_object_vars() in %s on line 18 NULL -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_object_vars_variation_001.phpt b/ext/standard/tests/class_object/get_object_vars_variation_001.phpt index 89fbc53e93..653a3e1055 100644 --- a/ext/standard/tests/class_object/get_object_vars_variation_001.phpt +++ b/ext/standard/tests/class_object/get_object_vars_variation_001.phpt @@ -15,6 +15,6 @@ Class A { $a = new A; var_dump(get_object_vars($a)); ?> ---EXPECTF-- +--EXPECT-- array(0) { -} \ No newline at end of file +} diff --git a/ext/standard/tests/class_object/get_object_vars_variation_002.phpt b/ext/standard/tests/class_object/get_object_vars_variation_002.phpt index 5975a1d39b..7d9cedb8ef 100644 --- a/ext/standard/tests/class_object/get_object_vars_variation_002.phpt +++ b/ext/standard/tests/class_object/get_object_vars_variation_002.phpt @@ -23,29 +23,7 @@ $arr['val'] = 'changed.val'; var_dump($arr, $obj, $a); ?> ---EXPECTF-- -array(0) { -} -array(2) { - ["ref"]=> - &string(10) "original.a" - ["val"]=> - string(10) "original.a" -} -array(2) { - ["ref"]=> - &string(11) "changed.ref" - ["val"]=> - string(11) "changed.val" -} -object(stdClass)#1 (2) { - ["ref"]=> - &string(11) "changed.ref" - ["val"]=> - string(10) "original.a" -} -string(11) "changed.ref" ---UEXPECTF-- +--EXPECT-- array(0) { } array(2) { @@ -66,4 +44,4 @@ object(stdClass)#1 (2) { [u"val"]=> unicode(10) "original.a" } -unicode(11) "changed.ref" \ No newline at end of file +unicode(11) "changed.ref" diff --git a/ext/standard/tests/class_object/get_object_vars_variation_003.phpt b/ext/standard/tests/class_object/get_object_vars_variation_003.phpt index 73201df353..1d0fa90b7b 100644 --- a/ext/standard/tests/class_object/get_object_vars_variation_003.phpt +++ b/ext/standard/tests/class_object/get_object_vars_variation_003.phpt @@ -165,4 +165,4 @@ bool(false) Arg value bool(false) -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_parent_class_error_001.phpt b/ext/standard/tests/class_object/get_parent_class_error_001.phpt index cf9c3e8674..a88e970511 100644 --- a/ext/standard/tests/class_object/get_parent_class_error_001.phpt +++ b/ext/standard/tests/class_object/get_parent_class_error_001.phpt @@ -26,4 +26,4 @@ echo "Done"; Warning: Wrong parameter count for get_parent_class() in %s on line 15 NULL -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_parent_class_variation_001.phpt b/ext/standard/tests/class_object/get_parent_class_variation_001.phpt index bc7800590a..1204128d37 100644 --- a/ext/standard/tests/class_object/get_parent_class_variation_001.phpt +++ b/ext/standard/tests/class_object/get_parent_class_variation_001.phpt @@ -20,13 +20,8 @@ var_dump(get_parent_class(new CasesensitivitytestCHILD)); echo "Done"; ?> ---EXPECTF-- -*** Testing get_parent_class() : variation *** -string(19) "caseSensitivityTest" -string(19) "caseSensitivityTest" -Done ---UEXPECTF-- +--EXPECT-- *** Testing get_parent_class() : variation *** unicode(19) "caseSensitivityTest" unicode(19) "caseSensitivityTest" -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/get_parent_class_variation_002.phpt b/ext/standard/tests/class_object/get_parent_class_variation_002.phpt index 7450c2a8d1..51e46f1892 100644 --- a/ext/standard/tests/class_object/get_parent_class_variation_002.phpt +++ b/ext/standard/tests/class_object/get_parent_class_variation_002.phpt @@ -176,4 +176,4 @@ bool(false) Arg value bool(false) -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/is_a_error_001.phpt b/ext/standard/tests/class_object/is_a_error_001.phpt index 779c70afdf..e00d70deb1 100644 --- a/ext/standard/tests/class_object/is_a_error_001.phpt +++ b/ext/standard/tests/class_object/is_a_error_001.phpt @@ -43,4 +43,4 @@ Deprecated: Function is_a() is deprecated in %s on line 21 Warning: Wrong parameter count for is_a() in %s on line 21 NULL -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/is_a_variation_001.phpt b/ext/standard/tests/class_object/is_a_variation_001.phpt index 02fc573f8c..d7438bd926 100644 --- a/ext/standard/tests/class_object/is_a_variation_001.phpt +++ b/ext/standard/tests/class_object/is_a_variation_001.phpt @@ -222,4 +222,4 @@ Arg value Deprecated: Function is_a() is deprecated in %s on line 69 bool(false) -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/is_a_variation_002.phpt b/ext/standard/tests/class_object/is_a_variation_002.phpt index a08e87a27f..3ae70f5ed5 100644 --- a/ext/standard/tests/class_object/is_a_variation_002.phpt +++ b/ext/standard/tests/class_object/is_a_variation_002.phpt @@ -232,4 +232,4 @@ Arg value Deprecated: Function is_a() is deprecated in %s on line 74 bool(false) -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/is_a_variation_003.phpt b/ext/standard/tests/class_object/is_a_variation_003.phpt index 3cff585d2d..e831e5c00c 100644 --- a/ext/standard/tests/class_object/is_a_variation_003.phpt +++ b/ext/standard/tests/class_object/is_a_variation_003.phpt @@ -24,4 +24,4 @@ echo "Done"; Deprecated: Function is_a() is deprecated in %s on line 13 bool(true) -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt index 1f832854a7..62ca70b92e 100644 --- a/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt @@ -177,4 +177,4 @@ bool(false) Arg value bool(false) -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt index 3d1ab3f25d..829731bf6c 100644 --- a/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt @@ -164,99 +164,6 @@ Arg value bool(false) Error: 4096 - Object of class stdClass could not be converted to string, %s(76) -Arg value -Error: 4096 - Object of class stdClass could not be converted to string, %s(77) -Error: 8 - Object of class stdClass to string conversion, %s(77) -bool(false) - -Arg value -bool(false) - -Arg value -bool(false) -Done ---UEXPECTF-- -*** Testing is_subclass_of() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(67) -Error: 8 - Undefined variable: unset_var, %s(70) - -Arg value 0 -bool(false) - -Arg value 1 -bool(false) - -Arg value 12345 -bool(false) - -Arg value -2345 -bool(false) - -Arg value 10.5 -bool(false) - -Arg value -10.5 -bool(false) - -Arg value 101234567000 -bool(false) - -Arg value 1.07654321E-9 -bool(false) - -Arg value 0.5 -bool(false) -Error: 8 - Array to string conversion, %s(76) - -Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) -Error: 8 - Array to string conversion, %s(76) - -Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) -Error: 8 - Array to string conversion, %s(76) - -Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) -Error: 8 - Array to string conversion, %s(76) - -Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) -Error: 8 - Array to string conversion, %s(76) - -Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) - -Arg value -bool(false) - -Arg value -bool(false) - -Arg value 1 -bool(false) - -Arg value -bool(false) - -Arg value 1 -bool(false) - -Arg value -bool(false) - -Arg value -bool(false) - -Arg value -bool(false) -Error: 4096 - Object of class stdClass could not be converted to string, %s(76) - Arg value Error: 4096 - Object of class stdClass could not be converted to Unicode string, %s(77) Error: 8 - Object of class stdClass to string conversion, %s(77) @@ -267,4 +174,4 @@ bool(false) Arg value bool(false) -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt index d4aef12349..cbc1ea207d 100644 --- a/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt @@ -19,8 +19,8 @@ var_dump(is_subclass_of('caseSensitivityTestCHILD', 'caseSensitivityTEST')); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing is_subclass_of() : usage variations *** *** Testing is_a() : usage variations *** bool(true) -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/method_exists_basic_001.phpt b/ext/standard/tests/class_object/method_exists_basic_001.phpt index 2f11e4c46e..23d36b855f 100644 --- a/ext/standard/tests/class_object/method_exists_basic_001.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_001.phpt @@ -49,7 +49,7 @@ foreach ($methods as $method) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- ---(Using string class name)--- Does C::inherit_pub exist? bool(true) @@ -80,4 +80,4 @@ Does C::static_pub exist? bool(true) Does C::static_prot exist? bool(true) Does C::static_priv exist? bool(true) Does C::non_existent exist? bool(false) -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/method_exists_basic_002.phpt b/ext/standard/tests/class_object/method_exists_basic_002.phpt index f6b62aa265..7e77de1161 100644 --- a/ext/standard/tests/class_object/method_exists_basic_002.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_002.phpt @@ -22,7 +22,7 @@ var_dump(method_exists(new stdclass, "nonexistent")); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- ---(Internal classes, using string class name)--- Does exception::getmessage exist? bool(true) Does stdclass::nonexistent exist? bool(false) @@ -30,4 +30,4 @@ Does stdclass::nonexistent exist? bool(false) ---(Internal classes, using class instance)--- Does exception::getmessage exist? bool(true) Does stdclass::nonexistent exist? bool(false) -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/method_exists_basic_003.phpt b/ext/standard/tests/class_object/method_exists_basic_003.phpt index 32f62b7e4b..dc0a6a4043 100644 --- a/ext/standard/tests/class_object/method_exists_basic_003.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_003.phpt @@ -16,7 +16,7 @@ var_dump(method_exists('UndefC', 'func')); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- In __autoload(UndefC) bool(false) -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/method_exists_variation_001.phpt b/ext/standard/tests/class_object/method_exists_variation_001.phpt index 5b9145128e..ebfa23967e 100644 --- a/ext/standard/tests/class_object/method_exists_variation_001.phpt +++ b/ext/standard/tests/class_object/method_exists_variation_001.phpt @@ -172,4 +172,4 @@ bool(false) Arg value bool(false) -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/method_exists_variation_002.phpt b/ext/standard/tests/class_object/method_exists_variation_002.phpt index b6342fa4d2..d56f9cbb8e 100644 --- a/ext/standard/tests/class_object/method_exists_variation_002.phpt +++ b/ext/standard/tests/class_object/method_exists_variation_002.phpt @@ -164,99 +164,6 @@ Arg value bool(false) Error: 4096 - Object of class stdClass could not be converted to string, %s(76) -Arg value -Error: 4096 - Object of class stdClass could not be converted to string, %s(77) -Error: 8 - Object of class stdClass to string conversion, %s(77) -bool(false) - -Arg value -bool(false) - -Arg value -bool(false) -Done ---UEXPECTF-- -*** Testing method_exists() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(67) -Error: 8 - Undefined variable: unset_var, %s(70) - -Arg value 0 -bool(false) - -Arg value 1 -bool(false) - -Arg value 12345 -bool(false) - -Arg value -2345 -bool(false) - -Arg value 10.5 -bool(false) - -Arg value -10.5 -bool(false) - -Arg value 101234567000 -bool(false) - -Arg value 1.07654321E-9 -bool(false) - -Arg value 0.5 -bool(false) -Error: 8 - Array to string conversion, %s(76) - -Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) -Error: 8 - Array to string conversion, %s(76) - -Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) -Error: 8 - Array to string conversion, %s(76) - -Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) -Error: 8 - Array to string conversion, %s(76) - -Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) -Error: 8 - Array to string conversion, %s(76) - -Arg value Array -Error: 8 - Array to string conversion, %s(77) -bool(false) - -Arg value -bool(false) - -Arg value -bool(false) - -Arg value 1 -bool(false) - -Arg value -bool(false) - -Arg value 1 -bool(false) - -Arg value -bool(false) - -Arg value -bool(false) - -Arg value -bool(false) -Error: 4096 - Object of class stdClass could not be converted to string, %s(76) - Arg value Error: 4096 - Object of class stdClass could not be converted to Unicode string, %s(77) Error: 8 - Object of class stdClass to string conversion, %s(77) @@ -267,4 +174,4 @@ bool(false) Arg value bool(false) -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/class_object/method_exists_variation_003.phpt b/ext/standard/tests/class_object/method_exists_variation_003.phpt index debe5a35e9..0b17113282 100644 --- a/ext/standard/tests/class_object/method_exists_variation_003.phpt +++ b/ext/standard/tests/class_object/method_exists_variation_003.phpt @@ -19,8 +19,8 @@ var_dump(method_exists('casesensiTivitytest', 'myMetHOD')); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing method_exists() : variation *** bool(true) bool(true) -Done \ No newline at end of file +Done -- 2.40.0