From 396647666faebb109d9cd4aada7bb0c7d0fb8aca Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 18 Dec 2019 00:19:02 +0000 Subject: [PATCH] Docs: Various documentation fixes for unit test factories. See #48303. Built from https://develop.svn.wordpress.org/trunk@46985 git-svn-id: http://core.svn.wordpress.org/trunk@46785 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/post.php | 2 +- wp-includes/taxonomy.php | 2 +- wp-includes/version.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-includes/post.php b/wp-includes/post.php index 1fd84bc2c5..2be10a1db6 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -4150,7 +4150,7 @@ function wp_insert_post( $postarr, $wp_error = false ) { * @param array|object $postarr Optional. Post data. Arrays are expected to be escaped, * objects are not. Default array. * @param bool $wp_error Optional. Allow return of WP_Error on failure. Default false. - * @return int|WP_Error The value 0 or WP_Error on failure. The post ID on success. + * @return int|WP_Error The post ID on success. The value 0 or WP_Error on failure. */ function wp_update_post( $postarr = array(), $wp_error = false ) { if ( is_object( $postarr ) ) { diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index a25206759b..a6adef3035 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -809,7 +809,7 @@ function get_tax_sql( $tax_query, $primary_table, $primary_id_column ) { * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which correspond to * a WP_Term object, an associative array, or a numeric array, respectively. Default OBJECT. * @param string $filter Optional, default is raw or no WordPress defined filter will applied. - * @return array|WP_Term|WP_Error|null Object of the type specified by `$output` on success. When `$output` is 'OBJECT', + * @return WP_Term|array|WP_Error|null Object of the type specified by `$output` on success. When `$output` is 'OBJECT', * a WP_Term instance is returned. If taxonomy does not exist, a WP_Error is * returned. Returns null for miscellaneous failure. */ diff --git a/wp-includes/version.php b/wp-includes/version.php index 72efd0b428..54a47642d2 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.4-alpha-46981'; +$wp_version = '5.4-alpha-46985'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.