Commit cc21f5e0955 for php.net

commit cc21f5e095501dad2e8b958e48a9bfe98edeb7ba
Merge: c80ac797d47 b273fc7aca4
Author: Arnaud Le Blanc <arnaud.lb@gmail.com>
Date:   Tue Jan 13 12:34:52 2026 +0100

    Merge branch 'PHP-8.4' into PHP-8.5

    * PHP-8.4:
      NEWS
      Set default_object_handlers when registering internal enums

diff --cc Zend/tests/enum/comparison-internal.phpt
index 00000000000,3d0a2f1e172..b07c0e1dba8
mode 000000,100644..100644
--- a/Zend/tests/enum/comparison-internal.phpt
+++ b/Zend/tests/enum/comparison-internal.phpt
@@@ -1,0 -1,54 +1,54 @@@
+ --TEST--
+ Enum comparison (internal enum)
+ --EXTENSIONS--
+ zend_test
+ --FILE--
+ <?php
+
+ $foo = ZendTestUnitEnum::Foo;
+ $bar = ZendTestUnitEnum::Bar;
+
+ var_dump($foo === $foo);
+ var_dump($foo == $foo);
+
+ var_dump($foo === $bar);
+ var_dump($foo == $bar);
+
+ var_dump($bar === $foo);
+ var_dump($bar == $foo);
+
+ var_dump($foo > $foo);
+ var_dump($foo < $foo);
+ var_dump($foo >= $foo);
+ var_dump($foo <= $foo);
+
+ var_dump($foo > $bar);
+ var_dump($foo < $bar);
+ var_dump($foo >= $bar);
+ var_dump($foo <= $bar);
+
+ var_dump($foo > true);
+ var_dump($foo < true);
+ var_dump($foo >= true);
+ var_dump($foo <= true);
+
+ ?>
+ --EXPECT--
+ bool(true)
+ bool(true)
+ bool(false)
+ bool(false)
+ bool(false)
+ bool(false)
+ bool(false)
+ bool(false)
+ bool(true)
+ bool(true)
+ bool(false)
+ bool(false)
+ bool(false)
+ bool(false)
+ bool(false)
+ bool(false)
 -bool(false)
 -bool(false)
++bool(true)
++bool(true)
diff --cc ext/zend_test/test.stub.php
index bf9a1c6b5bc,9116245c30f..b0fca4cc2b9
--- a/ext/zend_test/test.stub.php
+++ b/ext/zend_test/test.stub.php
@@@ -208,8 -201,11 +208,13 @@@ namespace
          case Baz = -1;
      }

+     enum ZendTestEnumWithInterface implements _ZendTestInterface {
+         case Foo;
+         case Bar;
+     }
+
 +    function zend_trigger_bailout(): never {}
 +
      function zend_test_array_return(): array {}

      /** @genstubs-expose-comment-block
diff --cc ext/zend_test/test_arginfo.h
index bd2240cedd6,039757207e6..eca1b91f6bf
Binary files differ