Changeset 50935

Timestamp:

05/19/2021 10:10:58 PM (3 years ago)

Author:

SergeyBiryukov

Message:

General: Ensure consistent type for integer properties of WP_Post, WP_Term, and WP_User.

Previously, these properties could be unexpectedly converted to strings in some contexts.

This applies to the following functions:

• sanitize_post_field()
• sanitize_term_field()
• sanitize_user_field()

and the following properties:

• WP_Post::ID
• WP_Post::post_parent
• WP_Post::menu_order
• WP_Term::term_id
• WP_Term::term_taxonomy_id
• WP_Term::parent
• WP_Term::count
• WP_Term::term_group
• WP_User::ID

Props grantmkin, SergeyBiryukov.
Fixes #53235. See #52995.

Location:

trunk

Files:

• src/wp-includes/post.php (modified) (1 diff)
• src/wp-includes/taxonomy.php (modified) (1 diff)
• src/wp-includes/user.php (modified) (1 diff)
• tests/phpunit/tests/post/objects.php (modified) (1 diff)
• tests/phpunit/tests/term/getTerm.php (modified) (2 diffs)
• tests/phpunit/tests/user.php (modified) (1 diff)

trunk/src/wp-includes/post.php

@@ -2634 +2634 @@
     }
 
+    // Restore the type for integer fields after esc_attr().
+    if ( in_array( $field, $int_fields, true ) ) {
+        $value = (int) $value;
+    }
+
     return $value;
 }

trunk/src/wp-includes/taxonomy.php

@@ -1761 +1761 @@
         $value = esc_js( $value );
     }
+
+    // Restore the type for integer fields after esc_attr().
+    if ( in_array( $field, $int_fields, true ) ) {
+        $value = (int) $value;
+    }
+
     return $value;
 }

trunk/src/wp-includes/user.php

@@ -1531 +1531 @@
         $value = esc_js( $value );
     }
+
+    // Restore the type for integer fields after esc_attr().
+    if ( in_array( $field, $int_fields, true ) ) {
+        $value = (int) $value;
+    }
+
     return $value;
 }

trunk/tests/phpunit/tests/post/objects.php

@@ -185 +185 @@
     }
 
+    /**
+     * @ticket 53235
+     */
+    public function test_numeric_properties_should_be_cast_to_ints() {
+        $post_id  = self::factory()->post->create();
+        $contexts = array( 'raw', 'edit', 'db', 'display', 'attribute', 'js' );
+
+        foreach ( $contexts as $context ) {
+            $post = get_post( $post_id, OBJECT, $context );
+
+            $this->assertInternalType( 'int', $post->ID );
+            $this->assertInternalType( 'int', $post->post_parent );
+            $this->assertInternalType( 'int', $post->menu_order );
+        }
+    }
+
     function test_get_post_identity() {
         $post = get_post( self::factory()->post->create() );

trunk/tests/phpunit/tests/term/getTerm.php

@@ -125 +125 @@
     /**
      * @ticket 14162
+     * @ticket 53235
      */
     public function test_numeric_properties_should_be_cast_to_ints() {
@@ -134 +135 @@
         $term_data = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->terms t JOIN $wpdb->term_taxonomy tt ON ( t.term_id = tt.term_id ) WHERE t.term_id = %d", $t ) );
 
-        $found = get_term( $term_data );
-
-        $this->assertInstanceOf( 'WP_Term', $found );
-        $this->assertInternalType( 'int', $found->term_id );
-        $this->assertInternalType( 'int', $found->term_taxonomy_id );
-        $this->assertInternalType( 'int', $found->parent );
-        $this->assertInternalType( 'int', $found->count );
-        $this->assertInternalType( 'int', $found->term_group );
+        $contexts = array( 'raw', 'edit', 'db', 'display', 'rss', 'attribute', 'js' );
+
+        foreach ( $contexts as $context ) {
+            $found = get_term( $term_data, '', OBJECT, $context );
+
+            $this->assertInstanceOf( 'WP_Term', $found );
+            $this->assertInternalType( 'int', $found->term_id );
+            $this->assertInternalType( 'int', $found->term_taxonomy_id );
+            $this->assertInternalType( 'int', $found->parent );
+            $this->assertInternalType( 'int', $found->count );
+            $this->assertInternalType( 'int', $found->term_group );
+        }
     }
 

trunk/tests/phpunit/tests/user.php

@@ -203 +203 @@
         foreach ( get_object_vars( $user ) as $key => $value ) {
             $this->assertSame( $value, $user->$key );
+        }
+    }
+
+    /**
+     * @ticket 53235
+     */
+    public function test_numeric_properties_should_be_cast_to_ints() {
+        $user     = new WP_User( self::$author_id );
+        $contexts = array( 'raw', 'edit', 'db', 'display', 'attribute', 'js' );
+
+        foreach ( $contexts as $context ) {
+            $user->filter = $context;
+            $user->init( $user->data );
+
+            $this->assertInternalType( 'int', $user->ID );
         }
     }