- killed off UEXPECT

- Tony has a patch that should fix all these

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 4cb6cbd32789153ce0d86d02c213d693f7a3727d..420310f6e88b0f8bd57712b464aacf93d32d8b5d 100644 (file)
--- 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 496c2dbe876ee74603b0782c968e60b51f9ef4c9..9fb7e81c6cb5a48e5c70453075f41564946fff5d 100644 (file)
--- 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 63cfe03d51de94cad5b90cbf71d5b9ff2914d876..0d8112471c94cfd27cc7af1700c3949effb82f5b 100644 (file)
--- 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 0745601452c6f32c446dc872904edf496ef46b01..c090841694a8d28508b09b7b08505dcf1cd74baa 100644 (file)
--- 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 2b3a8dd059102d0c213344f97d1571591462af82..0fac78f4ea531c55a1af484c3accab7f2347099d 100755 (executable)
--- 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 2ea102e5d2e4f0e7109bcb6534174cb202beb3bb..ea56f8d2e7e776e28759c6a40ba27a3910cc5bab 100755 (executable)
--- 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 b563c318817d2784b9924e6e9e6568501477019a..d3c19e609a30022e71d05cebe164b004fe234ca0 100644 (file)
--- 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 4c95c8f607007f21160aaae169217035b0c439e6..85df7096dd73711f3490a559c44d501506c3af3e 100644 (file)
--- 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 d2230183912192b0503cec5154a5f871b12ccd2c..45cadc924d16ee5c4665577d6953ab9d36664b18 100644 (file)
--- 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 c9e7349f80ec6d088635ccd841d9736794a820a2..d4640c7c3153a64c8789b4c30074d028fbf93dff 100644 (file)
--- 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 6edb1080325b420ab98069c95eaee12efba1b366..d3a7601c4624ea481e0d55f6e9f37361f37ab7de 100644 (file)
--- 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 644104fa413fe2e1f607c6a4559c467a34b821db..bbc584aeac7e5ab14af5d9cfce0a537ff247738a 100644 (file)
--- 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 6e40d902a5713be5713271e6531be8a5cde41ecb..2e433f10f359ba31e4b50fc271f831479b706d4c 100644 (file)
--- 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 05cfcb11e0442687bbb41ef88a2833fdc5d9d34e..af6fbc55eb25df96701d76ec6855ccad1618d18c 100644 (file)
--- 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 911c6e799daf8143dea24c64c6b04c8ad029d71b..ea20bc27b1bcd50b9a2c75f61b6e068c2d33a304 100644 (file)
--- 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 123e9772cc97d741d7c5327e26ab6ab0c48f9f6a..711f53a1d45cd1acc48850096a5fd873f8729f2e 100644 (file)
--- 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 5dfa7d481ed31087ccc288e7f5b3152277762b73..d5b40beee862fb939ea97c574322468ae2c36ad5 100644 (file)
--- 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 a0ec7151873dac340b442a7ad4a87ba6dce24404..81c59d70ab558b6769d69cfd5bbbfeb1cc39f8d2 100644 (file)
--- 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 6246d9c90f57872a19e268b0f32be24d50ab8c91..2a7f308a340c056f30ffb9cfe2b3e58ed7c47409 100644 (file)
--- 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 20edaa1d437f2006d5e1f5e67d4d6ab5dee0b2ad..99134eef670366008f60e0f4d0b3839fdd2a51d4 100644 (file)
--- 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 ef2482eca4788a08c72c66d9061a74bea3eb4d33..68a6c7e303c7754a2d547b4b1568401c6dc50569 100644 (file)
--- 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 67a2705d05cae9eb3e854297d21441c76756296a..58ef3bc482291acc7100f695cc6e1f565abb91bf 100644 (file)
--- 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 89fbc53e93f04e3e1807204131ecf7f8f357c9c6..653a3e10551b8bb8d1d439614052d2e6c796fe97 100644 (file)
--- 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 5975a1d39b45376073abaaf7e95907efb2a956e8..7d9cedb8effbe99482f57e94e17f2a5325b94901 100644 (file)
--- 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 73201df3530775d673639972ac1bf71ea4247dc3..1d0fa90b7b07aef2cb52fc06bed0f598be96179b 100644 (file)
--- 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 cf9c3e86744fd123998b0edbe7c12cd8cd8c82c0..a88e9705115aaf484c8f1111bd9f96dd8c54ab07 100644 (file)
--- 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 bc7800590ac9bb255549a7f255ad7ba106f61a00..1204128d372620ab92cc96ba8ed640798fefc7c4 100644 (file)
--- 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 7450c2a8d18fc0c2808f7590f8f079aefdfe8a5c..51e46f18927b311ec65b1725b66bddfacaf7172e 100644 (file)
--- 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 779c70afdfd803d45189160a33ae24e4ac3ed684..e00d70deb10c6d5db7fb0465dcff606d2e08d50b 100644 (file)
--- 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 02fc573f8c67391e73702743b89a0e20f792bd8b..d7438bd92602ba9d4b19528517edd1b4eb4b0f19 100644 (file)
--- 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 a08e87a27ffa9f217685f75cb33baed62685eba3..3ae70f5ed53c9ed156fb50af9b2254ef1c6f73b4 100644 (file)
--- 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 3cff585d2d611f966ceb8f53536f665c0462965d..e831e5c00c113264bc2bab947d043f7b65e7b37d 100644 (file)
--- 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 1f832854a7183e044ada1ee0a41dd5bc904bad74..62ca70b92e6d8219c6197f46dab87043b05dc8c3 100644 (file)
--- 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 3d1ab3f25dc4450dfdde856901e5d389bbef41bf..829731bf6c6020ecc388e2250e8f2f7a413125a6 100644 (file)
--- 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 d4aef1234946ca9acbb669af3d54dea83c8dffb5..cbc1ea207defcc0933fdd69454c440f798185d2e 100644 (file)
--- 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 2f11e4c46e71d29ce0f10742a9ae1dea0e2370c7..23d36b855fd150d7f3adba26757c9737170c9d15 100644 (file)
--- 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 f6b62aa26534de226eee0336c2aa8eeeb5fa2005..7e77de116121a0eeddf206dfeef371079c52ec7e 100644 (file)
--- 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 32f62b7e4baef57b627ae329f04a59132636e16f..dc0a6a40434a11710a11e4b44b1bb5c5093d2868 100644 (file)
--- 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 5b9145128ec15db8f0a807ae578338e7ef2f01dd..ebfa23967e6cb2d5ddd7fc339ddcdf8fa6ed1c82 100644 (file)
--- 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 b6342fa4d2dadd6dc3b8c73414934249404887c3..d56f9cbb8edc1172304f9f7b9bf10e1ca0e14173 100644 (file)
--- 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 debe5a35e97790f003150d04bb14ddd435a2c47a..0b17113282bb55503e91207def499e56b097145f 100644 (file)
--- 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