Merge branch 'WordPress:trunk' into trunk

Author: dd32

src/wp-includes/block-supports/typography.php

@@ -311,6 +311,7 @@ function wp_render_typography_support( $block_content, $block ) {
 		if ( ! empty( $block_content ) ) {
 			$processor = new WP_HTML_Tag_Processor( $block_content );
 			if ( $processor->next_tag() ) {
+				$processor->add_class( 'has-fit-text' );
 				if ( ! $processor->get_attribute( 'data-wp-interactive' ) ) {
 					$processor->set_attribute( 'data-wp-interactive', true );
 				}

src/wp-includes/class-wp-user.php

@@ -33,6 +33,8 @@
  * @property string     $display_name
  * @property string     $spam
  * @property string     $deleted
+ * @property string     $comment_shortcuts
+ * @property string     $infinite_scrolling
  * @property string     $locale
  * @property string     $rich_editing
  * @property string     $syntax_highlighting

tests/phpstan/baselines/property.nonObject.neon

@@ -178,16 +178,6 @@ parameters:
 			identifier: property.nonObject
 			count: 2
 			path: ../../../src/wp-admin/update.php
-		-
-			message: '#^Cannot access property \$comment_shortcuts on WP_User\|false\.$#'
-			identifier: property.nonObject
-			count: 1
-			path: ../../../src/wp-admin/user-edit.php
-		-
-			message: '#^Cannot access property \$infinite_scrolling on WP_User\|false\.$#'
-			identifier: property.nonObject
-			count: 1
-			path: ../../../src/wp-admin/user-edit.php
 		-
 			message: '#^Cannot access property \$id on int\|string\|WP_Term\.$#'
 			identifier: property.nonObject

tests/phpunit/tests/block-supports/typography.php

@@ -58,6 +58,9 @@ public function tear_down() {
 		unregister_block_type( $this->test_block_name );
 		$this->test_block_name = null;
 
+		// Resets script modules enqueued while rendering fit text.
+		$GLOBALS['wp_script_modules'] = null;
+
 		parent::tear_down();
 	}
 
@@ -1135,6 +1138,80 @@ public function data_generate_replace_inline_font_styles_with_fluid_values_fixtu
 		);
 	}
 
+	/**
+	 * Tests that the `has-fit-text` class name is added to the block wrapper when the
+	 * `fitText` attribute is set.
+	 *
+	 * @ticket 65973
+	 *
+	 * @covers ::wp_render_typography_support
+	 *
+	 * @dataProvider data_should_add_fit_text_class_name
+	 *
+	 * @param non-falsy-string $block_content  HTML block content.
+	 * @param non-falsy-string $expected_class Expected value of the class attribute on the block wrapper.
+	 */
+	public function test_should_add_fit_text_class_name( string $block_content, string $expected_class ) {
+		$block = array(
+			'blockName' => 'core/site-title',
+			'attrs'     => array(
+				'fitText' => true,
+			),
+		);
+
+		$actual = wp_render_typography_support( $block_content, $block );
+
+		$processor = new WP_HTML_Tag_Processor( $actual );
+		$processor->next_tag();
+
+		$this->assertSame( $expected_class, $processor->get_attribute( 'class' ), 'The block wrapper does not have the expected class names.' );
+		$this->assertSame( 1, substr_count( $actual, 'has-fit-text' ), 'The class name should be added exactly once, to the outermost tag only.' );
+	}
+
+	/**
+	 * Data provider for test_should_add_fit_text_class_name().
+	 *
+	 * @return array<non-falsy-string, array{ block_content: non-falsy-string, expected_class: non-falsy-string }>
+	 */
+	public function data_should_add_fit_text_class_name(): array {
+		return array(
+			'wrapper without a class attribute' => array(
+				'block_content'  => '<h1>Site Title</h1>',
+				'expected_class' => 'has-fit-text',
+			),
+			'wrapper with existing class names' => array(
+				'block_content'  => '<h1 class="wp-block-site-title"><a href="https://example.com">Site Title</a></h1>',
+				'expected_class' => 'wp-block-site-title has-fit-text',
+			),
+			'wrapper with an already serialized class name' => array(
+				'block_content'  => '<p class="has-fit-text">A paragraph</p>',
+				'expected_class' => 'has-fit-text',
+			),
+			'wrapper with inner blocks'         => array(
+				'block_content'  => '<div class="wp-block-group"><p>A paragraph inside a group</p></div>',
+				'expected_class' => 'wp-block-group has-fit-text',
+			),
+		);
+	}
+
+	/**
+	 * Tests that the `has-fit-text` class name is not added when the block does not
+	 * opt in to the fit text support.
+	 *
+	 * @ticket 65973
+	 *
+	 * @covers ::wp_render_typography_support
+	 */
+	public function test_should_not_add_fit_text_class_name_without_fit_text_attribute() {
+		$block_content = '<h1 class="wp-block-site-title">Site Title</h1>';
+		$block         = array(
+			'blockName' => 'core/site-title',
+			'attrs'     => array(),
+		);
+
+		$this->assertSame( $block_content, wp_render_typography_support( $block_content, $block ) );
+	}
+
 	/**
 	 * Tests that valid font size values are parsed.
 	 *