From 6b7ba33d6851fea58bc3214c2b9e4316aa918fa5 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Sat, 10 Oct 2020 19:14:04 +0000 Subject: [PATCH] Docs: Fix the types for some properties and parameters that use the generic `object` type. See #50768 Built from https://develop.svn.wordpress.org/trunk@49119 git-svn-id: http://core.svn.wordpress.org/trunk@48881 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-plugin-upgrader-skin.php | 2 +- wp-admin/includes/class-theme-upgrader-skin.php | 2 +- wp-admin/includes/class-wp-list-table.php | 4 ++-- wp-admin/includes/class-wp-upgrader-skin.php | 2 +- wp-includes/class-wp-query.php | 4 ++-- wp-includes/version.php | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wp-admin/includes/class-plugin-upgrader-skin.php b/wp-admin/includes/class-plugin-upgrader-skin.php index 6b911bfea2..6f7ef96b10 100644 --- a/wp-admin/includes/class-plugin-upgrader-skin.php +++ b/wp-admin/includes/class-plugin-upgrader-skin.php @@ -22,7 +22,7 @@ class Plugin_Upgrader_Skin extends WP_Upgrader_Skin { * * @since 2.8.0 * - * @var object + * @var string */ public $plugin = ''; diff --git a/wp-admin/includes/class-theme-upgrader-skin.php b/wp-admin/includes/class-theme-upgrader-skin.php index 7ca0b70db9..d7a6384250 100644 --- a/wp-admin/includes/class-theme-upgrader-skin.php +++ b/wp-admin/includes/class-theme-upgrader-skin.php @@ -22,7 +22,7 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin { * * @since 2.8.0 * - * @var object + * @var string */ public $theme = ''; diff --git a/wp-admin/includes/class-wp-list-table.php b/wp-admin/includes/class-wp-list-table.php index 7f72767693..0b20f6be0c 100644 --- a/wp-admin/includes/class-wp-list-table.php +++ b/wp-admin/includes/class-wp-list-table.php @@ -43,7 +43,7 @@ class WP_List_Table { * The current screen. * * @since 3.1.0 - * @var object + * @var WP_Screen */ protected $screen; @@ -1092,7 +1092,7 @@ class WP_List_Table { * Filters the list table sortable columns for a specific screen. * * The dynamic portion of the hook name, `$this->screen->id`, refers - * to the ID of the current screen, usually a string. + * to the ID of the current screen. * * @since 3.1.0 * diff --git a/wp-admin/includes/class-wp-upgrader-skin.php b/wp-admin/includes/class-wp-upgrader-skin.php index 6151004eab..06f10cdca3 100644 --- a/wp-admin/includes/class-wp-upgrader-skin.php +++ b/wp-admin/includes/class-wp-upgrader-skin.php @@ -20,7 +20,7 @@ class WP_Upgrader_Skin { * * @since 2.8.0 * - * @var object + * @var WP_Upgrader */ public $upgrader; diff --git a/wp-includes/class-wp-query.php b/wp-includes/class-wp-query.php index 9048ca53b6..34d0a5de96 100644 --- a/wp-includes/class-wp-query.php +++ b/wp-includes/class-wp-query.php @@ -63,7 +63,7 @@ class WP_Query { * Holds the contents of a post, page, category, attachment. * * @since 1.5.0 - * @var object|array + * @var WP_Term|WP_Post_Type|WP_Post|WP_User|null */ public $queried_object; @@ -3457,7 +3457,7 @@ class WP_Query { * * @since 1.5.0 * - * @return object + * @return WP_Term|WP_Post_Type|WP_Post|WP_User|null The queried object. */ public function get_queried_object() { if ( isset( $this->queried_object ) ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index eca60c1a5a..a14771fbc8 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.6-alpha-49118'; +$wp_version = '5.6-alpha-49119'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.