Merge branch 'xdebug_2_5'

xdebug · Apr 15, 2017 · 46a02b8 · 46a02b8
2 parents b995695 + d7a93bb
commit 46a02b8
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/xdebug.c b/xdebug.c
@@ -748,6 +748,9 @@ PHP_MINIT_FUNCTION(xdebug)
 		XDEBUG_SET_OPCODE_OVERRIDE_COMMON(ZEND_FETCH_OBJ_UNSET);
 		XDEBUG_SET_OPCODE_OVERRIDE_COMMON(ZEND_FETCH_CLASS);
 		XDEBUG_SET_OPCODE_OVERRIDE_COMMON(ZEND_FETCH_CONSTANT);
+#if PHP_VERSION_ID >= 70100
+		XDEBUG_SET_OPCODE_OVERRIDE_COMMON(ZEND_FETCH_CLASS_CONSTANT);
+#endif
 		XDEBUG_SET_OPCODE_OVERRIDE_COMMON(ZEND_CONCAT);
 		XDEBUG_SET_OPCODE_OVERRIDE_COMMON(ZEND_ISSET_ISEMPTY_DIM_OBJ);
 		XDEBUG_SET_OPCODE_OVERRIDE_COMMON(ZEND_PRE_INC_OBJ);
@@ -899,6 +902,9 @@ PHP_MSHUTDOWN_FUNCTION(xdebug)
 			zend_set_user_opcode_handler(ZEND_FETCH_OBJ_UNSET, NULL);
 			zend_set_user_opcode_handler(ZEND_FETCH_CLASS, NULL);
 			zend_set_user_opcode_handler(ZEND_FETCH_CONSTANT, NULL);
+#if PHP_VERSION_ID >= 70100
+			zend_set_user_opcode_handler(ZEND_FETCH_CLASS_CONSTANT, NULL);
+#endif
 			zend_set_user_opcode_handler(ZEND_CONCAT, NULL);
 			zend_set_user_opcode_handler(ZEND_ISSET_ISEMPTY_DIM_OBJ, NULL);
 			zend_set_user_opcode_handler(ZEND_PRE_INC_OBJ, NULL);