From: Marcus Boerger <helly@php.net>
Date: Wed, 10 May 2006 21:12:31 +0000 (+0000)
Subject: - Fix tests
X-Git-Tag: BEFORE_NEW_OUTPUT_API~241
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b85eb277fc037bf3132da636602b1689e523dba6;p=php

- Fix tests
---

diff --git a/tests/classes/interfaces_003.phpt b/tests/classes/interfaces_003.phpt
index fa2cb7317f..2c4c7e7c94 100755
--- a/tests/classes/interfaces_003.phpt
+++ b/tests/classes/interfaces_003.phpt
@@ -7,27 +7,20 @@ class MyObject {}
 
 interface MyInterface
 {
-	public function __construct(Object $o);
+	public function __construct(MyObject $o);
 }
 
 class MyTestClass implements MyInterface
 {
-	public function __construct(Object $o)
+	public function __construct(MyObject $o)
 	{
 	}
 }
 
 $obj = new MyTestClass;
 
-class MyTestFail
-{
-	public function __construct()
-	{
-	}
-}
-
 ?>
 ===DONE===
 --EXPECTF--
 
-Catchable fatal error: Argument 1 passed to MyTestClass::__construct() must be an object of class Object, called in %sinterfaces_003.php on line %d
+Catchable fatal error: Argument 1 passed to MyTestClass::__construct() must be an object of class MyObject, called in %sinterfaces_003.php on line %d
diff --git a/tests/classes/tostring_003.phpt b/tests/classes/tostring_003.phpt
index 23a4fe524c..8815bd9407 100755
--- a/tests/classes/tostring_003.phpt
+++ b/tests/classes/tostring_003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 __toString() in __destruct/exception
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
@@ -32,4 +30,4 @@ catch(Exception $e)
 ?>
 ====DONE====
 --EXPECTF--
-Fatal error: Object of class Test could not be converted to string in %stostring_003.php on line %d
+Fatal error: Method Test::__toString() must not throw an exception in %stostring_003.php on line %d