Changeset 61768

Timestamp:

02/27/2026 11:28:17 PM (5 days ago)

Author:

westonruter

Message:

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

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

Follow-up to r61767, r61766, r61719, r61716, r53300, r32598.

Props apermo, xate, mukesh27.
See #64238.
Fixes #64700.

File:

• trunk/src/wp-includes/general-template.php (modified) (14 diffs)

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

@@ -1339 +1339 @@
  * @param bool   $display     Optional. Whether to display or retrieve title. Default true.
  * @param string $seplocation Optional. Location of the separator (either 'left' or 'right').
- * @return string|void String when `$display` is false, nothing otherwise.
+ * @return string| otherwise.
  */
 function wp_title( $sep = '»', $display = true, $seplocation = '' ) {
@@ -1490 +1490 @@
  * @param string $prefix  Optional. What to display before the title.
  * @param bool   $display Optional. Whether to display or retrieve title. Default true.
- * @return string|void Title when retrieving.
+ * @return string| Title when retrieving.
  */
 function single_post_title( $prefix = '', $display = true ) {
@@ -1496 +1496 @@
 
     if ( ! isset( $_post->post_title ) ) {
-        return;
+        return;
     }
 
@@ -1525 +1525 @@
  * @param string $prefix  Optional. What to display before the title.
  * @param bool   $display Optional. Whether to display or retrieve title. Default true.
- * @return string|void Title when retrieving, null when displaying or failure.
+ * @return string| failure.
  */
 function post_type_archive_title( $prefix = '', $display = true ) {
     if ( ! is_post_type_archive() ) {
-        return;
+        return;
     }
 
@@ -1567 +1567 @@
  * @param string $prefix  Optional. What to display before the title.
  * @param bool   $display Optional. Whether to display or retrieve title. Default true.
- * @return string|void Title when retrieving.
+ * @return string| Title when retrieving.
  */
 function single_cat_title( $prefix = '', $display = true ) {
@@ -1584 +1584 @@
  * @param string $prefix  Optional. What to display before the title.
  * @param bool   $display Optional. Whether to display or retrieve title. Default true.
- * @return string|void Title when retrieving.
+ * @return string| Title when retrieving.
  */
 function single_tag_title( $prefix = '', $display = true ) {
@@ -1601 +1601 @@
  * @param string $prefix  Optional. What to display before the title.
  * @param bool   $display Optional. Whether to display or retrieve title. Default true.
- * @return string|void Title when retrieving.
+ * @return string| Title when retrieving.
  */
 function single_term_title( $prefix = '', $display = true ) {
@@ -1607 +1607 @@
 
     if ( ! $term ) {
-        return;
+        return;
     }
 
@@ -1638 +1638 @@
         $term_name = apply_filters( 'single_term_title', $term->name );
     } else {
-        return;
+        return;
     }
 
     if ( empty( $term_name ) ) {
-        return;
+        return;
     }
 
@@ -1666 +1666 @@
  * @param string $prefix  Optional. What to display before the title.
  * @param bool   $display Optional. Whether to display or retrieve title. Default true.
- * @return string|false|void False if there's no valid title for the month. Title when retrieving.
+ * @return string|false| False if there's no valid title for the month. Title when retrieving.
  */
 function single_month_title( $prefix = '', $display = true ) {
@@ -2682 +2682 @@
  * @param string $after   Optional. Output after the date. Default empty.
  * @param bool   $display Optional. Whether to echo the date or return it. Default true.
- * @return string|void String if retrieving.
+ * @return string| String if retrieving.
  */
 function the_date( $format = '', $before = '', $after = '', $display = true ) {
@@ -2757 +2757 @@
  * @param string $after   Optional. Output after the date. Default empty.
  * @param bool   $display Optional. Whether to echo the date or return it. Default true.
- * @return string|void String if retrieving.
+ * @return string| String if retrieving.
  */
 function the_modified_date( $format = '', $before = '', $after = '', $display = true ) {
@@ -5167 +5167 @@
  *
  * @param string $type The type of generator to return - (html|xhtml|atom|rss2|rdf|comment|export).
- * @return string|void The HTML content for the generator.
+ * @return string| The HTML content for the generator.
  */
 function get_the_generator( $type = '' ) {
@@ -5174 +5174 @@
         $current_filter = current_filter();
         if ( empty( $current_filter ) ) {
-            return;
+            return;
         }