WebDevStudios / CMB2

includes/CMB2.php

Doc Comments +2 added lines, -2 removed lines

@@ -866,7 +866,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 ) {
@@ -925,7 +925,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

@@ -118,19 +118,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 );
@@ -261,16 +261,16 @@ 
 	 * @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( array(
 				'field_args'  => $field_args,
@@ -280,7 +280,7 @@ 
 
 		} 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();
@@ -296,7 +296,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;
 		}
 
@@ -329,7 +329,7 @@ 
 		 *
 		 * @param string $id The group_id of the current group.
 		 */
-		$more_attributes = apply_filters( "cmb2_additional_group_attributes", '', $field_group->args, $args['id'] );
+		$more_attributes = apply_filters( "cmb2_additional_group_attributes", '', $field_group->args, $args[ 'id' ] );
 
 		$field_group->peform_param_callback( 'before_group' );
 
@@ -393,7 +393,7 @@ 
 			<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( array(
@@ -403,8 +403,8 @@ 
 
 					} 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();
 					}
@@ -433,7 +433,7 @@ 
 	 */
 	public function add_hidden_field( $args ) {
 		$field = new CMB2_Field( $args );
-		$this->hidden_fields[] = new CMB2_Types( $field );
+		$this->hidden_fields[ ] = new CMB2_Types( $field );
 
 		return $field;
 	}
@@ -572,7 +572,7 @@ 
 	 */
 	public function process_field( $field_args ) {
 
-		switch ( $field_args['type'] ) {
+		switch ( $field_args[ 'type' ] ) {
 
 			case 'group':
 				$this->save_group( $field_args );
@@ -592,7 +592,7 @@ 
 				) );
 
 				if ( $field->save_field_from_data( $this->data_to_save ) ) {
-					$this->updated[] = $field->id();
+					$this->updated[ ] = $field->id();
 				}
 
 				break;
@@ -605,11 +605,11 @@ 
 	 */
 	public function save_group( $args ) {
 
-		if ( ! isset( $args['id'], $args['fields'], $this->data_to_save[ $args['id'] ] ) || ! is_array( $args['fields'] ) ) {
+		if ( ! isset( $args[ 'id' ], $args[ 'fields' ], $this->data_to_save[ $args[ 'id' ] ] ) || ! is_array( $args[ 'fields' ] ) ) {
 			return;
 		}
 
-		$field_group        = new CMB2_Field( array(
+		$field_group = new CMB2_Field( array(
 			'field_args'  => $args,
 			'object_type' => $this->object_type(),
 			'object_id'   => $this->object_id(),
@@ -644,16 +644,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' ];
 					}
 				}
 
@@ -666,7 +666,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
@@ -701,22 +701,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;
 		}
 
@@ -788,7 +788,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' ] ) );
 	}
 
 	/**
@@ -854,7 +854,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 );
@@ -890,7 +890,7 @@ 
 		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 array(
 				'field_args'  => $field_args,
@@ -900,11 +900,11 @@ 
 		}
 
 		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 array(
-			'field_args'  => $this->meta_box['fields'][ $field_id ],
+			'field_args'  => $this->meta_box[ 'fields' ][ $field_id ],
 			'object_type' => $this->object_type(),
 			'object_id'   => $this->object_id(),
 		);
@@ -921,8 +921,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
@@ -947,18 +947,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' ];
 	}
 
 	/**
@@ -970,27 +970,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' ] );
 	}
 
 	/**
@@ -1002,9 +1002,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;
 		}
 	}
 
@@ -1027,15 +1027,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;
 	}
@@ -1059,11 +1059,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;
 	}
 
@@ -1077,7 +1077,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 );
@@ -1091,12 +1091,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_hookup.php

Doc Comments +1 added lines, -1 removed lines

@@ -267,7 +267,7 @@
 	 * Add 'closed' class to metabox
 	 * @since  2.0.0
 	 * @param  array  $classes Array of classes
-	 * @return array           Modified array of classes
+	 * @return string[]           Modified array of classes
 	 */
 	public function close_metabox_class( $classes ) {
 		$classes[] = 'closed';

Spacing +4 added lines, -4 removed lines

@@ -270,7 +270,7 @@ 
 	 * @return array           Modified array of classes
 	 */
 	public function close_metabox_class( $classes ) {
-		$classes[] = 'closed';
+		$classes[ ] = 'closed';
 		return $classes;
 	}
 
@@ -290,7 +290,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();
 		}
 	}
@@ -441,7 +441,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 );
@@ -504,7 +504,7 @@ 
 			return;
 		}
 
-		self::$hooks_completed[] = $key;
+		self::$hooks_completed[ ] = $key;
 		add_filter( $action, $hook, $priority, $accepted_args );
 	}
 

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * Handles hooking CMB2 forms/metaboxes into the post/attachement/user screens
- * and handles hooking in and saving those fields.
- *
- * @since  2.0.0
- *
- * @category  WordPress_Plugin
- * @package   CMB2
- * @author    WebDevStudios
- * @license   GPL-2.0+
- * @link      http://webdevstudios.com
- */
+	 * Handles hooking CMB2 forms/metaboxes into the post/attachement/user screens
+	 * and handles hooking in and saving those fields.
+	 *
+	 * @since  2.0.0
+	 *
+	 * @category  WordPress_Plugin
+	 * @package   CMB2
+	 * @author    WebDevStudios
+	 * @license   GPL-2.0+
+	 * @link      http://webdevstudios.com
+	 */
 class CMB2_hookup {
 
 	/**

includes/CMB2_Sanitize.php

Doc Comments +3 added lines

@@ -357,6 +357,7 @@ 
 	/**
 	 * Gets the values for the `file` field type from the data being saved.
 	 * @since  2.2.0
+	 * @param string $id_key
 	 */
 	public function _get_group_file_value_array( $id_key ) {
 		$alldata = $this->field->group->data_to_save;
@@ -378,6 +379,7 @@ 
 	/**
 	 * Peforms saving of `file` attachement's ID
 	 * @since  1.1.0
+	 * @param string $file_id_key
 	 */
 	public function _save_file_id_value( $file_id_key ) {
 		$id_field = $this->_new_supporting_field( $file_id_key );
@@ -398,6 +400,7 @@ 
 	/**
 	 * Peforms saving of `text_datetime_timestamp_timezone` utc timestamp
 	 * @since  2.2.0
+	 * @param string $utc_key
 	 */
 	public function _save_utc_value( $utc_key, $utc_stamp ) {
 		return $this->_new_supporting_field( $utc_key )->save_field( $utc_stamp );

Spacing +11 added lines, -11 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 );
 				}
@@ -409,10 +409,10 @@ 
 	 */
 	public function _new_supporting_field( $new_field_id ) {
 		$args = $this->field->args();
-		unset( $args['_id'], $args['_name'] );
+		unset( $args[ '_id' ], $args[ '_name' ] );
 
-		$args['id'] = $new_field_id;
-		$args['sanitization_cb'] = false;
+		$args[ 'id' ] = $new_field_id;
+		$args[ 'sanitization_cb' ] = false;
 
 		// And get new field object
 		return new CMB2_Field( array(
@@ -442,7 +442,7 @@ 
 			if ( $this->value ) {
 				$val = $this->$method( true );
 				if ( ! empty( $val ) ) {
-					$new_value[] = $val;
+					$new_value[ ] = $val;
 				}
 			}
 		}

includes/CMB2_Types.php

Doc Comments +1 added lines, -1 removed lines

@@ -175,7 +175,7 @@
 	 * Combines attributes into a string for a form element
 	 * @since  1.1.0
 	 * @param  array  $attrs        Attributes to concatenate
-	 * @param  array  $attr_exclude Attributes that should NOT be concatenated
+	 * @param  string[]  $attr_exclude Attributes that should NOT be concatenated
 	 * @return string               String of attributes for form element
 	 */
 	public function concat_attrs( $attrs, $attr_exclude = array() ) {

Spacing +61 added lines, -61 removed lines

@@ -200,8 +200,8 @@ 
 	 */
 	public function concat_items( $args = array() ) {
 
-		$method = isset( $args['method'] ) ? $args['method'] : 'select_option';
-		unset( $args['method'] );
+		$method = isset( $args[ 'method' ] ) ? $args[ 'method' ] : 'select_option';
+		unset( $args[ 'method' ] );
 
 		$value = $this->field->escaped_value()
 			? $this->field->escaped_value()
@@ -219,12 +219,12 @@ 
 			// Clone args & modify for just this item
 			$a = $args;
 
-			$a['value'] = $opt_value;
-			$a['label'] = $opt_label;
+			$a[ 'value' ] = $opt_value;
+			$a[ 'label' ] = $opt_label;
 
 			// Check if this option is the value of the input
 			if ( $value == $opt_value ) {
-				$a['checked'] = 'checked';
+				$a[ 'checked' ] = 'checked';
 			}
 
 			$concatenated_items .= $this->$method( $a, $i++ );
@@ -240,7 +240,7 @@ 
 	 * @return string       Generated option element html
 	 */
 	public function select_option( $args = array() ) {
-		return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args['value'], selected( isset( $args['checked'] ) && $args['checked'], true, false ), $args['label'] ) . "\n";
+		return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args[ 'value' ], selected( isset( $args[ 'checked' ] ) && $args[ 'checked' ], true, false ), $args[ 'label' ] ) . "\n";
 	}
 
 	/**
@@ -260,7 +260,7 @@ 
 			'label' => '',
 		) );
 
-		return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a['id'], $a['label'] );
+		return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a[ 'id' ], $a[ 'label' ] );
 	}
 
 	/**
@@ -272,10 +272,10 @@ 
 	 */
 	public function list_input_checkbox( $args, $i ) {
 		$saved_value = $this->field->escaped_value();
-		if ( is_array( $saved_value ) && in_array( $args['value'], $saved_value ) ) {
-			$args['checked'] = 'checked';
+		if ( is_array( $saved_value ) && in_array( $args[ 'value' ], $saved_value ) ) {
+			$args[ 'checked' ] = 'checked';
 		}
-		$args['type'] = 'checkbox';
+		$args[ 'type' ] = 'checkbox';
 		return $this->list_input( $args, $i );
 	}
 
@@ -426,11 +426,11 @@ 
 			'js_dependencies' => array(),
 		) );
 
-		if ( ! empty( $a['js_dependencies'] ) ) {
-			CMB2_JS::add_dependencies( $a['js_dependencies'] );
+		if ( ! empty( $a[ 'js_dependencies' ] ) ) {
+			CMB2_JS::add_dependencies( $a[ 'js_dependencies' ] );
 		}
 
-		return sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a['desc'] );
+		return sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a[ 'desc' ] );
 	}
 
 	/**
@@ -449,7 +449,7 @@ 
 			'value' => $this->field->escaped_value( 'esc_textarea' ),
 			'desc'  => $this->_desc( true ),
 		) );
-		return sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attrs( $a, array( 'desc', 'value' ) ), $a['value'], $a['desc'] );
+		return sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attrs( $a, array( 'desc', 'value' ) ), $a[ 'value' ], $a[ 'desc' ] );
 	}
 
 	/**
@@ -500,8 +500,8 @@ 
 			'options' => $this->field->options(),
 		) );
 
-		wp_editor( $a['value'], $a['id'], $a['options'] );
-		echo $a['desc'];
+		wp_editor( $a[ 'value' ], $a[ 'id' ], $a[ 'options' ] );
+		echo $a[ 'desc' ];
 	}
 
 	public function text_date( $args = array() ) {
@@ -512,7 +512,7 @@ 
 			'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker' ),
 		) );
 
-		if ( false === strpos( $args['class'], 'timepicker' ) ) {
+		if ( false === strpos( $args[ 'class' ], 'timepicker' ) ) {
 			$this->parse_picker_options( 'date' );
 		}
 
@@ -544,34 +544,34 @@ 
 			'timepicker' => array(),
 		) );
 
-		if ( empty( $args['value'] ) ) {
-			$args['value'] = $this->field->escaped_value();
+		if ( empty( $args[ 'value' ] ) ) {
+			$args[ 'value' ] = $this->field->escaped_value();
 			// This will be used if there is a select_timezone set for this field
 			$tz_offset = $this->field->field_timezone_offset();
 			if ( ! empty( $tz_offset ) ) {
-				$args['value'] -= $tz_offset;
+				$args[ 'value' ] -= $tz_offset;
 			}
 		}
 
-		$has_good_value = ! empty( $args['value'] ) && ! is_array( $args['value'] );
+		$has_good_value = ! empty( $args[ 'value' ] ) && ! is_array( $args[ 'value' ] );
 
-		$date_args = wp_parse_args( $args['datepicker'], array(
+		$date_args = wp_parse_args( $args[ 'datepicker' ], array(
 			'class' => 'cmb2-text-small cmb2-datepicker',
 			'name'  => $this->_name( '[date]' ),
 			'id'    => $this->_id( '_date' ),
-			'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args['value'] ) : '',
+			'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args[ 'value' ] ) : '',
 			'desc'  => '',
 		) );
 
 		// Let's get the date-format, and set it up as a data attr for the field.
 		$date_args = $this->parse_picker_options( 'date', $date_args );
 
-		$time_args = wp_parse_args( $args['timepicker'], array(
+		$time_args = wp_parse_args( $args[ 'timepicker' ], array(
 			'class' => 'cmb2-timepicker text-time',
 			'name'  => $this->_name( '[time]' ),
 			'id'    => $this->_id( '_time' ),
-			'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args['value'] ) : '',
-			'desc'  => $args['desc'],
+			'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args[ 'value' ] ) : '',
+			'desc'  => $args[ 'desc' ],
 			'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker', 'jquery-ui-datetimepicker' ),
 		) );
 
@@ -589,12 +589,12 @@ 
 			'select_timezone'         => array(),
 		) );
 
-		$args['value'] = $this->field->escaped_value();
-		if ( is_array( $args['value'] ) ) {
-			$args['value'] = '';
+		$args[ 'value' ] = $this->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 ) {
@@ -603,24 +603,24 @@ 
 			$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,
 		) );
 
-		$timezone_args = wp_parse_args( $args['select_timezone'], array(
+		$timezone_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' ],
 		) );
 
 		return $this->text_datetime_timestamp( $timestamp_args ) . "\n" . $this->select( $timezone_args );
 	}
 
 	public function select_timezone() {
-		$this->field->args['default'] = $this->field->args( 'default' )
+		$this->field->args[ 'default' ] = $this->field->args( 'default' )
 			? $this->field->args( 'default' )
 			: cmb2_utils()->timezone_string();
 
@@ -662,7 +662,7 @@ 
 			'desc'  => $this->_desc( true ),
 		) );
 
-		return sprintf( '<%1$s class="%2$s">%3$s</%1$s>%4$s', $a['tag'], $a['class'], $a['name'], $a['desc'] );
+		return sprintf( '<%1$s class="%2$s">%3$s</%1$s>%4$s', $a[ 'tag' ], $a[ 'class' ], $a[ 'name' ], $a[ 'desc' ] );
 	}
 
 	public function select( $args = array() ) {
@@ -675,17 +675,17 @@ 
 		) );
 
 		$attrs = $this->concat_attrs( $a, array( 'desc', 'options' ) );
-		return sprintf( '<select%s>%s</select>%s', $attrs, $a['options'], $a['desc'] );
+		return sprintf( '<select%s>%s</select>%s', $attrs, $a[ 'options' ], $a[ 'desc' ] );
 	}
 
 	public function taxonomy_select() {
 
 		$names      = $this->get_object_terms();
-		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[key( $names )]->slug;
+		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[ key( $names ) ]->slug;
 		$terms      = get_terms( $this->field->args( 'taxonomy' ), 'hide_empty=0' );
 		$options    = '';
 
-		$option_none  = $this->field->args( 'show_option_none' );
+		$option_none = $this->field->args( 'show_option_none' );
 		if ( ! empty( $option_none ) ) {
 			$option_none_value = apply_filters( 'cmb2_taxonomy_select_default_value', '' );
 			$option_none_value = apply_filters( "cmb2_taxonomy_select_{$this->_id()}_default_value", $option_none_value );
@@ -715,7 +715,7 @@ 
 			'desc'    => $this->_desc( true ),
 		) );
 
-		return sprintf( '<ul class="%s">%s</ul>%s', $a['class'], $a['options'], $a['desc'] );
+		return sprintf( '<ul class="%s">%s</ul>%s', $a[ 'class' ], $a[ 'options' ], $a[ 'desc' ] );
 	}
 
 	public function radio_inline() {
@@ -750,7 +750,7 @@ 
 			: $is_checked;
 
 		if ( $is_checked ) {
-			$defaults['checked'] = 'checked';
+			$defaults[ 'checked' ] = 'checked';
 		}
 
 		$args = $this->parse_args( $args, 'checkbox', $defaults );
@@ -760,14 +760,14 @@ 
 
 	public function taxonomy_radio() {
 		$names      = $this->get_object_terms();
-		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[key( $names )]->slug;
+		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[ key( $names ) ]->slug;
 		$terms      = get_terms( $this->field->args( 'taxonomy' ), 'hide_empty=0' );
 		$options    = ''; $i = 1;
 
 		if ( ! $terms ) {
 			$options .= sprintf( '<li><label>%s</label></li>', esc_html( $this->_text( 'no_terms_text', __( 'No terms', 'cmb2' ) ) ) );
 		} else {
-			$option_none  = $this->field->args( 'show_option_none' );
+			$option_none = $this->field->args( 'show_option_none' );
 			if ( ! empty( $option_none ) ) {
 				$option_none_value = apply_filters( "cmb2_taxonomy_radio_{$this->_id()}_default_value", apply_filters( 'cmb2_taxonomy_radio_default_value', '' ) );
 				$args = array(
@@ -775,7 +775,7 @@ 
 					'label' => $option_none,
 				);
 				if ( $saved_term == $option_none_value ) {
-					$args['checked'] = 'checked';
+					$args[ 'checked' ] = 'checked';
 				}
 				$options .= $this->list_input( $args, $i );
 				$i++;
@@ -788,7 +788,7 @@ 
 				);
 
 				if ( $saved_term == $term->slug ) {
-					$args['checked'] = 'checked';
+					$args[ 'checked' ] = 'checked';
 				}
 				$options .= $this->list_input( $args, $i );
 				$i++;
@@ -825,7 +825,7 @@ 
 				);
 
 				if ( is_array( $saved_terms ) && in_array( $term->slug, $saved_terms ) ) {
-					$args['checked'] = 'checked';
+					$args[ 'checked' ] = 'checked';
 				}
 				$options .= $this->list_input( $args, $i );
 				$i++;
@@ -930,7 +930,7 @@ 
 		$query_args = $this->field->args( 'query_args' );
 
 		// 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';
 
 		echo $this->input( array(
 			'type'  => $input_type,
@@ -951,8 +951,8 @@ 
 		// Reset field args for attachment ID
 		$args = $this->field->args();
 		// If we're looking at a file in a group, we need to get the non-prefixed id
-		$args['id'] = ( $this->field->group ? $this->field->args( '_id' ) : $cached_id ) . '_id';
-		unset( $args['_id'], $args['_name'] );
+		$args[ 'id' ] = ( $this->field->group ? $this->field->args( '_id' ) : $cached_id ) . '_id';
+		unset( $args[ '_id' ], $args[ '_name' ] );
 
 		// And get new field object
 		$this->field = new CMB2_Field( array(
@@ -984,7 +984,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="" />';
 				}
 
@@ -1015,11 +1015,11 @@ 
 	 */
 	public function img_status_output( $args ) {
 		printf( '<%1$s class="img-status">%2$s<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button"%3$s>%4$s</a></p>%5$s</%1$s>',
-			$args['tag'],
-			$args['image'],
-			isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '',
+			$args[ 'tag' ],
+			$args[ 'image' ],
+			isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '',
 			esc_html( $this->_text( 'remove_image_text', __( 'Remove Image', 'cmb2' ) ) ),
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
+			isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : ''
 		);
 	}
 
@@ -1031,14 +1031,14 @@ 
 	 */
 	public function file_status_output( $args ) {
 		printf( '<%1$s class="file-status"><span>%2$s <strong>%3$s</strong></span>&nbsp;&nbsp; (<a href="%4$s" target="_blank" rel="external">%5$s</a> / <a href="#" class="cmb2-remove-file-button"%6$s>%7$s</a>)%8$s</%1$s>',
-			$args['tag'],
+			$args[ 'tag' ],
 			esc_html( $this->_text( 'file_text', __( 'File:', 'cmb2' ) ) ),
-			$this->get_file_name_from_path( $args['value'] ),
-			$args['value'],
+			$this->get_file_name_from_path( $args[ 'value' ] ),
+			$args[ 'value' ],
 			esc_html( $this->_text( 'file_download_text', __( 'Download', 'cmb2' ) ) ),
-			isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '',
+			isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '',
 			esc_html( $this->_text( 'remove_text', __( 'Remove', 'cmb2' ) ) ),
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
+			isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : ''
 		);
 	}
 
@@ -1060,8 +1060,8 @@ 
 			if ( $update ) {
 				$atts = $this->field->args( 'attributes' );
 			} else {
-				$atts = isset( $args['attributes'] )
-					? $args['attributes']
+				$atts = isset( $args[ 'attributes' ] )
+					? $args[ 'attributes' ]
 					: $atts;
 			}
 
@@ -1077,7 +1077,7 @@ 
 		}
 
 		if ( $update ) {
-			$this->field->args['attributes'] = $atts;
+			$this->field->args[ 'attributes' ] = $atts;
 		}
 
 		return array_merge( $args, $atts );

example-functions.php

Spacing +5 added lines, -5 removed lines

@@ -78,7 +78,7 @@ 
 	$cmb_demo = new_cmb2_box( array(

 		'id'            => $prefix . 'metabox',

 		'title'         => __( 'Test Metabox', 'cmb2' ),

-		'object_types'  => array( 'page', ), // Post type

+		'object_types'  => array( 'page',), // Post type

 		// 'show_on_cb' => 'yourprefix_show_if_front_page', // function should return a bool value

 		// 'context'    => 'normal',

 		// 'priority'   => 'high',

@@ -329,7 +329,7 @@ 
 		'desc'    => __( 'field description (optional)', 'cmb2' ),

 		'id'      => $prefix . 'wysiwyg',

 		'type'    => 'wysiwyg',

-		'options' => array( 'textarea_rows' => 5, ),

+		'options' => array( 'textarea_rows' => 5,),

 	) );

 

 	$cmb_demo->add_field( array(

@@ -381,11 +381,11 @@ 
 	$cmb_about_page = new_cmb2_box( array(

 		'id'           => $prefix . 'metabox',

 		'title'        => __( 'About Page Metabox', 'cmb2' ),

-		'object_types' => array( 'page', ), // Post type

+		'object_types' => array( 'page',), // Post type

 		'context'      => 'normal',

 		'priority'     => 'high',

 		'show_names'   => true, // Show field names on the left

-		'show_on'      => array( 'id' => array( 2, ) ), // Specific post IDs to display this metabox

+		'show_on'      => array( 'id' => array( 2,) ), // Specific post IDs to display this metabox

 	) );

 

 	$cmb_about_page->add_field( array(

@@ -410,7 +410,7 @@ 
 	$cmb_group = new_cmb2_box( array(

 		'id'           => $prefix . 'metabox',

 		'title'        => __( 'Repeating Field Group', 'cmb2' ),

-		'object_types' => array( 'page', ),

+		'object_types' => array( 'page',),

 	) );

 

 	// $group_field_id is the field id string, so in this case: $prefix . 'demo'

Braces +15 added lines, -15 removed lines

@@ -15,9 +15,9 @@ 
  * Get the bootstrap! If using the plugin from wordpress.org, REMOVE THIS!

  */

 

-if ( file_exists( dirname( __FILE__ ) . '/cmb2/init.php' ) ) {

+if ( file_exists( dirname( __FILE__ ) . '/cmb2/init.php' ) ) {
 	require_once dirname( __FILE__ ) . '/cmb2/init.php';

-} elseif ( file_exists( dirname( __FILE__ ) . '/CMB2/init.php' ) ) {

+} elseif ( file_exists( dirname( __FILE__ ) . '/CMB2/init.php' ) ) {
 	require_once dirname( __FILE__ ) . '/CMB2/init.php';

 }

 

@@ -28,9 +28,9 @@ 
  *

  * @return bool             True if metabox should show

  */

-function yourprefix_show_if_front_page( $cmb ) {

+function yourprefix_show_if_front_page( $cmb ) {
 	// Don't show this metabox if it's not the front page template

-	if ( $cmb->object_id !== get_option( 'page_on_front' ) ) {

+	if ( $cmb->object_id !== get_option( 'page_on_front' ) ) {
 		return false;

 	}

 	return true;

@@ -43,9 +43,9 @@ 
  *

  * @return bool                     True if metabox should show

  */

-function yourprefix_hide_if_no_cats( $field ) {

+function yourprefix_hide_if_no_cats( $field ) {
 	// Don't show this field if not in the cats category

-	if ( ! has_tag( 'cats', $field->object_id ) ) {

+	if ( ! has_tag( 'cats', $field->object_id ) ) {
 		return false;

 	}

 	return true;

@@ -57,10 +57,10 @@ 
  * @param  array             $field_args Array of field parameters

  * @param  CMB2_Field object $field      Field object

  */

-function yourprefix_before_row_if_2( $field_args, $field ) {

-	if ( 2 == $field->object_id ) {

+function yourprefix_before_row_if_2( $field_args, $field ) {
+	if ( 2 == $field->object_id ) {
 		echo '<p>Testing <b>"before_row"</b> parameter (on $post_id 2)</p>';

-	} else {

+	} else {
 		echo '<p>Testing <b>"before_row"</b> parameter (<b>NOT</b> on $post_id 2)</p>';

 	}

 }

@@ -69,7 +69,7 @@ 
 /**

  * Hook in and add a demo metabox. Can only happen on the 'cmb2_admin_init' or 'cmb2_init' hook.

  */

-function yourprefix_register_demo_metabox() {

+function yourprefix_register_demo_metabox() {
 	$prefix = 'yourprefix_demo_';

 

 	/**

@@ -372,7 +372,7 @@ 
 /**

  * Hook in and add a metabox that only appears on the 'About' page

  */

-function yourprefix_register_about_page_metabox() {

+function yourprefix_register_about_page_metabox() {
 	$prefix = 'yourprefix_about_';

 

 	/**

@@ -401,7 +401,7 @@ 
 /**

  * Hook in and add a metabox to demonstrate repeatable grouped fields

  */

-function yourprefix_register_repeatable_group_field_metabox() {

+function yourprefix_register_repeatable_group_field_metabox() {
 	$prefix = 'yourprefix_group_';

 

 	/**

@@ -465,7 +465,7 @@ 
 /**

  * Hook in and add a metabox to add fields to the user profile pages

  */

-function yourprefix_register_user_profile_metabox() {

+function yourprefix_register_user_profile_metabox() {
 	$prefix = 'yourprefix_user_';

 

 	/**

@@ -535,7 +535,7 @@ 
 /**

  * Hook in and add a metabox to add fields to taxonomy terms

  */

-function yourprefix_register_taxonomy_metabox() {

+function yourprefix_register_taxonomy_metabox() {
 	$prefix = 'yourprefix_term_';

 

 	/**

@@ -577,7 +577,7 @@ 
 /**

  * Hook in and register a metabox to handle a theme options page

  */

-function yourprefix_register_theme_options_metabox() {

+function yourprefix_register_theme_options_metabox() {
 

 	$option_key = 'yourprefix_theme_options';

 

includes/CMB2_Field.php

Spacing +58 added lines, -58 removed lines

@@ -93,16 +93,16 @@ 
 	 */
 	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;
 		} 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';
 		}
 
-		$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();
@@ -117,7 +117,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 );
 	}
 
@@ -188,9 +188,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 );
@@ -231,13 +231,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 ) {
@@ -259,7 +259,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.
@@ -295,7 +295,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 ) {
@@ -303,22 +303,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' ] );
 	}
 
 	/**
@@ -368,19 +368,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 );
 	}
 
 	/**
@@ -851,7 +851,7 @@ 
 
 		foreach ( $conditional_classes as $class => $condition ) {
 			if ( $condition ) {
-				$classes[] = $class;
+				$classes[ ] = $class;
 			}
 		}
 
@@ -860,7 +860,7 @@ 
 		}
 
 		if ( $added_classes ) {
-			$classes[] = esc_attr( $added_classes );
+			$classes[ ] = esc_attr( $added_classes );
 		}
 
 		/**
@@ -965,10 +965,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;
@@ -1003,64 +1003,64 @@ 
 			'default'           => null,
 			'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' ) : '',
 		) );
 
 		// Allow a filter override of the default value
-		$args['default']    = apply_filters( 'cmb2_default_filter', $args['default'], $this );
-		$args['repeatable'] = $args['repeatable'] && ! $this->repeatable_exception( $args['type'] );
-		$args['inline']     = $args['inline'] || false !== stripos( $args['type'], '_inline' );
+		$args[ 'default' ]    = apply_filters( 'cmb2_default_filter', $args[ 'default' ], $this );
+		$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(
 				// See CMB2_Sanitize::_save_utc_value()
 				'file',
@@ -1079,7 +1079,7 @@ 
 	 * @param array $attrs Array of attributes to update
 	 */
 	public function maybe_set_attributes( $attrs = array() ) {
-		return wp_parse_args( $this->args['attributes'], $attrs );
+		return wp_parse_args( $this->args[ 'attributes' ], $attrs );
 	}
 
 }

includes/CMB2_JS.php

Spacing +3 added lines, -3 removed lines

@@ -51,17 +51,17 @@
 		$dependencies = apply_filters( 'cmb2_script_dependencies', self::$dependencies );
 
 		// if colorpicker
-		if ( ! is_admin() && isset( $dependencies['wp-color-picker'] ) ) {
+		if ( ! is_admin() && isset( $dependencies[ 'wp-color-picker' ] ) ) {
 			self::colorpicker_frontend();
 		}
 
 		// if file/file_list
-		if ( isset( $dependencies['media-editor'] ) ) {
+		if ( isset( $dependencies[ 'media-editor' ] ) ) {
 			wp_enqueue_media();
 		}
 
 		// if timepicker
-		if ( isset( $dependencies['jquery-ui-datetimepicker'] ) ) {
+		if ( isset( $dependencies[ 'jquery-ui-datetimepicker' ] ) ) {
 			wp_register_script( 'jquery-ui-datetimepicker', cmb2_utils()->url( 'js/jquery-ui-timepicker-addon.min.js' ), array( 'jquery-ui-slider' ), CMB2_VERSION );
 		}
 

includes/CMB2_Options.php

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
 
 			if ( ! $single ) {
 				// If multiple, add to array
-				$this->options[ $field_id ][] = $value;
+				$this->options[ $field_id ][ ] = $value;
 			} else {
 				$this->options[ $field_id ] = $value;
 			}

includes/CMB2_Show_Filters.php

Spacing +9 added lines, -9 removed lines

@@ -27,15 +27,15 @@ 
 	 * @return mixed                show_on key or false
 	 */
 	private static function get_show_on_key( $meta_box_args ) {
-		$show_on = isset( $meta_box_args['show_on'] ) ? (array) $meta_box_args['show_on'] : false;
+		$show_on = isset( $meta_box_args[ 'show_on' ] ) ? (array) $meta_box_args[ 'show_on' ] : false;
 		if ( $show_on && is_array( $show_on ) ) {
 
 			if ( array_key_exists( 'key', $show_on ) ) {
-				return $show_on['key'];
+				return $show_on[ 'key' ];
 			}
 
 			$keys = array_keys( $show_on );
-			return $keys[0];
+			return $keys[ 0 ];
 		}
 
 		return false;
@@ -51,17 +51,17 @@ 
 	 * @return mixed                show_on value or false
 	 */
 	private static function get_show_on_value( $meta_box_args ) {
-		$show_on = isset( $meta_box_args['show_on'] ) ? (array) $meta_box_args['show_on'] : false;
+		$show_on = isset( $meta_box_args[ 'show_on' ] ) ? (array) $meta_box_args[ 'show_on' ] : false;
 
 		if ( $show_on && is_array( $show_on ) ) {
 
 			if ( array_key_exists( 'value', $show_on ) ) {
-				return $show_on['value'];
+				return $show_on[ 'value' ];
 			}
 
 			$keys = array_keys( $show_on );
 
-			return $show_on[ $keys[0] ];
+			return $show_on[ $keys[ 0 ] ];
 		}
 
 		return array();
@@ -141,7 +141,7 @@ 
 		if ( is_admin() ) {
 
 			// If there is no 'page' query var, our filter isn't applicable
-			if ( ! isset( $_GET['page'] ) ) {
+			if ( ! isset( $_GET[ 'page' ] ) ) {
 				return $display;
 			}
 
@@ -153,12 +153,12 @@ 
 
 			if ( is_array( $show_on ) ) {
 				foreach ( $show_on as $page ) {
-					if ( $_GET['page'] == $page ) {
+					if ( $_GET[ 'page' ] == $page ) {
 						return true;
 					}
 				}
 			} else {
-				if ( $_GET['page'] == $show_on ) {
+				if ( $_GET[ 'page' ] == $show_on ) {
 					return true;
 				}
 			}