tabulate / tabulate

src/Controllers/ShortcodeController.php

Spacing +16 added lines, -16 removed lines

@@ -53,7 +53,7 @@ 
 			'search' => null,
 		);
 		$attrs = shortcode_atts( $defaults, $raw_attrs );
-		if ( ! isset( $attrs['table'] ) ) {
+		if ( ! isset( $attrs[ 'table' ] ) ) {
 			$msg = "The 'table' attribute must be set. Attributes found: [";
 			foreach ( $raw_attrs as $k => $v ) {
 				$msg .= ' ' . htmlentities2( $k ) . ' = "' . htmlentities2( $v ) . '" ';
@@ -61,19 +61,19 @@ 
 			$msg .= "]";
 			return $this->error( $msg );
 		}
-		$table = $this->db->get_table( $attrs['table'] );
+		$table = $this->db->get_table( $attrs[ 'table' ] );
 		if ( ! $table ) {
 			if ( ! is_user_logged_in() ) {
 				return $this->error( "You are not logged in. " . wp_loginout( get_the_permalink(), false ) );
 			}
 			return $this->error();
 		}
-		$format_method = $attrs['format'] . '_format';
+		$format_method = $attrs[ 'format' ] . '_format';
 		if ( is_callable( array( $this, $format_method ) ) ) {
 			wp_enqueue_script( 'tabulate-scripts' );
 			return $this->$format_method( $table, $attrs, $_REQUEST );
 		} else {
-			return $this->error( "Format '{$attrs['format']}' not available." );
+			return $this->error( "Format '{$attrs[ 'format' ]}' not available." );
 		}
 	}
 
@@ -103,8 +103,8 @@ 
 	 */
 	protected function record_format( Table $table, $attrs, $query = null ) {
 		// Check for the ident shortcode parameter...
-		if ( isset( $attrs['ident'] ) ) {
-			$ident = $attrs['ident'];
+		if ( isset( $attrs[ 'ident' ] ) ) {
+			$ident = $attrs[ 'ident' ];
 		}
 		// ...or the tablename=ident URL parameter.
 		if ( isset( $query[ $table->get_name() ] ) && is_scalar( $query[ $table->get_name() ] ) ) {
@@ -139,7 +139,7 @@ 
 		$template = new Template( 'record/shortcode.html' );
 		$template->table = $table;
 		$template->record = $table->get_default_record();
-		$template->return_to = ( isset( $attrs['return_to'] ) ) ? $attrs['return_to'] : get_the_permalink();
+		$template->return_to = ( isset( $attrs[ 'return_to' ] ) ) ? $attrs[ 'return_to' ] : get_the_permalink();
 		return $template->render();
 	}
 
@@ -164,9 +164,9 @@ 
 	protected function list_format( Table $table, $attrs ) {
 		$titles = array();
 		foreach ( $table->get_records() as $rec ) {
-			$titles[] = $rec->get_title();
+			$titles[ ] = $rec->get_title();
 		}
-		$glue = ( ! empty( $attrs['glue'] ) ) ? $attrs['glue'] : ', ';
+		$glue = ( ! empty( $attrs[ 'glue' ] ) ) ? $attrs[ 'glue' ] : ', ';
 		return '<span class="tabulate list-format">' . join( $glue, $titles ) . '</span>';
 	}
 
@@ -181,19 +181,19 @@ 
 	protected function table_format( Table $table, $attrs, $query = null ) {
 		// Filters.
 		// Apply filters from the URL query parameters.
-		if ( isset( $query['table'] ) && $query['table'] === $table->get_name() ) {
-			$query_filters = (isset( $query['filter'] )) ? $query['filter'] : array();
+		if ( isset( $query[ 'table' ] ) && $query[ 'table' ] === $table->get_name() ) {
+			$query_filters = ( isset( $query[ 'filter' ] ) ) ? $query[ 'filter' ] : array();
 			$table->add_filters( $query_filters );
 		}
 
 		// Pagination.
 		$page_num = 1;
-		if ( isset( $query['tabulate_p'] ) && is_numeric( $query['tabulate_p'] ) ) {
-			$page_num = abs( $query['tabulate_p'] );
+		if ( isset( $query[ 'tabulate_p' ] ) && is_numeric( $query[ 'tabulate_p' ] ) ) {
+			$page_num = abs( $query[ 'tabulate_p' ] );
 		}
 		$table->set_current_page_num( $page_num );
-		if ( isset( $query['tabulate_psize'] ) ) {
-			$table->set_records_per_page( $query['tabulate_psize'] );
+		if ( isset( $query[ 'tabulate_psize' ] ) ) {
+			$table->set_records_per_page( $query[ 'tabulate_psize' ] );
 		}
 
 		// Construct the HTML.
@@ -203,7 +203,7 @@ 
 		$template->records = $table->get_records();
 
 		// Add the search form if required.
-		$template->search = ! empty( $attrs['search'] );
+		$template->search = ! empty( $attrs[ 'search' ] );
 		$template->form_action = get_the_permalink();
 
 		// Return completed HTML output.

src/DB/Grants.php

Spacing +3 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
 			self::ANON_ROLE => 'Anonymous User',
 		);
 		foreach ( wp_roles()->roles as $role_name => $role ) {
-			$roles[ $role_name ] = $role['name'];
+			$roles[ $role_name ] = $role[ 'name' ];
 		}
 		return $roles;
 	}
@@ -122,11 +122,11 @@ 
 		$cap = substr( $cap_full_name, strlen( TABULATE_SLUG ) + 1 );
 
 		// Set up basic data.
-		$table_name = ( $args[2] ) ? $args[2] : false;
+		$table_name = ( $args[ 2 ] ) ? $args[ 2 ] : false;
 		$grants = new self();
 
 		// Users with 'promote_users' capability can do everything.
-		if ( isset( $all_capabilities['promote_users'] ) ) {
+		if ( isset( $all_capabilities[ 'promote_users' ] ) ) {
 			$all_capabilities[ $cap_full_name ] = true;
 		}
 

src/CSV.php

Spacing +15 added lines, -15 removed lines

@@ -81,15 +81,15 @@ 
 	 * @throws \Exception On upload error or if the file isn't a CSV.
 	 */
 	private function save_file( $uploaded ) {
-		if ( isset( $uploaded['error'] ) ) {
-			throw new \Exception( $uploaded['error'] );
+		if ( isset( $uploaded[ 'error' ] ) ) {
+			throw new \Exception( $uploaded[ 'error' ] );
 		}
-		if ( 'text/csv' !== $uploaded['type'] ) {
-			unlink( $uploaded['file'] );
+		if ( 'text/csv' !== $uploaded[ 'type' ] ) {
+			unlink( $uploaded[ 'file' ] );
 			throw new \Exception( 'Only CSV files can be imported.' );
 		}
 		$this->hash = uniqid( TABULATE_SLUG );
-		rename( $uploaded['file'], get_temp_dir() . '/' . $this->hash );
+		rename( $uploaded[ 'file' ], get_temp_dir() . '/' . $this->hash );
 	}
 
 	/**
@@ -112,12 +112,12 @@ 
 		$this->data = array();
 		$lines = $this->filesystem->get_contents_array( $file_path );
 		foreach ( $lines as $line ) {
-			$this->data[] = str_getcsv( $line );
+			$this->data[ ] = str_getcsv( $line );
 		}
 
 		// Extract headers.
-		$this->headers = $this->data[0];
-		unset( $this->data[0] );
+		$this->headers = $this->data[ 0 ];
+		unset( $this->data[ 0 ] );
 	}
 
 	/**
@@ -196,36 +196,36 @@ 
 				$column = $table->get_column( $db_column_name );
 				// Required, is not an update, has no default, and is empty.
 				if ( $column->is_required() && ! $pk_set && ! $column->get_default() && empty( $value ) ) {
-					$col_errors[] = 'Required but empty';
+					$col_errors[ ] = 'Required but empty';
 				}
 				// Already exists, and is not an update.
 				if ( $column->is_unique() && ! $pk_set && $this->value_exists( $table, $column, $value ) ) {
-					$col_errors[] = "Unique value already present: '$value'";
+					$col_errors[ ] = "Unique value already present: '$value'";
 				}
 				// Too long (if the column has a size and the value is greater than this).
 				if ( ! $column->is_foreign_key() && ! $column->is_boolean()
 						&& $column->get_size() > 0
 						&& strlen( $value ) > $column->get_size() ) {
-					$col_errors[] = 'Value (' . $value . ') too long (maximum length of ' . $column->get_size() . ')';
+					$col_errors[ ] = 'Value (' . $value . ') too long (maximum length of ' . $column->get_size() . ')';
 				}
 				// Invalid foreign key value.
 				if ( ! empty( $value ) && $column->is_foreign_key() ) {
 					$err = $this->validate_foreign_key( $column, $value );
 					if ( $err ) {
-						$col_errors[] = $err;
+						$col_errors[ ] = $err;
 					}
 				}
 				// Dates.
 				if ( 'date' === $column->get_type() && ! empty( $value ) && 1 !== preg_match( '/\d{4}-\d{2}-\d{2}/', $value ) ) {
-					$col_errors[] = 'Value (' . $value . ') not in date format';
+					$col_errors[ ] = 'Value (' . $value . ') not in date format';
 				}
 				if ( 'year' === $column->get_type() && ! empty( $value ) && ( $value < 1901 || $value > 2155 ) ) {
-					$col_errors[] = 'Year values must be between 1901 and 2155 (' . $value . ' given)';
+					$col_errors[ ] = 'Year values must be between 1901 and 2155 (' . $value . ' given)';
 				}
 
 				if ( count( $col_errors ) > 0 ) {
 					// Construct error details array.
-					$errors[] = array(
+					$errors[ ] = array(
 						'column_name' => $this->headers[ $col_num ],
 						'column_number' => $col_num,
 						'field_name' => $column->get_name(),

src/Controllers/ControllerBase.php

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
 	 * @param string|boolean $download_name The name of the file, for the user to download.
 	 */
 	protected function send_file( $ext, $mime, $content, $download_name = false ) {
-		$download_name = ($download_name ?: date( 'Y-m-d' ) ) . '.' . $ext;
+		$download_name = ( $download_name ?: date( 'Y-m-d' ) ) . '.' . $ext;
 		header( 'Content-Encoding: UTF-8' );
 		header( 'Content-type: ' . $mime . '; charset=UTF-8' );
 		header( 'Content-Disposition: attachment; filename="' . $download_name . '"' );
@@ -77,7 +77,7 @@ 
 	 * @param string $action The action name.
 	 */
 	public function verify_nonce( $action ) {
-		$nonce = wp_verify_nonce( $_REQUEST['_wpnonce'], $action );
+		$nonce = wp_verify_nonce( $_REQUEST[ '_wpnonce' ], $action );
 		if ( ! $nonce ) {
 			wp_die();
 		}

src/DB/Table.php

Spacing +45 added lines, -45 removed lines

@@ -207,7 +207,7 @@ 
 		}
 		// Validate the value.
 		$empty_value_allowed = ( strpos( $operator, 'empty' ) === false && ! empty( $value ) );
-		$valid_value = (strpos( $operator, 'empty' ) !== false) || $empty_value_allowed;
+		$valid_value = ( strpos( $operator, 'empty' ) !== false ) || $empty_value_allowed;
 		if ( ! $valid_operator ) {
 			// translators: Error message shown when a filter is passed an invalid value.
 			$msg = __( '"%s" is not a valid value.', 'tabulate' );
@@ -215,7 +215,7 @@ 
 		}
 		// Save the filter for later application (see Table::apply_filters()).
 		if ( $valid_columm && $valid_operator && $valid_value ) {
-			$this->filters[] = array(
+			$this->filters[ ] = array(
 				'column' => $column,
 				'operator' => $operator,
 				'value' => $value,
@@ -231,9 +231,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 );
 		}
 	}
@@ -250,7 +250,7 @@ 
 			// Add an empty default filter to start with.
 			$title_col = $this->get_title_column();
 			$first_filter = ( $title_col ) ? $title_col->get_name() : '';
-			$out[] = array(
+			$out[ ] = array(
 				'column' => $first_filter,
 				'operator' => 'like',
 				'value' => '',
@@ -286,49 +286,49 @@ 
 		$where_clause = '';
 		$join_clause = '';
 		foreach ( $this->filters as $filter_idx => $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'] ) {
+			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`";
 			}
 
-			if ( 'like' === $filter['operator'] || 'not like' === $filter['operator'] ) {
+			if ( 'like' === $filter[ 'operator' ] || 'not like' === $filter[ 'operator' ] ) {
 				// LIKE or NOT LIKE.
-				$where_clause .= " AND CONVERT($f_column, CHAR) " . strtoupper( $filter['operator'] ) . " %s ";
-				$params[ $param_name ] = '%' . trim( $filter['value'] ) . '%';
-			} elseif ( '=' === $filter['operator'] || '!=' === $filter['operator'] ) {
+				$where_clause .= " AND CONVERT($f_column, CHAR) " . strtoupper( $filter[ 'operator' ] ) . " %s ";
+				$params[ $param_name ] = '%' . trim( $filter[ 'value' ] ) . '%';
+			} elseif ( '=' === $filter[ 'operator' ] || '!=' === $filter[ 'operator' ] ) {
 				// Equals or does-not-equal.
-				$where_clause .= " AND $f_column " . $filter['operator'] . " %s ";
-				$params[ $param_name ] = trim( $filter['value'] );
-			} elseif ( 'empty' === $filter['operator'] ) {
+				$where_clause .= " AND $f_column " . $filter[ 'operator' ] . " %s ";
+				$params[ $param_name ] = trim( $filter[ 'value' ] );
+			} elseif ( 'empty' === $filter[ 'operator' ] ) {
 				// IS EMPTY.
 				$where_clause .= " AND ($f_column IS NULL OR $f_column = '')";
-			} elseif ( 'not empty' === $filter['operator'] ) {
+			} elseif ( 'not empty' === $filter[ 'operator' ] ) {
 				// IS NOT EMPTY.
 				$where_clause .= " AND ($f_column IS NOT NULL AND $f_column != '')";
-			} elseif ( 'in' === $filter['operator'] || 'not in' === $filter['operator'] ) {
+			} elseif ( 'in' === $filter[ 'operator' ] || 'not in' === $filter[ 'operator' ] ) {
 				// IN or NOT IN.
 				$placeholders = array();
-				foreach ( Util::split_newline( $filter['value'] ) as $vid => $val ) {
-					$placeholders[] = "%s";
+				foreach ( Util::split_newline( $filter[ 'value' ] ) as $vid => $val ) {
+					$placeholders[ ] = "%s";
 					$params[ $param_name . '_' . $vid ] = $val;
 					// Save the separated filter values for later.
-					$this->filters[ $filter_idx ]['values'][] = $val;
+					$this->filters[ $filter_idx ][ 'values' ][ ] = $val;
 				}
-				$negate = ( 'not in' === $filter['operator'] ) ? 'NOT' : '';
+				$negate = ( 'not in' === $filter[ 'operator' ] ) ? 'NOT' : '';
 				$where_clause .= " AND ($f_column $negate IN (" . join( ", ", $placeholders ) . "))";
 			} else {
 				// Other operators. They're already validated in self::addFilter().
-				$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' ] );
 			} // End if().
 
 			$param_num++;
@@ -444,7 +444,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();
 			}
 		}
 
@@ -455,7 +455,7 @@ 
 			$records_per_page = $this->get_records_per_page();
 			$sql .= ' LIMIT ' . $records_per_page;
 			if ( $this->get_current_page_num() > 1 ) {
-				$sql .= ' OFFSET ' . ($records_per_page * ($this->get_current_page_num() - 1));
+				$sql .= ' OFFSET ' . ( $records_per_page * ( $this->get_current_page_num() - 1 ) );
 			}
 		}
 
@@ -467,7 +467,7 @@ 
 
 		$records = array();
 		foreach ( $rows as $row ) {
-			$records[] = new Record( $this, $row );
+			$records[ ] = new Record( $this, $row );
 		}
 
 		if ( $save_sql ) {
@@ -542,9 +542,9 @@ 
 		$table_name = $this->get_name();
 		foreach ( $this->get_columns() as $col_name => $col ) {
 			if ( 'point' === $col->get_type() ) {
-				$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 );
@@ -697,17 +697,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 ( 'point' === $col->get_type() ) {
-				$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 ( 'point' !== $col->get_type() && 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.
@@ -848,7 +848,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() ) {
@@ -866,7 +866,7 @@ 
 		$cols = array();
 		foreach ( $this->get_columns() as $column ) {
 			if ( $column->is_unique() ) {
-				$cols[] = $column;
+				$cols[ ] = $column;
 			}
 		}
 		return $cols;
@@ -943,8 +943,8 @@ 
 			$defining_sql = $this->get_defining_sql();
 			$fk_pattern = '|FOREIGN KEY \(`(.*?)`\) REFERENCES `(.*?)`|';
 			preg_match_all( $fk_pattern, $defining_sql, $matches );
-			if ( isset( $matches[1] ) && count( $matches[1] ) > 0 ) {
-				foreach ( array_combine( $matches[1], $matches[2] ) as $col_name => $tab_name ) {
+			if ( isset( $matches[ 1 ] ) && count( $matches[ 1 ] ) > 0 ) {
+				foreach ( array_combine( $matches[ 1 ], $matches[ 2 ] ) as $col_name => $tab_name ) {
 					$this->referenced_table_names[ $col_name ] = $tab_name;
 				}
 			}
@@ -1048,7 +1048,7 @@ 
 		$json = new Services_JSON();
 		$metadata = array();
 		foreach ( $this->get_columns() as $column ) {
-			$metadata[] = array(
+			$metadata[ ] = array(
 				'name' => $column->get_name(),
 			);
 		}
@@ -1116,7 +1116,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();
@@ -1172,7 +1172,7 @@ 
 
 			} elseif ( $column->is_numeric() ) {
 				// Numeric values.
-				$sql_values[ $field ] = (float) $value;
+				$sql_values[ $field ] = ( float ) $value;
 
 			} else {
 				// Everything else.
@@ -1190,7 +1190,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 );
 
@@ -1210,7 +1210,7 @@ 
 			$where_clause = $this->database->get_wpdb()->prepare( "WHERE `$pk_name` = %s", $pk_value );
 			$sql = 'UPDATE ' . $this->get_name() . " $set_clause $where_clause";
 			$this->get_database()->query( $sql, null, 'Unable to update a record' );
-			$new_pk_value = (isset( $data[ $pk_name ] ) ) ? $data[ $pk_name ] : $pk_value;
+			$new_pk_value = ( isset( $data[ $pk_name ] ) ) ? $data[ $pk_name ] : $pk_value;
 
 		} else {
 			/*

Doc Comments +3 added lines, -3 removed lines

@@ -669,7 +669,7 @@ 
 	/**
 	 * Get a count of the number of pages in the currently filtered record set.
 	 *
-	 * @return integer The page count.
+	 * @return double The page count.
 	 */
 	public function get_page_count() {
 		return ceil( $this->count_records() / $this->get_records_per_page() );
@@ -987,7 +987,7 @@ 
 	/**
 	 * Get a list of the names of the foreign keys in this table.
 	 *
-	 * @return string[] Names of foreign key columns in this table.
+	 * @return integer[] Names of foreign key columns in this table.
 	 */
 	public function get_foreign_key_names() {
 		return array_keys( $this->get_referenced_tables( false ) );
@@ -1251,7 +1251,7 @@ 
 	 * Get a fully-qualified URL to a Back End page for this table.
 	 *
 	 * @param string           $action Which action to use ('index', 'import', etc.).
-	 * @param string[]|boolean $extra_params Other query string parameters to add.
+	 * @param null|false $extra_params Other query string parameters to add.
 	 * @param string           $controller Which controller to use ('table', 'record', etc.).
 	 * @return string The full URL.
 	 */

src/Controllers/TableController.php

Spacing +37 added lines, -37 removed lines

@@ -49,28 +49,28 @@ 
 	 * @return string
 	 */
 	public function index( $args ) {
-		$table = $this->get_table( $args['table'] );
+		$table = $this->get_table( $args[ 'table' ] );
 		if ( ! $table instanceof Table ) {
 			return $table;
 		}
 
 		// Pagination.
-		$page_num = (isset( $args['p'] ) && is_numeric( $args['p'] ) ) ? abs( $args['p'] ) : 1;
+		$page_num = ( isset( $args[ 'p' ] ) && is_numeric( $args[ 'p' ] ) ) ? abs( $args[ 'p' ] ) : 1;
 		$table->set_current_page_num( $page_num );
-		if ( isset( $args['psize'] ) ) {
-			$table->set_records_per_page( $args['psize'] );
+		if ( isset( $args[ 'psize' ] ) ) {
+			$table->set_records_per_page( $args[ 'psize' ] );
 		}
 
 		// Ordering.
-		if ( isset( $args['order_by'] ) ) {
-			$table->set_order_by( $args['order_by'] );
+		if ( isset( $args[ 'order_by' ] ) ) {
+			$table->set_order_by( $args[ 'order_by' ] );
 		}
-		if ( isset( $args['order_dir'] ) ) {
-			$table->set_order_dir( $args['order_dir'] );
+		if ( isset( $args[ 'order_dir' ] ) ) {
+			$table->set_order_dir( $args[ 'order_dir' ] );
 		}
 
 		// Filters.
-		$filter_param = (isset( $args['filter'] )) ? $args['filter'] : array();
+		$filter_param = ( isset( $args[ 'filter' ] ) ) ? $args[ 'filter' ] : array();
 		$table->add_filters( $filter_param );
 
 		// Give it all to the template.
@@ -122,7 +122,7 @@ 
 		$template->stage = 'choose_file';
 
 		// First make sure the user is allowed to import data into this table.
-		$table = $this->get_table( $args['table'] );
+		$table = $this->get_table( $args[ 'table' ] );
 		$template->record = $table->get_default_record();
 		$template->action = 'import';
 		$template->table = $table;
@@ -138,11 +138,11 @@ 
 		require_once ABSPATH . '/wp-admin/includes/file.php';
 		$template->form_action = $table->get_url( 'import' );
 		try {
-			$hash = isset( $_GET['hash'] ) ? $_GET['hash'] : false;
+			$hash = isset( $_GET[ 'hash' ] ) ? $_GET[ 'hash' ] : false;
 			$uploaded = false;
-			if ( isset( $_FILES['file'] ) ) {
+			if ( isset( $_FILES[ 'file' ] ) ) {
 				check_admin_referer( 'import-upload' );
-				$uploaded = wp_handle_upload( $_FILES['file'], array(
+				$uploaded = wp_handle_upload( $_FILES[ 'file' ], array(
 					'action' => $template->action,
 				) );
 			}
@@ -157,28 +157,28 @@ 
 		 */
 		if ( $csv_file->loaded() ) {
 			$template->file = $csv_file;
-			$template->stage = $template->stages[1];
+			$template->stage = $template->stages[ 1 ];
 			$template->form_action .= "&hash=" . $csv_file->hash;
 		}
 
 		/*
 		 * Stage 3 of 4: Previewing.
 		 */
-		if ( $csv_file->loaded() && isset( $_POST['preview'] ) ) {
+		if ( $csv_file->loaded() && isset( $_POST[ 'preview' ] ) ) {
 			check_admin_referer( 'import-preview' );
-			$template->stage = $template->stages[2];
-			$template->columns = wp_json_encode( $_POST['columns'] );
+			$template->stage = $template->stages[ 2 ];
+			$template->columns = wp_json_encode( $_POST[ 'columns' ] );
 			$errors = array();
 			// Make sure all required columns are selected.
 			foreach ( $table->get_columns() as $col ) {
 				// Handle missing columns separately; other column errors are
 				// done in the CSV class. Missing columns don't matter if importing
 				// existing records.
-				$is_missing = empty( $_POST['columns'][ $col->get_name() ] );
+				$is_missing = empty( $_POST[ 'columns' ][ $col->get_name() ] );
 				$pk = $table->get_pk_column();
-				$pk_present = $pk && isset( $_POST['columns'][ $pk->get_name() ] );
+				$pk_present = $pk && isset( $_POST[ 'columns' ][ $pk->get_name() ] );
 				if ( ! $pk_present && $col->is_required() && $is_missing ) {
-					$errors[] = array(
+					$errors[ ] = array(
 						'column_name' => '',
 						'column_number' => '',
 						'field_name' => $col->get_name(),
@@ -187,17 +187,17 @@ 
 					);
 				}
 			}
-			$template->errors = empty( $errors ) ? $csv_file->match_fields( $table, wp_unslash( $_POST['columns'] ) ) : $errors;
+			$template->errors = empty( $errors ) ? $csv_file->match_fields( $table, wp_unslash( $_POST[ 'columns' ] ) ) : $errors;
 		}
 
 		/*
 		 * Stage 4 of 4: Import.
 		 */
-		if ( $csv_file->loaded() && isset( $_POST['import'] ) ) {
+		if ( $csv_file->loaded() && isset( $_POST[ 'import' ] ) ) {
 			check_admin_referer( 'import-finish' );
-			$template->stage = $template->stages[3];
+			$template->stage = $template->stages[ 3 ];
 			$this->wpdb->query( 'BEGIN' );
-			$column_map = json_decode( wp_unslash( $_POST['columns'] ), true );
+			$column_map = json_decode( wp_unslash( $_POST[ 'columns' ] ), true );
 			$result = $csv_file->import_data( $table, $column_map );
 			$this->wpdb->query( 'COMMIT' );
 			$template->add_notice( 'updated', 'Import complete; ' . $result . ' rows imported.' );
@@ -214,11 +214,11 @@ 
 	 */
 	public function calendar( $args ) {
 		// @todo Validate args.
-		$year_num = (isset( $args['year'] )) ? $args['year'] : date( 'Y' );
-		$month_num = (isset( $args['month'] )) ? $args['month'] : date( 'm' );
+		$year_num = ( isset( $args[ 'year' ] ) ) ? $args[ 'year' ] : date( 'Y' );
+		$month_num = ( isset( $args[ 'month' ] ) ) ? $args[ 'month' ] : date( 'm' );
 
 		$template = new \WordPress\Tabulate\Template( 'calendar.html' );
-		$table = $this->get_table( $args['table'] );
+		$table = $this->get_table( $args[ 'table' ] );
 
 		$template->table = $table;
 		$template->action = 'calendar';
@@ -241,7 +241,7 @@ 
 					$records[ $date_val ] = array();
 				}
 				// Add this record to the day's list.
-				$records[ $date_val ][] = $rec;
+				$records[ $date_val ][ ] = $rec;
 			}
 		}
 		// $records is grouped by date, with each item in a single date being
@@ -260,10 +260,10 @@ 
 	 */
 	public function export( $args ) {
 		// Get table.
-		$table = $this->get_table( $args['table'] );
+		$table = $this->get_table( $args[ 'table' ] );
 
 		// Filter and export.
-		$filter_param = ( isset( $args['filter'] )) ? $args['filter'] : array();
+		$filter_param = ( isset( $args[ 'filter' ] ) ) ? $args[ 'filter' ] : array();
 		$table->add_filters( $filter_param );
 		$filename = $table->export();
 
@@ -284,11 +284,11 @@ 
 	 */
 	public function notfound( $args ) {
 		// Get table.
-		$table = $this->get_table( $args['table'] );
+		$table = $this->get_table( $args[ 'table' ] );
 
 		// Get the values from the request, or give up.
-		$filter_id = isset( $args['notfound'] ) ? $args['notfound'] : false;
-		$values_string = isset( $args['filter'][ $filter_id ]['value'] ) ? $args['filter'][ $filter_id ]['value'] : false;
+		$filter_id = isset( $args[ 'notfound' ] ) ? $args[ 'notfound' ] : false;
+		$values_string = isset( $args[ 'filter' ][ $filter_id ][ 'value' ] ) ? $args[ 'filter' ][ $filter_id ][ 'value' ] : false;
 		if ( ! $table instanceof Table || ! $values_string ) {
 			return;
 		}
@@ -323,12 +323,12 @@ 
 	 * @return string
 	 */
 	public function timeline( $args ) {
-		$table = $this->get_table( $args['table'] );
+		$table = $this->get_table( $args[ 'table' ] );
 		$template = new \WordPress\Tabulate\Template( 'timeline.html' );
 		$template->action = 'timeline';
 		$template->table = $table;
-		$start_date_arg = (isset( $args['start_date'] )) ? $args['start_date'] : date( 'Y-m-d' );
-		$end_date_arg = (isset( $args['end_date'] )) ? $args['end_date'] : date( 'Y-m-d' );
+		$start_date_arg = ( isset( $args[ 'start_date' ] ) ) ? $args[ 'start_date' ] : date( 'Y-m-d' );
+		$end_date_arg = ( isset( $args[ 'end_date' ] ) ) ? $args[ 'end_date' ] : date( 'Y-m-d' );
 		$start_date = new \DateTime( $start_date_arg );
 		$end_date = new \DateTime( $end_date_arg );
 		if ( $start_date->diff( $end_date, true )->d < 7 ) {
@@ -344,7 +344,7 @@ 
 			if ( ! isset( $data[ $record->get_title() ] ) ) {
 				$data[ $record->get_title() ] = array();
 			}
-			$data[ $record->get_title() ][] = $record;
+			$data[ $record->get_title() ][ ] = $record;
 		}
 		$template->data = $data;
 		return $template->render();

src/Menus.php

Unused Use Statements -1 removed lines

@@ -11,7 +11,6 @@
 use WordPress\Tabulate\DB\ChangeTracker;
 use WordPress\Tabulate\DB\Exception as TabulateException;
 use WordPress\Tabulate\DB\Reports;
-use WordPress\Tabulate\DB\Table;
 use WP_Admin_Bar;
 use WP_Filesystem_Base;
 use wpdb;

Spacing +9 added lines, -9 removed lines

@@ -90,7 +90,7 @@ 
 
 		// Home page (also change the first submenu item's title).
 		add_menu_page( 'Tabulate', 'Tabulate', 'read', TABULATE_SLUG, $dispatch_callback );
-		$page_title = ( isset( $_GET['table'] ) ) ? Text::titlecase( $_GET['table'] ) : 'Tabulate';
+		$page_title = ( isset( $_GET[ 'table' ] ) ) ? Text::titlecase( $_GET[ 'table' ] ) : 'Tabulate';
 		add_submenu_page( TABULATE_SLUG, $page_title, 'Overview', 'read', TABULATE_SLUG, $dispatch_callback );
 
 		// Add submenu pages.
@@ -147,17 +147,17 @@ 
 
 		// Only dispatch when it's our page.
 		$slug_lenth = strlen( TABULATE_SLUG );
-		if ( ! isset( $request['page'] ) || substr( $request['page'], 0, $slug_lenth ) !== TABULATE_SLUG ) {
+		if ( ! isset( $request[ 'page' ] ) || substr( $request[ 'page' ], 0, $slug_lenth ) !== TABULATE_SLUG ) {
 			return;
 		}
 
 		// Discern the controller name, based on an explicit request parameter, or
 		// the trailing part of the page slug (i.e. after 'tabulate_').
 		$controller_name = 'home';
-		if ( isset( $request['controller'] ) && strlen( $request['controller'] ) > 0 ) {
-			$controller_name = $request['controller'];
-		} elseif ( isset( $request['page'] ) && strlen( $request['page'] ) > $slug_lenth ) {
-			$controller_name = substr( $request['page'], $slug_lenth + 1 );
+		if ( isset( $request[ 'controller' ] ) && strlen( $request[ 'controller' ] ) > 0 ) {
+			$controller_name = $request[ 'controller' ];
+		} elseif ( isset( $request[ 'page' ] ) && strlen( $request[ 'page' ] ) > $slug_lenth ) {
+			$controller_name = substr( $request[ 'page' ], $slug_lenth + 1 );
 		}
 
 		// Create the controller and run the action.
@@ -167,8 +167,8 @@ 
 		}
 		$controller = new $controller_classname( $this->wpdb );
 		$controller->set_filesystem( $this->filesystem );
-		$action = ! empty( $request['action'] ) ? $request['action'] : 'index';
-		unset( $request['page'], $request['controller'], $request['action'] );
+		$action = ! empty( $request[ 'action' ] ) ? $request[ 'action' ] : 'index';
+		unset( $request[ 'page' ], $request[ 'controller' ], $request[ 'action' ] );
 		try {
 			$this->output = $controller->$action( $request );
 		} catch ( Exception $e ) {
@@ -215,7 +215,7 @@ 
 		$script_url = plugins_url( TABULATE_SLUG ) . '/assets/scripts.js';
 		$deps = array( 'jquery-ui-autocomplete', 'tabulate-omnivore', 'tabulate-maskedinput', 'tabulate-timepicker' );
 		if ( Util::is_plugin_active( 'rest-api/plugin.php' ) ) {
-			$deps[] = 'wp-api';
+			$deps[ ] = 'wp-api';
 		}
 		wp_enqueue_script( 'tabulate-scripts', $script_url, $deps, TABULATE_VERSION, true );
 

src/Controllers/SchemaController.php

Spacing +25 added lines, -25 removed lines

@@ -33,8 +33,8 @@ 
 		$db = new Database( $this->wpdb );
 		$template->action = 'structure';
 		$template->tables = $db->get_tables();
-		if ( isset( $args['table'] ) ) {
-			$template->table = $db->get_table( $args['table'] );
+		if ( isset( $args[ 'table' ] ) ) {
+			$template->table = $db->get_table( $args[ 'table' ] );
 			$template->record = $template->table->get_default_record();
 		}
 		$template->xtypes = Column::get_xtypes();
@@ -49,7 +49,7 @@ 
 	public function newtable( $args ) {
 		// Create table.
 		$db = new Database( $this->wpdb );
-		$table = $db->create_table( $args['new_table_name'] );
+		$table = $db->create_table( $args[ 'new_table_name' ] );
 
 		// Redirect user with message.
 		$template = new Template( 'table/schema.html' );
@@ -65,49 +65,49 @@ 
 	 * @param string[] $args The request arguments.
 	 */
 	public function save( $args ) {
-		if ( ! isset( $args['table'] ) || ! current_user_can( 'promote_users' ) ) {
+		if ( ! isset( $args[ 'table' ] ) || ! current_user_can( 'promote_users' ) ) {
 			$url = admin_url( 'admin.php?page=tabulate' );
 			wp_safe_redirect( $url );
 			exit;
 		}
 		$db = new Database( $this->wpdb );
-		$table = $db->get_table( $args['table'] );
-		if ( isset( $args['delete'] ) ) {
+		$table = $db->get_table( $args[ 'table' ] );
+		if ( isset( $args[ 'delete' ] ) ) {
 			wp_safe_redirect( $table->get_url( 'delete', null, 'schema' ) );
 			exit;
 		}
 
 		// Rename.
-		$new_name = $args['table'];
-		if ( $table instanceof Table && ! empty( $args['new_name'] ) ) {
-			$table->rename( $args['new_name'] );
+		$new_name = $args[ 'table' ];
+		if ( $table instanceof Table && ! empty( $args[ 'new_name' ] ) ) {
+			$table->rename( $args[ 'new_name' ] );
 			$new_name = $table->get_name();
 		}
 
 		// Set comment.
-		if ( isset( $args['new_comment'] ) ) {
-			$table->set_comment( $args['new_comment'] );
+		if ( isset( $args[ 'new_comment' ] ) ) {
+			$table->set_comment( $args[ 'new_comment' ] );
 		}
 
 		// Update columns.
 		$previous_column_name = '';
-		foreach ( $args['columns'] as $col_info ) {
+		foreach ( $args[ 'columns' ] as $col_info ) {
 			// Validate inputs.
-			$old_col_name = isset( $col_info['old_name'] ) ? $col_info['old_name'] : null;
-			$new_col_name = isset( $col_info['new_name'] ) ? $col_info['new_name'] : null;
-			$xtype = isset( $col_info['xtype'] ) ? $col_info['xtype'] : null;
-			$size = isset( $col_info['size'] ) ? wp_unslash( $col_info['size'] ) : null;
-			$nullable = isset( $col_info['nullable'] );
-			$default = isset( $col_info['default'] ) ? $col_info['default'] : null;
-			$auto_increment = isset( $args['auto_increment'] ) && $args['auto_increment'] === $old_col_name;
-			$unique = isset( $col_info['unique'] );
-			$comment = isset( $col_info['comment'] ) ? $col_info['comment'] : null;
-			$target_table = isset( $col_info['target_table'] ) ? $db->get_table( $col_info['target_table'] ) : null;
+			$old_col_name = isset( $col_info[ 'old_name' ] ) ? $col_info[ 'old_name' ] : null;
+			$new_col_name = isset( $col_info[ 'new_name' ] ) ? $col_info[ 'new_name' ] : null;
+			$xtype = isset( $col_info[ 'xtype' ] ) ? $col_info[ 'xtype' ] : null;
+			$size = isset( $col_info[ 'size' ] ) ? wp_unslash( $col_info[ 'size' ] ) : null;
+			$nullable = isset( $col_info[ 'nullable' ] );
+			$default = isset( $col_info[ 'default' ] ) ? $col_info[ 'default' ] : null;
+			$auto_increment = isset( $args[ 'auto_increment' ] ) && $args[ 'auto_increment' ] === $old_col_name;
+			$unique = isset( $col_info[ 'unique' ] );
+			$comment = isset( $col_info[ 'comment' ] ) ? $col_info[ 'comment' ] : null;
+			$target_table = isset( $col_info[ 'target_table' ] ) ? $db->get_table( $col_info[ 'target_table' ] ) : null;
 
 			// Change existing or insert new column.
 			$altered = false;
 			if ( $old_col_name ) {
-				$col = $table->get_column( $col_info['old_name'] );
+				$col = $table->get_column( $col_info[ 'old_name' ] );
 				if ( $col instanceof Column ) {
 					$col->alter( $new_col_name, $xtype, $size, $nullable, $default, $auto_increment, $unique, $comment, $target_table, $previous_column_name );
 					$altered = true;
@@ -137,10 +137,10 @@ 
 	public function delete( $args ) {
 		$template = new Template( 'table/delete.html' );
 		$db = new Database( $this->wpdb );
-		$table = $db->get_table( $args['table'] );
+		$table = $db->get_table( $args[ 'table' ] );
 
 		// Ask for confirmation.
-		if ( ! isset( $args['confirm_deletion'] ) ) {
+		if ( ! isset( $args[ 'confirm_deletion' ] ) ) {
 			$template->table = $table;
 			return $template->render();
 		}