3 files changed, 76 insertions, 2 deletions

diff --git a/ext/standard/tests/assert/assert02.phpt b/ext/standard/tests/assert/assert02.phpt
index 88a1e1242..ac0824cda 100644
--- a/ext/standard/tests/assert/assert02.phpt
+++ b/ext/standard/tests/assert/assert02.phpt
@@ -31,12 +31,12 @@ Warning: assert(): Assertion "$a" failed in %sassert02.php on line %d
 
 Parse error: %s error%sassert02.php(%d) : assert code on line 1
 in handler()
-string(64) "assert(): Failure evaluating code: 
+string(%d) "assert(): Failure evaluating code: 
 aa=sd+as+safsafasfaēsafēsafē"
 
 Warning: assert(): Assertion "0" failed in %sassert02.php on line %d
 
 Parse error: %s error%sassert02.php(%d) : assert code on line 1
 in handler()
-string(64) "assert(): Failure evaluating code: 
+string(%d) "assert(): Failure evaluating code: 
 aa=sd+as+safsafasfaēsafēsafē"
diff --git a/ext/standard/tests/assert/assert03.phpt b/ext/standard/tests/assert/assert03.phpt
new file mode 100644
index 000000000..077474d4d
--- /dev/null
+++ b/ext/standard/tests/assert/assert03.phpt
@@ -0,0 +1,33 @@
+--TEST--
+assert() - set callback using ini_set()
+--FILE--
+<?php
+function a($file,$line,$myev)
+{ 
+	        echo "assertion failed - a - $line,\"$myev\"\n";
+}
+ 
+function b($file,$line,$myev)
+{ 
+	        echo "assertion failed - b - $line,\"$myev\"\n";
+}
+ 
+assert_options(ASSERT_ACTIVE,1);
+assert_options(ASSERT_QUIET_EVAL,1);
+assert_options(ASSERT_WARNING,0);
+ 
+$a = 0;
+ 
+assert_options(ASSERT_CALLBACK,"a");
+assert('$a != 0');
+ 
+ /* Modify call back using ini_set() */
+ini_set("assert.callback", "b");
+assert('$a != 0');
+
+?>
+==DONE==
+--EXPECTF--
+assertion failed - a - %d,"$a != 0"
+assertion failed - b - %d,"$a != 0"
+==DONE==
diff --git a/ext/standard/tests/assert/assert04.phpt b/ext/standard/tests/assert/assert04.phpt
new file mode 100644
index 000000000..43028ad3a
--- /dev/null
+++ b/ext/standard/tests/assert/assert04.phpt
@@ -0,0 +1,41 @@
+--TEST--
+misc assert() tests tests
+--FILE--
+<?php
+/* Assert not active */
+assert_options(ASSERT_ACTIVE, 0);
+assert(1);
+ 
+ 
+/* Wrong parameter count in assert */
+assert_options(ASSERT_ACTIVE, 1);
+assert(2,3);
+ 
+/* Wrong parameter count in assert_options */
+assert_options(ASSERT_ACTIVE, 0, 2);
+ 
+/* Wrong parameter name in assert_options */
+$test="ASSERT_FRED";
+assert_options($test, 1);
+ 
+/* Assert false */
+assert(0);
+ 
+ 
+/* Assert false and bail*/
+assert_options(ASSERT_BAIL, 1);
+assert(0);
+ 
+echo "not reached\n";
+ 
+?>
+--EXPECTF--
+Warning: Wrong parameter count for assert() in %s on line %d
+
+Warning: Wrong parameter count for assert_options() in %s on line %d
+
+Warning: assert_options(): Unknown value 0 in %s on line %d
+
+Warning: assert(): Assertion failed in %s on line %d
+
+Warning: assert(): Assertion failed in %s on line %d