Merge branch 'trunk' into html-api/add-html-processor

Author: dmsnell

src/wp-includes/class-wp-theme-json-schema.php

@@ -138,8 +138,6 @@ private static function rename_settings( &$settings, $paths_to_rename ) {
 	 *
 	 * @param array $settings Reference to the current settings array.
 	 * @param array $path Path to the property to be removed.
-	 *
-	 * @return void
 	 */
 	private static function unset_setting_by_path( &$settings, $path ) {
 		$tmp_settings = &$settings; // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable

src/wp-includes/compat.php

@@ -434,11 +434,15 @@ function array_key_last( array $array ) { // phpcs:ignore Universal.NamingConven
 	 * @since 5.9.0
 	 *
 	 * @param string $haystack The string to search in.
-	 * @param string $needle   The substring to search for in the haystack.
+	 * @param string $needle   The substring to search for in the `$haystack`.
 	 * @return bool True if `$needle` is in `$haystack`, otherwise false.
 	 */
 	function str_contains( $haystack, $needle ) {
-		return ( '' === $needle || false !== strpos( $haystack, $needle ) );
+		if ( '' === $needle ) {
+			return true;
+		}
+
+		return false !== strpos( $haystack, $needle );
 	}
 }
 

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

@@ -1258,8 +1258,6 @@ private function parse_next_attribute() {
 	 * Move the internal cursor past any immediate successive whitespace.
 	 *
 	 * @since 6.2.0
-	 *
-	 * @return void
 	 */
 	private function skip_whitespace() {
 		$this->bytes_already_parsed += strspn( $this->html, " \t\f\r\n", $this->bytes_already_parsed );
@@ -1269,8 +1267,6 @@ private function skip_whitespace() {
 	 * Applies attribute updates and cleans up once a tag is fully parsed.
 	 *
 	 * @since 6.2.0
-	 *
-	 * @return void
 	 */
 	private function after_tag() {
 		$this->get_updated_html();
@@ -1289,8 +1285,6 @@ private function after_tag() {
 	 *
 	 * @see WP_HTML_Tag_Processor::$lexical_updates
 	 * @see WP_HTML_Tag_Processor::$classname_updates
-	 *
-	 * @return void
 	 */
 	private function class_name_updates_to_attributes_updates() {
 		if ( count( $this->classname_updates ) === 0 ) {
@@ -2183,7 +2177,6 @@ public function get_updated_html() {
 	 *     @type string|null $class_name   Tag must contain this class name to match.
 	 *     @type string      $tag_closers  "visit" or "skip": whether to stop on tag closers, e.g. </div>.
 	 * }
-	 * @return void
 	 */
 	private function parse_query( $query ) {
 		if ( null !== $query && $query === $this->last_query ) {

src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php

@@ -34,8 +34,6 @@ public function __construct() {
 	 * Registers the controllers routes.
 	 *
 	 * @since 5.9.0
-	 *
-	 * @return void
 	 */
 	public function register_routes() {
 		register_rest_route(

src/wp-includes/script-loader.php

@@ -3021,8 +3021,6 @@ static function () use ( $style ) {
  *     @type bool $optimize Whether to optimize the CSS output, e.g., combine rules. Default is `false`.
  *     @type bool $prettify Whether to add new lines and indents to output. Default is the test of whether the global constant `SCRIPT_DEBUG` is defined.
  * }
- *
- * @return void
  */
 function wp_enqueue_stored_styles( $options = array() ) {
 	$is_block_theme   = wp_is_block_theme();

src/wp-includes/style-engine/class-wp-style-engine-css-rules-store.php

@@ -80,8 +80,6 @@ public static function get_stores() {
 	 * Clears all stores from static::$stores.
 	 *
 	 * @since 6.1.0
-	 *
-	 * @return void
 	 */
 	public static function remove_all_stores() {
 		static::$stores = array();
@@ -93,7 +91,6 @@ public static function remove_all_stores() {
 	 * @since 6.1.0
 	 *
 	 * @param string $name The store name.
-	 * @return void
 	 */
 	public function set_name( $name ) {
 		$this->name = $name;
@@ -152,7 +149,6 @@ public function add_rule( $selector ) {
 	 * @since 6.1.0
 	 *
 	 * @param string $selector The CSS selector.
-	 * @return void
 	 */
 	public function remove_rule( $selector ) {
 		unset( $this->rules[ $selector ] );

src/wp-includes/style-engine/class-wp-style-engine-processor.php

@@ -126,8 +126,6 @@ public function get_css( $options = array() ) {
 	 * Combines selectors from the rules store when they have the same styles.
 	 *
 	 * @since 6.1.0
-	 *
-	 * @return void
 	 */
 	private function combine_rules_selectors() {
 		// Build an array of selectors along with the JSON-ified styles to make comparisons easier.

src/wp-includes/style-engine/class-wp-style-engine.php

@@ -288,7 +288,6 @@ protected static function is_valid_style_value( $style_value ) {
 	 * @param string   $store_name       A valid store key.
 	 * @param string   $css_selector     When a selector is passed, the function will return a full CSS rule `$selector { ...rules }`, otherwise a concatenated string of properties and values.
 	 * @param string[] $css_declarations An associative array of CSS definitions, e.g., `array( "$property" => "$value", "$property" => "$value" )`.
-	 * @return void
 	 */
 	public static function store_css_rule( $store_name, $css_selector, $css_declarations ) {
 		if ( empty( $store_name ) || empty( $css_selector ) || empty( $css_declarations ) ) {