Add new tests for class/object functions and features.

7 files changed, 205 insertions, 0 deletions

diff --git a/tests/classes/__call_004.phpt b/tests/classes/__call_004.phpt
new file mode 100644
index 0000000000..2072112a02
--- /dev/null
+++ b/tests/classes/__call_004.phpt
@@ -0,0 +1,41 @@
+--TEST--
+When __call() is invoked via ::, ensure current scope's __call() is favoured over the specified class's  __call().
+--FILE--
+<?php
+class A {
+	function __call($strMethod, $arrArgs) {
+		echo "In " . __METHOD__ . "($strMethod, array(" . implode(',',$arrArgs) . "))\n";
+		var_dump($this);
+	}
+}
+
+class B extends A {
+	function __call($strMethod, $arrArgs) {
+		echo "In " . __METHOD__ . "($strMethod, array(" . implode(',',$arrArgs) . "))\n";
+		var_dump($this);
+	}
+	
+	function test() {
+		A::test1(1,'a');
+		B::test2(1,'a');
+		self::test3(1,'a');
+		parent::test4(1,'a');
+	}
+}
+
+$b = new B();
+$b->test();
+?>
+--EXPECTF--
+In B::__call(test1, array(1,a))
+object(B)#1 (0) {
+}
+In B::__call(test2, array(1,a))
+object(B)#1 (0) {
+}
+In B::__call(test3, array(1,a))
+object(B)#1 (0) {
+}
+In B::__call(test4, array(1,a))
+object(B)#1 (0) {
+}
\ No newline at end of file
diff --git a/tests/classes/__call_005.phpt b/tests/classes/__call_005.phpt
new file mode 100644
index 0000000000..c82a853f72
--- /dev/null
+++ b/tests/classes/__call_005.phpt
@@ -0,0 +1,36 @@
+--TEST--
+When __call() is invoked via ::, ensure private implementation of __call() in superclass is accessed without error. 
+--FILE--
+<?php
+class A {
+	private function __call($strMethod, $arrArgs) {
+		echo "In " . __METHOD__ . "($strMethod, array(" . implode(',',$arrArgs) . "))\n";
+		var_dump($this);
+	}
+}
+
+class B extends A {
+	function test() {
+		A::test1(1,'a');
+		B::test2(1,'a');
+		self::test3(1,'a');
+		parent::test4(1,'a');
+	}
+}
+
+$b = new B();
+$b->test();
+?>
+--EXPECTF--
+In A::__call(test1, array(1,a))
+object(B)#1 (0) {
+}
+In A::__call(test2, array(1,a))
+object(B)#1 (0) {
+}
+In A::__call(test3, array(1,a))
+object(B)#1 (0) {
+}
+In A::__call(test4, array(1,a))
+object(B)#1 (0) {
+}
\ No newline at end of file
diff --git a/tests/classes/interface_constant_inheritance_001.phpt b/tests/classes/interface_constant_inheritance_001.phpt
new file mode 100644
index 0000000000..ae3e71e7ab
--- /dev/null
+++ b/tests/classes/interface_constant_inheritance_001.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Ensure an interface may not shadow an inherited constant. 
+--FILE--
+<?php
+interface I1 {
+	const FOO = 10;
+}
+
+interface I2 extends I1 {
+	const FOO = 10;
+}
+
+echo "Done\n";
+?>
+--EXPECTF--
+
+Fatal error: Cannot inherit previously-inherited constant FOO from interface I1 in %s on line 6
\ No newline at end of file
diff --git a/tests/classes/interface_constant_inheritance_002.phpt b/tests/classes/interface_constant_inheritance_002.phpt
new file mode 100644
index 0000000000..d5001baa3d
--- /dev/null
+++ b/tests/classes/interface_constant_inheritance_002.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Ensure a class may not shadow a constant inherited from an interface. 
+--FILE--
+<?php
+interface I {
+	const FOO = 10;
+}
+
+class C implements I {
+	const FOO = 10;
+}
+
+echo "Done\n";
+?>
+--EXPECTF--
+
+Fatal error: Cannot inherit previously-inherited constant FOO from interface I in %s on line 6
\ No newline at end of file
diff --git a/tests/classes/interface_constant_inheritance_003.phpt b/tests/classes/interface_constant_inheritance_003.phpt
new file mode 100644
index 0000000000..a3ba815edf
--- /dev/null
+++ b/tests/classes/interface_constant_inheritance_003.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Ensure a class may not inherit two constants with the same name from two separate interfaces. 
+--FILE--
+<?php
+interface I1 {
+	const FOO = 10;
+}
+
+interface I2 {
+	const FOO = 10;
+}
+
+class C implements I1,I2 {
+}
+
+echo "Done\n";
+?>
+--EXPECTF--
+
+Fatal error: Cannot inherit previously-inherited constant FOO from interface I2 in %s on line 10
diff --git a/tests/classes/interface_constant_inheritance_004.phpt b/tests/classes/interface_constant_inheritance_004.phpt
new file mode 100644
index 0000000000..f055929578
--- /dev/null
+++ b/tests/classes/interface_constant_inheritance_004.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Ensure a class may implement two interfaces which include the same constant (due to inheritance). 
+--FILE--
+<?php
+interface IA {
+	const FOO = 10;
+}
+
+interface IB extends IA {
+}
+
+class C implements IA, IB {
+}
+
+echo "Done\n";
+?>
+--EXPECTF--
+Done
diff --git a/tests/classes/tostring_004.phpt b/tests/classes/tostring_004.phpt
new file mode 100644
index 0000000000..de0283e8e6
--- /dev/null
+++ b/tests/classes/tostring_004.phpt
@@ -0,0 +1,56 @@
+--TEST--
+Object to string conversion: error cases and behaviour variations.
+--FILE--
+<?php
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+        echo "Error: $err_no - $err_msg\n";
+}
+set_error_handler('test_error_handler');
+error_reporting(8191);
+
+
+echo "Object with no __toString():\n";
+$obj = new stdClass;
+echo "Try 1:\n";
+printf($obj);
+printf("\n");
+
+echo "\nTry 2:\n";
+printf($obj . "\n");
+
+
+echo "\n\nObject with bad __toString():\n";
+class badToString {
+	function __toString() {
+		return 0;
+	}	
+}
+$obj = new badToString;
+echo "Try 1:\n";
+printf($obj);
+printf("\n");
+
+echo "\nTry 2:\n";
+printf($obj . "\n");
+
+?>
+--EXPECTF--
+Object with no __toString():
+Try 1:
+Error: 4096 - Object of class stdClass could not be converted to string
+Error: 8 - Object of class stdClass to string conversion
+Object
+
+Try 2:
+Error: 4096 - Object of class stdClass could not be converted to string
+
+
+
+Object with bad __toString():
+Try 1:
+Error: 4096 - Method badToString::__toString() must return a string value
+
+
+Try 2:
+Error: 4096 - Method badToString::__toString() must return a string value
+