Changeset 37870

Timestamp:

06/26/2016 01:22:36 PM (10 years ago)

Author:

jeremyfelt

Message:

Multisite: Change WP_Network id property to an integer.

For consistency and developer sanity.

Props flixos90.
Fixes #37050.

Location:

trunk

Files:

• src/wp-includes/class-wp-network.php (modified) (5 diffs)
• tests/phpunit/tests/multisite/network.php (modified) (1 diff)

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

@@ -19 +19 @@
  * @since 4.4.0
  *
+ * @property int $id
  * @property int $site_id
  */
@@ -26 +27 @@
          * Network ID.
          *
-         * A numeric string, for compatibility reasons.
-         *
-         * @since 4.4.0
-         * @access public
-         * @var string
-         */
-        public $id;
+         * @since 4.4.0
+         * @since 4.6.0 Type changed from string to int.
+         * @access private
+         * @var int
+         */
+        private $id;
 
         /**
@@ -153 +153 @@
         public function __get( $key ) {
                 switch ( $key ) {
+                        case 'id';
+                                return (int) $this->id;
                         case 'blog_id':
                                 return $this->blog_id;
@@ -175 +177 @@
         public function __isset( $key ) {
                 switch ( $key ) {
+                        case 'id':
                         case 'blog_id':
                         case 'site_id':
@@ -196 +199 @@
         public function __set( $key, $value ) {
                 switch ( $key ) {
+                        case 'id':
+                                $this->id = (int) $value;
+                                break;
                         case 'blog_id':
                         case 'site_id':

trunk/tests/phpunit/tests/multisite/network.php

@@ -89 +89 @@
 
         /**
+         * @ticket 37050
+         */
+        function test_wp_network_object_id_property_is_int() {
+                $id = self::factory()->network->create();
+
+                $network = WP_Network::get_instance( $id );
+
+                $this->assertSame( (int) $id, $network->id );
+        }
+
+        /**
          * @ticket 22917
          */