WebDevStudios / CMB2

includes/types/CMB2_Type_Textarea.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 		), $args );
 
 		return $this->rendered(
-			sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attrs( $a, array( 'desc', 'value' ) ), $a['value'], $a['desc'] )
+			sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attrs( $a, array( 'desc', 'value' ) ), $a[ 'value' ], $a[ 'desc' ] )
 		);
 	}
 }

includes/types/CMB2_Type_Text_Datetime_Timestamp_Timezone.php

Spacing +7 added lines, -7 removed lines

@@ -22,12 +22,12 @@ 
 			'select_timezone'         => array(),
 		) );
 
-		$args['value'] = $field->escaped_value();
-		if ( is_array( $args['value'] ) ) {
-			$args['value'] = '';
+		$args[ 'value' ] = $field->escaped_value();
+		if ( is_array( $args[ 'value' ] ) ) {
+			$args[ 'value' ] = '';
 		}
 
-		$datetime = maybe_unserialize( $args['value'] );
+		$datetime = maybe_unserialize( $args[ 'value' ] );
 		$value = $tzstring = '';
 
 		if ( $datetime && $datetime instanceof DateTime ) {
@@ -36,19 +36,19 @@ 
 			$value    = $datetime->getTimestamp();
 		}
 
-		$timestamp_args = wp_parse_args( $args['text_datetime_timestamp'], array(
+		$timestamp_args = wp_parse_args( $args[ 'text_datetime_timestamp' ], array(
 			'desc'     => '',
 			'value'    => $value,
 			'rendered' => true,
 		) );
 		$datetime_timestamp = $this->types->text_datetime_timestamp( $timestamp_args );
 
-		$timezone_select_args = wp_parse_args( $args['select_timezone'], array(
+		$timezone_select_args = wp_parse_args( $args[ 'select_timezone' ], array(
 			'class'    => 'cmb2_select cmb2-select-timezone',
 			'name'     => $this->_name( '[timezone]' ),
 			'id'       => $this->_id( '_timezone' ),
 			'options'  => wp_timezone_choice( $tzstring ),
-			'desc'     => $args['desc'],
+			'desc'     => $args[ 'desc' ],
 			'rendered' => true,
 		) );
 		$select = $this->types->select( $timezone_select_args );

includes/types/CMB2_Type_Text.php

Spacing +3 added lines, -3 removed lines

@@ -50,12 +50,12 @@
 			'js_dependencies' => array(),
 		), $args );
 
-		if ( ! empty( $a['js_dependencies'] ) ) {
-			$this->field->add_js_dependencies( $a['js_dependencies'] );
+		if ( ! empty( $a[ 'js_dependencies' ] ) ) {
+			$this->field->add_js_dependencies( $a[ 'js_dependencies' ] );
 		}
 
 		return $this->rendered(
-			sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a['desc'] )
+			sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a[ 'desc' ] )
 		);
 	}
 }

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/helper-functions.php

Doc Comments +2 added lines, -2 removed lines

@@ -317,8 +317,8 @@
 	 * Reimplementation of DateTime::createFromFormat for PHP < 5.3. :(
 	 * Borrowed from http://stackoverflow.com/questions/5399075/php-datetimecreatefromformat-in-5-2
 	 *
-	 * @param $date_format
-	 * @param $date_value
+	 * @param string $date_format
+	 * @param string $date_value
 	 *
 	 * @return DateTime
 	 */

Spacing +23 added lines, -23 removed lines

@@ -86,18 +86,18 @@ 
 	$oembed = cmb2_ajax()->get_oembed_no_edit( $args );
 
 	// Send back our embed
-	if ( $oembed['embed'] && $oembed['embed'] != $oembed['fallback'] ) {
-		return '<div class="cmb2-oembed">' . $oembed['embed'] . '</div>';
+	if ( $oembed[ 'embed' ] && $oembed[ 'embed' ] != $oembed[ 'fallback' ] ) {
+		return '<div class="cmb2-oembed">' . $oembed[ 'embed' ] . '</div>';
 	}
 
 	$error = sprintf(
 		/* translators: 1: results for. 2: link to codex.wordpress.org/Embeds */
 		esc_html__( 'No oEmbed Results Found for %1$s. View more info at %2$s.', 'cmb2' ),
-		$oembed['fallback'],
+		$oembed[ 'fallback' ],
 		'<a href="https://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>'
 	);
 
-	if ( isset( $args['wp_error'] ) && $args['wp_error'] ) {
+	if ( isset( $args[ 'wp_error' ] ) && $args[ 'wp_error' ] ) {
 		return new WP_Error( 'cmb2_get_oembed_result', $wp_error, compact( 'oembed', 'args' ) );
 	}
 
@@ -212,7 +212,7 @@ 
 		$cmb = CMB2_Boxes::get( $meta_box );
 	} else {
 		// See if we already have an instance of this metabox
-		$cmb = CMB2_Boxes::get( $meta_box['id'] );
+		$cmb = CMB2_Boxes::get( $meta_box[ 'id' ] );
 		// If not, we'll initate a new metabox
 		$cmb = $cmb ? $cmb : new CMB2( $meta_box, $object_id );
 	}
@@ -288,7 +288,7 @@ 
 	) );
 
 	// Set object type explicitly (rather than trying to guess from context)
-	$cmb->object_type( $args['object_type'] );
+	$cmb->object_type( $args[ 'object_type' ] );
 
 	// Save the metabox if it's been submitted
 	// check permissions
@@ -296,32 +296,32 @@ 
 	if (
 		$cmb->prop( 'save_fields' )
 		// check nonce
-		&& isset( $_POST['submit-cmb'], $_POST['object_id'], $_POST[ $cmb->nonce() ] )
+		&& isset( $_POST[ 'submit-cmb' ], $_POST[ 'object_id' ], $_POST[ $cmb->nonce() ] )
 		&& wp_verify_nonce( $_POST[ $cmb->nonce() ], $cmb->nonce() )
-		&& $object_id && $_POST['object_id'] == $object_id
+		&& $object_id && $_POST[ 'object_id' ] == $object_id
 	) {
 		$cmb->save_fields( $object_id, $cmb->object_type(), $_POST );
 	}
 
 	// Enqueue JS/CSS
-	if ( $args['cmb_styles'] ) {
+	if ( $args[ 'cmb_styles' ] ) {
 		CMB2_hookup::enqueue_cmb_css();
 	}
 
-	if ( $args['enqueue_js'] ) {
+	if ( $args[ 'enqueue_js' ] ) {
 		CMB2_hookup::enqueue_cmb_js();
 	}
 
-	$form_format = apply_filters( 'cmb2_get_metabox_form_format', $args['form_format'], $object_id, $cmb );
+	$form_format = apply_filters( 'cmb2_get_metabox_form_format', $args[ 'form_format' ], $object_id, $cmb );
 
 	$format_parts = explode( '%3$s', $form_format );
 
 	// Show cmb form
-	printf( $format_parts[0], $cmb->cmb_id, $object_id );
+	printf( $format_parts[ 0 ], $cmb->cmb_id, $object_id );
 	$cmb->show_form();
 
-	if ( isset( $format_parts[1] ) && $format_parts[1] ) {
-		printf( str_ireplace( '%4$s', '%1$s', $format_parts[1] ), $args['save_button'] );
+	if ( isset( $format_parts[ 1 ] ) && $format_parts[ 1 ] ) {
+		printf( str_ireplace( '%4$s', '%1$s', $format_parts[ 1 ] ), $args[ 'save_button' ] );
 	}
 
 }
@@ -334,7 +334,7 @@ 
  * @param  array   $args      Optional arguments array
  */
 function cmb2_metabox_form( $meta_box, $object_id = 0, $args = array() ) {
-	if ( ! isset( $args['echo'] ) || $args['echo'] ) {
+	if ( ! isset( $args[ 'echo' ] ) || $args[ 'echo' ] ) {
 		cmb2_print_metabox_form( $meta_box, $object_id, $args );
 	} else {
 		return cmb2_get_metabox_form( $meta_box, $object_id, $args );
@@ -356,7 +356,7 @@ 
 
 		$schedule_format = str_replace(
 			array( 'M', 'Y', 'm', 'd', 'H', 'i', 'a' ),
-			array('%b', '%Y', '%m', '%d', '%H', '%M', '%p' ),
+			array( '%b', '%Y', '%m', '%d', '%H', '%M', '%p' ),
 			$date_format
 		);
 
@@ -373,14 +373,14 @@ 
 			 * 4 or 2 characters, as needed
 			 */
 			'%04d-%02d-%02d %02d:%02d:%02d',
-			$parsed_time['tm_year'] + 1900,  // This will be "111", so we need to add 1900.
-			$parsed_time['tm_mon'] + 1,      // This will be the month minus one, so we add one.
-			$parsed_time['tm_mday'],
-			$parsed_time['tm_hour'],
-			$parsed_time['tm_min'],
-			$parsed_time['tm_sec']
+			$parsed_time[ 'tm_year' ] + 1900, // This will be "111", so we need to add 1900.
+			$parsed_time[ 'tm_mon' ] + 1, // This will be the month minus one, so we add one.
+			$parsed_time[ 'tm_mday' ],
+			$parsed_time[ 'tm_hour' ],
+			$parsed_time[ 'tm_min' ],
+			$parsed_time[ 'tm_sec' ]
 		);
 
-		return new DateTime($ymd);
+		return new DateTime( $ymd );
 	}
 }

includes/CMB2.php

Doc Comments +4 added lines, -3 removed lines

@@ -409,6 +409,7 @@ 
 	 * Add a hidden field to the list of hidden fields to be rendered later
 	 * @since 2.0.0
 	 * @param array  $field_args Array of field arguments to be passed to CMB2_Field
+	 * @param CMB2_Field $field_group
 	 */
 	public function add_hidden_field( $field_args, $field_group = null ) {
 		if ( isset( $field_args['field_args'] ) ) {
@@ -610,7 +611,7 @@ 
 	/**
 	 * Save a repeatable group
 	 * @since  1.x.x
-	 * @param  array $field_group CMB2_Field group field object
+	 * @param  CMB2_Field $field_group CMB2_Field group field object
 	 * @return mixed              Return of CMB2_Field::update_data()
 	 */
 	public function save_group_field( $field_group ) {
@@ -910,7 +911,7 @@ 
 	 * @param  mixed  $field_id     Field (or group field) ID
 	 * @param  mixed  $field_args   Array of field arguments
 	 * @param  mixed  $sub_field_id Sub field ID (if field_group exists)
-	 * @param  mixed  $field_group  If a sub-field, will be the parent group CMB2_Field object
+	 * @param  CMB2_Field|null  $field_group  If a sub-field, will be the parent group CMB2_Field object
 	 * @return array                Array of CMB2_Field arguments
 	 */
 	public function get_field_args( $field_id, $field_args, $sub_field_id, $field_group ) {
@@ -997,7 +998,7 @@ 
 	 * @since  2.0.0
 	 * @param  array  $field           Metabox field config array
 	 * @param  int    $position        (optional) Position of metabox. 1 for first, etc
-	 * @return mixed                   Field id or false
+	 * @return string                   Field id or false
 	 */
 	public function add_field( array $field, $position = 0 ) {
 		if ( ! is_array( $field ) || ! array_key_exists( 'id', $field ) ) {

Spacing +69 added lines, -69 removed lines

@@ -113,19 +113,19 @@ 
 	 */
 	public function __construct( $config, $object_id = 0 ) {
 
-		if ( empty( $config['id'] ) ) {
+		if ( empty( $config[ 'id' ] ) ) {
 			wp_die( esc_html__( '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 );
@@ -294,22 +294,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();
@@ -325,7 +325,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;
 		}
 
@@ -427,15 +427,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();
 					}
@@ -463,7 +463,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 {
@@ -476,7 +476,7 @@ 
 			$type->iterator = $field_group->index;
 		}
 
-		$this->hidden_fields[] = $type;
+		$this->hidden_fields[ ] = $type;
 
 		return $field;
 	}
@@ -573,11 +573,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;
@@ -591,7 +591,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;
@@ -658,7 +658,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;
 		}
 
@@ -706,16 +706,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' ];
 					}
 				}
 
@@ -729,7 +729,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
@@ -766,22 +766,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;
 		}
 
@@ -857,7 +857,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' ] ) );
 	}
 
 	/**
@@ -944,7 +944,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 );
@@ -980,16 +980,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 ] );
 	}
 
 	/**
@@ -1039,8 +1039,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
@@ -1065,26 +1065,26 @@ 
 			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' ] ) {
 			$field = $this->define_field_column( $field );
 		}
 
-		if ( isset( $field['taxonomy'] ) && ! empty( $field['remove_default'] ) ) {
-			$this->tax_metaboxes_to_remove[ $field['taxonomy'] ] = $field['taxonomy'];
+		if ( isset( $field[ 'taxonomy' ] ) && ! empty( $field[ 'remove_default' ] ) ) {
+			$this->tax_metaboxes_to_remove[ $field[ 'taxonomy' ] ] = $field[ 'taxonomy' ];
 		}
 
 		$this->_add_field_to_array(
 			$field,
-			$this->meta_box['fields'],
+			$this->meta_box[ 'fields' ],
 			$position
 		);
 
-		return $field['id'];
+		return $field[ 'id' ];
 	}
 
 	/**
@@ -1096,10 +1096,10 @@ 
 	protected function define_field_column( array $field ) {
 		$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,
 		) );
 
@@ -1115,27 +1115,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' ] );
 	}
 
 	/**
@@ -1147,9 +1147,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;
 		}
 	}
 
@@ -1172,15 +1172,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;
 	}
@@ -1204,11 +1204,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;
 	}
 
@@ -1222,7 +1222,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 );
@@ -1236,12 +1236,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 );

includes/CMB2_Field.php

Doc Comments +2 added lines, -2 removed lines

@@ -735,7 +735,7 @@ 
 	 * Return a formatted timestamp for a field
 	 * @since  2.0.0
 	 * @param  string $format     Either date_format or time_format
-	 * @param  string $meta_value Optional meta value to check
+	 * @param  integer $meta_value Optional meta value to check
 	 * @return string             Formatted date
 	 */
 	public function get_timestamp_format( $format = 'date_format', $meta_value = 0 ) {
@@ -1007,7 +1007,7 @@ 
 	 * Retrieve options args. Calls options_cb if it exists.
 	 * @since  2.0.0
 	 * @param  string  $key Specific option to retrieve
-	 * @return array        Array of options
+	 * @return string        Array of options
 	 */
 	public function options( $key = '' ) {
 		if ( ! empty( $this->field_options ) ) {

Spacing +78 added lines, -78 removed lines

@@ -110,21 +110,21 @@ 
 	 */
 	public function __construct( $args ) {
 
-		if ( ! empty( $args['group_field'] ) ) {
-			$this->group       = $args['group_field'];
+		if ( ! empty( $args[ 'group_field' ] ) ) {
+			$this->group       = $args[ 'group_field' ];
 			$this->object_id   = $this->group->object_id;
 			$this->object_type = $this->group->object_type;
 			$this->cmb_id      = $this->group->cmb_id;
 		} else {
-			$this->object_id   = isset( $args['object_id'] ) && '_' !== $args['object_id'] ? $args['object_id'] : 0;
-			$this->object_type = isset( $args['object_type'] ) ? $args['object_type'] : 'post';
+			$this->object_id   = isset( $args[ 'object_id' ] ) && '_' !== $args[ 'object_id' ] ? $args[ 'object_id' ] : 0;
+			$this->object_type = isset( $args[ 'object_type' ] ) ? $args[ 'object_type' ] : 'post';
 
-			if ( isset( $args['cmb_id'] ) ) {
-				$this->cmb_id = $args['cmb_id'];
+			if ( isset( $args[ 'cmb_id' ] ) ) {
+				$this->cmb_id = $args[ 'cmb_id' ];
 			}
 		}
 
-		$this->args = $this->_set_field_defaults( $args['field_args'], $args );
+		$this->args = $this->_set_field_defaults( $args[ 'field_args' ], $args );
 
 		if ( $this->object_id ) {
 			$this->value = $this->get_data();
@@ -143,7 +143,7 @@ 
 			return call_user_func_array( array( $this, 'get_string' ), $arguments );
 		}
 
-		$key = isset( $arguments[0] ) ? $arguments[0] : false;
+		$key = isset( $arguments[ 0 ] ) ? $arguments[ 0 ] : false;
 		return $this->args( $name, $key );
 	}
 
@@ -214,9 +214,9 @@ 
 	 */
 	public function get_data( $field_id = '', $args = array() ) {
 		if ( $field_id ) {
-			$args['field_id'] = $field_id;
+			$args[ 'field_id' ] = $field_id;
 		} else if ( $this->group ) {
-			$args['field_id'] = $this->group->id();
+			$args[ 'field_id' ] = $this->group->id();
 		}
 
 		$a = $this->data_args( $args );
@@ -257,13 +257,13 @@ 
 		 *
 		 * @since 2.0.0
 		 */
-		$data = apply_filters( "cmb2_override_{$a['field_id']}_meta_value", $data, $this->object_id, $a, $this );
+		$data = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_value", $data, $this->object_id, $a, $this );
 
 		// If no override, get value normally
 		if ( 'cmb2_field_no_override_val' === $data ) {
-			$data = 'options-page' === $a['type']
-				? cmb2_options( $a['id'] )->get( $a['field_id'] )
-				: get_metadata( $a['type'], $a['id'], $a['field_id'], ( $a['single'] || $a['repeat'] ) );
+			$data = 'options-page' === $a[ 'type' ]
+				? cmb2_options( $a[ 'id' ] )->get( $a[ 'field_id' ] )
+				: get_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], ( $a[ 'single' ] || $a[ 'repeat' ] ) );
 		}
 
 		if ( $this->group ) {
@@ -285,7 +285,7 @@ 
 	public function update_data( $new_value, $single = true ) {
 		$a = $this->data_args( array( 'single' => $single ) );
 
-		$a['value'] = $a['repeat'] ? array_values( $new_value ) : $new_value;
+		$a[ 'value' ] = $a[ 'repeat' ] ? array_values( $new_value ) : $new_value;
 
 		/**
 		 * Filter whether to override saving of meta value.
@@ -321,7 +321,7 @@ 
 		 *
 		 * @since 2.0.0
 		 */
-		$override = apply_filters( "cmb2_override_{$a['field_id']}_meta_save", $override, $a, $this->args(), $this );
+		$override = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_save", $override, $a, $this->args(), $this );
 
 		// If override, return that
 		if ( null !== $override ) {
@@ -329,22 +329,22 @@ 
 		}
 
 		// Options page handling (or temp data store)
-		if ( 'options-page' === $a['type'] || empty( $a['id'] ) ) {
-			return cmb2_options( $a['id'] )->update( $a['field_id'], $a['value'], false, $a['single'] );
+		if ( 'options-page' === $a[ 'type' ] || empty( $a[ 'id' ] ) ) {
+			return cmb2_options( $a[ 'id' ] )->update( $a[ 'field_id' ], $a[ 'value' ], false, $a[ 'single' ] );
 		}
 
 		// Add metadata if not single
-		if ( ! $a['single'] ) {
-			return add_metadata( $a['type'], $a['id'], $a['field_id'], $a['value'], false );
+		if ( ! $a[ 'single' ] ) {
+			return add_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $a[ 'value' ], false );
 		}
 
 		// Delete meta if we have an empty array
-		if ( is_array( $a['value'] ) && empty( $a['value'] ) ) {
-			return delete_metadata( $a['type'], $a['id'], $a['field_id'], $this->value );
+		if ( is_array( $a[ 'value' ] ) && empty( $a[ 'value' ] ) ) {
+			return delete_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $this->value );
 		}
 
 		// Update metadata
-		return update_metadata( $a['type'], $a['id'], $a['field_id'], $a['value'] );
+		return update_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $a[ 'value' ] );
 	}
 
 	/**
@@ -394,19 +394,19 @@ 
 		 * @param array $field_args All field arguments
 		 * @param CMB2_Field object $field This field object
 		 */
-		$override = apply_filters( "cmb2_override_{$a['field_id']}_meta_remove", $override, $a, $this->args(), $this );
+		$override = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_remove", $override, $a, $this->args(), $this );
 
 		// If no override, remove as usual
 		if ( null !== $override ) {
 			return $override;
 		}
 		// Option page handling
-		elseif ( 'options-page' === $a['type'] || empty( $a['id'] ) ) {
-			return cmb2_options( $a['id'] )->remove( $a['field_id'] );
+		elseif ( 'options-page' === $a[ 'type' ] || empty( $a[ 'id' ] ) ) {
+			return cmb2_options( $a[ 'id' ] )->remove( $a[ 'field_id' ] );
 		}
 
 		// Remove metadata
-		return delete_metadata( $a['type'], $a['id'], $a['field_id'], $old );
+		return delete_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $old );
 	}
 
 	/**
@@ -858,7 +858,7 @@ 
 
 		foreach ( $conditional_classes as $class => $condition ) {
 			if ( $condition ) {
-				$classes[] = $class;
+				$classes[ ] = $class;
 			}
 		}
 
@@ -869,7 +869,7 @@ 
 		}
 
 		if ( $added_classes ) {
-			$classes[] = esc_attr( $added_classes );
+			$classes[ ] = esc_attr( $added_classes );
 		}
 
 		/**
@@ -969,10 +969,10 @@ 
 	public function get_string( $text_key, $fallback ) {
 		// If null, populate with our field strings values.
 		if ( null === $this->strings ) {
-			$this->strings = (array) $this->args['text'];
+			$this->strings = (array) $this->args[ 'text' ];
 
-			if ( is_callable( $this->args['text_cb'] ) ) {
-				$strings = call_user_func( $this->args['text_cb'], $this );
+			if ( is_callable( $this->args[ 'text_cb' ] ) ) {
+				$strings = call_user_func( $this->args[ 'text_cb' ], $this );
 
 				if ( $strings && is_array( $strings ) ) {
 					$this->strings += $strings;
@@ -1006,10 +1006,10 @@ 
 			return $this->field_options;
 		}
 
-		$this->field_options = (array) $this->args['options'];
+		$this->field_options = (array) $this->args[ 'options' ];
 
-		if ( is_callable( $this->args['options_cb'] ) ) {
-			$options = call_user_func( $this->args['options_cb'], $this );
+		if ( is_callable( $this->args[ 'options_cb' ] ) ) {
+			$options = call_user_func( $this->args[ 'options_cb' ], $this );
 
 			if ( $options && is_array( $options ) ) {
 				$this->field_options = $options + $this->field_options;
@@ -1030,7 +1030,7 @@ 
 	 */
 	public function add_js_dependencies( $dependencies = array() ) {
 		foreach ( (array) $dependencies as $dependency ) {
-			$this->args['js_dependencies'][ $dependency ] = $dependency;
+			$this->args[ 'js_dependencies' ][ $dependency ] = $dependency;
 		}
 
 		CMB2_JS::add_dependencies( $dependencies );
@@ -1044,17 +1044,17 @@ 
 	 * @return mixed  Default field value
 	 */
 	public function get_default() {
-		if ( null !== $this->args['default'] ) {
-			return $this->args['default'];
+		if ( null !== $this->args[ 'default' ] ) {
+			return $this->args[ 'default' ];
 		}
 
-		$param = is_callable( $this->args['default_cb'] ) ? 'default_cb' : 'default';
+		$param = is_callable( $this->args[ 'default_cb' ] ) ? 'default_cb' : 'default';
 		$default = $this->get_param_callback_result( $param );
 
 		// Allow a filter override of the default value
-		$this->args['default'] = apply_filters( 'cmb2_default_filter', $default, $this );
+		$this->args[ 'default' ] = apply_filters( 'cmb2_default_filter', $default, $this );
 
-		return $this->args['default'];
+		return $this->args[ 'default' ];
 	}
 
 	/**
@@ -1084,18 +1084,18 @@ 
 			'classes_cb'        => '',
 			'select_all_button' => true,
 			'multiple'          => false,
-			'repeatable'        => isset( $args['type'] ) && 'group' == $args['type'],
+			'repeatable'        => isset( $args[ 'type' ] ) && 'group' == $args[ 'type' ],
 			'inline'            => false,
 			'on_front'          => true,
 			'show_names'        => true,
 			'save_field'        => true, // Will not save if false
 			'date_format'       => 'm\/d\/Y',
 			'time_format'       => 'h:i A',
-			'description'       => isset( $args['desc'] ) ? $args['desc'] : '',
-			'preview_size'      => 'file' == $args['type'] ? array( 350, 350 ) : array( 50, 50 ),
+			'description'       => isset( $args[ 'desc' ] ) ? $args[ 'desc' ] : '',
+			'preview_size'      => 'file' == $args[ 'type' ] ? array( 350, 350 ) : array( 50, 50 ),
 			'render_row_cb'     => array( $this, 'render_field_callback' ),
 			'display_cb'        => array( $this, 'display_value_callback' ),
-			'label_cb'          => 'title' != $args['type'] ? array( $this, 'label' ) : '',
+			'label_cb'          => 'title' != $args[ 'type' ] ? array( $this, 'label' ) : '',
 			'column'            => false,
 			'js_dependencies'   => array(),
 		) );
@@ -1109,44 +1109,44 @@ 
 		 */
 		$args = $this->convert_deprecated_params( $args );
 
-		$args['repeatable'] = $args['repeatable'] && ! $this->repeatable_exception( $args['type'] );
-		$args['inline']     = $args['inline'] || false !== stripos( $args['type'], '_inline' );
+		$args[ 'repeatable' ] = $args[ 'repeatable' ] && ! $this->repeatable_exception( $args[ 'type' ] );
+		$args[ 'inline' ]     = $args[ 'inline' ] || false !== stripos( $args[ 'type' ], '_inline' );
 
-		$args['options']    = 'group' == $args['type'] ? wp_parse_args( $args['options'], array(
+		$args[ 'options' ]    = 'group' == $args[ 'type' ] ? wp_parse_args( $args[ 'options' ], array(
 			'add_button'    => esc_html__( 'Add Group', 'cmb2' ),
 			'remove_button' => esc_html__( 'Remove Group', 'cmb2' ),
-		) ) : $args['options'];
+		) ) : $args[ 'options' ];
 
-		$args['_id']        = $args['id'];
-		$args['_name']      = $args['id'];
+		$args[ '_id' ]        = $args[ 'id' ];
+		$args[ '_name' ]      = $args[ 'id' ];
 
 		if ( $this->group ) {
 
-			$args['id']    = $this->group->args( 'id' ) . '_' . $this->group->index . '_' . $args['id'];
-			$args['_name'] = $this->group->args( 'id' ) . '[' . $this->group->index . '][' . $args['_name'] . ']';
+			$args[ 'id' ]    = $this->group->args( 'id' ) . '_' . $this->group->index . '_' . $args[ 'id' ];
+			$args[ '_name' ] = $this->group->args( 'id' ) . '[' . $this->group->index . '][' . $args[ '_name' ] . ']';
 		}
 
-		if ( 'wysiwyg' == $args['type'] ) {
-			$args['id'] = strtolower( str_ireplace( '-', '_', $args['id'] ) );
-			$args['options']['textarea_name'] = $args['_name'];
+		if ( 'wysiwyg' == $args[ 'type' ] ) {
+			$args[ 'id' ] = strtolower( str_ireplace( '-', '_', $args[ 'id' ] ) );
+			$args[ 'options' ][ 'textarea_name' ] = $args[ '_name' ];
 		}
 
 		$option_types = apply_filters( 'cmb2_all_or_nothing_types', array( 'select', 'radio', 'radio_inline', 'taxonomy_select', 'taxonomy_radio', 'taxonomy_radio_inline' ), $this );
 
-		if ( in_array( $args['type'], $option_types, true ) ) {
+		if ( in_array( $args[ 'type' ], $option_types, true ) ) {
 
-			$args['show_option_none'] = isset( $args['show_option_none'] ) ? $args['show_option_none'] : null;
-			$args['show_option_none'] = true === $args['show_option_none'] ? esc_html__( 'None', 'cmb2' ) : $args['show_option_none'];
+			$args[ 'show_option_none' ] = isset( $args[ 'show_option_none' ] ) ? $args[ 'show_option_none' ] : null;
+			$args[ 'show_option_none' ] = true === $args[ 'show_option_none' ] ? esc_html__( 'None', 'cmb2' ) : $args[ 'show_option_none' ];
 
-			if ( null === $args['show_option_none'] ) {
-				$off_by_default = in_array( $args['type'], array( 'select', 'radio', 'radio_inline' ), true );
-				$args['show_option_none'] = $off_by_default ? false : esc_html__( 'None', 'cmb2' );
+			if ( null === $args[ 'show_option_none' ] ) {
+				$off_by_default = in_array( $args[ 'type' ], array( 'select', 'radio', 'radio_inline' ), true );
+				$args[ 'show_option_none' ] = $off_by_default ? false : esc_html__( 'None', 'cmb2' );
 			}
 
 		}
 
-		$args['has_supporting_data'] = in_array(
-			$args['type'],
+		$args[ 'has_supporting_data' ] = in_array(
+			$args[ 'type' ],
 			array(
 				// CMB2_Sanitize::_save_file_id_value()/CMB2_Sanitize::_get_group_file_value_array()
 				'file',
@@ -1169,10 +1169,10 @@ 
 	protected function get_default_args( $field_args, $field_group = null ) {
 		$args = parent::get_default_args( array(), $this->group );
 
-		if ( isset( $field_args['field_args'] ) ) {
+		if ( isset( $field_args[ 'field_args' ] ) ) {
 			$args = wp_parse_args( $field_args, $args );
 		} else {
-			$args['field_args'] = wp_parse_args( $field_args, $this->args );
+			$args[ 'field_args' ] = wp_parse_args( $field_args, $this->args );
 		}
 
 		return $args;
@@ -1215,43 +1215,43 @@ 
 	 */
 	protected function convert_deprecated_params( $args ) {
 
-		if ( isset( $args['row_classes'] ) ) {
+		if ( isset( $args[ 'row_classes' ] ) ) {
 
 			$this->deprecated_param( __CLASS__ . '::__construct()', '2.2.3', self::DEPRECATED_PARAM, 'row_classes', 'classes' );
 
 			// row_classes param could be a callback
-			if ( is_callable( $args['row_classes'] ) ) {
+			if ( is_callable( $args[ 'row_classes' ] ) ) {
 
 				$this->deprecated_param( __CLASS__ . '::__construct()', '2.2.3', self::DEPRECATED_CB_PARAM, 'row_classes', 'classes_cb' );
 
-				$args['classes_cb'] = $args['row_classes'];
-				$args['classes'] = null;
+				$args[ 'classes_cb' ] = $args[ 'row_classes' ];
+				$args[ 'classes' ] = null;
 			} else {
 
 
-				$args['classes'] = $args['row_classes'];
+				$args[ 'classes' ] = $args[ 'row_classes' ];
 			}
 
-			unset( $args['row_classes'] );
+			unset( $args[ 'row_classes' ] );
 		}
 
 
 		// default param can be passed a callback as well
-		if ( is_callable( $args['default'] ) ) {
+		if ( is_callable( $args[ 'default' ] ) ) {
 
 			$this->deprecated_param( __CLASS__ . '::__construct()', '2.2.3', self::DEPRECATED_CB_PARAM, 'default', 'default_cb' );
 
-			$args['default_cb'] = $args['default'];
-			$args['default'] = null;
+			$args[ 'default_cb' ] = $args[ 'default' ];
+			$args[ 'default' ] = null;
 		}
 
 		// options param can be passed a callback as well
-		if ( is_callable( $args['options'] ) ) {
+		if ( is_callable( $args[ 'options' ] ) ) {
 
 			$this->deprecated_param( __CLASS__ . '::__construct()', '2.2.3', self::DEPRECATED_CB_PARAM, 'options', 'options_cb' );
 
-			$args['options_cb'] = $args['options'];
-			$args['options'] = array();
+			$args[ 'options_cb' ] = $args[ 'options' ];
+			$args[ 'options' ] = array();
 		}
 
 		return $args;

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/CMB2_Field_Display.php

Doc Comments -2 removed lines

@@ -113,8 +113,6 @@
 	 * Catchall method if field's 'display_cb' is NOT defined, or field type does
 	 * not have a corresponding display method
 	 * @since 2.2.2
-	 * @param  string $method    Non-existent method name
-	 * @param  array  $arguments All arguments passed to the method
 	 */
 	public function display() {
 		// If repeatable

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="" />';
 			}