diff --git a/src/wp-admin/includes/class-wp-importer.php b/src/wp-admin/includes/class-wp-importer.php index 085a5adc0e71a..0c66b02a96bdd 100644 --- a/src/wp-admin/includes/class-wp-importer.php +++ b/src/wp-admin/includes/class-wp-importer.php @@ -135,8 +135,14 @@ public function get_imported_comments( $blog_id ) { } /** - * @param int $blog_id - * @return int|void + * Sets the blog to import to. + * + * Accepts a numeric blog ID or a URL string. When given a URL, + * the blog is looked up by domain and path. On multisite, switches + * to the resolved blog. Exits with an error if the blog cannot be found. + * + * @param int|string $blog_id Blog ID or URL. + * @return int|never Blog ID on success. Exits on failure. */ public function set_blog( $blog_id ) { if ( is_numeric( $blog_id ) ) { @@ -177,7 +183,7 @@ public function set_blog( $blog_id ) { /** * @param int $user_id - * @return int|void + * @return int|never */ public function set_user( $user_id ) { if ( is_numeric( $user_id ) ) { diff --git a/src/wp-admin/includes/class-wp-privacy-requests-table.php b/src/wp-admin/includes/class-wp-privacy-requests-table.php index cffd2218f11f7..59f926e9d7b27 100644 --- a/src/wp-admin/includes/class-wp-privacy-requests-table.php +++ b/src/wp-admin/includes/class-wp-privacy-requests-table.php @@ -435,7 +435,7 @@ public function column_cb( $item ) { * @since 4.9.6 * * @param WP_User_Request $item Item being shown. - * @return string|void Status column markup. Returns a string if no status is found, + * @return string|null Status column markup. Returns a string if no status is found, * otherwise it displays the markup. */ public function column_status( $item ) { diff --git a/src/wp-admin/includes/class-wp-site-health.php b/src/wp-admin/includes/class-wp-site-health.php index 44c04175abaf2..75e046ef8ffa7 100644 --- a/src/wp-admin/includes/class-wp-site-health.php +++ b/src/wp-admin/includes/class-wp-site-health.php @@ -167,7 +167,17 @@ public function enqueue_scripts() { * @since 5.4.0 * * @param callable $callback - * @return mixed|void + * @return array{ + * label: string, + * status: 'good'|'recommended'|'critical', + * badge: array{ + * label: string, + * color: string, + * }, + * description: string, + * actions: string, + * test: string, + * } */ private function perform_test( $callback ) { /** diff --git a/src/wp-admin/includes/dashboard.php b/src/wp-admin/includes/dashboard.php index 94d95f749f84b..c3541180a9bdb 100644 --- a/src/wp-admin/includes/dashboard.php +++ b/src/wp-admin/includes/dashboard.php @@ -1648,7 +1648,7 @@ function wp_dashboard_primary_output( $widget_id, $feeds ) { * * @since 3.0.0 * - * @return true|void True if not multisite, user can't upload files, or the space check option is disabled. + * @return true|null True if not multisite, user can't upload files, or the space check option is disabled. */ function wp_dashboard_quota() { if ( ! is_multisite() || ! current_user_can( 'upload_files' ) diff --git a/src/wp-admin/includes/file.php b/src/wp-admin/includes/file.php index bea00005d9f60..78ab76953a947 100644 --- a/src/wp-admin/includes/file.php +++ b/src/wp-admin/includes/file.php @@ -734,7 +734,7 @@ function wp_tempnam( $filename = '', $dir = '' ) { * @param string $file File the user is attempting to edit. * @param string[] $allowed_files Optional. Array of allowed files to edit. * `$file` must match an entry exactly. - * @return string|void Returns the file name on success, dies on failure. + * @return string|null|never Returns the file name on success, null in case of absolute Windows drive paths, and dies on failure. */ function validate_file_to_edit( $file, $allowed_files = array() ) { $code = validate_file( $file, $allowed_files ); @@ -753,6 +753,7 @@ function validate_file_to_edit( $file, $allowed_files = array() ) { case 3: wp_die( __( 'Sorry, that file cannot be edited.' ) ); } + return null; } /** diff --git a/src/wp-admin/includes/media.php b/src/wp-admin/includes/media.php index 7cb942f1c945f..61c299e4e8f79 100644 --- a/src/wp-admin/includes/media.php +++ b/src/wp-admin/includes/media.php @@ -269,6 +269,7 @@ function _cleanup_image_add_caption( $matches ) { * @since 2.5.0 * * @param string $html + * @return never */ function media_send_to_editor( $html ) { ?> @@ -753,7 +754,7 @@ function get_upload_iframe_src( $type = null, $post_id = null, $tab = null ) { * * @since 2.5.0 * - * @return null|array|void Array of error messages keyed by attachment ID, null or void on success. + * @return null|array|never Array of error messages keyed by attachment ID, null on success, or exit. */ function media_upload_form_handler() { check_admin_referer( 'media-form' ); @@ -874,7 +875,7 @@ function media_upload_form_handler() { */ $html = apply_filters( 'media_send_to_editor', $html, $send_id, $attachment ); - return media_send_to_editor( $html ); + media_send_to_editor( $html ); } return $errors; @@ -976,7 +977,7 @@ function wp_media_upload_handler() { $html = apply_filters( 'image_send_to_editor_url', $html, sanitize_url( $src ), $alt, $align ); } - return media_send_to_editor( $html ); + media_send_to_editor( $html ); } if ( isset( $_POST['save'] ) ) { diff --git a/src/wp-admin/includes/plugin.php b/src/wp-admin/includes/plugin.php index fae10f1a679a4..ce5e7b8fbaab7 100644 --- a/src/wp-admin/includes/plugin.php +++ b/src/wp-admin/includes/plugin.php @@ -1296,8 +1296,8 @@ function is_uninstallable_plugin( $plugin ) { * @since 2.7.0 * * @param string $plugin Path to the plugin file relative to the plugins directory. - * @return true|void True if a plugin's uninstall.php file has been found and included. - * Void otherwise. + * @return true|null True if a plugin's uninstall.php file has been found and included. + * Null otherwise. */ function uninstall_plugin( $plugin ) { $file = plugin_basename( $plugin ); diff --git a/src/wp-admin/includes/post.php b/src/wp-admin/includes/post.php index a087e6b560f05..422c7e31ac208 100644 --- a/src/wp-admin/includes/post.php +++ b/src/wp-admin/includes/post.php @@ -982,15 +982,15 @@ function wp_write_post() { * * @since 2.0.0 * - * @return int|void Post ID on success, void on failure. + * @return int|never Post ID on success. Dies on failure. */ function write_post() { $result = wp_write_post(); if ( is_wp_error( $result ) ) { wp_die( $result->get_error_message() ); - } else { - return $result; } + + return $result; } // diff --git a/src/wp-includes/class-wp-admin-bar.php b/src/wp-includes/class-wp-admin-bar.php index e1f7282f82ab9..fbaba22ee2f0b 100644 --- a/src/wp-includes/class-wp-admin-bar.php +++ b/src/wp-includes/class-wp-admin-bar.php @@ -193,24 +193,25 @@ final protected function _set_node( $args ) { * @since 3.3.0 * * @param string $id - * @return object|void Node. + * @return object|null Node. */ final public function get_node( $id ) { $node = $this->_get_node( $id ); if ( $node ) { return clone $node; } + return null; } /** * @since 3.3.0 * * @param string $id - * @return object|void + * @return object|null */ final protected function _get_node( $id ) { if ( $this->bound ) { - return; + return null; } if ( empty( $id ) ) { @@ -225,12 +226,12 @@ final protected function _get_node( $id ) { /** * @since 3.3.0 * - * @return array|void + * @return array|null */ final public function get_nodes() { $nodes = $this->_get_nodes(); if ( ! $nodes ) { - return; + return null; } foreach ( $nodes as &$node ) { @@ -242,11 +243,11 @@ final public function get_nodes() { /** * @since 3.3.0 * - * @return array|void + * @return array|null */ final protected function _get_nodes() { if ( $this->bound ) { - return; + return null; } return $this->nodes; @@ -307,11 +308,11 @@ public function render() { /** * @since 3.3.0 * - * @return object|void + * @return object|null */ final protected function _bind() { if ( $this->bound ) { - return; + return null; } /*