Skip to content

Commit e25327b

Browse files
committed
Fix code review comments
1 parent df8c742 commit e25327b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+402
-366
lines changed

Diff for: EXTENSIONS

+1-1
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ MAINTENANCE: Maintained
496496
STATUS: Working
497497
-------------------------------------------------------------------------------
498498
EXTENSION: uri
499-
PRIMARY MAINTAINER Máté Kocsis <[email protected]> (2024 - 2024)
499+
PRIMARY MAINTAINER Máté Kocsis <[email protected]> (2025 - 2025)
500500
MAINTENANCE: Maintained
501501
STATUS: Working
502502
SINCE: 8.5.0

Diff for: ext/filter/logical_filters.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ void php_filter_validate_url(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
612612
}
613613

614614
/* Parse the URI - if it fails, we return NULL */
615-
php_uri *uri = php_uri_parse_to_struct(uri_handler, Z_STR_P(value), URI_COMPONENT_READ_NORMALIZED_FOR_MACHINE_PROCESSING, NULL);
615+
php_uri *uri = php_uri_parse_to_struct(uri_handler, Z_STR_P(value), URI_COMPONENT_READ_NORMALIZED_ASCII, NULL);
616616
if (uri == NULL) {
617617
RETURN_VALIDATION_FAILED
618618
}

Diff for: ext/soap/php_http.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ int make_http_soap_request(zval *this_ptr,
439439
zend_argument_value_error(6, "must be a valid URI parser name");
440440
return FALSE;
441441
}
442-
uri = php_uri_parse_to_struct(uri_handler, location, URI_COMPONENT_READ_NORMALIZED_FOR_MACHINE_PROCESSING, NULL);
442+
uri = php_uri_parse_to_struct(uri_handler, location, URI_COMPONENT_READ_NORMALIZED_ASCII, NULL);
443443
}
444444

445445
tmp = Z_CLIENT_STREAM_CONTEXT_P(this_ptr);
@@ -1160,7 +1160,7 @@ int make_http_soap_request(zval *this_ptr,
11601160
}
11611161

11621162
zend_string *loc_str = zend_string_init(loc, strlen(loc), false);
1163-
php_uri *new_uri = php_uri_parse_to_struct(uri_handler, loc_str, URI_COMPONENT_READ_NORMALIZED_FOR_MACHINE_PROCESSING, NULL);
1163+
php_uri *new_uri = php_uri_parse_to_struct(uri_handler, loc_str, URI_COMPONENT_READ_NORMALIZED_ASCII, NULL);
11641164
zend_string_release(loc_str);
11651165

11661166
if (new_uri != NULL) {

Diff for: ext/soap/tests/SoapServer/__getLastResponse.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class LocalSoapClient extends SoapClient {
1818
$this->server->addFunction("f");
1919
}
2020

21-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
21+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2222
ob_start();
2323
$this->server->handle($request);
2424
$response = ob_get_contents();

Diff for: ext/soap/tests/any.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class TestSoapClient extends SoapClient {
3333
$this->server->addFunction('echoAnyElement');
3434
}
3535

36-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
36+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
3737
ob_start();
3838
$this->server->handle($request);
3939
$response = ob_get_contents();

Diff for: ext/soap/tests/bugs/bug28969.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class LocalSoapClient extends SoapClient {
1818
$this->server->addFunction('test');
1919
}
2020

21-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
21+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2222
ob_start();
2323
$this->server->handle($request);
2424
$response = ob_get_contents();

Diff for: ext/soap/tests/bugs/bug29795.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class LocalSoapClient extends SoapClient {
1212
parent::__construct($wsdl, $options);
1313
}
1414

15-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
15+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
1616
return <<<EOF
1717
<?xml version="1.0" encoding="UTF-8"?><SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
1818
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"

Diff for: ext/soap/tests/bugs/bug29839.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class LocalSoapClient extends SoapClient {
2020
$this->server->addFunction('EchoString');
2121
}
2222

23-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
23+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2424
ob_start();
2525
$this->server->handle($request);
2626
$response = ob_get_contents();

Diff for: ext/soap/tests/bugs/bug29844.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class LocalSoapClient extends SoapClient {
2222
$this->server->setClass('hello_world');
2323
}
2424

25-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
25+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2626
ob_start();
2727
$this->server->handle($request);
2828
$response = ob_get_contents();

Diff for: ext/soap/tests/bugs/bug30045.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class LocalSoapClient extends SoapClient {
2121
$this->server->addFunction('foo');
2222
}
2323

24-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
24+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2525
$xml = simplexml_load_string($request);
2626
echo $xml->children("http://schemas.xmlsoap.org/soap/envelope/")->Body->children("http://test-uri")->children()->param1->asXML(),"\n";
2727
unset($xml);

Diff for: ext/soap/tests/bugs/bug30106.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class LocalSoapClient extends SoapClient {
2121
$this->server->addFunction("getContinentList");
2222
}
2323

24-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
24+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2525
echo $request;
2626
ob_start();
2727
$this->server->handle($request);

Diff for: ext/soap/tests/bugs/bug30175.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ soap.wsdl_cache_enabled=0
99

1010
class LocalSoapClient extends SoapClient {
1111

12-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
12+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
1313
return <<<EOF
1414
<?xml version="1.0" encoding="UTF-8"?>
1515
<SOAP-ENV:Envelope

Diff for: ext/soap/tests/bugs/bug30928.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class LocalSoapClient extends SoapClient {
2525
$this->server->addFunction('test');
2626
}
2727

28-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
28+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2929
ob_start();
3030
$this->server->handle($request);
3131
$response = ob_get_contents();

Diff for: ext/soap/tests/bugs/bug31695.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class LocalSoapClient extends SoapClient {
1919
$this->server->addFunction("Test");
2020
}
2121

22-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
22+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2323
echo "$location\n";
2424
ob_start();
2525
$this->server->handle($request);

Diff for: ext/soap/tests/bugs/bug31755.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ soap
55
--FILE--
66
<?php
77
class MySoapClient extends SoapClient {
8-
public function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
8+
public function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
99
echo $request, "\n";
1010
return '';
1111
}

Diff for: ext/soap/tests/bugs/bug32776.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class LocalSoapClient extends SoapClient {
2323
$this->server->addFunction('test');
2424
}
2525

26-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
26+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2727
ob_start();
2828
$this->server->handle($request);
2929
$response = ob_get_contents();

Diff for: ext/soap/tests/bugs/bug32941.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ soap
55
--FILE--
66
<?php
77
class TestSoapClient extends SoapClient {
8-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
8+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
99
return <<<EOF
1010
<?xml version="1.0" encoding="UTF-8"?>
1111
<soapenv:Envelope

Diff for: ext/soap/tests/bugs/bug34449.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ soap
55
--FILE--
66
<?php
77
class TestSoapClient extends SoapClient {
8-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): never {
8+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): never {
99
echo "$request\n";
1010
exit;
1111
}

Diff for: ext/soap/tests/bugs/bug34453.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class LocalSoapClient extends SoapClient {
2020
$this->server->addFunction('EchoString');
2121
}
2222

23-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
23+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2424
ob_start();
2525
$this->server->handle($request);
2626
$response = ob_get_contents();

Diff for: ext/soap/tests/bugs/bug34643.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class LocalSoapClient extends SoapClient {
2323
$this->server->setClass('fp');
2424
}
2525

26-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
26+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2727
ob_start();
2828
$this->server->handle($request);
2929
$response = ob_get_contents();

Diff for: ext/soap/tests/bugs/bug35142.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class TestSoapClient extends SoapClient {
2525
$this->server->addFunction('PostEvents');
2626
}
2727

28-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
28+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2929
echo "$request\n";
3030
ob_start();
3131
$this->server->handle($request);

Diff for: ext/soap/tests/bugs/bug35273.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0
77
--FILE--
88
<?php
99
class TestSoapClient extends SoapClient {
10-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): never {
10+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): never {
1111
echo $request;
1212
exit;
1313
}

Diff for: ext/soap/tests/bugs/bug36226-2.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class TestSoapClient extends SoapClient {
2424
$this->server->addFunction('PostEvents');
2525
}
2626

27-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
27+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2828
echo "$request\n";
2929
$this->server->handle($request);
3030
return $response;

Diff for: ext/soap/tests/bugs/bug36226.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class TestSoapClient extends SoapClient {
2525
$this->server->addFunction('PostEvents');
2626
}
2727

28-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
28+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2929
echo "$request\n";
3030
ob_start();
3131
$this->server->handle($request);

Diff for: ext/soap/tests/bugs/bug36999.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class LocalSoapClient extends SoapClient {
2020
$this->server->addFunction('echoLong');
2121
}
2222

23-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
23+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2424
ob_start();
2525
$this->server->handle($request);
2626
$response = ob_get_contents();

Diff for: ext/soap/tests/bugs/bug37083.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ soap.wsdl_cache=3
77
--FILE--
88
<?php
99
class TestSoapClient extends SoapClient {
10-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
10+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
1111
return <<<EOF
1212
<?xml version="1.0" encoding="utf-8"?>
1313
<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

Diff for: ext/soap/tests/bugs/bug38004.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class TestSoapClient extends SoapClient {
2121
$this->server->addFunction('Test');
2222
}
2323

24-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
24+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2525
ob_start();
2626
$this->server->handle($request);
2727
$response = ob_get_contents();

Diff for: ext/soap/tests/bugs/bug38005.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class TestSoapClient extends SoapClient {
1919
$this->server->addFunction('Test');
2020
}
2121

22-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
22+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2323
ob_start();
2424
$this->server->handle($request);
2525
$response = ob_get_contents();

Diff for: ext/soap/tests/bugs/bug38055.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class TestSoapClient extends SoapClient {
2222
$this->server->addFunction('Test');
2323
}
2424

25-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
25+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2626
ob_start();
2727
$this->server->handle($request);
2828
$response = ob_get_contents();

Diff for: ext/soap/tests/bugs/bug38067.phpt

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class TestSoapClient extends SoapClient {
2121
$this->server->addFunction('Test');
2222
}
2323

24-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
24+
function __doRequest($request, $location, $action, $version, $one_way = 0, $uriParserClass = null): string {
2525
ob_start();
2626
$this->server->handle($request);
2727
$response = ob_get_contents();
@@ -32,13 +32,13 @@ class TestSoapClient extends SoapClient {
3232

3333
$client = new TestSoapClient(__DIR__.'/bug38067.wsdl',
3434
array('encoding' => 'ISO-8859-1'));
35-
$str = 'test: ';
35+
$str = 'test: Ä';
3636
$res = $client->Test(array('str'=>$str));
3737
echo $str."\n";
3838
echo $res."\n";
3939
echo $g."\n";
4040
?>
4141
--EXPECT--
42-
test:
43-
test:
44-
test:
42+
test: Ä
43+
test: Ä
44+
test: Ä

Diff for: ext/soap/tests/bugs/bug38536.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0
77
--FILE--
88
<?php
99
class LocalSoapClient extends SoapClient {
10-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
10+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
1111
return <<<EOF
1212
<?xml version="1.0" encoding="UTF-8"?>
1313
<SOAP-ENV:Envelope

Diff for: ext/soap/tests/bugs/bug39121.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0
77
--FILE--
88
<?php
99
class LocalSoapClient extends SoapClient {
10-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
10+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
1111
return <<<EOF
1212
<?xml version="1.0" encoding="UTF-8"?>
1313
<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">

Diff for: ext/soap/tests/bugs/bug39815.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class LocalSoapClient extends SoapClient {
2323
$this->server->addFunction('test');
2424
}
2525

26-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
26+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2727
ob_start();
2828
$this->server->handle($request);
2929
$response = ob_get_contents();

Diff for: ext/soap/tests/bugs/bug42692.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class TestSoap extends SoapClient {
1919
$this->server->addFunction("checkAuth");
2020
}
2121

22-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
22+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2323
ob_start();
2424
$this->server->handle($request);
2525
$response = ob_get_contents();

Diff for: ext/soap/tests/bugs/bug43045.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class TestSoapClient extends SoapClient {
1616
$this->server = new SoapServer($wsdl, $options);
1717
$this->server->addFunction('test');
1818
}
19-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
19+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2020
ob_start();
2121
$this->server->handle($request);
2222
$response = ob_get_contents();

Diff for: ext/soap/tests/bugs/bug44882.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ soap.wsdl_cache_enabled=0
88
<?php
99
class TestSoapClient extends SoapClient
1010
{
11-
public function __doRequest($req, $loc, $act, $ver, $one_way = 0, ?string $uriParserName = null): string
11+
public function __doRequest($req, $loc, $act, $ver, $one_way = 0, ?string $uriParserClass = null): string
1212
{
1313
return <<<XML
1414
<?xml version="1.0" encoding="UTF-8"?>

Diff for: ext/soap/tests/bugs/bug46419.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class LocalSoapClient extends SoapClient {
1717
$this->server->addFunction('bar');
1818
}
1919

20-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
20+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2121
ob_start();
2222
$this->server->handle($request);
2323
$response = ob_get_contents();

Diff for: ext/soap/tests/bugs/bug47021.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ $options = [
5757

5858
class BugSoapClient extends SoapClient
5959
{
60-
public function __doRequest($request, $location, $action, $version, $one_way = null, ?string $uriParserName = null): string
60+
public function __doRequest($request, $location, $action, $version, $one_way = null, ?string $uriParserClass = null): string
6161
{
62-
$response = parent::__doRequest($request, $location, $action, $version, $one_way, $uriParserName);
62+
$response = parent::__doRequest($request, $location, $action, $version, $one_way, $uriParserClass);
6363

6464
var_dump(strlen($response));
6565

Diff for: ext/soap/tests/bugs/bug50675.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ soap
66
<?php
77

88
class TestSoapClient extends SoapClient {
9-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
9+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
1010
return <<<EOF
1111
<?xml version="1.0" encoding="UTF-8"?>
1212
<soapenv:Envelope

Diff for: ext/soap/tests/bugs/bug50762.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class LocalSoapClient extends SoapClient {
2323
$this->server->setObject(new testSoap());
2424
}
2525

26-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): string {
26+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): string {
2727
ob_start();
2828
$this->server->handle($request);
2929
$response = ob_get_contents();

Diff for: ext/soap/tests/bugs/bug54911.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ soap
55
--FILE--
66
<?php
77
class XSoapClient extends SoapClient {
8-
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserName = null): never {
8+
function __doRequest($request, $location, $action, $version, $one_way = false, ?string $uriParserClass = null): never {
99
echo self::$crash;
1010
}
1111
}

0 commit comments

Comments
 (0)