Skip to content

Commit cf7ca4e

Browse files
kocsismatekocsismate
committed
Fix code review comments
1 parent fb0c929 commit cf7ca4e

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

‎EXTENSIONS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ MAINTENANCE: Maintained
504504
STATUS: Working
505505
-------------------------------------------------------------------------------
506506
EXTENSION: uri
507-
PRIMARY MAINTAINER Máté Kocsis <[email protected]> (2024 - 2024)
507+
PRIMARY MAINTAINER Máté Kocsis <[email protected]> (2025 - 2025)
508508
MAINTENANCE: Maintained
509509
STATUS: Working
510510
SINCE: 8.5.0

‎ext/filter/logical_filters.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ void php_filter_validate_url(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
613613
}
614614

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

‎ext/soap/php_http.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ int make_http_soap_request(zval *this_ptr,
440440
zend_argument_value_error(6, "must be a valid URI parser name");
441441
return FALSE;
442442
}
443-
uri = php_uri_parse_to_struct(uri_handler, location, URI_COMPONENT_READ_NORMALIZED_FOR_MACHINE_PROCESSING, NULL);
443+
uri = php_uri_parse_to_struct(uri_handler, location, URI_COMPONENT_READ_NORMALIZED_ASCII, NULL);
444444
}
445445

446446
tmp = Z_CLIENT_STREAM_CONTEXT_P(this_ptr);
@@ -1161,7 +1161,7 @@ int make_http_soap_request(zval *this_ptr,
11611161
}
11621162

11631163
zend_string *loc_str = zend_string_init(loc, strlen(loc), false);
1164-
php_uri *new_uri = php_uri_parse_to_struct(uri_handler, loc_str, URI_COMPONENT_READ_NORMALIZED_FOR_MACHINE_PROCESSING, NULL);
1164+
php_uri *new_uri = php_uri_parse_to_struct(uri_handler, loc_str, URI_COMPONENT_READ_NORMALIZED_ASCII, NULL);
11651165
zend_string_release(loc_str);
11661166

11671167
if (new_uri != NULL) {

‎ext/soap/tests/SoapServer/__getLastResponse.phpt

Lines changed: 1 addition & 1 deletion
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();

‎ext/soap/tests/any.phpt

Lines changed: 1 addition & 1 deletion
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();

‎ext/soap/tests/bugs/bug28969.phpt

Lines changed: 1 addition & 1 deletion
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();

‎ext/soap/tests/bugs/bug29795.phpt

Lines changed: 1 addition & 1 deletion
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/"

‎ext/soap/tests/bugs/bug29839.phpt

Lines changed: 1 addition & 1 deletion
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();

‎ext/soap/tests/bugs/bug29844.phpt

Lines changed: 1 addition & 1 deletion
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();

‎ext/soap/tests/bugs/bug30045.phpt

Lines changed: 1 addition & 1 deletion
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);

0 commit comments

Comments
 (0)