Changeset 61766

Timestamp:

02/27/2026 11:07:25 PM (5 days ago)

Author:

westonruter

Message:

Code Quality: Replace void with null in union return types in link-template.php.

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

Follow-up to r61719, r61716, r32598.

Props apermo, xate, westonruter, noruzzaman.
See #64694, #64238.
Fixes #64699.

File:

• trunk/src/wp-includes/link-template.php (modified) (22 diffs)

trunk/src/wp-includes/link-template.php

@@ -1132 +1132 @@
  * @param int|WP_Term|null $term    Optional. Term ID or object. If null, the queried object will be inspected. Default null.
  * @param bool             $display Optional. Whether or not to echo the return. Default true.
- * @return string|void HTML content.
+ * @return string| HTML content.
  */
 function edit_term_link( $link = '', $before = '', $after = '', $term = null, $display = true ) {
@@ -1142 +1142 @@
 
     if ( ! $term ) {
-        return;
+        return;
     }
 
     $tax = get_taxonomy( $term->taxonomy );
     if ( ! current_user_can( 'edit_term', $term->term_id ) ) {
-        return;
+        return;
     }
 
@@ -1553 +1553 @@
  * @param string      $deprecated   Not used.
  * @param bool        $force_delete Optional. Whether to bypass Trash and force deletion. Default false.
- * @return string|void The delete post link URL for the given post.
+ * @return string| The delete post link URL for the given post.
  */
 function get_delete_post_link( $post = 0, $deprecated = '', $force_delete = false ) {
@@ -1563 +1563 @@
 
     if ( ! $post ) {
-        return;
+        return;
     }
 
@@ -1569 +1569 @@
 
     if ( ! $post_type_object ) {
-        return;
+        return;
     }
 
     if ( ! current_user_can( 'delete_post', $post->ID ) ) {
-        return;
+        return;
     }
 
@@ -1601 +1601 @@
  * @param string         $context    Optional. Context in which the URL should be used. Either 'display',
  *                                   to include HTML entities, or 'url'. Default 'display'.
- * @return string|void The edit comment link URL for the given comment, or void if the comment id does not exist or
+ * @return string| does not exist or
  *                     the current user is not allowed to edit it.
  */
@@ -1608 +1608 @@
 
     if ( ! is_object( $comment ) || ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
-        return;
+        return;
     }
 
@@ -1675 +1675 @@
  *
  * @param int|stdClass $link Optional. Bookmark ID. Default is the ID of the current bookmark.
- * @return string|void The edit bookmark link URL.
+ * @return string| The edit bookmark link URL.
  */
 function get_edit_bookmark_link( $link = 0 ) {
@@ -1681 +1681 @@
 
     if ( ! current_user_can( 'manage_links' ) ) {
-        return;
+        return;
     }
 
@@ -2058 +2058 @@
  *                                     Default true.
  * @param string       $taxonomy       Optional. Taxonomy, if `$in_same_term` is true. Default 'category'.
- * @return string|void The adjacent post relational link URL.
+ * @return string| The adjacent post relational link URL.
  */
 function get_adjacent_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
@@ -2069 +2069 @@
 
     if ( empty( $post ) ) {
-        return;
+        return;
     }
 
@@ -2516 +2516 @@
  *
  * @param int $max_page Optional. Max pages. Default 0.
- * @return string|void The link URL for next posts page.
+ * @return string| The link URL for next posts page.
  */
 function get_next_posts_page_link( $max_page = 0 ) {
@@ -2541 +2541 @@
  * @param int  $max_page Optional. Max pages. Default 0.
  * @param bool $display  Optional. Whether to echo the link. Default true.
- * @return string|void The link URL for next posts page if `$display = false`.
+ * @return string| The link URL for next posts page if `$display = false`.
  */
 function next_posts( $max_page = 0, $display = true ) {
@@ -2564 +2564 @@
  * @param string $label    Content for link text.
  * @param int    $max_page Optional. Max pages. Default 0.
- * @return string|void HTML-formatted next posts page link.
+ * @return string| HTML-formatted next posts page link.
  */
 function get_next_posts_link( $label = null, $max_page = 0 ) {
@@ -2625 +2625 @@
  * @global int $paged
  *
- * @return string|void The link for the previous posts page.
+ * @return string| The link for the previous posts page.
  */
 function get_previous_posts_page_link() {
@@ -2647 +2647 @@
  *
  * @param bool $display Optional. Whether to echo the link. Default true.
- * @return string|void The previous posts page link if `$display = false`.
+ * @return string| The previous posts page link if `$display = false`.
  */
 function previous_posts( $display = true ) {
@@ -2667 +2667 @@
  *
  * @param string $label Optional. Previous page link text.
- * @return string|void HTML-formatted previous page link.
+ * @return string| HTML-formatted previous page link.
  */
 function get_previous_posts_link( $label = null ) {
@@ -3125 +3125 @@
  * @param int      $max_page Optional. Max page. Default 0.
  * @param int|null $page     Optional. Page number. Default null.
- * @return string|void HTML-formatted link for the next page of comments.
+ * @return string| HTML-formatted link for the next page of comments.
  */
 function get_next_comments_link( $label = '', $max_page = 0, $page = null ) {
@@ -3131 +3131 @@
 
     if ( ! is_singular() ) {
-        return;
+        return;
     }
 
@@ -3153 +3153 @@
 
     if ( $next_page > $max_page ) {
-        return;
+        return;
     }
 
@@ -3197 +3197 @@
  * @param string   $label Optional. Label for comments link text. Default empty.
  * @param int|null $page  Optional. Page number. Default null.
- * @return string|void HTML-formatted link for the previous page of comments.
+ * @return string| HTML-formatted link for the previous page of comments.
  */
 function get_previous_comments_link( $label = '', $page = null ) {
     if ( ! is_singular() ) {
-        return;
+        return;
     }
 
@@ -3209 +3209 @@
 
     if ( (int) $page <= 1 ) {
-        return;
+        return;
     }