Merge branch 'WordPress:trunk' into trunk

Author: dd32

phpstan.neon.dist

@@ -40,3 +40,10 @@ parameters:
 			identifier: function.inner
 			path: src/wp-includes/canonical.php
 			count: 1
+		# Level 2:
+		# ValueError is PHP 8.0+; core throws it conditionally so the docblocks are correct for WP's 7.4+ range,
+		# but bleedingEdge's version-aware check treats the class as non-existent against the PHP 7.4 floor.
+		-
+			message: '#^PHPDoc tag @throws with type InvalidArgumentException\|ValueError is not subtype of Throwable$#'
+			path: src/wp-includes/compat.php
+			reportUnmatched: false

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

@@ -358,8 +358,14 @@ function wp_render_typography_support( $block_content, $block ) {
  * }
  * @return array|null An array consisting of `'value'` and `'unit'` properties on success.
  *                    `null` on failure.
+ * @phpstan-param array{
+ *     coerce_to?: string,
+ *     root_size_value?: positive-int,
+ *     acceptable_units?: non-empty-array<non-empty-string>,
+ * } $options
+ * @phpstan-return array{ value: float, unit: non-empty-string }|null
  */
-function wp_get_typography_value_and_unit( $raw_value, $options = array() ) {
+function wp_get_typography_value_and_unit( $raw_value, $options = array() ): ?array {
 	if ( ! is_string( $raw_value ) && ! is_int( $raw_value ) && ! is_float( $raw_value ) ) {
 		_doing_it_wrong(
 			__FUNCTION__,
@@ -384,21 +390,27 @@ function wp_get_typography_value_and_unit( $raw_value, $options = array() ) {
 		'acceptable_units' => array( 'rem', 'px', 'em' ),
 	);
 
+	/**
+	 * @var array{
+	 *     coerce_to: string,
+	 *     root_size_value: positive-int,
+	 *     acceptable_units: non-empty-array<non-empty-string>,
+	 * } $options
+	 */
 	$options = wp_parse_args( $options, $defaults );
 
-	$acceptable_units_group = implode( '|', $options['acceptable_units'] );
-	$pattern                = '/^(\d*\.?\d+)(' . $acceptable_units_group . '){1,1}$/';
-
-	preg_match( $pattern, $raw_value, $matches );
-
-	// Bails out if not a number value and a px or rem unit.
-	if ( ! isset( $matches[1] ) || ! isset( $matches[2] ) ) {
+	// Bails out if the raw value can't be parsed.
+	if ( ! preg_match( '/^(\d*\.?\d+)([a-zA-Z]+|%)$/', $raw_value, $matches ) ) {
 		return null;
 	}
 
-	$value = $matches[1];
+	$value = (float) $matches[1];
 	$unit  = $matches[2];
 
+	if ( ! in_array( $unit, $options['acceptable_units'], true ) ) {
+		return null;
+	}
+
 	/*
 	 * Default browser font size. Later, possibly could inject some JS to
 	 * compute this `getComputedStyle( document.querySelector( "html" ) ).fontSize`.
@@ -669,7 +681,7 @@ function wp_get_typography_font_size_value( $preset, $settings = array() ) {
 		 * For a - b * log2(), lower values of b will make the curve move towards the minimum faster.
 		 * The scale factor is constrained between min and max values.
 		 */
-		$minimum_font_size_factor     = min( max( 1 - 0.075 * log( $preferred_font_size_in_px, 2 ), $default_minimum_font_size_factor_min ), $default_minimum_font_size_factor_max );
+		$minimum_font_size_factor     = clamp( 1 - 0.075 * log( $preferred_font_size_in_px, 2 ), $default_minimum_font_size_factor_min, $default_minimum_font_size_factor_max );
 		$calculated_minimum_font_size = round( $preferred_size['value'] * $minimum_font_size_factor, 3 );
 
 		// Only use calculated min font size if it's > $minimum_font_size_limit value.

src/wp-includes/compat.php

@@ -685,6 +685,72 @@ function array_last( array $array ) { // phpcs:ignore Universal.NamingConvention
 	}
 }
 
+if ( ! function_exists( 'clamp' ) ) {
+	/**
+	 * Polyfill for `clamp()` function added in PHP 8.6.
+	 *
+	 * Clamps a value to be within the range of a given minimum and maximum.
+	 *
+	 * If the value is within the bounds, the original value is returned.
+	 * If it is not within the bounds, the closest bound is returned.
+	 *
+	 * @since 7.1.0
+	 *
+	 * @param mixed $value The value to clamp.
+	 * @param mixed $min   The minimum bound. Must be less than or equal to `$max`.
+	 * @param mixed $max   The maximum bound. Must be greater than or equal to `$min`.
+	 * @return mixed The clamped value. Either `$value`, `$min`, or `$max`.
+	 *
+	 * @throws ValueError               If `$min` is greater than `$max`, or if `$min` or `$max` is NAN, and the ValueError class exists (PHP 8.0+ or polyfilled).
+	 * @throws InvalidArgumentException If `$min` is greater than `$max`, or if `$min` or `$max` is NAN, and the ValueError class does not exist (PHP 7.x).
+	 *
+	 * @phpstan-template TValue
+	 * @phpstan-template TMin
+	 * @phpstan-template TMax
+	 * @phpstan-param TValue $value
+	 * @phpstan-param TMin   $min
+	 * @phpstan-param TMax   $max
+	 * @phpstan-return TValue|TMin|TMax
+	 */
+	function clamp( $value, $min, $max ) {
+		$throw_value_error = static function ( string $message ) {
+			// The ValueError class was introduced in PHP 8, so in 7.4 throw InvalidArgumentException instead.
+			if ( ! class_exists( 'ValueError', false ) ) {
+				throw new InvalidArgumentException( $message );
+			}
+			throw new ValueError( $message );
+		};
+
+		if ( is_float( $min ) && is_nan( $min ) ) {
+			$throw_value_error( 'clamp(): Argument #2 ($min) must not be NAN' );
+		}
+
+		if ( is_float( $max ) && is_nan( $max ) ) {
+			$throw_value_error( 'clamp(): Argument #3 ($max) must not be NAN' );
+		}
+
+		if ( $max < $min ) {
+			$throw_value_error( 'clamp(): Argument #2 ($min) must be smaller than or equal to argument #3 ($max)' );
+		}
+
+		/*
+		 * The upper bound is checked before the lower bound to match the order in PHP's
+		 * implementation. Comparison in PHP is not transitive when operands of different
+		 * types are mixed (for example, comparing against a bool coerces both operands to
+		 * bool), so both bounds can compare as exceeded at once, and the first check wins.
+		 */
+		if ( $value > $max ) {
+			return $max;
+		}
+
+		if ( $value < $min ) {
+			return $min;
+		}
+
+		return $value;
+	}
+}
+
 // IMAGETYPE_AVIF constant is only defined in PHP 8.x or later.
 if ( ! defined( 'IMAGETYPE_AVIF' ) ) {
 	define( 'IMAGETYPE_AVIF', 19 );

src/wp-includes/embed.php

@@ -594,7 +594,8 @@ function get_oembed_response_data( $post, $width ) {
 		)
 	);
 
-	$width  = min( max( $min_max_width['min'], $width ), $min_max_width['max'] );
+	/** @var array{ min: positive-int, max: positive-int } $min_max_width */
+	$width  = clamp( $width, $min_max_width['min'], $min_max_width['max'] );
 	$height = max( (int) ceil( $width / 16 * 9 ), 200 );
 
 	$data = array(