From 4ae2f4a83a963611aa939ebeed4dde15058cd51a Mon Sep 17 00:00:00 2001 From: jrfnl Date: Sat, 17 Oct 2020 16:33:33 +0200 Subject: [PATCH] Modernize: use explicit visibility for property declarations Using `var` or just and only `static` to declare a class property is PHP 4 code. PHP 5 introduced visibility modifiers. This updates the code base to use explicit visibility modifier for properties. No review has been done on what the visibility of the properties _should_ be as a property without visibility defaults to `public` and changing that to a more closed visibility would be a BC-break. --- .../class-twentynineteen-svg-icons.php | 6 +-- src/wp-includes/class-wp-rewrite.php | 42 +++++++++---------- src/wp-includes/pomo/entry.php | 18 ++++---- src/wp-includes/pomo/mo.php | 2 +- src/wp-includes/pomo/po.php | 2 +- src/wp-includes/pomo/streams.php | 6 +-- src/wp-includes/pomo/translations.php | 8 ++-- src/wp-includes/wp-db.php | 22 +++++----- .../class-wp-unittest-generator-sequence.php | 2 +- tests/phpunit/includes/mock-mailer.php | 2 +- tests/phpunit/includes/testcase-canonical.php | 14 +++---- tests/phpunit/includes/utils.php | 8 ++-- tests/phpunit/tests/admin/includesScreen.php | 2 +- tests/phpunit/tests/cache.php | 2 +- tests/phpunit/tests/feed/atom.php | 6 +-- tests/phpunit/tests/feed/rss2.php | 8 ++-- .../phpunit/tests/functions/wpListFilter.php | 4 +- tests/phpunit/tests/http/base.php | 4 +- tests/phpunit/tests/http/curl.php | 2 +- tests/phpunit/tests/http/streams.php | 2 +- tests/phpunit/tests/image/header.php | 2 +- tests/phpunit/tests/link/getDashboardUrl.php | 2 +- .../tests/multisite/wpMSSitesListTable.php | 2 +- tests/phpunit/tests/query/commentCount.php | 4 +- tests/phpunit/tests/query/date.php | 2 +- tests/phpunit/tests/query/results.php | 22 +++++----- tests/phpunit/tests/query/stickies.php | 2 +- tests/phpunit/tests/theme/customHeader.php | 2 +- tests/phpunit/tests/upload.php | 2 +- tests/phpunit/tests/user/countUserPosts.php | 4 +- .../tests/user/getActiveBlogForUser.php | 2 +- tests/phpunit/tests/user/listAuthors.php | 8 ++-- tests/phpunit/tests/walker.php | 4 +- tests/phpunit/tests/xmlrpc/wp/getComments.php | 2 +- .../phpunit/tests/xmlrpc/wp/getMediaItem.php | 4 +- tests/phpunit/tests/xmlrpc/wp/getPost.php | 8 ++-- tests/phpunit/tests/xmlrpc/wp/getPostType.php | 4 +- .../tests/xmlrpc/wp/restoreRevision.php | 4 +- 38 files changed, 121 insertions(+), 121 deletions(-) diff --git a/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-svg-icons.php b/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-svg-icons.php index 01a35c0309..aa2ebf27bb 100644 --- a/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-svg-icons.php +++ b/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-svg-icons.php @@ -70,7 +70,7 @@ class TwentyNineteen_SVG_Icons { * * @var array */ - static $ui_icons = array( + public static $ui_icons = array( 'link' => /* material-design – link */ ' @@ -178,7 +178,7 @@ class TwentyNineteen_SVG_Icons { * * @var array */ - static $social_icons_map = array( + public static $social_icons_map = array( 'amazon' => array( 'amazon.com', 'amazon.cn', @@ -237,7 +237,7 @@ class TwentyNineteen_SVG_Icons { * * @var array */ - static $social_icons = array( + public static $social_icons = array( '500px' => ' diff --git a/src/wp-includes/class-wp-rewrite.php b/src/wp-includes/class-wp-rewrite.php index 729ddf3663..6b5fc05fc8 100644 --- a/src/wp-includes/class-wp-rewrite.php +++ b/src/wp-includes/class-wp-rewrite.php @@ -45,7 +45,7 @@ class WP_Rewrite { * @since 1.5.0 * @var string */ - var $author_base = 'author'; + public $author_base = 'author'; /** * Permalink structure for author archives. @@ -53,7 +53,7 @@ class WP_Rewrite { * @since 1.5.0 * @var string */ - var $author_structure; + public $author_structure; /** * Permalink structure for date archives. @@ -61,7 +61,7 @@ class WP_Rewrite { * @since 1.5.0 * @var string */ - var $date_structure; + public $date_structure; /** * Permalink structure for pages. @@ -69,7 +69,7 @@ class WP_Rewrite { * @since 1.5.0 * @var string */ - var $page_structure; + public $page_structure; /** * Base of the search permalink structure (example.com/$search_base/query). @@ -77,7 +77,7 @@ class WP_Rewrite { * @since 1.5.0 * @var string */ - var $search_base = 'search'; + public $search_base = 'search'; /** * Permalink structure for searches. @@ -85,7 +85,7 @@ class WP_Rewrite { * @since 1.5.0 * @var string */ - var $search_structure; + public $search_structure; /** * Comments permalink base. @@ -93,7 +93,7 @@ class WP_Rewrite { * @since 1.5.0 * @var string */ - var $comments_base = 'comments'; + public $comments_base = 'comments'; /** * Pagination permalink base. @@ -109,7 +109,7 @@ class WP_Rewrite { * @since 4.2.0 * @var string */ - var $comments_pagination_base = 'comment-page'; + public $comments_pagination_base = 'comment-page'; /** * Feed permalink base. @@ -117,7 +117,7 @@ class WP_Rewrite { * @since 1.5.0 * @var string */ - var $feed_base = 'feed'; + public $feed_base = 'feed'; /** * Comments feed permalink structure. @@ -125,7 +125,7 @@ class WP_Rewrite { * @since 1.5.0 * @var string */ - var $comment_feed_structure; + public $comment_feed_structure; /** * Feed request permalink structure. @@ -133,7 +133,7 @@ class WP_Rewrite { * @since 1.5.0 * @var string */ - var $feed_structure; + public $feed_structure; /** * The static portion of the post permalink structure. @@ -178,7 +178,7 @@ class WP_Rewrite { * @since 1.5.0 * @var string */ - var $matches = ''; + public $matches = ''; /** * Rewrite rules to match against the request to find the redirect or query. @@ -186,7 +186,7 @@ class WP_Rewrite { * @since 1.5.0 * @var array */ - var $rules; + public $rules; /** * Additional rules added external to the rewrite class. @@ -196,7 +196,7 @@ class WP_Rewrite { * @since 2.1.0 * @var array */ - var $extra_rules = array(); + public $extra_rules = array(); /** * Additional rules that belong at the beginning to match first. @@ -206,7 +206,7 @@ class WP_Rewrite { * @since 2.3.0 * @var array */ - var $extra_rules_top = array(); + public $extra_rules_top = array(); /** * Rules that don't redirect to WordPress' index.php. @@ -217,7 +217,7 @@ class WP_Rewrite { * @since 2.1.0 * @var array */ - var $non_wp_rules = array(); + public $non_wp_rules = array(); /** * Extra permalink structures, e.g. categories, added by add_permastruct(). @@ -225,7 +225,7 @@ class WP_Rewrite { * @since 2.1.0 * @var array */ - var $extra_permastructs = array(); + public $extra_permastructs = array(); /** * Endpoints (like /trackback/) added by add_rewrite_endpoint(). @@ -233,7 +233,7 @@ class WP_Rewrite { * @since 2.1.0 * @var array */ - var $endpoints; + public $endpoints; /** * Whether to write every mod_rewrite rule for WordPress into the .htaccess file. @@ -277,7 +277,7 @@ class WP_Rewrite { * @since 1.5.0 * @var array */ - var $rewritecode = array( + public $rewritecode = array( '%year%', '%monthnum%', '%day%', @@ -298,7 +298,7 @@ class WP_Rewrite { * @since 1.5.0 * @var array */ - var $rewritereplace = array( + public $rewritereplace = array( '([0-9]{4})', '([0-9]{1,2})', '([0-9]{1,2})', @@ -318,7 +318,7 @@ class WP_Rewrite { * @since 1.5.0 * @var array */ - var $queryreplace = array( + public $queryreplace = array( 'year=', 'monthnum=', 'day=', diff --git a/src/wp-includes/pomo/entry.php b/src/wp-includes/pomo/entry.php index a1293d4fa5..f0226dbc54 100644 --- a/src/wp-includes/pomo/entry.php +++ b/src/wp-includes/pomo/entry.php @@ -18,16 +18,16 @@ if ( ! class_exists( 'Translation_Entry', false ) ) : * * @var boolean */ - var $is_plural = false; + public $is_plural = false; - var $context = null; - var $singular = null; - var $plural = null; - var $translations = array(); - var $translator_comments = ''; - var $extracted_comments = ''; - var $references = array(); - var $flags = array(); + public $context = null; + public $singular = null; + public $plural = null; + public $translations = array(); + public $translator_comments = ''; + public $extracted_comments = ''; + public $references = array(); + public $flags = array(); /** * @param array $args associative array, support following keys: diff --git a/src/wp-includes/pomo/mo.php b/src/wp-includes/pomo/mo.php index b4f829fdef..7e3bf81014 100644 --- a/src/wp-includes/pomo/mo.php +++ b/src/wp-includes/pomo/mo.php @@ -13,7 +13,7 @@ require_once __DIR__ . '/streams.php'; if ( ! class_exists( 'MO', false ) ) : class MO extends Gettext_Translations { - var $_nplurals = 2; + public $_nplurals = 2; /** * Loaded MO file. diff --git a/src/wp-includes/pomo/po.php b/src/wp-includes/pomo/po.php index 5030afb5df..b2a605a3ec 100644 --- a/src/wp-includes/pomo/po.php +++ b/src/wp-includes/pomo/po.php @@ -21,7 +21,7 @@ ini_set( 'auto_detect_line_endings', 1 ); if ( ! class_exists( 'PO', false ) ) : class PO extends Gettext_Translations { - var $comments_before_headers = ''; + public $comments_before_headers = ''; /** * Exports headers to a PO entry diff --git a/src/wp-includes/pomo/streams.php b/src/wp-includes/pomo/streams.php index 89e13a8f4b..3978d65791 100644 --- a/src/wp-includes/pomo/streams.php +++ b/src/wp-includes/pomo/streams.php @@ -11,8 +11,8 @@ if ( ! class_exists( 'POMO_Reader', false ) ) : class POMO_Reader { - var $endian = 'little'; - var $_post = ''; + public $endian = 'little'; + public $_post = ''; /** * PHP5 constructor. @@ -226,7 +226,7 @@ if ( ! class_exists( 'POMO_StringReader', false ) ) : */ class POMO_StringReader extends POMO_Reader { - var $_str = ''; + public $_str = ''; /** * PHP5 constructor. diff --git a/src/wp-includes/pomo/translations.php b/src/wp-includes/pomo/translations.php index d99037eaed..d93c6528f4 100644 --- a/src/wp-includes/pomo/translations.php +++ b/src/wp-includes/pomo/translations.php @@ -12,8 +12,8 @@ require_once __DIR__ . '/entry.php'; if ( ! class_exists( 'Translations', false ) ) : class Translations { - var $entries = array(); - var $headers = array(); + public $entries = array(); + public $headers = array(); /** * Add entry to the PO structure @@ -301,8 +301,8 @@ if ( ! class_exists( 'NOOP_Translations', false ) ) : * Provides the same interface as Translations, but doesn't do anything */ class NOOP_Translations { - var $entries = array(); - var $headers = array(); + public $entries = array(); + public $headers = array(); function add_entry( $entry ) { return true; diff --git a/src/wp-includes/wp-db.php b/src/wp-includes/wp-db.php index 80c117c1a0..5eabf8a540 100644 --- a/src/wp-includes/wp-db.php +++ b/src/wp-includes/wp-db.php @@ -61,7 +61,7 @@ class wpdb { * @since 0.71 * @var bool */ - var $show_errors = false; + public $show_errors = false; /** * Whether to suppress errors during the DB bootstrapping. Default false. @@ -69,7 +69,7 @@ class wpdb { * @since 2.5.0 * @var bool */ - var $suppress_errors = false; + public $suppress_errors = false; /** * The error encountered during the last query. @@ -101,7 +101,7 @@ class wpdb { * @since 0.71 * @var int */ - var $rows_affected = 0; + public $rows_affected = 0; /** * The ID generated for an AUTO_INCREMENT column by the last query (usually INSERT). @@ -117,7 +117,7 @@ class wpdb { * @since 0.71 * @var string */ - var $last_query; + public $last_query; /** * Results of the last query. @@ -125,7 +125,7 @@ class wpdb { * @since 0.71 * @var array|null */ - var $last_result; + public $last_result; /** * MySQL result, which is either a resource or boolean. @@ -198,7 +198,7 @@ class wpdb { * } * } */ - var $queries; + public $queries; /** * The number of times to retry reconnecting before dying. Default 5. @@ -234,7 +234,7 @@ class wpdb { * @since 2.3.2 * @var bool */ - var $ready = false; + public $ready = false; /** * Blog ID. @@ -259,7 +259,7 @@ class wpdb { * @see wpdb::tables() * @var array */ - var $tables = array( + public $tables = array( 'posts', 'comments', 'links', @@ -281,7 +281,7 @@ class wpdb { * @see wpdb::tables() * @var array */ - var $old_tables = array( 'categories', 'post2cat', 'link2cat' ); + public $old_tables = array( 'categories', 'post2cat', 'link2cat' ); /** * List of WordPress global tables. @@ -290,7 +290,7 @@ class wpdb { * @see wpdb::tables() * @var array */ - var $global_tables = array( 'users', 'usermeta' ); + public $global_tables = array( 'users', 'usermeta' ); /** * List of Multisite global tables. @@ -299,7 +299,7 @@ class wpdb { * @see wpdb::tables() * @var array */ - var $ms_global_tables = array( + public $ms_global_tables = array( 'blogs', 'blogmeta', 'signups', diff --git a/tests/phpunit/includes/factory/class-wp-unittest-generator-sequence.php b/tests/phpunit/includes/factory/class-wp-unittest-generator-sequence.php index 5c0778f3d4..9391dd8bf7 100644 --- a/tests/phpunit/includes/factory/class-wp-unittest-generator-sequence.php +++ b/tests/phpunit/includes/factory/class-wp-unittest-generator-sequence.php @@ -1,7 +1,7 @@ Encoding = '8bit'; diff --git a/tests/phpunit/includes/testcase-canonical.php b/tests/phpunit/includes/testcase-canonical.php index 655c0b0612..3866145589 100644 --- a/tests/phpunit/includes/testcase-canonical.php +++ b/tests/phpunit/includes/testcase-canonical.php @@ -1,13 +1,13 @@ array( 'base' => 'dashboard', 'id' => 'dashboard', diff --git a/tests/phpunit/tests/cache.php b/tests/phpunit/tests/cache.php index 16206208da..b8c11b09df 100644 --- a/tests/phpunit/tests/cache.php +++ b/tests/phpunit/tests/cache.php @@ -4,7 +4,7 @@ * @group cache */ class Tests_Cache extends WP_UnitTestCase { - var $cache = null; + public $cache = null; function setUp() { parent::setUp(); diff --git a/tests/phpunit/tests/feed/atom.php b/tests/phpunit/tests/feed/atom.php index cc9a30af72..e8d308014c 100644 --- a/tests/phpunit/tests/feed/atom.php +++ b/tests/phpunit/tests/feed/atom.php @@ -9,9 +9,9 @@ * @group feed */ class Tests_Feeds_Atom extends WP_UnitTestCase { - static $user_id; - static $posts; - static $category; + public static $user_id; + public static $posts; + public static $category; /** * Setup a new user and attribute some posts. diff --git a/tests/phpunit/tests/feed/rss2.php b/tests/phpunit/tests/feed/rss2.php index 8eda26e9d2..16fd4fe198 100644 --- a/tests/phpunit/tests/feed/rss2.php +++ b/tests/phpunit/tests/feed/rss2.php @@ -9,10 +9,10 @@ * @group feed */ class Tests_Feeds_RSS2 extends WP_UnitTestCase { - static $user_id; - static $posts; - static $category; - static $post_date; + public static $user_id; + public static $posts; + public static $category; + public static $post_date; /** * Setup a new user and attribute some posts. diff --git a/tests/phpunit/tests/functions/wpListFilter.php b/tests/phpunit/tests/functions/wpListFilter.php index 24d43b504d..64abe90c44 100644 --- a/tests/phpunit/tests/functions/wpListFilter.php +++ b/tests/phpunit/tests/functions/wpListFilter.php @@ -8,8 +8,8 @@ * @covers ::wp_list_pluck */ class Tests_Functions_wpListFilter extends WP_UnitTestCase { - var $object_list = array(); - var $array_list = array(); + public $object_list = array(); + public $array_list = array(); function setUp() { parent::setUp(); diff --git a/tests/phpunit/tests/http/base.php b/tests/phpunit/tests/http/base.php index 0919f91ac0..c7cce5bad2 100644 --- a/tests/phpunit/tests/http/base.php +++ b/tests/phpunit/tests/http/base.php @@ -12,8 +12,8 @@ */ abstract class WP_HTTP_UnitTestCase extends WP_UnitTestCase { // You can use your own version of data/WPHTTP-testcase-redirection-script.php here. - var $redirection_script = 'http://api.wordpress.org/core/tests/1.0/redirection.php'; - var $file_stream_url = 'http://s.w.org/screenshots/3.9/dashboard.png'; + public $redirection_script = 'http://api.wordpress.org/core/tests/1.0/redirection.php'; + public $file_stream_url = 'http://s.w.org/screenshots/3.9/dashboard.png'; protected $http_request_args; diff --git a/tests/phpunit/tests/http/curl.php b/tests/phpunit/tests/http/curl.php index 271e6dd698..ceee347aa8 100644 --- a/tests/phpunit/tests/http/curl.php +++ b/tests/phpunit/tests/http/curl.php @@ -7,7 +7,7 @@ require_once __DIR__ . '/base.php'; * @group external-http */ class Tests_HTTP_curl extends WP_HTTP_UnitTestCase { - var $transport = 'curl'; + public $transport = 'curl'; /** * @ticket 39783 diff --git a/tests/phpunit/tests/http/streams.php b/tests/phpunit/tests/http/streams.php index 61fcc11925..9ae1b30512 100644 --- a/tests/phpunit/tests/http/streams.php +++ b/tests/phpunit/tests/http/streams.php @@ -7,5 +7,5 @@ require_once __DIR__ . '/base.php'; * @group external-http */ class Tests_HTTP_streams extends WP_HTTP_UnitTestCase { - var $transport = 'streams'; + public $transport = 'streams'; } diff --git a/tests/phpunit/tests/image/header.php b/tests/phpunit/tests/image/header.php index d378dddb2d..897c68e5fa 100644 --- a/tests/phpunit/tests/image/header.php +++ b/tests/phpunit/tests/image/header.php @@ -6,7 +6,7 @@ require_once ABSPATH . 'wp-admin/includes/class-custom-image-header.php'; * @group header */ class Tests_Image_Header extends WP_UnitTestCase { - var $custom_image_header; + public $custom_image_header; function setUp() { parent::setUp(); diff --git a/tests/phpunit/tests/link/getDashboardUrl.php b/tests/phpunit/tests/link/getDashboardUrl.php index be051b3027..9495c6f546 100644 --- a/tests/phpunit/tests/link/getDashboardUrl.php +++ b/tests/phpunit/tests/link/getDashboardUrl.php @@ -4,7 +4,7 @@ * @group link */ class Tests_Link_GetDashboardUrl extends WP_UnitTestCase { - static $user_id = false; + public static $user_id = false; public static function wpSetUpBeforeClass( $factory ) { self::$user_id = $factory->user->create( array( 'role' => 'administrator' ) ); diff --git a/tests/phpunit/tests/multisite/wpMSSitesListTable.php b/tests/phpunit/tests/multisite/wpMSSitesListTable.php index a49369cca5..b9dc73cdb0 100644 --- a/tests/phpunit/tests/multisite/wpMSSitesListTable.php +++ b/tests/phpunit/tests/multisite/wpMSSitesListTable.php @@ -12,7 +12,7 @@ if ( is_multisite() ) : /** * @var WP_MS_Sites_List_Table */ - var $table = false; + public $table = false; function setUp() { parent::setUp(); diff --git a/tests/phpunit/tests/query/commentCount.php b/tests/phpunit/tests/query/commentCount.php index fd72740f7b..29d3f3cad6 100644 --- a/tests/phpunit/tests/query/commentCount.php +++ b/tests/phpunit/tests/query/commentCount.php @@ -3,9 +3,9 @@ * @group query */ class Tests_Query_CommentCount extends WP_UnitTestCase { - static $post_ids = array(); + public static $post_ids = array(); public $q; - static $post_type = 'page'; // Can be anything. + public static $post_type = 'page'; // Can be anything. public function setUp() { parent::setUp(); diff --git a/tests/phpunit/tests/query/date.php b/tests/phpunit/tests/query/date.php index 0372233cfb..17d5dc5aa3 100644 --- a/tests/phpunit/tests/query/date.php +++ b/tests/phpunit/tests/query/date.php @@ -10,7 +10,7 @@ class Tests_Query_Date extends WP_UnitTestCase { public $q; - static $post_ids = array(); + public static $post_ids = array(); public static function wpSetUpBeforeClass( $factory ) { // Be careful modifying this. Tests are coded to expect this exact sample data. diff --git a/tests/phpunit/tests/query/results.php b/tests/phpunit/tests/query/results.php index eb801249ab..e284e3417b 100644 --- a/tests/phpunit/tests/query/results.php +++ b/tests/phpunit/tests/query/results.php @@ -9,17 +9,17 @@ class Tests_Query_Results extends WP_UnitTestCase { protected $q; - static $cat_ids = array(); - static $tag_ids = array(); - static $post_ids = array(); - - static $parent_one; - static $parent_two; - static $parent_three; - static $child_one; - static $child_two; - static $child_three; - static $child_four; + public static $cat_ids = array(); + public static $tag_ids = array(); + public static $post_ids = array(); + + public static $parent_one; + public static $parent_two; + public static $parent_three; + public static $child_one; + public static $child_two; + public static $child_three; + public static $child_four; public static function wpSetUpBeforeClass( $factory ) { $cat_a = $factory->term->create( diff --git a/tests/phpunit/tests/query/stickies.php b/tests/phpunit/tests/query/stickies.php index 2dc285ade3..306c1a6876 100644 --- a/tests/phpunit/tests/query/stickies.php +++ b/tests/phpunit/tests/query/stickies.php @@ -6,7 +6,7 @@ * @group query */ class Tests_Query_Stickies extends WP_UnitTestCase { - static $posts = array(); + public static $posts = array(); public static function wpSetUpBeforeClass( $factory ) { // Set post times to get a reliable order. diff --git a/tests/phpunit/tests/theme/customHeader.php b/tests/phpunit/tests/theme/customHeader.php index 229b85dec1..34a30496e9 100644 --- a/tests/phpunit/tests/theme/customHeader.php +++ b/tests/phpunit/tests/theme/customHeader.php @@ -4,7 +4,7 @@ */ class Tests_Theme_Custom_Header extends WP_UnitTestCase { - static $post; + public static $post; protected static $header_video_id; diff --git a/tests/phpunit/tests/upload.php b/tests/phpunit/tests/upload.php index 8fe2f9e91d..43cd1e338a 100644 --- a/tests/phpunit/tests/upload.php +++ b/tests/phpunit/tests/upload.php @@ -5,7 +5,7 @@ */ class Tests_Upload extends WP_UnitTestCase { - var $siteurl; + public $siteurl; function setUp() { $this->_reset_options(); diff --git a/tests/phpunit/tests/user/countUserPosts.php b/tests/phpunit/tests/user/countUserPosts.php index a3ed4c305f..3ddd3b4da0 100644 --- a/tests/phpunit/tests/user/countUserPosts.php +++ b/tests/phpunit/tests/user/countUserPosts.php @@ -5,8 +5,8 @@ * @group post */ class Tests_User_CountUserPosts extends WP_UnitTestCase { - static $user_id; - static $post_ids = array(); + public static $user_id; + public static $post_ids = array(); public static function wpSetUpBeforeClass( $factory ) { self::$user_id = $factory->user->create( diff --git a/tests/phpunit/tests/user/getActiveBlogForUser.php b/tests/phpunit/tests/user/getActiveBlogForUser.php index 0d13583ae0..6476e3ac63 100644 --- a/tests/phpunit/tests/user/getActiveBlogForUser.php +++ b/tests/phpunit/tests/user/getActiveBlogForUser.php @@ -10,7 +10,7 @@ if ( is_multisite() ) : * @group multisite */ class Tests_Multisite_getActiveBlogForUser extends WP_UnitTestCase { - static $user_id = false; + public static $user_id = false; public static function wpSetUpBeforeClass( $factory ) { self::$user_id = $factory->user->create(); diff --git a/tests/phpunit/tests/user/listAuthors.php b/tests/phpunit/tests/user/listAuthors.php index 8908b39d0b..35c3e91211 100644 --- a/tests/phpunit/tests/user/listAuthors.php +++ b/tests/phpunit/tests/user/listAuthors.php @@ -4,10 +4,10 @@ * @group user */ class Tests_User_ListAuthors extends WP_UnitTestCase { - static $user_ids = array(); - static $fred_id; - static $posts = array(); - static $user_urls = array(); + public static $user_ids = array(); + public static $fred_id; + public static $posts = array(); + public static $user_urls = array(); /* Defaults 'orderby' => 'name', 'order' => 'ASC', diff --git a/tests/phpunit/tests/walker.php b/tests/phpunit/tests/walker.php index 5ab08b1579..c40db21a90 100644 --- a/tests/phpunit/tests/walker.php +++ b/tests/phpunit/tests/walker.php @@ -286,8 +286,8 @@ class Tests_Walker extends WP_UnitTestCase { class Walker_Test extends Walker { - var $tree_type = 'test'; - var $db_fields = array( + public $tree_type = 'test'; + public $db_fields = array( 'parent' => 'parent', 'id' => 'id', ); diff --git a/tests/phpunit/tests/xmlrpc/wp/getComments.php b/tests/phpunit/tests/xmlrpc/wp/getComments.php index 07d78e0b0f..5ec958762f 100644 --- a/tests/phpunit/tests/xmlrpc/wp/getComments.php +++ b/tests/phpunit/tests/xmlrpc/wp/getComments.php @@ -4,7 +4,7 @@ * @group xmlrpc */ class Tests_XMLRPC_wp_getComments extends WP_XMLRPC_UnitTestCase { - var $post_id; + public $post_id; function test_invalid_username_password() { $result = $this->myxmlrpcserver->wp_getComments( array( 1, 'username', 'password', array() ) ); diff --git a/tests/phpunit/tests/xmlrpc/wp/getMediaItem.php b/tests/phpunit/tests/xmlrpc/wp/getMediaItem.php index 6312cdda44..26b2ac4aa1 100644 --- a/tests/phpunit/tests/xmlrpc/wp/getMediaItem.php +++ b/tests/phpunit/tests/xmlrpc/wp/getMediaItem.php @@ -6,8 +6,8 @@ class Tests_XMLRPC_wp_getMediaItem extends WP_XMLRPC_UnitTestCase { protected static $post_id; - var $attachment_data; - var $attachment_id; + public $attachment_data; + public $attachment_id; public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) { self::$post_id = $factory->post->create(); diff --git a/tests/phpunit/tests/xmlrpc/wp/getPost.php b/tests/phpunit/tests/xmlrpc/wp/getPost.php index 30b8addf6c..6752677d97 100644 --- a/tests/phpunit/tests/xmlrpc/wp/getPost.php +++ b/tests/phpunit/tests/xmlrpc/wp/getPost.php @@ -4,10 +4,10 @@ * @group xmlrpc */ class Tests_XMLRPC_wp_getPost extends WP_XMLRPC_UnitTestCase { - var $post_data; - var $post_id; - var $post_date_ts; - var $post_custom_field; + public $post_data; + public $post_id; + public $post_date_ts; + public $post_custom_field; function setUp() { parent::setUp(); diff --git a/tests/phpunit/tests/xmlrpc/wp/getPostType.php b/tests/phpunit/tests/xmlrpc/wp/getPostType.php index 3781dc0674..cfff2320fc 100644 --- a/tests/phpunit/tests/xmlrpc/wp/getPostType.php +++ b/tests/phpunit/tests/xmlrpc/wp/getPostType.php @@ -4,8 +4,8 @@ * @group xmlrpc */ class Tests_XMLRPC_wp_getPostType extends WP_XMLRPC_UnitTestCase { - var $cpt_name; - var $cpt_args; + public $cpt_name; + public $cpt_args; function setUp() { parent::setUp(); diff --git a/tests/phpunit/tests/xmlrpc/wp/restoreRevision.php b/tests/phpunit/tests/xmlrpc/wp/restoreRevision.php index b3ef2731a2..e89e1f988c 100644 --- a/tests/phpunit/tests/xmlrpc/wp/restoreRevision.php +++ b/tests/phpunit/tests/xmlrpc/wp/restoreRevision.php @@ -4,8 +4,8 @@ * @group xmlrpc */ class Tests_XMLRPC_wp_restoreRevision extends WP_XMLRPC_UnitTestCase { - var $post_id; - var $revision_id; + public $post_id; + public $revision_id; function setUp() { parent::setUp(); -- 2.28.0.windows.1