Commit a2dd29d8d02 for php.net

commit a2dd29d8d02687859dbae00f980fc9a893e7adf5
Merge: 46b40957b17 facf3f99cf6
Author: Ilija Tovilo <ilija.tovilo@me.com>
Date:   Mon Aug 10 23:12:35 2026 +0200

    Merge branch 'PHP-8.4' into PHP-8.5

    * PHP-8.4:
      Fix test file conflict