cvs: ZendEngine2 / zend_API.c zend_execute_API.c zend_vm_def.h

helly		Sat Feb  2 15:46:20 2008 UTC

  Modified files:              
    /ZendEngine2	zend_API.c zend_execute_API.c zend_vm_def.h 
  Log:
  -Add comment that explains wh we need E_ERROR in those cases
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.454&r2=1.455&diff_format=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.454 ZendEngine2/zend_API.c:1.455
--- ZendEngine2/zend_API.c:1.454	Sat Feb  2 15:23:22 2008
+++ ZendEngine2/zend_API.c	Sat Feb  2 15:46:19 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_API.c,v 1.454 2008/02/02 15:23:22 helly Exp $ */
+/* $Id: zend_API.c,v 1.455 2008/02/02 15:46:19 helly Exp $ */
 
 #include "zend.h"
 #include "zend_execute.h"
@@ -2767,6 +2767,7 @@
 					severity = E_STRICT;
 					verb = "should not";
 				} else {
+					/* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */
 					severity = E_ERROR;
 					verb = "cannot";
 				}
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.436&r2=1.437&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.436 ZendEngine2/zend_execute_API.c:1.437
--- ZendEngine2/zend_execute_API.c:1.436	Sat Feb  2 15:23:22 2008
+++ ZendEngine2/zend_execute_API.c	Sat Feb  2 15:46:19 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute_API.c,v 1.436 2008/02/02 15:23:22 helly Exp $ */
+/* $Id: zend_execute_API.c,v 1.437 2008/02/02 15:46:19 helly Exp $ */
 
 #include <stdio.h>
 #include <signal.h>
@@ -1150,6 +1150,7 @@
 				severity = E_STRICT;
 				verb = "should not";
 			} else {
+				/* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */
 				severity = E_ERROR;
 				verb = "cannot";
 			}
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_def.h?r1=1.211&r2=1.212&diff_format=u
Index: ZendEngine2/zend_vm_def.h
diff -u ZendEngine2/zend_vm_def.h:1.211 ZendEngine2/zend_vm_def.h:1.212
--- ZendEngine2/zend_vm_def.h:1.211	Sat Feb  2 15:23:22 2008
+++ ZendEngine2/zend_vm_def.h	Sat Feb  2 15:46:19 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_vm_def.h,v 1.211 2008/02/02 15:23:22 helly Exp $ */
+/* $Id: zend_vm_def.h,v 1.212 2008/02/02 15:46:19 helly Exp $ */
 
 /* If you change this file, please regenerate the zend_vm_execute.h and
  * zend_vm_opcodes.h files by running:
@@ -2032,6 +2032,7 @@
 				severity = E_STRICT;
 				verb = "should not";
 			} else {
+				/* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */
 				severity = E_ERROR;
 				verb = "cannot";
 			}
@@ -2144,6 +2145,7 @@
 			zend_error(E_STRICT, "Non-static method %v::%v() should not be called statically", EX(function_state).function->common.scope->name, EX(function_state).function->common.function_name);
 		} else {
 			/* FIXME: output identifiers properly */
+			/* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */
 			zend_error_noreturn(E_ERROR, "Non-static method %v::%v() cannot be called statically", EX(function_state).function->common.scope->name, EX(function_state).function->common.function_name);
 		}
 	}