Merge branch 'trac-48456-codemirror-v5-upgrade' into trac-48456-codemirror-v5-upgrade-espree

Author: westonruter

src/wp-admin/includes/media.php

@@ -38,8 +38,8 @@ function media_upload_tabs() {
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param array $tabs
- * @return array $tabs with gallery if post has image attachment
+ * @param array $tabs Associative array of default tab names.
+ * @return array $tabs Filtered tabs with gallery if post has image attachment.
  */
 function update_gallery_tab( $tabs ) {
 	global $wpdb;
@@ -71,7 +71,7 @@ function update_gallery_tab( $tabs ) {
  *
  * @since 2.5.0
  *
- * @global string $redir_tab
+ * @global string $redir_tab The name of the tab to redirect to.
  */
 function the_media_upload_tabs() {
 	global $redir_tab;
@@ -527,7 +527,7 @@ function media_handle_sideload( $file_array, $post_id = 0, $desc = null, $post_d
  * @since 5.3.0 Formalized the existing and already documented `...$args` parameter
  *              by adding it to the function signature.
  *
- * @global string $body_id
+ * @global string $body_id The ID attribute value for the body element.
  *
  * @param callable $content_func Function that outputs the content.
  * @param mixed    ...$args      Optional additional parameters to pass to the callback function when it's called.

src/wp-admin/includes/user.php

@@ -482,7 +482,7 @@ function wp_revoke_user( $id ) {
 /**
  * @since 2.8.0
  *
- * @global int $user_ID
+ * @global int $user_ID Current user ID.
  *
  * @param false $errors Deprecated.
  */
@@ -505,8 +505,8 @@ function default_password_nag_handler( $errors = false ) {
 /**
  * @since 2.8.0
  *
- * @param int     $user_ID
- * @param WP_User $old_data
+ * @param int     $user_ID  User ID.
+ * @param WP_User $old_data The user object before the update.
  */
 function default_password_nag_edit_user( $user_ID, $old_data ) {
 	// Short-circuit it.
@@ -602,7 +602,7 @@ function use_ssl_preference( $user ) {
 /**
  * @since MU (3.0.0)
  *
- * @param string $text
+ * @param string $text The email body text.
  * @return string User site invitation email message.
  */
 function admin_created_user_email( $text ) {

src/wp-content/themes/twentytwentyfive/patterns/hidden-written-by.php

@@ -10,8 +10,8 @@
  */
 
 ?>
-<!-- wp:group {"style":{"spacing":{"blockGap":"0.2em","margin":{"bottom":"var:preset|spacing|60"}}},"textColor":"accent-4","fontSize":"small","layout":{"type":"flex","flexWrap":"wrap"}} -->
-<div class="wp-block-group has-accent-4-color has-text-color has-link-color has-small-font-size" style="margin-bottom:var(--wp--preset--spacing--60)">
+<!-- wp:group {"style":{"spacing":{"blockGap":"0.2em","margin":{"bottom":"var:preset|spacing|60"}}},"fontSize":"small","layout":{"type":"flex","flexWrap":"wrap"}} -->
+<div class="wp-block-group has-small-font-size" style="margin-bottom:var(--wp--preset--spacing--60)">
 	<!-- wp:paragraph -->
 	<p><?php esc_html_e( 'Written by ', 'twentytwentyfive' ); ?></p>
 	<!-- /wp:paragraph -->

src/wp-includes/pluggable.php

@@ -446,7 +446,7 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
 		$from_name = apply_filters( 'wp_mail_from_name', $from_name );
 
 		try {
-			$phpmailer->setFrom( $from_email, $from_name );
+			$phpmailer->setFrom( $from_email, $from_name, false );
 		} catch ( PHPMailer\PHPMailer\Exception $e ) {
 			$mail_error_data                             = compact( 'to', 'subject', 'message', 'headers', 'attachments' );
 			$mail_error_data['phpmailer_exception_code'] = $e->getCode();

tests/phpunit/tests/pluggable/wpMail.php

@@ -411,18 +411,21 @@ public function test_wp_mail_addresses_arent_encoded() {
 	}
 
 	/**
-	 * Test that the Sender field in the SMTP envelope is set by Core.
+	 * Test that the Sender field in the SMTP envelope is not set by Core.
 	 *
-	 * A missing Sender field can lead to messages failing DMARC SPF checks.
+	 * Correctly setting the Sender requires knowledge that is not available
+	 * to Core. An incorrect value will often lead to messages being rejected
+	 * by the receiving MTA, so it's the admin's responsibility to
+	 * set it correctly.
 	 *
-	 * @ticket 49687
+	 * @ticket 37736
 	 */
-	public function test_wp_mail_sender_set() {
-		wp_mail( 'user@example.org', 'Testing the Sender field', 'The Sender field should have been set.' );
+	public function test_wp_mail_sender_not_set() {
+		wp_mail( 'user@example.org', 'Testing the Sender field', 'The Sender field should not have been set.' );
 
 		$mailer = tests_retrieve_phpmailer_instance();
 
-		$this->assertSame( 'wordpress@example.org', $mailer->Sender );
+		$this->assertSame( '', $mailer->Sender );
 	}
 
 	/**

tools/webpack/codemirror-banner.js

@@ -1,8 +1,11 @@
 /* jshint node:true */
 /* jshint esversion: 6 */
-const pkg = require( '../../package.json' );
+const codemirrorVersion = require( 'codemirror/package.json' ).version;
+if ( typeof codemirrorVersion !== 'string' ) {
+	throw new Error( 'Could not read CodeMirror version from package.json' );
+}
 
-module.exports = `/*! This file is auto-generated from CodeMirror - v${ pkg.dependencies.codemirror }
+module.exports = `/*! This file is auto-generated from CodeMirror - v${ codemirrorVersion }
 
 CodeMirror, copyright (c) by Marijn Haverbeke and others
 Distributed under an MIT license: http://codemirror.net/LICENSE