mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Remove static calls from incompatible $this context"

Browse Source 
This reverts commit dc9991b167.
This commit is contained in:
Nikita Popov 2015-01-19 15:12:51 +01:00
parent 230bfb1067
commit 5f0248304e
3 changed files with 137 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Zend/tests/incompat_ctx_user.phpt
View File

@ -16,4 +16,5 @@ $b->bar();
?> ?>
--EXPECTF-- --EXPECTF--
Fatal error: Non-static method A::foo() cannot be called statically, assuming $this from incompatible context in %s on line %d Deprecated: Non-static method A::foo() should not be called statically, assuming $this from incompatible context in %s on line %d
string(1) "B"

30
Zend/zend_vm_def.h
View File

@ -2471,24 +2471,24 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, CONST|VAR, CONST|TMPVAR|UNUSE
object = Z_OBJ(EX(This)); object = Z_OBJ(EX(This));
GC_REFCOUNT(object)++; GC_REFCOUNT(object)++;
} }
if (!object) { if (!object ||
!instanceof_function(object->ce, ce)) {
/* We are calling method of the other (incompatible) class,
but passing $this. This is done for compatibility with php-4. */
if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) { if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) {
/* We allow calling userland non-static methods without $this */ zend_error(
zend_error(E_STRICT, object ? E_DEPRECATED : E_STRICT,
"Non-static method %s::%s() should not be called statically", "Non-static method %s::%s() should not be called statically%s",
fbc->common.scope->name->val, fbc->common.function_name->val); fbc->common.scope->name->val, fbc->common.function_name->val,
object ? ", assuming $this from incompatible context" : "");
} else { } else {
/* An internal function assumes $this is present and won't check that. /* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */
* So PHP would crash by allowing the call. */ zend_error_noreturn(
zend_error_noreturn(E_ERROR, E_ERROR,
"Non-static method %s::%s() cannot be called statically", "Non-static method %s::%s() cannot be called statically%s",
fbc->common.scope->name->val, fbc->common.function_name->val); fbc->common.scope->name->val, fbc->common.function_name->val,
object ? ", assuming $this from incompatible context" : "");
} }
} else if (!instanceof_function(object->ce, ce)) {
zend_error_noreturn(E_ERROR,
"Non-static method %s::%s() cannot be called statically, "
"assuming $this from incompatible context",
fbc->common.scope->name->val, fbc->common.function_name->val);
} }
} }

240
Zend/zend_vm_execute.h
View File

@ -4257,24 +4257,24 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CONST_HANDLER(
object = Z_OBJ(EX(This)); object = Z_OBJ(EX(This));
GC_REFCOUNT(object)++; GC_REFCOUNT(object)++;
} }
if (!object) { if (!object ||
!instanceof_function(object->ce, ce)) {
/* We are calling method of the other (incompatible) class,
but passing $this. This is done for compatibility with php-4. */
if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) { if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) {
/* We allow calling userland non-static methods without $this */ zend_error(
zend_error(E_STRICT, object ? E_DEPRECATED : E_STRICT,
"Non-static method %s::%s() should not be called statically", "Non-static method %s::%s() should not be called statically%s",
fbc->common.scope->name->val, fbc->common.function_name->val); fbc->common.scope->name->val, fbc->common.function_name->val,
object ? ", assuming $this from incompatible context" : "");
} else { } else {
/* An internal function assumes $this is present and won't check that. /* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */
* So PHP would crash by allowing the call. */ zend_error_noreturn(
zend_error_noreturn(E_ERROR, E_ERROR,
"Non-static method %s::%s() cannot be called statically", "Non-static method %s::%s() cannot be called statically%s",
fbc->common.scope->name->val, fbc->common.function_name->val); fbc->common.scope->name->val, fbc->common.function_name->val,
object ? ", assuming $this from incompatible context" : "");
} }
} else if (!instanceof_function(object->ce, ce)) {
zend_error_noreturn(E_ERROR,
"Non-static method %s::%s() cannot be called statically, "
"assuming $this from incompatible context",
fbc->common.scope->name->val, fbc->common.function_name->val);
} }
} }
@ -6052,24 +6052,24 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_UNUSED_HANDLER
object = Z_OBJ(EX(This)); object = Z_OBJ(EX(This));
GC_REFCOUNT(object)++; GC_REFCOUNT(object)++;
} }
if (!object) { if (!object ||
!instanceof_function(object->ce, ce)) {
/* We are calling method of the other (incompatible) class,
but passing $this. This is done for compatibility with php-4. */
if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) { if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) {
/* We allow calling userland non-static methods without $this */ zend_error(
zend_error(E_STRICT, object ? E_DEPRECATED : E_STRICT,
"Non-static method %s::%s() should not be called statically", "Non-static method %s::%s() should not be called statically%s",
fbc->common.scope->name->val, fbc->common.function_name->val); fbc->common.scope->name->val, fbc->common.function_name->val,
object ? ", assuming $this from incompatible context" : "");
} else { } else {
/* An internal function assumes $this is present and won't check that. /* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */
* So PHP would crash by allowing the call. */ zend_error_noreturn(
zend_error_noreturn(E_ERROR, E_ERROR,
"Non-static method %s::%s() cannot be called statically", "Non-static method %s::%s() cannot be called statically%s",
fbc->common.scope->name->val, fbc->common.function_name->val); fbc->common.scope->name->val, fbc->common.function_name->val,
object ? ", assuming $this from incompatible context" : "");
} }
} else if (!instanceof_function(object->ce, ce)) {
zend_error_noreturn(E_ERROR,
"Non-static method %s::%s() cannot be called statically, "
"assuming $this from incompatible context",
fbc->common.scope->name->val, fbc->common.function_name->val);
} }
} }
@ -7127,24 +7127,24 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CV_HANDLER(ZEN
object = Z_OBJ(EX(This)); object = Z_OBJ(EX(This));
GC_REFCOUNT(object)++; GC_REFCOUNT(object)++;
} }
if (!object) { if (!object ||
!instanceof_function(object->ce, ce)) {
/* We are calling method of the other (incompatible) class,
but passing $this. This is done for compatibility with php-4. */
if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) { if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) {
/* We allow calling userland non-static methods without $this */ zend_error(
zend_error(E_STRICT, object ? E_DEPRECATED : E_STRICT,
"Non-static method %s::%s() should not be called statically", "Non-static method %s::%s() should not be called statically%s",
fbc->common.scope->name->val, fbc->common.function_name->val); fbc->common.scope->name->val, fbc->common.function_name->val,
object ? ", assuming $this from incompatible context" : "");
} else { } else {
/* An internal function assumes $this is present and won't check that. /* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */
* So PHP would crash by allowing the call. */ zend_error_noreturn(
zend_error_noreturn(E_ERROR, E_ERROR,
"Non-static method %s::%s() cannot be called statically", "Non-static method %s::%s() cannot be called statically%s",
fbc->common.scope->name->val, fbc->common.function_name->val); fbc->common.scope->name->val, fbc->common.function_name->val,
object ? ", assuming $this from incompatible context" : "");
} }
} else if (!instanceof_function(object->ce, ce)) {
zend_error_noreturn(E_ERROR,
"Non-static method %s::%s() cannot be called statically, "
"assuming $this from incompatible context",
fbc->common.scope->name->val, fbc->common.function_name->val);
} }
} }
@ -8265,24 +8265,24 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_TMPVAR_HANDLER
object = Z_OBJ(EX(This)); object = Z_OBJ(EX(This));
GC_REFCOUNT(object)++; GC_REFCOUNT(object)++;
} }
if (!object) { if (!object ||
!instanceof_function(object->ce, ce)) {
/* We are calling method of the other (incompatible) class,
but passing $this. This is done for compatibility with php-4. */
if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) { if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) {
/* We allow calling userland non-static methods without $this */ zend_error(
zend_error(E_STRICT, object ? E_DEPRECATED : E_STRICT,
"Non-static method %s::%s() should not be called statically", "Non-static method %s::%s() should not be called statically%s",
fbc->common.scope->name->val, fbc->common.function_name->val); fbc->common.scope->name->val, fbc->common.function_name->val,
object ? ", assuming $this from incompatible context" : "");
} else { } else {
/* An internal function assumes $this is present and won't check that. /* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */
* So PHP would crash by allowing the call. */ zend_error_noreturn(
zend_error_noreturn(E_ERROR, E_ERROR,
"Non-static method %s::%s() cannot be called statically", "Non-static method %s::%s() cannot be called statically%s",
fbc->common.scope->name->val, fbc->common.function_name->val); fbc->common.scope->name->val, fbc->common.function_name->val,
object ? ", assuming $this from incompatible context" : "");
} }
} else if (!instanceof_function(object->ce, ce)) {
zend_error_noreturn(E_ERROR,
"Non-static method %s::%s() cannot be called statically, "
"assuming $this from incompatible context",
fbc->common.scope->name->val, fbc->common.function_name->val);
} }
} }
@ -13393,24 +13393,24 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZE
object = Z_OBJ(EX(This)); object = Z_OBJ(EX(This));
GC_REFCOUNT(object)++; GC_REFCOUNT(object)++;
} }
if (!object) { if (!object ||
!instanceof_function(object->ce, ce)) {
/* We are calling method of the other (incompatible) class,
but passing $this. This is done for compatibility with php-4. */
if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) { if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) {
/* We allow calling userland non-static methods without $this */ zend_error(
zend_error(E_STRICT, object ? E_DEPRECATED : E_STRICT,
"Non-static method %s::%s() should not be called statically", "Non-static method %s::%s() should not be called statically%s",
fbc->common.scope->name->val, fbc->common.function_name->val); fbc->common.scope->name->val, fbc->common.function_name->val,
object ? ", assuming $this from incompatible context" : "");
} else { } else {
/* An internal function assumes $this is present and won't check that. /* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */
* So PHP would crash by allowing the call. */ zend_error_noreturn(
zend_error_noreturn(E_ERROR, E_ERROR,
"Non-static method %s::%s() cannot be called statically", "Non-static method %s::%s() cannot be called statically%s",
fbc->common.scope->name->val, fbc->common.function_name->val); fbc->common.scope->name->val, fbc->common.function_name->val,
object ? ", assuming $this from incompatible context" : "");
} }
} else if (!instanceof_function(object->ce, ce)) {
zend_error_noreturn(E_ERROR,
"Non-static method %s::%s() cannot be called statically, "
"assuming $this from incompatible context",
fbc->common.scope->name->val, fbc->common.function_name->val);
} }
} }
@ -14882,24 +14882,24 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_UNUSED_HANDLER(Z
object = Z_OBJ(EX(This)); object = Z_OBJ(EX(This));
GC_REFCOUNT(object)++; GC_REFCOUNT(object)++;
} }
if (!object) { if (!object ||
!instanceof_function(object->ce, ce)) {
/* We are calling method of the other (incompatible) class,
but passing $this. This is done for compatibility with php-4. */
if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) { if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) {
/* We allow calling userland non-static methods without $this */ zend_error(
zend_error(E_STRICT, object ? E_DEPRECATED : E_STRICT,
"Non-static method %s::%s() should not be called statically", "Non-static method %s::%s() should not be called statically%s",
fbc->common.scope->name->val, fbc->common.function_name->val); fbc->common.scope->name->val, fbc->common.function_name->val,
object ? ", assuming $this from incompatible context" : "");
} else { } else {
/* An internal function assumes $this is present and won't check that. /* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */
* So PHP would crash by allowing the call. */ zend_error_noreturn(
zend_error_noreturn(E_ERROR, E_ERROR,
"Non-static method %s::%s() cannot be called statically", "Non-static method %s::%s() cannot be called statically%s",
fbc->common.scope->name->val, fbc->common.function_name->val); fbc->common.scope->name->val, fbc->common.function_name->val,
object ? ", assuming $this from incompatible context" : "");
} }
} else if (!instanceof_function(object->ce, ce)) {
zend_error_noreturn(E_ERROR,
"Non-static method %s::%s() cannot be called statically, "
"assuming $this from incompatible context",
fbc->common.scope->name->val, fbc->common.function_name->val);
} }
} }
@ -16329,24 +16329,24 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_
object = Z_OBJ(EX(This)); object = Z_OBJ(EX(This));
GC_REFCOUNT(object)++; GC_REFCOUNT(object)++;
} }
if (!object) { if (!object ||
!instanceof_function(object->ce, ce)) {
/* We are calling method of the other (incompatible) class,
but passing $this. This is done for compatibility with php-4. */
if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) { if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) {
/* We allow calling userland non-static methods without $this */ zend_error(
zend_error(E_STRICT, object ? E_DEPRECATED : E_STRICT,
"Non-static method %s::%s() should not be called statically", "Non-static method %s::%s() should not be called statically%s",
fbc->common.scope->name->val, fbc->common.function_name->val); fbc->common.scope->name->val, fbc->common.function_name->val,
object ? ", assuming $this from incompatible context" : "");
} else { } else {
/* An internal function assumes $this is present and won't check that. /* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */
* So PHP would crash by allowing the call. */ zend_error_noreturn(
zend_error_noreturn(E_ERROR, E_ERROR,
"Non-static method %s::%s() cannot be called statically", "Non-static method %s::%s() cannot be called statically%s",
fbc->common.scope->name->val, fbc->common.function_name->val); fbc->common.scope->name->val, fbc->common.function_name->val,
object ? ", assuming $this from incompatible context" : "");
} }
} else if (!instanceof_function(object->ce, ce)) {
zend_error_noreturn(E_ERROR,
"Non-static method %s::%s() cannot be called statically, "
"assuming $this from incompatible context",
fbc->common.scope->name->val, fbc->common.function_name->val);
} }
} }
@ -17766,24 +17766,24 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_TMPVAR_HANDLER(Z
object = Z_OBJ(EX(This)); object = Z_OBJ(EX(This));
GC_REFCOUNT(object)++; GC_REFCOUNT(object)++;
} }
if (!object) { if (!object ||
!instanceof_function(object->ce, ce)) {
/* We are calling method of the other (incompatible) class,
but passing $this. This is done for compatibility with php-4. */
if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) { if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) {
/* We allow calling userland non-static methods without $this */ zend_error(
zend_error(E_STRICT, object ? E_DEPRECATED : E_STRICT,
"Non-static method %s::%s() should not be called statically", "Non-static method %s::%s() should not be called statically%s",
fbc->common.scope->name->val, fbc->common.function_name->val); fbc->common.scope->name->val, fbc->common.function_name->val,
object ? ", assuming $this from incompatible context" : "");
} else { } else {
/* An internal function assumes $this is present and won't check that. /* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */
* So PHP would crash by allowing the call. */ zend_error_noreturn(
zend_error_noreturn(E_ERROR, E_ERROR,
"Non-static method %s::%s() cannot be called statically", "Non-static method %s::%s() cannot be called statically%s",
fbc->common.scope->name->val, fbc->common.function_name->val); fbc->common.scope->name->val, fbc->common.function_name->val,
object ? ", assuming $this from incompatible context" : "");
} }
} else if (!instanceof_function(object->ce, ce)) {
zend_error_noreturn(E_ERROR,
"Non-static method %s::%s() cannot be called statically, "
"assuming $this from incompatible context",
fbc->common.scope->name->val, fbc->common.function_name->val);
} }
} }