Changeset 59020

Timestamp:

09/13/2024 10:10:51 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Networks and Sites: Set WP_Network properties via setters upon creation.

This ensures that WP_Network::$id is stored internally as int, to match the documented type.

Follow-up to [37870].

Props ironprogrammer, scottculverhouse, spacedmonkey, SergeyBiryukov.
See #62035.

Location:

trunk

Files:

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

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

@@ -132 +132 @@
         public function __construct( $network ) {
                 foreach ( get_object_vars( $network ) as $key => $value ) {
-                        $this->$key = $value;
+                        $this->__set( $key, $value );
                 }
 

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

@@ -128 +128 @@
                 /**
                  * @ticket 37050
+                 *
+                 * @covers WP_Network::__get
                  */
                 public function test_wp_network_object_id_property_is_int() {
@@ -135 +137 @@
 
                         $this->assertSame( (int) $id, $network->id );
+                }
+
+                /**
+                 * Tests that the `WP_Network::$id` property is stored as int.
+                 *
+                 * Uses reflection to access the private property.
+                 * Differs from using the public getter method, which casts to int.
+                 *
+                 * @ticket 62035
+                 *
+                 * @covers WP_Network::__construct
+                 */
+                public function test_wp_network_object_id_property_stored_as_int() {
+                        $id = self::factory()->network->create();
+
+                        $network = WP_Network::get_instance( $id );
+
+                        $reflection = new ReflectionObject( $network );
+                        $property   = $reflection->getProperty( 'id' );
+                        $property->setAccessible( true );
+
+                        $this->assertSame( (int) $id, $property->getValue( $network ) );
                 }