Revert "Fix bug #24214 implement access to skip_last in user API for backtrace"

This reverts commit a5cef84.

Author: krakjoe

NEWS

@@ -13,7 +13,6 @@ PHP                                                                        NEWS
     (Björn Tantau)
   . Fixed bug #81076 (incorrect debug info on Closures with implicit binds).
     (krakjoe)
-  . Fixed bug #24214 (implement skipping frames in backtraces). (krakjoe)
 
  - Standard:
   . Fixed bug #77627 (method_exists on Closure::__invoke inconsistency).

Zend/tests/debug_backtrace_skip_last.phpt

@@ -1648,14 +1648,13 @@ ZEND_FUNCTION(debug_print_backtrace)
 {
 	zend_long options = 0;
 	zend_long limit = 0;
-	zend_long skip_last = 1;
 	zval backtrace;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|lll", &options, &limit, &skip_last) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|ll", &options, &limit) == FAILURE) {
 		RETURN_THROWS();
 	}
 
-	zend_fetch_debug_backtrace(&backtrace, skip_last, options, limit);
+	zend_fetch_debug_backtrace(&backtrace, 1, options, limit);
 	ZEND_ASSERT(Z_TYPE(backtrace) == IS_ARRAY);
 
 	zend_string *str = zend_trace_to_string(Z_ARRVAL(backtrace), /* include_main */ false);
@@ -1685,11 +1684,8 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int
 		return;
 	}
 
-	while (skip_last--) {
-		if (!call->prev_execute_data) {
-			break;
-		}
-
+	if (skip_last) {
+		/* skip debug_backtrace() */
 		call = call->prev_execute_data;
 	}
 
@@ -1873,13 +1869,12 @@ ZEND_FUNCTION(debug_backtrace)
 {
 	zend_long options = DEBUG_BACKTRACE_PROVIDE_OBJECT;
 	zend_long limit = 0;
-	zend_long skip_last = 1;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|lll", &options, &limit, &skip_last) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|ll", &options, &limit) == FAILURE) {
 		RETURN_THROWS();
 	}
 
-	zend_fetch_debug_backtrace(return_value, skip_last, options, limit);
+	zend_fetch_debug_backtrace(return_value, 1, options, limit);
 }
 /* }}} */
 

Zend/tests/debug_print_backtrace_skip_last.phpt

@@ -111,9 +111,9 @@ function get_loaded_extensions(bool $zend_extensions = false): array {}
 
 function get_defined_constants(bool $categorize = false): array {}
 
-function debug_backtrace(int $options = DEBUG_BACKTRACE_PROVIDE_OBJECT, int $limit = 0, int $skip_last = 1): array {}
+function debug_backtrace(int $options = DEBUG_BACKTRACE_PROVIDE_OBJECT, int $limit = 0): array {}
 
-function debug_print_backtrace(int $options = 0, int $limit = 0, int $skip_last = 1): void {}
+function debug_print_backtrace(int $options = 0, int $limit = 0): void {}
 
 function extension_loaded(string $extension): bool {}
 

Zend/zend_builtin_functions.c

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 2db8f4b7a5b005a012e1d9d0d3aa2f26d0cb4f85 */
+ * Stub hash: c333499e3ea100d976f0fa8bb8800ed21b04f1c6 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_version, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -183,13 +183,11 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_debug_backtrace, 0, 0, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "DEBUG_BACKTRACE_PROVIDE_OBJECT")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, limit, IS_LONG, 0, "0")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, skip_last, IS_LONG, 0, "1")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_debug_print_backtrace, 0, 0, IS_VOID, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, limit, IS_LONG, 0, "0")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, skip_last, IS_LONG, 0, "1")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_extension_loaded, 0, 1, _IS_BOOL, 0)