WebDevStudios / CMB2

includes/types/CMB2_Type_Base.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 	 */
 	public function __construct( CMB2_Types $types, $args = array() ) {
 		$this->types = $types;
-		$args['rendered'] = isset( $args['rendered'] ) ? (bool) $args['rendered'] : true;
+		$args[ 'rendered' ] = isset( $args[ 'rendered' ] ) ? (bool) $args[ 'rendered' ] : true;
 		$this->args = $args;
 	}
 
@@ -56,7 +56,7 @@ 
 	 * @return string|CMB2_Type_Base           Rendered output or this object.
 	 */
 	public function rendered( $rendered ) {
-		if ( $this->args['rendered'] ) {
+		if ( $this->args[ 'rendered' ] ) {
 			return is_a( $rendered, __CLASS__ ) ? $rendered->rendered : $rendered;
 		}
 

includes/CMB2_Sanitize.php

Spacing +8 added lines, -8 removed lines

@@ -172,7 +172,7 @@ 
 
 		global $wp_locale;
 
-		$search = array( $wp_locale->number_format['thousands_sep'], $wp_locale->number_format['decimal_point'] );
+		$search = array( $wp_locale->number_format[ 'thousands_sep' ], $wp_locale->number_format[ 'decimal_point' ] );
 		$replace = array( '', '.' );
 
 		// for repeatable
@@ -215,8 +215,8 @@ 
 			return $repeat_value;
 		}
 
-		if ( isset( $this->value['date'], $this->value['time'] ) ) {
-			$this->value = $this->field->get_timestamp_from_value( $this->value['date'] . ' ' . $this->value['time'] );
+		if ( isset( $this->value[ 'date' ], $this->value[ 'time' ] ) ) {
+			$this->value = $this->field->get_timestamp_from_value( $this->value[ 'date' ] . ' ' . $this->value[ 'time' ] );
 		}
 
 		if ( $tz_offset = $this->field->field_timezone_offset() ) {
@@ -254,7 +254,7 @@ 
 		$tzstring = null;
 
 		if ( is_array( $this->value ) && array_key_exists( 'timezone', $this->value ) ) {
-			$tzstring = $this->value['timezone'];
+			$tzstring = $this->value[ 'timezone' ];
 		}
 
 		if ( empty( $tzstring ) ) {
@@ -274,8 +274,8 @@ 
 			$tzstring = false !== $tzstring ? $tzstring : timezone_name_from_abbr( '', 0, 0 );
 		}
 
-		$full_format = $this->field->args['date_format'] . ' ' . $this->field->args['time_format'];
-		$full_date   = $this->value['date'] . ' ' . $this->value['time'];
+		$full_format = $this->field->args[ 'date_format' ] . ' ' . $this->field->args[ 'time_format' ];
+		$full_date   = $this->value[ 'date' ] . ' ' . $this->value[ 'time' ];
 
 		try {
 
@@ -298,7 +298,7 @@ 
 			} else {
 				// Save the utc timestamp supporting field
 				if ( $repeat ) {
-					$utc_values[ $utc_key ][] = $utc_stamp;
+					$utc_values[ $utc_key ][ ] = $utc_stamp;
 				} else {
 					$this->_save_utc_value( $utc_key, $utc_stamp );
 				}
@@ -433,7 +433,7 @@ 
 			if ( $this->value ) {
 				$val = $this->$method( true );
 				if ( ! empty( $val ) ) {
-					$new_value[] = $val;
+					$new_value[ ] = $val;
 				}
 			}
 		}

includes/types/CMB2_Type_File.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 		$output     = '';
 
 		// if options array and 'url' => false, then hide the url field
-		$input_type = array_key_exists( 'url', $options ) && false === $options['url'] ? 'hidden' : 'text';
+		$input_type = array_key_exists( 'url', $options ) && false === $options[ 'url' ] ? 'hidden' : 'text';
 
 		$output .= parent::render( array(
 			'type'  => $input_type,
@@ -71,7 +71,7 @@ 
 				if ( $_id_value ) {
 					$image = wp_get_attachment_image( $_id_value, $img_size, null, array( 'class' => 'cmb-file-field-image' ) );
 				} else {
-					$size = is_array( $img_size ) ? $img_size[0] : 350;
+					$size = is_array( $img_size ) ? $img_size[ 0 ] : 350;
 					$image = '<img style="max-width: ' . absint( $size ) . 'px; width: 100%; height: auto;" src="' . $meta_value . '" alt="" />';
 				}
 

includes/CMB2_Utils.php

Spacing +20 added lines, -21 removed lines

@@ -30,7 +30,7 @@ 
 		$dir = wp_upload_dir();
 
 		// Is URL in uploads directory?
-		if ( false === strpos( $img_url, $dir['baseurl'] . '/' ) ) {
+		if ( false === strpos( $img_url, $dir[ 'baseurl' ] . '/' ) ) {
 			return false;
 		}
 
@@ -55,8 +55,8 @@ 
 
 			foreach ( $query->posts as $post_id ) {
 				$meta = wp_get_attachment_metadata( $post_id );
-				$original_file       = basename( $meta['file'] );
-				$cropped_image_files = isset( $meta['sizes'] ) ? wp_list_pluck( $meta['sizes'], 'file' ) : array();
+				$original_file       = basename( $meta[ 'file' ] );
+				$cropped_image_files = isset( $meta[ 'sizes' ] ) ? wp_list_pluck( $meta[ 'sizes' ], 'file' ) : array();
 				if ( $original_file === $file || in_array( $file, $cropped_image_files ) ) {
 					$attachment_id = $post_id;
 					break;
@@ -140,8 +140,7 @@ 
 		}
 
 		return $this->is_valid_time_stamp( $string )
-			? (int) $string :
-			strtotime( (string) $string );
+			? (int) $string : strtotime( (string) $string );
 	}
 
 	/**
@@ -172,7 +171,7 @@ 
 	 * @param  mixed $value Value to check
 	 * @return bool         True or false
 	 */
-	public function notempty( $value ){
+	public function notempty( $value ) {
 		return null !== $value && '' !== $value && false !== $value;
 	}
 
@@ -322,24 +321,24 @@ 
 
 		// order is relevant here, since the replacement will be done sequentially.
 		$supported_options = array(
-			'd' => 'dd',  // Day, leading 0
-			'j' => 'd',   // Day, no 0
-			'z' => 'o',   // Day of the year, no leading zeroes,
+			'd' => 'dd', // Day, leading 0
+			'j' => 'd', // Day, no 0
+			'z' => 'o', // Day of the year, no leading zeroes,
 			// 'D' => 'D',   // Day name short, not sure how it'll work with translations
 			// 'l' => 'DD',  // Day name full, idem before
-			'm' => 'mm',  // Month of the year, leading 0
-			'n' => 'm',   // Month of the year, no leading 0
+			'm' => 'mm', // Month of the year, leading 0
+			'n' => 'm', // Month of the year, no leading 0
 			// 'M' => 'M',   // Month, Short name
 			// 'F' => 'MM',  // Month, full name,
-			'y' => 'y',   // Year, two digit
-			'Y' => 'yy',  // Year, full
-			'H' => 'HH',  // Hour with leading 0 (24 hour)
-			'G' => 'H',   // Hour with no leading 0 (24 hour)
-			'h' => 'hh',  // Hour with leading 0 (12 hour)
-			'g' => 'h',   // Hour with no leading 0 (12 hour),
-			'i' => 'mm',  // Minute with leading 0,
-			's' => 'ss',  // Second with leading 0,
-			'a' => 'tt',  // am/pm
+			'y' => 'y', // Year, two digit
+			'Y' => 'yy', // Year, full
+			'H' => 'HH', // Hour with leading 0 (24 hour)
+			'G' => 'H', // Hour with no leading 0 (24 hour)
+			'h' => 'hh', // Hour with leading 0 (12 hour)
+			'g' => 'h', // Hour with no leading 0 (12 hour),
+			'i' => 'mm', // Minute with leading 0,
+			's' => 'ss', // Second with leading 0,
+			'a' => 'tt', // am/pm
 			'A' => 'TT'   // AM/PM
 		);
 
@@ -360,7 +359,7 @@ 
 	 * @return string Modified value
 	 */
 	public function wrap_escaped_chars( $value ) {
-		return "'" . str_replace( '\\', '', $value[0] ) . "'";
+		return "'" . str_replace( '\\', '', $value[ 0 ] ) . "'";
 	}
 
 	/**

includes/types/CMB2_Type_Taxonomy_Select.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 	public function render() {
 		$names = $this->get_object_terms();
 
-		$saved_term  = is_wp_error( $names ) || empty( $names ) ? $this->field->get_default() : $names[key( $names )]->slug;
+		$saved_term  = is_wp_error( $names ) || empty( $names ) ? $this->field->get_default() : $names[ key( $names ) ]->slug;
 		$terms       = $this->get_terms();
 		$options     = '';
 		$option_none = $this->field->args( 'show_option_none' );

includes/types/CMB2_Type_Title.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 		), $this->args );
 
 		return $this->rendered(
-			sprintf( '<%1$s %2$s>%3$s</%1$s>%4$s', $a['tag'], $this->concat_attrs( $a, array( 'tag', 'name', 'desc' ) ), $a['name'], $a['desc'] )
+			sprintf( '<%1$s %2$s>%3$s</%1$s>%4$s', $a[ 'tag' ], $this->concat_attrs( $a, array( 'tag', 'name', 'desc' ) ), $a[ 'name' ], $a[ 'desc' ] )
 		);
 	}
 

includes/CMB2_Field_Display.php

Spacing +12 added lines, -12 removed lines

@@ -124,7 +124,7 @@ 
 			if ( is_array( $this->field->value ) ) {
 
 				// Then loop and output.
-				echo '<ul class="cmb2-'. str_replace( '_', '-', $this->field->type() ) .'">';
+				echo '<ul class="cmb2-' . str_replace( '_', '-', $this->field->type() ) . '">';
 				foreach ( $this->field->value as $val ) {
 					$this->value = $val;
 					echo '<li>', $this->_display(), '</li>';
@@ -197,8 +197,8 @@ 
 		$options = $this->field->options();
 
 		$fallback = $this->field->args( 'show_option_none' );
-		if ( ! $fallback && isset( $options[''] ) ) {
-			$fallback = $options[''];
+		if ( ! $fallback && isset( $options[ '' ] ) ) {
+			$fallback = $options[ '' ];
 		}
 		if ( ! $this->value && $fallback ) {
 			echo $fallback;
@@ -225,9 +225,9 @@ 
 		$output = array();
 		foreach ( $this->value as $val ) {
 			if ( isset( $options[ $val ] ) ) {
-				$output[] = $options[ $val ];
+				$output[ ] = $options[ $val ];
 			} else {
-				$output[] = esc_attr( $val );
+				$output[ ] = esc_attr( $val );
 			}
 		}
 
@@ -251,7 +251,7 @@ 
 	 * @since 2.2.2
 	 */
 	protected function _display() {
-		echo '<xmp class="cmb2-code">'. print_r( $this->value, true ) .'</xmp>';
+		echo '<xmp class="cmb2-code">' . print_r( $this->value, true ) . '</xmp>';
 	}
 }
 
@@ -293,7 +293,7 @@ 
 		if ( $datetime && $datetime instanceof DateTime ) {
 			$tz       = $datetime->getTimezone();
 			$tzstring = $tz->getName();
-			$this->value    = $datetime->getTimestamp();
+			$this->value = $datetime->getTimestamp();
 		}
 
 		$date = $this->field->get_timestamp_format( 'date_format', $this->value );
@@ -317,7 +317,7 @@ 
 		if ( is_wp_error( $terms ) || empty( $terms ) && ( $default = $this->field->get_default() ) ) {
 			$term = get_term_by( 'slug', $default, $taxonomy );
 		} elseif ( ! empty( $terms ) ) {
-			$term = $terms[key( $terms )];
+			$term = $terms[ key( $terms ) ];
 		}
 
 		if ( $term ) {
@@ -341,10 +341,10 @@ 
 			$terms = array();
 			if ( is_array( $default ) ) {
 				foreach ( $default as $slug ) {
-					$terms[] = get_term_by( 'slug', $slug, $taxonomy );
+					$terms[ ] = get_term_by( 'slug', $slug, $taxonomy );
 				}
 			} else {
-				$terms[] = get_term_by( 'slug', $default, $taxonomy );
+				$terms[ ] = get_term_by( 'slug', $default, $taxonomy );
 			}
 		}
 
@@ -353,7 +353,7 @@ 
 			$links = array();
 			foreach ( $terms as $term ) {
 				$link = get_edit_term_link( $term->term_id, $taxonomy );
-				$links[] = '<a href="'. esc_url( $link ) .'">'. esc_html( $term->name ) .'</a>';
+				$links[ ] = '<a href="' . esc_url( $link ) . '">' . esc_html( $term->name ) . '</a>';
 			}
 			// Then loop and output.
 			echo '<div class="cmb2-taxonomy-terms-', esc_attr( $taxonomy ), '">';
@@ -396,7 +396,7 @@ 
 			if ( $id ) {
 				$image = wp_get_attachment_image( $id, $img_size, null, array( 'class' => 'cmb-image-display' ) );
 			} else {
-				$size = is_array( $img_size ) ? $img_size[0] : 200;
+				$size = is_array( $img_size ) ? $img_size[ 0 ] : 200;
 				$image = '<img class="cmb-image-display" style="max-width: ' . absint( $size ) . 'px; width: 100%; height: auto;" src="' . $url_value . '" alt="" />';
 			}
 

includes/CMB2_hookup.php

Spacing +16 added lines, -16 removed lines

@@ -119,7 +119,7 @@ 
 
 		if ( $this->cmb->has_columns ) {
 			add_filter( 'manage_edit-comments_columns', array( $this, 'register_column_headers' ) );
-			add_action( 'manage_comments_custom_column', array( $this, 'column_display'  ), 10, 3 );
+			add_action( 'manage_comments_custom_column', array( $this, 'column_display' ), 10, 3 );
 		}
 	}
 
@@ -136,7 +136,7 @@ 
 
 		if ( $this->cmb->has_columns ) {
 			add_filter( 'manage_users_columns', array( $this, 'register_column_headers' ) );
-			add_filter( 'manage_users_custom_column', array( $this, 'return_column_display'  ), 10, 3 );
+			add_filter( 'manage_users_custom_column', array( $this, 'return_column_display' ), 10, 3 );
 		}
 	}
 
@@ -170,7 +170,7 @@ 
 
 			if ( $this->cmb->has_columns ) {
 				add_filter( "manage_edit-{$taxonomy}_columns", array( $this, 'register_column_headers' ) );
-				add_filter( "manage_{$taxonomy}_custom_column", array( $this, 'return_column_display'  ), 10, 3 );
+				add_filter( "manage_{$taxonomy}_custom_column", array( $this, 'return_column_display' ), 10, 3 );
 			}
 		}
 
@@ -263,25 +263,25 @@ 
 		$fields = $this->cmb->prop( 'fields' );
 
 		foreach ( $fields as $key => $field ) {
-			if ( ! isset( $field['column'] ) ) {
+			if ( ! isset( $field[ 'column' ] ) ) {
 				continue;
 			}
 
-			$column = $field['column'];
+			$column = $field[ 'column' ];
 
-			if ( false === $column['position'] ) {
+			if ( false === $column[ 'position' ] ) {
 
-				$columns[ $field['id'] ] = $column['name'];
+				$columns[ $field[ 'id' ] ] = $column[ 'name' ];
 
 			} else {
 
-				$before = array_slice( $columns, 0, absint( $column['position'] ) );
-				$before[ $field['id'] ] = $column['name'];
+				$before = array_slice( $columns, 0, absint( $column[ 'position' ] ) );
+				$before[ $field[ 'id' ] ] = $column[ 'name' ];
 				$columns = $before + $columns;
 			}
 
-			$column['field'] = $field;
-			$this->columns[ $field['id'] ] = $column;
+			$column[ 'field' ] = $field;
+			$this->columns[ $field[ 'id' ] ] = $column;
 		}
 
 		return $columns;
@@ -294,7 +294,7 @@ 
 	public function column_display( $column_name, $object_id ) {
 		if ( isset( $this->columns[ $column_name ] ) ) {
  			$field = new CMB2_Field( array(
-				'field_args'  => $this->columns[ $column_name ]['field'],
+				'field_args'  => $this->columns[ $column_name ][ 'field' ],
 				'object_type' => $this->object_type,
 				'object_id'   => $this->cmb->object_id( $object_id ),
 				'cmb_id'      => $this->cmb->cmb_id,
@@ -355,7 +355,7 @@ 
 	 * @return array           Modified array of classes
 	 */
 	public function close_metabox_class( $classes ) {
-		$classes[] = 'closed';
+		$classes[ ] = 'closed';
 		return $classes;
 	}
 
@@ -375,7 +375,7 @@ 
 	public function user_new_metabox( $section ) {
 		if ( $section == $this->cmb->prop( 'new_user_section' ) ) {
 			$object_id = $this->cmb->object_id();
-			$this->cmb->object_id( isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id );
+			$this->cmb->object_id( isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id );
 			$this->user_metabox();
 		}
 	}
@@ -555,7 +555,7 @@ 
 		if ( $this->taxonomy_can_save( $taxonomy ) ) {
 
 			foreach ( $this->cmb->prop( 'fields' ) as $field ) {
-				$data_to_delete[ $field['id'] ] = '';
+				$data_to_delete[ $field[ 'id' ] ] = '';
 			}
 
 			$this->cmb->save_fields( $term_id, 'term', $data_to_delete );
@@ -616,7 +616,7 @@ 
 			return;
 		}
 
-		self::$hooks_completed[] = $key;
+		self::$hooks_completed[ ] = $key;
 		add_filter( $action, $hook, $priority, $accepted_args );
 	}
 

includes/CMB2.php

Spacing +67 added lines, -67 removed lines

@@ -104,19 +104,19 @@ 
 	 */
 	public function __construct( $config, $object_id = 0 ) {
 
-		if ( empty( $config['id'] ) ) {
+		if ( empty( $config[ 'id' ] ) ) {
 			wp_die( __( 'Metabox configuration is required to have an ID parameter', 'cmb2' ) );
 		}
 
 		$this->meta_box = wp_parse_args( $config, $this->mb_defaults );
-		$this->meta_box['fields'] = array();
+		$this->meta_box[ 'fields' ] = array();
 
 		$this->object_id( $object_id );
 		$this->mb_object_type();
-		$this->cmb_id = $config['id'];
+		$this->cmb_id = $config[ 'id' ];
 
-		if ( ! empty( $config['fields'] ) && is_array( $config['fields'] ) ) {
-			$this->add_fields( $config['fields'] );
+		if ( ! empty( $config[ 'fields' ] ) && is_array( $config[ 'fields' ] ) ) {
+			$this->add_fields( $config[ 'fields' ] );
 		}
 
 		CMB2_Boxes::add( $this );
@@ -285,22 +285,22 @@ 
 	 * @return mixed CMB2_Field object if successful.
 	 */
 	public function render_field( $field_args ) {
-		$field_args['context'] = $this->prop( 'context' );
+		$field_args[ 'context' ] = $this->prop( 'context' );
 
-		if ( 'group' == $field_args['type'] ) {
+		if ( 'group' == $field_args[ 'type' ] ) {
 
-			if ( ! isset( $field_args['show_names'] ) ) {
-				$field_args['show_names'] = $this->prop( 'show_names' );
+			if ( ! isset( $field_args[ 'show_names' ] ) ) {
+				$field_args[ 'show_names' ] = $this->prop( 'show_names' );
 			}
 			$field = $this->render_group( $field_args );
 
-		} elseif ( 'hidden' == $field_args['type'] && $this->get_field( $field_args )->should_show() ) {
+		} elseif ( 'hidden' == $field_args[ 'type' ] && $this->get_field( $field_args )->should_show() ) {
 			// Save rendering for after the metabox
 			$field = $this->add_hidden_field( $field_args );
 
 		} else {
 
-			$field_args['show_names'] = $this->prop( 'show_names' );
+			$field_args[ 'show_names' ] = $this->prop( 'show_names' );
 
 			// Render default fields
 			$field = $this->get_field( $field_args )->render_field();
@@ -316,7 +316,7 @@ 
 	 */
 	public function render_group( $args ) {
 
-		if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) {
+		if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) {
 			return;
 		}
 
@@ -398,15 +398,15 @@ 
 			<div class="inside cmb-td cmb-nested cmb-field-list">';
 				// Loop and render repeatable group fields
 				foreach ( array_values( $field_group->args( 'fields' ) ) as $field_args ) {
-					if ( 'hidden' == $field_args['type'] ) {
+					if ( 'hidden' == $field_args[ 'type' ] ) {
 
 						// Save rendering for after the metabox
 						$this->add_hidden_field( $field_args, $field_group );
 
 					} else {
 
-						$field_args['show_names'] = $field_group->args( 'show_names' );
-						$field_args['context']    = $field_group->args( 'context' );
+						$field_args[ 'show_names' ] = $field_group->args( 'show_names' );
+						$field_args[ 'context' ]    = $field_group->args( 'context' );
 
 						$field = $this->get_field( $field_args, $field_group )->render_field();
 					}
@@ -434,7 +434,7 @@ 
 	 * @param array  $field_args Array of field arguments to be passed to CMB2_Field
 	 */
 	public function add_hidden_field( $field_args, $field_group = null ) {
-		if ( isset( $field_args['field_args'] ) ) {
+		if ( isset( $field_args[ 'field_args' ] ) ) {
 			// For back-compatibility.
 			$field = new CMB2_Field( $field_args );
 		} else {
@@ -447,7 +447,7 @@ 
 			$type->iterator = $field_group->index;
 		}
 
-		$this->hidden_fields[] = $type;
+		$this->hidden_fields[ ] = $type;
 
 		return $field;
 	}
@@ -544,11 +544,11 @@ 
 	 */
 	public function process_field( $field_args ) {
 
-		switch ( $field_args['type'] ) {
+		switch ( $field_args[ 'type' ] ) {
 
 			case 'group':
 				if ( $this->save_group( $field_args ) ) {
-					$this->updated[] = $field_args['id'];
+					$this->updated[ ] = $field_args[ 'id' ];
 				}
 
 				break;
@@ -562,7 +562,7 @@ 
 				$field = $this->get_new_field( $field_args );
 
 				if ( $field->save_field_from_data( $this->data_to_save ) ) {
-					$this->updated[] = $field->id();
+					$this->updated[ ] = $field->id();
 				}
 
 				break;
@@ -629,7 +629,7 @@ 
 	 * @return mixed        Return of CMB2_Field::update_data()
 	 */
 	public function save_group( $args ) {
-		if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) {
+		if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) {
 			return;
 		}
 
@@ -677,16 +677,16 @@ 
 						$_new_val = array();
 						foreach ( $new_val as $group_index => $grouped_data ) {
 							// Add the supporting data to the $saved array stack
-							$saved[ $field_group->index ][ $grouped_data['supporting_field_id'] ][] = $grouped_data['supporting_field_value'];
+							$saved[ $field_group->index ][ $grouped_data[ 'supporting_field_id' ] ][ ] = $grouped_data[ 'supporting_field_value' ];
 							// Reset var to the actual value
-							$_new_val[ $group_index ] = $grouped_data['value'];
+							$_new_val[ $group_index ] = $grouped_data[ 'value' ];
 						}
 						$new_val = $_new_val;
 					} else {
 						// Add the supporting data to the $saved array stack
-						$saved[ $field_group->index ][ $new_val['supporting_field_id'] ] = $new_val['supporting_field_value'];
+						$saved[ $field_group->index ][ $new_val[ 'supporting_field_id' ] ] = $new_val[ 'supporting_field_value' ];
 						// Reset var to the actual value
-						$new_val = $new_val['value'];
+						$new_val = $new_val[ 'value' ];
 					}
 				}
 
@@ -700,7 +700,7 @@ 
 
 				// Compare values and add to `$updated` array
 				if ( $is_updated || $is_removed ) {
-					$this->updated[] = $base_id . '::' . $field_group->index . '::' . $sub_id;
+					$this->updated[ ] = $base_id . '::' . $field_group->index . '::' . $sub_id;
 				}
 
 				// Add to `$saved` array
@@ -737,22 +737,22 @@ 
 		// Try to get our object ID from the global space
 		switch ( $this->object_type() ) {
 			case 'user':
-				$object_id = isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id;
-				$object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS['user_ID'] ) ? $GLOBALS['user_ID'] : $object_id;
+				$object_id = isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id;
+				$object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS[ 'user_ID' ] ) ? $GLOBALS[ 'user_ID' ] : $object_id;
 				break;
 
 			case 'comment':
-				$object_id = isset( $_REQUEST['c'] ) ? $_REQUEST['c'] : $object_id;
-				$object_id = ! $object_id && isset( $GLOBALS['comments']->comment_ID ) ? $GLOBALS['comments']->comment_ID : $object_id;
+				$object_id = isset( $_REQUEST[ 'c' ] ) ? $_REQUEST[ 'c' ] : $object_id;
+				$object_id = ! $object_id && isset( $GLOBALS[ 'comments' ]->comment_ID ) ? $GLOBALS[ 'comments' ]->comment_ID : $object_id;
 				break;
 
 			case 'term':
-				$object_id = isset( $_REQUEST['tag_ID'] ) ? $_REQUEST['tag_ID'] : $object_id;
+				$object_id = isset( $_REQUEST[ 'tag_ID' ] ) ? $_REQUEST[ 'tag_ID' ] : $object_id;
 				break;
 
 			default:
-				$object_id = isset( $GLOBALS['post']->ID ) ? $GLOBALS['post']->ID : $object_id;
-				$object_id = isset( $_REQUEST['post'] ) ? $_REQUEST['post'] : $object_id;
+				$object_id = isset( $GLOBALS[ 'post' ]->ID ) ? $GLOBALS[ 'post' ]->ID : $object_id;
+				$object_id = isset( $_REQUEST[ 'post' ] ) ? $_REQUEST[ 'post' ] : $object_id;
 				break;
 		}
 
@@ -828,7 +828,7 @@ 
 	 * @return boolean True/False
 	 */
 	public function is_options_page_mb() {
-		return ( isset( $this->meta_box['show_on']['key'] ) && 'options-page' === $this->meta_box['show_on']['key'] || array_key_exists( 'options-page', $this->meta_box['show_on'] ) );
+		return ( isset( $this->meta_box[ 'show_on' ][ 'key' ] ) && 'options-page' === $this->meta_box[ 'show_on' ][ 'key' ] || array_key_exists( 'options-page', $this->meta_box[ 'show_on' ] ) );
 	}
 
 	/**
@@ -915,7 +915,7 @@ 
 			return $field;
 		}
 
-		$field_id = is_string( $field ) ? $field : $field['id'];
+		$field_id = is_string( $field ) ? $field : $field[ 'id' ];
 
 		$parent_field_id = ! empty( $field_group ) ? $field_group->id() : '';
 		$ids = $this->get_field_ids( $field_id, $parent_field_id, true );
@@ -951,16 +951,16 @@ 
 		if ( $field_group && ( $sub_field_id || 0 === $sub_field_id ) ) {
 
 			// Update the fields array w/ any modified properties inherited from the group field
-			$this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] = $field_args;
+			$this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] = $field_args;
 
 			return $this->get_default_args( $field_args, $field_group );
 		}
 
 		if ( is_array( $field_args ) ) {
-			$this->meta_box['fields'][ $field_id ] = array_merge( $field_args, $this->meta_box['fields'][ $field_id ] );
+			$this->meta_box[ 'fields' ][ $field_id ] = array_merge( $field_args, $this->meta_box[ 'fields' ][ $field_id ] );
 		}
 
-		return $this->get_default_args( $this->meta_box['fields'][ $field_id ] );
+		return $this->get_default_args( $this->meta_box[ 'fields' ][ $field_id ] );
 	}
 
 	/**
@@ -1010,8 +1010,8 @@ 
 
 			$sub_fields = false;
 			if ( array_key_exists( 'fields', $field ) ) {
-				$sub_fields = $field['fields'];
-				unset( $field['fields'] );
+				$sub_fields = $field[ 'fields' ];
+				unset( $field[ 'fields' ] );
 			}
 
 			$field_id = $parent_field_id
@@ -1036,29 +1036,29 @@ 
 			return false;
 		}
 
-		if ( 'oembed' === $field['type'] ) {
+		if ( 'oembed' === $field[ 'type' ] ) {
 			// Initiate oembed Ajax hooks
 			cmb2_ajax();
 		}
 
-		if ( isset( $field['column'] ) && false !== $field['column'] ) {
+		if ( isset( $field[ 'column' ] ) && false !== $field[ 'column' ] ) {
 			$this->has_columns = true;
 
-			$column = is_array( $field['column'] ) ? $field['column'] : array();
+			$column = is_array( $field[ 'column' ] ) ? $field[ 'column' ] : array();
 
-			$field['column'] = wp_parse_args( $column, array(
-				'name'     => isset( $field['name'] ) ? $field['name'] : '',
+			$field[ 'column' ] = wp_parse_args( $column, array(
+				'name'     => isset( $field[ 'name' ] ) ? $field[ 'name' ] : '',
 				'position' => false,
 			) );
 		}
 
 		$this->_add_field_to_array(
 			$field,
-			$this->meta_box['fields'],
+			$this->meta_box[ 'fields' ],
 			$position
 		);
 
-		return $field['id'];
+		return $field[ 'id' ];
 	}
 
 	/**
@@ -1070,27 +1070,27 @@ 
 	 * @return mixed                   Array of parent/field ids or false
 	 */
 	public function add_group_field( $parent_field_id, array $field, $position = 0 ) {
-		if ( ! array_key_exists( $parent_field_id, $this->meta_box['fields'] ) ) {
+		if ( ! array_key_exists( $parent_field_id, $this->meta_box[ 'fields' ] ) ) {
 			return false;
 		}
 
-		$parent_field = $this->meta_box['fields'][ $parent_field_id ];
+		$parent_field = $this->meta_box[ 'fields' ][ $parent_field_id ];
 
-		if ( 'group' !== $parent_field['type'] ) {
+		if ( 'group' !== $parent_field[ 'type' ] ) {
 			return false;
 		}
 
-		if ( ! isset( $parent_field['fields'] ) ) {
-			$this->meta_box['fields'][ $parent_field_id ]['fields'] = array();
+		if ( ! isset( $parent_field[ 'fields' ] ) ) {
+			$this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ] = array();
 		}
 
 		$this->_add_field_to_array(
 			$field,
-			$this->meta_box['fields'][ $parent_field_id ]['fields'],
+			$this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ],
 			$position
 		);
 
-		return array( $parent_field_id, $field['id'] );
+		return array( $parent_field_id, $field[ 'id' ] );
 	}
 
 	/**
@@ -1102,9 +1102,9 @@ 
 	 */
 	protected function _add_field_to_array( $field, &$fields, $position = 0 ) {
 		if ( $position ) {
-			cmb2_utils()->array_insert( $fields, array( $field['id'] => $field ), $position );
+			cmb2_utils()->array_insert( $fields, array( $field[ 'id' ] => $field ), $position );
 		} else {
-			$fields[ $field['id'] ] = $field;
+			$fields[ $field[ 'id' ] ] = $field;
 		}
 	}
 
@@ -1127,15 +1127,15 @@ 
 		unset( $this->fields[ implode( '', $ids ) ] );
 
 		if ( ! $sub_field_id ) {
-			unset( $this->meta_box['fields'][ $field_id ] );
+			unset( $this->meta_box[ 'fields' ][ $field_id ] );
 			return true;
 		}
 
-		if ( isset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] ) ) {
-			unset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] );
+		if ( isset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] ) ) {
+			unset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] );
 		}
-		if ( isset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] ) ) {
-			unset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] );
+		if ( isset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] ) ) {
+			unset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] );
 		}
 		return true;
 	}
@@ -1159,11 +1159,11 @@ 
 		list( $field_id, $sub_field_id ) = $ids;
 
 		if ( ! $sub_field_id ) {
-			$this->meta_box['fields'][ $field_id ][ $property ] = $value;
+			$this->meta_box[ 'fields' ][ $field_id ][ $property ] = $value;
 			return $field_id;
 		}
 
-		$this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ][ $property ] = $value;
+		$this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ][ $property ] = $value;
 		return $field_id;
 	}
 
@@ -1177,7 +1177,7 @@ 
 	public function get_field_ids( $field_id, $parent_field_id = '' ) {
 		$sub_field_id = $parent_field_id ? $field_id : '';
 		$field_id     = $parent_field_id ? $parent_field_id : $field_id;
-		$fields       =& $this->meta_box['fields'];
+		$fields       = & $this->meta_box[ 'fields' ];
 
 		if ( ! array_key_exists( $field_id, $fields ) ) {
 			$field_id = $this->search_old_school_array( $field_id, $fields );
@@ -1191,12 +1191,12 @@ 
 			return array( $field_id, $sub_field_id );
 		}
 
-		if ( 'group' !== $fields[ $field_id ]['type'] ) {
+		if ( 'group' !== $fields[ $field_id ][ 'type' ] ) {
 			return false;
 		}
 
-		if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ]['fields'] ) ) {
-			$sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ]['fields'] );
+		if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ][ 'fields' ] ) ) {
+			$sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ][ 'fields' ] );
 		}
 
 		return false === $sub_field_id ? false : array( $field_id, $sub_field_id );