Code Modernization: Use explicit visibility for class property declarations.

Using `var` or only `static` to declare a class property is PHP 4 code.

This updates the codebase to use explicit visibility modifiers introduced in PHP 5.

Props jrf.
Fixes #51557. See #22234.

git-svn-id: https://develop.svn.wordpress.org/trunk@49184 602fd350-edb4-49c9-b593-d223f7449a82

30 files changed, 68 insertions, 68 deletions

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 @@
 <?php
 
 class WP_UnitTest_Generator_Sequence {
-	static $incr = -1;
+	public static $incr = -1;
 	public $next;
 	public $template_string;
 
diff --git a/tests/phpunit/includes/mock-mailer.php b/tests/phpunit/includes/mock-mailer.php
index e5e3d98fa2..d02d2efc69 100644
--- a/tests/phpunit/includes/mock-mailer.php
+++ b/tests/phpunit/includes/mock-mailer.php
@@ -3,7 +3,7 @@ require_once ABSPATH . 'wp-includes/PHPMailer/PHPMailer.php';
 require_once ABSPATH . 'wp-includes/PHPMailer/Exception.php';
 
 class MockPHPMailer extends PHPMailer\PHPMailer\PHPMailer {
-	var $mock_sent = array();
+	public $mock_sent = array();
 
 	function preSend() {
 		$this->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 @@
 <?php
 
 class WP_Canonical_UnitTestCase extends WP_UnitTestCase {
-	static $old_current_user;
-	static $author_id;
-	static $post_ids    = array();
-	static $comment_ids = array();
-	static $term_ids    = array();
-	static $terms       = array();
-	static $old_options = array();
+	public static $old_current_user;
+	public static $author_id;
+	public static $post_ids    = array();
+	public static $comment_ids = array();
+	public static $term_ids    = array();
+	public static $terms       = array();
+	public static $old_options = array();
 
 	/**
 	 * This can be defined in a subclass of this class which contains its own data() method.
diff --git a/tests/phpunit/includes/utils.php b/tests/phpunit/includes/utils.php
index 08b7c0f5d9..1546d4e973 100644
--- a/tests/phpunit/includes/utils.php
+++ b/tests/phpunit/includes/utils.php
@@ -38,8 +38,8 @@ function strip_ws( $txt ) {
  * add_action( 'foo', array( &$ma, 'action' ) );
  */
 class MockAction {
-	var $events;
-	var $debug;
+	public $events;
+	public $debug;
 
 	/**
 	 * PHP5 constructor.
@@ -184,8 +184,8 @@ class MockAction {
 // Convert valid XML to an array tree structure.
 // Kinda lame, but it works with a default PHP 4 installation.
 class TestXMLParser {
-	var $xml;
-	var $data = array();
+	public $xml;
+	public $data = array();
 
 	/**
 	 * PHP5 constructor.
diff --git a/tests/phpunit/tests/admin/includesScreen.php b/tests/phpunit/tests/admin/includesScreen.php
index c482ae3711..ade4294c6b 100644
--- a/tests/phpunit/tests/admin/includesScreen.php
+++ b/tests/phpunit/tests/admin/includesScreen.php
@@ -5,7 +5,7 @@
  * @group adminScreen
  */
 class Tests_Admin_includesScreen extends WP_UnitTestCase {
-	var $core_screens = array(
+	public $core_screens = array(
 		'index.php'                            => 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();