Merge branch 'trunk' into add/trash-child-notes-with-parent

adamsilverstein · adamsilverstein · commit 8d29438f7fcd · 2025-11-14T17:02:18.000-08:00
diff --git a/.github/workflows/install-testing.yml b/.github/workflows/install-testing.yml
@@ -95,11 +95,12 @@ jobs:
           - db-version: '9.1'
           - db-version: '9.2'
           - db-version: '9.3'
+          - db-version: '9.4'
           # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.4'
+            db-version: '9.5'
           - php: '7.3'
-            db-version: '9.4'
+            db-version: '9.5'
 
     services:
       database:
diff --git a/.github/workflows/local-docker-environment.yml b/.github/workflows/local-docker-environment.yml
@@ -105,11 +105,12 @@ jobs:
           - db-version: '9.1'
           - db-version: '9.2'
           - db-version: '9.3'
+          - db-version: '9.4'
           # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.4'
+            db-version: '9.5'
           - php: '7.3'
-            db-version: '9.4'
+            db-version: '9.5'
           # No PHP 8.5 + Memcached support yet.
           - php: '8.5'
             memcached: true
diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml
@@ -203,20 +203,20 @@ jobs:
         os: [ ubuntu-24.04 ]
         php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
         db-type: [ 'mysql', 'mariadb' ]
-        db-version: [ '9.4', '12.0' ]
+        db-version: [ '9.5', '12.0' ]
         multisite: [ false, true ]
         memcached: [ false ]
         db-innovation: [ true ]
 
         exclude:
           # MySQL 9.0+ will not work on PHP <= 7.3 because mysql_native_password was removed. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.4'
+            db-version: '9.5'
           - php: '7.3'
-            db-version: '9.4'
+            db-version: '9.5'
           # Exclude version combinations that don't exist.
           - db-type: 'mariadb'
-            db-version: '9.4'
+            db-version: '9.5'
           - db-type: 'mysql'
             db-version: '12.0'
     with:
diff --git a/.github/workflows/upgrade-testing.yml b/.github/workflows/upgrade-testing.yml
@@ -70,7 +70,7 @@ jobs:
         os: [ 'ubuntu-24.04' ]
         php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
         db-type: [ 'mysql' ]
-        db-version: [ '5.7', '8.0', '8.4', '9.4' ]
+        db-version: [ '5.7', '8.0', '8.4', '9.5' ]
         wp: [ '6.7', '6.8' ]
         multisite: [ false, true ]
 
@@ -82,9 +82,9 @@ jobs:
             db-version: '8.4'
           # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.4'
+            db-version: '9.5'
           - php: '7.3'
-            db-version: '9.4'
+            db-version: '9.5'
     with:
       os: ${{ matrix.os }}
       php: ${{ matrix.php }}
@@ -201,7 +201,7 @@ jobs:
         os: [ 'ubuntu-24.04' ]
         php: [ '7.2', '7.3', '7.4' ]
         db-type: [ 'mysql' ]
-        db-version: [ '5.7', '8.0', '8.4', '9.4' ]
+        db-version: [ '5.7', '8.0', '8.4', '9.5' ]
         wp: [ '4.7' ]
         multisite: [ false, true ]
 
@@ -213,9 +213,9 @@ jobs:
             db-version: '8.4'
           # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.4'
+            db-version: '9.5'
           - php: '7.3'
-            db-version: '9.4'
+            db-version: '9.5'
     with:
       os: ${{ matrix.os }}
       php: ${{ matrix.php }}
diff --git a/.version-support-mysql.json b/.version-support-mysql.json
@@ -1,5 +1,6 @@
 {
 	"7-0": [
+		"9.5",
 		"9.4",
 		"9.3",
 		"9.2",
diff --git a/src/wp-admin/includes/plugin.php b/src/wp-admin/includes/plugin.php
@@ -1427,7 +1427,7 @@ function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $call
 	if ( null === $position || ! is_numeric( $position ) ) {
 		$menu[] = $new_menu;
 	} elseif ( isset( $menu[ (string) $position ] ) ) {
-		$collision_avoider = base_convert( substr( md5( $menu_slug . $menu_title ), -4 ), 16, 10 ) * 0.00001;
+		$collision_avoider = (int) base_convert( substr( md5( $menu_slug . $menu_title ), -4 ), 16, 10 ) * 0.00001;
 		$position          = (string) ( $position + $collision_avoider );
 		$menu[ $position ] = $new_menu;
 	} else {
diff --git a/src/wp-includes/abilities.php b/src/wp-includes/abilities.php
@@ -220,7 +220,6 @@ function wp_register_core_abilities(): void {
 					'db_server_info' => array(
 						'type'        => 'string',
 						'description' => __( 'The database server vendor and version string reported by the driver.' ),
-						'examples'    => array( '8.0.34', '10.11.6-MariaDB' ),
 					),
 					'wp_version'     => array(
 						'type'        => 'string',
diff --git a/src/wp-includes/block-supports/typography.php b/src/wp-includes/block-supports/typography.php
@@ -306,7 +306,7 @@ function wp_typography_get_preset_inline_style_value( $style_value, $css_propert
  * @return string Filtered block content.
  */
 function wp_render_typography_support( $block_content, $block ) {
-	if ( ! empty( $block['attrs']['fitText'] ) && ! is_admin() ) {
+	if ( ! empty( $block['attrs']['fitText'] ) && $block['attrs']['fitText'] && ! is_admin() ) {
 		wp_enqueue_script_module( '@wordpress/block-editor/utils/fit-text-frontend' );
 
 		// Add Interactivity API directives for fit text to work with client-side navigation.
@@ -322,6 +322,8 @@ function wp_render_typography_support( $block_content, $block ) {
 				$block_content = $processor->get_updated_html();
 			}
 		}
+		// fitText supersedes any other typography features
+		return $block_content;
 	}
 	if ( ! isset( $block['attrs']['style']['typography']['fontSize'] ) ) {
 		return $block_content;
diff --git a/src/wp-includes/class-wp-duotone.php b/src/wp-includes/class-wp-duotone.php
@@ -246,7 +246,7 @@ private static function colord_parse_hex( $hex ) {
 				'r' => (int) base_convert( $hex[0] . $hex[0], 16, 10 ),
 				'g' => (int) base_convert( $hex[1] . $hex[1], 16, 10 ),
 				'b' => (int) base_convert( $hex[2] . $hex[2], 16, 10 ),
-				'a' => 4 === strlen( $hex ) ? round( base_convert( $hex[3] . $hex[3], 16, 10 ) / 255, 2 ) : 1,
+				'a' => 4 === strlen( $hex ) ? round( (int) base_convert( $hex[3] . $hex[3], 16, 10 ) / 255, 2 ) : 1,
 			);
 		}
 
diff --git a/src/wp-includes/class-wpdb.php b/src/wp-includes/class-wpdb.php
@@ -960,13 +960,7 @@ public function set_sql_mode( $modes = array() ) {
 				return;
 			}
 
-			$modes_str = $modes_array[0];
-
-			if ( empty( $modes_str ) ) {
-				return;
-			}
-
-			$modes = explode( ',', $modes_str );
+			$modes = explode( ',', $modes_array[0] );
 		}
 
 		$modes = array_change_key_case( $modes, CASE_UPPER );
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-abilities-v1-list-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-abilities-v1-list-controller.php
@@ -194,6 +194,27 @@ public function get_item_permissions_check( $request ) {
 		return current_user_can( 'read' );
 	}
 
+	/**
+	 * Normalizes schema empty object defaults.
+	 *
+	 * Converts empty array defaults to objects when the schema type is 'object'
+	 * to ensure proper JSON serialization as {} instead of [].
+	 *
+	 * @since 6.9.0
+	 *
+	 * @param array<string, mixed> $schema The schema array.
+	 * @return array<string, mixed> The normalized schema.
+	 */
+	private function normalize_schema_empty_object_defaults( array $schema ): array {
+		if ( isset( $schema['type'] ) && 'object' === $schema['type'] && isset( $schema['default'] ) ) {
+			$default = $schema['default'];
+			if ( is_array( $default ) && empty( $default ) ) {
+				$schema['default'] = (object) $default;
+			}
+		}
+		return $schema;
+	}
+
 	/**
 	 * Prepares an ability for response.
 	 *
@@ -209,8 +230,8 @@ public function prepare_item_for_response( $ability, $request ) {
 			'label'         => $ability->get_label(),
 			'description'   => $ability->get_description(),
 			'category'      => $ability->get_category(),
-			'input_schema'  => $ability->get_input_schema(),
-			'output_schema' => $ability->get_output_schema(),
+			'input_schema'  => $this->normalize_schema_empty_object_defaults( $ability->get_input_schema() ),
+			'output_schema' => $this->normalize_schema_empty_object_defaults( $ability->get_output_schema() ),
 			'meta'          => $ability->get_meta(),
 		);
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"7-0": [`
	`3`	`+ "9.5",`
`3`	`4`	`"9.4",`
`4`	`5`	`"9.3",`
`5`	`6`	`"9.2",`
Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ function wp_typography_get_preset_inline_style_value( $style_value, $css_propert`
`306`	`306`	`* @return string Filtered block content.`
`307`	`307`	`*/`
`308`	`308`	`function wp_render_typography_support( $block_content, $block ) {`
`309`		`- if ( ! empty( $block['attrs']['fitText'] ) && ! is_admin() ) {`
	`309`	`+ if ( ! empty( $block['attrs']['fitText'] ) && $block['attrs']['fitText'] && ! is_admin() ) {`
`310`	`310`	`wp_enqueue_script_module( '@wordpress/block-editor/utils/fit-text-frontend' );`
`311`	`311`
`312`	`312`	`// Add Interactivity API directives for fit text to work with client-side navigation.`
`@@ -322,6 +322,8 @@ function wp_render_typography_support( $block_content, $block ) {`
`322`	`322`	`$block_content = $processor->get_updated_html();`
`323`	`323`	`}`
`324`	`324`	`}`
	`325`	`+ // fitText supersedes any other typography features`
	`326`	`+ return $block_content;`
`325`	`327`	`}`
`326`	`328`	`if ( ! isset( $block['attrs']['style']['typography']['fontSize'] ) ) {`
`327`	`329`	`return $block_content;`
Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ private static function colord_parse_hex( $hex ) {`
`246`	`246`	`'r' => (int) base_convert( $hex[0] . $hex[0], 16, 10 ),`
`247`	`247`	`'g' => (int) base_convert( $hex[1] . $hex[1], 16, 10 ),`
`248`	`248`	`'b' => (int) base_convert( $hex[2] . $hex[2], 16, 10 ),`
`249`		`- 'a' => 4 === strlen( $hex ) ? round( base_convert( $hex[3] . $hex[3], 16, 10 ) / 255, 2 ) : 1,`
	`249`	`+ 'a' => 4 === strlen( $hex ) ? round( (int) base_convert( $hex[3] . $hex[3], 16, 10 ) / 255, 2 ) : 1,`
`250`	`250`	`);`
`251`	`251`	`}`
`252`	`252`
Original file line number	Diff line number	Diff line change
`@@ -960,13 +960,7 @@ public function set_sql_mode( $modes = array() ) {`
`960`	`960`	`return;`
`961`	`961`	`}`
`962`	`962`
`963`		`- $modes_str = $modes_array[0];`
`964`		`-`
`965`		`- if ( empty( $modes_str ) ) {`
`966`		`- return;`
`967`		`- }`
`968`		`-`
`969`		`- $modes = explode( ',', $modes_str );`
	`963`	`+ $modes = explode( ',', $modes_array[0] );`
`970`	`964`	`}`
`971`	`965`
`972`	`966`	`$modes = array_change_key_case( $modes, CASE_UPPER );`