Implement "Followup improvements for ext/uri" RFC - URL building with base URL (#23526)

Add support for passing a non-null $baseUrl parameter for Uri\WhatWg\UrlBuilder::build().

RFC: https://wiki.php.net/rfc/uri_followup#uri_building

Author: kocsismate

ext/uri/php_uri.c

@@ -1425,8 +1425,6 @@ PHP_METHOD(Uri_WhatWg_UrlBuilder, build)
 
 	lxb_url_t *base_url = NULL;
 	if (base_url_zv != NULL) {
-		zend_argument_error(NULL, 1, "is not supported yet, and therefore, null must be passed");
-		RETURN_THROWS();
 		base_url = Z_URI_OBJECT_P(base_url_zv)->uri;
 	}
 

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

@@ -0,0 +1,21 @@
+--TEST--
+Test Uri\WhatWg\UrlBuilder::build() - success - replaces the base authority with encoded credentials
+--FILE--
+<?php
+
+$base = new Uri\WhatWg\Url("https://old:secret@example.com:81/a?old#old");
+$builder = new Uri\WhatWg\UrlBuilder();
+$builder->setHost("example.net");
+$builder->setUsername("a@b");
+$builder->setPassword("c:d");
+$url = $builder->build($base);
+
+var_dump($url->toAsciiString());
+var_dump($url->equals(new Uri\WhatWg\Url($url->toAsciiString())));
+var_dump($base->toAsciiString());
+
+?>
+--EXPECT--
+string(32) "https://a%40b:c%3Ad@example.net/"
+bool(true)
+string(43) "https://old:secret@example.com:81/a?old#old"

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

@@ -0,0 +1,19 @@
+--TEST--
+Test Uri\WhatWg\UrlBuilder::build() - error - empty reference with an opaque base
+--FILE--
+<?php
+
+$base = new Uri\WhatWg\Url("foo:opaque?old#old");
+$builder = new Uri\WhatWg\UrlBuilder();
+
+try {
+    $builder->build($base);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+    var_dump($e->errors[0]->type);
+}
+
+?>
+--EXPECT--
+Uri\WhatWg\InvalidUrlException: The specified path is malformed (MissingSchemeNonRelativeUrl)
+enum(Uri\WhatWg\UrlValidationErrorType::MissingSchemeNonRelativeUrl)

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

@@ -0,0 +1,17 @@
+--TEST--
+Test Uri\WhatWg\UrlBuilder basic - error - with base URL containing opaque path
+--FILE--
+<?php
+
+$builder = new Uri\WhatWg\UrlBuilder();
+$builder->setPath("/foo/bar/baz");
+
+try {
+    $builder->build(new Uri\WhatWg\Url("scheme:opaque-path"));
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Uri\WhatWg\InvalidUrlException: The specified path is malformed (MissingSchemeNonRelativeUrl)

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

@@ -0,0 +1,17 @@
+--TEST--
+Test Uri\WhatWg\UrlBuilder::build() - success - inherits the path and query but not the fragment
+--FILE--
+<?php
+
+$base = new Uri\WhatWg\Url("https://example.com/a?old#old");
+$builder = new Uri\WhatWg\UrlBuilder();
+
+$url = $builder->build($base);
+
+var_dump($url->toAsciiString());
+var_dump($url->equals(new Uri\WhatWg\Url($url->toAsciiString())));
+
+?>
+--EXPECT--
+string(25) "https://example.com/a?old"
+bool(true)

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

@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\UrlBuilder basic - success - with base URL
---XFAIL--
-Support for passing $baseUrl to Uri\WhatWg\UrlBuilder::build() is not implemented yet.
 --FILE--
 <?php
 

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

@@ -0,0 +1,37 @@
+--TEST--
+Test Uri\WhatWg\UrlBuilder basic - success - with scheme relative URL
+--FILE--
+<?php
+
+$builder = new Uri\WhatWg\UrlBuilder();
+$builder->setHost("example.net");
+$builder->setPath("/foo/bar/baz");
+$builder->setPort(124);
+$url = $builder->build(new Uri\WhatWg\Url("https://user:pass@example.com:123/foo/bar?query#hash"));
+
+var_dump($url->toAsciiString());
+var_dump($url);
+var_dump($url->equals(new Uri\WhatWg\Url($url->toAsciiString())));
+
+?>
+--EXPECTF--
+string(35) "https://example.net:124/foo/bar/baz"
+object(Uri\WhatWg\Url)#%d (%d) {
+  ["scheme"]=>
+  string(5) "https"
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  string(11) "example.net"
+  ["port"]=>
+  int(124)
+  ["path"]=>
+  string(12) "/foo/bar/baz"
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+bool(true)

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

@@ -0,0 +1,27 @@
+--TEST--
+Test Uri\WhatWg\UrlBuilder::build() - error - preserves soft errors output with an opaque base URL
+--FILE--
+<?php
+
+$builder = new Uri\WhatWg\UrlBuilder();
+$builder->setPath("/a\tb");
+$softErrors = ["previous error"];
+
+try {
+    $builder->build(new Uri\WhatWg\Url("foo:opaque"), $softErrors);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+    foreach ($e->errors as $error) {
+        var_dump($error->type);
+    }
+}
+
+var_dump($softErrors);
+
+?>
+--EXPECT--
+Uri\WhatWg\InvalidUrlException: The specified path is malformed (MissingSchemeNonRelativeUrl)
+enum(Uri\WhatWg\UrlValidationErrorType::MissingSchemeNonRelativeUrl)
+enum(Uri\WhatWg\UrlValidationErrorType::InvalidUrlUnit)
+array(0) {
+}

…ilder/build_error_soft_errors_reset.phpt …rror_soft_errors_reset_without_base.phptext/uri/tests/whatwg/builder/build_error_soft_errors_reset.phpt renamed to ext/uri/tests/whatwg/builder/build_error_soft_errors_reset_without_base.phpt ext/uri/tests/whatwg/builder/build_error_soft_errors_reset.phpt renamed to ext/uri/tests/whatwg/builder/build_error_soft_errors_reset_without_base.phpt

@@ -0,0 +1,23 @@
+--TEST--
+Test Uri\WhatWg\UrlBuilder::build() - error - soft errors assigned to a typed property with a base URL
+--FILE--
+<?php
+
+class Foo {
+    public string $errors = "unchanged";
+}
+
+$foo = new Foo();
+$builder = new Uri\WhatWg\UrlBuilder();
+$builder->setFragment("a\tb");
+try {
+    $builder->build(new Uri\WhatWg\Url("https://example.com/"), $foo->errors);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+var_dump($foo->errors);
+
+?>
+--EXPECT--
+TypeError: Cannot assign array to reference held by property Foo::$errors of type string
+string(9) "unchanged"