cvs: ZendEngine2(PHP_5_2) / zend_compile.c
| From: | Ilia Alshanetsky | Date: | Fri, 20 Oct 2006 02:44:02 +0000 |
| Subject: | cvs: ZendEngine2(PHP_5_2) / zend_compile.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-5342@lists.php.net to get a copy of this message | ||
iliaa Fri Oct 20 02:44:02 2006 UTC
Modified files: (Branch: PHP_5_2)
/ZendEngine2 zend_compile.c
Log:
Make use of abstract methods be E_STRICT rather then E_ERROR
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.647.2.27.2.19&r2=1.647.2.27.2.20&diff_format=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.647.2.27.2.19 ZendEngine2/zend_compile.c:1.647.2.27.2.20
--- ZendEngine2/zend_compile.c:1.647.2.27.2.19 Tue Oct 3 11:10:33 2006
+++ ZendEngine2/zend_compile.c Fri Oct 20 02:44:02 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_compile.c,v 1.647.2.27.2.19 2006/10/03 11:10:33 dmitry Exp $ */
+/* $Id: zend_compile.c,v 1.647.2.27.2.20 2006/10/20 02:44:02 iliaa Exp $ */
#include <zend_language_parser.h>
#include "zend.h"
@@ -1080,7 +1080,7 @@
fn_flags = 0;
}
if ((fn_flags & ZEND_ACC_STATIC) && (fn_flags & ZEND_ACC_ABSTRACT) &&
!(CG(active_class_entry)->ce_flags & ZEND_ACC_INTERFACE)) {
- zend_error(E_COMPILE_ERROR, "Static function %s%s%s() cannot be abstract", is_method ?
CG(active_class_entry)->name : "", is_method ? "::" : "",
Z_STRVAL(function_name->u.constant));
+ zend_error(E_STRICT, "Static function %s%s%s() should not be abstract", is_method ?
CG(active_class_entry)->name : "", is_method ? "::" : "",
Z_STRVAL(function_name->u.constant));
}
function_token->u.op_array = CG(active_op_array);