WebDevStudios / CMB2

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 +63 added lines, -63 removed lines

@@ -119,19 +119,19 @@ 
 	 */
 	public function __construct( $meta_box, $object_id = 0 ) {
 
-		if ( empty( $meta_box['id'] ) ) {
+		if ( empty( $meta_box[ 'id' ] ) ) {
 			wp_die( __( 'Metabox configuration is required to have an ID parameter', 'cmb2' ) );
 		}
 
 		$this->meta_box = wp_parse_args( $meta_box, $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 = $meta_box['id'];
+		$this->cmb_id = $meta_box[ 'id' ];
 
-		if ( ! empty( $meta_box['fields'] ) && is_array( $meta_box['fields'] ) ) {
-			$this->add_fields( $meta_box['fields'] );
+		if ( ! empty( $meta_box[ 'fields' ] ) && is_array( $meta_box[ 'fields' ] ) ) {
+			$this->add_fields( $meta_box[ 'fields' ] );
 		}
 
 		CMB2_Boxes::add( $this );
@@ -262,22 +262,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();
@@ -293,7 +293,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;
 		}
 
@@ -375,15 +375,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();
 					}
@@ -411,14 +411,14 @@ 
 	 * @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 {
 			$field = $this->get_new_field( $field_args, $field_group );
 		}
 
-		$this->hidden_fields[] = new CMB2_Types( $field );
+		$this->hidden_fields[ ] = new CMB2_Types( $field );
 
 		return $field;
 	}
@@ -515,11 +515,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;
@@ -533,7 +533,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;
@@ -600,7 +600,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;
 		}
 
@@ -648,16 +648,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' ];
 					}
 				}
 
@@ -670,7 +670,7 @@ 
 				$is_removed = ( empty( $new_val ) && ! empty( $old_val ) );
 				// 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
@@ -705,22 +705,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;
 		}
 
@@ -796,7 +796,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' ] ) );
 	}
 
 	/**
@@ -883,7 +883,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 );
@@ -919,16 +919,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 ] );
 	}
 
 	/**
@@ -978,8 +978,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
@@ -1004,18 +1004,18 @@ 
 			return false;
 		}
 
-		if ( 'oembed' === $field['type'] ) {
+		if ( 'oembed' === $field[ 'type' ] ) {
 			// Initiate oembed Ajax hooks
 			cmb2_ajax();
 		}
 
 		$this->_add_field_to_array(
 			$field,
-			$this->meta_box['fields'],
+			$this->meta_box[ 'fields' ],
 			$position
 		);
 
-		return $field['id'];
+		return $field[ 'id' ];
 	}
 
 	/**
@@ -1027,27 +1027,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' ] );
 	}
 
 	/**
@@ -1059,9 +1059,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;
 		}
 	}
 
@@ -1084,15 +1084,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;
 	}
@@ -1116,11 +1116,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;
 	}
 
@@ -1134,7 +1134,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 );
@@ -1148,12 +1148,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 +71 added lines, -71 removed lines

@@ -107,21 +107,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'] );
+		$this->args = $this->_set_field_defaults( $args[ 'field_args' ] );
 
 		if ( $this->object_id ) {
 			$this->value = $this->get_data();
@@ -136,7 +136,7 @@ 
 	 * @return mixed             Value of field argument
 	 */
 	public function __call( $name, $arguments ) {
-		$key = isset( $arguments[0] ) ? $arguments[0] : false;
+		$key = isset( $arguments[ 0 ] ) ? $arguments[ 0 ] : false;
 		return $this->args( $name, $key );
 	}
 
@@ -207,9 +207,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 );
@@ -250,13 +250,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 ) {
@@ -278,7 +278,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.
@@ -314,7 +314,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 ) {
@@ -322,22 +322,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' ] );
 	}
 
 	/**
@@ -387,19 +387,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 );
 	}
 
 	/**
@@ -870,7 +870,7 @@ 
 
 		foreach ( $conditional_classes as $class => $condition ) {
 			if ( $condition ) {
-				$classes[] = $class;
+				$classes[ ] = $class;
 			}
 		}
 
@@ -879,7 +879,7 @@ 
 		}
 
 		if ( $added_classes ) {
-			$classes[] = esc_attr( $added_classes );
+			$classes[ ] = esc_attr( $added_classes );
 		}
 
 		/**
@@ -981,10 +981,10 @@ 
 	public function 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;
@@ -1018,10 +1018,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;
@@ -1043,17 +1043,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, false );
 
 		// 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' ];
 	}
 
 	/**
@@ -1080,68 +1080,68 @@ 
 			'default_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,
 			'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' ),
-			'label_cb'          => 'title' != $args['type'] ? array( $this, 'label' ) : '',
+			'label_cb'          => 'title' != $args[ 'type' ] ? array( $this, 'label' ) : '',
 		) );
 
 		// default param can be passed a callback as well
-		if ( is_callable( $args['default'] ) ) {
-			$args['default_cb'] = $args['default'];
-			$args['default'] = null;
+		if ( is_callable( $args[ 'default' ] ) ) {
+			$args[ 'default_cb' ] = $args[ 'default' ];
+			$args[ 'default' ] = null;
 		}
 
-		$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' );
 
 		// options param can be passed a callback as well
-		if ( is_callable( $args['options'] ) ) {
-			$args['options_cb'] = $args['options'];
-			$args['options'] = array();
+		if ( is_callable( $args[ 'options' ] ) ) {
+			$args[ 'options_cb' ] = $args[ 'options' ];
+			$args[ 'options' ] = array();
 		}
 
-		$args['options']    = 'group' == $args['type'] ? wp_parse_args( $args['options'], array(
+		$args[ 'options' ] = 'group' == $args[ 'type' ] ? wp_parse_args( $args[ 'options' ], array(
 			'add_button'    => __( 'Add Group', 'cmb2' ),
 			'remove_button' => __( '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'] ? __( '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' ] ? __( '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 : __( '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 : __( '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',
@@ -1173,10 +1173,10 @@ 
 			'cmb_id'      => $this->cmb_id,
 		);
 
-		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 new CMB2_Field( $args );

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 ] ) . "'";
 	}
 
 	/**

Braces +3 added lines, -2 removed lines

@@ -115,7 +115,8 @@ 
 			$tzstring = '';
 		}
 
-		if ( empty( $tzstring ) ) { // Create a UTC+- zone if no timezone string exists
+		if ( empty( $tzstring ) ) {
+// Create a UTC+- zone if no timezone string exists
 			if ( 0 == $current_offset ) {
 				$tzstring = 'UTC+0';
 			} elseif ( $current_offset < 0 ) {
@@ -172,7 +173,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;
 	}