Context Navigation

← Previous Change
Next Change →

class-wp-admin-bar.php

Timestamp:

03/30/2026 05:31:56 AM (4 months ago)

Author:

westonruter

Message:

Code Quality: Replace void with proper return types in union PHPDoc annotations.

In PHP's type system, void means a function does not return a value and cannot be part of a union type. Many functions in core were documented as returning e.g. string|void while actually returning null implicitly via bare return; statements. This replaces void with null in union return types, adds explicit return null; statements, and updates @return annotations across 22 files in wp-includes.

Additionally:

Adds @return never for WP_Recovery_Mode::redirect_protected().
Fixes WP_Theme_JSON::set_spacing_sizes() to use @return void instead of @return null|void.
Removes void from return types where the function always returns a value or dies: remove_theme_support(), WP_Recovery_Mode::handle_error().
Fixes wp_die() return type from never|void to void with clarified description.
Initializes $primary variable in get_active_blog_for_user() to prevent a possible undefined variable notice.

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

Follow-up to r62177, r61766, r61719.

Props apermo, xateman, westonruter, parthvataliya, nimeshatxecurify.
See #64704.

File:

: 1 edited

trunk/src/wp-includes/class-wp-admin-bar.php (modified) (6 diffs)

Legend:

: Unmodified
: Added
: Removed

trunk/src/wp-includes/class-wp-admin-bar.php

-              r61997
+              r62178
+         *
          * @param string $id
          * @return object|void Node.
+         * @return object|null Node.
          */
         final public function get_node( $id ) {
 …
                         return clone $node;
+                }
+                return null;
+        }
 …
+         *
          * @param string $id
          * @return object|void
+         * @return object|null
          */
         final protected function _get_node( $id ) {
                 if ( $this->bound ) {
                         return;
+                        return null;
+                }
 …
                         return $this->nodes[ $id ];
+                }
+        }
+        /**
+         * @since 3.3.0
+         *
+         * @return array|void
+                return null;
+        }
+        /**
+         * @since 3.3.0
+         *
+         * @return array|null
          */
         final public function get_nodes() {
                 $nodes = $this->_get_nodes();
                 if ( ! $nodes ) {
                         return;
+                        return null;
+                }
 …
          * @since 3.3.0
+         *
          * @return array|void
+         * @return array|null
          */
         final protected function _get_nodes() {
                 if ( $this->bound ) {
                         return;
+                        return null;
+                }
 …
          * @since 3.3.0
+         *
          * @return object|void
+         * @return object|null
          */
         final protected function _bind() {
                 if ( $this->bound ) {
                         return;
+                        return null;
+                }

Note: See TracChangeset for help on using the changeset viewer.

Make WordPress Core

Context Navigation

Changeset 62178 for trunk/src/wp-includes/class-wp-admin-bar.php

Legend:

trunk/src/wp-includes/class-wp-admin-bar.php

Download in other formats: