Ticket #60475: 60475.diff

src/wp-includes/comment-template.php

@@ -24 +24 @@
 function get_comment_author( $comment_id = 0 ) {
         $comment = get_comment( $comment_id );
 
-        $comment_id = ! empty( $comment->comment_ID ) ? $comment->comment_ID : $comment_id;
+        $comment_id = ! empty( $comment->comment_ID ) ? $comment->comment_ID : (string) $comment_id;
 
         if ( empty( $comment->comment_author ) ) {
                 $user = ! empty( $comment->user_id ) ? get_userdata( $comment->user_id ) : false;

tests/phpunit/tests/comment/getCommentAuthor.php

@@ +1 @@
+<?php
+
+/**
+ * @group comment
+ *
+ * @covers ::get_comment_author
+ */
+class Tests_Comment_GetCommentAuthor extends WP_UnitTestCase {
+
+        private static $comment;
+
+        public static function set_up_before_class() {
+                parent::set_up_before_class();
+
+                self::$comment = self::factory()->comment->create_and_get(
+                        array(
+                                'comment_post_ID' => 0,
+                        )
+                );
+        }
+
+        public function get_comment_author_filter( $comment_author, $comment_id, $comment ) {
+                $this->assertSame( $comment_id, self::$comment->comment_ID, 'Comment IDs do not match.' );
+                $this->assertTrue( is_string( $comment_id ), '$comment_id parameter is not a string.' );
+
+                return $comment_author;
+        }
+
+        public function test_comment_author_passes_correct_comment_id_for_comment_object() {
+                add_filter( 'get_comment_author', array( $this, 'get_comment_author_filter' ), 99, 3 );
+
+                get_comment_author( self::$comment );
+
+                remove_filter( 'get_comment_author', array( $this, 'get_comment_author_filter' ), 99 );
+        }
+
+        public function test_comment_author_passes_correct_comment_id_for_int() {
+                add_filter( 'get_comment_author', array( $this, 'get_comment_author_filter' ), 99, 3 );
+
+                get_comment_author( self::$comment->comment_ID );
+
+                remove_filter( 'get_comment_author', array( $this, 'get_comment_author_filter' ), 99 );
+        }
+
+        public function get_comment_author_filter_non_existent_id( $comment_author, $comment_id, $comment ) {
+                $this->assertSame( $comment_id, (string) $this->non_existent_comment_id, 'Comment IDs do not match.' );
+                $this->assertTrue( is_string( $comment_id ), '$comment_id parameter is not a string.' );
+
+                return $comment_author;
+        }
+
+        public function test_comment_author_passes_correct_comment_id_for_non_existent_comment() {
+                add_filter( 'get_comment_author', array( $this, 'get_comment_author_filter_non_existent_id' ), 99, 3 );
+
+                $this->non_existent_comment_id = self::$comment->comment_ID + 1;
+
+                get_comment_author( $this->non_existent_comment_id ); // non-existent comment ID.
+
+                remove_filter( 'get_comment_author', array( $this, 'get_comment_author_filter_non_existent_id' ), 99 );
+        }
+}