From b026fde15226cbe1af8bff9d74f2afe91c22d2c6 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 25 Feb 2018 20:32:30 +0000 Subject: [PATCH] Docs: Remove `@static` notations from property DocBlocks in `wp-admin/*` and `wp-includes/*` classes. This tag has been used in the past, but should no longer be used. Just using the `static` keyword in code is enough for PhpDocumentor on PHP5+ to recognize static variables and methods, and PhpDocumentor will mark them as static. Props birgire. See #42803. Built from https://develop.svn.wordpress.org/trunk@42747 git-svn-id: http://core.svn.wordpress.org/trunk@42577 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-screen.php | 4 ---- wp-includes/class-oembed.php | 1 - wp-includes/class-wp-customize-control.php | 2 -- wp-includes/class-wp-customize-panel.php | 2 -- wp-includes/class-wp-customize-section.php | 2 -- wp-includes/class-wp-customize-setting.php | 1 - wp-includes/class-wp-tax-query.php | 2 -- wp-includes/class-wp-theme.php | 5 ----- wp-includes/class-wp-user.php | 1 - wp-includes/version.php | 2 +- wp-includes/widgets/class-wp-widget-calendar.php | 2 -- 11 files changed, 1 insertion(+), 23 deletions(-) diff --git a/wp-admin/includes/class-wp-screen.php b/wp-admin/includes/class-wp-screen.php index afb0928c7c..6133f923c0 100644 --- a/wp-admin/includes/class-wp-screen.php +++ b/wp-admin/includes/class-wp-screen.php @@ -141,8 +141,6 @@ final class WP_Screen { /** * Stores old string-based help. * - * @static - * * @var array */ private static $_old_compat_help = array(); @@ -160,8 +158,6 @@ final class WP_Screen { * * @since 3.3.0 * - * @static - * * @var array */ private static $_registry = array(); diff --git a/wp-includes/class-oembed.php b/wp-includes/class-oembed.php index e52578ff66..30df338be4 100644 --- a/wp-includes/class-oembed.php +++ b/wp-includes/class-oembed.php @@ -30,7 +30,6 @@ class WP_oEmbed { * A list of an early oEmbed providers. * * @since 4.0.0 - * @static * @var array */ public static $early_providers = array(); diff --git a/wp-includes/class-wp-customize-control.php b/wp-includes/class-wp-customize-control.php index d43f0e5f0b..8825832952 100644 --- a/wp-includes/class-wp-customize-control.php +++ b/wp-includes/class-wp-customize-control.php @@ -20,8 +20,6 @@ class WP_Customize_Control { * Used when sorting two instances whose priorities are equal. * * @since 4.1.0 - * - * @static * @var int */ protected static $instance_count = 0; diff --git a/wp-includes/class-wp-customize-panel.php b/wp-includes/class-wp-customize-panel.php index f234f32c8c..17d3640f8d 100644 --- a/wp-includes/class-wp-customize-panel.php +++ b/wp-includes/class-wp-customize-panel.php @@ -24,8 +24,6 @@ class WP_Customize_Panel { * Used when sorting two instances whose priorities are equal. * * @since 4.1.0 - * - * @static * @var int */ protected static $instance_count = 0; diff --git a/wp-includes/class-wp-customize-section.php b/wp-includes/class-wp-customize-section.php index fa406b1b2f..6a7b812f2d 100644 --- a/wp-includes/class-wp-customize-section.php +++ b/wp-includes/class-wp-customize-section.php @@ -24,8 +24,6 @@ class WP_Customize_Section { * Used when sorting two instances whose priorities are equal. * * @since 4.1.0 - * - * @static * @var int */ protected static $instance_count = 0; diff --git a/wp-includes/class-wp-customize-setting.php b/wp-includes/class-wp-customize-setting.php index ae768fece7..a5cbabb484 100644 --- a/wp-includes/class-wp-customize-setting.php +++ b/wp-includes/class-wp-customize-setting.php @@ -135,7 +135,6 @@ class WP_Customize_Setting { * Cache of multidimensional values to improve performance. * * @since 4.4.0 - * @static * @var array */ protected static $aggregated_multidimensionals = array(); diff --git a/wp-includes/class-wp-tax-query.php b/wp-includes/class-wp-tax-query.php index 165b246ccd..5422756f4d 100644 --- a/wp-includes/class-wp-tax-query.php +++ b/wp-includes/class-wp-tax-query.php @@ -43,8 +43,6 @@ class WP_Tax_Query { * Standard response when the query should not return any rows. * * @since 3.2.0 - * - * @static * @var string */ private static $no_results = array( diff --git a/wp-includes/class-wp-theme.php b/wp-includes/class-wp-theme.php index 2005ec7aba..e18ee5ca57 100644 --- a/wp-includes/class-wp-theme.php +++ b/wp-includes/class-wp-theme.php @@ -21,7 +21,6 @@ final class WP_Theme implements ArrayAccess { /** * Headers for style.css files. * - * @static * @var array */ private static $file_headers = array( @@ -41,7 +40,6 @@ final class WP_Theme implements ArrayAccess { /** * Default themes. * - * @static * @var array */ private static $default_themes = array( @@ -60,7 +58,6 @@ final class WP_Theme implements ArrayAccess { /** * Renamed theme tags. * - * @static * @var array */ private static $tag_map = array( @@ -158,7 +155,6 @@ final class WP_Theme implements ArrayAccess { * * Default is false. Can be set with the {@see 'wp_cache_themes_persistently'} filter. * - * @static * @var bool */ private static $persistently_cache; @@ -168,7 +164,6 @@ final class WP_Theme implements ArrayAccess { * * By default the bucket is not cached, so this value is useless. * - * @static * @var bool */ private static $cache_expiration = 1800; diff --git a/wp-includes/class-wp-user.php b/wp-includes/class-wp-user.php index 4d0f654070..ec3761f4b3 100644 --- a/wp-includes/class-wp-user.php +++ b/wp-includes/class-wp-user.php @@ -101,7 +101,6 @@ class WP_User { private $site_id = 0; /** - * @static * @since 3.3.0 * @var array */ diff --git a/wp-includes/version.php b/wp-includes/version.php index 6ce4eba37d..b031c41f1f 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '5.0-alpha-42746'; +$wp_version = '5.0-alpha-42747'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-includes/widgets/class-wp-widget-calendar.php b/wp-includes/widgets/class-wp-widget-calendar.php index c19a3a29a3..08de0775f9 100644 --- a/wp-includes/widgets/class-wp-widget-calendar.php +++ b/wp-includes/widgets/class-wp-widget-calendar.php @@ -19,8 +19,6 @@ class WP_Widget_Calendar extends WP_Widget { * Ensure that the ID attribute only appears in the markup once * * @since 4.4.0 - * - * @static * @var int */ private static $instance = 0;