cvs: ZendEngine2 / zend_compile.c /tests objects_002.phpt objects_003.phpt objects_004.phpt objects_005.phpt objects_006.phpt objects_007.phpt objects_008.phpt objects_009.phpt
[email protected] ("Felipe Pena") Sat, 04 Apr 2009 17:19:29 -0000
| Newsgroups | php.zend-engine.cvs |
|---|---|
| Message-ID | <cvsfelipe1238865569@cvsserver> |
felipe Sat Apr 4 17:19:29 2009 UTC
Modified files:
/ZendEngine2 zend_compile.c
/ZendEngine2/tests objects_002.phpt objects_003.phpt
objects_004.phpt objects_005.phpt
objects_006.phpt objects_007.phpt
objects_008.phpt objects_009.phpt
Log:
- Synced old changes
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.852&r2=1.853&diff_format=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.852 ZendEngine2/zend_compile.c:1.853
--- ZendEngine2/zend_compile.c:1.852 Thu Mar 26 20:01:38 2009
+++ ZendEngine2/zend_compile.c Sat Apr 4 17:19:28 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_compile.c,v 1.852 2009/03/26 20:01:38 felipe Exp $ */
+/* $Id: zend_compile.c,v 1.853 2009/04/04 17:19:28 felipe Exp $ */
#include <zend_language_parser.h>
#include "zend.h"
@@ -2727,7 +2727,7 @@
child->common.prototype = parent->common.prototype ? parent->common.prototype : parent;
}
- if (child->common.prototype) {
+ if (child->common.prototype && (child->common.prototype->common.fn_flags & ZEND_ACC_ABSTRACT)) {
if (!zend_do_perform_implementation_check(child, child->common.prototype TSRMLS_CC)) {
zend_error(E_COMPILE_ERROR, "Declaration of %v::%v() must be compatible with that of %v::%v()", ZEND_FN_SCOPE_NAME(child), child->common.function_name, ZEND_FN_SCOPE_NAME(child->common.prototype), child->common.prototype->common.function_name);
}
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/objects_002.phpt?r1=1.3&r2=1.4&diff_format=u
Index: ZendEngine2/tests/objects_002.phpt
diff -u ZendEngine2/tests/objects_002.phpt:1.3 ZendEngine2/tests/objects_002.phpt:1.4
--- ZendEngine2/tests/objects_002.phpt:1.3 Mon May 26 14:33:43 2008
+++ ZendEngine2/tests/objects_002.phpt Sat Apr 4 17:19:28 2009
@@ -20,4 +20,5 @@
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
+Strict Standards: Declaration of test3::foo() should be compatible with that of test::foo() in %s on line %d
+Done
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/objects_003.phpt?r1=1.3&r2=1.4&diff_format=u
Index: ZendEngine2/tests/objects_003.phpt
diff -u ZendEngine2/tests/objects_003.phpt:1.3 ZendEngine2/tests/objects_003.phpt:1.4
--- ZendEngine2/tests/objects_003.phpt:1.3 Mon May 26 14:33:43 2008
+++ ZendEngine2/tests/objects_003.phpt Sat Apr 4 17:19:28 2009
@@ -20,4 +20,5 @@
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
+Strict Standards: Declaration of test3::foo() should be compatible with that of test::foo() in %s on line %d
+Done
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/objects_004.phpt?r1=1.3&r2=1.4&diff_format=u
Index: ZendEngine2/tests/objects_004.phpt
diff -u ZendEngine2/tests/objects_004.phpt:1.3 ZendEngine2/tests/objects_004.phpt:1.4
--- ZendEngine2/tests/objects_004.phpt:1.3 Mon May 26 14:33:43 2008
+++ ZendEngine2/tests/objects_004.phpt Sat Apr 4 17:19:28 2009
@@ -20,4 +20,5 @@
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
+Strict Standards: Declaration of test3::foo() should be compatible with that of test::foo() in %s on line %d
+Done
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/objects_005.phpt?r1=1.3&r2=1.4&diff_format=u
Index: ZendEngine2/tests/objects_005.phpt
diff -u ZendEngine2/tests/objects_005.phpt:1.3 ZendEngine2/tests/objects_005.phpt:1.4
--- ZendEngine2/tests/objects_005.phpt:1.3 Mon May 26 14:33:43 2008
+++ ZendEngine2/tests/objects_005.phpt Sat Apr 4 17:19:29 2009
@@ -20,4 +20,5 @@
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
+Strict Standards: Declaration of test3::foo() should be compatible with that of test::foo() in %s on line %d
+Done
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/objects_006.phpt?r1=1.3&r2=1.4&diff_format=u
Index: ZendEngine2/tests/objects_006.phpt
diff -u ZendEngine2/tests/objects_006.phpt:1.3 ZendEngine2/tests/objects_006.phpt:1.4
--- ZendEngine2/tests/objects_006.phpt:1.3 Mon May 26 14:33:43 2008
+++ ZendEngine2/tests/objects_006.phpt Sat Apr 4 17:19:29 2009
@@ -20,4 +20,5 @@
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
+Strict Standards: Declaration of test3::foo() should be compatible with that of test::foo() in %s on line %d
+Done
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/objects_007.phpt?r1=1.3&r2=1.4&diff_format=u
Index: ZendEngine2/tests/objects_007.phpt
diff -u ZendEngine2/tests/objects_007.phpt:1.3 ZendEngine2/tests/objects_007.phpt:1.4
--- ZendEngine2/tests/objects_007.phpt:1.3 Mon May 26 14:33:43 2008
+++ ZendEngine2/tests/objects_007.phpt Sat Apr 4 17:19:29 2009
@@ -20,4 +20,5 @@
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
+Strict Standards: Declaration of test3::foo() should be compatible with that of test::foo() in %s on line %d
+Done
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/objects_008.phpt?r1=1.3&r2=1.4&diff_format=u
Index: ZendEngine2/tests/objects_008.phpt
diff -u ZendEngine2/tests/objects_008.phpt:1.3 ZendEngine2/tests/objects_008.phpt:1.4
--- ZendEngine2/tests/objects_008.phpt:1.3 Mon May 26 14:33:43 2008
+++ ZendEngine2/tests/objects_008.phpt Sat Apr 4 17:19:29 2009
@@ -20,4 +20,5 @@
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
+Strict Standards: Declaration of test3::foo() should be compatible with that of test::foo() in %s on line %d
+Done
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/objects_009.phpt?r1=1.3&r2=1.4&diff_format=u
Index: ZendEngine2/tests/objects_009.phpt
diff -u ZendEngine2/tests/objects_009.phpt:1.3 ZendEngine2/tests/objects_009.phpt:1.4
--- ZendEngine2/tests/objects_009.phpt:1.3 Mon May 26 14:33:43 2008
+++ ZendEngine2/tests/objects_009.phpt Sat Apr 4 17:19:29 2009
@@ -20,4 +20,5 @@
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
+Strict Standards: Declaration of test3::foo() should be compatible with that of test::foo() in %s on line %d
+Done