Refactor

Author: kocsismate

ext/uri/php_uri.c

@@ -1225,26 +1225,22 @@ PHP_METHOD(Uri_Rfc3986_UriBuilder, build)
 	const zval *query = Z_RFC3986_URI_PROP_QUERY_P(ZEND_THIS);
 	const zval *fragment = Z_RFC3986_URI_PROP_FRAGMENT_P(ZEND_THIS);
 
-	zend_string *uri_str = php_uri_parser_rfc3986_recompose_from_zval(scheme, userinfo, host, port, path, query, fragment);
-	if (uri_str == NULL) {
-		RETURN_THROWS();
-	}
-
-	php_uri_parser_rfc3986_uris *base_uri = NULL;
+	php_uri_parser_rfc3986_uris *base_uris = NULL;
 	if (base_url != NULL) {
-		base_uri = Z_URI_OBJECT_P(base_url)->uri;
+		base_uris = Z_URI_OBJECT_P(base_url)->uri;
 	}
 
-	php_uri_parser_rfc3986_uris *uri = php_uri_parser_rfc3986_parse_ex(ZSTR_VAL(uri_str), ZSTR_LEN(uri_str), base_uri, false);
-	zend_string_release(uri_str);
-	if (uri == NULL) {
+	php_uri_parser_rfc3986_uris *uriparser_uris = php_uri_parser_rfc3986_build_from_zval(
+		base_uris, scheme, userinfo, host, port, path, query, fragment
+	);
+	if (uriparser_uris == NULL) {
 		RETURN_THROWS();
 	}
 
 	object_init_ex(return_value, php_uri_ce_rfc3986_uri);
 	php_uri_object *uri_object = Z_URI_OBJECT_P(return_value);
 	uri_object->parser = &php_uri_parser_rfc3986;
-	uri_object->uri = uri;
+	uri_object->uri = uriparser_uris;
 }
 
 PHPAPI php_uri_object *php_uri_object_create(zend_class_entry *class_type, const php_uri_parser *parser)

ext/uri/php_uri_common.h

@@ -46,7 +46,7 @@ typedef enum php_uri_component_read_mode {
 
 typedef zend_result (*php_uri_property_handler_read)(void *uri, php_uri_component_read_mode read_mode, zval *retval);
 
-typedef zend_result (*php_uri_property_handler_write)(void *uri, zval *value, zval *errors);
+typedef zend_result (*php_uri_property_handler_write)(void *uri, const zval *value, zval *errors);
 
 typedef enum php_uri_property_name {
 	PHP_URI_PROPERTY_NAME_SCHEME,

ext/uri/tests/rfc3986/builder/basic_error_with_base.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Test Uri\Rfc3986\UriBuilder basic - error - with base URL
+--FILE--
+<?php
+
+$builder = new Uri\Rfc3986\UriBuilder()
+    ->setPath("/foo/bar/baz");
+
+try {
+    $builder->build(new Uri\Rfc3986\Uri("/foo/bar"));
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+Uri\InvalidUriException: The specified base URI must be absolute

ext/uri/tests/rfc3986/builder/basic_success_with_base.phpt

@@ -0,0 +1,33 @@
+--TEST--
+Test Uri\Rfc3986\UriBuilder basic - success - with base URL
+--FILE--
+<?php
+
+$builder = new Uri\Rfc3986\UriBuilder()
+    ->setPath("/foo/bar/baz");
+$uri = $builder->build(new Uri\Rfc3986\Uri("https://example.com"));
+
+var_dump($uri->toRawString());
+var_dump($uri);
+
+?>
+--EXPECTF--
+string(31) "https://example.com/foo/bar/baz"
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.com"
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(12) "/foo/bar/baz"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}

ext/uri/tests/rfc3986/builder/path_error_missing_leading_slash.phpt

@@ -15,4 +15,4 @@ try {
 
 ?>
 --EXPECT--
-Uri\InvalidUriException: A path must be either empty or begin with "/" when the URI contains a host
+Uri\InvalidUriException: The specified path is malformed

ext/uri/tests/rfc3986/builder/port_error_missing_host.phpt

@@ -14,4 +14,4 @@ try {
 
 ?>
 --EXPECT--
-Uri\InvalidUriException: The URI must contain a host if either the userinfo or the port component is present
+Uri\InvalidUriException: Cannot set a port without having a host

ext/uri/tests/rfc3986/builder/userinfo_error_missing_host.phpt

@@ -14,4 +14,4 @@ try {
 
 ?>
 --EXPECT--
-Uri\InvalidUriException: The URI must contain a host if either the userinfo or the port component is present
+Uri\InvalidUriException: Cannot set a userinfo without having a host

ext/uri/tests/rfc3986/modification/port_error_negative.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - too small number
+Test Uri\Rfc3986\Uri component modification - port - too small number
 --EXTENSIONS--
 uri
 --FILE--