test: fix 8.5 language tests

Signed-off-by: Alexandre Rulleau <[email protected]>

Author: Leiyks

dockerfiles/ci/xfail_tests/8.5.list

@@ -4,9 +4,10 @@ Zend/tests/arginfo_zpp_mismatch_strict.phpt
 Zend/tests/bug63882_2.phpt
 Zend/tests/bug69315.phpt
 Zend/tests/bug70258.phpt
-Zend/tests/bug70805.phpt
-Zend/tests/bug70805_1.phpt
-Zend/tests/bug70805_2.phpt
+Zend/tests/gc/bug70805.phpt
+Zend/tests/gc/bug70805_1.phpt
+Zend/tests/gc/bug70805_2.phpt
+Zend/tests/disable_classes_warning.phpt
 Zend/tests/bug71539_5.phpt
 Zend/tests/bug72038.phpt
 Zend/tests/bug75921.phpt
@@ -18,8 +19,8 @@ Zend/tests/fibers/out-of-memory-in-fiber.phpt
 Zend/tests/fibers/out-of-memory-in-nested-fiber.phpt
 Zend/tests/fibers/out-of-memory-in-recursive-fiber.phpt
 Zend/tests/gc_031.phpt
-Zend/tests/gc_037.phpt
-Zend/tests/gc_045.phpt
+Zend/tests/gc/gc_037.phpt
+Zend/tests/gc/gc_045.phpt
 Zend/tests/get_defined_functions_basic.phpt
 Zend/tests/get_required_files.phpt
 Zend/tests/gh7958.phpt

dockerfiles/ci/xfail_tests/README.md

@@ -211,3 +211,9 @@ The exact PHP version that a given test checks this env var varies, but these
 are some tests which are skipped for older versions which don't check it:
 
  - `ext/sockets/tests/socket_shutdown.phpt`
+
+## `Zend/tests/disable_classes_warning.phpt`
+
+Disabled on versions: `8.5+`.
+
+PHP 8.5 completely removed the `disable_classes` INI directive (see [RFC](https://wiki.php.net/rfc/remove_disable_classes)). This test verifies warning behavior when using the removed directive. The test expects 0 warnings but with the DD tracer loaded it returns 1, likely due to the tracer initialization triggering an unrelated warning.

ext/handlers_exception.c

@@ -25,6 +25,10 @@ static zif_handler dd_http_response_code = NULL;
 static zif_handler dd_set_error_handler = NULL;
 static zif_handler dd_set_exception_handler = NULL;
 static zif_handler dd_restore_exception_handler = NULL;
+#if PHP_VERSION_ID >= 80500
+static zif_handler dd_get_error_handler = NULL;
+static zif_handler dd_get_exception_handler = NULL;
+#endif
 
 static void dd_check_exception_in_header(int old_response_code) {
     int new_response_code = SG(sapi_headers).http_response_code;
@@ -197,6 +201,38 @@ static PHP_FUNCTION(ddtrace_restore_exception_handler) {
     }
 }
 
+#if PHP_VERSION_ID >= 80500
+static PHP_FUNCTION(ddtrace_get_error_handler) {
+    dd_get_error_handler(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+
+    // Unwrap the handler if it's our wrapper
+    if (Z_TYPE_P(return_value) == IS_OBJECT && Z_OBJCE_P(return_value) == &dd_exception_or_error_handler_ce) {
+        zval *handler = dd_exception_or_error_handler_handler(Z_OBJ_P(return_value));
+        zval_ptr_dtor(return_value);
+        if (Z_ISUNDEF_P(handler)) {
+            ZVAL_NULL(return_value);
+        } else {
+            ZVAL_COPY(return_value, handler);
+        }
+    }
+}
+
+static PHP_FUNCTION(ddtrace_get_exception_handler) {
+    dd_get_exception_handler(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+
+    // Unwrap the handler if it's our wrapper
+    if (Z_TYPE_P(return_value) == IS_OBJECT && Z_OBJCE_P(return_value) == &dd_exception_or_error_handler_ce) {
+        zval *handler = dd_exception_or_error_handler_handler(Z_OBJ_P(return_value));
+        zval_ptr_dtor(return_value);
+        if (Z_ISUNDEF_P(handler)) {
+            ZVAL_NULL(return_value);
+        } else {
+            ZVAL_COPY(return_value, handler);
+        }
+    }
+}
+#endif
+
 static zend_internal_function ddtrace_exception_or_error_handler;
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ddtrace_exception_or_error_handler, 0, 0, 1)
@@ -497,6 +533,10 @@ void ddtrace_exception_handlers_startup(void) {
         {ZEND_STRL("set_exception_handler"), &dd_set_exception_handler, ZEND_FN(ddtrace_set_exception_handler)},
         {ZEND_STRL("restore_exception_handler"), &dd_restore_exception_handler,
          ZEND_FN(ddtrace_restore_exception_handler)},
+#if PHP_VERSION_ID >= 80500
+        {ZEND_STRL("get_error_handler"), &dd_get_error_handler, ZEND_FN(ddtrace_get_error_handler)},
+        {ZEND_STRL("get_exception_handler"), &dd_get_exception_handler, ZEND_FN(ddtrace_get_exception_handler)},
+#endif
     };
     size_t handlers_len = sizeof handlers / sizeof handlers[0];
     for (size_t i = 0; i < handlers_len; ++i) {