From ae281c372af67b9053dc7a08136f9db2454d8fd5 Mon Sep 17 00:00:00 2001 From: foobar Date: Thu, 15 Sep 2005 19:49:58 +0000 Subject: [PATCH] - Fix tests due to changes in the error messages. # Also nuked some CRLF's --- Zend/tests/array_type_hint_001.phpt | 2 +- Zend/tests/bug20240.phpt | 2 +- Zend/tests/bug33996.phpt | 2 +- Zend/tests/bug34199.phpt | 1 + tests/classes/type_hinting_001.phpt | 2 +- tests/lang/bug24658.phpt | 2 +- tests/lang/type_hints_001.phpt | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Zend/tests/array_type_hint_001.phpt b/Zend/tests/array_type_hint_001.phpt index b110622aeb..b8a8955f2d 100755 --- a/Zend/tests/array_type_hint_001.phpt +++ b/Zend/tests/array_type_hint_001.phpt @@ -12,4 +12,4 @@ foo(123); --EXPECTF-- 3 -Fatal error: Argument 1 must be an array, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php on line 2 +Fatal error: Argument 1 passed to foo() must be an array, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php on line 2 diff --git a/Zend/tests/bug20240.phpt b/Zend/tests/bug20240.phpt index 4395044006..acf673a277 100755 --- a/Zend/tests/bug20240.phpt +++ b/Zend/tests/bug20240.phpt @@ -39,5 +39,5 @@ echo "Done\n"; 2 3 Done -test::__destruct test::destructor +test::__destruct diff --git a/Zend/tests/bug33996.phpt b/Zend/tests/bug33996.phpt index 9b52f02a8f..1f02cae0f9 100755 --- a/Zend/tests/bug33996.phpt +++ b/Zend/tests/bug33996.phpt @@ -26,4 +26,4 @@ FooTest(new Foo()); --EXPECTF-- Warning: Missing argument 1 for NormalTest(), called in %sbug33996.php on line 17 and defined in %sbug33996.php on line 12 Hi! -Fatal error: Argument 1 must be an object of class Foo, called in %sbug33996.php on line 18 and defined in %sbug33996.php on line 7 +Fatal error: Argument 1 passed to FooTest() must be an object of class Foo, called in %sbug33996.php on line 18 and defined in %sbug33996.php on line 7 diff --git a/Zend/tests/bug34199.phpt b/Zend/tests/bug34199.phpt index 9541eea9b4..daae0deb3d 100755 --- a/Zend/tests/bug34199.phpt +++ b/Zend/tests/bug34199.phpt @@ -15,3 +15,4 @@ if(!$kids) echo "ok\n"; else echo "bug\n"; bool(false) ok ok + diff --git a/tests/classes/type_hinting_001.phpt b/tests/classes/type_hinting_001.phpt index c46e420ab6..82241298d8 100644 --- a/tests/classes/type_hinting_001.phpt +++ b/tests/classes/type_hinting_001.phpt @@ -35,4 +35,4 @@ $a->b($b); ?> --EXPECTF-- -Fatal error: Argument 1 must implement interface Foo, called in %s on line 27 and defined in %s on line 12 +Fatal error: Argument 1 passed to FooBar::a() must implement interface Foo, called in %s on line 27 and defined in %s on line 12 diff --git a/tests/lang/bug24658.phpt b/tests/lang/bug24658.phpt index 399fd32cac..d9bf0f5668 100644 --- a/tests/lang/bug24658.phpt +++ b/tests/lang/bug24658.phpt @@ -53,4 +53,4 @@ int(2) object(foo)#%d (0) { } -Fatal error: Argument 1 must be an object of class foo in %s on line %d +Fatal error: Argument 1 passed to typehint() must be an object of class foo in %s on line %d diff --git a/tests/lang/type_hints_001.phpt b/tests/lang/type_hints_001.phpt index 2aea3e703e..2b5f6c8287 100644 --- a/tests/lang/type_hints_001.phpt +++ b/tests/lang/type_hints_001.phpt @@ -23,4 +23,4 @@ type_hint_foo($bar); ?> --EXPECTF-- -Fatal error: Argument 1 must be an instance of Foo, called in %s on line 16 and defined in %s on line 9 +Fatal error: Argument 1 passed to type_hint_foo() must be an instance of Foo, called in %s on line 16 and defined in %s on line 9 -- 2.40.0