Update Xdebug patch for PHP 8.5

shivammathur · shivammathur · commit 520c8fbe01ff · 2025-08-19T08:34:57.000Z
diff --git a/scripts/patch-extensions.sh b/scripts/patch-extensions.sh
@@ -50,6 +50,7 @@ patch_pdo_sqlsrv() {
 patch_xdebug() {
   [[ "$PHP_VERSION" = "8.5" ]] && sed -i 's/80500/80600/g' config.m4
   [[ "$PHP_VERSION" = "8.5" ]] && sed -i 's#ext/standard/php_smart_string.h#Zend/zend_smart_string.h#' src/develop/stack.c src/lib/var.c
+  [[ "$PHP_VERSION" = "8.5" ]] && sed -i 's/samesite_s,/samesite_s, 0,/g' src/lib/compat.c
   [[ "$PHP_VERSION" = "8.4" || "$PHP_VERSION" = "8.5" ]] && sed -i -e "s|ext/standard/php_lcg.h|ext/random/php_random.h|" src/lib/usefulstuff.c
 }
 

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ patch_pdo_sqlsrv() {`
`50`	`50`	`patch_xdebug() {`
`51`	`51`	`[[ "$PHP_VERSION" = "8.5" ]] && sed -i 's/80500/80600/g' config.m4`
`52`	`52`	`[[ "$PHP_VERSION" = "8.5" ]] && sed -i 's#ext/standard/php_smart_string.h#Zend/zend_smart_string.h#' src/develop/stack.c src/lib/var.c`
	`53`	`+ [[ "$PHP_VERSION" = "8.5" ]] && sed -i 's/samesite_s,/samesite_s, 0,/g' src/lib/compat.c`
`53`	`54`	`[[ "$PHP_VERSION" = "8.4" \|\| "$PHP_VERSION" = "8.5" ]] && sed -i -e "s\|ext/standard/php_lcg.h\|ext/random/php_random.h\|" src/lib/usefulstuff.c`
`54`	`55`	`}`
`55`	`56`