Merge branch 'trunk' into trac-64238-script-modules

Author: westonruter

src/wp-admin/includes/class-wp-debug-data.php

@@ -1592,6 +1592,11 @@ private static function get_wp_constants(): array {
 				'value' => $db_collate,
 				'debug' => $db_collate_debug,
 			),
+			'EMPTY_TRASH_DAYS'    => array(
+				'label' => 'EMPTY_TRASH_DAYS',
+				'value' => EMPTY_TRASH_DAYS ? EMPTY_TRASH_DAYS : __( 'Empty value' ),
+				'debug' => EMPTY_TRASH_DAYS,
+			),
 		);
 
 		return array(

src/wp-admin/includes/post.php

@@ -764,7 +764,7 @@ function get_default_post_to_edit( $post_type = 'post', $create_in_db = false )
 	if ( $create_in_db ) {
 		$post_id = wp_insert_post(
 			array(
-				'post_title'  => __( 'Auto Draft' ),
+				'post_title'  => post_type_supports( $post_type, 'title' ) ? __( 'Auto Draft' ) : '',
 				'post_type'   => $post_type,
 				'post_status' => 'auto-draft',
 			),

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

@@ -56,11 +56,12 @@ class WP_Dependencies {
 	/**
 	 * An array of additional arguments passed when a handle is registered.
 	 *
-	 * Arguments are appended to the item query string.
+	 * The keys are dependency handles and the values are query strings which are appended to the item URL's query
+	 * string, after the `ver` if provided.
 	 *
 	 * @since 2.6.0
 	 *
-	 * @var array
+	 * @var array<string, string>
 	 */
 	public $args = array();
 
@@ -100,7 +101,7 @@ class WP_Dependencies {
 	 *
 	 * @since 5.9.0
 	 *
-	 * @var array
+	 * @var array<string, string|null>
 	 */
 	private $queued_before_register = array();
 

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

@@ -66,7 +66,7 @@ class _WP_Dependency {
 	 * Extra data to supply to the handle.
 	 *
 	 * @since 2.6.0
-	 * @var array
+	 * @var array<string, mixed>
 	 */
 	public $extra = array();
 
@@ -82,7 +82,7 @@ class _WP_Dependency {
 	 * Translation path set for this dependency.
 	 *
 	 * @since 5.0.0
-	 * @var string
+	 * @var string|null
 	 */
 	public $translations_path;
 

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

@@ -46,7 +46,7 @@ class WP_Scripts extends WP_Dependencies {
 	 * Holds handles of scripts which are enqueued in footer.
 	 *
 	 * @since 2.8.0
-	 * @var array
+	 * @var string[]
 	 */
 	public $in_footer = array();
 
@@ -118,7 +118,7 @@ class WP_Scripts extends WP_Dependencies {
 	 * List of default directories.
 	 *
 	 * @since 2.8.0
-	 * @var array
+	 * @var string[]|null
 	 */
 	public $default_dirs;
 
@@ -374,7 +374,8 @@ public function do_item( $handle, $group = false ) {
 			$filtered_src = apply_filters( 'script_loader_src', $src, $handle );
 
 			if (
-				$this->in_default_dir( $filtered_src )
+				is_string( $filtered_src )
+				&& $this->in_default_dir( $filtered_src )
 				&& ( $before_script || $after_script || $translations_stop_concat || $this->is_delayed_strategy( $strategy ) )
 			) {
 				$this->do_concat = false;
@@ -589,9 +590,9 @@ public function get_inline_script_tag( $handle, $position = 'after' ) {
 	 *
 	 * @since 2.1.0
 	 *
-	 * @param string $handle      Name of the script to attach data to.
-	 * @param string $object_name Name of the variable that will contain the data.
-	 * @param array  $l10n        Array of data to localize.
+	 * @param string               $handle      Name of the script to attach data to.
+	 * @param string               $object_name Name of the variable that will contain the data.
+	 * @param array<string, mixed> $l10n        Array of data to localize.
 	 * @return bool True on success, false on failure.
 	 */
 	public function localize( $handle, $object_name, $l10n ) {

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

@@ -96,7 +96,7 @@ class WP_Styles extends WP_Dependencies {
 	 * List of default directories.
 	 *
 	 * @since 2.8.0
-	 * @var array
+	 * @var string[]|null
 	 */
 	public $default_dirs;
 
@@ -183,7 +183,7 @@ public function do_item( $handle, $group = false ) {
 		}
 
 		if ( $this->do_concat ) {
-			if ( $this->in_default_dir( $src ) && ! isset( $obj->extra['alt'] ) ) {
+			if ( is_string( $src ) && $this->in_default_dir( $src ) && ! isset( $obj->extra['alt'] ) ) {
 				$this->concat         .= "$handle,";
 				$this->concat_version .= "$handle$ver";
 

tests/phpunit/tests/admin/includesPost.php

@@ -548,6 +548,38 @@ public function test_get_default_post_to_edit_with_wp_insert_post_error() {
 		get_default_post_to_edit( 'post', true );
 	}
 
+	/**
+	 * Tests that default post title is present when a CPT has title support, and is empty otherwise.
+	 *
+	 * @ticket 45516
+	 *
+	 * @covers ::get_default_post_to_edit
+	 */
+	public function test_get_default_post_to_edit_with_and_without_title_support() {
+		register_post_type(
+			'yes_title',
+			array(
+				'supports' => array( 'title', 'editor' ),
+			)
+		);
+		register_post_type(
+			'no_title',
+			array(
+				'supports' => array( 'editor' ),
+			)
+		);
+
+		/*
+		 * The ID is obtained because get_default_post_to_edit() will force the post_title
+		 * to be overridden on the returned WP_Post object.
+		 */
+		$default_yes_title_post_id = get_default_post_to_edit( 'yes_title', true )->ID;
+		$default_no_title_post_id  = get_default_post_to_edit( 'no_title', true )->ID;
+
+		$this->assertSame( __( 'Auto Draft' ), get_post( $default_yes_title_post_id )->post_title, 'Expected post_title to be the default title.' );
+		$this->assertSame( '', get_post( $default_no_title_post_id )->post_title, 'Expected post_title to be an empty string.' );
+	}
+
 	/**
 	 * @ticket 38293
 	 */