Commit 2de529f892d for php.net

commit 2de529f892d0935af2098ca3ddaef88a69d228ce
Merge: ec79850c501 2d651e203db
Author: Tim Düsterhus <tim@tideways-gmbh.com>
Date:   Mon Apr 20 09:49:58 2026 +0200

    Merge branch 'PHP-8.4' into PHP-8.5

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