Commit eefe4db40ed for php

commit eefe4db40ed2b6da4352db6510d920d2abcaead7
Merge: b4f14f40ac4 33d7f34694f
Author: ndossche <7771979+ndossche@users.noreply.github.com>
Date:   Thu Oct 8 20:41:43 2026 +0200

    Merge branch 'PHP-8.5' into PHP-8.6

    * PHP-8.5:
      zend_alloc: move a small block shrunk to the size of the bin below

diff --cc ext/zend_test/test.stub.php
index afeae903c66,1e693707e3f..1fbacdae109
--- a/ext/zend_test/test.stub.php
+++ b/ext/zend_test/test.stub.php
@@@ -299,71 -264,8 +299,73 @@@ namespace

      function zend_delref(mixed $variable): void {}

+     function zend_test_erealloc_block_size(int $old_size, int $new_size): array {}
+
 +	function zend_bool(bool $param): bool {}
 +	function zend_bool_or_null(bool|null $param): bool|null {}
 +	function zend_bool_slow_zpp(bool $param): bool {}
 +	function zend_bool_or_null_slow_zpp(bool|null $param): bool|null {}
 +
 +	function zend_int(int $param): int {}
 +	function zend_int_or_null(int|null $param): int|null {}
 +	function zend_int_slow_zpp(int $param): int {}
 +	function zend_int_or_null_slow_zpp(int|null $param): int|null {}
 +
 +	function zend_float(float $param): float {}
 +	function zend_float_or_null(float|null $param): float|null {}
 +	function zend_float_slow_zpp(float $param): float {}
 +	function zend_float_or_null_slow_zpp(float|null $param): float|null {}
 +
 +	function zend_number(int|float $param): int|float {}
 +	function zend_number_or_null(int|float|null $param): int|float|null {}
 +	function zend_number_slow_zpp(int|float $param): int|float {}
 +	function zend_number_or_null_slow_zpp(int|float|null $param): int|float|null {}
 +
 +	function zend_object(object $param): object {}
 +	function zend_object_or_null(object|null $param): object|null {}
 +	function zend_object_slow_zpp(object $param): object {}
 +	function zend_object_or_null_slow_zpp(object|null $param): object|null {}
 +
 +	function zend_obj(object $param): object {}
 +	function zend_obj_or_null(object|null $param): object|null {}
 +
 +	function zend_obj_or_class_name(object|string $param): string {}
 +	function zend_obj_or_class_name_or_null(object|string|null $param): string|null {}
 +
 +	function zend_class_name(string $param): string {}
 +	function zend_class_name_or_null(string|null $param): string|null {}
 +	function zend_class_name_slow_zpp(string $param): string {}
 +	function zend_class_name_or_null_slow_zpp(string|null $param): string|null {}
 +
 +	function zend_object_sdtClass(stdClass $param): stdClass {}
 +	function zend_object_sdtClass_or_null(stdClass|null $param): stdClass|null {}
 +	function zend_object_sdtClass_slow_zpp(stdClass $param): stdClass {}
 +	function zend_object_sdtClass_or_null_slow_zpp(stdClass|null $param): stdClass|null {}
 +
 +	function zend_obj_sdtClass(stdClass $param): stdClass {}
 +	function zend_obj_sdtClass_or_null(stdClass|null $param): stdClass|null {}
 +
 +    /**
 +     * @param resource $param
 +     * @return resource
 +     */
 +	function zend_resource($param) {}
 +    /**
 +     * @param resource|null $param
 +     * @return resource|null
 +     */
 +	function zend_resource_or_null($param) {}
 +    /**
 +     * @param resource $param
 +     * @return resource
 +     */
 +	function zend_resource_slow_zpp($param) {}
 +    /**
 +     * @param resource|null $param
 +     * @return resource|null
 +     */
 +	function zend_resource_or_null_slow_zpp($param) {}
 +
      function zend_string_or_object(object|string $param): object|string {}

      function zend_string_or_object_or_null(object|string|null $param): object|string|null {}
diff --cc ext/zend_test/test_arginfo.h
index d01e3d036c7,f4bd4c9ee7d..40f06222783
Binary files differ
diff --cc ext/zend_test/test_decl.h
index d2bc04df8f4,00000000000..96ebfbea6fc
mode 100644,000000..100644
Binary files differ
diff --cc ext/zend_test/test_legacy_arginfo.h
index e12e72eb6d2,00000000000..4ee3d3d083e
mode 100644,000000..100644
Binary files differ