Review fixes

Author: kocsismate

ext/uri/tests/whatwg/builder/basic_error_with_opaque_base.phpt

@@ -9,7 +9,7 @@ $builder->setPath("/foo/bar/baz");
 try {
     $builder->build(new Uri\WhatWg\Url("scheme:opaque-path"));
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>

ext/uri/tests/whatwg/builder/basic_error_with_password_base.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Test Uri\WhatWg\UrlBuilder basic - error - URL consisting of only a password with base URL
+--FILE--
+<?php
+
+$builder = new Uri\WhatWg\UrlBuilder();
+$builder->setPassword("password");
+
+try {
+    $builder->build(new Uri\WhatWg\Url("https://example.com"));
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Uri\WhatWg\InvalidUrlException: The specified URL cannot have password

ext/uri/tests/whatwg/builder/basic_error_with_port_base.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Test Uri\WhatWg\UrlBuilder basic - error - URL consisting of only a port with base URL
+--FILE--
+<?php
+
+$builder = new Uri\WhatWg\UrlBuilder();
+$builder->setPort(123);
+
+try {
+    $builder->build(new Uri\WhatWg\Url("https://example.com"));
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Uri\WhatWg\InvalidUrlException: The specified URL cannot have port

ext/uri/tests/whatwg/builder/basic_error_with_username_base.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Test Uri\WhatWg\UrlBuilder basic - error - URL consisting of only a username with base URL
+--FILE--
+<?php
+
+$builder = new Uri\WhatWg\UrlBuilder();
+$builder->setUsername("username");
+
+try {
+    $builder->build(new Uri\WhatWg\Url("https://example.com"));
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Uri\WhatWg\InvalidUrlException: The specified URL cannot have username

ext/uri/tests/whatwg/builder/basic_success_with_scheme_relative_url.phpt

@@ -15,14 +15,14 @@ var_dump($url->equals(new Uri\WhatWg\Url($url->toAsciiString())));
 
 ?>
 --EXPECTF--
-string(45) "https://user:pass@example.net:124/foo/bar/baz"
+string(35) "https://example.net:124/foo/bar/baz"
 object(Uri\WhatWg\Url)#%d (%d) {
   ["scheme"]=>
   string(5) "https"
   ["username"]=>
-  string(4) "user"
+  NULL
   ["password"]=>
-  string(4) "pass"
+  NULL
   ["host"]=>
   string(11) "example.net"
   ["port"]=>

ext/uri/uri_parser_whatwg.c

@@ -1001,6 +1001,14 @@ ZEND_ATTRIBUTE_NONNULL_ARGS(1, 2, 3, 4, 5, 6, 7, 8, 9) lxb_url_t *php_uri_parser
 		if (status != LXB_STATUS_OK) {
 			goto failure;
 		}
+	} else if (lexbor_base_url->username.data != NULL) {
+		zval zv;
+		ZVAL_NULL(&zv);
+		const zend_result result = php_uri_parser_whatwg_username_write(lexbor_url, &zv, NULL);
+		php_uri_parser_whatwg_build_errors(&errors);
+		if (result == FAILURE) {
+			goto failure;
+		}
 	}
 
 	if (Z_TYPE_P(password) == IS_STRING) {
@@ -1012,6 +1020,14 @@ ZEND_ATTRIBUTE_NONNULL_ARGS(1, 2, 3, 4, 5, 6, 7, 8, 9) lxb_url_t *php_uri_parser
 		if (status != LXB_STATUS_OK) {
 			goto failure;
 		}
+	} else if (lexbor_base_url->password.data != NULL) {
+		zval zv;
+		ZVAL_NULL(&zv);
+		const zend_result result = php_uri_parser_whatwg_password_write(lexbor_url, &zv, NULL);
+		php_uri_parser_whatwg_build_errors(&errors);
+		if (result == FAILURE) {
+			goto failure;
+		}
 	}
 
 	if (Z_TYPE_P(host) == IS_STRING) {
@@ -1037,6 +1053,14 @@ ZEND_ATTRIBUTE_NONNULL_ARGS(1, 2, 3, 4, 5, 6, 7, 8, 9) lxb_url_t *php_uri_parser
 		if (status != LXB_STATUS_OK) {
 			goto failure;
 		}
+	}  else if (lexbor_base_url->has_port) {
+		zval zv;
+		ZVAL_NULL(&zv);
+		const zend_result result = php_uri_parser_whatwg_port_write(lexbor_url, &zv, NULL);
+		php_uri_parser_whatwg_build_errors(&errors);
+		if (result == FAILURE) {
+			goto failure;
+		}
 	}
 
 	if (Z_TYPE_P(path) == IS_STRING && Z_STRLEN_P(path) > 0) {
@@ -1116,12 +1140,6 @@ ZEND_ATTRIBUTE_NONNULL_ARGS(2, 3, 4, 5, 6, 7, 8, 9) lxb_url_t *php_uri_parser_wh
 ) {
 	lxb_url_parser_clean(&lexbor_parser);
 
-	if (lexbor_base_url != NULL && Z_TYPE_P(scheme) == IS_STRING && Z_STRLEN_P(scheme) == 0) {
-		return php_uri_parser_whatwg_resolve_reference_from_zval(
-			lexbor_base_url, scheme, username, password, host, port, path, query, fragment, errors_zv
-		);
-	}
-
 	if (Z_TYPE_P(host) == IS_NULL ||
 		Z_STRLEN_P(host) == 0 ||
 		php_uri_parser_whatwg_get_special_scheme(Z_STR_P(scheme)) == LXB_URL_SCHEMEL_TYPE_FILE
@@ -1142,6 +1160,12 @@ ZEND_ATTRIBUTE_NONNULL_ARGS(2, 3, 4, 5, 6, 7, 8, 9) lxb_url_t *php_uri_parser_wh
 		}
 	}
 
+	if (lexbor_base_url != NULL && Z_TYPE_P(scheme) == IS_STRING && Z_STRLEN_P(scheme) == 0) {
+		return php_uri_parser_whatwg_resolve_reference_from_zval(
+			lexbor_base_url, scheme, username, password, host, port, path, query, fragment, errors_zv
+		);
+	}
+
 	lxb_url_t *lexbor_url = lexbor_mraw_calloc(lexbor_parser.mraw, sizeof(*lexbor_url));
 	if (lexbor_url == NULL) {
 		zend_throw_exception(php_uri_ce_whatwg_invalid_url_exception, "Memory allocation error", 0);