Changeset 61789

Timestamp:

03/03/2026 05:53:52 AM (2 days ago)

Author:

westonruter

Message:

Code Quality: Normalize object as type being supplied as comment, post, site, term, and user.

When constructing these objects, the specific instance type is redundantly used in a union with a generic object. A generic object can be passed directly from database row result. This also hardens get_post() to account for passing an object that lacks an ID property. Similarly, sanitize_term() is hardened to account for an object lacking a term_id property. Comprehensive unit tests are added for get_post() and sanitize_term().

Developed in ​https://github.com/WordPress/wordpress-develop/pull/11096

Props westonruter, apermo.
See #64238, #64225.

Location:

trunk

Files:

• src/wp-includes/class-wp-comment.php (modified) (1 diff)
• src/wp-includes/class-wp-post.php (modified) (1 diff)
• src/wp-includes/class-wp-site.php (modified) (1 diff)
• src/wp-includes/class-wp-term.php (modified) (1 diff)
• src/wp-includes/class-wp-user.php (modified) (1 diff)
• src/wp-includes/post.php (modified) (2 diffs)
• src/wp-includes/taxonomy.php (modified) (1 diff)
• tests/phpunit/tests/post/getPost.php (added)
• tests/phpunit/tests/term/sanitizeTerm.php (added)

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

@@ -211 +211 @@
      * @since 4.4.0
      *
-     * @param WP_Comment $comment Comment object.
+     * @param t $comment Comment object.
      */
     public function __construct( $comment ) {

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

@@ -261 +261 @@
      * @since 3.5.0
      *
-     * @param WP_Post|object $post Post object.
+     * @param object $post Post object.
      */
     public function __construct( $post ) {

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

@@ -191 +191 @@
      * @since 4.5.0
      *
-     * @param WP_Site|object $site A site object.
+     * @param object $site A site object.
      */
     public function __construct( $site ) {

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

@@ -193 +193 @@
      * @since 4.4.0
      *
-     * @param WP_Term|object $term Term object.
+     * @param object $term Term object.
      */
     public function __construct( $term ) {

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

@@ -122 +122 @@
      * @global wpdb $wpdb WordPress database abstraction object.
      *
-     * @param int|string|stdClass|WP_User $id      User's ID, a WP_User object, or a user object from the DB.
-     * @param string                      $name    Optional. User's username
-     * @param int                         $site_id Optional Site ID, defaults to current site.
+     * @param int|string| $id      User's ID, a WP_User object, or a user object from the DB.
+     * @param string            $name    Optional. User's username
+     * @param int               $site_id Optional Site ID, defaults to current site.
      */
     public function __construct( $id = 0, $name = '', $site_id = 0 ) {

trunk/src/wp-includes/post.php

@@ -1136 +1136 @@
  * @global WP_Post $post Global post object.
  *
- * @param int|WP_Post|null $post   Optional. Post ID or post object. `null`, `false`, `0` and other PHP falsey values
+ * @param int| $post   Optional. Post ID or post object. `null`, `false`, `0` and other PHP falsey values
  *                                 return the current global post inside the loop. A numerically valid post ID that
  *                                 points to a non-existent post returns `null`. Defaults to global $post.
@@ -1160 +1160 @@
         } elseif ( 'raw' === $post->filter ) {
             $_post = new WP_Post( $post );
+
+
         } else {
-            $_post = WP_Post::get_instance( $post->ID );
+            $_post = ;
         }
     } else {

trunk/src/wp-includes/taxonomy.php

@@ -1724 +1724 @@
     $do_object = is_object( $term );
 
-    $term_id = $do_object ? $term->term_id : ( $term['term_id'] ?? 0 );
+    $term_id = $do_object ?  : ( $term['term_id'] ?? 0 );
 
     foreach ( (array) $fields as $field ) {