This commit was manufactured by cvs2svn to create branch 'PHP_5_0'.

3 files changed, 102 insertions, 0 deletions

diff --git a/tests/classes/autoload_005.phpt b/tests/classes/autoload_005.phpt
new file mode 100755
index 0000000000..36a4e18f0b
--- /dev/null
+++ b/tests/classes/autoload_005.phpt
@@ -0,0 +1,45 @@
+--TEST--
+ZE2 Autoload from destructor
+--SKIPIF--
+<?php 
+	if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); 
+	if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
+?>
+--FILE--
+<?php
+
+function __autoload($class_name)
+{
+	var_dump(class_exists($class_name, false));
+	require_once(dirname(__FILE__) . '/' . $class_name . '.p5c');
+	echo __FUNCTION__ . '(' . $class_name . ")\n";
+}
+
+var_dump(class_exists('autoload_derived', false));
+var_dump(class_exists('autoload_derived', false));
+
+class Test
+{
+    function __destruct() {
+        echo __METHOD__ . "\n";
+        $o = new autoload_derived;
+        var_dump($o);
+    }
+}
+
+$o = new Test;
+unset($o);
+
+?>
+===DONE===
+--EXPECTF--
+bool(false)
+bool(false)
+Test::__destruct
+bool(false)
+bool(false)
+__autoload(autoload_root)
+__autoload(autoload_derived)
+object(autoload_derived)#%d (0) {
+}
+===DONE===
diff --git a/tests/classes/ctor_failure.phpt b/tests/classes/ctor_failure.phpt
new file mode 100755
index 0000000000..bbebca2af8
--- /dev/null
+++ b/tests/classes/ctor_failure.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Do not call destructors if constructor fails
+--FILE--
+<?php
+
+class Test
+{
+    function __construct($msg) {
+        echo __METHOD__ . "($msg)\n";
+        throw new Exception($msg);
+    }
+    
+    function __destruct() {
+        echo __METHOD__ . "\n";
+    }
+}
+
+try
+{
+    $o = new Test('Hello');
+    unset($o);
+}
+catch (Exception $e)
+{
+    echo 'Caught ' . get_class($e) . '(' . $e->getMessage() . ")\n";
+}
+
+?>
+===DONE===
+--EXPECT--
+Test::__construct(Hello)
+Caught Exception(Hello)
+===DONE===
diff --git a/tests/classes/destructor_and_echo.phpt b/tests/classes/destructor_and_echo.phpt
new file mode 100755
index 0000000000..c6c6f23a71
--- /dev/null
+++ b/tests/classes/destructor_and_echo.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Destructors and echo
+--FILE--
+<?php
+
+class Test
+{
+    function __construct() {
+        echo __METHOD__ . "\n";
+    }
+    
+    function __destruct() {
+        echo __METHOD__ . "\n";
+    }
+}
+
+$o = new Test;
+
+?>
+===DONE===
+--EXPECT--
+Test::__construct
+===DONE===
+Test::__destruct