tabulate / tabulate

src/DB/Table.php

Spacing +63 added lines, -63 removed lines

@@ -116,11 +116,11 @@ 
 		// Validate the parts of the filter.
 		$valid_columm = in_array( $column, array_keys( $this->get_columns() ) );
 		$valid_operator = in_array( $operator, array_keys( $this->operators ) );
-		$emptyValueAllowed = (strpos( $operator, 'empty' ) === false && !empty( $value ));
-		$valid_value = (strpos( $operator, 'empty' ) !== false) || $emptyValueAllowed;
+		$emptyValueAllowed = ( strpos( $operator, 'empty' ) === false && ! empty( $value ) );
+		$valid_value = ( strpos( $operator, 'empty' ) !== false ) || $emptyValueAllowed;
 		if ( $valid_columm && $valid_operator && $valid_value ) {
 			// Save the filter for later application.
-			$this->filters[] = array(
+			$this->filters[ ] = array(
 				'column' => $column,
 				'operator' => $operator,
 				'value' => $value,
@@ -134,9 +134,9 @@ 
 	 */
 	public function add_filters( $filters ) {
 		foreach ( $filters as $filter ) {
-			$column = (isset( $filter['column'] )) ? $filter['column'] : false;
-			$operator = (isset( $filter['operator'] )) ? $filter['operator'] : false;
-			$value = (isset( $filter['value'] )) ? $filter['value'] : false;
+			$column = ( isset( $filter[ 'column' ] ) ) ? $filter[ 'column' ] : false;
+			$operator = ( isset( $filter[ 'operator' ] ) ) ? $filter[ 'operator' ] : false;
+			$value = ( isset( $filter[ 'value' ] ) ) ? $filter[ 'value' ] : false;
 			$this->add_filter( $column, $operator, $value );
 		}
 	}
@@ -145,7 +145,7 @@ 
 		return $this->filters;
 	}
 
-	protected function get_fk_join_clause($table, $alias, $column) {
+	protected function get_fk_join_clause( $table, $alias, $column ) {
 		return 'LEFT OUTER JOIN `' . $table->get_name() . '` AS f' . $alias
 				. ' ON (`' . $this->get_name() . '`.`' . $column->get_name() . '` '
 				. ' = `f' . $alias . '`.`' . $table->get_pk_column()->get_name() . '`)';
@@ -157,55 +157,55 @@ 
 	 * @param string $sql The SQL to modify
 	 * @return array Parameter values, in the order of their occurence in $sql
 	 */
-	public function apply_filters(&$sql) {
+	public function apply_filters( &$sql ) {
 
 		$params = array();
 		$param_num = 1; // Incrementing parameter suffix, to permit duplicate columns.
 		$where_clause = '';
 		$join_clause = '';
 		foreach ( $this->filters as $filter ) {
-			$f_column = $filter['column'];
-			$param_name = $filter['column'] . $param_num;
+			$f_column = $filter[ 'column' ];
+			$param_name = $filter[ 'column' ] . $param_num;
 
 			// Filters on foreign keys need to work on the FKs title column.
-			$column = $this->columns[$f_column];
-			if ( $column->is_foreign_key() && ! $filter['force'] ) {
+			$column = $this->columns[ $f_column ];
+			if ( $column->is_foreign_key() && ! $filter[ 'force' ] ) {
 				$join = $this->join_on( $column );
-				$f_column = $join['column_alias'];
-				$join_clause .= $join['join_clause'];
+				$f_column = $join[ 'column_alias' ];
+				$join_clause .= $join[ 'join_clause' ];
 			} else {
 				// The result of join_on() above is quoted, so this must also be.
 				$f_column = "`" . $this->get_name() . "`.`$f_column`";
 			}
 
 			// LIKE or NOT LIKE
-			if ( $filter['operator'] == 'like' || $filter['operator'] == 'not like' ) {
-				$where_clause .= " AND CONVERT($f_column, CHAR) " . strtoupper( $filter['operator'] ) . " %s ";
-				$params[$param_name] = '%' . trim($filter['value']) . '%';
+			if ( $filter[ 'operator' ] == 'like' || $filter[ 'operator' ] == 'not like' ) {
+				$where_clause .= " AND CONVERT($f_column, CHAR) " . strtoupper( $filter[ 'operator' ] ) . " %s ";
+				$params[ $param_name ] = '%' . trim( $filter[ 'value' ] ) . '%';
 			} // Equals or does-not-equal
-			elseif ( $filter['operator'] == '=' || $filter['operator'] == '!=' ) {
-				$where_clause .= " AND $f_column " . strtoupper( $filter['operator'] ) . " %s ";
-				$params[$param_name] = trim($filter['value']);
+			elseif ( $filter[ 'operator' ] == '=' || $filter[ 'operator' ] == '!=' ) {
+				$where_clause .= " AND $f_column " . strtoupper( $filter[ 'operator' ] ) . " %s ";
+				$params[ $param_name ] = trim( $filter[ 'value' ] );
 			} // IS EMPTY
-			elseif ( $filter['operator'] == 'empty' ) {
+			elseif ( $filter[ 'operator' ] == 'empty' ) {
 				$where_clause .= " AND ($f_column IS NULL OR $f_column = '')";
 			} // IS NOT EMPTY
-			elseif ( $filter['operator'] == 'not empty' ) {
+			elseif ( $filter[ 'operator' ] == 'not empty' ) {
 				$where_clause .= " AND ($f_column IS NOT NULL AND $f_column != '')";
 			} // IN or NOT IN
-			elseif ( $filter['operator'] == 'in' || $filter['operator'] == 'not in') {
-				$values = explode( "\n", $filter['value'] );
+			elseif ( $filter[ 'operator' ] == 'in' || $filter[ 'operator' ] == 'not in' ) {
+				$values = explode( "\n", $filter[ 'value' ] );
 				$placeholders = array();
 				foreach ( $values as $vid => $val ) {
-					$placeholders[] = "%s";
-					$params[ $param_name . '_' . $vid ] = trim($val);
+					$placeholders[ ] = "%s";
+					$params[ $param_name . '_' . $vid ] = trim( $val );
 				}
-				$negate = ( $filter['operator'] == 'not in' ) ? 'NOT' : '';
+				$negate = ( $filter[ 'operator' ] == 'not in' ) ? 'NOT' : '';
 				$where_clause .= " AND ($f_column $negate IN (" . join( ", ", $placeholders ) . "))";
 			} // Other operators. They're already validated in $this->addFilter()
 			else {
-				$where_clause .= " AND ($f_column " . $filter['operator'] . " %s)";
-				$params[$param_name] = trim($filter['value']);
+				$where_clause .= " AND ($f_column " . $filter[ 'operator' ] . " %s)";
+				$params[ $param_name ] = trim( $filter[ 'value' ] );
 			}
 
 			$param_num++;
@@ -310,7 +310,7 @@ 
 			$order_by = $this->get_column( $this->get_order_by() );
 			if ( $order_by ) {
 				$order_by_join = $this->join_on( $order_by );
-				$sql .= $order_by_join['join_clause'] . ' ORDER BY ' . $order_by_join['column_alias'] . ' ' . $this->get_order_dir();
+				$sql .= $order_by_join[ 'join_clause' ] . ' ORDER BY ' . $order_by_join[ 'column_alias' ] . ' ' . $this->get_order_dir();
 			}
 		}
 
@@ -321,7 +321,7 @@ 
 			$records_per_page = $this->get_records_per_page();
 			$sql .= ' LIMIT ' . $records_per_page;
 			if ( $this->page() > 1 ) {
-				$sql .= ' OFFSET ' . ($records_per_page * ($this->get_current_page_num() - 1));
+				$sql .= ' OFFSET ' . ( $records_per_page * ( $this->get_current_page_num() - 1 ) );
 			}
 		}
 
@@ -333,7 +333,7 @@ 
 
 		$records = array();
 		foreach ( $rows as $row ) {
-			$records[] = new Record( $this, $row );
+			$records[ ] = new Record( $this, $row );
 		}
 
 		if ( $save_sql ) {
@@ -348,7 +348,7 @@ 
 		return $this->current_page_num;
 	}
 
-	public function set_current_page_num($current_page_num) {
+	public function set_current_page_num( $current_page_num ) {
 		$this->current_page_num = $current_page_num;
 	}
 
@@ -356,7 +356,7 @@ 
 		return $this->records_per_page;
 	}
 
-	public function set_records_per_page($recordsPerPage) {
+	public function set_records_per_page( $recordsPerPage ) {
 		$this->records_per_page = $recordsPerPage;
 	}
 
@@ -376,9 +376,9 @@ 
 		$table_name = $this->get_name();
 		foreach ( $this->get_columns() as $col_name => $col ) {
 			if ( $col->get_type() == 'point' ) {
-				$select[] = "AsText(`$table_name`.`$col_name`) AS `$col_name`";
+				$select[ ] = "AsText(`$table_name`.`$col_name`) AS `$col_name`";
 			} else {
-				$select[] = "`$table_name`.`$col_name`";
+				$select[ ] = "`$table_name`.`$col_name`";
 			}
 		}
 		return join( ', ', $select );
@@ -415,7 +415,7 @@ 
 		foreach ( $this->get_columns() as $col ) {
 			$row[ $col->get_name() ] = $col->get_default();
 		}
-		$record = new Record($this, $row);
+		$record = new Record( $this, $row );
 		return $record;
 	}
 
@@ -464,7 +464,7 @@ 
 	 * @link https://dev.mysql.com/doc/refman/5.6/en/view-updatability.html
 	 */
 	public function is_updatable() {
-		if ($this->is_table()) {
+		if ( $this->is_table() ) {
 			return true;
 		}
 		return false;
@@ -499,7 +499,7 @@ 
 	 * @param integer $page
 	 * @return integer Current page
 	 */
-	public function page($page = false) {
+	public function page( $page = false ) {
 		if ( $page !== false ) {
 			$this->current_page_num = $page;
 		} else {
@@ -526,17 +526,17 @@ 
 		foreach ( $this->columns as $col_name => $col ) {
 			if ( $col->is_foreign_key() ) {
 				$col_join = $this->join_on( $col );
-				$column_name = $col_join['column_alias'];
-				$join_clause .= $col_join['join_clause'];
+				$column_name = $col_join[ 'column_alias' ];
+				$join_clause .= $col_join[ 'join_clause' ];
 			} elseif ( $col->get_type() === 'point' ) {
-				$columns[] = "IF(`$this->name`.`$col_name` IS NOT NULL, AsText(`$this->name`.`$col_name`), '') AS `$col_name`";
+				$columns[ ] = "IF(`$this->name`.`$col_name` IS NOT NULL, AsText(`$this->name`.`$col_name`), '') AS `$col_name`";
 			} else {
 				$column_name = "`$this->name`.`$col_name`";
 			}
 			if ( $col->get_type() !== 'point' && isset( $column_name ) ) {
-				$columns[] = "REPLACE(IFNULL($column_name, ''),CONCAT(CHAR(13),CHAR(10)),CHAR(10))"; // 13 = \r and 10 = \n
+				$columns[ ] = "REPLACE(IFNULL($column_name, ''),CONCAT(CHAR(13),CHAR(10)),CHAR(10))"; // 13 = \r and 10 = \n
 			}
-			$column_headers[] = $col->get_title();
+			$column_headers[ ] = $col->get_title();
 		}
 
 		// Build basic SELECT statement
@@ -557,7 +557,7 @@ 
 		// Build the final SQL, appending the column headers in a UNION.
 		$sql = 'SELECT "' . join( '", "', $column_headers ) . '"'
 			. ' UNION ' . $sql
-			. ' INTO OUTFILE "' . $filename.'" '
+			. ' INTO OUTFILE "' . $filename . '" '
 			. ' FIELDS TERMINATED BY ","'
 			. ' ENCLOSED BY \'"\''
 			. ' ESCAPED BY \'"\''
@@ -617,7 +617,7 @@ 
 			$sql = $this->get_defining_sql();
 			$comment_pattern = '/.*\)(?:.*COMMENT[\w=]*\'(.*)\')?/si';
 			preg_match( $comment_pattern, $sql, $matches );
-			$this->comment = ( isset( $matches[1] ) ) ? $matches[1] : '';
+			$this->comment = ( isset( $matches[ 1 ] ) ) ? $matches[ 1 ] : '';
 			$this->comment = str_replace( "''", "'", $this->comment );
 		}
 		if ( empty( $this->comment ) && $this->is_view() ) {
@@ -634,7 +634,7 @@ 
 		$cols = array();
 		foreach ( $this->get_columns() as $column ) {
 			if ( $column->is_unique() ) {
-				$cols[] = $column;
+				$cols[ ] = $column;
 			}
 		}
 		return $cols;
@@ -710,8 +710,8 @@ 
 			$definingSql = $this->get_defining_sql();
 			$foreignKeyPattern = '|FOREIGN KEY \(`(.*?)`\) REFERENCES `(.*?)`|';
 			preg_match_all( $foreignKeyPattern, $definingSql, $matches );
-			if ( isset( $matches[1] ) && count( $matches[1] ) > 0 ) {
-				foreach ( array_combine( $matches[1], $matches[2] ) as $colName => $tabName ) {
+			if ( isset( $matches[ 1 ] ) && count( $matches[ 1 ] ) > 0 ) {
+				foreach ( array_combine( $matches[ 1 ], $matches[ 2 ] ) as $colName => $tabName ) {
 					$this->referenced_table_names[ $colName ] = $tabName;
 				}
 			}
@@ -724,7 +724,7 @@ 
 			}
 		}
 
-		return ($instantiate) ? $this->referenced_tables : $this->referenced_table_names;
+		return ( $instantiate ) ? $this->referenced_tables : $this->referenced_table_names;
 	}
 
 	/**
@@ -784,7 +784,7 @@ 
 		foreach ( $this->get_columns() as $column ) {
 			$out .= "| $column \n";
 		}
-		$out .= '+-----------------------------------------+'."\n\n";
+		$out .= '+-----------------------------------------+' . "\n\n";
 		return $out;
 	}
 
@@ -815,7 +815,7 @@ 
 		$json = new Services_JSON();
 		$metadata = array();
 		foreach ( $this->get_columns() as $column ) {
-			$metadata[] = array(
+			$metadata[ ] = array(
 				'name' => $column->get_name(),
 			);
 		}
@@ -869,7 +869,7 @@ 
 	 */
 	public function save_record( $data, $pk_value = null ) {
 		// Changeset only created here if not already in progress.
-		$changeset_comment = isset( $data['changeset_comment'] ) ? $data['changeset_comment'] : null;
+		$changeset_comment = isset( $data[ 'changeset_comment' ] ) ? $data[ 'changeset_comment' ] : null;
 		$change_tracker = new ChangeTracker( $this->get_database()->get_wpdb(), $changeset_comment );
 
 		$columns = $this->get_columns();
@@ -892,11 +892,11 @@ 
 
 			} elseif ( $column->is_boolean() ) {
 				// Boolean values.
-				if ( $column->nullable() && ( is_null($value) || '' === $value ) ) {
+				if ( $column->nullable() && ( is_null( $value ) || '' === $value ) ) {
 					// Null.
 					$data[ $field ] = null;
 					$sql_values[ $field ] = 'NULL';
-				} elseif ( $value === false || in_array( strtoupper($value), array( '0', 'FALSE', 'OFF', 'NO' ) ) ) {
+				} elseif ( $value === false || in_array( strtoupper( $value ), array( '0', 'FALSE', 'OFF', 'NO' ) ) ) {
 					// False.
 					$data[ $field ] = false;
 					$sql_values[ $field ] = '0';
@@ -917,7 +917,7 @@ 
 
 			} elseif ( $column->get_type() === 'point' ) {
 				// POINT columns.
-				$sql_values[ $field ] = "GeomFromText('" . esc_sql( $value ) ."')";
+				$sql_values[ $field ] = "GeomFromText('" . esc_sql( $value ) . "')";
 
 			} elseif ( $column->is_numeric() ) {
 				// Numeric values.
@@ -925,7 +925,7 @@ 
 
 			} else {
 				// Everything else.
-				$sql_values[ $field ] = "'" . esc_sql( $value ) ."'";
+				$sql_values[ $field ] = "'" . esc_sql( $value ) . "'";
 
 			}
 		}
@@ -939,7 +939,7 @@ 
 		// Can probably be removed when https://core.trac.wordpress.org/ticket/15158 is resolved.
 		$set_items = array();
 		foreach ( $sql_values as $field => $escd_datum ) {
-			$set_items[] = "`$field` = $escd_datum";
+			$set_items[ ] = "`$field` = $escd_datum";
 		}
 		$set_clause = 'SET ' . join( ', ', $set_items );
 
@@ -955,8 +955,8 @@ 
 				throw new Exception( 'You do not have permission to update data in this table.' );
 			}
 			$where_clause = $this->database->get_wpdb()->prepare( "WHERE `$pk_name` = %s", $pk_value );
-			$this->database->get_wpdb()->query( 'UPDATE ' . $this->get_name()." $set_clause $where_clause;" );
-			$new_pk_value = (isset( $data[ $pk_name ] ) ) ? $data[ $pk_name ] : $pk_value;
+			$this->database->get_wpdb()->query( 'UPDATE ' . $this->get_name() . " $set_clause $where_clause;" );
+			$new_pk_value = ( isset( $data[ $pk_name ] ) ) ? $data[ $pk_name ] : $pk_value;
 
 		} else { // Or insert?
 			// Check permission.
@@ -1020,7 +1020,7 @@ 
 	 */
 	public function rename( $new_name ) {
 		if ( $this->get_database()->get_table( $new_name ) ) {
-			throw new Exception("Table '$new_name' already exists");
+			throw new Exception( "Table '$new_name' already exists" );
 		}
 		$wpdb = $this->get_database()->get_wpdb();
 		$old_name = $this->get_name();
@@ -1028,10 +1028,10 @@ 
 		$this->get_database()->reset();
 		$new = $this->get_database()->get_table( $new_name, false );
 		if ( ! $new ) {
-			throw new Exception("Table '$old_name' was not renamed to '$new_name'");
+			throw new Exception( "Table '$old_name' was not renamed to '$new_name'" );
 		}
 		$this->name = $new->get_name();
-		$wpdb->query( "UPDATE `".ChangeTracker::changes_name() . "`"
+		$wpdb->query( "UPDATE `" . ChangeTracker::changes_name() . "`"
 			. " SET `table_name` = '$new_name' "
 			. " WHERE `table_name` = '$old_name';" );
 	}