Issue zephir-lang#251: fix for PHP 7.0

sjinks · Apr 9, 2017 · 2f4fa61 · 2f4fa61
1 parent d07f981
commit 2f4fa61
Showing 1 changed file with 0 additions and 15 deletions.
diff --git a/kernels/ZendEngine3/fcall.c b/kernels/ZendEngine3/fcall.c
@@ -179,11 +179,6 @@ int zephir_call_user_function(zval *object_pp, zend_class_entry *obj_ce, zephir_
 	zephir_fcall_cache_entry *temp_cache_entry = NULL;
 	int reload_cache = 1, i;
 
-#if PHP_VERSION_ID < 70100
-	zend_class_entry *old_scope;
-	old_scope = EG(scope);
-#endif
-
 	assert(obj_ce || !object_pp);
 	ZVAL_UNDEF(&local_retval_ptr);
 
@@ -199,12 +194,6 @@ int zephir_call_user_function(zval *object_pp, zend_class_entry *obj_ce, zephir_
 		return FAILURE;
 	}
 
-	if (obj_ce) {
-#if PHP_VERSION_ID < 70100
-		EG(scope) = obj_ce;
-#endif
-	}
-
 	if ((!cache_entry || !*cache_entry) && zephir_globals_ptr->cache_enabled) {
 		if (cache_slot > 0) {
 			if (zephir_globals_ptr->scache[cache_slot]) {
@@ -309,10 +298,6 @@ int zephir_call_user_function(zval *object_pp, zend_class_entry *obj_ce, zephir_
 	efree(p);
 #endif
 
-#if PHP_VERSION_ID < 70100
-	EG(scope) = old_scope;
-#endif
-
 	/* Skip caching IF:
 	 * call failed OR there was an exception (to be safe) OR cache key is not defined OR
 	 * fcall cache was deinitialized OR we have a slot cache