Commit 0ba344d4860 for php

commit 0ba344d48608fe0f86cf21bf9e48b746e75b15df
Merge: 0dcc08d453d 29fc38b714b
Author: Levi Morrison <levi.morrison@datadoghq.com>
Date:   Fri Oct 9 09:20:26 2026 -0600

    Merge branch 'PHP-8.5' of ../PHP-8.5 into PHP-8.6

diff --cc NEWS
index 44176bcb54f,43e9ef3d965..7d757807414
--- a/NEWS
+++ b/NEWS
@@@ -1,8 -1,11 +1,11 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 8.5.13
 +?? ??? ????, PHP 8.6.0RC4

  - Core:
+   . Fixed bug GH-24184 (System ID not being reinitialized after an Apache
+     graceful restart, potentially causing incompatible OPcache file cache
+     entries to be reused). (Levi Morrison)
    . Fixed memory leak when an exception already contains the pending exception
      in its previous chain. (Edmond)
    . Fixed bug GH-23979 (Nullsafe operator must not flush delayed oplines of an
diff --cc ext/zend_test/test.c
index fa9b43b68c5,ff2c4da72ac..3b6ee7390e2
--- a/ext/zend_test/test.c
+++ b/ext/zend_test/test.c
@@@ -33,13 -37,11 +33,14 @@@
  #include "Zend/Optimizer/zend_optimizer.h"
  #include "Zend/zend_alloc.h"
  #include "test_arginfo.h"
 +#include "tmp_methods_arginfo.h"
  #include "zend_call_stack.h"
  #include "zend_exceptions.h"
+ #include "zend_system_id.h"
  #include "zend_mm_custom_handlers.h"
  #include "ext/uri/php_uri.h"
 +#include "zend_observer.h"
 +#include "test_decl.h"

  #include <signal.h>