From 5eb3f0ffcb0959960eeacec86e2ee5ed718e9ef1 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Tue, 14 Jul 2020 12:10:05 +0000 Subject: [PATCH] Docs: Improve docs for arguments that accept a numerically indexed array of associative arrays. See #49572 Built from https://develop.svn.wordpress.org/trunk@48475 git-svn-id: http://core.svn.wordpress.org/trunk@48244 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/ajax-actions.php | 4 ++-- wp-admin/includes/class-wp-site-health.php | 6 +++--- wp-includes/class-wp-date-query.php | 4 ++-- wp-includes/class-wp-editor.php | 4 ++-- wp-includes/class-wp-meta-query.php | 2 +- wp-includes/class-wp-tax-query.php | 4 ++-- wp-includes/version.php | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php index 54fb2782dc..ee2d186481 100644 --- a/wp-admin/includes/ajax-actions.php +++ b/wp-admin/includes/ajax-actions.php @@ -4775,7 +4775,7 @@ function wp_ajax_wp_privacy_export_personal_data() { * @param array $args { * An array of callable exporters of personal data. Default empty array. * - * @type array { + * @type array ...$0 { * Array of personal data exporters. * * @type callable $callback Callable exporter function that accepts an @@ -4965,7 +4965,7 @@ function wp_ajax_wp_privacy_erase_personal_data() { * @param array $args { * An array of callable erasers of personal data. Default empty array. * - * @type array { + * @type array ...$0 { * Array of personal data exporters. * * @type callable $callback Callable eraser that accepts an email address and diff --git a/wp-admin/includes/class-wp-site-health.php b/wp-admin/includes/class-wp-site-health.php index a86e422fe7..bb8237a44e 100644 --- a/wp-admin/includes/class-wp-site-health.php +++ b/wp-admin/includes/class-wp-site-health.php @@ -157,10 +157,10 @@ class WP_Site_Health { * @since 5.3.0 * * @param array $test_result { - * An associated array of test result data. + * An associative array of test result data. * - * @param string $label A label describing the test, and is used as a header in the output. - * @param string $status The status of the test, which can be a value of `good`, `recommended` or `critical`. + * @param string $label A label describing the test, and is used as a header in the output. + * @param string $status The status of the test, which can be a value of `good`, `recommended` or `critical`. * @param array $badge { * Tests are put into categories which have an associated badge shown, these can be modified and assigned here. * diff --git a/wp-includes/class-wp-date-query.php b/wp-includes/class-wp-date-query.php index 1e6c048230..59901de6c2 100644 --- a/wp-includes/class-wp-date-query.php +++ b/wp-includes/class-wp-date-query.php @@ -72,7 +72,7 @@ class WP_Date_Query { * @param array $date_query { * Array of date query clauses. * - * @type array { + * @type array ...$0 { * @type string $column Optional. The column to query against. If undefined, inherits the value of * the `$default_column` parameter. Accepts 'post_date', 'post_date_gmt', * 'post_modified','post_modified_gmt', 'comment_date', 'comment_date_gmt'. @@ -81,7 +81,7 @@ class WP_Date_Query { * 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN'. Default '='. * @type string $relation Optional. The boolean relationship between the date queries. Accepts 'OR' or 'AND'. * Default 'OR'. - * @type array { + * @type array ...$0 { * Optional. An array of first-order clause parameters, or another fully-formed date query. * * @type string|array $before { diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php index 382636717f..1fe4dc752b 100644 --- a/wp-includes/class-wp-editor.php +++ b/wp-includes/class-wp-editor.php @@ -1794,9 +1794,9 @@ final class _WP_Editors { * @see 'wp_link_query_args' filter * * @param array $results { - * An associative array of query results. + * An array of associative arrays of query results. * - * @type array { + * @type array ...$0 { * @type int $ID Post ID. * @type string $title The trimmed, escaped post title. * @type string $permalink Post permalink. diff --git a/wp-includes/class-wp-meta-query.php b/wp-includes/class-wp-meta-query.php index f9845e4a09..1e9b4900ba 100644 --- a/wp-includes/class-wp-meta-query.php +++ b/wp-includes/class-wp-meta-query.php @@ -109,7 +109,7 @@ class WP_Meta_Query { * * @type string $relation Optional. The MySQL keyword used to join * the clauses of the query. Accepts 'AND', or 'OR'. Default 'AND'. - * @type array { + * @type array ...$0 { * Optional. An array of first-order clause parameters, or another fully-formed meta query. * * @type string $key Meta key to filter by. diff --git a/wp-includes/class-wp-tax-query.php b/wp-includes/class-wp-tax-query.php index d322b458db..1432245cc0 100644 --- a/wp-includes/class-wp-tax-query.php +++ b/wp-includes/class-wp-tax-query.php @@ -96,8 +96,8 @@ class WP_Tax_Query { * * @type string $relation Optional. The MySQL keyword used to join * the clauses of the query. Accepts 'AND', or 'OR'. Default 'AND'. - * @type array { - * Optional. An array of first-order clause parameters, or another fully-formed tax query. + * @type array ...$0 { + * An array of first-order clause parameters, or another fully-formed tax query. * * @type string $taxonomy Taxonomy being queried. Optional when field=term_taxonomy_id. * @type string|int|array $terms Term or terms to filter by. diff --git a/wp-includes/version.php b/wp-includes/version.php index dc6f8e263c..f163a53edc 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-beta1-48474'; +$wp_version = '5.5-beta1-48475'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.