Ticket #48027: 48027.1.diff

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

@@ -162 +162 @@
          * Retrieves a WP_Comment instance.
          *
          * @since 4.4.0
+         * @since 5.3.0 Convert WP_Comment::$user_id to int.
          *
          * @global wpdb $wpdb WordPress database abstraction object.
          *
@@ -188 +189 @@
                         wp_cache_add( $_comment->comment_ID, $_comment, 'comment' );
                 }
 
+                $_comment->user_id = ( int ) $_comment->user_id;
+
                 return new WP_Comment( $_comment );
         }
 

tests/phpunit/tests/comment-submission.php

@@ -246 +246 @@
                 $this->assertSame( 'Comment Author', $comment->comment_author );
                 $this->assertSame( 'comment@example.org', $comment->comment_author_email );
                 $this->assertSame( 'http://user.example.org', $comment->comment_author_url );
-                $this->assertSame( '0', $comment->user_id );
+                $this->assertSame( 0, $comment->user_id );
 
         }
 

tests/phpunit/tests/comment.php

@@ -855 +855 @@
 
                 $expected = array(
                         'comment_ID'           => (string) $comment_id,
-                        'user_id'              => '0', // Anonymized.
+                        'user_id'              => 0, // Anonymized.
                         'comment_author'       => 'Anonymous', // Anonymized.
                         'comment_author_email' => '', // Anonymized.
                         'comment_author_url'   => '', // Anonymized.
@@ -1241 +1241 @@
                 // Number of exported comments.
                 $this->assertSame( 0, count( $actual['data'] ) );
         }
+
+        /**
+         * @ticket 48027
+         */
+        public function test_user_id_from_get_comment_should_be_int() {
+                $args = array(
+                        'user_id'                          => self::$user_id,
+                        'comment_post_ID'      => self::$post_id,
+                        'comment_author'       => 'Comment Author',
+                        'comment_author_email' => 'personal@local.host',
+                        'comment_author_url'   => 'https://local.host/',
+                        'comment_author_IP'    => '192.168.0.1',
+                        'comment_date'         => '2018-03-28 20:05:00',
+                        'comment_agent'        => 'SOME_AGENT',
+                        'comment_content'      => 'Comment',
+                );
+
+                $c = self::factory()->comment->create( $args );
+
+                $comment = get_comment( $c );
+                $this->assertSame( $comment->user_id, self::$user_id );
+
+                // Test for get_comments().
+                $user_id_1 = self::factory()->user->create();
+                $user_id_2 = self::factory()->user->create();
+                $user_id_3 = self::factory()->user->create();
+                self::factory()->comment->create( array( 'user_id' => $user_id_1, 'comment_post_ID' => self::$post_id ) );
+                self::factory()->comment->create( array( 'user_id' => $user_id_2, 'comment_post_ID' => self::$post_id ) );
+                self::factory()->comment->create( array( 'user_id' => $user_id_3, 'comment_post_ID' => self::$post_id ) );
+
+                $comments = get_comments( array( 'post_id' => self::$post_id ) );
+
+                foreach( $comments as $comm ) {
+                        $this->assertInternalType( 'int', $comm->user_id );
+                }
+        }
 }

tests/phpunit/tests/xmlrpc/wp/getComment.php

@@ -54 +54 @@
                 $this->assertNotIXRError( $result );
 
                 // Check data types
-                $this->assertInternalType( 'string', $result['user_id'] );
+                $this->assertInternalType( 'int', $result['user_id'] );
                 $this->assertInternalType( 'string', $result['comment_id'] );
                 $this->assertInstanceOf( 'IXR_Date', $result['date_created_gmt'] );
                 $this->assertInternalType( 'string', $result['parent'] );