Ticket #36717: 36717.4.diff

src/wp-includes/class-wp-network.php

@@ -17 +17 @@
  * ability to interact with any network of sites is required.
  *
  * @since 4.4.0
+ *
+ * @property int $site_id
  */
 class WP_Network {
 
@@ -58 +60 @@
          * A numeric string, for compatibility reasons.
          *
          * @since 4.4.0
-         * @access public
+         * @access private
          * @var string
          */
-        public $blog_id = 0;
+        private $blog_id = 0;
 
         /**
          * Domain used to set cookies for this network.
@@ -138 +140 @@
         }
 
         /**
+         * Getter.
+         *
+         * Allows current multisite naming conventions when getting properties.
+         *
+         * @since 4.6.0
+         * @access public
+         *
+         * @param string $key Property to get.
+         * @return mixed Value of the property. Null if not available.
+         */
+        public function __get( $key ) {
+                switch ( $key ) {
+                        case 'blog_id':
+                                return $this->blog_id;
+                        case 'site_id':
+                                return (int) $this->blog_id;
+                }
+
+                return null;
+        }
+
+        /**
+         * Isset-er.
+         *
+         * Allows current multisite naming conventions when checking for properties.
+         *
+         * @since 4.6.0
+         * @access public
+         *
+         * @param string $key Property to check if set.
+         * @return bool Whether the property is set.
+         */
+        public function __isset( $key ) {
+                switch( $key ) {
+                        case 'blog_id':
+                        case 'site_id':
+                                return true;
+                }
+
+                return false;
+        }
+
+        /**
+         * Setter.
+         *
+         * Allows current multisite naming conventions while setting properties.
+         *
+         * @since 4.6.0
+         * @access public
+         *
+         * @param string $key   Property to set.
+         * @param mixed  $value Value to assign to the property.
+         */
+        public function __set( $key, $value ) {
+                switch( $key ) {
+                        case 'blog_id':
+                        case 'site_id':
+                                $this->blog_id = (string) $value;
+                                break;
+                        default:
+                                $this->$key = $value;
+                }
+        }
+
+        /**
          * Set the site name assigned to the network if one has not been populated.
          *
          * @since 4.4.0

src/wp-includes/class-wp-site.php

@@ -14 +14 @@
  * setup the current site.
  *
  * @since 4.5.0
+ *
+ * @property int $id
+ * @property int $network_id
  */
 final class WP_Site {
 
@@ -23 +26 @@
          * A numeric string, for compatibility reasons.
          *
          * @since 4.5.0
-         * @access public
+         * @access private
          * @var string
          */
-        public $blog_id;
+        private $blog_id;
 
         /**
          * Domain of the site.
@@ -55 +58 @@
          * A numeric string, for compatibility reasons.
          *
          * @since 4.5.0
-         * @access public
+         * @access private
          * @var string
          */
-        public $site_id = '0';
+        private $site_id = '0';
 
         /**
          * The date on which the site was created or registered.
@@ -210 +213 @@
         public function to_array() {
                 return get_object_vars( $this );
         }
+
+        /**
+         * Getter.
+         *
+         * Allows current multisite naming conventions when getting properties.
+         *
+         * @since 4.6.0
+         * @access public
+         *
+         * @param string $key Property to get.
+         * @return mixed Value of the property. Null if not available.
+         */
+        public function __get( $key ) {
+                switch ( $key ) {
+                        case 'id':
+                                return (int) $this->blog_id;
+                        case 'blog_id':
+                                return $this->blog_id;
+                        case 'site_id':
+                                return $this->site_id;
+                        case 'network_id':
+                                return (int) $this->site_id;
+                }
+
+                return null;
+        }
+
+        /**
+         * Isset-er.
+         *
+         * Allows current multisite naming conventions when checking for properties.
+         *
+         * @since 4.6.0
+         * @access public
+         *
+         * @param string $key Property to check if set.
+         * @return bool Whether the property is set.
+         */
+        public function __isset( $key ) {
+                switch ( $key ) {
+                        case 'id':
+                        case 'blog_id':
+                        case 'site_id':
+                        case 'network_id':
+                                return true;
+                }
+
+                return false;
+        }
+
+        /**
+         * Setter.
+         *
+         * Allows current multisite naming conventions while setting properties.
+         *
+         * @since 4.6.0
+         * @access public
+         *
+         * @param string $key   Property to set.
+         * @param mixed  $value Value to assign to the property.
+         */
+        public function __set( $key, $value ) {
+                switch( $key ) {
+                        case 'id':
+                        case 'blog_id':
+                                $this->blog_id = (string) $value;
+                                break;
+                        case 'site_id':
+                        case 'network_id':
+                                $this->site_id = (string) $value;
+                                break;
+                        default:
+                                $this->$key = $value;
+                }
+        }
 }