[pull] master from php:master

UPGRADING

@@ -1110,6 +1110,7 @@ PHP 8.6 UPGRADE NOTES
   . Improved performance of intval('+0b...', 2) and intval('0b...', 2).
   . Improved performance of str_split().
   . Improved performance of str_pad().
+  . Improved performance of str_repeat() when the multiplier is 1.
 
 - URI:
   . Improved performance of Uri\WhatWg\Url::parse() when collecting

Zend/Optimizer/zend_func_infos.h

@@ -493,7 +493,6 @@ static const func_info_t func_infos[] = {
 	F1("hebrev", MAY_BE_STRING),
 	F1("strip_tags", MAY_BE_STRING),
 	F1("str_getcsv", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_ARRAY_OF_NULL),
-	F1("str_repeat", MAY_BE_STRING),
 	F1("count_chars", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_LONG|MAY_BE_STRING),
 	F1("localeconv", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_ARRAY_OF_ARRAY),
 	F1("sscanf", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_ANY|MAY_BE_LONG|MAY_BE_NULL),

ext/opcache/tests/jit/str_repeat_refcount.phpt

@@ -0,0 +1,23 @@
+--TEST--
+str_repeat() may return a shared string
+--EXTENSIONS--
+opcache
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit=1205
+opcache.jit_buffer_size=32M
+--FILE--
+<?php
+function test(int $length): void {
+    $input = str_repeat('a', $length);
+    str_repeat($input, 1);
+    $overwrite = str_repeat('b', $length);
+    var_dump($input, $overwrite);
+}
+test(16);
+?>
+--EXPECT--
+string(16) "aaaaaaaaaaaaaaaa"
+string(16) "bbbbbbbbbbbbbbbb"

ext/standard/basic_functions.stub.php

@@ -2593,7 +2593,6 @@ function parse_str(string $string, &$result): void {}
  */
 function str_getcsv(string $string, string $separator = ",", string $enclosure = "\"", string $escape = "\\"): array {}
 
-/** @refcount 1 */
 function str_repeat(string $string, int $times): string {}
 
 /**

ext/standard/string.c

@@ -5638,6 +5638,10 @@ PHP_FUNCTION(str_repeat)
 	if (ZSTR_LEN(input_str) == 0 || mult == 0)
 		RETURN_EMPTY_STRING();
 
+	if (mult == 1) {
+		RETURN_STR_COPY(input_str);
+	}
+
 	/* Initialize the result string */
 	result = zend_string_safe_alloc(ZSTR_LEN(input_str), mult, 0, 0);
 	result_len = ZSTR_LEN(input_str) * mult;

ext/uri/php_uri.c

@@ -1404,12 +1404,12 @@ PHP_METHOD(Uri_WhatWg_UrlBuilder, setFragment)
 PHP_METHOD(Uri_WhatWg_UrlBuilder, build)
 {
 	zval *base_url_zv = NULL;
-	zval *errors = NULL;
+	zval *soft_errors = NULL;
 
 	ZEND_PARSE_PARAMETERS_START(0, 2)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_OBJECT_OF_CLASS_OR_NULL(base_url_zv, php_uri_ce_whatwg_url)
-		Z_PARAM_ZVAL(errors)
+		Z_PARAM_ZVAL(soft_errors)
 	ZEND_PARSE_PARAMETERS_END();
 
 	const zval *scheme = Z_WHATWG_URL_PROP_SCHEME_DEREF_P(ZEND_THIS);
@@ -1430,7 +1430,7 @@ PHP_METHOD(Uri_WhatWg_UrlBuilder, build)
 
 	lxb_url_t *lexbor_url = php_uri_parser_whatwg_build_from_zval(
 		base_url, scheme, username, password, host, port, path, query, fragment,
-		errors
+		soft_errors
 	);
 	if (lexbor_url == NULL) {
 		RETURN_THROWS();

ext/uri/php_uri.stub.php

@@ -240,8 +240,8 @@ public function setQuery(?string $query): static {}
 
         public function setFragment(?string $fragment): static {}
 
-        /** @param array $errors */
-        public function build(?\Uri\WhatWg\Url $baseUrl = null, &$errors = null): \Uri\WhatWg\Url {}
+        /** @param array $softErrors */
+        public function build(?\Uri\WhatWg\Url $baseUrl = null, &$softErrors = null): \Uri\WhatWg\Url {}
     }
 
     /** @strict-properties */

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

@@ -0,0 +1,28 @@
+--TEST--
+Test Uri\WhatWg\UrlBuilder::setHost() - error - initializes validation errors
+--FILE--
+<?php
+
+$builder = new Uri\WhatWg\UrlBuilder();
+
+try {
+    $builder->setHost("example.com/path");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+    var_dump($e->errors);
+}
+
+?>
+--EXPECTF--
+Uri\WhatWg\InvalidUrlException: The specified host is malformed (HostInvalidCodePoint)
+array(1) {
+  [0]=>
+  object(Uri\WhatWg\UrlValidationError)#%d (%d) {
+    ["context"]=>
+    string(0) ""
+    ["type"]=>
+    enum(Uri\WhatWg\UrlValidationErrorType::HostInvalidCodePoint)
+    ["failure"]=>
+    bool(true)
+  }
+}

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

@@ -0,0 +1,21 @@
+--TEST--
+Test Uri\WhatWg\UrlBuilder::build() - error - initializes errors for invalid component combinations
+--FILE--
+<?php
+
+$builder = new Uri\WhatWg\UrlBuilder();
+$builder->setScheme("foo");
+$builder->setUsername("user");
+
+try {
+    $builder->build();
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+    var_dump($e->errors);
+}
+
+?>
+--EXPECT--
+Uri\WhatWg\InvalidUrlException: The specified URL cannot have username
+array(0) {
+}

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

@@ -0,0 +1,39 @@
+--TEST--
+Test Uri\WhatWg\UrlBuilder::build() - error - password with a host that normalizes to empty
+--FILE--
+<?php
+
+$builder = new Uri\WhatWg\UrlBuilder();
+$builder->setScheme("foo");
+$builder->setHost("\t\n");
+$builder->setPassword("pass");
+$softErrors = ["unchanged"];
+
+try {
+    $builder->build(softErrors: $softErrors);
+} 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
+array(1) {
+  [0]=>
+  object(Uri\WhatWg\UrlValidationError)#%d (%d) {
+    ["context"]=>
+    string(2) "	
+"
+    ["type"]=>
+    enum(Uri\WhatWg\UrlValidationErrorType::InvalidUrlUnit)
+    ["failure"]=>
+    bool(false)
+  }
+}
+array(1) {
+  [0]=>
+  string(9) "unchanged"
+}

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

@@ -0,0 +1,39 @@
+--TEST--
+Test Uri\WhatWg\UrlBuilder::build() - error - port with a host that normalizes to empty
+--FILE--
+<?php
+
+$builder = new Uri\WhatWg\UrlBuilder();
+$builder->setScheme("foo");
+$builder->setHost("\t\n");
+$builder->setPort(123);
+$softErrors = ["unchanged"];
+
+try {
+    $builder->build(softErrors: $softErrors);
+} 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
+array(1) {
+  [0]=>
+  object(Uri\WhatWg\UrlValidationError)#%d (%d) {
+    ["context"]=>
+    string(2) "	
+"
+    ["type"]=>
+    enum(Uri\WhatWg\UrlValidationErrorType::InvalidUrlUnit)
+    ["failure"]=>
+    bool(false)
+  }
+}
+array(1) {
+  [0]=>
+  string(9) "unchanged"
+}

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

@@ -0,0 +1,39 @@
+--TEST--
+Test Uri\WhatWg\UrlBuilder::build() - error - username with a host that normalizes to empty
+--FILE--
+<?php
+
+$builder = new Uri\WhatWg\UrlBuilder();
+$builder->setScheme("foo");
+$builder->setHost("\t\n");
+$builder->setUsername("user");
+$softErrors = ["unchanged"];
+
+try {
+    $builder->build(softErrors: $softErrors);
+} 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
+array(1) {
+  [0]=>
+  object(Uri\WhatWg\UrlValidationError)#%d (%d) {
+    ["context"]=>
+    string(2) "	
+"
+    ["type"]=>
+    enum(Uri\WhatWg\UrlValidationErrorType::InvalidUrlUnit)
+    ["failure"]=>
+    bool(false)
+  }
+}
+array(1) {
+  [0]=>
+  string(9) "unchanged"
+}

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

@@ -0,0 +1,46 @@
+--TEST--
+Test Uri\WhatWg\UrlBuilder::build() - error - leaves soft errors unchanged
+--FILE--
+<?php
+
+$builder = new Uri\WhatWg\UrlBuilder();
+$builder->setScheme("ht\ttps");
+$builder->setHost(null);
+$softErrors = ["unchanged"];
+
+try {
+    $builder->build(softErrors: $softErrors);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+    var_dump($e->errors);
+}
+
+var_dump($softErrors);
+
+?>
+--EXPECTF--
+Uri\WhatWg\InvalidUrlException: The specified host is malformed (HostMissing)
+array(2) {
+  [0]=>
+  object(Uri\WhatWg\UrlValidationError)#%d (%d) {
+    ["context"]=>
+    string(4) "	tps"
+    ["type"]=>
+    enum(Uri\WhatWg\UrlValidationErrorType::InvalidUrlUnit)
+    ["failure"]=>
+    bool(false)
+  }
+  [1]=>
+  object(Uri\WhatWg\UrlValidationError)#%d (%d) {
+    ["context"]=>
+    string(0) ""
+    ["type"]=>
+    enum(Uri\WhatWg\UrlValidationErrorType::HostMissing)
+    ["failure"]=>
+    bool(true)
+  }
+}
+array(1) {
+  [0]=>
+  string(9) "unchanged"
+}