Skip to content
Closed
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/wp-includes/class-wpdb.php
Original file line number Diff line number Diff line change
Expand Up @@ -1453,11 +1453,11 @@ private function _escape_identifier_value( $identifier ) {
* individual arguments.
* @param mixed ...$args Further variables to substitute into the query's placeholders
* if being called with individual arguments.
* @return string|void Sanitized query string, if there is a query to prepare.
* @return string|null Sanitized query string, if there is a query to prepare.
*/
public function prepare( $query, ...$args ) {
if ( is_null( $query ) ) {
return;
return null;
}

/*
Expand Down Expand Up @@ -2117,7 +2117,7 @@ public function parse_db_host( $host ) {
* @since 3.9.0
*
* @param bool $allow_bail Optional. Allows the function to bail. Default true.
* @return bool|void True if the connection is up.
* @return bool True if the connection is up, false otherwise.
Comment thread
apermo marked this conversation as resolved.
Outdated
*/
public function check_connection( $allow_bail = true ) {
// Check if the connection is alive.
Expand Down Expand Up @@ -3056,7 +3056,7 @@ public function get_var( $query = null, $x = 0, $y = 0 ) {
* correspond to an stdClass object, an associative array, or a numeric array,
* respectively. Default OBJECT.
* @param int $y Optional. Row to return. Indexed from 0. Default 0.
* @return array|object|null|void Database query result in format specified by $output or null on failure.
* @return array|object|null Database query result in format specified by $output or null on failure.
*/
public function get_row( $query = null, $output = OBJECT, $y = 0 ) {
$this->func_call = "\$db->get_row(\"$query\",$output,$y)";
Expand Down
4 changes: 3 additions & 1 deletion src/wp-includes/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -5501,6 +5501,8 @@ function wp_ob_end_flush_all() {
* @since 2.3.2
*
* @global wpdb $wpdb WordPress database abstraction object.
*
* @return never
*/
function dead_db() {
global $wpdb;
Expand All @@ -5519,7 +5521,7 @@ function dead_db() {
}

// Otherwise, be terse.
wp_die( '<h1>' . __( 'Error establishing a database connection' ) . '</h1>', __( 'Database Error' ) );
wp_die( '<h1>' . __( 'Error establishing a database connection' ) . '</h1>', __( 'Database Error' ) ); // @phpstan-ignore return.never (wp_die() always exits by default.)
Comment thread
apermo marked this conversation as resolved.
Outdated
}

/**
Expand Down
Loading