Test fixes

Author: kocsismate

ext/soap/tests/bugs/bug38067.phpt

@@ -21,7 +21,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('Test');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0, $uriParserClass = null): string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0, ?string $uriParserClass = null): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();

ext/soap/tests/bugs/bug66049.phpt

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

ext/standard/url.c

@@ -433,7 +433,7 @@ static zend_result parse_url_init_parser(void)
 	zend_hash_init(&parse_url_property_handlers, 8, NULL, NULL, true);
 
 	URI_REGISTER_PROPERTY_READ_HANDLER(&parse_url_property_handlers, ZSTR_KNOWN(ZEND_STR_SCHEME), parse_url_read_scheme);
-	URI_REGISTER_PROPERTY_READ_HANDLER(&parse_url_property_handlers, ZSTR_KNOWN(ZEND_STR_USER), parse_url_read_username);
+	URI_REGISTER_PROPERTY_READ_HANDLER(&parse_url_property_handlers, ZSTR_KNOWN(ZEND_STR_USERNAME), parse_url_read_username);
 	URI_REGISTER_PROPERTY_READ_HANDLER(&parse_url_property_handlers, ZSTR_KNOWN(ZEND_STR_PASSWORD), parse_url_read_password);
 	URI_REGISTER_PROPERTY_READ_HANDLER(&parse_url_property_handlers, ZSTR_KNOWN(ZEND_STR_HOST), parse_url_read_host);
 	URI_REGISTER_PROPERTY_READ_HANDLER(&parse_url_property_handlers, ZSTR_KNOWN(ZEND_STR_PORT), parse_url_read_port);

ext/uri/php_lexbor.c

@@ -219,7 +219,7 @@ static void fill_errors(zval *errors)
 				ZVAL_TRUE(&failure);
 				break;
 			case LXB_URL_ERROR_TYPE_PORT_OUT_OF_RANGE:
-				error_str = zend_string_init("PortOfOfRange", sizeof("PortOfOfRange"), false);
+				error_str = zend_string_init("PortOutOfRange", sizeof("PortOutOfRange"), false);
 				ZVAL_TRUE(&failure);
 				break;
 			case LXB_URL_ERROR_TYPE_PORT_INVALID:

ext/uri/php_uri.c

@@ -191,6 +191,7 @@ PHPAPI php_uri *php_uri_parse_to_struct(const uri_handler_t *uri_handler, zend_s
 
 	result = php_uri_get_scheme(uri_internal, read_mode, &tmp);
 	if (result == FAILURE) {
+		php_uri_free(uri_internal);
 		php_uri_struct_free(uri);
 		return NULL;
 	}
@@ -201,6 +202,7 @@ PHPAPI php_uri *php_uri_parse_to_struct(const uri_handler_t *uri_handler, zend_s
 
 	result = php_uri_get_username(uri_internal, read_mode, &tmp);
 	if (result == FAILURE) {
+		php_uri_free(uri_internal);
 		php_uri_struct_free(uri);
 		return NULL;
 	}
@@ -211,6 +213,7 @@ PHPAPI php_uri *php_uri_parse_to_struct(const uri_handler_t *uri_handler, zend_s
 
 	result = php_uri_get_password(uri_internal, read_mode, &tmp);
 	if (result == FAILURE) {
+		php_uri_free(uri_internal);
 		php_uri_struct_free(uri);
 		return NULL;
 	}
@@ -221,6 +224,7 @@ PHPAPI php_uri *php_uri_parse_to_struct(const uri_handler_t *uri_handler, zend_s
 
 	result = php_uri_get_host(uri_internal, read_mode, &tmp);
 	if (result == FAILURE) {
+		php_uri_free(uri_internal);
 		php_uri_struct_free(uri);
 		return NULL;
 	}
@@ -231,6 +235,7 @@ PHPAPI php_uri *php_uri_parse_to_struct(const uri_handler_t *uri_handler, zend_s
 
 	result = php_uri_get_port(uri_internal, read_mode, &tmp);
 	if (result == FAILURE) {
+		php_uri_free(uri_internal);
 		php_uri_struct_free(uri);
 		return NULL;
 	}
@@ -240,6 +245,7 @@ PHPAPI php_uri *php_uri_parse_to_struct(const uri_handler_t *uri_handler, zend_s
 
 	result = php_uri_get_path(uri_internal, read_mode, &tmp);
 	if (result == FAILURE) {
+		php_uri_free(uri_internal);
 		php_uri_struct_free(uri);
 		return NULL;
 	}
@@ -250,6 +256,7 @@ PHPAPI php_uri *php_uri_parse_to_struct(const uri_handler_t *uri_handler, zend_s
 
 	result = php_uri_get_query(uri_internal, read_mode, &tmp);
 	if (result == FAILURE) {
+		php_uri_free(uri_internal);
 		php_uri_struct_free(uri);
 		return NULL;
 	}
@@ -260,6 +267,7 @@ PHPAPI php_uri *php_uri_parse_to_struct(const uri_handler_t *uri_handler, zend_s
 
 	result = php_uri_get_fragment(uri_internal, read_mode, &tmp);
 	if (result == FAILURE) {
+		php_uri_free(uri_internal);
 		php_uri_struct_free(uri);
 		return NULL;
 	}

ext/uri/php_uri.stub.php

@@ -120,7 +120,7 @@ enum UrlValidationErrorType
         case InvalidReverseSoldius;
         case InvalidCredentials;
         case HostMissing;
-        case PortOfOfRange;
+        case PortOutOfRange;
         case PortInvalid;
         case FileInvalidWindowsDriveLetter;
         case FileInvalidWindowsDriveLetterHost;

ext/uri/php_uri_arginfo.h

@@ -93,7 +93,7 @@ array(%d) {
   string(14) "www.google.com"
   ["port"]=>
   int(8080)
-  ["username"]=>
+  ["user"]=>
   string(8) "username"
   ["pass"]=>
   string(8) "password"