IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Coding Standards: Fix the Squiz.PHP.DisallowMultipleAssignments violations in wp-includes.

Browse Source 
See #47632.


Built from https://develop.svn.wordpress.org/trunk@45590


git-svn-id: http://core.svn.wordpress.org/trunk@45401 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast
2019-07-02 23:42:58 +00:00
parent 55b2d94cca
commit 4803fc405e
76 changed files with 1038 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
wp-includes/wp-db.php
View File

@@ -1438,7 +1438,8 @@ class wpdb {
wp_load_translations_early();
if ( $caller = $this->get_caller() ) {
$caller = $this->get_caller();
if ( $caller ) {
/* translators: 1: Database error message, 2: SQL query, 3: Name of the calling function */
$error_str = sprintf( __( 'WordPress database error %1$s for query %2$s made by %3$s' ), $str, $this->last_query, $caller );
} else {
@@ -1543,7 +1544,8 @@ class wpdb {
$this->last_result = array();
$this->col_info = null;
$this->last_query = null;
$this->rows_affected = $this->num_rows = 0;
$this->rows_affected = 0;
$this->num_rows = 0;
$this->last_error = '';
if ( $this->use_mysqli && $this->result instanceof mysqli_result ) {
@@ -1594,7 +1596,8 @@ class wpdb {
$socket = null;
$is_ipv6 = false;
if ( $host_data = $this->parse_db_host( $this->dbhost ) ) {
$host_data = $this->parse_db_host( $this->dbhost );
if ( $host_data ) {
list( $host, $port, $socket, $is_ipv6 ) = $host_data;
}
@@ -2161,7 +2164,8 @@ class wpdb {
return false;
}
$formats = $values = array();
$formats = array();
$values = array();
foreach ( $data as $value ) {
if ( is_null( $value['value'] ) ) {
$formats[] = 'NULL';
@@ -2225,7 +2229,9 @@ class wpdb {
return false;
}
$fields = $conditions = $values = array();
$fields = array();
$conditions = array();
$values = array();
foreach ( $data as $field => $value ) {
if ( is_null( $value['value'] ) ) {
$fields[] = "`$field` = NULL";
@@ -2286,7 +2292,8 @@ class wpdb {
return false;
}
$conditions = $values = array();
$conditions = array();
$values = array();
foreach ( $where as $field => $value ) {
if ( is_null( $value['value'] ) ) {
$conditions[] = "`$field` IS NULL";
@@ -2358,7 +2365,8 @@ class wpdb {
* of 'value' and 'format' keys.
*/
protected function process_field_formats( $data, $format ) {
$formats = $original_formats = (array) $format;
$formats = (array) $format;
$original_formats = $formats;
foreach ( $data as $field => $value ) {
$value = array(
@@ -2650,7 +2658,8 @@ class wpdb {
return $this->table_charset[ $tablekey ];
}
$charsets = $columns = array();
$charsets = array();
$columns = array();
$table_parts = explode( '.', $table );
$table = '`' . implode( '`.`', $table_parts ) . '`';
@@ -3048,7 +3057,8 @@ class wpdb {
}
// We couldn't use any local conversions, send it to the DB.
$value['db'] = $db_check_string = true;
$value['db'] = true;
$db_check_string = true;
}
unset( $value ); // Remove by reference.