[php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6
| From: | David Carlier | Date: | Sat, 10 Oct 2026 10:23:59 +0000 |
| Subject: | [php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-142152@lists.php.net to get a copy of this message | ||
Author: David Carlier (devnexen)
Date: 2026-10-10T11:23:21+01:00
Commit: https://github.com/php/php-src/commit/33c94a26c6c1e7fd0c23c19aa0a565c79cbb38c5
Raw diff: https://github.com/php/php-src/commit/33c94a26c6c1e7fd0c23c19aa0a565c79cbb38c5.diff
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
ext/zend_test: fix gh24081.phpt on arm CI.
Changed paths:
M ext/zend_test/tests/gh24081.phpt
Diff:
diff --git a/ext/zend_test/tests/gh24081.phpt b/ext/zend_test/tests/gh24081.phpt
index 96119454bf69..d4e702fa2d78 100644
--- a/ext/zend_test/tests/gh24081.phpt
+++ b/ext/zend_test/tests/gh24081.phpt
@@ -5,6 +5,7 @@ zend_test
--INI--
opcache.jit=disable
zend_test.observer.enabled=1
+zend_test.observer.show_output=1
zend_test.observer.show_opcode_in_user_handler=ZEND_ADD
--FILE--
<?php