10 files changed, 5 insertions, 140 deletions
diff --git a/ext/standard/tests/assert/assert02.phpt b/ext/standard/tests/assert/assert02.phpt
index be94ce869c..44a22d7af0 100644
--- a/ext/standard/tests/assert/assert02.phpt
+++ b/ext/standard/tests/assert/assert02.phpt
@@ -29,30 +29,14 @@ Notice: Undefined variable: a in %sassert02.php(12) : assert code on line 1
 
 Warning: assert(): Assertion "$a" failed in %sassert02.php on line 12
 
-Parse error: %s error, unexpected '=' in %sassert02.php(14) : assert code on line 1
-in handler()
-string(%d) "assert(): Failure evaluating code: 
-aa=sd+as+safsafasfasafsaf"
-
-Warning: assert(): Assertion "0" failed in %sassert02.php on line 16
-
-Parse error: %s error, unexpected '=' in %sassert02.php(19) : assert code on line 1
-in handler()
-string(%d) "assert(): Failure evaluating code: 
-aa=sd+as+safsafasfasafsaf"
---UEXPECTF--
-Notice: Undefined variable: a in %sassert02.php(12) : assert code on line 1
-
-Warning: assert(): Assertion "$a" failed in %sassert02.php on line 12
-
-Parse error: %s error, unexpected '=' in %sassert02.php(14) : assert code on line 1
+Parse error: %s error%sin %sassert02.php(14) : assert code on line 1
 in handler()
 unicode(%d) "assert(): Failure evaluating code: 
 aa=sd+as+safsafasfasafsaf"
 
 Warning: assert(): Assertion "0" failed in %sassert02.php on line 16
 
-Parse error: %s error, unexpected '=' in %sassert02.php(19) : assert code on line 1
+Parse error: %s error%sin %sassert02.php(19) : assert code on line 1
 in handler()
 unicode(%d) "assert(): Failure evaluating code: 
 aa=sd+as+safsafasfasafsaf"
diff --git a/ext/standard/tests/assert/assert_basic.phpt b/ext/standard/tests/assert/assert_basic.phpt
index a6738630ae..f4240c96a6 100644
--- a/ext/standard/tests/assert/assert_basic.phpt
+++ b/ext/standard/tests/assert/assert_basic.phpt
@@ -21,14 +21,7 @@ var_dump($r2=assert($sa));
 //Non string assert 
 var_dump($r2=assert(0));
 var_dump($r2=assert(1));
---EXPECTF--
-f1 called
-NULL
-bool(true)
-f1 called
-NULL
-bool(true)
---UEXPECTF--
+--EXPECT--
 f1 called
 NULL
 bool(true)
diff --git a/ext/standard/tests/assert/assert_basic1.phpt b/ext/standard/tests/assert/assert_basic1.phpt
index 2bc87139cf..e803bb0ccc 100644
--- a/ext/standard/tests/assert/assert_basic1.phpt
+++ b/ext/standard/tests/assert/assert_basic1.phpt
@@ -22,12 +22,7 @@ var_dump($r2=assert($sa));
 //Non string assert 
 var_dump($r2=assert(0));
 var_dump($r2=assert(1));
---EXPECTF--
-bool(true)
-bool(true)
-bool(true)
-bool(true)
---UEXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/assert/assert_basic2.phpt b/ext/standard/tests/assert/assert_basic2.phpt
index ba3ffe23fc..fc02a04e16 100644
--- a/ext/standard/tests/assert/assert_basic2.phpt
+++ b/ext/standard/tests/assert/assert_basic2.phpt
@@ -31,16 +31,6 @@ f1 called
 
 Warning: assert(): Assertion failed in %s on line 13
 string(2) "f1"
-string(2) "f2"
-f2 called
-
-Warning: assert(): Assertion failed in %s on line 17
---UEXPECTF--
-string(2) "f1"
-f1 called
-
-Warning: assert(): Assertion failed in %s on line 13
-string(2) "f1"
 unicode(2) "f2"
 f2 called
 
diff --git a/ext/standard/tests/assert/assert_basic3.phpt b/ext/standard/tests/assert/assert_basic3.phpt
index 611cb5f5a8..0ce326606f 100644
--- a/ext/standard/tests/assert/assert_basic3.phpt
+++ b/ext/standard/tests/assert/assert_basic3.phpt
@@ -23,8 +23,3 @@ int(0)
 f1 called
 
 Warning: assert(): Assertion "0 != 0" failed in %s on line 10
---UEXPECTF--
-int(0)
-f1 called
-
-Warning: assert(): Assertion "0 != 0" failed in %s on line 10
diff --git a/ext/standard/tests/assert/assert_basic4.phpt b/ext/standard/tests/assert/assert_basic4.phpt
index 84205968e6..6c2baab437 100644
--- a/ext/standard/tests/assert/assert_basic4.phpt
+++ b/ext/standard/tests/assert/assert_basic4.phpt
@@ -24,18 +24,7 @@ echo "Initial values: ini.get(\"assert.bail\") => [".ini_get("assert.bail")."]\n
 echo "Initial values: ini.get(\"assert.quiet_eval\") => [".ini_get("assert.quiet_eval")."]\n";
 echo "Initial values: ini.get(\"assert.callback\") => [".ini_get("assert.callback")."]\n\n";
 
---EXPECTF--
-Initial values: assert_options(ASSERT_ACTIVE) => [0]
-Initial values: assert_options(ASSERT_WARNING) => [0]
-Initial values: assert_options(ASSERT_BAIL) => [0]
-Initial values: assert_options(ASSERT_QUIET_EVAL) => [0]
-Initial values: assert_options(ASSERT_CALLBACK) => [f1]
-Initial values: ini.get("assert.active") => [0]
-Initial values: ini.get("assert.warning") => [0]
-Initial values: ini.get("assert.bail") => [0]
-Initial values: ini.get("assert.quiet_eval") => [0]
-Initial values: ini.get("assert.callback") => [f1]
---UEXPECTF--
+--EXPECT--
 Initial values: assert_options(ASSERT_ACTIVE) => [0]
 Initial values: assert_options(ASSERT_WARNING) => [0]
 Initial values: assert_options(ASSERT_BAIL) => [0]
diff --git a/ext/standard/tests/assert/assert_basic5.phpt b/ext/standard/tests/assert/assert_basic5.phpt
index 05c4f5fd80..737f902d64 100644
--- a/ext/standard/tests/assert/assert_basic5.phpt
+++ b/ext/standard/tests/assert/assert_basic5.phpt
@@ -30,11 +30,3 @@ Warning: assert(): Assertion "0 != 0" failed in %s on line 10
 NULL
 bool(true)
 int(1)
---UEXPECTF--
-int(0)
-f1 called
-
-Warning: assert(): Assertion "0 != 0" failed in %s on line 10
-NULL
-bool(true)
-int(1)
diff --git a/ext/standard/tests/assert/assert_error.phpt b/ext/standard/tests/assert/assert_error.phpt
index 0d485054cc..28655be318 100644
--- a/ext/standard/tests/assert/assert_error.phpt
+++ b/ext/standard/tests/assert/assert_error.phpt
@@ -25,8 +25,3 @@ Notice: Use of undefined constant threemeninaboat - assumed 'threemeninaboat' in
 bool(true)
 int(0)
 bool(true)
---UEXPECTF--
-Notice: Use of undefined constant threemeninaboat - assumed 'threemeninaboat' in %s(9) : assert code on line 1
-bool(true)
-int(0)
-bool(true)
diff --git a/ext/standard/tests/assert/assert_error1.phpt b/ext/standard/tests/assert/assert_error1.phpt
index 718515f208..992b81e7c4 100644
--- a/ext/standard/tests/assert/assert_error1.phpt
+++ b/ext/standard/tests/assert/assert_error1.phpt
@@ -42,12 +42,3 @@ bool(false)
 
 Warning: Wrong parameter count for assert() in %s on line 22
 NULL
---UEXPECTF--
-Warning: Wrong parameter count for assert_options() in %s on line 14
-NULL
-
-Warning: assert_options(): Unknown value 0 in %s on line 18
-bool(false)
-
-Warning: Wrong parameter count for assert() in %s on line 22
-NULL
diff --git a/ext/standard/tests/assert/assert_variation.phpt b/ext/standard/tests/assert/assert_variation.phpt
index 82fdfb21b9..e36f4a95b8 100644
--- a/ext/standard/tests/assert/assert_variation.phpt
+++ b/ext/standard/tests/assert/assert_variation.phpt
@@ -77,65 +77,6 @@ f1 called
 NULL
 
 Change callback function using ini.set and test return value 
-string(2) "f1"
-assert_options(ASSERT_CALLBACK) => [f2]
-ini.get("assert.callback") => [f2]
-f2 called
-NULL
-
-Change callback function using assert_options and test return value 
-string(2) "f2"
-assert_options(ASSERT_CALLBACK) => [f3]
-ini.get("assert.callback") => [f2]
-f3 called
-NULL
-
-Reset the name of the callback routine to a class method and check that it works
-string(2) "f3"
-assert_options(ASSERT_CALLBACK) => [c1]
-ini.get("assert.callback") => [f2]
-NULL
-
-Reset callback options to use a class method 
-string(2) "c1"
-array(2) {
-  [0]=>
-  string(2) "c1"
-  [1]=>
-  string(6) "assert"
-}
-ini.get("assert.callback") => [f2]
-
-
-Strict Standards: Non-static method c1::assert() should not be called statically in %s on line %d
-Class assertion failed 53, "0 != 0"
-NULL
-
-Reset callback options to use an object method 
-array(2) {
-  [0]=>
-  string(2) "c1"
-  [1]=>
-  string(6) "assert"
-}
-array(2) {
-  [0]=>
-  &object(c1)#1 (0) {
-  }
-  [1]=>
-  string(6) "assert"
-}
-ini.get("assert.callback") => [f2]
-
-Class assertion failed 61, "0 != 0"
-NULL
---UEXPECTF--
-Initial values: assert_options(ASSERT_CALLBACK) => [f1]
-Initial values: ini.get("assert.callback") => [f1]
-f1 called
-NULL
-
-Change callback function using ini.set and test return value 
 unicode(2) "f1"
 assert_options(ASSERT_CALLBACK) => [f2]
 ini.get("assert.callback") => [f2]