Commit 3afd2cbbb85 for php.net

commit 3afd2cbbb8584a7e2bd2c06d0d33e7f86bf45214
Merge: 8ad79e15c93 749f4887360
Author: Ilija Tovilo <ilija.tovilo@me.com>
Date:   Sun Apr 12 00:20:48 2026 +0200

    Merge branch 'PHP-8.5'

    * PHP-8.5:
      Simplify gh21031.phpt and solve flakiness