Apply suggestions from code review

Co-authored-by: Weston Ruter <[email protected]>

Author: peterwilsoncc

src/wp-includes/general-template.php

@@ -4672,8 +4672,8 @@ function paginate_links( $args = '' ) {
 	/*
 	 * Ensures sites not using trailing slashes get links in the form
 	 * `/page/2` rather than `/page/2/`. On these sites, linking to the
-	 * URL with a trailing slash will results in a 301 redirect from the
-	 * incorrect URL to the correctly formattted one. This presents an
+	 * URL with a trailing slash will result in a 301 redirect from the
+	 * incorrect URL to the correctly formatted one. This presents an
 	 * unnecessary performance hit.
 	 */
 	if ( $wp_rewrite->using_permalinks() && ! $wp_rewrite->use_trailing_slashes ) {

tests/phpunit/tests/general/paginateLinks.php

@@ -435,7 +435,7 @@ public function test_permalinks_with_trailing_slash_produce_links_with_trailing_
 		$found_links = 0;
 		while ( $processor->next_tag( 'A' ) ) {
 			++$found_links;
-			$href = $processor->get_attribute( 'href' );
+			$href = (string) $processor->get_attribute( 'href' );
 			$this->assertStringEndsWith( '/', $href, "Pagination links should end with a trailing slash, found: $href" );
 		}
 		$this->assertGreaterThan( 0, $found_links, 'There should be pagination links found.' );
@@ -459,8 +459,8 @@ public function test_permalinks_without_trailing_slash_produce_links_without_tra
 		$found_links = 0;
 		while ( $processor->next_tag( 'A' ) ) {
 			++$found_links;
-			$href = $processor->get_attribute( 'href' );
-			$this->assertStringEndsNotWith( '/', $href, "Pagination links should end with a trailing slash, found: $href" );
+			$href = (string) $processor->get_attribute( 'href' );
+			$this->assertStringEndsNotWith( '/', $href, "Pagination links should not end with a trailing slash, found: $href" );
 		}
 		$this->assertGreaterThan( 0, $found_links, 'There should be pagination links found.' );
 	}
@@ -474,7 +474,6 @@ public function test_permalinks_without_trailing_slash_produce_links_without_tra
 	 * @dataProvider data_query_strings
 	 *
 	 * @param string $query_string Query string.
-	 * @param string $unexpected   Unexpected query string.
 	 */
 	public function test_permalinks_with_trailing_slash_do_not_modify_query_strings( string $query_string ) {
 		update_option( 'posts_per_page', 2 );
@@ -489,7 +488,7 @@ public function test_permalinks_with_trailing_slash_do_not_modify_query_strings(
 		$found_links = 0;
 		while ( $processor->next_tag( 'A' ) ) {
 			++$found_links;
-			$href = $processor->get_attribute( 'href' );
+			$href = (string) $processor->get_attribute( 'href' );
 			$this->assertStringEndsWith( "/?{$query_string}", $href, "Pagination links should not modify the query string, found: $href" );
 		}
 		$this->assertGreaterThan( 0, $found_links, 'There should be pagination links found.' );
@@ -504,7 +503,6 @@ public function test_permalinks_with_trailing_slash_do_not_modify_query_strings(
 	 * @dataProvider data_query_strings
 	 *
 	 * @param string $query_string Query string.
-	 * @param string $unexpected   Unexpected query string.
 	 */
 	public function test_permalinks_without_trailing_slash_do_not_modify_query_strings( string $query_string ) {
 		update_option( 'posts_per_page', 2 );
@@ -519,7 +517,7 @@ public function test_permalinks_without_trailing_slash_do_not_modify_query_strin
 		$found_links = 0;
 		while ( $processor->next_tag( 'A' ) ) {
 			++$found_links;
-			$href = $processor->get_attribute( 'href' );
+			$href = (string) $processor->get_attribute( 'href' );
 			$this->assertStringEndsWith( "?{$query_string}", $href, "Pagination links should not modify the query string, found: $href" );
 			$this->assertStringEndsNotWith( "/?{$query_string}", $href, "Pagination links should not be slashed before the query string, found: $href" );
 		}
@@ -531,12 +529,12 @@ public function test_permalinks_without_trailing_slash_do_not_modify_query_strin
 	 *  - test_permalinks_without_trailing_slash_do_not_modify_query_strings
 	 *  - test_permalinks_with_trailing_slash_do_not_modify_query_strings
 	 *
-	 * @return array<string[]> Data provider.
+	 * @return array<string, array{ 0: string }> Data provider.
 	 */
 	public function data_query_strings(): array {
 		return array(
-			array( 'foo=bar' ),
-			array( 'foo=bar&pen=pencil' ),
+			'single query var' => array( 'foo=bar' ),
+			'multi query vars' => array( 'foo=bar&pen=pencil' ),
 		);
 	}
 }