Merge branch 'PHP-8.5'

ndossche · ndossche · commit 4094bf732520 · 2025-10-20T22:35:58.000+02:00
* PHP-8.5:
  Fix merge issue
diff --git a/ext/phar/util.c b/ext/phar/util.c
@@ -1468,7 +1468,6 @@ static zend_result phar_call_openssl_signverify(bool is_sign, php_stream *fp, ze
 			zval_ptr_dtor(&retval);
 			ZEND_FALLTHROUGH;
 		case IS_FALSE:
-		default:
 			zval_ptr_dtor(&zp[1]);
 			return FAILURE;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1468,7 +1468,6 @@ static zend_result phar_call_openssl_signverify(bool is_sign, php_stream *fp, ze`
`1468`	`1468`	`zval_ptr_dtor(&retval);`
`1469`	`1469`	`ZEND_FALLTHROUGH;`
`1470`	`1470`	`case IS_FALSE:`
`1471`		`- default:`
`1472`	`1471`	`zval_ptr_dtor(&zp[1]);`
`1473`	`1472`	`return FAILURE;`
`1474`	`1473`	`}`