fix tests, add more

13 files changed, 150 insertions, 0 deletions

diff --git a/Zend/tests/compare_001.phpt b/Zend/tests/compare_001.phpt
index 36aaa55a39..1d42c637d6 100644
--- a/Zend/tests/compare_001.phpt
+++ b/Zend/tests/compare_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 comparing different variables for equality
+--SKIPIF--
+<?php if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?>
 --FILE--
 <?php
 
diff --git a/Zend/tests/compare_002.phpt b/Zend/tests/compare_002.phpt
index 7a5246e686..5e5009c323 100644
--- a/Zend/tests/compare_002.phpt
+++ b/Zend/tests/compare_002.phpt
@@ -1,5 +1,7 @@
 --TEST--
 comparing different variables for identity
+--SKIPIF--
+<?php if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?>
 --FILE--
 <?php
 
diff --git a/Zend/tests/compare_003.phpt b/Zend/tests/compare_003.phpt
index 0210e29372..9327ee58bc 100644
--- a/Zend/tests/compare_003.phpt
+++ b/Zend/tests/compare_003.phpt
@@ -1,5 +1,7 @@
 --TEST--
 comparing different variables (greater than)
+--SKIPIF--
+<?php if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?>
 --FILE--
 <?php
 
diff --git a/Zend/tests/compare_004.phpt b/Zend/tests/compare_004.phpt
index 50c553f301..69131cd5cd 100644
--- a/Zend/tests/compare_004.phpt
+++ b/Zend/tests/compare_004.phpt
@@ -1,5 +1,7 @@
 --TEST--
 comparing different variables (less than)
+--SKIPIF--
+<?php if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?>
 --FILE--
 <?php
 
diff --git a/Zend/tests/compare_005.phpt b/Zend/tests/compare_005.phpt
index c7c9d38450..4f5cd80b54 100644
--- a/Zend/tests/compare_005.phpt
+++ b/Zend/tests/compare_005.phpt
@@ -1,5 +1,7 @@
 --TEST--
 comparing different variables (greater or equal than)
+--SKIPIF--
+<?php if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?>
 --FILE--
 <?php
 
diff --git a/Zend/tests/compare_006.phpt b/Zend/tests/compare_006.phpt
index b44258ffd6..743983b97f 100644
--- a/Zend/tests/compare_006.phpt
+++ b/Zend/tests/compare_006.phpt
@@ -1,5 +1,7 @@
 --TEST--
 comparing different variables (smaller or equal than)
+--SKIPIF--
+<?php if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?>
 --FILE--
 <?php
 
diff --git a/Zend/tests/decrement_001.phpt b/Zend/tests/decrement_001.phpt
index 558f92eecd..027e68f2b6 100644
--- a/Zend/tests/decrement_001.phpt
+++ b/Zend/tests/decrement_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 decrementing different variables
+--SKIPIF--
+<?php if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?>
 --FILE--
 <?php
 
diff --git a/Zend/tests/exception_handler_001.phpt b/Zend/tests/exception_handler_001.phpt
new file mode 100644
index 0000000000..8f6572ef01
--- /dev/null
+++ b/Zend/tests/exception_handler_001.phpt
@@ -0,0 +1,20 @@
+--TEST--
+exception handler tests - 1
+--FILE--
+<?php
+
+set_exception_handler("foo");
+
+function foo($e) {
+	var_dump(get_class($e)." thrown!");
+}
+
+class test extends Exception {
+}
+
+throw new test();
+
+echo "Done\n";
+?>
+--EXPECTF--	
+string(12) "test thrown!"
diff --git a/Zend/tests/exception_handler_002.phpt b/Zend/tests/exception_handler_002.phpt
new file mode 100644
index 0000000000..3e0e4f00dd
--- /dev/null
+++ b/Zend/tests/exception_handler_002.phpt
@@ -0,0 +1,23 @@
+--TEST--
+exception handler tests - 2
+--FILE--
+<?php
+
+set_exception_handler("foo");
+
+function foo($e) {
+	var_dump(get_class($e)." thrown!");
+	throw new Exception();
+}
+
+class test extends Exception {
+}
+
+throw new test();
+
+echo "Done\n";
+?>
+--EXPECTF--	
+string(12) "test thrown!"
+
+Fatal error: Exception thrown without a stack frame in Unknown on line 0
diff --git a/Zend/tests/exception_handler_003.phpt b/Zend/tests/exception_handler_003.phpt
new file mode 100644
index 0000000000..137a6cabb4
--- /dev/null
+++ b/Zend/tests/exception_handler_003.phpt
@@ -0,0 +1,24 @@
+--TEST--
+exception handler tests - 3
+--FILE--
+<?php
+
+class test {
+
+	function foo () {
+		set_exception_handler(array($this, "bar"));
+	}
+
+	function bar($e) {
+		var_dump(get_class($e)." thrown!");
+	}
+}
+
+$a = new test;
+$a->foo();
+throw new Exception();
+
+echo "Done\n";
+?>
+--EXPECTF--	
+string(17) "Exception thrown!"
diff --git a/Zend/tests/exception_handler_004.phpt b/Zend/tests/exception_handler_004.phpt
new file mode 100644
index 0000000000..2f367817e3
--- /dev/null
+++ b/Zend/tests/exception_handler_004.phpt
@@ -0,0 +1,21 @@
+--TEST--
+exception handler tests - 4
+--FILE--
+<?php
+
+set_exception_handler("fo");
+set_exception_handler(array("", ""));
+set_exception_handler();
+set_exception_handler("foo", "bar");
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: set_exception_handler() expects the argument (fo) to be a valid callback in %s on line %d
+
+Warning: set_exception_handler() expects the argument (::) to be a valid callback in %s on line %d
+
+Warning: Wrong parameter count for set_exception_handler() in %s on line %d
+
+Warning: Wrong parameter count for set_exception_handler() in %s on line %d
+Done
diff --git a/Zend/tests/exception_handler_005.phpt b/Zend/tests/exception_handler_005.phpt
new file mode 100644
index 0000000000..cc99bc6230
--- /dev/null
+++ b/Zend/tests/exception_handler_005.phpt
@@ -0,0 +1,23 @@
+--TEST--
+exception handler tests - 5
+--FILE--
+<?php
+
+set_exception_handler("foo");
+set_exception_handler("foo1");
+
+function foo($e) {
+	var_dump(__FUNCTION__."(): ".get_class($e)." thrown!");
+}
+
+function foo1($e) {
+	var_dump(__FUNCTION__."(): ".get_class($e)." thrown!");
+}
+
+
+throw new excEption();
+
+echo "Done\n";
+?>
+--EXPECTF--	
+string(25) "foo1(): Exception thrown!"
diff --git a/Zend/tests/exception_handler_006.phpt b/Zend/tests/exception_handler_006.phpt
new file mode 100644
index 0000000000..05a5d927fa
--- /dev/null
+++ b/Zend/tests/exception_handler_006.phpt
@@ -0,0 +1,25 @@
+--TEST--
+exception handler tests - 6
+--FILE--
+<?php
+
+set_exception_handler("foo");
+set_exception_handler("foo1");
+
+restore_exception_handler();
+
+function foo($e) {
+	var_dump(__FUNCTION__."(): ".get_class($e)." thrown!");
+}
+
+function foo1($e) {
+	var_dump(__FUNCTION__."(): ".get_class($e)." thrown!");
+}
+
+
+throw new excEption();
+
+echo "Done\n";
+?>
+--EXPECTF--	
+string(24) "foo(): Exception thrown!"