ext/uri: fixed url component delimiter handling

Author: NickSdot

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

@@ -0,0 +1,39 @@
+--TEST--
+Test Uri\WhatWg\UrlBuilder::setFragment() - success - hashmark only with base URL
+--FILE--
+<?php
+
+$base = new Uri\WhatWg\Url('https://example.com/base/path?oldQuery#oldFragment');
+
+$url = new Uri\WhatWg\UrlBuilder()
+    ->setFragment('#')
+    ->build($base);
+
+var_dump($url->toAsciiString());
+var_dump($url);
+var_dump($url->equals(new Uri\WhatWg\Url($url->toAsciiString())));
+var_dump($url->equals(new Uri\WhatWg\Url('#', $base), Uri\UriComparisonMode::IncludeFragment));
+
+?>
+--EXPECTF--
+string(39) "https://example.com/base/path?oldQuery#"
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(10) "/base/path"
+  ["query"]=>
+  string(8) "oldQuery"
+  ["fragment"]=>
+  string(0) ""
+}
+bool(true)
+bool(true)

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

@@ -0,0 +1,39 @@
+--TEST--
+Test Uri\WhatWg\UrlBuilder::setQuery() - success - question mark only with base URL
+--FILE--
+<?php
+
+$base = new Uri\WhatWg\Url('https://example.com/base/path?oldQuery#oldFragment');
+
+$url = new Uri\WhatWg\UrlBuilder()
+    ->setQuery('?')
+    ->build($base);
+
+var_dump($url->toAsciiString());
+var_dump($url);
+var_dump($url->equals(new Uri\WhatWg\Url($url->toAsciiString())));
+var_dump($url->equals(new Uri\WhatWg\Url('?', $base), Uri\UriComparisonMode::IncludeFragment));
+
+?>
+--EXPECTF--
+string(30) "https://example.com/base/path?"
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(10) "/base/path"
+  ["query"]=>
+  string(0) ""
+  ["fragment"]=>
+  NULL
+}
+bool(true)
+bool(true)

ext/uri/uri_parser_whatwg.c

@@ -1143,26 +1143,30 @@ ZEND_ATTRIBUTE_NONNULL_ARGS(1, 2, 3, 4, 5, 6, 7, 8, 9) lxb_url_t *php_uri_parser
 
 	if (Z_TYPE_P(query) == IS_STRING) {
 		lxb_url_query_set_null(lexbor_url);
-		lxb_url_parser_clean(&lexbor_parser);
-		status = lxb_url_parse_basic(&lexbor_parser, lexbor_url, lexbor_base_url,
-			(lxb_char_t *) Z_STRVAL_P(query), Z_STRLEN_P(query),
-			LXB_URL_STATE_QUERY_STATE, LXB_ENCODING_AUTO
-		);
-		php_uri_parser_whatwg_build_errors_and_throw(status, "query", &errors);
-		if (status != LXB_STATUS_OK) {
+		zend_result result;
+		if (Z_STRLEN_P(query) == 0) {
+			lexbor_str_init(&lexbor_url->query, lexbor_url->mraw, 1);
+			result = SUCCESS;
+		} else {
+			result = php_uri_parser_whatwg_query_write(lexbor_url, query, NULL);
+		}
+		php_uri_parser_whatwg_build_errors(&errors);
+		if (result == FAILURE) {
 			goto failure;
 		}
 	}
 
 	if (Z_TYPE_P(fragment) == IS_STRING) {
 		lxb_url_fragment_set_null(lexbor_url);
-		lxb_url_parser_clean(&lexbor_parser);
-		status = lxb_url_parse_basic(&lexbor_parser, lexbor_url, lexbor_base_url,
-			(lxb_char_t *) Z_STRVAL_P(fragment), Z_STRLEN_P(fragment),
-			LXB_URL_STATE_FRAGMENT_STATE, LXB_ENCODING_AUTO
-		);
-		php_uri_parser_whatwg_build_errors_and_throw(status, "fragment", &errors);
-		if (status != LXB_STATUS_OK) {
+		zend_result result;
+		if (Z_STRLEN_P(fragment) == 0) {
+			lexbor_str_init(&lexbor_url->fragment, lexbor_url->mraw, 1);
+			result = SUCCESS;
+		} else {
+			result = php_uri_parser_whatwg_fragment_write(lexbor_url, fragment, NULL);
+		}
+		php_uri_parser_whatwg_build_errors(&errors);
+		if (result == FAILURE) {
 			goto failure;
 		}
 	}