summaryrefslogtreecommitdiff
path: root/Zend/zend_execute_API.c
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-01-30 13:35:36 +0100
committerNikita Popov <nikita.ppv@gmail.com>2019-01-30 14:00:16 +0100
commit0dfd918ee7a3520836b875b8c24f0a5f98fbee15 (patch)
tree2f9645b0f4bcef2f5a3d0ae702bf27470b6f397b /Zend/zend_execute_API.c
parente93bbf4d5d2812c698a4711fc0ff751b170bdf2b (diff)
downloadphp-git-0dfd918ee7a3520836b875b8c24f0a5f98fbee15.tar.gz
Remove support for __autoload()
There are probably some improvements we can do to the SPL implementation now that __autoload() is gone. In particular having EG(autoload_func) as a property zend function, rather than a simple callback probably doesn't make sense.
Diffstat (limited to 'Zend/zend_execute_API.c')
-rw-r--r--Zend/zend_execute_API.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 12799a96e1..9215717bcc 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -903,16 +903,10 @@ ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, zend_string *
}
if (!EG(autoload_func)) {
- zend_function *func = zend_fetch_function(ZSTR_KNOWN(ZEND_STR_MAGIC_AUTOLOAD));
-
- if (func) {
- EG(autoload_func) = func;
- } else {
- if (!key) {
- zend_string_release_ex(lc_name, 0);
- }
- return NULL;
+ if (!key) {
+ zend_string_release_ex(lc_name, 0);
}
+ return NULL;
}