Commit 041ed58ce76 for php.net

commit 041ed58ce762543a6bc7bf046e551e00e56276cc
Merge: ff7ef3c858f a2dd29d8d02
Author: Ilija Tovilo <ilija.tovilo@me.com>
Date:   Mon Aug 10 23:12:47 2026 +0200

    Merge branch 'PHP-8.5'

    * PHP-8.5:
      Fix test file conflict