jani Sat, 13 Feb 2010 01:08:04 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=295003
Log:
- Fixed tests
Changed paths:
U php/php-src/branches/PHP_5_2/tests/classes/constants_error_004.phpt
U php/php-src/branches/PHP_5_2/tests/lang/bug44827.phpt
U php/php-src/branches/PHP_5_3/tests/classes/constants_error_004.phpt
U php/php-src/branches/PHP_5_3/tests/lang/bug44827.phpt
U php/php-src/trunk/tests/classes/constants_error_004.phpt
U php/php-src/trunk/tests/lang/bug44827.phpt
Modified: php/php-src/branches/PHP_5_2/tests/classes/constants_error_004.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/tests/classes/constants_error_004.phpt
2010-02-12 23:38:25 UTC (rev 295002)
+++ php/php-src/branches/PHP_5_2/tests/classes/constants_error_004.phpt
2010-02-13 01:08:04 UTC (rev 295003)
@@ -10,4 +10,4 @@
$a = new C();
?>
--EXPECTF--
-Fatal error: Class 'D' not found in %s on line %d
+Fatal error: Undefined class constant 'D::hello' in %s on line %d
Modified: php/php-src/branches/PHP_5_2/tests/lang/bug44827.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/tests/lang/bug44827.phpt 2010-02-12
23:38:25 UTC (rev 295002)
+++ php/php-src/branches/PHP_5_2/tests/lang/bug44827.phpt 2010-02-13
01:08:04 UTC (rev 295003)
@@ -9,6 +9,8 @@
define('::', true);
var_dump(constant('::'));
?>
---EXPECTREGEX--
-.*Fatal.*
+--EXPECTF--
+Warning: Class constants cannot be defined or redefined in %s on line %d
+Warning: constant(): Couldn't find constant :: in %s on line %d
+NULL
Modified: php/php-src/branches/PHP_5_3/tests/classes/constants_error_004.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/tests/classes/constants_error_004.phpt
2010-02-12 23:38:25 UTC (rev 295002)
+++ php/php-src/branches/PHP_5_3/tests/classes/constants_error_004.phpt
2010-02-13 01:08:04 UTC (rev 295003)
@@ -10,4 +10,4 @@
$a = new C();
?>
--EXPECTF--
-Fatal error: Class 'D' not found in %s on line %d
+Fatal error: Undefined class constant 'D::hello' in %s on line %d
Modified: php/php-src/branches/PHP_5_3/tests/lang/bug44827.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/tests/lang/bug44827.phpt 2010-02-12
23:38:25 UTC (rev 295002)
+++ php/php-src/branches/PHP_5_3/tests/lang/bug44827.phpt 2010-02-13
01:08:04 UTC (rev 295003)
@@ -9,6 +9,9 @@
define('::', true);
var_dump(constant('::'));
?>
---EXPECTREGEX--
-.*Fatal.*
+--EXPECTF--
+Warning: Class constants cannot be defined or redefined in %s on line %d
+Warning: constant(): Couldn't find constant :: in %s on line %d
+NULL
+
Modified: php/php-src/trunk/tests/classes/constants_error_004.phpt
===================================================================
--- php/php-src/trunk/tests/classes/constants_error_004.phpt 2010-02-12
23:38:25 UTC (rev 295002)
+++ php/php-src/trunk/tests/classes/constants_error_004.phpt 2010-02-13
01:08:04 UTC (rev 295003)
@@ -10,4 +10,4 @@
$a = new C();
?>
--EXPECTF--
-Fatal error: Class 'D' not found in %s on line %d
+Fatal error: Undefined class constant 'D::hello' in %s on line %d
Modified: php/php-src/trunk/tests/lang/bug44827.phpt
===================================================================
--- php/php-src/trunk/tests/lang/bug44827.phpt 2010-02-12 23:38:25 UTC (rev
295002)
+++ php/php-src/trunk/tests/lang/bug44827.phpt 2010-02-13 01:08:04 UTC (rev
295003)
@@ -9,6 +9,8 @@
define('::', true);
var_dump(constant('::'));
?>
---EXPECTREGEX--
-.*Fatal.*
+--EXPECTF--
+Warning: Class constants cannot be defined or redefined in %s on line %d
+Warning: constant(): Couldn't find constant :: in %s on line %d
+NULL
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
