php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-30 03:33:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Restored original EG(scope) behavior when call object methods

Browse Source
This commit is contained in:
Dmitry Stogov
2014-05-06 02:04:05 +04:00
parent 1606a9a36a
commit 28a8135331
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zend/zend_vm_def.h
+6 -1
View File
@@ -1938,8 +1938,13 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY)
if (fbc->common.scope) {
should_change_scope = 1;
Z_OBJ(EG(This)) = object;
//??? EG(scope) = (object) ? NULL : fbc->common.scope;
/* TODO: we don't set scope if we call an object method ??? */
/* See: ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt */
#if 1
EG(scope) = (object) ? NULL : fbc->common.scope;
#else
EG(scope) = fbc->common.scope;
#endif
EG(called_scope) = EX(call)->called_scope;
}
Zend/zend_vm_execute.h
+6 -1
View File
@@ -548,8 +548,13 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR
if (fbc->common.scope) {
should_change_scope = 1;
Z_OBJ(EG(This)) = object;
//??? EG(scope) = (object) ? NULL : fbc->common.scope;
/* TODO: we don't set scope if we call an object method ??? */
/* See: ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt */
#if 1
EG(scope) = (object) ? NULL : fbc->common.scope;
#else
EG(scope) = fbc->common.scope;
#endif
EG(called_scope) = EX(call)->called_scope;
}