Merge branch 'trunk' into migrate-urls-in-css

Author: adamziel

components/Blueprints/class-runner.php

@@ -55,7 +55,7 @@
 use WordPress\HttpClient\Client;
 use WordPress\Zip\ZipFilesystem;
 
-use function WordPress\Encoding\_wp_has_noncharacters_fallback;
+use function WordPress\Encoding\wp_is_valid_utf8;
 use function WordPress\Filesystem\wp_unix_sys_get_temp_dir;
 use function WordPress\Zip\is_zip_file_stream;
 
@@ -379,14 +379,7 @@ private function load_blueprint() {
 		// Validate the Blueprint string we've just loaded.
 
 		// **UTF-8 Encoding:** Assert the Blueprint input is UTF-8 encoded.
-		$is_valid_utf8 = false;
-		if ( function_exists( 'mb_check_encoding' ) ) {
-			$is_valid_utf8 = mb_check_encoding( $blueprint_string, 'UTF-8' );
-		} else {
-			$is_valid_utf8 = ! _wp_has_noncharacters_fallback( $blueprint_string );
-		}
-
-		if ( ! $is_valid_utf8 ) {
+		if ( ! wp_is_valid_utf8( $blueprint_string ) ) {
 			throw new BlueprintExecutionException( 'Blueprint must be encoded as UTF-8.' );
 		}
 

components/DataLiberation/URL/class-cssprocessor.php

@@ -2,9 +2,9 @@
 
 namespace WordPress\DataLiberation\URL;
 
-use function WordPress\Encoding\utf8_codepoint_at;
 use function WordPress\Encoding\codepoint_to_utf8_bytes;
 use function WordPress\Encoding\compat\_wp_scan_utf8;
+use function WordPress\Encoding\utf8_ord;
 use function WordPress\Encoding\wp_scrub_utf8;
 
 /**
@@ -1532,7 +1532,7 @@ private function consume_ident_start_codepoint( $at ): int {
 		}
 
 		$codepoint_byte_length = $new_at - $at;
-		$codepoint             = utf8_codepoint_at( $this->css, $at );
+		$codepoint             = utf8_ord( substr( $this->css, $at, $codepoint_byte_length ) );
 		if ( null !== $codepoint && $codepoint >= 0x80 ) {
 			return $codepoint_byte_length;
 		}