Use PHPUnit assertion methods

Author: westonruter

src/wp-includes/general-template.php

@@ -4676,12 +4676,16 @@ function paginate_links( $args = '' ) {
 	 * incorrect URL to the correctly formatted one. This presents an
 	 * unnecessary performance hit.
 	 */
+<<<<<<< HEAD
 	if ( $wp_rewrite->using_permalinks() && ! $wp_rewrite->use_trailing_slashes ) {
 		$pagenum_link = untrailingslashit( $url_parts[0] );
 	} else {
 		$pagenum_link = trailingslashit( $url_parts[0] );
 	}
 	$pagenum_link .= '%_%';
+=======
+	$pagenum_link = user_trailingslashit( $url_parts[0] );
+>>>>>>> d52bdb7a8f (Use PHPUnit assertion methods)
 
 	// URL base depends on permalink settings.
 	$format  = $wp_rewrite->using_index_permalinks() && ! strpos( $pagenum_link, 'index.php' ) ? 'index.php/' : '';

tests/phpunit/tests/general/paginateLinks.php

@@ -21,12 +21,12 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ): void
 				'name'     => 'Categorized',
 			)
 		);
-		assert( is_int( $category_id ) );
+		self::assertIsInt( $category_id );
 
 		$post_ids = $factory->post->create_many( 10 );
 		foreach ( $post_ids as $post_id ) {
-			assert( is_int( $post_id ) );
-			assert( is_array( wp_set_post_categories( $post_id, array( $category_id ) ) ) );
+			self::assertIsInt( $post_id );
+			self::assertIsArray( wp_set_post_categories( $post_id, array( $category_id ) ) );
 		}
 	}