Commit 95a17aff1d7 for php.net

commit 95a17aff1d70dd83ca3afc5b7bcbfa669ec97014
Merge: fad43236348 2de529f892d
Author: Tim Düsterhus <tim@tideways-gmbh.com>
Date:   Mon Apr 20 09:50:27 2026 +0200

    Merge branch 'PHP-8.5'

    * PHP-8.5:
      zend_inheritance: Fix enum case conflict in trait binding (#21771)