commit 8bb923eb299c51f2453d35f9fecfcf2fb83ee8c3
Merge: 2c8cd7bee9b a9cd8d44a7f
Author: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Wed Aug 12 15:59:36 2026 +0530
Merge branch 'PHP-8.5'
* PHP-8.5:
Fix test file conflict on Windows (#23226)