tabulate / tabulate

src/Controllers/HomeController.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 		if ( ! $table_info ) {
 			$table_info = array();
 			foreach ( $db->get_tables() as $table ) {
-				$table_info[] = array(
+				$table_info[ ] = array(
 					'title' => $table->get_title(),
 					'count' => $table->count_records(),
 					'url' => $table->get_url(),
@@ -30,7 +30,7 @@ 
 
 		// Reports.
 		$reports_table = $db->get_table( \WordPress\Tabulate\DB\Reports::reports_table_name() );
-		$template->reports = ($reports_table) ? $reports_table->get_records( false ) : array();
+		$template->reports = ( $reports_table ) ? $reports_table->get_records( false ) : array();
 
 		return $template->render();
 	}

src/Controllers/RecordController.php

Doc Comments +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
 	 * Save a record.
 	 *
 	 * @param string[] $args The request arguments.
-	 * @return boolean
+	 * @return false|null
 	 */
 	public function save( $args ) {
 		$db = new \WordPress\Tabulate\DB\Database( $this->wpdb );
@@ -131,7 +131,7 @@ 
 	 * Delete (or ask for confirmation of deleting) a single record.
 	 *
 	 * @param string[] $args The request arguments.
-	 * @return type
+	 * @return null|string
 	 */
 	public function delete( $args ) {
 		$db = new \WordPress\Tabulate\DB\Database( $this->wpdb );

Spacing +15 added lines, -15 removed lines

@@ -37,12 +37,12 @@ 
 	public function index( $args ) {
 		// Get database and table.
 		$db = new \WordPress\Tabulate\DB\Database( $this->wpdb );
-		$table = $db->get_table( $args['table'] );
+		$table = $db->get_table( $args[ 'table' ] );
 
 		// Give it all to the template.
 		$template = $this->get_template( $table );
-		if ( isset( $args['ident'] ) ) {
-			$template->record = $table->get_record( $args['ident'] );
+		if ( isset( $args[ 'ident' ] ) ) {
+			$template->record = $table->get_record( $args[ 'ident' ] );
 			// Check permission.
 			if ( ! Grants::current_user_can( Grants::UPDATE, $table->get_name() ) ) {
 				$template->add_notice( 'error', 'You do not have permission to update data in this table.' );
@@ -55,8 +55,8 @@ 
 				$template->add_notice( 'error', 'You do not have permission to create records in this table.' );
 			}
 			// Add query-string values.
-			if ( isset( $args['defaults'] ) ) {
-				$template->record->set_multiple( $args['defaults'] );
+			if ( isset( $args[ 'defaults' ] ) ) {
+				$template->record->set_multiple( $args[ 'defaults' ] );
 			}
 		}
 		// Don't save to non-updatable views.
@@ -68,8 +68,8 @@ 
 		wp_enqueue_script( 'dashboard' );
 
 		// Return to URL.
-		if ( isset( $args['return_to'] ) ) {
-			$template->return_to = $args['return_to'];
+		if ( isset( $args[ 'return_to' ] ) ) {
+			$template->return_to = $args[ 'return_to' ];
 		}
 
 		return $template->render();
@@ -83,21 +83,21 @@ 
 	 */
 	public function save( $args ) {
 		$db = new \WordPress\Tabulate\DB\Database( $this->wpdb );
-		$table = $db->get_table( $args['table'] );
+		$table = $db->get_table( $args[ 'table' ] );
 		if ( ! $table ) {
 			// It shouldn't be possible to get here via the UI, so no message.
 			return false;
 		}
 
 		// Guard against non-post requests. c.f. wp-comments-post.php.
-		if ( ! isset( $_SERVER['REQUEST_METHOD'] ) || 'POST' !== $_SERVER['REQUEST_METHOD'] ) {
+		if ( ! isset( $_SERVER[ 'REQUEST_METHOD' ] ) || 'POST' !== $_SERVER[ 'REQUEST_METHOD' ] ) {
 			header( 'Allow: POST' );
 			header( 'HTTP/1.1 405 Method Not Allowed' );
 			header( 'Content-Type: text/plain' );
 			return false;
 		}
 
-		$record_ident = isset( $args['ident'] ) ? $args['ident'] : false;
+		$record_ident = isset( $args[ 'ident' ] ) ? $args[ 'ident' ] : false;
 		$this->verify_nonce( 'tabulate-record-' . $record_ident );
 		$template = $this->get_template( $table );
 
@@ -107,7 +107,7 @@ 
 		$existing = $table->get_record( $pk );
 		if ( ! $record_ident && $existing ) {
 			$template->add_notice( 'updated', "The record identified by '$pk' already exists." );
-			$_REQUEST['return_to'] = $existing->get_url();
+			$_REQUEST[ 'return_to' ] = $existing->get_url();
 		} else {
 			// Otherwise, create a new one.
 			try {
@@ -122,7 +122,7 @@ 
 			}
 		}
 		// Redirect back to the edit form.
-		$return_to = ( ! empty( $_REQUEST['return_to'] ) ) ? $_REQUEST['return_to'] : $template->record->get_url();
+		$return_to = ( ! empty( $_REQUEST[ 'return_to' ] ) ) ? $_REQUEST[ 'return_to' ] : $template->record->get_url();
 		wp_safe_redirect( $return_to );
 		exit;
 	}
@@ -135,15 +135,15 @@ 
 	 */
 	public function delete( $args ) {
 		$db = new \WordPress\Tabulate\DB\Database( $this->wpdb );
-		$table = $db->get_table( $args['table'] );
-		$record_ident = isset( $args['ident'] ) ? $args['ident'] : false;
+		$table = $db->get_table( $args[ 'table' ] );
+		$record_ident = isset( $args[ 'ident' ] ) ? $args[ 'ident' ] : false;
 		if ( ! $record_ident ) {
 			wp_safe_redirect( $table->get_url() );
 			exit;
 		}
 
 		// Ask for confirmation.
-		if ( ! isset( $_POST['confirm_deletion'] ) ) {
+		if ( ! isset( $_POST[ 'confirm_deletion' ] ) ) {
 			$template = new \WordPress\Tabulate\Template( 'record/delete.html' );
 			$template->table = $table;
 			$template->record = $table->get_record( $record_ident );

src/DB/Column.php

Doc Comments +2 added lines, -2 removed lines

@@ -117,7 +117,7 @@ 
 	/**
 	 * Get the valid options for this column; only applies to ENUM and SET.
 	 *
-	 * @return array The available options.
+	 * @return string[] The available options.
 	 */
 	public function get_options() {
 		return $this->options;
@@ -270,7 +270,7 @@ 
 	/**
 	 * Get the default value for this column.
 	 *
-	 * @return mixed
+	 * @return string|null
 	 */
 	public function get_default() {
 		if ( 'CURRENT_TIMESTAMP' === $this->default_value ) {

Spacing +41 added lines, -41 removed lines

@@ -144,33 +144,33 @@ 
 	protected function parse_info( $info ) {
 
 		// Name.
-		$this->name = $info['Field'];
+		$this->name = $info[ 'Field' ];
 
 		// Type.
-		$this->parse_type( $info['Type'] );
+		$this->parse_type( $info[ 'Type' ] );
 
 		// Default.
-		$this->default_value = $info['Default'];
+		$this->default_value = $info[ 'Default' ];
 
 		// Primary key.
-		if ( 'PRI' === strtoupper( $info['Key'] ) ) {
+		if ( 'PRI' === strtoupper( $info[ 'Key' ] ) ) {
 			$this->is_primary_key = true;
-			if ( 'auto_increment' === $info['Extra'] ) {
+			if ( 'auto_increment' === $info[ 'Extra' ] ) {
 				$this->is_auto_increment = true;
 			}
 		}
 
 		// Unique key.
-		$this->is_unique = ( 'UNI' === strtoupper( $info['Key'] ) );
+		$this->is_unique = ( 'UNI' === strtoupper( $info[ 'Key' ] ) );
 
 		// Comment.
-		$this->comment = $info['Comment'];
+		$this->comment = $info[ 'Comment' ];
 
 		// Collation.
-		$this->collation = $info['Collation'];
+		$this->collation = $info[ 'Collation' ];
 
 		// Is this column NULL?
-		$this->nullable = ( 'YES' === $info['Null'] );
+		$this->nullable = ( 'YES' === $info[ 'Null' ] );
 
 		// Is this a foreign key?
 		if ( in_array( $this->get_name(), $this->get_table()->get_foreign_key_names(), true ) ) {
@@ -302,14 +302,14 @@ 
 	public function get_xtype() {
 		$xtypes = self::get_xtypes();
 		if ( $this->is_foreign_key() ) {
-			return $xtypes['fk'];
+			return $xtypes[ 'fk' ];
 		}
 		if ( $this->is_boolean() ) {
-			return $xtypes['boolean'];
+			return $xtypes[ 'boolean' ];
 		}
 		// Otherwise fall back on the first xtype with a matching type.
 		foreach ( $xtypes as $xtype ) {
-			if ( strtoupper( $this->get_type() ) === $xtype['type'] ) {
+			if ( strtoupper( $this->get_type() ) === $xtype[ 'type' ] ) {
 				return $xtype;
 			}
 		}
@@ -506,22 +506,22 @@ 
 		$this->scale = null;
 		$this->options = null;
 		if ( preg_match( $varchar_pattern, $type_string, $matches ) ) {
-			$this->type = $matches[1];
-			$this->size = (int) $matches[2];
+			$this->type = $matches[ 1 ];
+			$this->size = ( int ) $matches[ 2 ];
 		} elseif ( preg_match( $decimal_pattern, $type_string, $matches ) ) {
 			$this->type = 'decimal';
-			$this->precision = $matches[1];
-			$this->scale = $matches[2];
+			$this->precision = $matches[ 1 ];
+			$this->scale = $matches[ 2 ];
 		} elseif ( preg_match( $float_pattern, $type_string, $matches ) ) {
 			$this->type = 'float';
-			$this->precision = $matches[1];
-			$this->scale = $matches[2];
+			$this->precision = $matches[ 1 ];
+			$this->scale = $matches[ 2 ];
 		} elseif ( preg_match( $integer_pattern, $type_string, $matches ) ) {
-			$this->type = $matches[1];
-			$this->size = (int) $matches[2];
+			$this->type = $matches[ 1 ];
+			$this->size = ( int ) $matches[ 2 ];
 		} elseif ( preg_match( $enum_pattern, $type_string, $matches ) ) {
-			$this->type = $matches[1];
-			$values = explode( "','", $matches[2] );
+			$this->type = $matches[ 1 ];
+			$values = explode( "','", $matches[ 2 ] );
 			$this->options = array_combine( $values, $values );
 		}
 	}
@@ -532,14 +532,14 @@ 
 	 * @return string
 	 */
 	public function __toString() {
-		$pk = ($this->is_primary_key) ? ' PK' : '';
-		$auto = ($this->is_auto_increment) ? ' AI' : '';
+		$pk = ( $this->is_primary_key ) ? ' PK' : '';
+		$auto = ( $this->is_auto_increment ) ? ' AI' : '';
 		if ( $this->references ) {
 			$ref = ' References ' . $this->references . '.';
 		} else {
 			$ref = '';
 		}
-		$size = ($this->size > 0) ? "($this->size)" : '';
+		$size = ( $this->size > 0 ) ? "($this->size)" : '';
 		return $this->name . ' ' . strtoupper( $this->type ) . $size . $pk . $auto . $ref;
 	}
 
@@ -551,7 +551,7 @@ 
 	public function get_current_column_definition() {
 		return self::get_column_definition(
 			$this->get_name(),
-			$this->get_xtype()['name'],
+			$this->get_xtype()[ 'name' ],
 			$this->get_size(),
 			$this->nullable(),
 			$this->get_default(),
@@ -580,14 +580,14 @@ 
 	 */
 	public function alter( $new_name = null, $xtype_name = null, $size = null, $nullable = null, $default = null, $auto_increment = null, $unique = null, $comment = null, $target_table = null, $after = null ) {
 		// Any that have not been set explicitely should be unchanged.
-		$new_name = ! is_null( $new_name ) ? (string) $new_name : $this->get_name();
-		$xtype_name = ! is_null( $xtype_name ) ? (string) $xtype_name : $this->get_xtype()['name'];
+		$new_name = ! is_null( $new_name ) ? ( string ) $new_name : $this->get_name();
+		$xtype_name = ! is_null( $xtype_name ) ? ( string ) $xtype_name : $this->get_xtype()[ 'name' ];
 		$size = ! is_null( $size ) ? $size : $this->get_size();
-		$nullable = ! is_null( $nullable ) ? (boolean) $nullable : $this->nullable();
-		$default = ! is_null( $default ) ? (string) $default : $this->get_default();
-		$auto_increment = ! is_null( $auto_increment ) ? (boolean) $auto_increment : $this->is_auto_increment();
-		$unique = ! is_null( $unique ) ? (boolean) $unique : $this->is_unique();
-		$comment = ! is_null( $comment ) ? (string) $comment : $this->get_comment();
+		$nullable = ! is_null( $nullable ) ? ( boolean ) $nullable : $this->nullable();
+		$default = ! is_null( $default ) ? ( string ) $default : $this->get_default();
+		$auto_increment = ! is_null( $auto_increment ) ? ( boolean ) $auto_increment : $this->is_auto_increment();
+		$unique = ! is_null( $unique ) ? ( boolean ) $unique : $this->is_unique();
+		$comment = ! is_null( $comment ) ? ( string ) $comment : $this->get_comment();
 		$target_table = ! is_null( $target_table ) ? $target_table : $this->get_referenced_table();
 
 		// Check the current column definition.
@@ -602,7 +602,7 @@ 
 		if ( $this->is_unique() ) {
 			$sql = 'SHOW INDEXES FROM `' . $table->get_name() . '` WHERE Column_name LIKE "' . $this->get_name() . '"';
 			foreach ( $wpdb->get_results( $sql, ARRAY_A ) as $index ) {
-				$sql = "DROP INDEX `" . $index['Key_name'] . "` ON `" . $table->get_name() . "`";
+				$sql = "DROP INDEX `" . $index[ 'Key_name' ] . "` ON `" . $table->get_name() . "`";
 				$wpdb->query( $sql );
 			}
 		}
@@ -660,23 +660,23 @@ 
 	public static function get_column_definition( $name, $xtype_name = null, $size = null, $nullable = true, $default = null, $auto_increment = null, $unique = null, $comment = null, $target_table = null, $after = null ) {
 		// Type.
 		$xtypes = self::get_xtypes();
-		$xtype = ( isset( $xtypes[ $xtype_name ] ) ) ? $xtypes[ $xtype_name ] : $xtypes['text_short'];
-		$type_str = $xtype['type'];
+		$xtype = ( isset( $xtypes[ $xtype_name ] ) ) ? $xtypes[ $xtype_name ] : $xtypes[ 'text_short' ];
+		$type_str = $xtype[ 'type' ];
 		// Size.
 		$size_str = '';
-		if ( $xtype['sizes'] > 0 ) {
-			$size_str = '(' . ( $size ? : 50 ) . ')';
+		if ( $xtype[ 'sizes' ] > 0 ) {
+			$size_str = '(' . ( $size ?: 50 ) . ')';
 		}
 		if ( 'boolean' === $xtype_name ) {
 			$size_str = '(1)';
 		}
-		$null_str = (true === $nullable) ? 'NULL' : 'NOT NULL';
+		$null_str = ( true === $nullable ) ? 'NULL' : 'NOT NULL';
 		$default_str = '';
 		if ( 'text_long' !== $xtype_name ) {
 			$default_str = ! empty( $default ) ? "DEFAULT '$default'" : ( $nullable ? 'DEFAULT NULL' : '' );
 		}
 		$auto_increment_str = '';
-		if ( $auto_increment && 'integer' === $xtype['name'] ) {
+		if ( $auto_increment && 'integer' === $xtype[ 'name' ] ) {
 			$auto_increment_str = 'AUTO_INCREMENT';
 		}
 		$unique_str = $unique ? 'UNIQUE' : '';
@@ -697,7 +697,7 @@ 
 				. ' (`' . $pk_col->get_name() . '`)';
 			$type_str = $pk_col->get_type();
 			$size_str = '(' . $pk_col->get_size() . ')';
-			$sign_str = ($pk_col->is_unsigned()) ? 'UNSIGNED' : '';
+			$sign_str = ( $pk_col->is_unsigned() ) ? 'UNSIGNED' : '';
 		}
 
 		// Put it all together.

src/Controllers/ReportsController.php

Doc Comments +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 	 * View a report.
 	 *
 	 * @param string[] $args The request arguments.
-	 * @return type
+	 * @return null|string
 	 */
 	public function index( $args ) {
 		$db = new Database( $this->wpdb );

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 	 */
 	public function index( $args ) {
 		$db = new Database( $this->wpdb );
-		$id = isset( $args['id'] ) ? $args['id'] : Reports::DEFAULT_REPORT_ID;
+		$id = isset( $args[ 'id' ] ) ? $args[ 'id' ] : Reports::DEFAULT_REPORT_ID;
 		$reports = new Reports( $db );
 		$template = $reports->get_template( $id );
 		$out = $template->render();

src/Controllers/ApiController.php

Spacing +5 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
 		$db = new Database( $this->wpdb );
 		$out = array();
 		foreach ( $db->get_tables( false ) as $table ) {
-			$out[] = array(
+			$out[ ] = array(
 				'value' => $table->get_name(),
 				'label' => $table->get_title(),
 			);
@@ -65,7 +65,7 @@ 
 		$out = array();
 		foreach ( $tables as $table ) {
 			if ( Grants::current_user_can( Grants::CREATE, $table->get_name() ) ) {
-				$out[] = $table->get_name();
+				$out[ ] = $table->get_name();
 			}
 		}
 		return $out;
@@ -81,7 +81,7 @@ 
 	 * @return array
 	 */
 	public function foreign_key_values( \WP_REST_Request $request ) {
-		if ( ! isset( $this->get['term'] ) ) {
+		if ( ! isset( $this->get[ 'term' ] ) ) {
 			return array();
 		}
 		$db = new Database( $this->wpdb );
@@ -90,9 +90,9 @@ 
 			return array();
 		}
 		// First get any exact matches.
-		$out = $this->foreign_key_values_build( $table, '=', $this->get['term'] );
+		$out = $this->foreign_key_values_build( $table, '=', $this->get[ 'term' ] );
 		// Then get any 'contains' matches.
-		$out += $this->foreign_key_values_build( $table, 'like', '%' . $this->get['term'] . '%' );
+		$out += $this->foreign_key_values_build( $table, 'like', '%' . $this->get[ 'term' ] . '%' );
 		return $out;
 	}
 

src/Template.php

Spacing +5 added lines, -5 removed lines

@@ -82,7 +82,7 @@ 
 	public static function add_path( $new_path ) {
 		$path = realpath( $new_path );
 		if ( ! in_array( $path, self::$paths, true ) ) {
-			self::$paths[] = $path;
+			self::$paths[ ] = $path;
 		}
 	}
 
@@ -105,7 +105,7 @@ 
 		foreach ( self::$paths as $path ) {
 			$dir = $path . '/' . ltrim( $directory, '/' );
 			foreach ( preg_grep( '/^[^\.].*\.(twig|html)$/', scandir( $dir ) ) as $file ) {
-				$templates[] = $directory . '/' . $file;
+				$templates[ ] = $directory . '/' . $file;
 			}
 		}
 		return $templates;
@@ -150,11 +150,11 @@ 
 	 * @param string $message The message to display.
 	 */
 	public function add_notice( $type, $message ) {
-		$this->data['notices'][] = array(
+		$this->data[ 'notices' ][ ] = array(
 			'type' => $type,
 			'message' => $message,
 		);
-		set_transient( $this->transient_notices, $this->data['notices'] );
+		set_transient( $this->transient_notices, $this->data[ 'notices' ] );
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 			$twig->addFunction( $f, new \Twig_SimpleFunction( $f, $f ) );
 		}
 		// Handle wp_nonce_field() differently in order to default it to returning the string.
-		$wp_nonce_field = new \Twig_SimpleFunction( 'wp_nonce_field', function ( $action = -1, $name = "_wpnonce", $referer = true, $echo = false ) {
+		$wp_nonce_field = new \Twig_SimpleFunction( 'wp_nonce_field', function( $action = -1, $name = "_wpnonce", $referer = true, $echo = false ) {
 			return wp_nonce_field( $action, $name, $referer, $echo );
 		} );
 		$twig->addFunction( $wp_nonce_field );

Doc Comments +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 	 * Get an item from this template's data.
 	 *
 	 * @param string $name The name of the template variable.
-	 * @return mixed
+	 * @return string
 	 */
 	public function __get( $name ) {
 		return $this->data[ $name ];

src/DB/ChangeTracker.php

Spacing +2 added lines, -2 removed lines

@@ -163,10 +163,10 @@
 			);
 			// Daft workaround for https://core.trac.wordpress.org/ticket/15158 .
 			if ( ! is_null( $old_val ) ) {
-				$data['old_value'] = $old_val;
+				$data[ 'old_value' ] = $old_val;
 			}
 			if ( ! is_null( $new_val ) ) {
-				$data['new_value'] = $new_val;
+				$data[ 'new_value' ] = $new_val;
 			}
 			// Save the change record.
 			$this->wpdb->insert( $this->changes_name(), $data );

Doc Comments +2 added lines, -2 removed lines

@@ -116,7 +116,7 @@ 
 	 *
 	 * @param Table  $table The table into which the record is being saved.
 	 * @param string $pk_value The primary key of the record being saved. May be null.
-	 * @return boolean
+	 * @return false|null
 	 */
 	public function before_save( Table $table, $pk_value ) {
 		// Don't save changes to the changes tables.
@@ -137,7 +137,7 @@ 
 	 *
 	 * @param Table  $table The table the record is being saved in.
 	 * @param Record $new_record The record, after being saved.
-	 * @return boolean
+	 * @return false|null
 	 */
 	public function after_save( Table $table, Record $new_record ) {
 		// Don't save changes to the changes tables.

src/DB/Record.php

Spacing +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
 	 */
 	public function __construct( $table, $data = array() ) {
 		$this->table = $table;
-		$this->data = (object) $data;
+		$this->data = ( object ) $data;
 	}
 
 	/**
@@ -175,7 +175,7 @@ 
 			$title_parts = array();
 			foreach ( $this->table->get_columns() as $col ) {
 				$col_name = $col->get_name() . self::FKTITLE;
-				$title_parts[] = $this->$col_name();
+				$title_parts[ ] = $this->$col_name();
 			}
 			return '[ ' . join( ' | ', $title_parts ) . ' ]';
 		}
@@ -227,7 +227,7 @@ 
 			'table' => $this->table->get_name(),
 		);
 		if ( $include_ident && false !== $this->get_primary_key() ) {
-			$params['ident'] = $this->get_primary_key();
+			$params[ 'ident' ] = $this->get_primary_key();
 		}
 		if ( is_array( $extra_params ) ) {
 			$params = array_merge( $params, $extra_params );

src/Controllers/MapController.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 	 */
 	protected function set_up( $args ) {
 		$db = new Database( $this->wpdb );
-		$this->table = $db->get_table( $args['table'] );
+		$this->table = $db->get_table( $args[ 'table' ] );
 
 		// Check that a point column exists.
 		$points = $this->table->get_columns( 'point' );
@@ -49,7 +49,7 @@ 
 		$this->point_col_name = $point_col->get_name();
 
 		// Apply filters.
-		$filter_param = (isset( $args['filter'] )) ? $args['filter'] : array();
+		$filter_param = ( isset( $args[ 'filter' ] ) ) ? $args[ 'filter' ] : array();
 		$this->table->add_filters( $filter_param );
 		$this->table->add_filter( $this->point_col_name, 'not empty', '' );
 	}