felipe Sat, 19 Nov 2011 18:01:26 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=319551
Log:
- Fix tests
Changed paths:
U php/php-src/branches/PHP_5_3/Zend/tests/inter_007.phpt
U php/php-src/branches/PHP_5_3/Zend/tests/inter_04.phpt
U php/php-src/branches/PHP_5_3/Zend/tests/objects_018.phpt
U php/php-src/branches/PHP_5_4/Zend/tests/inter_007.phpt
U php/php-src/branches/PHP_5_4/Zend/tests/inter_04.phpt
U php/php-src/branches/PHP_5_4/Zend/tests/objects_018.phpt
U php/php-src/trunk/Zend/tests/inter_007.phpt
U php/php-src/trunk/Zend/tests/inter_04.phpt
U php/php-src/trunk/Zend/tests/objects_018.phpt
Modified: php/php-src/branches/PHP_5_3/Zend/tests/inter_007.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/tests/inter_007.phpt 2011-11-19
17:37:00 UTC (rev 319550)
+++ php/php-src/branches/PHP_5_3/Zend/tests/inter_007.phpt 2011-11-19
18:01:26 UTC (rev 319551)
@@ -17,4 +17,4 @@
?>
--EXPECTF--
-Fatal error: Can't inherit abstract function c::B() (previously declared
abstract in d) in %s on line %d
+Fatal error: Cannot make non static method c::B() static in class d in %s on
line %d
Modified: php/php-src/branches/PHP_5_3/Zend/tests/inter_04.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/tests/inter_04.phpt 2011-11-19
17:37:00 UTC (rev 319550)
+++ php/php-src/branches/PHP_5_3/Zend/tests/inter_04.phpt 2011-11-19
18:01:26 UTC (rev 319551)
@@ -14,6 +14,8 @@
interface c extends a, b {
}
+echo "done!\n";
+
?>
--EXPECTF--
-Fatal error: Can't inherit abstract function b::b() (previously declared
abstract in a) in %s on line %d
+done!
Modified: php/php-src/branches/PHP_5_3/Zend/tests/objects_018.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/tests/objects_018.phpt 2011-11-19
17:37:00 UTC (rev 319550)
+++ php/php-src/branches/PHP_5_3/Zend/tests/objects_018.phpt 2011-11-19
18:01:26 UTC (rev 319551)
@@ -14,6 +14,8 @@
interface Itest3 extends Itest, Itest2 {
}
+echo "done!\n";
+
?>
--EXPECTF--
-Fatal error: Can't inherit abstract function Itest2::a() (previously declared
abstract in Itest) in %s on line %d
+done!
Modified: php/php-src/branches/PHP_5_4/Zend/tests/inter_007.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/tests/inter_007.phpt 2011-11-19
17:37:00 UTC (rev 319550)
+++ php/php-src/branches/PHP_5_4/Zend/tests/inter_007.phpt 2011-11-19
18:01:26 UTC (rev 319551)
@@ -17,4 +17,4 @@
?>
--EXPECTF--
-Fatal error: Can't inherit abstract function c::B() (previously declared
abstract in d) in %s on line %d
+Fatal error: Cannot make non static method c::B() static in class d in %s on
line %d
Modified: php/php-src/branches/PHP_5_4/Zend/tests/inter_04.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/tests/inter_04.phpt 2011-11-19
17:37:00 UTC (rev 319550)
+++ php/php-src/branches/PHP_5_4/Zend/tests/inter_04.phpt 2011-11-19
18:01:26 UTC (rev 319551)
@@ -14,6 +14,8 @@
interface c extends a, b {
}
+echo "done!\n";
+
?>
--EXPECTF--
-Fatal error: Can't inherit abstract function b::b() (previously declared
abstract in a) in %s on line %d
+done!
Modified: php/php-src/branches/PHP_5_4/Zend/tests/objects_018.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/tests/objects_018.phpt 2011-11-19
17:37:00 UTC (rev 319550)
+++ php/php-src/branches/PHP_5_4/Zend/tests/objects_018.phpt 2011-11-19
18:01:26 UTC (rev 319551)
@@ -14,6 +14,8 @@
interface Itest3 extends Itest, Itest2 {
}
+echo "done!\n";
+
?>
--EXPECTF--
-Fatal error: Can't inherit abstract function Itest2::a() (previously declared
abstract in Itest) in %s on line %d
+done!
Modified: php/php-src/trunk/Zend/tests/inter_007.phpt
===================================================================
--- php/php-src/trunk/Zend/tests/inter_007.phpt 2011-11-19 17:37:00 UTC (rev
319550)
+++ php/php-src/trunk/Zend/tests/inter_007.phpt 2011-11-19 18:01:26 UTC (rev
319551)
@@ -17,4 +17,4 @@
?>
--EXPECTF--
-Fatal error: Can't inherit abstract function c::B() (previously declared
abstract in d) in %s on line %d
+Fatal error: Cannot make non static method c::B() static in class d in %s on
line %d
Modified: php/php-src/trunk/Zend/tests/inter_04.phpt
===================================================================
--- php/php-src/trunk/Zend/tests/inter_04.phpt 2011-11-19 17:37:00 UTC (rev
319550)
+++ php/php-src/trunk/Zend/tests/inter_04.phpt 2011-11-19 18:01:26 UTC (rev
319551)
@@ -14,6 +14,8 @@
interface c extends a, b {
}
+echo "done!\n";
+
?>
--EXPECTF--
-Fatal error: Can't inherit abstract function b::b() (previously declared
abstract in a) in %s on line %d
+done!
Modified: php/php-src/trunk/Zend/tests/objects_018.phpt
===================================================================
--- php/php-src/trunk/Zend/tests/objects_018.phpt 2011-11-19 17:37:00 UTC
(rev 319550)
+++ php/php-src/trunk/Zend/tests/objects_018.phpt 2011-11-19 18:01:26 UTC
(rev 319551)
@@ -14,6 +14,8 @@
interface Itest3 extends Itest, Itest2 {
}
+echo "done!\n";
+
?>
--EXPECTF--
-Fatal error: Can't inherit abstract function Itest2::a() (previously declared
abstract in Itest) in %s on line %d
+done!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
