Merge branch 'trunk' into fix/30049

swissspidy · swissspidy · commit 4a9cddf04ea6 · 2024-06-18T19:14:39.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -79,70 +79,70 @@
 	},
 	"dependencies": {
 		"@wordpress/a11y": "4.0.1",
-		"@wordpress/annotations": "3.0.1",
+		"@wordpress/annotations": "3.0.2",
 		"@wordpress/api-fetch": "7.0.1",
 		"@wordpress/autop": "4.0.1",
 		"@wordpress/blob": "4.0.1",
-		"@wordpress/block-directory": "5.0.1",
-		"@wordpress/block-editor": "13.0.1",
-		"@wordpress/block-library": "9.0.1",
+		"@wordpress/block-directory": "5.0.2",
+		"@wordpress/block-editor": "13.0.2",
+		"@wordpress/block-library": "9.0.2",
 		"@wordpress/block-serialization-default-parser": "5.0.1",
-		"@wordpress/blocks": "13.0.1",
-		"@wordpress/commands": "1.0.1",
-		"@wordpress/components": "28.0.1",
+		"@wordpress/blocks": "13.0.2",
+		"@wordpress/commands": "1.0.2",
+		"@wordpress/components": "28.0.2",
 		"@wordpress/compose": "7.0.1",
-		"@wordpress/core-commands": "1.0.1",
-		"@wordpress/core-data": "7.0.1",
-		"@wordpress/customize-widgets": "5.0.1",
-		"@wordpress/data": "10.0.1",
-		"@wordpress/data-controls": "4.0.1",
-		"@wordpress/dataviews": "2.0.1",
+		"@wordpress/core-commands": "1.0.2",
+		"@wordpress/core-data": "7.0.2",
+		"@wordpress/customize-widgets": "5.0.2",
+		"@wordpress/data": "10.0.2",
+		"@wordpress/data-controls": "4.0.2",
+		"@wordpress/dataviews": "2.0.2",
 		"@wordpress/date": "5.0.1",
 		"@wordpress/deprecated": "4.0.1",
 		"@wordpress/dom": "4.0.1",
 		"@wordpress/dom-ready": "4.0.1",
-		"@wordpress/edit-post": "8.0.1",
-		"@wordpress/edit-site": "6.0.1",
-		"@wordpress/edit-widgets": "6.0.1",
-		"@wordpress/editor": "14.0.1",
+		"@wordpress/edit-post": "8.0.2",
+		"@wordpress/edit-site": "6.0.2",
+		"@wordpress/edit-widgets": "6.0.2",
+		"@wordpress/editor": "14.0.2",
 		"@wordpress/element": "6.0.1",
 		"@wordpress/escape-html": "3.0.1",
-		"@wordpress/format-library": "5.0.1",
+		"@wordpress/format-library": "5.0.2",
 		"@wordpress/hooks": "4.0.1",
 		"@wordpress/html-entities": "4.0.1",
 		"@wordpress/i18n": "5.0.1",
 		"@wordpress/icons": "10.0.1",
 		"@wordpress/interactivity": "6.0.1",
 		"@wordpress/interactivity-router": "2.0.1",
-		"@wordpress/interface": "6.0.1",
+		"@wordpress/interface": "6.0.2",
 		"@wordpress/is-shallow-equal": "5.0.1",
-		"@wordpress/keyboard-shortcuts": "5.0.1",
+		"@wordpress/keyboard-shortcuts": "5.0.2",
 		"@wordpress/keycodes": "4.0.1",
-		"@wordpress/list-reusable-blocks": "5.0.1",
+		"@wordpress/list-reusable-blocks": "5.0.2",
 		"@wordpress/media-utils": "5.0.1",
-		"@wordpress/notices": "5.0.1",
-		"@wordpress/nux": "9.0.1",
-		"@wordpress/patterns": "2.0.1",
-		"@wordpress/plugins": "7.0.1",
-		"@wordpress/preferences": "4.0.1",
+		"@wordpress/notices": "5.0.2",
+		"@wordpress/nux": "9.0.2",
+		"@wordpress/patterns": "2.0.2",
+		"@wordpress/plugins": "7.0.2",
+		"@wordpress/preferences": "4.0.2",
 		"@wordpress/preferences-persistence": "2.0.1",
 		"@wordpress/primitives": "4.0.1",
 		"@wordpress/priority-queue": "3.0.1",
-		"@wordpress/private-apis": "1.0.1",
+		"@wordpress/private-apis": "1.0.2",
 		"@wordpress/redux-routine": "5.0.1",
-		"@wordpress/reusable-blocks": "5.0.1",
-		"@wordpress/rich-text": "7.0.1",
-		"@wordpress/router": "1.0.1",
-		"@wordpress/server-side-render": "5.0.1",
+		"@wordpress/reusable-blocks": "5.0.2",
+		"@wordpress/rich-text": "7.0.2",
+		"@wordpress/router": "1.0.2",
+		"@wordpress/server-side-render": "5.0.2",
 		"@wordpress/shortcode": "4.0.1",
-		"@wordpress/style-engine": "2.0.1",
+		"@wordpress/style-engine": "2.0.2",
 		"@wordpress/sync": "1.0.1",
 		"@wordpress/token-list": "3.0.1",
 		"@wordpress/undo-manager": "1.0.1",
 		"@wordpress/url": "4.0.1",
-		"@wordpress/viewport": "6.0.1",
+		"@wordpress/viewport": "6.0.2",
 		"@wordpress/warning": "3.0.1",
-		"@wordpress/widgets": "4.0.1",
+		"@wordpress/widgets": "4.0.2",
 		"@wordpress/wordcount": "4.0.1",
 		"backbone": "1.5.0",
 		"clipboard": "2.0.11",
diff --git a/src/readme.html b/src/readme.html
@@ -58,7 +58,7 @@ <h2>System Requirements</h2>
 <h3>Recommendations</h3>
 <ul>
 	<li><a href="https://www.php.net/">PHP</a> version <strong>7.4</strong> or greater.</li>
-	<li><a href="https://www.mysql.com/">MySQL</a> version <strong>8.0</strong> or greater OR <a href="https://mariadb.org/">MariaDB</a> version <strong>10.4</strong> or greater.</li>
+	<li><a href="https://www.mysql.com/">MySQL</a> version <strong>8.0</strong> or greater OR <a href="https://mariadb.org/">MariaDB</a> version <strong>10.5</strong> or greater.</li>
 	<li>The <a href="https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html">mod_rewrite</a> Apache module.</li>
 	<li><a href="https://wordpress.org/news/2016/12/moving-toward-ssl/">HTTPS</a> support.</li>
 	<li>A link to <a href="https://wordpress.org/">wordpress.org</a> on your site.</li>
diff --git a/src/wp-admin/includes/class-wp-automatic-updater.php b/src/wp-admin/includes/class-wp-automatic-updater.php
@@ -511,6 +511,9 @@ public function update( $type, $item ) {
 				&& ( 'up_to_date' === $upgrade_result->get_error_code()
 					|| 'locked' === $upgrade_result->get_error_code() )
 			) {
+				// Allow visitors to browse the site again.
+				$upgrader->maintenance_mode( false );
+
 				/*
 				 * These aren't actual errors, treat it as a skipped-update instead
 				 * to avoid triggering the post-core update failure routines.
diff --git a/src/wp-admin/includes/class-wp-site-health.php b/src/wp-admin/includes/class-wp-site-health.php
@@ -18,7 +18,7 @@ class WP_Site_Health {
 	private $mysql_server_version        = '';
 	private $mysql_required_version      = '5.5';
 	private $mysql_recommended_version   = '8.0';
-	private $mariadb_recommended_version = '10.4';
+	private $mariadb_recommended_version = '10.5';
 
 	public $php_memory_limit;
 
diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php
@@ -52,6 +52,21 @@ function wp_install( $blog_title, $user_name, $user_email, $is_public, $deprecat
 		wp_check_mysql_version();
 		wp_cache_flush();
 		make_db_current_silent();
+
+		/*
+		 * Ensure update checks are delayed after installation.
+		 *
+		 * This prevents users being presented with a maintenance mode screen
+		 * immediately after installation.
+		 */
+		wp_unschedule_hook( 'wp_version_check' );
+		wp_unschedule_hook( 'wp_update_plugins' );
+		wp_unschedule_hook( 'wp_update_themes' );
+
+		wp_schedule_event( time() + HOUR_IN_SECONDS, 'twicedaily', 'wp_version_check' );
+		wp_schedule_event( time() + ( 1.5 * HOUR_IN_SECONDS ), 'twicedaily', 'wp_update_plugins' );
+		wp_schedule_event( time() + ( 2 * HOUR_IN_SECONDS ), 'twicedaily', 'wp_update_themes' );
+
 		populate_options();
 		populate_roles();
 
diff --git a/src/wp-content/themes/twentytwentyfour/screenshot.png b/src/wp-content/themes/twentytwentyfour/screenshot.png
diff --git a/src/wp-includes/assets/script-loader-packages.min.php b/src/wp-includes/assets/script-loader-packages.min.php
diff --git a/src/wp-includes/class-wp-admin-bar.php b/src/wp-includes/class-wp-admin-bar.php
@@ -575,7 +575,7 @@ final protected function _render_item( $node ) {
 			$menuclass = ' class="' . esc_attr( trim( $menuclass ) ) . '"';
 		}
 
-		echo "<li id='" . esc_attr( 'wp-admin-bar-' . $node->id ) . "'$menuclass>";
+		echo "<li role='group' id='" . esc_attr( 'wp-admin-bar-' . $node->id ) . "'$menuclass>";
 
 		if ( $has_link ) {
 			$attributes = array( 'onclick', 'target', 'title', 'rel', 'lang', 'dir' );
diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php
@@ -8094,10 +8094,11 @@ function get_available_post_mime_types( $type = 'attachment' ) {
 	$mime_types = apply_filters( 'pre_get_available_post_mime_types', null, $type );
 
 	if ( ! is_array( $mime_types ) ) {
-		$mime_types = $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT post_mime_type FROM $wpdb->posts WHERE post_type = %s", $type ) );
+		$mime_types = $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT post_mime_type FROM $wpdb->posts WHERE post_type = %s AND post_mime_type != ''", $type ) );
 	}
 
-	return $mime_types;
+	// Remove nulls from returned $mime_types.
+	return array_values( array_filter( $mime_types ) );
 }
 
 /**
diff --git a/src/wp-includes/version.php b/src/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.6-beta2-58392-src';
+$wp_version = '6.6-beta3-58440-src';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/tests/phpunit/tests/admin/wpSiteHealth.php b/tests/phpunit/tests/admin/wpSiteHealth.php
@@ -38,9 +38,6 @@ public function set_up() {
 	 * @covers ::__construct()
 	 */
 	public function test_mysql_recommended_version_matches_readme_html() {
-		// This test is designed to only run on trunk.
-		$this->skipOnAutomatedBranches();
-
 		$reflection          = new ReflectionClass( $this->instance );
 		$reflection_property = $reflection->getProperty( 'mysql_recommended_version' );
 		$reflection_property->setAccessible( true );
@@ -57,9 +54,6 @@ public function test_mysql_recommended_version_matches_readme_html() {
 	 * @covers ::__construct()
 	 */
 	public function test_mariadb_recommended_version_matches_readme_html() {
-		// This test is designed to only run on trunk.
-		$this->skipOnAutomatedBranches();
-
 		$reflection          = new ReflectionClass( $this->instance );
 		$reflection_property = $reflection->getProperty( 'mariadb_recommended_version' );
 		$reflection_property->setAccessible( true );
diff --git a/tests/phpunit/tests/post/getAvailablePostMimeTypes.php b/tests/phpunit/tests/post/getAvailablePostMimeTypes.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Unit tests covering post mime types.
+ *
+ * @ticket 59195
+ *
+ * @group post
+ *
+ * @covers ::get_available_post_mime_types
+ */
+
+class Tests_Post_GetAvailablePostMimeTypes extends WP_UnitTestCase {
+
+	public function tear_down() {
+		// Remove all uploads.
+		$this->remove_added_uploads();
+		remove_filter( 'pre_get_available_post_mime_types', array( $this, 'filter_add_null_to_post_mime_types' ) );
+		parent::tear_down();
+	}
+
+	public function test_should_return_expected_post_mime_types() {
+		// Upload a JPEG image.
+		$filename = DIR_TESTDATA . '/images/test-image.jpg';
+		$contents = file_get_contents( $filename );
+		$upload   = wp_upload_bits( wp_basename( $filename ), null, $contents );
+		$this->assertEmpty( $upload['error'], 'Uploading a JPEG file should not result in an error.' );
+		$this->_make_attachment( $upload );
+
+		// Upload a PDF file.
+		$filename = DIR_TESTDATA . '/images/test-alpha.pdf';
+		$contents = file_get_contents( $filename );
+		$upload   = wp_upload_bits( wp_basename( $filename ), null, $contents );
+		$this->assertEmpty( $upload['error'], 'Uploading a PDF file should not result in an error.' );
+		$this->_make_attachment( $upload );
+
+		$mime_types = get_available_post_mime_types();
+
+		$this->assertSame( array( 'image/jpeg', 'application/pdf' ), $mime_types, 'The MIME types returned should match the uploaded file MIME types.' );
+	}
+
+	public function test_should_remove_null() {
+		// Add filter to inject null into the mime types array.
+		add_filter( 'pre_get_available_post_mime_types', array( $this, 'filter_add_null_to_post_mime_types' ) );
+
+		$mime_types = get_available_post_mime_types();
+		$this->assertEqualsCanonicalizing( array( 'image/jpeg', 'image/png' ), $mime_types );
+	}
+
+	/**
+	 * Filter to inject null into the mime types array.
+	 *
+	 * @param string $type Post type.
+	 * @return array
+	 */
+	public function filter_add_null_to_post_mime_types( $type ) {
+		return array( 'image/jpeg', null, 'image/png' );
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -575,7 +575,7 @@ final protected function _render_item( $node ) {`
`575`	`575`	`$menuclass = ' class="' . esc_attr( trim( $menuclass ) ) . '"';`
`576`	`576`	`}`
`577`	`577`
`578`		`- echo "<li id='" . esc_attr( 'wp-admin-bar-' . $node->id ) . "'$menuclass>";`
	`578`	`+ echo "<li role='group' id='" . esc_attr( 'wp-admin-bar-' . $node->id ) . "'$menuclass>";`
`579`	`579`
`580`	`580`	`if ( $has_link ) {`
`581`	`581`	`$attributes = array( 'onclick', 'target', 'title', 'rel', 'lang', 'dir' );`
Original file line number	Diff line number	Diff line change
`@@ -8094,10 +8094,11 @@ function get_available_post_mime_types( $type = 'attachment' ) {`
`8094`	`8094`	`$mime_types = apply_filters( 'pre_get_available_post_mime_types', null, $type );`
`8095`	`8095`
`8096`	`8096`	`if ( ! is_array( $mime_types ) ) {`
`8097`		`- $mime_types = $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT post_mime_type FROM $wpdb->posts WHERE post_type = %s", $type ) );`
	`8097`	`+ $mime_types = $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT post_mime_type FROM $wpdb->posts WHERE post_type = %s AND post_mime_type != ''", $type ) );`
`8098`	`8098`	`}`
`8099`	`8099`
`8100`		`- return $mime_types;`
	`8100`	`+ // Remove nulls from returned $mime_types.`
	`8101`	`+ return array_values( array_filter( $mime_types ) );`
`8101`	`8102`	`}`
`8102`	`8103`
`8103`	`8104`	`/**`