commit a9cd8d44a7f8aac160216a22d9cf6a77daaefb55
Merge: 304664212ea 257999bd33b
Author: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Wed Aug 12 15:57:54 2026 +0530
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
Fix test file conflict on Windows (#23226)