Merge branch 'WordPress:trunk' into ticket/63692-2

Author: VladimirAus

README.md

@@ -37,11 +37,13 @@ If you are not using a package manager, see the [Node.js download page](https://
 
 **Note:** WordPress currently only officially supports Node.js `20.x` and npm `10.x`.
 
-You will also need [Docker](https://www.docker.com/products/docker-desktop) installed and running on your computer. Docker is the virtualization software that powers the local development environment. Docker can be installed just like any other regular application.
+You will also need a container environment such as [Docker Desktop](https://www.docker.com/products/docker-desktop) installed and running on your computer. The container environment is the virtualization software that powers the local development environment and can be installed just like any other regular application.
+
+**Note:** WordPress currently only officially supports Docker but several container environments are available and should generally be compatible, such as [Colima](https://github.com/abiosoft/colima), [OrbStack](https://orbstack.dev/), [Podman Desktop](https://podman-desktop.io/), and [Rancher Desktop](https://rancherdesktop.io/).
 
 ### Development Environment Commands
 
-Ensure [Docker](https://www.docker.com/products/docker-desktop) is running before using these commands.
+Ensure your container environment is running before using these commands.
 
 #### To start the development environment for the first time
 
@@ -97,7 +99,7 @@ npm run test:php -- --group <group name or ticket number>
 #### Generating a code coverage report
 PHP code coverage reports are [generated daily](https://github.com/WordPress/wordpress-develop/actions/workflows/test-coverage.yml) and [submitted to Codecov.io](https://app.codecov.io/gh/WordPress/wordpress-develop).
 
-After the local Docker environment has [been installed and started](#to-start-the-development-environment-for-the-first-time), the following command can be used to generate a code coverage report. 
+After the local container environment has [been installed and started](#to-start-the-development-environment-for-the-first-time), the following command can be used to generate a code coverage report. 
 
 ```
 npm run test:coverage
@@ -133,15 +135,15 @@ npm run env:start
 
 #### Resetting the development environment
 
-The development environment can be reset. This will destroy the database and attempt to remove the pulled Docker images.
+The development environment can be reset. This will destroy the database and attempt to remove the pulled container images.
 
 ```
 npm run env:reset
 ```
 
 ### Apple Silicon machines and old MySQL/MariaDB versions
 
-Older MySQL and MariaDB Docker images do not support Apple Silicon processors (M1, M2, etc.). This is true for:
+Older MySQL and MariaDB container images do not support Apple Silicon processors (M1, M2, etc.). This is true for:
 
 - MySQL versions 5.7 and earlier
 - MariaDB 5.5
@@ -155,7 +157,7 @@ services:
     platform: linux/amd64
 ```
 
-Additionally, the "Use Rosetta for x86/AMD64 emulation on Apple Silicon" setting in Docker needs to be disabled for this workaround.
+Additionally, the "Use Rosetta for x86/AMD64 emulation on Apple Silicon" setting in your container environment (if applicable) needs to be disabled for this workaround.
 
 ## Credentials
 

src/wp-content/themes/twentyten/functions.php

@@ -55,7 +55,7 @@
 
 if ( ! function_exists( 'twentyten_setup' ) ) :
 	/**
-	 * Set up theme defaults and registers support for various WordPress features.
+	 * Sets up theme defaults and registers support for various WordPress features.
 	 *
 	 * Note that this function is hooked into the after_setup_theme hook, which runs
 	 * before the init hook. The init hook is too late for some features, such as indicating
@@ -267,7 +267,7 @@ function twentyten_setup() {
 
 if ( ! function_exists( 'twentyten_admin_header_style' ) ) :
 	/**
-	 * Style the header image displayed on the Appearance > Header admin panel.
+	 * Styles the header image displayed on the Appearance > Header admin panel.
 	 *
 	 * Referenced via add_custom_image_header() in twentyten_setup().
 	 *
@@ -293,7 +293,7 @@ function twentyten_admin_header_style() {
 
 if ( ! function_exists( 'twentyten_header_image' ) ) :
 	/**
-	 * Custom header image markup displayed.
+	 * Displays the custom header image markup.
 	 *
 	 * @since Twenty Ten 4.0
 	 */
@@ -359,7 +359,7 @@ function twentyten_excerpt_length( $length ) {
 
 if ( ! function_exists( 'twentyten_continue_reading_link' ) ) :
 	/**
-	 * Return a "Continue Reading" link for excerpts.
+	 * Returns a "Continue Reading" link for excerpts.
 	 *
 	 * @since Twenty Ten 1.0
 	 *
@@ -371,7 +371,7 @@ function twentyten_continue_reading_link() {
 endif;
 
 /**
- * Replace "[...]" with an ellipsis and twentyten_continue_reading_link().
+ * Replaces "[...]" with an ellipsis and twentyten_continue_reading_link().
  *
  * "[...]" is appended to automatically generated excerpts.
  *
@@ -411,7 +411,7 @@ function twentyten_custom_excerpt_more( $output ) {
 add_filter( 'get_the_excerpt', 'twentyten_custom_excerpt_more' );
 
 /**
- * Remove inline styles printed when the gallery shortcode is used.
+ * Removes inline styles printed when the gallery shortcode is used.
  *
  * Galleries are styled by the theme in Twenty Ten's style.css. This is just
  * a simple filter call that tells WordPress to not use the default styles.
@@ -620,7 +620,7 @@ function twentyten_widgets_init() {
 add_action( 'widgets_init', 'twentyten_widgets_init' );
 
 /**
- * Remove the default styles that are packaged with the Recent Comments widget.
+ * Removes the default styles that are packaged with the Recent Comments widget.
  *
  * To override this in a child theme, remove the filter and optionally add your own
  * function tied to the widgets_init action hook.
@@ -638,7 +638,7 @@ function twentyten_remove_recent_comments_style() {
 
 if ( ! function_exists( 'twentyten_posted_on' ) ) :
 	/**
-	 * Print HTML with meta information for the current post-date/time and author.
+	 * Prints HTML with meta information for the current post-date/time and author.
 	 *
 	 * @since Twenty Ten 1.0
 	 */
@@ -666,7 +666,7 @@ function twentyten_posted_on() {
 
 if ( ! function_exists( 'twentyten_posted_in' ) ) :
 	/**
-	 * Print HTML with meta information for the current post (category, tags and permalink).
+	 * Prints HTML with meta information for the current post (category, tags and permalink).
 	 *
 	 * @since Twenty Ten 1.0
 	 */
@@ -794,7 +794,7 @@ function twentyten_register_block_patterns() {
 
 if ( ! function_exists( 'wp_body_open' ) ) :
 	/**
-	 * Fire the wp_body_open action.
+	 * Fires the wp_body_open action.
 	 *
 	 * Added for backward compatibility to support pre-5.2.0 WordPress versions.
 	 *

src/wp-includes/html-api/class-wp-html-doctype-info.php

@@ -50,6 +50,8 @@
  *
  * @since 6.7.0
  *
+ * @access private
+ *
  * @see WP_HTML_Processor
  */
 class WP_HTML_Doctype_Info {

src/wp-includes/html-api/class-wp-html-processor.php

@@ -1760,14 +1760,19 @@ private function step_in_head(): bool {
 			case '+META':
 				$this->insert_html_element( $this->state->current_token );
 
+				// All following conditions depend on "tentative" encoding confidence.
+				if ( 'tentative' !== $this->state->encoding_confidence ) {
+					return true;
+				}
+
 				/*
 				 * > If the active speculative HTML parser is null, then:
 				 * >   - If the element has a charset attribute, and getting an encoding from
 				 * >     its value results in an encoding, and the confidence is currently
 				 * >     tentative, then change the encoding to the resulting encoding.
 				 */
 				$charset = $this->get_attribute( 'charset' );
-				if ( is_string( $charset ) && 'tentative' === $this->state->encoding_confidence ) {
+				if ( is_string( $charset ) ) {
 					$this->bail( 'Cannot yet process META tags with charset to determine encoding.' );
 				}
 
@@ -1784,8 +1789,7 @@ private function step_in_head(): bool {
 				if (
 					is_string( $http_equiv ) &&
 					is_string( $content ) &&
-					0 === strcasecmp( $http_equiv, 'Content-Type' ) &&
-					'tentative' === $this->state->encoding_confidence
+					0 === strcasecmp( $http_equiv, 'Content-Type' )
 				) {
 					$this->bail( 'Cannot yet process META tags with http-equiv Content-Type to determine encoding.' );
 				}

tests/phpunit/tests/html-api/wpHtmlProcessorMetaTag.php

@@ -0,0 +1,77 @@
+<?php
+/**
+ * Unit tests covering WP_HTML_Processor META tag handling.
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ *
+ * @since 6.9
+ *
+ * @group html-api
+ *
+ * @coversDefaultClass WP_HTML_Processor
+ */
+class Tests_HtmlApi_WpHtmlProcessorMetaTag extends WP_UnitTestCase {
+	/**
+	 * Data provider.
+	 */
+	public static function data_supported_meta_tags(): array {
+		return array(
+			'No attributes'                        => array( '<meta>' ),
+			'Unrelated attributes'                 => array( '<meta not-charset="OK">' ),
+			'Boolean charset'                      => array( '<meta charset>' ),
+			'HTTP Equiv: accept'                   => array( '<meta http-equiv="accept" content="">' ),
+			'HTTP Equiv: content-type, no content' => array( '<meta http-equiv="content-type">' ),
+			'Boolean HTTP Equiv'                   => array( '<meta http-equiv content="">' ),
+		);
+	}
+
+	/**
+	 * Ensures that META tags correctly handle encoding confidence.
+	 *
+	 * @ticket 63738
+	 *
+	 * @dataProvider data_supported_meta_tags
+	 */
+	public function test_supported_meta_tag( string $html ) {
+		$html      = '<!DOCTYPE html>' . $html;
+		$processor = new class($html) extends WP_HTML_Processor {
+			public function __construct( $html ) {
+				parent::__construct( $html, parent::CONSTRUCTOR_UNLOCK_CODE );
+			}
+		};
+
+		$this->assertTrue( $processor->next_tag( 'META' ) );
+	}
+
+	/**
+	 * Data provider.
+	 */
+	public static function data_unsupported_meta_tags(): array {
+		return array(
+			'With charset'                => array( '<meta charset="utf8">', 'Cannot yet process META tags with charset to determine encoding.' ),
+			'With CHARSET'                => array( '<meta CHARSET="utf8">', 'Cannot yet process META tags with charset to determine encoding.' ),
+			'With http-equiv'             => array( '<meta http-equiv="content-type" content="">', 'Cannot yet process META tags with http-equiv Content-Type to determine encoding.' ),
+			'With http-equiv and content' => array( '<meta http-equiv="Content-Type" content="UTF-8">', 'Cannot yet process META tags with http-equiv Content-Type to determine encoding.' ),
+		);
+	}
+
+	/**
+	 * Ensures that unsupported encoding META tags bail.
+	 *
+	 * @ticket 63738
+	 *
+	 * @dataProvider data_unsupported_meta_tags
+	 */
+	public function test_unsupported_meta_tags( string $html, string $unsupported_message ) {
+		$html      = '<!DOCTYPE html>' . $html;
+		$processor = new class($html) extends WP_HTML_Processor {
+			public function __construct( $html ) {
+				parent::__construct( $html, parent::CONSTRUCTOR_UNLOCK_CODE );
+			}
+		};
+
+		$this->assertFalse( $processor->next_tag( 'META' ) );
+		$this->assertInstanceOf( WP_HTML_Unsupported_Exception::class, $processor->get_unsupported_exception() );
+	}
+}