Commit 29af2f15bcb for php

commit 29af2f15bcb460e0d29b8f3e3437343577487c95
Merge: d4195cb2f6b 58805f762cb
Author: ndossche <7771979+ndossche@users.noreply.github.com>
Date:   Tue Oct 6 22:54:17 2026 +0200

    Merge branch 'PHP-8.5' into PHP-8.6

    * PHP-8.5:
      Fix merge