Skip to content

Commit 14d9fe1

Browse files
kocsismatekocsismate
committed
Test fixes
1 parent da3092a commit 14d9fe1

File tree

8 files changed

+15
-7
lines changed

8 files changed

+15
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
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 = 0, $uriParserClass = null): string {
24+
function __doRequest($request, $location, $action, $version, $one_way = 0, ?string $uriParserClass = null): string {
2525
ob_start();
2626
$this->server->handle($request);
2727
$response = ob_get_contents();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function soap_string_from_xml($str)
1515
}
1616

1717
class TestSoapClient extends SoapClient {
18-
function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
18+
function __doRequest($request, $location, $action, $version, $one_way = 0, ?string $uriParserClass = null): ?string {
1919
$res='<?xml version="1.0" encoding="UTF-8"?>
2020
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
2121
<SOAP-ENV:Body>

‎ext/standard/url.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ static zend_result parse_url_init_parser(void)
430430
zend_hash_init(&parse_url_property_handlers, 8, NULL, NULL, true);
431431

432432
URI_REGISTER_PROPERTY_READ_HANDLER(&parse_url_property_handlers, ZSTR_KNOWN(ZEND_STR_SCHEME), parse_url_read_scheme);
433-
URI_REGISTER_PROPERTY_READ_HANDLER(&parse_url_property_handlers, ZSTR_KNOWN(ZEND_STR_USER), parse_url_read_username);
433+
URI_REGISTER_PROPERTY_READ_HANDLER(&parse_url_property_handlers, ZSTR_KNOWN(ZEND_STR_USERNAME), parse_url_read_username);
434434
URI_REGISTER_PROPERTY_READ_HANDLER(&parse_url_property_handlers, ZSTR_KNOWN(ZEND_STR_PASSWORD), parse_url_read_password);
435435
URI_REGISTER_PROPERTY_READ_HANDLER(&parse_url_property_handlers, ZSTR_KNOWN(ZEND_STR_HOST), parse_url_read_host);
436436
URI_REGISTER_PROPERTY_READ_HANDLER(&parse_url_property_handlers, ZSTR_KNOWN(ZEND_STR_PORT), parse_url_read_port);

‎ext/uri/php_lexbor.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ static void fill_errors(zval *errors)
219219
ZVAL_TRUE(&failure);
220220
break;
221221
case LXB_URL_ERROR_TYPE_PORT_OUT_OF_RANGE:
222-
error_str = zend_string_init("PortOfOfRange", sizeof("PortOfOfRange"), false);
222+
error_str = zend_string_init("PortOutOfRange", sizeof("PortOutOfRange"), false);
223223
ZVAL_TRUE(&failure);
224224
break;
225225
case LXB_URL_ERROR_TYPE_PORT_INVALID:

‎ext/uri/php_uri.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ PHPAPI php_uri *php_uri_parse_to_struct(const uri_handler_t *uri_handler, zend_s
191191

192192
result = php_uri_get_scheme(uri_internal, read_mode, &tmp);
193193
if (result == FAILURE) {
194+
php_uri_free(uri_internal);
194195
php_uri_struct_free(uri);
195196
return NULL;
196197
}
@@ -201,6 +202,7 @@ PHPAPI php_uri *php_uri_parse_to_struct(const uri_handler_t *uri_handler, zend_s
201202

202203
result = php_uri_get_username(uri_internal, read_mode, &tmp);
203204
if (result == FAILURE) {
205+
php_uri_free(uri_internal);
204206
php_uri_struct_free(uri);
205207
return NULL;
206208
}
@@ -211,6 +213,7 @@ PHPAPI php_uri *php_uri_parse_to_struct(const uri_handler_t *uri_handler, zend_s
211213

212214
result = php_uri_get_password(uri_internal, read_mode, &tmp);
213215
if (result == FAILURE) {
216+
php_uri_free(uri_internal);
214217
php_uri_struct_free(uri);
215218
return NULL;
216219
}
@@ -221,6 +224,7 @@ PHPAPI php_uri *php_uri_parse_to_struct(const uri_handler_t *uri_handler, zend_s
221224

222225
result = php_uri_get_host(uri_internal, read_mode, &tmp);
223226
if (result == FAILURE) {
227+
php_uri_free(uri_internal);
224228
php_uri_struct_free(uri);
225229
return NULL;
226230
}
@@ -231,6 +235,7 @@ PHPAPI php_uri *php_uri_parse_to_struct(const uri_handler_t *uri_handler, zend_s
231235

232236
result = php_uri_get_port(uri_internal, read_mode, &tmp);
233237
if (result == FAILURE) {
238+
php_uri_free(uri_internal);
234239
php_uri_struct_free(uri);
235240
return NULL;
236241
}
@@ -240,6 +245,7 @@ PHPAPI php_uri *php_uri_parse_to_struct(const uri_handler_t *uri_handler, zend_s
240245

241246
result = php_uri_get_path(uri_internal, read_mode, &tmp);
242247
if (result == FAILURE) {
248+
php_uri_free(uri_internal);
243249
php_uri_struct_free(uri);
244250
return NULL;
245251
}
@@ -250,6 +256,7 @@ PHPAPI php_uri *php_uri_parse_to_struct(const uri_handler_t *uri_handler, zend_s
250256

251257
result = php_uri_get_query(uri_internal, read_mode, &tmp);
252258
if (result == FAILURE) {
259+
php_uri_free(uri_internal);
253260
php_uri_struct_free(uri);
254261
return NULL;
255262
}
@@ -260,6 +267,7 @@ PHPAPI php_uri *php_uri_parse_to_struct(const uri_handler_t *uri_handler, zend_s
260267

261268
result = php_uri_get_fragment(uri_internal, read_mode, &tmp);
262269
if (result == FAILURE) {
270+
php_uri_free(uri_internal);
263271
php_uri_struct_free(uri);
264272
return NULL;
265273
}

‎ext/uri/php_uri.stub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ enum UrlValidationErrorType
120120
case InvalidReverseSoldius;
121121
case InvalidCredentials;
122122
case HostMissing;
123-
case PortOfOfRange;
123+
case PortOutOfRange;
124124
case PortInvalid;
125125
case FileInvalidWindowsDriveLetter;
126126
case FileInvalidWindowsDriveLetterHost;

‎ext/uri/php_uri_arginfo.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ext/uri/tests/002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ array(%d) {
9393
string(14) "www.google.com"
9494
["port"]=>
9595
int(8080)
96-
["username"]=>
96+
["user"]=>
9797
string(8) "username"
9898
["pass"]=>
9999
string(8) "password"

0 commit comments

Comments
 (0)