[php-src] master: Merge branch 'PHP-8.5' into PHP-8.6
| From: | ndossche | Date: | Thu, 01 Oct 2026 19:29:06 +0000 |
| Subject: | [php-src] master: Merge branch 'PHP-8.5' into PHP-8.6 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-141855@lists.php.net to get a copy of this message | ||
Author: ndossche (ndossche)
Date: 2026-10-01T21:28:51+02:00
Commit: https://github.com/php/php-src/commit/f59a037dbf88b541d8fbf521c9f938f7ac2b8583
Raw diff: https://github.com/php/php-src/commit/f59a037dbf88b541d8fbf521c9f938f7ac2b8583.diff
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
Fix soap test on 8.5+
Changed paths:
M ext/soap/tests/bugs/gh22895.phpt
Diff:
diff --git a/ext/soap/tests/bugs/gh22895.phpt b/ext/soap/tests/bugs/gh22895.phpt
index feed80065a46..56b143a834d9 100644
--- a/ext/soap/tests/bugs/gh22895.phpt
+++ b/ext/soap/tests/bugs/gh22895.phpt
@@ -13,7 +13,8 @@ class LocalSoapClient extends SoapClient
$location,
$action,
$version,
- $one_way = false
+ $oneWay = false,
+ $uriParserClass = null
): ?string {
return '';
}