From b16368c2687b9f78a1cb6a7e22ff20e9b37ab760 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sat, 20 Jun 2020 12:40:12 +0000 Subject: [PATCH] Docs: Remove `@staticvar` tags from core. The tag was supported in phpDocumentor 1.x, but is no longer supported in 2.x and 3.x. Usage of static variables is considered an internal implementation detail and has no information value for someone reading the docs. Props alishanvr, jrf. Fixes #50426. Built from https://develop.svn.wordpress.org/trunk@48109 git-svn-id: http://core.svn.wordpress.org/trunk@47878 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../includes/class-wp-filesystem-ftpext.php | 1 - wp-admin/includes/class-wp-list-table.php | 2 -- .../class-wp-ms-themes-list-table.php | 1 - wp-admin/includes/deprecated.php | 2 -- wp-admin/includes/media.php | 2 -- wp-admin/includes/screen.php | 2 -- wp-admin/includes/template.php | 4 --- wp-admin/includes/theme.php | 2 -- wp-admin/includes/widgets.php | 2 -- wp-admin/update-core.php | 2 -- .../themes/twentyseventeen/functions.php | 2 -- .../themes/twentytwenty/inc/template-tags.php | 2 -- wp-includes/admin-bar.php | 2 -- wp-includes/class-http.php | 5 --- wp-includes/class-wp-customize-widgets.php | 3 -- wp-includes/class-wp-http-proxy.php | 3 -- wp-includes/class-wp-rewrite.php | 2 -- wp-includes/class-wp-theme.php | 15 --------- wp-includes/comment.php | 4 --- wp-includes/compat.php | 2 -- wp-includes/embed.php | 2 -- wp-includes/formatting.php | 33 ------------------- wp-includes/functions.php | 25 -------------- wp-includes/http.php | 3 -- wp-includes/l10n.php | 3 -- wp-includes/load.php | 6 ---- wp-includes/media.php | 6 ---- wp-includes/ms-default-constants.php | 3 -- wp-includes/ms-functions.php | 3 -- wp-includes/nav-menu-template.php | 3 -- wp-includes/nav-menu.php | 2 -- wp-includes/pluggable.php | 5 --- wp-includes/plugin.php | 3 -- wp-includes/pomo/po.php | 7 ++-- wp-includes/revision.php | 2 -- wp-includes/taxonomy.php | 4 --- wp-includes/theme.php | 3 -- wp-includes/version.php | 2 +- .../widgets/class-wp-widget-categories.php | 2 -- .../class-wp-widget-recent-comments.php | 2 -- 40 files changed, 3 insertions(+), 176 deletions(-) diff --git a/wp-admin/includes/class-wp-filesystem-ftpext.php b/wp-admin/includes/class-wp-filesystem-ftpext.php index d165b2bc3e..cddbd631a2 100644 --- a/wp-admin/includes/class-wp-filesystem-ftpext.php +++ b/wp-admin/includes/class-wp-filesystem-ftpext.php @@ -581,7 +581,6 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base { } /** - * @staticvar bool $is_windows * @param string $line * @return array */ diff --git a/wp-admin/includes/class-wp-list-table.php b/wp-admin/includes/class-wp-list-table.php index defe8a84ae..fb65d66c94 100644 --- a/wp-admin/includes/class-wp-list-table.php +++ b/wp-admin/includes/class-wp-list-table.php @@ -1109,8 +1109,6 @@ class WP_List_Table { * * @since 3.1.0 * - * @staticvar int $cb_counter - * * @param bool $with_id Whether to set the ID attribute or not */ public function print_column_headers( $with_id = true ) { diff --git a/wp-admin/includes/class-wp-ms-themes-list-table.php b/wp-admin/includes/class-wp-ms-themes-list-table.php index 4c56a16804..2a7dab15a7 100644 --- a/wp-admin/includes/class-wp-ms-themes-list-table.php +++ b/wp-admin/includes/class-wp-ms-themes-list-table.php @@ -217,7 +217,6 @@ class WP_MS_Themes_List_Table extends WP_List_Table { } /** - * @staticvar string $term * @param WP_Theme $theme * @return bool */ diff --git a/wp-admin/includes/deprecated.php b/wp-admin/includes/deprecated.php index bb122e4f92..a9abf670a5 100644 --- a/wp-admin/includes/deprecated.php +++ b/wp-admin/includes/deprecated.php @@ -754,8 +754,6 @@ function wp_dashboard_quick_press_output() { * @since 2.7.0 * @deprecated 3.3.0 Use wp_editor() * @see wp_editor() - * - * @staticvar int $num */ function wp_tiny_mce( $teeny = false, $settings = false ) { _deprecated_function( __FUNCTION__, '3.3.0', 'wp_editor()' ); diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index 57dbbdb8c3..422d015b5e 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -616,8 +616,6 @@ function wp_iframe( $content_func, ...$args ) { * * @global int $post_ID * - * @staticvar int $instance - * * @param string $editor_id */ function media_buttons( $editor_id = 'content' ) { diff --git a/wp-admin/includes/screen.php b/wp-admin/includes/screen.php index 345bc8b4f2..f675302c75 100644 --- a/wp-admin/includes/screen.php +++ b/wp-admin/includes/screen.php @@ -11,8 +11,6 @@ * * @since 2.7.0 * - * @staticvar array $column_headers - * * @param string|WP_Screen $screen The screen you want the headers for * @return string[] The column header labels keyed by column ID. */ diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 5641f061a2..74352dfad5 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -603,8 +603,6 @@ function list_meta( $meta ) { * * @since 2.5.0 * - * @staticvar string $update_nonce - * * @param array $entry * @param int $count * @return string @@ -1236,8 +1234,6 @@ function _get_plugin_from_callback( $callback ) { * * @global array $wp_meta_boxes * - * @staticvar bool $already_sorted - * * @param string|WP_Screen $screen The screen identifier. If you have used add_menu_page() or * add_submenu_page() to create a new screen (and hence screen_id) * make sure your menu slug conforms to the limits of sanitize_key() diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php index b6e44ad9ae..1839c939cb 100644 --- a/wp-admin/includes/theme.php +++ b/wp-admin/includes/theme.php @@ -162,8 +162,6 @@ function theme_update_available( $theme ) { * * @since 3.8.0 * - * @staticvar object $themes_update - * * @param WP_Theme $theme WP_Theme object. * @return string|false HTML for the update link, or false if invalid info was passed. */ diff --git a/wp-admin/includes/widgets.php b/wp-admin/includes/widgets.php index d3bdf2032c..a74896cc54 100644 --- a/wp-admin/includes/widgets.php +++ b/wp-admin/includes/widgets.php @@ -126,8 +126,6 @@ function wp_list_widget_controls( $sidebar, $sidebar_name = '' ) { * * @global array $wp_registered_widgets * - * @staticvar int $i - * * @param array $params * @return array */ diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index 1af08bb9b2..0c4391ea01 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -31,8 +31,6 @@ if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_themes' * @global string $wp_local_package Locale code of the package. * @global wpdb $wpdb WordPress database abstraction object. * - * @staticvar bool $first_pass - * * @param object $update */ function list_core_update( $update ) { diff --git a/wp-content/themes/twentyseventeen/functions.php b/wp-content/themes/twentyseventeen/functions.php index ee03607d2a..e3c6ef91c2 100644 --- a/wp-content/themes/twentyseventeen/functions.php +++ b/wp-content/themes/twentyseventeen/functions.php @@ -628,8 +628,6 @@ add_filter( 'widget_tag_cloud_args', 'twentyseventeen_widget_tag_cloud_args' ); * * @see wp_unique_id() Themes requiring WordPress 5.0.3 and greater should use this instead. * - * @staticvar int $id_counter - * * @param string $prefix Prefix for the returned ID. * @return string Unique ID. */ diff --git a/wp-content/themes/twentytwenty/inc/template-tags.php b/wp-content/themes/twentytwenty/inc/template-tags.php index a543a36895..ba4e9151de 100644 --- a/wp-content/themes/twentytwenty/inc/template-tags.php +++ b/wp-content/themes/twentytwenty/inc/template-tags.php @@ -781,8 +781,6 @@ function twentytwenty_toggle_duration() { * * @see wp_unique_id() Themes requiring WordPress 5.0.3 and greater should use this instead. * - * @staticvar int $id_counter - * * @param string $prefix Prefix for the returned ID. * @return string Unique ID. */ diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php index 6b5ad0e575..15cb441668 100644 --- a/wp-includes/admin-bar.php +++ b/wp-includes/admin-bar.php @@ -70,8 +70,6 @@ function _wp_admin_bar_init() { * @since 5.4.0 Called on 'wp_body_open' action first, with 'wp_footer' as a fallback. * * @global WP_Admin_Bar $wp_admin_bar - * - * @staticvar bool $rendered */ function wp_admin_bar_render() { global $wp_admin_bar; diff --git a/wp-includes/class-http.php b/wp-includes/class-http.php index 1a37ee9dad..772cb5581d 100644 --- a/wp-includes/class-http.php +++ b/wp-includes/class-http.php @@ -559,8 +559,6 @@ class WP_Http { * @deprecated 5.1.0 Use WP_Http::request() * @see WP_Http::request() * - * @staticvar array $transports - * * @param string $url URL to Request. * @param array $args Request arguments. * @return array|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'. @@ -850,9 +848,6 @@ class WP_Http { * @link https://core.trac.wordpress.org/ticket/8927 Allow preventing external requests. * @link https://core.trac.wordpress.org/ticket/14636 Allow wildcard domains in WP_ACCESSIBLE_HOSTS * - * @staticvar array|null $accessible_hosts - * @staticvar array $wildcard_regex - * * @param string $uri URI of url. * @return bool True to block, false to allow. */ diff --git a/wp-includes/class-wp-customize-widgets.php b/wp-includes/class-wp-customize-widgets.php index d982ff1776..3071b2f2b5 100644 --- a/wp-includes/class-wp-customize-widgets.php +++ b/wp-includes/class-wp-customize-widgets.php @@ -173,8 +173,6 @@ final class WP_Customize_Widgets { * * @since 4.2.0 * - * @staticvar array $cache - * * @param string $setting_id Setting ID. * @return string|void Setting type. */ @@ -936,7 +934,6 @@ final class WP_Customize_Widgets { * * @global array $wp_registered_widgets * @global array $wp_registered_widget_controls - * @staticvar array $available_widgets * * @see wp_list_widgets() * diff --git a/wp-includes/class-wp-http-proxy.php b/wp-includes/class-wp-http-proxy.php index f9b97c865e..a1b3418d77 100644 --- a/wp-includes/class-wp-http-proxy.php +++ b/wp-includes/class-wp-http-proxy.php @@ -160,9 +160,6 @@ class WP_HTTP_Proxy { * * @since 2.8.0 * - * @staticvar array|null $bypass_hosts - * @staticvar array $wildcard_regex - * * @param string $uri URI to check. * @return bool True, to send through the proxy and false if, the proxy should not be used. */ diff --git a/wp-includes/class-wp-rewrite.php b/wp-includes/class-wp-rewrite.php index e23c483893..cfd5c1ecee 100644 --- a/wp-includes/class-wp-rewrite.php +++ b/wp-includes/class-wp-rewrite.php @@ -1786,8 +1786,6 @@ class WP_Rewrite { * * @since 2.0.1 * - * @staticvar bool $do_hard_later - * * @param bool $hard Whether to update .htaccess (hard flush) or just update rewrite_rules option (soft flush). Default is true (hard). */ public function flush_rules( $hard = true ) { diff --git a/wp-includes/class-wp-theme.php b/wp-includes/class-wp-theme.php index 9ffef81219..ec796b5826 100644 --- a/wp-includes/class-wp-theme.php +++ b/wp-includes/class-wp-theme.php @@ -453,8 +453,6 @@ final class WP_Theme implements ArrayAccess { /** * __isset() magic method for properties formerly returned by current_theme_info() * - * @staticvar array $properties - * * @since 3.4.0 * * @param string $offset Property to check if set. @@ -547,8 +545,6 @@ final class WP_Theme implements ArrayAccess { /** * Method to implement ArrayAccess for keys formerly returned by get_themes() * - * @staticvar array $keys - * * @since 3.4.0 * * @param mixed $offset @@ -810,9 +806,6 @@ final class WP_Theme implements ArrayAccess { * @since 3.4.0 * @since 5.4.0 Added support for `Requires at least` and `Requires PHP` headers. * - * @staticvar array $header_tags - * @staticvar array $header_tags_with_a - * * @param string $header Theme header. Accepts 'Name', 'Description', 'Author', 'Version', * 'ThemeURI', 'AuthorURI', 'Status', 'Tags', 'RequiresWP', 'RequiresPHP'. * @param string $value Value to sanitize. @@ -876,8 +869,6 @@ final class WP_Theme implements ArrayAccess { * * @since 3.4.0 * - * @staticvar string $comma - * * @param string $header Theme header. Name, Description, Author, Version, ThemeURI, AuthorURI, Status, Tags. * @param string|array $value Value to mark up. An array for Tags header, string otherwise. * @param string $translate Whether the header has been translated. @@ -922,8 +913,6 @@ final class WP_Theme implements ArrayAccess { * * @since 3.4.0 * - * @staticvar array $tags_list - * * @param string $header Theme header. Name, Description, Author, Version, ThemeURI, AuthorURI, Status, Tags. * @param string|array $value Value to translate. An array for Tags header, string otherwise. * @return string|array Translated value. An array for Tags header, string otherwise. @@ -1473,8 +1462,6 @@ final class WP_Theme implements ArrayAccess { * * @since 3.4.0 * - * @staticvar array $allowed_themes - * * @return string[] Array of stylesheet names. */ public static function get_allowed_on_network() { @@ -1500,8 +1487,6 @@ final class WP_Theme implements ArrayAccess { * * @since 3.4.0 * - * @staticvar array $allowed_themes - * * @param int $blog_id Optional. ID of the site. Defaults to the current site. * @return string[] Array of stylesheet names. */ diff --git a/wp-includes/comment.php b/wp-includes/comment.php index 4a3799328e..ece93e68ee 100644 --- a/wp-includes/comment.php +++ b/wp-includes/comment.php @@ -2466,8 +2466,6 @@ function wp_update_comment( $commentarr ) { * * @since 2.5.0 * - * @staticvar bool $_defer - * * @param bool $defer * @return bool */ @@ -2500,8 +2498,6 @@ function wp_defer_comment_counting( $defer = null ) { * * @see wp_update_comment_count_now() For what could cause a false return value * - * @staticvar array $_deferred - * * @param int|null $post_id Post ID. * @param bool $do_deferred Optional. Whether to process previously deferred * post comment counts. Default false. diff --git a/wp-includes/compat.php b/wp-includes/compat.php index ddb372468a..e322dd26de 100644 --- a/wp-includes/compat.php +++ b/wp-includes/compat.php @@ -20,8 +20,6 @@ if ( ! function_exists( '_' ) ) { * @since 4.2.2 * @access private * - * @staticvar string $utf8_pcre - * * @param bool $set - Used for testing only * null : default - get PCRE/u capability * false : Used for testing - return false for future calls to this function diff --git a/wp-includes/embed.php b/wp-includes/embed.php index edad8c0f96..b2dbdacc7f 100644 --- a/wp-includes/embed.php +++ b/wp-includes/embed.php @@ -114,8 +114,6 @@ function wp_oembed_get( $url, $args = '' ) { * @since 2.9.0 * @access private * - * @staticvar WP_oEmbed $wp_oembed - * * @return WP_oEmbed object. */ function _wp_oembed_get_object() { diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index 0dec8388c9..14fcceaaef 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -29,23 +29,6 @@ * * @global array $wp_cockneyreplace Array of formatted entities for certain common phrases. * @global array $shortcode_tags - * @staticvar array $static_characters - * @staticvar array $static_replacements - * @staticvar array $dynamic_characters - * @staticvar array $dynamic_replacements - * @staticvar array $default_no_texturize_tags - * @staticvar array $default_no_texturize_shortcodes - * @staticvar bool $run_texturize - * @staticvar string $apos - * @staticvar string $prime - * @staticvar string $double_prime - * @staticvar string $opening_quote - * @staticvar string $closing_quote - * @staticvar string $opening_single_quote - * @staticvar string $closing_single_quote - * @staticvar string $open_q_flag - * @staticvar string $open_sq_flag - * @staticvar string $apos_flag * * @param string $text The text to be formatted. * @param bool $reset Set to true for unit testing. Translated patterns will reset. @@ -633,8 +616,6 @@ function wp_html_split( $input ) { * * @since 4.4.0 * - * @staticvar string $regex - * * @return string The regular expression */ function get_html_split_regex() { @@ -694,8 +675,6 @@ function get_html_split_regex() { * @internal This function will be removed in 4.5.0 per Shortcode API Roadmap. * @since 4.4.0 * - * @staticvar string $html_regex - * * @param string $shortcode_regex The result from _get_wptexturize_shortcode_regex(). Optional. * @return string The regular expression */ @@ -938,8 +917,6 @@ function seems_utf8( $str ) { * @since 5.5.0 `$quote_style` also accepts `ENT_XML1`. * @access private * - * @staticvar string $_charset - * * @param string $string The text which is to be encoded. * @param int|string $quote_style Optional. Converts double quotes if set to ENT_COMPAT, * both single and double if set to ENT_QUOTES or none if set to ENT_NOQUOTES. @@ -1112,9 +1089,6 @@ function wp_specialchars_decode( $string, $quote_style = ENT_NOQUOTES ) { * * @since 2.8.0 * - * @staticvar bool $is_utf8 - * @staticvar bool $utf8_pcre - * * @param string $string The text which is to be checked. * @param bool $strip Optional. Whether to attempt to strip out invalid UTF8. Default is false. * @return string The checked text. @@ -5445,8 +5419,6 @@ function wp_basename( $path, $suffix = '' ) { * * @since 3.0.0 * - * @staticvar string|false $dblq - * * @param string $text The text to be modified. * @return string The modified text. */ @@ -5619,8 +5591,6 @@ function get_url_in_content( $content ) { * * @since 4.0.0 * - * @staticvar string $spaces - * * @return string The spaces regexp. */ function wp_spaces_regexp() { @@ -5649,8 +5619,6 @@ function wp_spaces_regexp() { * Print the important emoji-related styles. * * @since 4.2.0 - * - * @staticvar bool $printed */ function print_emoji_styles() { static $printed = false; @@ -5684,7 +5652,6 @@ img.emoji { * Print the inline Emoji detection script if it is not already printed. * * @since 4.2.0 - * @staticvar bool $printed */ function print_emoji_detection_script() { static $printed = false; diff --git a/wp-includes/functions.php b/wp-includes/functions.php index e5c727d3ec..4440461c10 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -2125,8 +2125,6 @@ function wp_normalize_path( $path ) { * * @since 2.5.0 * - * @staticvar string $temp - * * @return string Writable temporary directory. */ function get_temp_dir() { @@ -2260,9 +2258,6 @@ function wp_get_upload_dir() { * @since 2.0.0 * @uses _wp_upload_dir() * - * @staticvar array $cache - * @staticvar array $tested_paths - * * @param string $time Optional. Time formatted in 'yyyy/mm'. Default null. * @param bool $create_dir Optional. Whether to check and create the uploads directory. * Default true for backward compatibility. @@ -3985,8 +3980,6 @@ function _wp_json_sanity_check( $data, $depth ) { * * @see _wp_json_sanity_check() * - * @staticvar bool $use_mb - * * @param string $string The string which is to be converted. * @return string The checked string. */ @@ -5349,8 +5342,6 @@ function validate_file( $file, $allowed_files = array() ) { * * @since 2.6.0 * - * @staticvar bool $forced - * * @param string|bool $force Optional. Whether to force SSL in admin screens. Default null. * @return bool True if forced, false if not forced. */ @@ -5427,8 +5418,6 @@ function wp_guess_url() { * * @since 3.3.0 * - * @staticvar bool $_suspend - * * @param bool $suspend Optional. Suspends additions if true, re-enables them if false. * @return bool The current suspend setting */ @@ -5578,8 +5567,6 @@ function get_main_network_id() { * * @since 3.0.0 * - * @staticvar bool $global_terms - * * @return bool True if multisite and global terms enabled. */ function global_terms_enabled() { @@ -5719,9 +5706,6 @@ function _wp_timezone_choice_usort_callback( $a, $b ) { * @since 2.9.0 * @since 4.7.0 Added the `$locale` parameter. * - * @staticvar bool $mo_loaded - * @staticvar string $locale_loaded - * * @param string $selected_zone Selected timezone. * @param string $locale Optional. Locale to load the timezones in. Default current site locale. * @return string @@ -6258,8 +6242,6 @@ function send_frame_options_header() { * @see wp_kses() * @see esc_url() * - * @staticvar array $protocols - * * @return string[] Array of allowed protocols. Defaults to an array containing 'http', 'https', * 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet', * 'mms', 'rtsp', 'sms', 'svn', 'tel', 'fax', 'xmpp', 'webcal', and 'urn'. @@ -6295,8 +6277,6 @@ function wp_allowed_protocols() { * * @see https://core.trac.wordpress.org/ticket/19589 * - * @staticvar array $truncate_paths Array of paths to truncate. - * * @param string $ignore_class Optional. A class to ignore all function calls within - useful * when you want to just give info about the callee. Default null. * @param int $skip_frames Optional. A number of stack frames to skip - useful for unwinding @@ -6623,9 +6603,6 @@ function _canonical_charset( $charset ) { * * @see reset_mbstring_encoding() * - * @staticvar array $encodings - * @staticvar bool $overloaded - * * @param bool $reset Optional. Whether to reset the encoding back to a previously-set encoding. * Default false. */ @@ -6963,8 +6940,6 @@ function wp_is_uuid( $uuid, $version = null ) { * * @since 5.0.3 * - * @staticvar int $id_counter - * * @param string $prefix Prefix for the returned ID. * @return string Unique ID. */ diff --git a/wp-includes/http.php b/wp-includes/http.php index fc34c170f4..7d71f39cd5 100644 --- a/wp-includes/http.php +++ b/wp-includes/http.php @@ -15,8 +15,6 @@ * @since 2.7.0 * @access private * - * @staticvar WP_Http $http - * * @return WP_Http HTTP Transport object. */ function _wp_http_get_object() { @@ -620,7 +618,6 @@ function allowed_http_request_hosts( $is_external, $host ) { * @since 3.6.0 * * @global wpdb $wpdb WordPress database abstraction object. - * @staticvar array $queried * * @param bool $is_external * @param string $host diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php index d7e6acd55b..3ffa709643 100644 --- a/wp-includes/l10n.php +++ b/wp-includes/l10n.php @@ -1151,7 +1151,6 @@ function _load_textdomain_just_in_time( $domain ) { * @access private * * @see _load_textdomain_just_in_time() - * @staticvar array $available_translations * * @param string $domain Text domain. Unique identifier for retrieving translated strings. * @param bool $reset Whether to reset the internal cache. Used by the switch to locale functionality. @@ -1180,7 +1179,6 @@ function _get_path_to_translation( $domain, $reset = false ) { * @access private * * @see _get_path_to_translation() - * @staticvar array $cached_mofiles * * @param string $domain Text domain. Unique identifier for retrieving translated strings. * @return string|false The path to the translation file or false if no translation file was found. @@ -1228,7 +1226,6 @@ function _get_path_to_translation_from_lang_dir( $domain ) { * @since 2.8.0 * * @global MO[] $l10n - * @staticvar NOOP_Translations $noop_translations * * @param string $domain Text domain. Unique identifier for retrieving translated strings. * @return Translations|NOOP_Translations A Translations instance. diff --git a/wp-includes/load.php b/wp-includes/load.php index 1fa88e1c8b..fcddd575d4 100644 --- a/wp-includes/load.php +++ b/wp-includes/load.php @@ -1206,8 +1206,6 @@ function get_current_network_id() { * @access private * * @global WP_Locale $wp_locale WordPress date and time locale object. - * - * @staticvar bool $loaded */ function wp_load_translations_early() { global $wp_locale; @@ -1300,8 +1298,6 @@ function wp_load_translations_early() { * * @since 4.4.0 * - * @staticvar bool $installing - * * @param bool $is_installing Optional. True to set WP into Installing mode, false to turn Installing mode off. * Omit this parameter if you only want to fetch the current status. * @return bool True if WP is installing, otherwise false. When a `$is_installing` is passed, the function will @@ -1380,8 +1376,6 @@ function wp_convert_hr_to_bytes( $value ) { * * @since 4.6.0 * - * @staticvar array $ini_all - * * @link https://www.php.net/manual/en/function.ini-get-all.php * * @param string $setting The name of the ini setting to check. diff --git a/wp-includes/media.php b/wp-includes/media.php index c477daccb1..4fc4fe79f3 100644 --- a/wp-includes/media.php +++ b/wp-includes/media.php @@ -1982,8 +1982,6 @@ add_shortcode( 'gallery', 'gallery_shortcode' ); * * @since 2.5.0 * - * @staticvar int $instance - * * @param array $attr { * Attributes of the gallery shortcode. * @@ -2312,7 +2310,6 @@ function wp_playlist_scripts( $type ) { * @since 3.9.0 * * @global int $content_width - * @staticvar int $instance * * @param array $attr { * Array of default playlist attributes. @@ -2646,8 +2643,6 @@ function wp_get_attachment_id3_keys( $attachment, $context = 'display' ) { * * @since 3.6.0 * - * @staticvar int $instance - * * @param array $attr { * Attributes of the audio shortcode. * @@ -2860,7 +2855,6 @@ function wp_get_video_extensions() { * @since 3.6.0 * * @global int $content_width - * @staticvar int $instance * * @param array $attr { * Attributes of the shortcode. diff --git a/wp-includes/ms-default-constants.php b/wp-includes/ms-default-constants.php index 3164cf6e89..7d794e32e6 100644 --- a/wp-includes/ms-default-constants.php +++ b/wp-includes/ms-default-constants.php @@ -124,9 +124,6 @@ function ms_file_constants() { * we will have translations loaded and can trigger warnings easily. * * @since 3.0.0 - * - * @staticvar bool $subdomain_error - * @staticvar bool $subdomain_error_warn */ function ms_subdomain_constants() { static $subdomain_error = null; diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index 78c3870279..dac77987a7 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -1929,7 +1929,6 @@ function wpmu_log_new_registrations( $blog_id, $user_id ) { * @see term_id_filter * * @global wpdb $wpdb WordPress database abstraction object. - * @staticvar int $global_terms_recurse * * @param int $term_id An ID for a term on the current blog. * @param string $deprecated Not used. @@ -2318,8 +2317,6 @@ Thanks! * * @since 2.8.5 * - * @staticvar bool $forced_content - * * @param bool $force * @return bool True if forced, false if not forced. */ diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php index 9ca093707f..ffe9777cb2 100644 --- a/wp-includes/nav-menu-template.php +++ b/wp-includes/nav-menu-template.php @@ -16,8 +16,6 @@ require_once ABSPATH . WPINC . '/class-walker-nav-menu.php'; * @since 3.0.0 * @since 4.7.0 Added the `item_spacing` argument. * - * @staticvar array $menu_id_slugs - * * @param array $args { * Optional. Array of nav menu arguments. * @@ -605,7 +603,6 @@ function walk_nav_menu_tree( $items, $depth, $r ) { * @since 3.0.1 * @access private * - * @staticvar array $used_ids * @param string $id * @param object $item * @return string diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php index d3667448c1..80649ef79c 100644 --- a/wp-includes/nav-menu.php +++ b/wp-includes/nav-menu.php @@ -649,8 +649,6 @@ function _is_valid_nav_menu_item( $item ) { * * @since 3.0.0 * - * @staticvar array $fetched - * * @param int|string|WP_Term $menu Menu ID, slug, name, or object. * @param array $args { * Optional. Arguments to pass to get_posts(). diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index c66beea1dd..c019b91af9 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -2235,9 +2235,6 @@ if ( ! function_exists( 'wp_salt' ) ) : * * @link https://api.wordpress.org/secret-key/1.1/salt/ Create secrets for wp-config.php * - * @staticvar array $cached_salts - * @staticvar array $duplicated_keys - * * @param string $scheme Authentication scheme (auth, secure_auth, logged_in, nonce) * @return string Salt value */ @@ -2472,8 +2469,6 @@ if ( ! function_exists( 'wp_rand' ) ) : * @since 4.4.0 Uses PHP7 random_int() or the random_compat library if available. * * @global string $rnd_value - * @staticvar string $seed - * @staticvar bool $use_random_int_functionality * * @param int $min Lower limit for the generated number * @param int $max Upper limit for the generated number diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php index 2a97c9eba5..25c60a5813 100644 --- a/wp-includes/plugin.php +++ b/wp-includes/plugin.php @@ -709,9 +709,6 @@ function plugin_basename( $file ) { * * @global array $wp_plugin_paths * - * @staticvar string $wp_plugin_path - * @staticvar string $wpmu_plugin_path - * * @param string $file Known path to the file. * @return bool Whether the path was able to be registered. */ diff --git a/wp-includes/pomo/po.php b/wp-includes/pomo/po.php index 29f370841d..f98ff01566 100644 --- a/wp-includes/pomo/po.php +++ b/wp-includes/pomo/po.php @@ -450,11 +450,8 @@ if ( ! class_exists( 'PO', false ) ) : } /** - * @staticvar string $last_line - * @staticvar boolean $use_last_line - * - * @param resource $f - * @param string $action + * @param resource $f + * @param string $action * @return boolean */ function read_line( $f, $action = 'read' ) { diff --git a/wp-includes/revision.php b/wp-includes/revision.php index 49c8253cbe..9eb74b98a9 100644 --- a/wp-includes/revision.php +++ b/wp-includes/revision.php @@ -14,8 +14,6 @@ * @since 4.5.0 The optional `$autosave` parameter was deprecated and renamed to `$deprecated`. * @access private * - * @staticvar array $fields - * * @param array|WP_Post $post Optional. A post array or a WP_Post object being processed * for insertion as a post revision. Default empty array. * @param bool $deprecated Not used. diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index dc1d3fd48b..eaa380a1bd 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -3086,8 +3086,6 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) { * * @since 2.5.0 * - * @staticvar bool $_defer - * * @param bool $defer Optional. Enable if true, disable if false. * @return bool Whether term counting is enabled or disabled. */ @@ -3116,8 +3114,6 @@ function wp_defer_term_counting( $defer = null ) { * * @since 2.3.0 * - * @staticvar array $_deferred - * * @param int|array $terms The term_taxonomy_id of the terms. * @param string $taxonomy The context of the term. * @param bool $do_deferred Whether to flush the deferred term counts too. Default false. diff --git a/wp-includes/theme.php b/wp-includes/theme.php index 8f686dceb1..e34976f621 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -15,7 +15,6 @@ * @since 3.4.0 * * @global array $wp_theme_directories - * @staticvar array $_themes * * @param array $args { * Optional. The search arguments. @@ -424,7 +423,6 @@ function register_theme_directory( $directory ) { * @since 2.9.0 * * @global array $wp_theme_directories - * @staticvar array $found_themes * * @param bool $force Optional. Whether to force a new directory scan. Defaults to false. * @return array|false Valid themes found @@ -1254,7 +1252,6 @@ function the_header_image_tag( $attr = array() ) { * @access private * * @global array $_wp_default_headers - * @staticvar object $_wp_random_header * * @return object */ diff --git a/wp-includes/version.php b/wp-includes/version.php index 7e2050e322..9fe8f27e2b 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-alpha-48108'; +$wp_version = '5.5-alpha-48109'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-includes/widgets/class-wp-widget-categories.php b/wp-includes/widgets/class-wp-widget-categories.php index 60bf6ef819..b532454fe8 100644 --- a/wp-includes/widgets/class-wp-widget-categories.php +++ b/wp-includes/widgets/class-wp-widget-categories.php @@ -37,8 +37,6 @@ class WP_Widget_Categories extends WP_Widget { * @since 4.2.0 Creates a unique HTML ID for the `