Commit 30d9432760 for wordpress.org

commit 30d94327600b420b3bc8abc97f7d93b8095ced57
Author: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date:   Sat Oct 17 16:26:09 2020 +0000

    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.
    Built from https://develop.svn.wordpress.org/trunk@49184


    git-svn-id: http://core.svn.wordpress.org/trunk@48946 1a063a9b-81f0-0310-95a4-ce76da25c4cd

diff --git a/wp-content/themes/twentynineteen/classes/class-twentynineteen-svg-icons.php b/wp-content/themes/twentynineteen/classes/class-twentynineteen-svg-icons.php
index 01a35c0309..aa2ebf27bb 100644
--- a/wp-content/themes/twentynineteen/classes/class-twentynineteen-svg-icons.php
+++ b/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 */ '
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
     <path d="M0 0h24v24H0z" fill="none"></path>
@@ -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'       => '
 <svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 	<path d="M6.94026,15.1412c.00437.01213.108.29862.168.44064a6.55008,6.55008,0,1,0,6.03191-9.09557,6.68654,6.68654,0,0,0-2.58357.51467A8.53914,8.53914,0,0,0,8.21268,8.61344L8.209,8.61725V3.22948l9.0504-.00008c.32934-.0036.32934-.46353.32934-.61466s0-.61091-.33035-.61467L7.47248,2a.43.43,0,0,0-.43131.42692v7.58355c0,.24466.30476.42131.58793.4819.553.11812.68074-.05864.81617-.2457l.018-.02481A10.52673,10.52673,0,0,1,9.32258,9.258a5.35268,5.35268,0,1,1,7.58985,7.54976,5.417,5.417,0,0,1-3.80867,1.56365,5.17483,5.17483,0,0,1-2.69822-.74478l.00342-4.61111a2.79372,2.79372,0,0,1,.71372-1.78792,2.61611,2.61611,0,0,1,1.98282-.89477,2.75683,2.75683,0,0,1,1.95525.79477,2.66867,2.66867,0,0,1,.79656,1.909,2.724,2.724,0,0,1-2.75849,2.748,4.94651,4.94651,0,0,1-.86254-.13719c-.31234-.093-.44519.34058-.48892.48349-.16811.54966.08453.65862.13687.67489a3.75751,3.75751,0,0,0,1.25234.18375,3.94634,3.94634,0,1,0-2.82444-6.742,3.67478,3.67478,0,0,0-1.13028,2.584l-.00041.02323c-.0035.11667-.00579,2.881-.00644,3.78811l-.00407-.00451a6.18521,6.18521,0,0,1-1.0851-1.86092c-.10544-.27856-.34358-.22925-.66857-.12917-.14192.04372-.57386.17677-.47833.489Zm4.65165-1.08338a.51346.51346,0,0,0,.19513.31818l.02276.022a.52945.52945,0,0,0,.3517.18416.24242.24242,0,0,0,.16577-.0611c.05473-.05082.67382-.67812.73287-.738l.69041.68819a.28978.28978,0,0,0,.21437.11032.53239.53239,0,0,0,.35708-.19486c.29792-.30419.14885-.46821.07676-.54751l-.69954-.69975.72952-.73469c.16-.17311.01874-.35708-.12218-.498-.20461-.20461-.402-.25742-.52855-.14083l-.7254.72665-.73354-.73375a.20128.20128,0,0,0-.14179-.05695.54135.54135,0,0,0-.34379.19648c-.22561.22555-.274.38149-.15656.5059l.73374.7315-.72942.73072A.26589.26589,0,0,0,11.59191,14.05782Zm1.59866-9.915A8.86081,8.86081,0,0,0,9.854,4.776a.26169.26169,0,0,0-.16938.22759.92978.92978,0,0,0,.08619.42094c.05682.14524.20779.531.50006.41955a8.40969,8.40969,0,0,1,2.91968-.55484,7.87875,7.87875,0,0,1,3.086.62286,8.61817,8.61817,0,0,1,2.30562,1.49315.2781.2781,0,0,0,.18318.07586c.15529,0,.30425-.15253.43167-.29551.21268-.23861.35873-.4369.1492-.63538a8.50425,8.50425,0,0,0-2.62312-1.694A9.0177,9.0177,0,0,0,13.19058,4.14283ZM19.50945,18.6236h0a.93171.93171,0,0,0-.36642-.25406.26589.26589,0,0,0-.27613.06613l-.06943.06929A7.90606,7.90606,0,0,1,7.60639,18.505a7.57284,7.57284,0,0,1-1.696-2.51537,8.58715,8.58715,0,0,1-.5147-1.77754l-.00871-.04864c-.04939-.25873-.28755-.27684-.62981-.22448-.14234.02178-.5755.088-.53426.39969l.001.00712a9.08807,9.08807,0,0,0,15.406,4.99094c.00193-.00192.04753-.04718.0725-.07436C19.79425,19.16234,19.87422,18.98728,19.50945,18.6236Z"></path>
diff --git a/wp-includes/class-wp-rewrite.php b/wp-includes/class-wp-rewrite.php
index 729ddf3663..6b5fc05fc8 100644
--- a/wp-includes/class-wp-rewrite.php
+++ b/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/wp-includes/pomo/entry.php b/wp-includes/pomo/entry.php
index a1293d4fa5..f0226dbc54 100644
--- a/wp-includes/pomo/entry.php
+++ b/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/wp-includes/pomo/mo.php b/wp-includes/pomo/mo.php
index b4f829fdef..7e3bf81014 100644
--- a/wp-includes/pomo/mo.php
+++ b/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/wp-includes/pomo/po.php b/wp-includes/pomo/po.php
index 5030afb5df..b2a605a3ec 100644
--- a/wp-includes/pomo/po.php
+++ b/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/wp-includes/pomo/streams.php b/wp-includes/pomo/streams.php
index 89e13a8f4b..3978d65791 100644
--- a/wp-includes/pomo/streams.php
+++ b/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/wp-includes/pomo/translations.php b/wp-includes/pomo/translations.php
index d99037eaed..d93c6528f4 100644
--- a/wp-includes/pomo/translations.php
+++ b/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/wp-includes/version.php b/wp-includes/version.php
index 67c4af22f2..81000a43a0 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.6-alpha-49183';
+$wp_version = '5.6-alpha-49184';

 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index 80c117c1a0..5eabf8a540 100644
--- a/wp-includes/wp-db.php
+++ b/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',