ext/uri: Fix the behavior for $softErrors (#23740)

Uri\WhatWg\Url::__construct() and Uri\WhatWg\UrlBuilder::build() now set $softErrors to an empty array when URL processing throws an exception, instead of preserving its value.

Author: kocsismate

UPGRADING

@@ -318,6 +318,12 @@ PHP 8.6 UPGRADE NOTES
     platform's key_t range instead of passing a truncated key to the operating
     system.
 
+- URI:
+  . Uri\WhatWg\Url::__construct() now sets $softErrors to an empty array when
+    URL processing throws an exception, instead of preserving its value.
+    URL validation errors remain available in the
+    Uri\WhatWg\InvalidUrlException::$errors property.
+
 - Zip:
   . ZipArchive::extractTo now raises a TypeError for the files argument if one
     or more of the entries is not a string.

ext/uri/php_uri.c

@@ -387,6 +387,8 @@ ZEND_ATTRIBUTE_NONNULL_ARGS(1, 2) PHPAPI void php_uri_instantiate_uri(
 	if (UNEXPECTED(uri == NULL)) {
 		if (should_throw) {
 			zval_ptr_dtor(&errors);
+			ZVAL_EMPTY_ARRAY(&errors);
+			pass_errors_by_ref_and_free(errors_zv, &errors);
 			RETURN_THROWS();
 		} else {
 			if (pass_errors_by_ref_and_free(errors_zv, &errors) == FAILURE) {
@@ -1433,6 +1435,9 @@ PHP_METHOD(Uri_WhatWg_UrlBuilder, build)
 		soft_errors
 	);
 	if (lexbor_url == NULL) {
+		zval errors;
+		ZVAL_EMPTY_ARRAY(&errors);
+		pass_errors_by_ref_and_free(soft_errors, &errors);
 		RETURN_THROWS();
 	}
 

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

@@ -7,17 +7,14 @@ $builder = new Uri\WhatWg\UrlBuilder();
 $builder->setScheme("foo");
 $builder->setHost("\t\n");
 $builder->setPassword("pass");
-$softErrors = ["unchanged"];
 
 try {
-    $builder->build(softErrors: $softErrors);
+    $builder->build();
 } catch (Throwable $e) {
     echo $e::class, ': ', $e->getMessage(), "\n";
     var_dump($e->errors);
 }
 
-var_dump($softErrors);
-
 ?>
 --EXPECTF--
 Uri\WhatWg\InvalidUrlException: The specified URL cannot have password
@@ -33,7 +30,3 @@ array(1) {
     bool(false)
   }
 }
-array(1) {
-  [0]=>
-  string(9) "unchanged"
-}

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

@@ -7,17 +7,14 @@ $builder = new Uri\WhatWg\UrlBuilder();
 $builder->setScheme("foo");
 $builder->setHost("\t\n");
 $builder->setPort(123);
-$softErrors = ["unchanged"];
 
 try {
-    $builder->build(softErrors: $softErrors);
+    $builder->build();
 } catch (Throwable $e) {
     echo $e::class, ': ', $e->getMessage(), "\n";
     var_dump($e->errors);
 }
 
-var_dump($softErrors);
-
 ?>
 --EXPECTF--
 Uri\WhatWg\InvalidUrlException: The specified URL cannot have port
@@ -33,7 +30,3 @@ array(1) {
     bool(false)
   }
 }
-array(1) {
-  [0]=>
-  string(9) "unchanged"
-}

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

@@ -7,17 +7,14 @@ $builder = new Uri\WhatWg\UrlBuilder();
 $builder->setScheme("foo");
 $builder->setHost("\t\n");
 $builder->setUsername("user");
-$softErrors = ["unchanged"];
 
 try {
-    $builder->build(softErrors: $softErrors);
+    $builder->build();
 } catch (Throwable $e) {
     echo $e::class, ': ', $e->getMessage(), "\n";
     var_dump($e->errors);
 }
 
-var_dump($softErrors);
-
 ?>
 --EXPECTF--
 Uri\WhatWg\InvalidUrlException: The specified URL cannot have username
@@ -33,7 +30,3 @@ array(1) {
     bool(false)
   }
 }
-array(1) {
-  [0]=>
-  string(9) "unchanged"
-}

…r/build_error_soft_errors_unchanged.phpt …ilder/build_error_soft_errors_reset.phptext/uri/tests/whatwg/builder/build_error_soft_errors_unchanged.phpt renamed to ext/uri/tests/whatwg/builder/build_error_soft_errors_reset.phpt ext/uri/tests/whatwg/builder/build_error_soft_errors_unchanged.phpt renamed to ext/uri/tests/whatwg/builder/build_error_soft_errors_reset.phpt

@@ -1,12 +1,12 @@
 --TEST--
-Test Uri\WhatWg\UrlBuilder::build() - error - leaves soft errors unchanged
+Test Uri\WhatWg\UrlBuilder::build() - error - clears soft errors when an exception is thrown
 --FILE--
 <?php
 
 $builder = new Uri\WhatWg\UrlBuilder();
 $builder->setScheme("ht\ttps");
 $builder->setHost(null);
-$softErrors = ["unchanged"];
+$softErrors = ["previous error"];
 
 try {
     $builder->build(softErrors: $softErrors);
@@ -40,7 +40,5 @@ array(2) {
     bool(true)
   }
 }
-array(1) {
-  [0]=>
-  string(9) "unchanged"
+array(0) {
 }

…g/basic_error_soft_errors_unchanged.phpt …rsing/basic_error_soft_errors_reset.phptext/uri/tests/whatwg/parsing/basic_error_soft_errors_unchanged.phpt renamed to ext/uri/tests/whatwg/parsing/basic_error_soft_errors_reset.phpt ext/uri/tests/whatwg/parsing/basic_error_soft_errors_unchanged.phpt renamed to ext/uri/tests/whatwg/parsing/basic_error_soft_errors_reset.phpt

@@ -1,9 +1,9 @@
 --TEST--
-Test Uri\WhatWg\Url::__construct() - error - leaves soft errors unchanged
+Test Uri\WhatWg\Url::__construct() - error - clears soft errors when an exception is thrown
 --FILE--
 <?php
 
-$softErrors = ["unchanged"];
+$softErrors = ["previous error"];
 
 try {
     new Uri\WhatWg\Url("🐘", softErrors: $softErrors);
@@ -28,7 +28,5 @@ array(1) {
     bool(true)
   }
 }
-array(1) {
-  [0]=>
-  string(9) "unchanged"
+array(0) {
 }