lightspeeddevelopment / lsx-health-plan

vendor/CMB2/includes/CMB2_Field.php

Spacing +287 added lines, -287 removed lines

@@ -129,25 +129,25 @@ 
 	 * @since 1.1.0
 	 * @param array $args Field arguments.
 	 */
-	public function __construct( $args ) {
+	public function __construct($args) {
 
-		if ( ! empty( $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'] ) ) {
+			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 ) {
+		if ($this->object_id) {
 			$this->value = $this->get_data();
 		}
 	}
@@ -160,13 +160,13 @@ 
 	 * @param  array  $arguments Array of passed-in arguments.
 	 * @return mixed             Value of field argument
 	 */
-	public function __call( $name, $arguments ) {
-		if ( 'string' === $name ) {
-			return call_user_func_array( array( $this, 'get_string' ), $arguments );
+	public function __call($name, $arguments) {
+		if ('string' === $name) {
+			return call_user_func_array(array($this, 'get_string'), $arguments);
 		}
 
-		$key = isset( $arguments[0] ) ? $arguments[0] : '';
-		return $this->args( $name, $key );
+		$key = isset($arguments[0]) ? $arguments[0] : '';
+		return $this->args($name, $key);
 	}
 
 	/**
@@ -176,9 +176,9 @@ 
 	 * @param  boolean $raw Whether to retrieve pre-modidifed id.
 	 * @return string       Field id
 	 */
-	public function id( $raw = false ) {
+	public function id($raw = false) {
 		$id = $raw ? '_id' : 'id';
-		return $this->args( $id );
+		return $this->args($id);
 	}
 
 	/**
@@ -189,16 +189,16 @@ 
 	 * @param  string $_key Sub argument to check.
 	 * @return mixed        Argument value or false if non-existent
 	 */
-	public function args( $key = '', $_key = '' ) {
-		$arg = $this->_data( 'args', $key );
+	public function args($key = '', $_key = '') {
+		$arg = $this->_data('args', $key);
 
-		if ( in_array( $key, array( 'default', 'default_cb' ), true ) ) {
+		if (in_array($key, array('default', 'default_cb'), true)) {
 
 			$arg = $this->get_default();
 
-		} elseif ( $_key ) {
+		} elseif ($_key) {
 
-			$arg = isset( $arg[ $_key ] ) ? $arg[ $_key ] : false;
+			$arg = isset($arg[$_key]) ? $arg[$_key] : false;
 		}
 
 		return $arg;
@@ -212,10 +212,10 @@ 
 	 * @param  string $key Field property array key to check.
 	 * @return mixed        Queried property value or false
 	 */
-	public function _data( $var, $key = '' ) {
+	public function _data($var, $key = '') {
 		$vars = $this->{$var};
-		if ( $key ) {
-			return array_key_exists( $key, $vars ) ? $vars[ $key ] : false;
+		if ($key) {
+			return array_key_exists($key, $vars) ? $vars[$key] : false;
 		}
 		return $vars;
 	}
@@ -227,8 +227,8 @@ 
 	 * @param  string $key If value is an array, is used to get array key->value.
 	 * @return mixed       Field value or false if non-existent
 	 */
-	public function value( $key = '' ) {
-		return $this->_data( 'value', $key );
+	public function value($key = '') {
+		return $this->_data('value', $key);
 	}
 
 	/**
@@ -239,14 +239,14 @@ 
 	 * @param  array  $args     Override arguments.
 	 * @return mixed            Meta/Option value
 	 */
-	public function get_data( $field_id = '', $args = array() ) {
-		if ( $field_id ) {
+	public function get_data($field_id = '', $args = array()) {
+		if ($field_id) {
 			$args['field_id'] = $field_id;
-		} elseif ( $this->group ) {
+		} elseif ($this->group) {
 			$args['field_id'] = $this->group->id();
 		}
 
-		$a = $this->data_args( $args );
+		$a = $this->data_args($args);
 
 		/**
 		 * Filter whether to override getting of meta value.
@@ -273,7 +273,7 @@ 
 		 *
 		 * @param CMB2_Field object $field This field object
 		 */
-		$data = apply_filters( 'cmb2_override_meta_value', 'cmb2_field_no_override_val', $this->object_id, $a, $this );
+		$data = apply_filters('cmb2_override_meta_value', 'cmb2_field_no_override_val', $this->object_id, $a, $this);
 
 		/**
 		 * Filter and parameters are documented for 'cmb2_override_meta_value' filter (above).
@@ -284,19 +284,19 @@ 
 		 *
 		 * @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 ) {
+		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'] ) );
+				? cmb2_options($a['id'])->get($a['field_id'])
+				: get_metadata($a['type'], $a['id'], $a['field_id'], ($a['single'] || $a['repeat']));
 		}
 
-		if ( $this->group ) {
+		if ($this->group) {
 
-			$data = is_array( $data ) && isset( $data[ $this->group->index ][ $this->args( '_id' ) ] )
-				? $data[ $this->group->index ][ $this->args( '_id' ) ]
+			$data = is_array($data) && isset($data[$this->group->index][$this->args('_id')])
+				? $data[$this->group->index][$this->args('_id')]
 				: false;
 		}
 
@@ -311,12 +311,12 @@ 
 	 * @param  bool  $single    Whether data is an array (add_metadata).
 	 * @return mixed
 	 */
-	public function update_data( $new_value, $single = true ) {
-		$a = $this->data_args( array(
+	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.
@@ -341,7 +341,7 @@ 
 		 *
 		 * @param CMB2_Field object $field This field object
 		 */
-		$override = apply_filters( 'cmb2_override_meta_save', null, $a, $this->args(), $this );
+		$override = apply_filters('cmb2_override_meta_save', null, $a, $this->args(), $this);
 
 		/**
 		 * Filter and parameters are documented for 'cmb2_override_meta_save' filter (above).
@@ -352,30 +352,30 @@ 
 		 *
 		 * @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 ) {
+		if (null !== $override) {
 			return $override;
 		}
 
 		// 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']);
 	}
 
 	/**
@@ -385,10 +385,10 @@ 
 	 * @param  string $old Old value.
 	 * @return mixed
 	 */
-	public function remove_data( $old = '' ) {
-		$a = $this->data_args( array(
+	public function remove_data($old = '') {
+		$a = $this->data_args(array(
 			'old' => $old,
-		) );
+		));
 
 		/**
 		 * Filter whether to override removing of meta value.
@@ -407,7 +407,7 @@ 
 		 * @param array $field_args All field arguments
 		 * @param CMB2_Field object $field This field object
 		 */
-		$override = apply_filters( 'cmb2_override_meta_remove', null, $a, $this->args(), $this );
+		$override = apply_filters('cmb2_override_meta_remove', null, $a, $this->args(), $this);
 
 		/**
 		 * Filter whether to override removing of meta value.
@@ -429,19 +429,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 ) {
+		if (null !== $override) {
 			return $override;
 		} // End if.
 		// 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);
 	}
 
 	/**
@@ -451,14 +451,14 @@ 
 	 * @param  array $args Override arguments.
 	 * @return array       Updated arguments
 	 */
-	public function data_args( $args = array() ) {
-		$args = wp_parse_args( $args, array(
+	public function data_args($args = array()) {
+		$args = wp_parse_args($args, array(
 			'type'     => $this->object_type,
 			'id'       => $this->object_id,
-			'field_id' => $this->id( true ),
-			'repeat'   => $this->args( 'repeatable' ),
-			'single'   => ! $this->args( 'multiple' ),
-		) );
+			'field_id' => $this->id(true),
+			'repeat'   => $this->args('repeatable'),
+			'single'   => ! $this->args('multiple'),
+		));
 		return $args;
 	}
 
@@ -469,24 +469,24 @@ 
 	 * @param  mixed $meta_value Meta value.
 	 * @return mixed             Possibly sanitized meta value
 	 */
-	public function sanitization_cb( $meta_value ) {
+	public function sanitization_cb($meta_value) {
 
-		if ( $this->args( 'repeatable' ) && is_array( $meta_value ) ) {
+		if ($this->args('repeatable') && is_array($meta_value)) {
 			// Remove empties.
-			$meta_value = array_filter( $meta_value );
+			$meta_value = array_filter($meta_value);
 		}
 
 		// Check if the field has a registered validation callback.
-		$cb = $this->maybe_callback( 'sanitization_cb' );
-		if ( false === $cb ) {
+		$cb = $this->maybe_callback('sanitization_cb');
+		if (false === $cb) {
 			// If requesting NO validation, return meta value.
 			return $meta_value;
-		} elseif ( $cb ) {
+		} elseif ($cb) {
 			// Ok, callback is good, let's run it.
-			return call_user_func( $cb, $meta_value, $this->args(), $this );
+			return call_user_func($cb, $meta_value, $this->args(), $this);
 		}
 
-		$sanitizer = new CMB2_Sanitize( $this, $meta_value );
+		$sanitizer = new CMB2_Sanitize($this, $meta_value);
 		$field_type = $this->type();
 
 		/**
@@ -504,9 +504,9 @@ 
 		 * @param array      $field_args The current field's arguments
 		 * @param object     $sanitizer  This `CMB2_Sanitize` object
 		 */
-		$override_value = apply_filters( "cmb2_sanitize_{$field_type}", null, $sanitizer->value, $this->object_id, $this->args(), $sanitizer );
+		$override_value = apply_filters("cmb2_sanitize_{$field_type}", null, $sanitizer->value, $this->object_id, $this->args(), $sanitizer);
 
-		if ( null !== $override_value ) {
+		if (null !== $override_value) {
 			return $override_value;
 		}
 
@@ -521,14 +521,14 @@ 
 	 * @param  array $data_to_save $_POST data to check.
 	 * @return array|int|bool                Result of save, false on failure
 	 */
-	public function save_field_from_data( array $data_to_save ) {
+	public function save_field_from_data(array $data_to_save) {
 		$this->data_to_save = $data_to_save;
 
-		$meta_value = isset( $this->data_to_save[ $this->id( true ) ] )
-			? $this->data_to_save[ $this->id( true ) ]
+		$meta_value = isset($this->data_to_save[$this->id(true)])
+			? $this->data_to_save[$this->id(true)]
 			: null;
 
-		return $this->save_field( $meta_value );
+		return $this->save_field($meta_value);
 	}
 
 	/**
@@ -538,25 +538,25 @@ 
 	 * @param  array $meta_value Desired value to sanitize/store.
 	 * @return array|int|bool              Result of save. false on failure
 	 */
-	public function save_field( $meta_value ) {
+	public function save_field($meta_value) {
 
 		$updated   = false;
 		$action    = '';
-		$new_value = $this->sanitization_cb( $meta_value );
+		$new_value = $this->sanitization_cb($meta_value);
 
-		if ( ! $this->args( 'save_field' ) ) {
+		if ( ! $this->args('save_field')) {
 
 			// Nothing to see here.
 			$action = 'disabled';
 
-		} elseif ( $this->args( 'multiple' ) && ! $this->args( 'repeatable' ) && ! $this->group ) {
+		} elseif ($this->args('multiple') && ! $this->args('repeatable') && ! $this->group) {
 
 			$this->remove_data();
 			$count = 0;
 
-			if ( ! empty( $new_value ) ) {
-				foreach ( $new_value as $add_new ) {
-					if ( $this->update_data( $add_new, false ) ) {
+			if ( ! empty($new_value)) {
+				foreach ($new_value as $add_new) {
+					if ($this->update_data($add_new, false)) {
 						$count++;
 					}
 				}
@@ -565,20 +565,20 @@ 
 			$updated = $count ? $count : false;
 			$action  = 'repeatable';
 
-		} elseif ( ! CMB2_Utils::isempty( $new_value ) && $new_value !== $this->get_data() ) {
-			$updated = $this->update_data( $new_value );
+		} elseif ( ! CMB2_Utils::isempty($new_value) && $new_value !== $this->get_data()) {
+			$updated = $this->update_data($new_value);
 			$action  = 'updated';
-		} elseif ( CMB2_Utils::isempty( $new_value ) ) {
+		} elseif (CMB2_Utils::isempty($new_value)) {
 			$updated = $this->remove_data();
 			$action  = 'removed';
 		}
 
-		if ( $updated ) {
+		if ($updated) {
 			$this->value = $this->get_data();
 			$this->escaped_value = null;
 		}
 
-		$field_id = $this->id( true );
+		$field_id = $this->id(true);
 
 		/**
 		 * Hooks after save field action.
@@ -590,7 +590,7 @@ 
 		 * @param string            $action   Action performed. Could be "repeatable", "updated", or "removed".
 		 * @param CMB2_Field object $field    This field object
 		 */
-		do_action( 'cmb2_save_field', $field_id, $updated, $action, $this );
+		do_action('cmb2_save_field', $field_id, $updated, $action, $this);
 
 		/**
 		 * Hooks after save field action.
@@ -604,7 +604,7 @@ 
 		 * @param string            $action  Action performed. Could be "repeatable", "updated", or "removed".
 		 * @param CMB2_Field object $field   This field object
 		 */
-		do_action( "cmb2_save_field_{$field_id}", $updated, $action, $this );
+		do_action("cmb2_save_field_{$field_id}", $updated, $action, $this);
 
 		return $updated;
 	}
@@ -617,11 +617,11 @@ 
 	 */
 	public function escaping_exception() {
 		// These types cannot be escaped.
-		return in_array( $this->type(), array(
+		return in_array($this->type(), array(
 			'file_list',
 			'multicheck',
 			'text_datetime_timestamp_timezone',
-		) );
+		));
 	}
 
 	/**
@@ -631,7 +631,7 @@ 
 	 * @param  string $type Field type to check.
 	 * @return bool         True if type cannot be repeatable
 	 */
-	public function repeatable_exception( $type ) {
+	public function repeatable_exception($type) {
 		// These types cannot be repeatable.
 		$internal_fields = array(
 			// Use file_list instead.
@@ -662,8 +662,8 @@ 
 		 *                      and not values. The value can be anything, because it is meaningless. Example:
 		 *                      array( 'my_custom_field' => 1 )
 		 */
-		$all_fields = array_merge( apply_filters( 'cmb2_non_repeatable_fields', array() ), $internal_fields );
-		return isset( $all_fields[ $type ] );
+		$all_fields = array_merge(apply_filters('cmb2_non_repeatable_fields', array()), $internal_fields);
+		return isset($all_fields[$type]);
 	}
 
 	/**
@@ -673,7 +673,7 @@ 
 	 * @param  string $type Field type to check.
 	 * @return bool         True if has own method.
 	 */
-	public function has_args_method( $type ) {
+	public function has_args_method($type) {
 
 		// These types have their own arguments parser.
 		$type_methods = array(
@@ -681,11 +681,11 @@ 
 			'wysiwyg' => 'set_field_defaults_wysiwyg',
 		);
 
-		if ( isset( $type_methods[ $type ] ) ) {
-			return $type_methods[ $type ];
+		if (isset($type_methods[$type])) {
+			return $type_methods[$type];
 		}
 
-		$all_or_nothing_types = array_flip( apply_filters( 'cmb2_all_or_nothing_types', array(
+		$all_or_nothing_types = array_flip(apply_filters('cmb2_all_or_nothing_types', array(
 			'select',
 			'radio',
 			'radio_inline',
@@ -694,9 +694,9 @@ 
 			'taxonomy_radio',
 			'taxonomy_radio_inline',
 			'taxonomy_radio_hierarchical',
-		), $this ) );
+		), $this));
 
-		if ( isset( $all_or_nothing_types[ $type ] ) ) {
+		if (isset($all_or_nothing_types[$type])) {
 			return 'set_field_defaults_all_or_nothing_types';
 		}
 
@@ -711,18 +711,18 @@ 
 	 * @param  mixed           $meta_value Meta value.
 	 * @return mixed                Final value.
 	 */
-	public function escaped_value( $func = 'esc_attr', $meta_value = '' ) {
+	public function escaped_value($func = 'esc_attr', $meta_value = '') {
 
-		if ( null !== $this->escaped_value ) {
+		if (null !== $this->escaped_value) {
 			return $this->escaped_value;
 		}
 
 		$meta_value = $meta_value ? $meta_value : $this->value();
 
 		// Check if the field has a registered escaping callback.
-		if ( $cb = $this->maybe_callback( 'escape_cb' ) ) {
+		if ($cb = $this->maybe_callback('escape_cb')) {
 			// Ok, callback is good, let's run it.
-			return call_user_func( $cb, $meta_value, $this->args(), $this );
+			return call_user_func($cb, $meta_value, $this->args(), $this);
 		}
 
 		$field_type = $this->type();
@@ -741,26 +741,26 @@ 
 		 * @param array      $field_args The current field's arguments.
 		 * @param object     $field      This `CMB2_Field` object.
 		 */
-		$esc = apply_filters( "cmb2_types_esc_{$field_type}", null, $meta_value, $this->args(), $this );
-		if ( null !== $esc ) {
+		$esc = apply_filters("cmb2_types_esc_{$field_type}", null, $meta_value, $this->args(), $this);
+		if (null !== $esc) {
 			return $esc;
 		}
 
-		if ( false === $cb || $this->escaping_exception() ) {
+		if (false === $cb || $this->escaping_exception()) {
 			// If requesting NO escaping, return meta value.
-			return $this->val_or_default( $meta_value );
+			return $this->val_or_default($meta_value);
 		}
 
 		// escaping function passed in?
 		$func       = $func ? $func : 'esc_attr';
-		$meta_value = $this->val_or_default( $meta_value );
+		$meta_value = $this->val_or_default($meta_value);
 
-		if ( is_array( $meta_value ) ) {
-			foreach ( $meta_value as $key => $value ) {
-				$meta_value[ $key ] = call_user_func( $func, $value );
+		if (is_array($meta_value)) {
+			foreach ($meta_value as $key => $value) {
+				$meta_value[$key] = call_user_func($func, $value);
 			}
 		} else {
-			$meta_value = call_user_func( $func, $meta_value );
+			$meta_value = call_user_func($func, $meta_value);
 		}
 
 		$this->escaped_value = $meta_value;
@@ -774,8 +774,8 @@ 
 	 * @param  mixed $meta_value Field value.
 	 * @return mixed             Field value, or default value
 	 */
-	public function val_or_default( $meta_value ) {
-		return ! CMB2_Utils::isempty( $meta_value ) ? $meta_value : $this->get_default();
+	public function val_or_default($meta_value) {
+		return ! CMB2_Utils::isempty($meta_value) ? $meta_value : $this->get_default();
 	}
 
 	/**
@@ -785,7 +785,7 @@ 
 	 * @return string Offset time string
 	 */
 	public function field_timezone_offset() {
-		return CMB2_Utils::timezone_offset( $this->field_timezone() );
+		return CMB2_Utils::timezone_offset($this->field_timezone());
 	}
 
 	/**
@@ -798,12 +798,12 @@ 
 		$value = '';
 
 		// Is timezone arg set?
-		if ( $this->args( 'timezone' ) ) {
-			$value = $this->args( 'timezone' );
+		if ($this->args('timezone')) {
+			$value = $this->args('timezone');
 		} // End if.
 		// Is there another meta key with a timezone stored as its value we should use?
-		elseif ( $this->args( 'timezone_meta_key' ) ) {
-			$value = $this->get_data( $this->args( 'timezone_meta_key' ) );
+		elseif ($this->args('timezone_meta_key')) {
+			$value = $this->get_data($this->args('timezone_meta_key'));
 		}
 
 		return $value;
@@ -817,8 +817,8 @@ 
 	 * @param  string $format     Either date_format or time_format.
 	 * @return string             Formatted date
 	 */
-	public function format_timestamp( $meta_value, $format = 'date_format' ) {
-		return date( stripslashes( $this->args( $format ) ), $meta_value );
+	public function format_timestamp($meta_value, $format = 'date_format') {
+		return date(stripslashes($this->args($format)), $meta_value);
 	}
 
 	/**
@@ -829,20 +829,20 @@ 
 	 * @param  string|int $meta_value Optional meta value to check.
 	 * @return string             Formatted date
 	 */
-	public function get_timestamp_format( $format = 'date_format', $meta_value = 0 ) {
+	public function get_timestamp_format($format = 'date_format', $meta_value = 0) {
 		$meta_value = $meta_value ? $meta_value : $this->escaped_value();
-		if ( empty( $meta_value ) ) {
+		if (empty($meta_value)) {
 			$meta_value = $this->get_default();
 		}
 
-		$meta_value = CMB2_Utils::make_valid_time_stamp( $meta_value );
-		if ( empty( $meta_value ) ) {
+		$meta_value = CMB2_Utils::make_valid_time_stamp($meta_value);
+		if (empty($meta_value)) {
 			return '';
 		}
 
-		return is_array( $meta_value )
-			? array_map( array( $this, 'format_timestamp' ), $meta_value, $format )
-			: $this->format_timestamp( $meta_value, $format );
+		return is_array($meta_value)
+			? array_map(array($this, 'format_timestamp'), $meta_value, $format)
+			: $this->format_timestamp($meta_value, $format);
 	}
 
 	/**
@@ -852,8 +852,8 @@ 
 	 * @param  string $value Date value.
 	 * @return mixed         Unix timestamp representing the date.
 	 */
-	public function get_timestamp_from_value( $value ) {
-		return CMB2_Utils::get_timestamp_from_value( $value, $this->args( 'date_format' ) );
+	public function get_timestamp_from_value($value) {
+		return CMB2_Utils::get_timestamp_from_value($value, $this->args('date_format'));
 	}
 
 	/**
@@ -864,7 +864,7 @@ 
 	public function render_field() {
 		$this->render_context = 'edit';
 
-		$this->peform_param_callback( 'render_row_cb' );
+		$this->peform_param_callback('render_row_cb');
 
 		// For chaining.
 		return $this;
@@ -878,12 +878,12 @@ 
 	public function render_field_callback() {
 
 		// If field is requesting to not be shown on the front-end.
-		if ( ! is_admin() && ! $this->args( 'on_front' ) ) {
+		if ( ! is_admin() && ! $this->args('on_front')) {
 			return;
 		}
 
 		// If field is requesting to be conditionally shown.
-		if ( ! $this->should_show() ) {
+		if ( ! $this->should_show()) {
 			return;
 		}
 
@@ -894,7 +894,7 @@ 
 		 *
 		 * @param CMB2_Field $field The current field object.
 		 */
-		do_action( 'cmb2_before_field_row', $this );
+		do_action('cmb2_before_field_row', $this);
 
 		/**
 		 * Hook before field row begins.
@@ -903,36 +903,36 @@ 
 		 *
 		 * @param CMB2_Field $field The current field object.
 		 */
-		do_action( "cmb2_before_{$field_type}_field_row", $this );
+		do_action("cmb2_before_{$field_type}_field_row", $this);
 
-		$this->peform_param_callback( 'before_row' );
+		$this->peform_param_callback('before_row');
 
-		printf( "<div class=\"cmb-row %s\" data-fieldtype=\"%s\">\n", $this->row_classes(), $field_type );
+		printf("<div class=\"cmb-row %s\" data-fieldtype=\"%s\">\n", $this->row_classes(), $field_type);
 
-		if ( ! $this->args( 'show_names' ) ) {
+		if ( ! $this->args('show_names')) {
 			echo "\n\t<div class=\"cmb-td\">\n";
 
-			$this->peform_param_callback( 'label_cb' );
+			$this->peform_param_callback('label_cb');
 
 		} else {
 
-			if ( $this->get_param_callback_result( 'label_cb' ) ) {
-				echo '<div class="cmb-th">', $this->peform_param_callback( 'label_cb' ), '</div>';
+			if ($this->get_param_callback_result('label_cb')) {
+				echo '<div class="cmb-th">', $this->peform_param_callback('label_cb'), '</div>';
 			}
 
 			echo "\n\t<div class=\"cmb-td\">\n";
 		}
 
-		$this->peform_param_callback( 'before' );
+		$this->peform_param_callback('before');
 
-		$types = new CMB2_Types( $this );
+		$types = new CMB2_Types($this);
 		$types->render();
 
-		$this->peform_param_callback( 'after' );
+		$this->peform_param_callback('after');
 
 		echo "\n\t</div>\n</div>";
 
-		$this->peform_param_callback( 'after_row' );
+		$this->peform_param_callback('after_row');
 
 		/**
 		 * Hook after field row ends.
@@ -941,14 +941,14 @@ 
 		 *
 		 * @param CMB2_Field $field The current field object.
 		 */
-		do_action( "cmb2_after_{$field_type}_field_row", $this );
+		do_action("cmb2_after_{$field_type}_field_row", $this);
 
 		/**
 		 * Hook after field row ends.
 		 *
 		 * @param CMB2_Field $field The current field object.
 		 */
-		do_action( 'cmb2_after_field_row', $this );
+		do_action('cmb2_after_field_row', $this);
 
 		// For chaining.
 		return $this;
@@ -961,13 +961,13 @@ 
 	 * @return string Label html markup.
 	 */
 	public function label() {
-		if ( ! $this->args( 'name' ) ) {
+		if ( ! $this->args('name')) {
 			return '';
 		}
 
-		$style = ! $this->args( 'show_names' ) ? ' style="display:none;"' : '';
+		$style = ! $this->args('show_names') ? ' style="display:none;"' : '';
 
-		return sprintf( "\n" . '<label%1$s for="%2$s">%3$s</label>' . "\n", $style, $this->id(), $this->args( 'name' ) );
+		return sprintf("\n" . '<label%1$s for="%2$s">%3$s</label>' . "\n", $style, $this->id(), $this->args('name'));
 	}
 
 	/**
@@ -987,34 +987,34 @@ 
 		 *
 		 * @param array $field_types The types of fields which should get the 'table-layout' class
 		 */
-		$repeat_table_rows_types = apply_filters( 'cmb2_repeat_table_row_types', array(
+		$repeat_table_rows_types = apply_filters('cmb2_repeat_table_row_types', array(
 			'text_url',
 			'text',
-		) );
+		));
 
 		$conditional_classes = array(
-			'cmb-type-' . str_replace( '_', '-', sanitize_html_class( $this->type() ) ) => true,
-			'cmb2-id-' . str_replace( '_', '-', sanitize_html_class( $this->id() ) )    => true,
-			'cmb-repeat'             => $this->args( 'repeatable' ),
+			'cmb-type-' . str_replace('_', '-', sanitize_html_class($this->type())) => true,
+			'cmb2-id-' . str_replace('_', '-', sanitize_html_class($this->id()))    => true,
+			'cmb-repeat'             => $this->args('repeatable'),
 			'cmb-repeat-group-field' => $this->group,
-			'cmb-inline'             => $this->args( 'inline' ),
-			'table-layout'           => 'edit' === $this->render_context && in_array( $this->type(), $repeat_table_rows_types ),
+			'cmb-inline'             => $this->args('inline'),
+			'table-layout'           => 'edit' === $this->render_context && in_array($this->type(), $repeat_table_rows_types),
 		);
 
-		foreach ( $conditional_classes as $class => $condition ) {
-			if ( $condition ) {
+		foreach ($conditional_classes as $class => $condition) {
+			if ($condition) {
 				$classes[] = $class;
 			}
 		}
 
-		if ( $added_classes = $this->args( 'classes' ) ) {
-			$added_classes = is_array( $added_classes ) ? implode( ' ', $added_classes ) : (string) $added_classes;
-		} elseif ( $added_classes = $this->get_param_callback_result( 'classes_cb' ) ) {
-			$added_classes = is_array( $added_classes ) ? implode( ' ', $added_classes ) : (string) $added_classes;
+		if ($added_classes = $this->args('classes')) {
+			$added_classes = is_array($added_classes) ? implode(' ', $added_classes) : (string) $added_classes;
+		} elseif ($added_classes = $this->get_param_callback_result('classes_cb')) {
+			$added_classes = is_array($added_classes) ? implode(' ', $added_classes) : (string) $added_classes;
 		}
 
-		if ( $added_classes ) {
-			$classes[] = esc_attr( $added_classes );
+		if ($added_classes) {
+			$classes[] = esc_attr($added_classes);
 		}
 
 		/**
@@ -1025,7 +1025,7 @@ 
 		 * @param string            $classes Space-separated list of row classes
 		 * @param CMB2_Field object $field   This field object
 		 */
-		return apply_filters( 'cmb2_row_classes', implode( ' ', $classes ), $this );
+		return apply_filters('cmb2_row_classes', implode(' ', $classes), $this);
 	}
 
 	/**
@@ -1036,7 +1036,7 @@ 
 	public function render_column() {
 		$this->render_context = 'display';
 
-		$this->peform_param_callback( 'display_cb' );
+		$this->peform_param_callback('display_cb');
 
 		// For chaining.
 		return $this;
@@ -1049,10 +1049,10 @@ 
 	 */
 	public function get_rest_value() {
 		$field_type = $this->type();
-		$field_id   = $this->id( true );
+		$field_id   = $this->id(true);
 
-		if ( $cb = $this->maybe_callback( 'rest_value_cb' ) ) {
-			add_filter( "cmb2_get_rest_value_for_{$field_id}", $cb, 99 );
+		if ($cb = $this->maybe_callback('rest_value_cb')) {
+			add_filter("cmb2_get_rest_value_for_{$field_id}", $cb, 99);
 		}
 
 		$value = $this->get_data();
@@ -1065,7 +1065,7 @@ 
 		 * @param mixed      $value The value from CMB2_Field::get_data()
 		 * @param CMB2_Field $field This field object.
 		 */
-		$value = apply_filters( 'cmb2_get_rest_value', $value, $this );
+		$value = apply_filters('cmb2_get_rest_value', $value, $this);
 
 		/**
 		 * Filter the value before it is sent to the REST request.
@@ -1077,7 +1077,7 @@ 
 		 * @param mixed      $value The value from CMB2_Field::get_data()
 		 * @param CMB2_Field $field This field object.
 		 */
-		$value = apply_filters( "cmb2_get_rest_value_{$field_type}", $value, $this );
+		$value = apply_filters("cmb2_get_rest_value_{$field_type}", $value, $this);
 
 		/**
 		 * Filter the value before it is sent to the REST request.
@@ -1089,7 +1089,7 @@ 
 		 * @param mixed      $value The value from CMB2_Field::get_data()
 		 * @param CMB2_Field $field This field object.
 		 */
-		return apply_filters( "cmb2_get_rest_value_for_{$field_id}", $value, $this );
+		return apply_filters("cmb2_get_rest_value_for_{$field_id}", $value, $this);
 	}
 
 	/**
@@ -1100,15 +1100,15 @@ 
 	 * @return CMB2_Field|bool Supporting field object, if supported.
 	 */
 	public function get_supporting_field() {
-		$suffix = $this->args( 'has_supporting_data' );
-		if ( empty( $suffix ) ) {
+		$suffix = $this->args('has_supporting_data');
+		if (empty($suffix)) {
 			return false;
 		}
 
-		return $this->get_field_clone( array(
-			'id' => $this->_id( '', false ) . $suffix,
+		return $this->get_field_clone(array(
+			'id' => $this->_id('', false) . $suffix,
 			'sanitization_cb' => false,
-		) );
+		));
 	}
 
 	/**
@@ -1118,11 +1118,11 @@ 
 	 */
 	public function display_value_callback() {
 		// If field is requesting to be conditionally shown.
-		if ( ! $this->should_show() ) {
+		if ( ! $this->should_show()) {
 			return;
 		}
 
-		$display = new CMB2_Field_Display( $this );
+		$display = new CMB2_Field_Display($this);
 		$field_type = $this->type();
 
 		/**
@@ -1136,26 +1136,26 @@ 
 		 * @param CMB2_Field         $field      This field object.
 		 * @param CMB2_Field_Display $display    The `CMB2_Field_Display` object.
 		 */
-		$pre_output = apply_filters( "cmb2_pre_field_display_{$field_type}", null, $this, $display );
+		$pre_output = apply_filters("cmb2_pre_field_display_{$field_type}", null, $this, $display);
 
-		if ( null !== $pre_output ) {
+		if (null !== $pre_output) {
 			echo $pre_output;
 			return;
 		}
 
-		$this->peform_param_callback( 'before_display_wrap' );
+		$this->peform_param_callback('before_display_wrap');
 
-		printf( "<div class=\"cmb-column %s\" data-fieldtype=\"%s\">\n", $this->row_classes(), $field_type );
+		printf("<div class=\"cmb-column %s\" data-fieldtype=\"%s\">\n", $this->row_classes(), $field_type);
 
-		$this->peform_param_callback( 'before_display' );
+		$this->peform_param_callback('before_display');
 
-		CMB2_Field_Display::get( $this )->display();
+		CMB2_Field_Display::get($this)->display();
 
-		$this->peform_param_callback( 'after_display' );
+		$this->peform_param_callback('after_display');
 
 		echo "\n</div>";
 
-		$this->peform_param_callback( 'after_display_wrap' );
+		$this->peform_param_callback('after_display_wrap');
 
 		// For chaining.
 		return $this;
@@ -1168,9 +1168,9 @@ 
 	 * @param  string $value Value to update.
 	 * @return string        Updated value
 	 */
-	public function replace_hash( $value ) {
+	public function replace_hash($value) {
 		// Replace hash with 1 based count.
-		return str_replace( '{#}', ( $this->index + 1 ), $value );
+		return str_replace('{#}', ($this->index + 1), $value);
 	}
 
 	/**
@@ -1182,27 +1182,27 @@ 
 	 * @param  string $fallback Fallback text.
 	 * @return string            Text
 	 */
-	public function get_string( $text_key, $fallback ) {
+	public function get_string($text_key, $fallback) {
 		// If null, populate with our field strings values.
-		if ( null === $this->strings ) {
+		if (null === $this->strings) {
 			$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 ) ) {
+				if ($strings && is_array($strings)) {
 					$this->strings += $strings;
 				}
 			}
 		}
 
 		// If we have that string value, send it back.
-		if ( isset( $this->strings[ $text_key ] ) ) {
-			return $this->strings[ $text_key ];
+		if (isset($this->strings[$text_key])) {
+			return $this->strings[$text_key];
 		}
 
 		// Check options for back-compat.
-		$string = $this->options( $text_key );
+		$string = $this->options($text_key);
 
 		return $string ? $string : $fallback;
 	}
@@ -1214,13 +1214,13 @@ 
 	 * @param  string $key Specific option to retrieve.
 	 * @return array|mixed Array of options or specific option.
 	 */
-	public function options( $key = '' ) {
-		if ( empty( $this->field_options ) ) {
+	public function options($key = '') {
+		if (empty($this->field_options)) {
 			$this->set_options();
 		}
 
-		if ( $key ) {
-			return array_key_exists( $key, $this->field_options ) ? $this->field_options[ $key ] : false;
+		if ($key) {
+			return array_key_exists($key, $this->field_options) ? $this->field_options[$key] : false;
 		}
 
 		return $this->field_options;
@@ -1236,10 +1236,10 @@ 
 	public function set_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 ) ) {
+			if ($options && is_array($options)) {
 				$this->field_options = $options + $this->field_options;
 			}
 		}
@@ -1253,12 +1253,12 @@ 
 	 * @since 2.2.0
 	 * @param array $dependencies Dependies to register for this field.
 	 */
-	public function add_js_dependencies( $dependencies = array() ) {
-		foreach ( (array) $dependencies as $dependency ) {
-			$this->args['js_dependencies'][ $dependency ] = $dependency;
+	public function add_js_dependencies($dependencies = array()) {
+		foreach ((array) $dependencies as $dependency) {
+			$this->args['js_dependencies'][$dependency] = $dependency;
 		}
 
-		CMB2_JS::add_dependencies( $dependencies );
+		CMB2_JS::add_dependencies($dependencies);
 	}
 
 	/**
@@ -1267,11 +1267,11 @@ 
 	 * @since 2.2.0
 	 */
 	public function register_js_data() {
-		if ( $this->group ) {
-			CMB2_JS::add_field_data( $this->group );
+		if ($this->group) {
+			CMB2_JS::add_field_data($this->group);
 		}
 
-		return CMB2_JS::add_field_data( $this );
+		return CMB2_JS::add_field_data($this);
 	}
 
 	/**
@@ -1283,13 +1283,13 @@ 
 	 */
 	public function js_data() {
 		return array(
-			'label'     => $this->args( 'name' ),
-			'id'        => $this->id( true ),
+			'label'     => $this->args('name'),
+			'id'        => $this->id(true),
 			'type'      => $this->type(),
 			'hash'      => $this->hash_id(),
 			'box'       => $this->cmb_id,
 			'id_attr'   => $this->id(),
-			'name_attr' => $this->args( '_name' ),
+			'name_attr' => $this->args('_name'),
 			'default'   => $this->get_default(),
 			'group'     => $this->group_id(),
 			'index'     => $this->group ? $this->group->index : null,
@@ -1304,8 +1304,8 @@ 
 	 * @return string
 	 */
 	public function hash_id() {
-		if ( '' === $this->hash_id ) {
-			$this->hash_id = CMB2_Utils::generate_hash( $this->cmb_id . '||' . $this->id() );
+		if ('' === $this->hash_id) {
+			$this->hash_id = CMB2_Utils::generate_hash($this->cmb_id . '||' . $this->id());
 		}
 
 		return $this->hash_id;
@@ -1319,7 +1319,7 @@ 
 	 * @return string
 	 */
 	public function group_id() {
-		return $this->group ? $this->group->id( true ) : '';
+		return $this->group ? $this->group->id(true) : '';
 	}
 
 	/**
@@ -1332,15 +1332,15 @@ 
 	public function get_default() {
 		$default = $this->args['default'];
 
-		if ( null !== $default ) {
-			return apply_filters( 'cmb2_default_filter', $default, $this );
+		if (null !== $default) {
+			return apply_filters('cmb2_default_filter', $default, $this);
 		}
 
-		$param = is_callable( $this->args['default_cb'] ) ? 'default_cb' : 'default';
-		$default = $this->args['default'] = $this->get_param_callback_result( $param );
+		$param = is_callable($this->args['default_cb']) ? 'default_cb' : 'default';
+		$default = $this->args['default'] = $this->get_param_callback_result($param);
 
 		// Allow a filter override of the default value.
-		return apply_filters( 'cmb2_default_filter', $this->args['default'], $this );
+		return apply_filters('cmb2_default_filter', $this->args['default'], $this);
 	}
 
 	/**
@@ -1351,8 +1351,8 @@ 
 	 * @param  array $args Field config array.
 	 * @return array        Modified field config array.
 	 */
-	public function _set_field_defaults( $args ) {
-		$defaults = $this->get_default_field_args( $args );
+	public function _set_field_defaults($args) {
+		$defaults = $this->get_default_field_args($args);
 
 		/**
 		 * Filter the CMB2 Field defaults.
@@ -1363,10 +1363,10 @@ 
 		 * @param string            $type     Field type for the current field to allow for selective filtering.
 		 * @param CMB2_Field object $field    This field object.
 		 */
-		$defaults = apply_filters( 'cmb2_field_defaults', $defaults, $args['id'], $args['type'], $this );
+		$defaults = apply_filters('cmb2_field_defaults', $defaults, $args['id'], $args['type'], $this);
 
 		// Set up blank or default values for empty ones.
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		/**
 		 * Filtering the CMB2 Field arguments once merged with the defaults, but before further processing.
@@ -1375,7 +1375,7 @@ 
 		 * @param array             $args  Metabox field config array defaults.
 		 * @param CMB2_Field object $field This field object.
 		 */
-		$args = apply_filters( 'cmb2_field_arguments_raw', $args, $this );
+		$args = apply_filters('cmb2_field_arguments_raw', $args, $this);
 
 		/*
 		 * Deprecated usage:
@@ -1384,19 +1384,19 @@ 
 		 * 'row_classes' -- use 'class', or 'class_cb'
 		 * 'default' -- as callback (use default_cb)
 		 */
-		$args = $this->convert_deprecated_params( $args );
+		$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['_id']        = $args['id'];
 		$args['_name']      = $args['id'];
 
-		if ( $method = $this->has_args_method( $args['type'] ) ) {
-			$args = $this->{$method}( $args );
+		if ($method = $this->has_args_method($args['type'])) {
+			$args = $this->{$method}($args);
 		}
 
-		if ( $this->group ) {
-			$args = $this->set_group_sub_field_defaults( $args );
+		if ($this->group) {
+			$args = $this->set_group_sub_field_defaults($args);
 		}
 
 		$with_supporting = array(
@@ -1406,13 +1406,13 @@ 
 			'text_datetime_timestamp_timezone' => '_utc',
 		);
 
-		$args['has_supporting_data'] = isset( $with_supporting[ $args['type'] ] )
-			? $with_supporting[ $args['type'] ]
+		$args['has_supporting_data'] = isset($with_supporting[$args['type']])
+			? $with_supporting[$args['type']]
 			: false;
 
 		// Repeatable fields require jQuery sortable library.
-		if ( ! empty( $args['repeatable'] ) ) {
-			CMB2_JS::add_dependencies( 'jquery-ui-sortable' );
+		if ( ! empty($args['repeatable'])) {
+			CMB2_JS::add_dependencies('jquery-ui-sortable');
 		}
 
 		/**
@@ -1422,7 +1422,7 @@ 
 		 * @param array             $args  Metabox field config array after processing.
 		 * @param CMB2_Field object $field This field object.
 		 */
-		return apply_filters( 'cmb2_field_arguments', $args, $this );
+		return apply_filters('cmb2_field_arguments', $args, $this);
 	}
 
 	/**
@@ -1433,12 +1433,12 @@ 
 	 * @param  array $args Field config array.
 	 * @return array        Modified field config array.
 	 */
-	protected function set_field_defaults_group( $args ) {
-		$args['options'] = wp_parse_args( $args['options'], array(
-			'add_button'     => esc_html__( 'Add Group', 'cmb2' ),
-			'remove_button'  => esc_html__( 'Remove Group', 'cmb2' ),
+	protected function set_field_defaults_group($args) {
+		$args['options'] = wp_parse_args($args['options'], array(
+			'add_button'     => esc_html__('Add Group', 'cmb2'),
+			'remove_button'  => esc_html__('Remove Group', 'cmb2'),
 			'remove_confirm' => '',
-		) );
+		));
 
 		return $args;
 	}
@@ -1451,8 +1451,8 @@ 
 	 * @param  array $args Field config array.
 	 * @return array        Modified field config array.
 	 */
-	protected function set_field_defaults_wysiwyg( $args ) {
-		$args['id'] = strtolower( str_ireplace( '-', '_', $args['id'] ) );
+	protected function set_field_defaults_wysiwyg($args) {
+		$args['id'] = strtolower(str_ireplace('-', '_', $args['id']));
 		$args['options']['textarea_name'] = $args['_name'];
 
 		return $args;
@@ -1466,13 +1466,13 @@ 
 	 * @param  array $args Field config array.
 	 * @return array        Modified field config array.
 	 */
-	protected function set_field_defaults_all_or_nothing_types( $args ) {
-		$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'];
+	protected function set_field_defaults_all_or_nothing_types($args) {
+		$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');
 		}
 
 		return $args;
@@ -1486,9 +1486,9 @@ 
 	 * @param  array $args Field config array.
 	 * @return array        Modified field config array.
 	 */
-	protected function set_group_sub_field_defaults( $args ) {
-		$args['id']    = $this->group->args( 'id' ) . '_' . $this->group->index . '_' . $args['id'];
-		$args['_name'] = $this->group->args( 'id' ) . '[' . $this->group->index . '][' . $args['_name'] . ']';
+	protected function set_group_sub_field_defaults($args) {
+		$args['id']    = $this->group->args('id') . '_' . $this->group->index . '_' . $args['id'];
+		$args['_name'] = $this->group->args('id') . '[' . $this->group->index . '][' . $args['_name'] . ']';
 
 		return $args;
 	}
@@ -1501,8 +1501,8 @@ 
 	 * @param  array $args Field config array.
 	 * @return array        Field defaults.
 	 */
-	protected function get_default_field_args( $args ) {
-		$type = isset( $args['type'] ) ? $args['type'] : '';
+	protected function get_default_field_args($args) {
+		$type = isset($args['type']) ? $args['type'] : '';
 
 		return array(
 			'type'              => $type,
@@ -1529,11 +1529,11 @@ 
 			'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' === $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' !== $type ? array( $this, 'label' ) : '',
+			'description'       => isset($args['desc']) ? $args['desc'] : '',
+			'preview_size'      => 'file' === $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' !== $type ? array($this, 'label') : '',
 			'column'            => false,
 			'js_dependencies'   => array(),
 			'show_in_rest'      => null,
@@ -1551,13 +1551,13 @@ 
 	 * @param  CMB2_Field $field_group (optional) CMB2_Field object (group parent).
 	 * @return array                   Array of field arguments.
 	 */
-	protected function get_default_args( $field_args, $field_group = null ) {
-		$args = parent::get_default_args( array(), $this->group );
+	protected function get_default_args($field_args, $field_group = null) {
+		$args = parent::get_default_args(array(), $this->group);
 
-		if ( isset( $field_args['field_args'] ) ) {
-			$args = wp_parse_args( $field_args, $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;
@@ -1573,8 +1573,8 @@ 
 	 *
 	 * @return CMB2_Field         The new CMB2_Field instance.
 	 */
-	public function get_field_clone( $field_args ) {
-		return $this->get_new_field( $field_args );
+	public function get_field_clone($field_args) {
+		return $this->get_new_field($field_args);
 	}
 
 	/**
@@ -1585,11 +1585,11 @@ 
 	 * @return CMB2|WP_Error If new CMB2_Field is called without cmb_id arg, returns error.
 	 */
 	public function get_cmb() {
-		if ( ! $this->cmb_id ) {
-			return new WP_Error( 'no_cmb_id', esc_html__( 'Sorry, this field does not have a cmb_id specified.', 'cmb2' ) );
+		if ( ! $this->cmb_id) {
+			return new WP_Error('no_cmb_id', esc_html__('Sorry, this field does not have a cmb_id specified.', 'cmb2'));
 		}
 
-		return cmb2_get_metabox( $this->cmb_id, $this->object_id, $this->object_type );
+		return cmb2_get_metabox($this->cmb_id, $this->object_id, $this->object_type);
 	}
 
 	/**
@@ -1599,16 +1599,16 @@ 
 	 * @param  array $args Metabox field config array.
 	 * @return array       Modified field config array.
 	 */
-	protected function convert_deprecated_params( $args ) {
+	protected function convert_deprecated_params($args) {
 
-		if ( isset( $args['row_classes'] ) ) {
+		if (isset($args['row_classes'])) {
 
 			// We'll let this one be.
 			// $this->deprecated_param( __CLASS__ . '::__construct()', '2.2.3', self::DEPRECATED_PARAM, 'row_classes', 'classes' );
 			// row_classes param could be a callback. This is definitely deprecated.
-			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' );
+				$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;
@@ -1617,22 +1617,22 @@ 
 				$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' );
+			$this->deprecated_param(__CLASS__ . '::__construct()', '2.2.3', self::DEPRECATED_CB_PARAM, 'default', 'default_cb');
 
 			$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' );
+			$this->deprecated_param(__CLASS__ . '::__construct()', '2.2.3', self::DEPRECATED_CB_PARAM, 'options', 'options_cb');
 
 			$args['options_cb'] = $args['options'];
 			$args['options'] = array();

vendor/CMB2/includes/CMB2_Hookup_Base.php

Spacing +15 added lines, -15 removed lines

@@ -40,8 +40,8 @@ 
 	 *
 	 * @param  CMB2 $cmb The CMB2 object to hookup.
 	 */
-	public static function maybe_init_and_hookup( CMB2 $cmb ) {
-		throw new Exception( sprintf( esc_html__( '%1$s should be implemented by the extended class.', 'cmb2' ), __FUNCTION__ ) );
+	public static function maybe_init_and_hookup(CMB2 $cmb) {
+		throw new Exception(sprintf(esc_html__('%1$s should be implemented by the extended class.', 'cmb2'), __FUNCTION__));
 	}
 
 	/**
@@ -50,7 +50,7 @@ 
 	 * @since 2.0.0
 	 * @param CMB2 $cmb The CMB2 object to hookup.
 	 */
-	public function __construct( CMB2 $cmb ) {
+	public function __construct(CMB2 $cmb) {
 		$this->cmb = $cmb;
 		$this->object_type = $this->cmb->mb_object_type();
 	}
@@ -66,23 +66,23 @@ 
 	 * @param integer  $priority      Order the functions are executed.
 	 * @param int      $accepted_args The number of arguments the function accepts.
 	 */
-	public function once( $action, $hook, $priority = 10, $accepted_args = 1 ) {
+	public function once($action, $hook, $priority = 10, $accepted_args = 1) {
 		static $hooks_completed = array();
 
 		$args = func_get_args();
 
 		// Get object hash.. This bypasses issues with serializing closures.
-		if ( is_object( $hook ) ) {
-			$args[1] = spl_object_hash( $args[1] );
-		} elseif ( is_array( $hook ) && is_object( $hook[0] ) ) {
-			$args[1][0] = spl_object_hash( $hook[0] );
+		if (is_object($hook)) {
+			$args[1] = spl_object_hash($args[1]);
+		} elseif (is_array($hook) && is_object($hook[0])) {
+			$args[1][0] = spl_object_hash($hook[0]);
 		}
 
-		$key = md5( serialize( $args ) );
+		$key = md5(serialize($args));
 
-		if ( ! isset( $hooks_completed[ $key ] ) ) {
-			$hooks_completed[ $key ] = 1;
-			add_filter( $action, $hook, $priority, $accepted_args );
+		if ( ! isset($hooks_completed[$key])) {
+			$hooks_completed[$key] = 1;
+			add_filter($action, $hook, $priority, $accepted_args);
 		}
 	}
 
@@ -93,13 +93,13 @@ 
 	 * @throws Exception Throws an exception if the field is invalid.
 	 * @return mixed
 	 */
-	public function __get( $field ) {
-		switch ( $field ) {
+	public function __get($field) {
+		switch ($field) {
 			case 'object_type':
 			case 'cmb':
 				return $this->{$field};
 			default:
-				throw new Exception( sprintf( esc_html__( 'Invalid %1$s property: %2$s', 'cmb2' ), __CLASS__, $field ) );
+				throw new Exception(sprintf(esc_html__('Invalid %1$s property: %2$s', 'cmb2'), __CLASS__, $field));
 		}
 	}
 }

vendor/CMB2/includes/shim/WP_REST_Controller.php

Spacing +115 added lines, -115 removed lines

@@ -22,7 +22,7 @@ 
 	 */
 	public function register_routes() {
 		/* translators: %s: register_routes() */
-		_doing_it_wrong( 'WP_REST_Controller::register_routes', sprintf( __( "Method '%s' must be overridden." ), __METHOD__ ), '4.7' );
+		_doing_it_wrong('WP_REST_Controller::register_routes', sprintf(__("Method '%s' must be overridden."), __METHOD__), '4.7');
 	}
 
 	/**
@@ -31,10 +31,10 @@ 
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|boolean
 	 */
-	public function get_items_permissions_check( $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
+	public function get_items_permissions_check($request) {
+		return new WP_Error('invalid-method', sprintf(__("Method '%s' not implemented. Must be overridden in subclass."), __METHOD__), array(
 			'status' => 405,
-		) );
+		));
 	}
 
 	/**
@@ -43,10 +43,10 @@ 
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|WP_REST_Response
 	 */
-	public function get_items( $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
+	public function get_items($request) {
+		return new WP_Error('invalid-method', sprintf(__("Method '%s' not implemented. Must be overridden in subclass."), __METHOD__), array(
 			'status' => 405,
-		) );
+		));
 	}
 
 	/**
@@ -55,10 +55,10 @@ 
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|boolean
 	 */
-	public function get_item_permissions_check( $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
+	public function get_item_permissions_check($request) {
+		return new WP_Error('invalid-method', sprintf(__("Method '%s' not implemented. Must be overridden in subclass."), __METHOD__), array(
 			'status' => 405,
-		) );
+		));
 	}
 
 	/**
@@ -67,10 +67,10 @@ 
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|WP_REST_Response
 	 */
-	public function get_item( $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
+	public function get_item($request) {
+		return new WP_Error('invalid-method', sprintf(__("Method '%s' not implemented. Must be overridden in subclass."), __METHOD__), array(
 			'status' => 405,
-		) );
+		));
 	}
 
 	/**
@@ -79,10 +79,10 @@ 
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|boolean
 	 */
-	public function create_item_permissions_check( $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
+	public function create_item_permissions_check($request) {
+		return new WP_Error('invalid-method', sprintf(__("Method '%s' not implemented. Must be overridden in subclass."), __METHOD__), array(
 			'status' => 405,
-		) );
+		));
 	}
 
 	/**
@@ -91,10 +91,10 @@ 
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|WP_REST_Response
 	 */
-	public function create_item( $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
+	public function create_item($request) {
+		return new WP_Error('invalid-method', sprintf(__("Method '%s' not implemented. Must be overridden in subclass."), __METHOD__), array(
 			'status' => 405,
-		) );
+		));
 	}
 
 	/**
@@ -103,10 +103,10 @@ 
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|boolean
 	 */
-	public function update_item_permissions_check( $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
+	public function update_item_permissions_check($request) {
+		return new WP_Error('invalid-method', sprintf(__("Method '%s' not implemented. Must be overridden in subclass."), __METHOD__), array(
 			'status' => 405,
-		) );
+		));
 	}
 
 	/**
@@ -115,10 +115,10 @@ 
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|WP_REST_Response
 	 */
-	public function update_item( $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
+	public function update_item($request) {
+		return new WP_Error('invalid-method', sprintf(__("Method '%s' not implemented. Must be overridden in subclass."), __METHOD__), array(
 			'status' => 405,
-		) );
+		));
 	}
 
 	/**
@@ -127,10 +127,10 @@ 
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|boolean
 	 */
-	public function delete_item_permissions_check( $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
+	public function delete_item_permissions_check($request) {
+		return new WP_Error('invalid-method', sprintf(__("Method '%s' not implemented. Must be overridden in subclass."), __METHOD__), array(
 			'status' => 405,
-		) );
+		));
 	}
 
 	/**
@@ -139,10 +139,10 @@ 
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|WP_REST_Response
 	 */
-	public function delete_item( $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
+	public function delete_item($request) {
+		return new WP_Error('invalid-method', sprintf(__("Method '%s' not implemented. Must be overridden in subclass."), __METHOD__), array(
 			'status' => 405,
-		) );
+		));
 	}
 
 	/**
@@ -151,10 +151,10 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_Error|object $prepared_item
 	 */
-	protected function prepare_item_for_database( $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
+	protected function prepare_item_for_database($request) {
+		return new WP_Error('invalid-method', sprintf(__("Method '%s' not implemented. Must be overridden in subclass."), __METHOD__), array(
 			'status' => 405,
-		) );
+		));
 	}
 
 	/**
@@ -164,10 +164,10 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response $response
 	 */
-	public function prepare_item_for_response( $item, $request ) {
-		return new WP_Error( 'invalid-method', sprintf( __( "Method '%s' not implemented. Must be overridden in subclass." ), __METHOD__ ), array(
+	public function prepare_item_for_response($item, $request) {
+		return new WP_Error('invalid-method', sprintf(__("Method '%s' not implemented. Must be overridden in subclass."), __METHOD__), array(
 			'status' => 405,
-		) );
+		));
 	}
 
 	/**
@@ -176,21 +176,21 @@ 
 	 * @param WP_REST_Response $response Response object.
 	 * @return array Response data, ready for insertion into collection data.
 	 */
-	public function prepare_response_for_collection( $response ) {
-		if ( ! ( $response instanceof WP_REST_Response ) ) {
+	public function prepare_response_for_collection($response) {
+		if ( ! ($response instanceof WP_REST_Response)) {
 			return $response;
 		}
 
 		$data = (array) $response->get_data();
 		$server = rest_get_server();
 
-		if ( method_exists( $server, 'get_compact_response_links' ) ) {
-			$links = call_user_func( array( $server, 'get_compact_response_links' ), $response );
+		if (method_exists($server, 'get_compact_response_links')) {
+			$links = call_user_func(array($server, 'get_compact_response_links'), $response);
 		} else {
-			$links = call_user_func( array( $server, 'get_response_links' ), $response );
+			$links = call_user_func(array($server, 'get_response_links'), $response);
 		}
 
-		if ( ! empty( $links ) ) {
+		if ( ! empty($links)) {
 			$data['_links'] = $links;
 		}
 
@@ -204,27 +204,27 @@ 
 	 * @param string $context
 	 * @return array
 	 */
-	public function filter_response_by_context( $data, $context ) {
+	public function filter_response_by_context($data, $context) {
 
 		$schema = $this->get_item_schema();
-		foreach ( $data as $key => $value ) {
-			if ( empty( $schema['properties'][ $key ] ) || empty( $schema['properties'][ $key ]['context'] ) ) {
+		foreach ($data as $key => $value) {
+			if (empty($schema['properties'][$key]) || empty($schema['properties'][$key]['context'])) {
 				continue;
 			}
 
-			if ( ! in_array( $context, $schema['properties'][ $key ]['context'] ) ) {
-				unset( $data[ $key ] );
+			if ( ! in_array($context, $schema['properties'][$key]['context'])) {
+				unset($data[$key]);
 				continue;
 			}
 
-			if ( 'object' === $schema['properties'][ $key ]['type'] && ! empty( $schema['properties'][ $key ]['properties'] ) ) {
-				foreach ( $schema['properties'][ $key ]['properties'] as $attribute => $details ) {
-					if ( empty( $details['context'] ) ) {
+			if ('object' === $schema['properties'][$key]['type'] && ! empty($schema['properties'][$key]['properties'])) {
+				foreach ($schema['properties'][$key]['properties'] as $attribute => $details) {
+					if (empty($details['context'])) {
 						continue;
 					}
-					if ( ! in_array( $context, $details['context'] ) ) {
-						if ( isset( $data[ $key ][ $attribute ] ) ) {
-							unset( $data[ $key ][ $attribute ] );
+					if ( ! in_array($context, $details['context'])) {
+						if (isset($data[$key][$attribute])) {
+							unset($data[$key][$attribute]);
 						}
 					}
 				}
@@ -240,7 +240,7 @@ 
 	 * @return array
 	 */
 	public function get_item_schema() {
-		return $this->add_additional_fields_schema( array() );
+		return $this->add_additional_fields_schema(array());
 	}
 
 	/**
@@ -252,9 +252,9 @@ 
 
 		$schema = $this->get_item_schema();
 
-		foreach ( $schema['properties'] as &$property ) {
-			if ( isset( $property['arg_options'] ) ) {
-				unset( $property['arg_options'] );
+		foreach ($schema['properties'] as &$property) {
+			if (isset($property['arg_options'])) {
+				unset($property['arg_options']);
 			}
 		}
 
@@ -270,7 +270,7 @@ 
 		return array(
 			'context'                => $this->get_context_param(),
 			'page'                   => array(
-				'description'        => __( 'Current page of the collection.' ),
+				'description'        => __('Current page of the collection.'),
 				'type'               => 'integer',
 				'default'            => 1,
 				'sanitize_callback'  => 'absint',
@@ -278,7 +278,7 @@ 
 				'minimum'            => 1,
 			),
 			'per_page'               => array(
-				'description'        => __( 'Maximum number of items to be returned in result set.' ),
+				'description'        => __('Maximum number of items to be returned in result set.'),
 				'type'               => 'integer',
 				'default'            => 10,
 				'minimum'            => 1,
@@ -287,7 +287,7 @@ 
 				'validate_callback'  => 'rest_validate_request_arg',
 			),
 			'search'                 => array(
-				'description'        => __( 'Limit results to those matching a string.' ),
+				'description'        => __('Limit results to those matching a string.'),
 				'type'               => 'string',
 				'sanitize_callback'  => 'sanitize_text_field',
 				'validate_callback'  => 'rest_validate_request_arg',
@@ -303,28 +303,28 @@ 
 	 * @param array $args
 	 * @return array
 	 */
-	public function get_context_param( $args = array() ) {
+	public function get_context_param($args = array()) {
 		$param_details = array(
-			'description'        => __( 'Scope under which the request is made; determines fields present in response.' ),
+			'description'        => __('Scope under which the request is made; determines fields present in response.'),
 			'type'               => 'string',
 			'sanitize_callback'  => 'sanitize_key',
 			'validate_callback'  => 'rest_validate_request_arg',
 		);
 		$schema = $this->get_item_schema();
-		if ( empty( $schema['properties'] ) ) {
-			return array_merge( $param_details, $args );
+		if (empty($schema['properties'])) {
+			return array_merge($param_details, $args);
 		}
 		$contexts = array();
-		foreach ( $schema['properties'] as $attributes ) {
-			if ( ! empty( $attributes['context'] ) ) {
-				$contexts = array_merge( $contexts, $attributes['context'] );
+		foreach ($schema['properties'] as $attributes) {
+			if ( ! empty($attributes['context'])) {
+				$contexts = array_merge($contexts, $attributes['context']);
 			}
 		}
-		if ( ! empty( $contexts ) ) {
-			$param_details['enum'] = array_unique( $contexts );
-			rsort( $param_details['enum'] );
+		if ( ! empty($contexts)) {
+			$param_details['enum'] = array_unique($contexts);
+			rsort($param_details['enum']);
 		}
-		return array_merge( $param_details, $args );
+		return array_merge($param_details, $args);
 	}
 
 	/**
@@ -334,17 +334,17 @@ 
 	 * @param WP_REST_Request $request
 	 * @return array modified object with additional fields.
 	 */
-	protected function add_additional_fields_to_object( $object, $request ) {
+	protected function add_additional_fields_to_object($object, $request) {
 
 		$additional_fields = $this->get_additional_fields();
 
-		foreach ( $additional_fields as $field_name => $field_options ) {
+		foreach ($additional_fields as $field_name => $field_options) {
 
-			if ( ! $field_options['get_callback'] ) {
+			if ( ! $field_options['get_callback']) {
 				continue;
 			}
 
-			$object[ $field_name ] = call_user_func( $field_options['get_callback'], $object, $field_name, $request, $this->get_object_type() );
+			$object[$field_name] = call_user_func($field_options['get_callback'], $object, $field_name, $request, $this->get_object_type());
 		}
 
 		return $object;
@@ -356,22 +356,22 @@ 
 	 * @param array           $object
 	 * @param WP_REST_Request $request
 	 */
-	protected function update_additional_fields_for_object( $object, $request ) {
+	protected function update_additional_fields_for_object($object, $request) {
 
 		$additional_fields = $this->get_additional_fields();
 
-		foreach ( $additional_fields as $field_name => $field_options ) {
+		foreach ($additional_fields as $field_name => $field_options) {
 
-			if ( ! $field_options['update_callback'] ) {
+			if ( ! $field_options['update_callback']) {
 				continue;
 			}
 
 			// Don't run the update callbacks if the data wasn't passed in the request.
-			if ( ! isset( $request[ $field_name ] ) ) {
+			if ( ! isset($request[$field_name])) {
 				continue;
 			}
 
-			call_user_func( $field_options['update_callback'], $request[ $field_name ], $object, $field_name, $request, $this->get_object_type() );
+			call_user_func($field_options['update_callback'], $request[$field_name], $object, $field_name, $request, $this->get_object_type());
 		}
 	}
 
@@ -382,8 +382,8 @@ 
 	 *
 	 * @param array $schema Schema array.
 	 */
-	protected function add_additional_fields_schema( $schema ) {
-		if ( empty( $schema['title'] ) ) {
+	protected function add_additional_fields_schema($schema) {
+		if (empty($schema['title'])) {
 			return $schema;
 		}
 
@@ -392,14 +392,14 @@ 
 		 */
 		$object_type = $schema['title'];
 
-		$additional_fields = $this->get_additional_fields( $object_type );
+		$additional_fields = $this->get_additional_fields($object_type);
 
-		foreach ( $additional_fields as $field_name => $field_options ) {
-			if ( ! $field_options['schema'] ) {
+		foreach ($additional_fields as $field_name => $field_options) {
+			if ( ! $field_options['schema']) {
 				continue;
 			}
 
-			$schema['properties'][ $field_name ] = $field_options['schema'];
+			$schema['properties'][$field_name] = $field_options['schema'];
 		}
 
 		return $schema;
@@ -411,23 +411,23 @@ 
 	 * @param  string $object_type
 	 * @return array
 	 */
-	protected function get_additional_fields( $object_type = null ) {
+	protected function get_additional_fields($object_type = null) {
 
-		if ( ! $object_type ) {
+		if ( ! $object_type) {
 			$object_type = $this->get_object_type();
 		}
 
-		if ( ! $object_type ) {
+		if ( ! $object_type) {
 			return array();
 		}
 
 		global $wp_rest_additional_fields;
 
-		if ( ! $wp_rest_additional_fields || ! isset( $wp_rest_additional_fields[ $object_type ] ) ) {
+		if ( ! $wp_rest_additional_fields || ! isset($wp_rest_additional_fields[$object_type])) {
 			return array();
 		}
 
-		return $wp_rest_additional_fields[ $object_type ];
+		return $wp_rest_additional_fields[$object_type];
 	}
 
 	/**
@@ -438,7 +438,7 @@ 
 	protected function get_object_type() {
 		$schema = $this->get_item_schema();
 
-		if ( ! $schema || ! isset( $schema['title'] ) ) {
+		if ( ! $schema || ! isset($schema['title'])) {
 			return null;
 		}
 
@@ -455,54 +455,54 @@ 
 	 *                       WP_REST_Server::CREATABLE.
 	 * @return array $endpoint_args
 	 */
-	public function get_endpoint_args_for_item_schema( $method = WP_REST_Server::CREATABLE ) {
+	public function get_endpoint_args_for_item_schema($method = WP_REST_Server::CREATABLE) {
 
 		$schema                = $this->get_item_schema();
-		$schema_properties     = ! empty( $schema['properties'] ) ? $schema['properties'] : array();
+		$schema_properties     = ! empty($schema['properties']) ? $schema['properties'] : array();
 		$endpoint_args = array();
 
-		foreach ( $schema_properties as $field_id => $params ) {
+		foreach ($schema_properties as $field_id => $params) {
 
 			// Arguments specified as `readonly` are not allowed to be set.
-			if ( ! empty( $params['readonly'] ) ) {
+			if ( ! empty($params['readonly'])) {
 				continue;
 			}
 
-			$endpoint_args[ $field_id ] = array(
+			$endpoint_args[$field_id] = array(
 				'validate_callback' => 'rest_validate_request_arg',
 				'sanitize_callback' => 'rest_sanitize_request_arg',
 			);
 
-			if ( isset( $params['description'] ) ) {
-				$endpoint_args[ $field_id ]['description'] = $params['description'];
+			if (isset($params['description'])) {
+				$endpoint_args[$field_id]['description'] = $params['description'];
 			}
 
-			if ( WP_REST_Server::CREATABLE === $method && isset( $params['default'] ) ) {
-				$endpoint_args[ $field_id ]['default'] = $params['default'];
+			if (WP_REST_Server::CREATABLE === $method && isset($params['default'])) {
+				$endpoint_args[$field_id]['default'] = $params['default'];
 			}
 
-			if ( WP_REST_Server::CREATABLE === $method && ! empty( $params['required'] ) ) {
-				$endpoint_args[ $field_id ]['required'] = true;
+			if (WP_REST_Server::CREATABLE === $method && ! empty($params['required'])) {
+				$endpoint_args[$field_id]['required'] = true;
 			}
 
-			foreach ( array( 'type', 'format', 'enum' ) as $schema_prop ) {
-				if ( isset( $params[ $schema_prop ] ) ) {
-					$endpoint_args[ $field_id ][ $schema_prop ] = $params[ $schema_prop ];
+			foreach (array('type', 'format', 'enum') as $schema_prop) {
+				if (isset($params[$schema_prop])) {
+					$endpoint_args[$field_id][$schema_prop] = $params[$schema_prop];
 				}
 			}
 
 			// Merge in any options provided by the schema property.
-			if ( isset( $params['arg_options'] ) ) {
+			if (isset($params['arg_options'])) {
 
 				// Only use required / default from arg_options on CREATABLE endpoints.
-				if ( WP_REST_Server::CREATABLE !== $method ) {
-					$params['arg_options'] = array_diff_key( $params['arg_options'], array(
+				if (WP_REST_Server::CREATABLE !== $method) {
+					$params['arg_options'] = array_diff_key($params['arg_options'], array(
 						'required' => '',
 						'default' => '',
-					) );
+					));
 				}
 
-				$endpoint_args[ $field_id ] = array_merge( $endpoint_args[ $field_id ], $params['arg_options'] );
+				$endpoint_args[$field_id] = array_merge($endpoint_args[$field_id], $params['arg_options']);
 			}
 		}// End foreach().
 
@@ -523,8 +523,8 @@ 
 	 * @param int|WP_Post $post Post ID or post object. Defaults to global $post.
 	 * @return WP_Post|null A `WP_Post` object when successful.
 	 */
-	public function get_post( $post ) {
-		$post_obj = get_post( $post );
+	public function get_post($post) {
+		$post_obj = get_post($post);
 
 		/**
 		 * Filter the post.
@@ -534,7 +534,7 @@ 
 		 * @param WP_Post|null $post_obj  The post object as returned by `get_post()`.
 		 * @param int|WP_Post  $post      The original value used to obtain the post object.
 		 */
-		$post = apply_filters( 'rest_the_post', $post_obj, $post );
+		$post = apply_filters('rest_the_post', $post_obj, $post);
 
 		return $post;
 	}

vendor/CMB2/includes/CMB2_Hookup.php

Spacing +216 added lines, -216 removed lines

@@ -62,10 +62,10 @@ 
 	 *
 	 * @return CMB2_Hookup_Base $hookup The hookup object.
 	 */
-	public static function maybe_init_and_hookup( CMB2 $cmb ) {
-		if ( $cmb->prop( 'hookup' ) ) {
+	public static function maybe_init_and_hookup(CMB2 $cmb) {
+		if ($cmb->prop('hookup')) {
 
-			$hookup = new self( $cmb );
+			$hookup = new self($cmb);
 
 			// Hook in the hookup... how meta.
 			return $hookup->universal_hooks();
@@ -75,18 +75,18 @@ 
 	}
 
 	public function universal_hooks() {
-		foreach ( get_class_methods( 'CMB2_Show_Filters' ) as $filter ) {
-			add_filter( 'cmb2_show_on', array( 'CMB2_Show_Filters', $filter ), 10, 3 );
+		foreach (get_class_methods('CMB2_Show_Filters') as $filter) {
+			add_filter('cmb2_show_on', array('CMB2_Show_Filters', $filter), 10, 3);
 		}
 
-		if ( is_admin() ) {
+		if (is_admin()) {
 			// Register our scripts and styles for cmb.
-			$this->once( 'admin_enqueue_scripts', array( __CLASS__, 'register_scripts' ), 8 );
-			$this->once( 'admin_enqueue_scripts', array( $this, 'do_scripts' ) );
+			$this->once('admin_enqueue_scripts', array(__CLASS__, 'register_scripts'), 8);
+			$this->once('admin_enqueue_scripts', array($this, 'do_scripts'));
 
 			$this->maybe_enqueue_column_display_styles();
 
-			switch ( $this->object_type ) {
+			switch ($this->object_type) {
 				case 'post':
 					return $this->post_hooks();
 				case 'comment':
@@ -106,42 +106,42 @@ 
 	public function post_hooks() {
 
 		// Fetch the context we set in our call.
-		$context = $this->cmb->prop( 'context' ) ? $this->cmb->prop( 'context' ) : 'normal';
+		$context = $this->cmb->prop('context') ? $this->cmb->prop('context') : 'normal';
 
 		// Call the proper hook based on the context provided.
-		switch ( $context ) {
+		switch ($context) {
 
 			case 'form_top':
-				add_action( 'edit_form_top', array( $this, 'add_context_metaboxes' ) );
+				add_action('edit_form_top', array($this, 'add_context_metaboxes'));
 				break;
 
 			case 'before_permalink':
-				add_action( 'edit_form_before_permalink', array( $this, 'add_context_metaboxes' ) );
+				add_action('edit_form_before_permalink', array($this, 'add_context_metaboxes'));
 				break;
 
 			case 'after_title':
-				add_action( 'edit_form_after_title', array( $this, 'add_context_metaboxes' ) );
+				add_action('edit_form_after_title', array($this, 'add_context_metaboxes'));
 				break;
 
 			case 'after_editor':
-				add_action( 'edit_form_after_editor', array( $this, 'add_context_metaboxes' ) );
+				add_action('edit_form_after_editor', array($this, 'add_context_metaboxes'));
 				break;
 
 			default:
-				add_action( 'add_meta_boxes', array( $this, 'add_metaboxes' ) );
+				add_action('add_meta_boxes', array($this, 'add_metaboxes'));
 		}
 
-		add_action( 'add_meta_boxes', array( $this, 'remove_default_tax_metaboxes' ) );
-		add_action( 'add_attachment', array( $this, 'save_post' ) );
-		add_action( 'edit_attachment', array( $this, 'save_post' ) );
-		add_action( 'save_post', array( $this, 'save_post' ), 10, 2 );
+		add_action('add_meta_boxes', array($this, 'remove_default_tax_metaboxes'));
+		add_action('add_attachment', array($this, 'save_post'));
+		add_action('edit_attachment', array($this, 'save_post'));
+		add_action('save_post', array($this, 'save_post'), 10, 2);
 
-		if ( $this->cmb->has_columns ) {
-			foreach ( $this->cmb->box_types() as $post_type ) {
-				add_filter( "manage_{$post_type}_posts_columns", array( $this, 'register_column_headers' ) );
-				add_action( "manage_{$post_type}_posts_custom_column", array( $this, 'column_display' ), 10, 2 );
-				add_filter( "manage_edit-{$post_type}_sortable_columns", array( $this, 'columns_sortable' ) );
-				add_action( 'pre_get_posts', array( $this, 'columns_sortable_orderby' ) );
+		if ($this->cmb->has_columns) {
+			foreach ($this->cmb->box_types() as $post_type) {
+				add_filter("manage_{$post_type}_posts_columns", array($this, 'register_column_headers'));
+				add_action("manage_{$post_type}_posts_custom_column", array($this, 'column_display'), 10, 2);
+				add_filter("manage_edit-{$post_type}_sortable_columns", array($this, 'columns_sortable'));
+				add_action('pre_get_posts', array($this, 'columns_sortable_orderby'));
 			}
 		}
 
@@ -149,14 +149,14 @@ 
 	}
 
 	public function comment_hooks() {
-		add_action( 'add_meta_boxes_comment', array( $this, 'add_metaboxes' ) );
-		add_action( 'edit_comment', array( $this, 'save_comment' ) );
+		add_action('add_meta_boxes_comment', array($this, 'add_metaboxes'));
+		add_action('edit_comment', array($this, 'save_comment'));
 
-		if ( $this->cmb->has_columns ) {
-			add_filter( 'manage_edit-comments_columns', array( $this, 'register_column_headers' ) );
-			add_action( 'manage_comments_custom_column', array( $this, 'column_display' ), 10, 3 );
-			add_filter( "manage_edit-comments_sortable_columns", array( $this, 'columns_sortable' ) );
-			add_action( 'pre_get_posts', array( $this, 'columns_sortable_orderby' ) );
+		if ($this->cmb->has_columns) {
+			add_filter('manage_edit-comments_columns', array($this, 'register_column_headers'));
+			add_action('manage_comments_custom_column', array($this, 'column_display'), 10, 3);
+			add_filter("manage_edit-comments_sortable_columns", array($this, 'columns_sortable'));
+			add_action('pre_get_posts', array($this, 'columns_sortable_orderby'));
 		}
 
 		return $this;
@@ -165,43 +165,43 @@ 
 	public function user_hooks() {
 		$priority = $this->get_priority();
 
-		add_action( 'show_user_profile', array( $this, 'user_metabox' ), $priority );
-		add_action( 'edit_user_profile', array( $this, 'user_metabox' ), $priority );
-		add_action( 'user_new_form', array( $this, 'user_new_metabox' ), $priority );
+		add_action('show_user_profile', array($this, 'user_metabox'), $priority);
+		add_action('edit_user_profile', array($this, 'user_metabox'), $priority);
+		add_action('user_new_form', array($this, 'user_new_metabox'), $priority);
 
-		add_action( 'personal_options_update', array( $this, 'save_user' ) );
-		add_action( 'edit_user_profile_update', array( $this, 'save_user' ) );
-		add_action( 'user_register', array( $this, 'save_user' ) );
+		add_action('personal_options_update', array($this, 'save_user'));
+		add_action('edit_user_profile_update', array($this, 'save_user'));
+		add_action('user_register', array($this, 'save_user'));
 
-		if ( $this->cmb->has_columns ) {
-			add_filter( 'manage_users_columns', array( $this, 'register_column_headers' ) );
-			add_filter( 'manage_users_custom_column', array( $this, 'return_column_display' ), 10, 3 );
-			add_filter( "manage_users_sortable_columns", array( $this, 'columns_sortable' ) );
-			add_action( 'pre_get_posts', array( $this, 'columns_sortable_orderby' ) );
+		if ($this->cmb->has_columns) {
+			add_filter('manage_users_columns', array($this, 'register_column_headers'));
+			add_filter('manage_users_custom_column', array($this, 'return_column_display'), 10, 3);
+			add_filter("manage_users_sortable_columns", array($this, 'columns_sortable'));
+			add_action('pre_get_posts', array($this, 'columns_sortable_orderby'));
 		}
 
 		return $this;
 	}
 
 	public function term_hooks() {
-		if ( ! function_exists( 'get_term_meta' ) ) {
-			wp_die( esc_html__( 'Term Metadata is a WordPress 4.4+ feature. Please upgrade your WordPress install.', 'cmb2' ) );
+		if ( ! function_exists('get_term_meta')) {
+			wp_die(esc_html__('Term Metadata is a WordPress 4.4+ feature. Please upgrade your WordPress install.', 'cmb2'));
 		}
 
-		if ( ! $this->cmb->prop( 'taxonomies' ) ) {
-			wp_die( esc_html__( 'Term metaboxes configuration requires a "taxonomies" parameter.', 'cmb2' ) );
+		if ( ! $this->cmb->prop('taxonomies')) {
+			wp_die(esc_html__('Term metaboxes configuration requires a "taxonomies" parameter.', 'cmb2'));
 		}
 
-		$this->taxonomies = (array) $this->cmb->prop( 'taxonomies' );
-		$show_on_term_add = $this->cmb->prop( 'new_term_section' );
-		$priority         = $this->get_priority( 8 );
+		$this->taxonomies = (array) $this->cmb->prop('taxonomies');
+		$show_on_term_add = $this->cmb->prop('new_term_section');
+		$priority         = $this->get_priority(8);
 
-		foreach ( $this->taxonomies as $taxonomy ) {
+		foreach ($this->taxonomies as $taxonomy) {
 			// Display our form data.
-			add_action( "{$taxonomy}_edit_form", array( $this, 'term_metabox' ), $priority, 2 );
+			add_action("{$taxonomy}_edit_form", array($this, 'term_metabox'), $priority, 2);
 
-			$show_on_add = is_array( $show_on_term_add )
-				? in_array( $taxonomy, $show_on_term_add )
+			$show_on_add = is_array($show_on_term_add)
+				? in_array($taxonomy, $show_on_term_add)
 				: (bool) $show_on_term_add;
 
 			/**
@@ -212,24 +212,24 @@ 
 			 * @param bool   $show_on_add Default is the value of the new_term_section cmb parameter.
 			 * @param object $cmb         The CMB2 instance
 			 */
-			$show_on_add = apply_filters( "cmb2_show_on_term_add_form_{$this->cmb->cmb_id}", $show_on_add, $this->cmb );
+			$show_on_add = apply_filters("cmb2_show_on_term_add_form_{$this->cmb->cmb_id}", $show_on_add, $this->cmb);
 
 			// Display form in add-new section (unless specified not to).
-			if ( $show_on_add ) {
-				add_action( "{$taxonomy}_add_form_fields", array( $this, 'term_metabox' ), $priority, 2 );
+			if ($show_on_add) {
+				add_action("{$taxonomy}_add_form_fields", array($this, 'term_metabox'), $priority, 2);
 			}
 
-			if ( $this->cmb->has_columns ) {
-				add_filter( "manage_edit-{$taxonomy}_columns", array( $this, 'register_column_headers' ) );
-				add_filter( "manage_{$taxonomy}_custom_column", array( $this, 'return_column_display' ), 10, 3 );
-				add_filter( "manage_edit-{$taxonomy}_sortable_columns", array( $this, 'columns_sortable' ) );
-				add_action( 'pre_get_posts', array( $this, 'columns_sortable_orderby' ) );
+			if ($this->cmb->has_columns) {
+				add_filter("manage_edit-{$taxonomy}_columns", array($this, 'register_column_headers'));
+				add_filter("manage_{$taxonomy}_custom_column", array($this, 'return_column_display'), 10, 3);
+				add_filter("manage_edit-{$taxonomy}_sortable_columns", array($this, 'columns_sortable'));
+				add_action('pre_get_posts', array($this, 'columns_sortable_orderby'));
 			}
 		}
 
-		add_action( 'created_term', array( $this, 'save_term' ), 10, 3 );
-		add_action( 'edited_terms', array( $this, 'save_term' ), 10, 2 );
-		add_action( 'delete_term', array( $this, 'delete_term' ), 10, 3 );
+		add_action('created_term', array($this, 'save_term'), 10, 3);
+		add_action('edited_terms', array($this, 'save_term'), 10, 2);
+		add_action('delete_term', array($this, 'delete_term'), 10, 3);
 
 		return $this;
 	}
@@ -237,10 +237,10 @@ 
 	public function options_page_hooks() {
 		$option_keys = $this->cmb->options_page_keys();
 
-		if ( ! empty( $option_keys ) ) {
-			foreach ( $option_keys as $option_key ) {
-				$this->options_hookup[ $option_key ] = new CMB2_Options_Hookup( $this->cmb, $option_key );
-				$this->options_hookup[ $option_key ]->hooks();
+		if ( ! empty($option_keys)) {
+			foreach ($option_keys as $option_key) {
+				$this->options_hookup[$option_key] = new CMB2_Options_Hookup($this->cmb, $option_key);
+				$this->options_hookup[$option_key]->hooks();
 			}
 		}
 
@@ -253,12 +253,12 @@ 
 	 * @since 2.0.7
 	 */
 	protected static function register_styles() {
-		if ( self::$css_registration_done ) {
+		if (self::$css_registration_done) {
 			return;
 		}
 
 		// Only use minified files if SCRIPT_DEBUG is off.
-		$min   = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$min   = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 		$front = is_admin() ? '' : '-front';
 		$rtl   = is_rtl() ? '-rtl' : '';
 
@@ -267,9 +267,9 @@ 
 		 *
 		 * @param array $dependencies The registered style dependencies for the cmb2 stylesheet.
 		 */
-		$dependencies = apply_filters( 'cmb2_style_dependencies', array() );
-		wp_register_style( 'cmb2-styles', CMB2_Utils::url( "css/cmb2{$front}{$rtl}{$min}.css" ), $dependencies );
-		wp_register_style( 'cmb2-display-styles', CMB2_Utils::url( "css/cmb2-display{$rtl}{$min}.css" ), $dependencies );
+		$dependencies = apply_filters('cmb2_style_dependencies', array());
+		wp_register_style('cmb2-styles', CMB2_Utils::url("css/cmb2{$front}{$rtl}{$min}.css"), $dependencies);
+		wp_register_style('cmb2-display-styles', CMB2_Utils::url("css/cmb2-display{$rtl}{$min}.css"), $dependencies);
 
 		self::$css_registration_done = true;
 	}
@@ -280,12 +280,12 @@ 
 	 * @since  2.0.7
 	 */
 	protected static function register_js() {
-		if ( self::$js_registration_done ) {
+		if (self::$js_registration_done) {
 			return;
 		}
 
 		$hook = is_admin() ? 'admin_footer' : 'wp_footer';
-		add_action( $hook, array( 'CMB2_JS', 'enqueue' ), 8 );
+		add_action($hook, array('CMB2_JS', 'enqueue'), 8);
 
 		self::$js_registration_done = true;
 	}
@@ -307,7 +307,7 @@ 
 	 *
 	 * @param string $hook Current hook for the admin page.
 	 */
-	public function do_scripts( $hook ) {
+	public function do_scripts($hook) {
 		$hooks = array(
 			'post.php',
 			'post-new.php',
@@ -322,11 +322,11 @@ 
 		);
 		// only pre-enqueue our scripts/styles on the proper pages
 		// show_form_for_type will have us covered if we miss something here.
-		if ( in_array( $hook, $hooks, true ) ) {
-			if ( $this->cmb->prop( 'cmb_styles' ) ) {
+		if (in_array($hook, $hooks, true)) {
+			if ($this->cmb->prop('cmb_styles')) {
 				self::enqueue_cmb_css();
 			}
-			if ( $this->cmb->prop( 'enqueue_js' ) ) {
+			if ($this->cmb->prop('enqueue_js')) {
 				self::enqueue_cmb_js();
 			}
 		}
@@ -339,24 +339,24 @@ 
 	 *
 	 * @param array $columns Array of columns available for the admin page.
 	 */
-	public function register_column_headers( $columns ) {
-		foreach ( $this->cmb->prop( 'fields' ) as $key => $field ) {
-			if ( empty( $field['column'] ) ) {
+	public function register_column_headers($columns) {
+		foreach ($this->cmb->prop('fields') as $key => $field) {
+			if (empty($field['column'])) {
 				continue;
 			}
 
 			$column = $field['column'];
 
-			if ( false === $column['position'] ) {
-				$columns[ $field['id'] ] = $column['name'];
+			if (false === $column['position']) {
+				$columns[$field['id']] = $column['name'];
 			} else {
-				$before = array_slice( $columns, 0, absint( $column['position'] ) );
-				$before[ $field['id'] ] = $column['name'];
+				$before = array_slice($columns, 0, absint($column['position']));
+				$before[$field['id']] = $column['name'];
 				$columns = $before + $columns;
 			}
 
 			$column['field'] = $field;
-			$this->columns[ $field['id'] ] = $column;
+			$this->columns[$field['id']] = $column;
 		}
 
 		return $columns;
@@ -370,16 +370,16 @@ 
 	 * @param string $column_name Current column name.
 	 * @param mixed  $object_id Current object ID.
 	 */
-	public function column_display( $column_name, $object_id ) {
-		if ( isset( $this->columns[ $column_name ] ) ) {
-			$field = new CMB2_Field( array(
-				'field_args'  => $this->columns[ $column_name ]['field'],
+	public function column_display($column_name, $object_id) {
+		if (isset($this->columns[$column_name])) {
+			$field = new CMB2_Field(array(
+				'field_args'  => $this->columns[$column_name]['field'],
 				'object_type' => $this->object_type,
-				'object_id'   => $this->cmb->object_id( $object_id ),
+				'object_id'   => $this->cmb->object_id($object_id),
 				'cmb_id'      => $this->cmb->cmb_id,
-			) );
+			));
 
-			$this->cmb->get_field( $field )->render_column();
+			$this->cmb->get_field($field)->render_column();
 		}
 	}
 
@@ -392,10 +392,10 @@ 
 	 *
 	 * @return array $columns An array of sortable columns with CMB2 columns.
 	 */
-	public function columns_sortable( $columns ) {
-		foreach ( $this->cmb->prop( 'fields' ) as $key => $field ) {
-			if ( ! empty( $field['column'] ) && empty( $field['column']['disable_sortable'] ) ) {
-				$columns[ $field['id'] ] = $field['id'];
+	public function columns_sortable($columns) {
+		foreach ($this->cmb->prop('fields') as $key => $field) {
+			if ( ! empty($field['column']) && empty($field['column']['disable_sortable'])) {
+				$columns[$field['id']] = $field['id'];
 			}
 		}
 
@@ -411,28 +411,28 @@ 
 	 *
 	 * @return void
 	 */
-	public function columns_sortable_orderby( $query ) {
-		if ( ! is_admin() ) {
+	public function columns_sortable_orderby($query) {
+		if ( ! is_admin()) {
 			return;
 		}
 
-		$orderby = $query->get( 'orderby' );
+		$orderby = $query->get('orderby');
 
-		foreach ( $this->cmb->prop( 'fields' ) as $key => $field ) {
+		foreach ($this->cmb->prop('fields') as $key => $field) {
 			if (
-				empty( $field['column'] )
-				|| ! empty( $field['column']['disable_sortable'] )
+				empty($field['column'])
+				|| ! empty($field['column']['disable_sortable'])
 				|| $field['id'] !== $orderby
 			) {
 				continue;
 			}
 
-			$query->set( 'meta_key', $field['id'] );
+			$query->set('meta_key', $field['id']);
 
 			$type = $field['type'];
 
-			if ( ! empty( $field['attributes']['type'] ) ) {
-				switch ( $field['attributes']['type'] ) {
+			if ( ! empty($field['attributes']['type'])) {
+				switch ($field['attributes']['type']) {
 					case 'number':
 					case 'date':
 						$type = $field['attributes']['type'];
@@ -443,22 +443,22 @@ 
 				}
 			}
 
-			switch ( $type ) {
+			switch ($type) {
 				case 'number':
 				case 'text_date_timestamp':
 				case 'text_datetime_timestamp':
 				case 'text_money':
-					$query->set( 'orderby', 'meta_value_num' );
+					$query->set('orderby', 'meta_value_num');
 					break;
 				case 'text_time':
-					$query->set( 'orderby', 'meta_value_time' );
+					$query->set('orderby', 'meta_value_time');
 					break;
 				case 'text_date':
-					$query->set( 'orderby', 'meta_value_date' );
+					$query->set('orderby', 'meta_value_date');
 					break;
 
 				default:
-					$query->set( 'orderby', 'meta_value' );
+					$query->set('orderby', 'meta_value');
 					break;
 			}
 		}
@@ -469,9 +469,9 @@ 
 	 *
 	 * @since 2.2.2
 	 */
-	public function return_column_display( $empty, $custom_column, $object_id ) {
+	public function return_column_display($empty, $custom_column, $object_id) {
 		ob_start();
-		$this->column_display( $custom_column, $object_id );
+		$this->column_display($custom_column, $object_id);
 		$column = ob_get_clean();
 
 		return $column ? $column : $empty;
@@ -484,17 +484,17 @@ 
 	 */
 	public function add_context_metaboxes() {
 
-		if ( ! $this->show_on() ) {
+		if ( ! $this->show_on()) {
 			return;
 		}
 
 		$page = get_current_screen()->id;
 
-		foreach ( $this->cmb->box_types() as $object_type ) {
-			$screen = convert_to_screen( $object_type );
+		foreach ($this->cmb->box_types() as $object_type) {
+			$screen = convert_to_screen($object_type);
 
 			// If we're on the right post-type/object...
-			if ( isset( $screen->id ) && $screen->id === $page ) {
+			if (isset($screen->id) && $screen->id === $page) {
 
 				// Show the box.
 				$this->output_context_metabox();
@@ -508,7 +508,7 @@ 
 	 * @since 2.2.4
 	 */
 	public function output_context_metabox() {
-		$title = $this->cmb->prop( 'title' );
+		$title = $this->cmb->prop('title');
 
 		/*
 		 * To keep from outputting the open/close markup, do not include
@@ -517,17 +517,17 @@ 
 		 * To output the fields 'naked' (without a postbox wrapper/style), then
 		 * add a `'remove_box_wrap' => true` to your metabox registration array.
 		 */
-		$add_wrap = ! empty( $title ) || ! $this->cmb->prop( 'remove_box_wrap' );
-		$add_handle = $add_wrap && ! empty( $title );
+		$add_wrap = ! empty($title) || ! $this->cmb->prop('remove_box_wrap');
+		$add_handle = $add_wrap && ! empty($title);
 
 		// Open the context-box wrap.
-		$this->context_box_title_markup_open( $add_handle );
+		$this->context_box_title_markup_open($add_handle);
 
 		// Show the form fields.
 		$this->cmb->show_form();
 
 		// Close the context-box wrap.
-		$this->context_box_title_markup_close( $add_handle );
+		$this->context_box_title_markup_close($add_handle);
 	}
 
 	/**
@@ -536,22 +536,22 @@ 
 	 * @since 2.2.4
 	 * @param bool $add_handle Whether to add the metabox handle and opening div for .inside.
 	 */
-	public function context_box_title_markup_open( $add_handle = true ) {
-		$title = $this->cmb->prop( 'title' );
+	public function context_box_title_markup_open($add_handle = true) {
+		$title = $this->cmb->prop('title');
 
 		$page = get_current_screen()->id;
-		add_filter( "postbox_classes_{$page}_{$this->cmb->cmb_id}", array( $this, 'postbox_classes' ) );
+		add_filter("postbox_classes_{$page}_{$this->cmb->cmb_id}", array($this, 'postbox_classes'));
 
-		echo '<div id="' . $this->cmb->cmb_id . '" class="' . postbox_classes( $this->cmb->cmb_id, $page ) . '">' . "\n";
+		echo '<div id="' . $this->cmb->cmb_id . '" class="' . postbox_classes($this->cmb->cmb_id, $page) . '">' . "\n";
 
-		if ( $add_handle ) {
+		if ($add_handle) {
 
 			echo '<button type="button" class="handlediv button-link" aria-expanded="true">';
-				echo '<span class="screen-reader-text">' . sprintf( __( 'Toggle panel: %s' ), $title ) . '</span>';
+				echo '<span class="screen-reader-text">' . sprintf(__('Toggle panel: %s'), $title) . '</span>';
 				echo '<span class="toggle-indicator" aria-hidden="true"></span>';
 			echo '</button>';
 
-			echo '<h2 class="hndle"><span>' . esc_attr( $title ) . '</span></h2>' . "\n";
+			echo '<h2 class="hndle"><span>' . esc_attr($title) . '</span></h2>' . "\n";
 			echo '<div class="inside">' . "\n";
 		}
 	}
@@ -562,10 +562,10 @@ 
 	 * @since 2.2.4
 	 * @param bool $add_inside_close Whether to add closing div for .inside.
 	 */
-	public function context_box_title_markup_close( $add_inside_close = true ) {
+	public function context_box_title_markup_close($add_inside_close = true) {
 
 		// Load the closing divs for a title box.
-		if ( $add_inside_close ) {
+		if ($add_inside_close) {
 			echo '</div>' . "\n"; // .inside
 		}
 
@@ -579,7 +579,7 @@ 
 	 */
 	public function add_metaboxes() {
 
-		if ( ! $this->show_on() ) {
+		if ( ! $this->show_on()) {
 			return;
 		}
 
@@ -592,22 +592,22 @@ 
 		 * This is a good solution if you want to handle outputting your
 		 * metaboxes/fields elsewhere in the post-screen.
 		 */
-		if ( ! $this->cmb->prop( 'title' ) ) {
+		if ( ! $this->cmb->prop('title')) {
 			return;
 		}
 
 		$page = get_current_screen()->id;
-		add_filter( "postbox_classes_{$page}_{$this->cmb->cmb_id}", array( $this, 'postbox_classes' ) );
+		add_filter("postbox_classes_{$page}_{$this->cmb->cmb_id}", array($this, 'postbox_classes'));
 
-		foreach ( $this->cmb->box_types() as $object_type ) {
+		foreach ($this->cmb->box_types() as $object_type) {
 			add_meta_box(
 				$this->cmb->cmb_id,
-				$this->cmb->prop( 'title' ),
-				array( $this, 'metabox_callback' ),
+				$this->cmb->prop('title'),
+				array($this, 'metabox_callback'),
 				$object_type,
-				$this->cmb->prop( 'context' ),
-				$this->cmb->prop( 'priority' ),
-				$this->cmb->prop( 'mb_callback_args' )
+				$this->cmb->prop('context'),
+				$this->cmb->prop('priority'),
+				$this->cmb->prop('mb_callback_args')
 			);
 		}
 	}
@@ -619,15 +619,15 @@ 
 	 *
 	 */
 	public function remove_default_tax_metaboxes() {
-		$to_remove = array_filter( (array) $this->cmb->tax_metaboxes_to_remove, 'taxonomy_exists' );
-		if ( empty( $to_remove ) ) {
+		$to_remove = array_filter((array) $this->cmb->tax_metaboxes_to_remove, 'taxonomy_exists');
+		if (empty($to_remove)) {
 			return;
 		}
 
-		foreach ( $this->cmb->box_types() as $post_type ) {
-			foreach ( $to_remove as $taxonomy ) {
-				$mb_id = is_taxonomy_hierarchical( $taxonomy ) ? "{$taxonomy}div" : "tagsdiv-{$taxonomy}";
-				remove_meta_box( $mb_id, $post_type, 'side' );
+		foreach ($this->cmb->box_types() as $post_type) {
+			foreach ($to_remove as $taxonomy) {
+				$mb_id = is_taxonomy_hierarchical($taxonomy) ? "{$taxonomy}div" : "tagsdiv-{$taxonomy}";
+				remove_meta_box($mb_id, $post_type, 'side');
 			}
 		}
 	}
@@ -639,13 +639,13 @@ 
 	 * @param  array $classes Array of classes.
 	 * @return array           Modified array of classes
 	 */
-	public function postbox_classes( $classes ) {
-		if ( $this->cmb->prop( 'closed' ) && ! in_array( 'closed', $classes ) ) {
+	public function postbox_classes($classes) {
+		if ($this->cmb->prop('closed') && ! in_array('closed', $classes)) {
 			$classes[] = 'closed';
 		}
 
-		if ( $this->cmb->is_alternate_context_box() ) {
-			$classes = $this->alternate_context_postbox_classes( $classes );
+		if ($this->cmb->is_alternate_context_box()) {
+			$classes = $this->alternate_context_postbox_classes($classes);
 		} else {
 			$classes[] = 'cmb2-postbox';
 		}
@@ -660,17 +660,17 @@ 
 	 * @param  array $classes Array of classes.
 	 * @return array           Modified array of classes
 	 */
-	protected function alternate_context_postbox_classes( $classes ) {
+	protected function alternate_context_postbox_classes($classes) {
 		$classes[] = 'context-box';
-		$classes[] = 'context-' . $this->cmb->prop( 'context' ) . '-box';
+		$classes[] = 'context-' . $this->cmb->prop('context') . '-box';
 
-		if ( in_array( $this->cmb->cmb_id, get_hidden_meta_boxes( get_current_screen() ) ) ) {
+		if (in_array($this->cmb->cmb_id, get_hidden_meta_boxes(get_current_screen()))) {
 			$classes[] = 'hide-if-js';
 		}
 
-		$add_wrap = $this->cmb->prop( 'title' ) || ! $this->cmb->prop( 'remove_box_wrap' );
+		$add_wrap = $this->cmb->prop('title') || ! $this->cmb->prop('remove_box_wrap');
 
-		if ( $add_wrap ) {
+		if ($add_wrap) {
 			$classes[] = 'cmb2-postbox postbox';
 		} else {
 			$classes[] = 'cmb2-no-box-wrap';
@@ -686,7 +686,7 @@ 
 	 */
 	public function metabox_callback() {
 		$object_id = 'comment' === $this->object_type ? get_comment_ID() : get_the_ID();
-		$this->cmb->show_form( $object_id, $this->object_type );
+		$this->cmb->show_form($object_id, $this->object_type);
 	}
 
 	/**
@@ -696,10 +696,10 @@ 
 	 *
 	 * @param mixed $section User section metabox.
 	 */
-	public function user_new_metabox( $section ) {
-		if ( $section === $this->cmb->prop( 'new_user_section' ) ) {
+	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();
 		}
 	}
@@ -710,7 +710,7 @@ 
 	 * @since  1.0.0
 	 */
 	public function user_metabox() {
-		$this->show_form_for_type( 'user' );
+		$this->show_form_for_type('user');
 	}
 
 	/**
@@ -719,7 +719,7 @@ 
 	 * @since  2.2.0
 	 */
 	public function term_metabox() {
-		$this->show_form_for_type( 'term' );
+		$this->show_form_for_type('term');
 	}
 
 	/**
@@ -729,23 +729,23 @@ 
 	 * @param  string $type Object type.
 	 * @return void
 	 */
-	public function show_form_for_type( $type ) {
-		if ( $type != $this->object_type ) {
+	public function show_form_for_type($type) {
+		if ($type != $this->object_type) {
 			return;
 		}
 
-		if ( ! $this->show_on() ) {
+		if ( ! $this->show_on()) {
 			return;
 		}
 
-		if ( $this->cmb->prop( 'cmb_styles' ) ) {
+		if ($this->cmb->prop('cmb_styles')) {
 			self::enqueue_cmb_css();
 		}
-		if ( $this->cmb->prop( 'enqueue_js' ) ) {
+		if ($this->cmb->prop('enqueue_js')) {
 			self::enqueue_cmb_js();
 		}
 
-		$this->cmb->show_form( 0, $type );
+		$this->cmb->show_form(0, $type);
 	}
 
 	/**
@@ -765,7 +765,7 @@ 
 		 * @param mixed  $meta_box_args Array of the metabox arguments.
 		 * @param mixed  $cmb           The CMB2 instance.
 		 */
-		$show = (bool) apply_filters( 'cmb2_show_on', $show, $this->cmb->meta_box, $this->cmb );
+		$show = (bool) apply_filters('cmb2_show_on', $show, $this->cmb->meta_box, $this->cmb);
 
 		return $show;
 	}
@@ -778,11 +778,11 @@ 
 	 * @param integer $default Default display hook priority.
 	 * @return integer          Hook priority.
 	 */
-	public function get_priority( $default = 10 ) {
-		$priority = $this->cmb->prop( 'priority' );
+	public function get_priority($default = 10) {
+		$priority = $this->cmb->prop('priority');
 
-		if ( ! is_numeric( $priority ) ) {
-			switch ( $priority ) {
+		if ( ! is_numeric($priority)) {
+			switch ($priority) {
 
 				case 'high':
 					$priority = 5;
@@ -809,22 +809,22 @@ 
 	 * @param  mixed $post    Post object.
 	 * @return void
 	 */
-	public function save_post( $post_id, $post = false ) {
+	public function save_post($post_id, $post = false) {
 
-		$post_type = $post ? $post->post_type : get_post_type( $post_id );
+		$post_type = $post ? $post->post_type : get_post_type($post_id);
 
 		$do_not_pass_go = (
-			! $this->can_save( $post_type )
+			! $this->can_save($post_type)
 			// Check user editing permissions.
-			|| ( 'page' === $post_type && ! current_user_can( 'edit_page', $post_id ) )
-			|| ! current_user_can( 'edit_post', $post_id )
+			|| ('page' === $post_type && ! current_user_can('edit_page', $post_id))
+			|| ! current_user_can('edit_post', $post_id)
 		);
 
-		if ( $do_not_pass_go ) {
+		if ($do_not_pass_go) {
 			return;
 		}
 
-		$this->cmb->save_fields( $post_id, 'post', $_POST );
+		$this->cmb->save_fields($post_id, 'post', $_POST);
 	}
 
 	/**
@@ -834,12 +834,12 @@ 
 	 * @param  int $comment_id Comment ID.
 	 * @return void
 	 */
-	public function save_comment( $comment_id ) {
+	public function save_comment($comment_id) {
 
-		$can_edit = current_user_can( 'moderate_comments', $comment_id );
+		$can_edit = current_user_can('moderate_comments', $comment_id);
 
-		if ( $this->can_save( get_comment_type( $comment_id ) ) && $can_edit ) {
-			$this->cmb->save_fields( $comment_id, 'comment', $_POST );
+		if ($this->can_save(get_comment_type($comment_id)) && $can_edit) {
+			$this->cmb->save_fields($comment_id, 'comment', $_POST);
 		}
 	}
 
@@ -850,10 +850,10 @@ 
 	 * @param  int $user_id User ID.
 	 * @return void
 	 */
-	public function save_user( $user_id ) {
+	public function save_user($user_id) {
 		// check permissions.
-		if ( $this->can_save( 'user' ) ) {
-			$this->cmb->save_fields( $user_id, 'user', $_POST );
+		if ($this->can_save('user')) {
+			$this->cmb->save_fields($user_id, 'user', $_POST);
 		}
 	}
 
@@ -866,12 +866,12 @@ 
 	 * @param string $taxonomy Taxonomy.
 	 * @return void
 	 */
-	public function save_term( $term_id, $tt_id, $taxonomy = '' ) {
+	public function save_term($term_id, $tt_id, $taxonomy = '') {
 		$taxonomy = $taxonomy ? $taxonomy : $tt_id;
 
 		// check permissions.
-		if ( $this->taxonomy_can_save( $taxonomy ) && $this->can_save( 'term' ) ) {
-			$this->cmb->save_fields( $term_id, 'term', $_POST );
+		if ($this->taxonomy_can_save($taxonomy) && $this->can_save('term')) {
+			$this->cmb->save_fields($term_id, 'term', $_POST);
 		}
 	}
 
@@ -884,15 +884,15 @@ 
 	 * @param  string $taxonomy Taxonomy.
 	 * @return void
 	 */
-	public function delete_term( $term_id, $tt_id, $taxonomy = '' ) {
-		if ( $this->taxonomy_can_save( $taxonomy ) ) {
+	public function delete_term($term_id, $tt_id, $taxonomy = '') {
+		if ($this->taxonomy_can_save($taxonomy)) {
 
 			$data_to_delete = array();
-			foreach ( $this->cmb->prop( 'fields' ) as $field ) {
-				$data_to_delete[ $field['id'] ] = '';
+			foreach ($this->cmb->prop('fields') as $field) {
+				$data_to_delete[$field['id']] = '';
 			}
 
-			$this->cmb->save_fields( $term_id, 'term', $data_to_delete );
+			$this->cmb->save_fields($term_id, 'term', $data_to_delete);
 		}
 	}
 
@@ -903,19 +903,19 @@ 
 	 * @param  string $type Current object type.
 	 * @return bool         Whether object can be saved.
 	 */
-	public function can_save( $type = '' ) {
+	public function can_save($type = '') {
 
 		$can_save = (
-			$this->cmb->prop( 'save_fields' )
+			$this->cmb->prop('save_fields')
 			// check nonce.
-			&& isset( $_POST[ $this->cmb->nonce() ] )
-			&& wp_verify_nonce( $_POST[ $this->cmb->nonce() ], $this->cmb->nonce() )
+			&& isset($_POST[$this->cmb->nonce()])
+			&& wp_verify_nonce($_POST[$this->cmb->nonce()], $this->cmb->nonce())
 			// check if autosave.
-			&& ! ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
+			&& ! (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
 			// get the metabox types & compare it to this type.
-			&& ( $type && in_array( $type, $this->cmb->box_types() ) )
+			&& ($type && in_array($type, $this->cmb->box_types()))
 			// Don't do updates during a switch-to-blog instance.
-			&& ! ( is_multisite() && ms_is_switched() )
+			&& ! (is_multisite() && ms_is_switched())
 		);
 
 		/**
@@ -924,7 +924,7 @@ 
 		 * @param bool   $can_save Whether the current metabox can save.
 		 * @param object $cmb      The CMB2 instance.
 		 */
-		return apply_filters( 'cmb2_can_save', $can_save, $this->cmb );
+		return apply_filters('cmb2_can_save', $can_save, $this->cmb);
 	}
 
 	/**
@@ -935,14 +935,14 @@ 
 	 * @param string $taxonomy Taxonomy of term being modified.
 	 * @return bool             Whether taxonomy is editable.
 	 */
-	public function taxonomy_can_save( $taxonomy ) {
-		if ( empty( $this->taxonomies ) || ! in_array( $taxonomy, $this->taxonomies ) ) {
+	public function taxonomy_can_save($taxonomy) {
+		if (empty($this->taxonomies) || ! in_array($taxonomy, $this->taxonomies)) {
 			return false;
 		}
 
-		$taxonomy_object = get_taxonomy( $taxonomy );
+		$taxonomy_object = get_taxonomy($taxonomy);
 		// Can the user edit this term?
-		if ( ! isset( $taxonomy_object->cap ) || ! current_user_can( $taxonomy_object->cap->edit_terms ) ) {
+		if ( ! isset($taxonomy_object->cap) || ! current_user_can($taxonomy_object->cap->edit_terms)) {
 			return false;
 		}
 
@@ -959,10 +959,10 @@ 
 		if (
 			$pagenow
 			&& $this->cmb->has_columns
-			&& $this->cmb->prop( 'cmb_styles' )
-			&& in_array( $pagenow, array( 'edit.php', 'users.php', 'edit-comments.php', 'edit-tags.php' ), 1 )
+			&& $this->cmb->prop('cmb_styles')
+			&& in_array($pagenow, array('edit.php', 'users.php', 'edit-comments.php', 'edit-tags.php'), 1)
 			) {
-			self::enqueue_cmb_css( 'cmb2-display-styles' );
+			self::enqueue_cmb_css('cmb2-display-styles');
 		}
 	}
 
@@ -974,14 +974,14 @@ 
 	 * @param string $handle CSS handle.
 	 * @return mixed
 	 */
-	public static function enqueue_cmb_css( $handle = 'cmb2-styles' ) {
+	public static function enqueue_cmb_css($handle = 'cmb2-styles') {
 
 		/**
 		 * Filter to determine if CMB2'S css should be enqueued.
 		 *
 		 * @param bool $enqueue_css Default is true.
 		 */
-		if ( ! apply_filters( 'cmb2_enqueue_css', true ) ) {
+		if ( ! apply_filters('cmb2_enqueue_css', true)) {
 			return false;
 		}
 
@@ -991,7 +991,7 @@ 
 		 * White list the options as this method can be used as a hook callback
 		 * and have a different argument passed.
 		 */
-		return wp_enqueue_style( 'cmb2-display-styles' === $handle ? $handle : 'cmb2-styles' );
+		return wp_enqueue_style('cmb2-display-styles' === $handle ? $handle : 'cmb2-styles');
 	}
 
 	/**
@@ -1006,7 +1006,7 @@ 
 		 *
 		 * @param bool $enqueue_js Default is true.
 		 */
-		if ( ! apply_filters( 'cmb2_enqueue_js', true ) ) {
+		if ( ! apply_filters('cmb2_enqueue_js', true)) {
 			return false;
 		}
 

vendor/CMB2/includes/CMB2.php

Spacing +341 added lines, -341 removed lines

@@ -193,31 +193,31 @@ 
 	 * @param array   $config    Metabox config array.
 	 * @param integer $object_id Optional object id.
 	 */
-	public function __construct( $config, $object_id = 0 ) {
+	public function __construct($config, $object_id = 0) {
 
-		if ( empty( $config['id'] ) ) {
-			wp_die( esc_html__( 'Metabox configuration is required to have an ID parameter.', 'cmb2' ) );
+		if (empty($config['id'])) {
+			wp_die(esc_html__('Metabox configuration is required to have an ID parameter.', 'cmb2'));
 		}
 
 		$this->cmb_id = $config['id'];
-		$this->meta_box = wp_parse_args( $config, $this->mb_defaults );
+		$this->meta_box = wp_parse_args($config, $this->mb_defaults);
 		$this->meta_box['fields'] = array();
 
 		// Ensures object_types is an array.
-		$this->set_prop( 'object_types', $this->box_types() );
-		$this->object_id( $object_id );
+		$this->set_prop('object_types', $this->box_types());
+		$this->object_id($object_id);
 
-		if ( $this->is_options_page_mb() ) {
+		if ($this->is_options_page_mb()) {
 			$this->init_options_mb();
 		}
 
 		$this->mb_object_type();
 
-		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 );
+		CMB2_Boxes::add($this);
 
 		/**
 		 * Hook during initiation of CMB2 object
@@ -226,13 +226,13 @@ 
 		 *
 		 * @param array $cmb This CMB2 object
 		 */
-		do_action( "cmb2_init_{$this->cmb_id}", $this );
+		do_action("cmb2_init_{$this->cmb_id}", $this);
 
 		// Hook in the hookup... how meta.
-		add_action( "cmb2_init_hookup_{$this->cmb_id}", array( 'CMB2_Hookup', 'maybe_init_and_hookup' ) );
+		add_action("cmb2_init_hookup_{$this->cmb_id}", array('CMB2_Hookup', 'maybe_init_and_hookup'));
 
 		// Hook in the rest api functionality.
-		add_action( "cmb2_init_hookup_{$this->cmb_id}", array( 'CMB2_REST', 'maybe_init_and_hookup' ) );
+		add_action("cmb2_init_hookup_{$this->cmb_id}", array('CMB2_REST', 'maybe_init_and_hookup'));
 	}
 
 	/**
@@ -244,14 +244,14 @@ 
 	 *
 	 * @return CMB2
 	 */
-	public function show_form( $object_id = 0, $object_type = '' ) {
-		$this->render_form_open( $object_id, $object_type );
+	public function show_form($object_id = 0, $object_type = '') {
+		$this->render_form_open($object_id, $object_type);
 
-		foreach ( $this->prop( 'fields' ) as $field_args ) {
-			$this->render_field( $field_args );
+		foreach ($this->prop('fields') as $field_args) {
+			$this->render_field($field_args);
 		}
 
-		return $this->render_form_close( $object_id, $object_type );
+		return $this->render_form_close($object_id, $object_type);
 	}
 
 	/**
@@ -264,9 +264,9 @@ 
 	 *
 	 * @return CMB2
 	 */
-	public function render_form_open( $object_id = 0, $object_type = '' ) {
-		$object_type = $this->object_type( $object_type );
-		$object_id = $this->object_id( $object_id );
+	public function render_form_open($object_id = 0, $object_type = '') {
+		$object_type = $this->object_type($object_type);
+		$object_id = $this->object_id($object_id);
 
 		echo "\n<!-- Begin CMB2 Fields -->\n";
 
@@ -282,7 +282,7 @@ 
 		 *                            Could also be `comment`, `user` or `options-page`.
 		 * @param array  $cmb         This CMB2 object.
 		 */
-		do_action( 'cmb2_before_form', $this->cmb_id, $object_id, $object_type, $this );
+		do_action('cmb2_before_form', $this->cmb_id, $object_id, $object_type, $this);
 
 		/**
 		 * Hook before form table begins
@@ -297,9 +297,9 @@ 
 		 * @param int    $object_id   The ID of the current object
 		 * @param array  $cmb         This CMB2 object
 		 */
-		do_action( "cmb2_before_{$object_type}_form_{$this->cmb_id}", $object_id, $this );
+		do_action("cmb2_before_{$object_type}_form_{$this->cmb_id}", $object_id, $this);
 
-		echo '<div class="', esc_attr( $this->box_classes() ), '"><div id="cmb2-metabox-', sanitize_html_class( $this->cmb_id ), '" class="cmb2-metabox cmb-field-list">';
+		echo '<div class="', esc_attr($this->box_classes()), '"><div id="cmb2-metabox-', sanitize_html_class($this->cmb_id), '" class="cmb2-metabox cmb-field-list">';
 
 		return $this;
 	}
@@ -312,17 +312,17 @@ 
 	 */
 	public function box_classes() {
 
-		$classes = array( 'cmb2-wrap', 'form-table' );
+		$classes = array('cmb2-wrap', 'form-table');
 
 		// Use the callback to fetch classes.
-		if ( $added_classes = $this->get_param_callback_result( 'classes_cb' ) ) {
-			$added_classes = is_array( $added_classes ) ? $added_classes : array( $added_classes );
-			$classes = array_merge( $classes, $added_classes );
+		if ($added_classes = $this->get_param_callback_result('classes_cb')) {
+			$added_classes = is_array($added_classes) ? $added_classes : array($added_classes);
+			$classes = array_merge($classes, $added_classes);
 		}
 
-		if ( $added_classes = $this->prop( 'classes' ) ) {
-			$added_classes = is_array( $added_classes ) ? $added_classes : array( $added_classes );
-			$classes = array_merge( $classes, $added_classes );
+		if ($added_classes = $this->prop('classes')) {
+			$added_classes = is_array($added_classes) ? $added_classes : array($added_classes);
+			$classes = array_merge($classes, $added_classes);
 		}
 
 		/**
@@ -330,11 +330,11 @@ 
 		 *
 		 * @since 2.2.4
 		 */
-		if ( $this->is_alternate_context_box() ) {
+		if ($this->is_alternate_context_box()) {
 			$context = array();
 
 			// Include custom class if requesting no title.
-			if ( ! $this->prop( 'title' ) && ! $this->prop( 'remove_box_wrap' ) ) {
+			if ( ! $this->prop('title') && ! $this->prop('remove_box_wrap')) {
 				$context[] = 'cmb2-context-wrap-no-title';
 			}
 
@@ -342,13 +342,13 @@ 
 			$context[] = 'cmb2-context-wrap';
 
 			// Include a context-type based context wrapper.
-			$context[] = 'cmb2-context-wrap-' . $this->prop( 'context' );
+			$context[] = 'cmb2-context-wrap-' . $this->prop('context');
 
 			// Include an ID based context wrapper as well.
-			$context[] = 'cmb2-context-wrap-' . $this->prop( 'id' );
+			$context[] = 'cmb2-context-wrap-' . $this->prop('id');
 
 			// And merge all the classes back into the array.
-			$classes = array_merge( $classes, $context );
+			$classes = array_merge($classes, $context);
 		}
 
 		/**
@@ -359,22 +359,22 @@ 
 		 * @param string $classes Array of classes for the cmb2-wrap.
 		 * @param CMB2   $cmb     This CMB2 object.
 		 */
-		$classes = apply_filters( 'cmb2_wrap_classes', $classes, $this );
+		$classes = apply_filters('cmb2_wrap_classes', $classes, $this);
 
 		$split = array();
-		foreach ( array_filter( $classes ) as $class ) {
-			foreach ( explode( ' ', $class ) as $_class ) {
+		foreach (array_filter($classes) as $class) {
+			foreach (explode(' ', $class) as $_class) {
 				// Clean up & sanitize.
-				$split[] = sanitize_html_class( strip_tags( $_class ) );
+				$split[] = sanitize_html_class(strip_tags($_class));
 			}
 		}
 		$classes = $split;
 
 		// Remove any duplicates.
-		$classes = array_unique( $classes );
+		$classes = array_unique($classes);
 
 		// Make it a string.
-		return implode( ' ', $classes );
+		return implode(' ', $classes);
 	}
 
 	/**
@@ -387,9 +387,9 @@ 
 	 *
 	 * @return CMB2
 	 */
-	public function render_form_close( $object_id = 0, $object_type = '' ) {
-		$object_type = $this->object_type( $object_type );
-		$object_id = $this->object_id( $object_id );
+	public function render_form_close($object_id = 0, $object_type = '') {
+		$object_type = $this->object_type($object_type);
+		$object_id = $this->object_id($object_id);
 
 		echo '</div></div>';
 
@@ -407,7 +407,7 @@ 
 		 * @param int    $object_id   The ID of the current object
 		 * @param array  $cmb         This CMB2 object
 		 */
-		do_action( "cmb2_after_{$object_type}_form_{$this->cmb_id}", $object_id, $this );
+		do_action("cmb2_after_{$object_type}_form_{$this->cmb_id}", $object_id, $this);
 
 		/**
 		 * Hook after form form has been rendered
@@ -419,7 +419,7 @@ 
 		 *                            Could also be `comment`, `user` or `options-page`.
 		 * @param array  $cmb         This CMB2 object.
 		 */
-		do_action( 'cmb2_after_form', $this->cmb_id, $object_id, $object_type, $this );
+		do_action('cmb2_after_form', $this->cmb_id, $object_id, $object_type, $this);
 
 		echo "\n<!-- End CMB2 Fields -->\n";
 
@@ -433,26 +433,26 @@ 
 	 * @param  array $field_args A field configuration array.
 	 * @return mixed CMB2_Field object if successful.
 	 */
-	public function render_field( $field_args ) {
-		$field_args['context'] = $this->prop( 'context' );
+	public function render_field($field_args) {
+		$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 );
+			$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 );
+			$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();
+			$field = $this->get_field($field_args)->render_field();
 		}
 
 		return $field;
@@ -464,21 +464,21 @@ 
 	 * @param array|CMB2_Field $args Array of field arguments for a group field parent or the group parent field.
 	 * @return CMB2_Field|null Group field object.
 	 */
-	public function render_group( $args ) {
+	public function render_group($args) {
 		$field_group = false;
 
-		if ( $args instanceof CMB2_Field ) {
+		if ($args instanceof CMB2_Field) {
 			$field_group = 'group' === $args->type() ? $args : false;
-		} elseif ( isset( $args['id'], $args['fields'] ) && is_array( $args['fields'] ) ) {
-			$field_group = $this->get_field( $args );
+		} elseif (isset($args['id'], $args['fields']) && is_array($args['fields'])) {
+			$field_group = $this->get_field($args);
 		}
 
-		if ( ! $field_group ) {
+		if ( ! $field_group) {
 			return;
 		}
 
 		$field_group->render_context = 'edit';
-		$field_group->peform_param_callback( 'render_row_cb' );
+		$field_group->peform_param_callback('render_row_cb');
 
 		return $field_group;
 	}
@@ -493,51 +493,51 @@ 
 	 *
 	 * @return CMB2_Field|null Group field object.
 	 */
-	public function render_group_callback( $field_args, $field_group ) {
+	public function render_group_callback($field_args, $field_group) {
 
 		// If field is requesting to be conditionally shown.
-		if ( ! $field_group || ! $field_group->should_show() ) {
+		if ( ! $field_group || ! $field_group->should_show()) {
 			return;
 		}
 
 		$field_group->index = 0;
 
-		$field_group->peform_param_callback( 'before_group' );
+		$field_group->peform_param_callback('before_group');
 
-		$desc      = $field_group->args( 'description' );
-		$label     = $field_group->args( 'name' );
+		$desc      = $field_group->args('description');
+		$label     = $field_group->args('name');
 		$group_val = (array) $field_group->value();
 
-		echo '<div class="cmb-row cmb-repeat-group-wrap ', esc_attr( $field_group->row_classes() ), '" data-fieldtype="group"><div class="cmb-td"><div data-groupid="', esc_attr( $field_group->id() ), '" id="', esc_attr( $field_group->id() ), '_repeat" ', $this->group_wrap_attributes( $field_group ), '>';
+		echo '<div class="cmb-row cmb-repeat-group-wrap ', esc_attr($field_group->row_classes()), '" data-fieldtype="group"><div class="cmb-td"><div data-groupid="', esc_attr($field_group->id()), '" id="', esc_attr($field_group->id()), '_repeat" ', $this->group_wrap_attributes($field_group), '>';
 
-		if ( $desc || $label ) {
+		if ($desc || $label) {
 			$class = $desc ? ' cmb-group-description' : '';
 			echo '<div class="cmb-row', $class, '"><div class="cmb-th">';
-			if ( $label ) {
+			if ($label) {
 				echo '<h2 class="cmb-group-name">', $label, '</h2>';
 			}
-			if ( $desc ) {
+			if ($desc) {
 				echo '<p class="cmb2-metabox-description">', $desc, '</p>';
 			}
 			echo '</div></div>';
 		}
 
-		if ( ! empty( $group_val ) ) {
-			foreach ( $group_val as $group_key => $field_id ) {
-				$this->render_group_row( $field_group );
+		if ( ! empty($group_val)) {
+			foreach ($group_val as $group_key => $field_id) {
+				$this->render_group_row($field_group);
 				$field_group->index++;
 			}
 		} else {
-			$this->render_group_row( $field_group );
+			$this->render_group_row($field_group);
 		}
 
-		if ( $field_group->args( 'repeatable' ) ) {
-			echo '<div class="cmb-row"><div class="cmb-td"><p class="cmb-add-row"><button type="button" data-selector="', esc_attr( $field_group->id() ), '_repeat" data-grouptitle="', esc_attr( $field_group->options( 'group_title' ) ), '" class="cmb-add-group-row button-secondary">', $field_group->options( 'add_button' ), '</button></p></div></div>';
+		if ($field_group->args('repeatable')) {
+			echo '<div class="cmb-row"><div class="cmb-td"><p class="cmb-add-row"><button type="button" data-selector="', esc_attr($field_group->id()), '_repeat" data-grouptitle="', esc_attr($field_group->options('group_title')), '" class="cmb-add-group-row button-secondary">', $field_group->options('add_button'), '</button></p></div></div>';
 		}
 
 		echo '</div></div></div>';
 
-		$field_group->peform_param_callback( 'after_group' );
+		$field_group->peform_param_callback('after_group');
 
 		return $field_group;
 	}
@@ -549,10 +549,10 @@ 
 	 * @param  CMB2_Field $field_group The group CMB2_Field object.
 	 * @return string                  The attributes string.
 	 */
-	public function group_wrap_attributes( $field_group ) {
+	public function group_wrap_attributes($field_group) {
 		$classes = 'cmb-nested cmb-field-list cmb-repeatable-group';
-		$classes .= $field_group->options( 'sortable' ) ? ' sortable' : ' non-sortable';
-		$classes .= $field_group->args( 'repeatable' ) ? ' repeatable' : ' non-repeatable';
+		$classes .= $field_group->options('sortable') ? ' sortable' : ' non-sortable';
+		$classes .= $field_group->args('repeatable') ? ' repeatable' : ' non-repeatable';
 
 		$group_wrap_attributes = array(
 			'class' => $classes,
@@ -569,18 +569,18 @@ 
 		 * @param string     $group_wrap_attributes Current attributes array.
 		 * @param CMB2_Field $field_group           The group CMB2_Field object.
 		 */
-		$group_wrap_attributes = apply_filters( 'cmb2_group_wrap_attributes', $group_wrap_attributes, $field_group );
+		$group_wrap_attributes = apply_filters('cmb2_group_wrap_attributes', $group_wrap_attributes, $field_group);
 
 		$atts = array();
-		foreach ( $group_wrap_attributes as $att => $att_value ) {
-			if ( ! CMB2_Utils::is_data_attribute( $att ) ) {
-				$att_value = htmlspecialchars( $att_value );
+		foreach ($group_wrap_attributes as $att => $att_value) {
+			if ( ! CMB2_Utils::is_data_attribute($att)) {
+				$att_value = htmlspecialchars($att_value);
 			}
 
-			$atts[ sanitize_html_class( $att ) ] = sanitize_text_field( $att_value );
+			$atts[sanitize_html_class($att)] = sanitize_text_field($att_value);
 		}
 
-		return CMB2_Utils::concat_attrs( $atts );
+		return CMB2_Utils::concat_attrs($atts);
 	}
 
 	/**
@@ -591,46 +591,46 @@ 
 	 *
 	 * @return CMB2
 	 */
-	public function render_group_row( $field_group ) {
+	public function render_group_row($field_group) {
 
-		$field_group->peform_param_callback( 'before_group_row' );
-		$closed_class     = $field_group->options( 'closed' ) ? ' closed' : '';
-		$confirm_deletion = $field_group->options( 'remove_confirm' );
-		$confirm_deletion = ! empty( $confirm_deletion ) ? $confirm_deletion : '';
+		$field_group->peform_param_callback('before_group_row');
+		$closed_class     = $field_group->options('closed') ? ' closed' : '';
+		$confirm_deletion = $field_group->options('remove_confirm');
+		$confirm_deletion = ! empty($confirm_deletion) ? $confirm_deletion : '';
 
 		echo '
 		<div id="cmb-group-', $field_group->id(), '-', $field_group->index, '" class="postbox cmb-row cmb-repeatable-grouping', $closed_class, '" data-iterator="', $field_group->index, '">';
 
-		if ( $field_group->args( 'repeatable' ) ) {
-			echo '<button type="button" data-selector="', $field_group->id(), '_repeat" data-confirm="', esc_attr( $confirm_deletion ), '" class="dashicons-before dashicons-no-alt cmb-remove-group-row" title="', esc_attr( $field_group->options( 'remove_button' ) ), '"></button>';
+		if ($field_group->args('repeatable')) {
+			echo '<button type="button" data-selector="', $field_group->id(), '_repeat" data-confirm="', esc_attr($confirm_deletion), '" class="dashicons-before dashicons-no-alt cmb-remove-group-row" title="', esc_attr($field_group->options('remove_button')), '"></button>';
 		}
 
 			echo '
-			<div class="cmbhandle" title="' , esc_attr__( 'Click to toggle', 'cmb2' ), '"><br></div>
-			<h3 class="cmb-group-title cmbhandle-title"><span>', $field_group->replace_hash( $field_group->options( 'group_title' ) ), '</span></h3>
+			<div class="cmbhandle" title="' , esc_attr__('Click to toggle', 'cmb2'), '"><br></div>
+			<h3 class="cmb-group-title cmbhandle-title"><span>', $field_group->replace_hash($field_group->options('group_title')), '</span></h3>
 
 			<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'] ) {
+		foreach (array_values($field_group->args('fields')) as $field_args) {
+			if ('hidden' === $field_args['type']) {
 
 				// Save rendering for after the metabox.
-				$this->add_hidden_field( $field_args, $field_group );
+				$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');
 
-				$this->get_field( $field_args, $field_group )->render_field();
+				$this->get_field($field_args, $field_group)->render_field();
 			}
 		}
 
-		if ( $field_group->args( 'repeatable' ) ) {
+		if ($field_group->args('repeatable')) {
 			echo '
 					<div class="cmb-row cmb-remove-field-row">
 						<div class="cmb-remove-row">
-							<button type="button" data-selector="', $field_group->id(), '_repeat" data-confirm="', esc_attr( $confirm_deletion ), '" class="cmb-remove-group-row cmb-remove-group-row-button alignright button-secondary">', $field_group->options( 'remove_button' ), '</button>
+							<button type="button" data-selector="', $field_group->id(), '_repeat" data-confirm="', esc_attr($confirm_deletion), '" class="cmb-remove-group-row cmb-remove-group-row-button alignright button-secondary">', $field_group->options('remove_button'), '</button>
 						</div>
 					</div>
 					';
@@ -640,7 +640,7 @@ 
 		</div>
 		';
 
-		$field_group->peform_param_callback( 'after_group_row' );
+		$field_group->peform_param_callback('after_group_row');
 
 		return $this;
 	}
@@ -654,17 +654,17 @@ 
 	 * @param CMB2_Field|null $field_group CMB2_Field group field object.
 	 * @return CMB2_Field
 	 */
-	public function add_hidden_field( $field_args, $field_group = null ) {
-		if ( isset( $field_args['field_args'] ) ) {
+	public function add_hidden_field($field_args, $field_group = null) {
+		if (isset($field_args['field_args'])) {
 			// For back-compatibility.
-			$field = new CMB2_Field( $field_args );
+			$field = new CMB2_Field($field_args);
 		} else {
-			$field = $this->get_new_field( $field_args, $field_group );
+			$field = $this->get_new_field($field_args, $field_group);
 		}
 
-		$types = new CMB2_Types( $field );
+		$types = new CMB2_Types($field);
 
-		if ( $field_group ) {
+		if ($field_group) {
 			$types->iterator = $field_group->index;
 		}
 
@@ -681,8 +681,8 @@ 
 	 * @return CMB2
 	 */
 	public function render_hidden_fields() {
-		if ( ! empty( $this->hidden_fields ) ) {
-			foreach ( $this->hidden_fields as $hidden ) {
+		if ( ! empty($this->hidden_fields)) {
+			foreach ($this->hidden_fields as $hidden) {
 				$hidden->render();
 			}
 		}
@@ -697,33 +697,33 @@ 
 	 * @param  array $data_to_sanitize Array of field_id => value data for sanitizing (likely $_POST data).
 	 * @return mixed
 	 */
-	public function get_sanitized_values( array $data_to_sanitize ) {
+	public function get_sanitized_values(array $data_to_sanitize) {
 		$this->data_to_save = $data_to_sanitize;
 		$stored_id          = $this->object_id();
 
 		// We do this So CMB will sanitize our data for us, but not save it.
-		$this->object_id( '_' );
+		$this->object_id('_');
 
 		// Ensure temp. data store is empty.
-		cmb2_options( 0 )->set();
+		cmb2_options(0)->set();
 
 		// We want to get any taxonomy values back.
-		add_filter( "cmb2_return_taxonomy_values_{$this->cmb_id}", '__return_true' );
+		add_filter("cmb2_return_taxonomy_values_{$this->cmb_id}", '__return_true');
 
 		// Process/save fields.
 		$this->process_fields();
 
 		// Put things back the way they were.
-		remove_filter( "cmb2_return_taxonomy_values_{$this->cmb_id}", '__return_true' );
+		remove_filter("cmb2_return_taxonomy_values_{$this->cmb_id}", '__return_true');
 
 		// Get data from temp. data store.
-		$sanitized_values = cmb2_options( 0 )->get_options();
+		$sanitized_values = cmb2_options(0)->get_options();
 
 		// Empty out temp. data store again.
-		cmb2_options( 0 )->set();
+		cmb2_options(0)->set();
 
 		// Reset the object id.
-		$this->object_id( $stored_id );
+		$this->object_id($stored_id);
 
 		return $sanitized_values;
 	}
@@ -738,18 +738,18 @@ 
 	 *
 	 * @return CMB2
 	 */
-	public function save_fields( $object_id = 0, $object_type = '', $data_to_save = array() ) {
+	public function save_fields($object_id = 0, $object_type = '', $data_to_save = array()) {
 
 		// Fall-back to $_POST data.
-		$this->data_to_save = ! empty( $data_to_save ) ? $data_to_save : $_POST;
-		$object_id = $this->object_id( $object_id );
-		$object_type = $this->object_type( $object_type );
+		$this->data_to_save = ! empty($data_to_save) ? $data_to_save : $_POST;
+		$object_id = $this->object_id($object_id);
+		$object_type = $this->object_type($object_type);
 
 		$this->process_fields();
 
 		// If options page, save the updated options.
-		if ( 'options-page' === $object_type ) {
-			cmb2_options( $object_id )->set();
+		if ('options-page' === $object_type) {
+			cmb2_options($object_id)->set();
 		}
 
 		return $this->after_save();
@@ -767,13 +767,13 @@ 
 		$this->pre_process();
 
 		// Remove the show_on properties so saving works.
-		$this->prop( 'show_on', array() );
+		$this->prop('show_on', array());
 
 		// save field ids of those that are updated.
 		$this->updated = array();
 
-		foreach ( $this->prop( 'fields' ) as $field_args ) {
-			$this->process_field( $field_args );
+		foreach ($this->prop('fields') as $field_args) {
+			$this->process_field($field_args);
 		}
 
 		return $this;
@@ -787,12 +787,12 @@ 
 	 *
 	 * @return CMB2
 	 */
-	public function process_field( $field_args ) {
+	public function process_field($field_args) {
 
-		switch ( $field_args['type'] ) {
+		switch ($field_args['type']) {
 
 			case 'group':
-				if ( $this->save_group( $field_args ) ) {
+				if ($this->save_group($field_args)) {
 					$this->updated[] = $field_args['id'];
 				}
 
@@ -803,9 +803,9 @@ 
 				break;
 
 			default:
-				$field = $this->get_new_field( $field_args );
+				$field = $this->get_new_field($field_args);
 
-				if ( $field->save_field_from_data( $this->data_to_save ) ) {
+				if ($field->save_field_from_data($this->data_to_save)) {
 					$this->updated[] = $field->id();
 				}
 
@@ -838,7 +838,7 @@ 
 		 * @param array $cmb       This CMB2 object
 		 * @param int   $object_id The ID of the current object
 		 */
-		do_action( "cmb2_{$object_type}_process_fields_{$this->cmb_id}", $this, $this->object_id() );
+		do_action("cmb2_{$object_type}_process_fields_{$this->cmb_id}", $this, $this->object_id());
 
 		return $this;
 	}
@@ -868,7 +868,7 @@ 
 		 *                            Will only include field ids that had values change.
 		 * @param array  $cmb         This CMB2 object
 		 */
-		do_action( "cmb2_save_{$object_type}_fields", $object_id, $this->cmb_id, $this->updated, $this );
+		do_action("cmb2_save_{$object_type}_fields", $object_id, $this->cmb_id, $this->updated, $this);
 
 		/**
 		 * Fires after all fields have been saved.
@@ -884,7 +884,7 @@ 
 		 *                            Will only include field ids that had values change.
 		 * @param array  $cmb         This CMB2 object
 		 */
-		do_action( "cmb2_save_{$object_type}_fields_{$this->cmb_id}", $object_id, $this->updated, $this );
+		do_action("cmb2_save_{$object_type}_fields_{$this->cmb_id}", $object_id, $this->updated, $this);
 
 		return $this;
 	}
@@ -896,12 +896,12 @@ 
 	 * @param  array $args Field arguments array.
 	 * @return mixed        Return of CMB2_Field::update_data().
 	 */
-	public function save_group( $args ) {
-		if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) {
+	public function save_group($args) {
+		if ( ! isset($args['id'], $args['fields']) || ! is_array($args['fields'])) {
 			return;
 		}
 
-		return $this->save_group_field( $this->get_new_field( $args ) );
+		return $this->save_group_field($this->get_new_field($args));
 	}
 
 	/**
@@ -911,85 +911,85 @@ 
 	 * @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 ) {
+	public function save_group_field($field_group) {
 		$base_id = $field_group->id();
 
-		if ( ! isset( $this->data_to_save[ $base_id ] ) ) {
+		if ( ! isset($this->data_to_save[$base_id])) {
 			return;
 		}
 
 		$old        = $field_group->get_data();
 		// Check if group field has sanitization_cb.
-		$group_vals = $field_group->sanitization_cb( $this->data_to_save[ $base_id ] );
+		$group_vals = $field_group->sanitization_cb($this->data_to_save[$base_id]);
 		$saved      = array();
 
 		$field_group->index = 0;
 		$field_group->data_to_save = $this->data_to_save;
 
-		foreach ( array_values( $field_group->fields() ) as $field_args ) {
-			if ( 'title' === $field_args['type'] ) {
+		foreach (array_values($field_group->fields()) as $field_args) {
+			if ('title' === $field_args['type']) {
 				// Don't process title fields.
 				continue;
 			}
 
-			$field  = $this->get_new_field( $field_args, $field_group );
-			$sub_id = $field->id( true );
-			if ( empty( $saved[ $field_group->index ] ) ) {
-				$saved[ $field_group->index ] = array();
+			$field  = $this->get_new_field($field_args, $field_group);
+			$sub_id = $field->id(true);
+			if (empty($saved[$field_group->index])) {
+				$saved[$field_group->index] = array();
 			}
 
-			foreach ( (array) $group_vals as $field_group->index => $post_vals ) {
+			foreach ((array) $group_vals as $field_group->index => $post_vals) {
 
 				// Get value.
-				$new_val = isset( $group_vals[ $field_group->index ][ $sub_id ] )
-					? $group_vals[ $field_group->index ][ $sub_id ]
+				$new_val = isset($group_vals[$field_group->index][$sub_id])
+					? $group_vals[$field_group->index][$sub_id]
 					: false;
 
 				// Sanitize.
-				$new_val = $field->sanitization_cb( $new_val );
+				$new_val = $field->sanitization_cb($new_val);
 
-				if ( is_array( $new_val ) && $field->args( 'has_supporting_data' ) ) {
-					if ( $field->args( 'repeatable' ) ) {
+				if (is_array($new_val) && $field->args('has_supporting_data')) {
+					if ($field->args('repeatable')) {
 						$_new_val = array();
-						foreach ( $new_val as $group_index => $grouped_data ) {
+						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'];
 					}
 				}
 
 				// Get old value.
-				$old_val = is_array( $old ) && isset( $old[ $field_group->index ][ $sub_id ] )
-					? $old[ $field_group->index ][ $sub_id ]
+				$old_val = is_array($old) && isset($old[$field_group->index][$sub_id])
+					? $old[$field_group->index][$sub_id]
 					: false;
 
-				$is_updated = ( ! CMB2_Utils::isempty( $new_val ) && $new_val !== $old_val );
-				$is_removed = ( CMB2_Utils::isempty( $new_val ) && ! CMB2_Utils::isempty( $old_val ) );
+				$is_updated = ( ! CMB2_Utils::isempty($new_val) && $new_val !== $old_val);
+				$is_removed = (CMB2_Utils::isempty($new_val) && ! CMB2_Utils::isempty($old_val));
 
 				// Compare values and add to `$updated` array.
-				if ( $is_updated || $is_removed ) {
+				if ($is_updated || $is_removed) {
 					$this->updated[] = $base_id . '::' . $field_group->index . '::' . $sub_id;
 				}
 
 				// Add to `$saved` array.
-				$saved[ $field_group->index ][ $sub_id ] = $new_val;
+				$saved[$field_group->index][$sub_id] = $new_val;
 
 			}// End foreach.
 
-			$saved[ $field_group->index ] = CMB2_Utils::filter_empty( $saved[ $field_group->index ] );
+			$saved[$field_group->index] = CMB2_Utils::filter_empty($saved[$field_group->index]);
 		}// End foreach.
 
-		$saved = CMB2_Utils::filter_empty( $saved );
+		$saved = CMB2_Utils::filter_empty($saved);
 
-		return $field_group->update_data( $saved, true );
+		return $field_group->update_data($saved, true);
 	}
 
 	/**
@@ -999,44 +999,44 @@ 
 	 * @param  integer|string $object_id Object ID.
 	 * @return integer|string $object_id Object ID.
 	 */
-	public function object_id( $object_id = 0 ) {
+	public function object_id($object_id = 0) {
 		global $pagenow;
 
-		if ( $object_id ) {
+		if ($object_id) {
 			$this->object_id = $object_id;
 			return $this->object_id;
 		}
 
-		if ( $this->object_id ) {
+		if ($this->object_id) {
 			return $this->object_id;
 		}
 
 		// Try to get our object ID from the global space.
-		switch ( $this->object_type() ) {
+		switch ($this->object_type()) {
 			case 'user':
-				$object_id = isset( $_REQUEST['user_id'] ) ? sanitize_text_field( wp_unslash( $_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']) ? sanitize_text_field(wp_unslash($_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'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['c'] ) ) : $object_id;
-				$object_id = ! $object_id && isset( $GLOBALS['comments']->comment_ID ) ? $GLOBALS['comments']->comment_ID : $object_id;
+				$object_id = isset($_REQUEST['c']) ? sanitize_text_field(wp_unslash($_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'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['tag_ID'] ) ) : $object_id;
+				$object_id = isset($_REQUEST['tag_ID']) ? sanitize_text_field(wp_unslash($_REQUEST['tag_ID'])) : $object_id;
 				break;
 
 			case 'options-page':
 				$key = $this->doing_options_page();
-				if ( ! empty( $key ) ) {
+				if ( ! empty($key)) {
 					$object_id = $key;
 				}
 				break;
 
 			default:
-				$object_id = isset( $GLOBALS['post']->ID ) ? $GLOBALS['post']->ID : $object_id;
-				$object_id = isset( $_REQUEST['post'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['post'] ) ) : $object_id;
+				$object_id = isset($GLOBALS['post']->ID) ? $GLOBALS['post']->ID : $object_id;
+				$object_id = isset($_REQUEST['post']) ? sanitize_text_field(wp_unslash($_REQUEST['post'])) : $object_id;
 				break;
 		}
 
@@ -1053,11 +1053,11 @@ 
 	 * @return string Object type.
 	 */
 	public function mb_object_type() {
-		if ( null !== $this->mb_object_type ) {
+		if (null !== $this->mb_object_type) {
 			return $this->mb_object_type;
 		}
 
-		if ( $this->is_options_page_mb() ) {
+		if ($this->is_options_page_mb()) {
 			$this->mb_object_type = 'options-page';
 			return $this->mb_object_type;
 		}
@@ -1067,17 +1067,17 @@ 
 		$type = '';
 
 		// if it's an array of one, extract it.
-		if ( 1 === count( $registered_types ) ) {
-			$last = end( $registered_types );
-			if ( is_string( $last ) ) {
+		if (1 === count($registered_types)) {
+			$last = end($registered_types);
+			if (is_string($last)) {
 				$type = $last;
 			}
-		} elseif ( ( $curr_type = $this->current_object_type() ) && in_array( $curr_type, $registered_types, true ) ) {
+		} elseif (($curr_type = $this->current_object_type()) && in_array($curr_type, $registered_types, true)) {
 			$type = $curr_type;
 		}
 
 		// Get our object type.
-		switch ( $type ) {
+		switch ($type) {
 
 			case 'user':
 			case 'comment':
@@ -1101,8 +1101,8 @@ 
 	 *
 	 * @return array Object types.
 	 */
-	public function box_types( $fallback = array() ) {
-		return CMB2_Utils::ensure_array( $this->prop( 'object_types' ), $fallback );
+	public function box_types($fallback = array()) {
+		return CMB2_Utils::ensure_array($this->prop('object_types'), $fallback);
 	}
 
 	/**
@@ -1115,18 +1115,18 @@ 
 	 *
 	 * @return bool Whether given object type(s) are registered to this box.
 	 */
-	public function is_box_type( $object_types = array(), $fallback = array() ) {
+	public function is_box_type($object_types = array(), $fallback = array()) {
 		$object_types = (array) $object_types;
-		$box_types    = $this->box_types( $fallback );
+		$box_types    = $this->box_types($fallback);
 
-		if ( in_array( 'term', $box_types, true ) ) {
-			$taxonomies = CMB2_Utils::ensure_array( $this->prop( 'taxonomies' ) );
-			$box_types = array_merge( $box_types, $taxonomies );
+		if (in_array('term', $box_types, true)) {
+			$taxonomies = CMB2_Utils::ensure_array($this->prop('taxonomies'));
+			$box_types = array_merge($box_types, $taxonomies);
 		}
 
-		$found = array_intersect( $object_types, $box_types );
+		$found = array_intersect($object_types, $box_types);
 
-		return ! empty( $found );
+		return ! empty($found);
 	}
 
 	/**
@@ -1140,9 +1140,9 @@ 
 		$keys  = $this->options_page_keys();
 		$types = $this->box_types();
 
-		if ( empty( $keys ) ) {
+		if (empty($keys)) {
 			$keys = '';
-			$types = $this->deinit_options_mb( $types );
+			$types = $this->deinit_options_mb($types);
 		} else {
 
 			// Make sure 'options-page' is one of the object types.
@@ -1150,10 +1150,10 @@ 
 		}
 
 		// Set/Reset the option_key property.
-		$this->set_prop( 'option_key', $keys );
+		$this->set_prop('option_key', $keys);
 
 		// Reset the object types.
-		$this->set_prop( 'object_types', array_unique( $types ) );
+		$this->set_prop('object_types', array_unique($types));
 	}
 
 	/**
@@ -1164,19 +1164,19 @@ 
 	 * @param array $types Array of types.
 	 * @return array
 	 */
-	protected function deinit_options_mb( $types ) {
-		if ( isset( $this->meta_box['show_on']['key'] ) && 'options-page' === $this->meta_box['show_on']['key'] ) {
-			unset( $this->meta_box['show_on']['key'] );
+	protected function deinit_options_mb($types) {
+		if (isset($this->meta_box['show_on']['key']) && 'options-page' === $this->meta_box['show_on']['key']) {
+			unset($this->meta_box['show_on']['key']);
 		}
 
-		if ( array_key_exists( 'options-page', $this->meta_box['show_on'] ) ) {
-			unset( $this->meta_box['show_on']['options-page'] );
+		if (array_key_exists('options-page', $this->meta_box['show_on'])) {
+			unset($this->meta_box['show_on']['options-page']);
 		}
 
-		$index = array_search( 'options-page', $types );
+		$index = array_search('options-page', $types);
 
-		if ( false !== $index ) {
-			unset( $types[ $index ] );
+		if (false !== $index) {
+			unset($types[$index]);
 		}
 
 		return $types;
@@ -1192,7 +1192,7 @@ 
 		return (
 			// 'show_on' values checked for back-compatibility.
 			$this->is_old_school_options_page_mb()
-			|| in_array( 'options-page', $this->box_types() )
+			|| in_array('options-page', $this->box_types())
 		);
 	}
 
@@ -1205,8 +1205,8 @@ 
 	public function is_old_school_options_page_mb() {
 		return (
 			// 'show_on' values checked for back-compatibility.
-			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'] )
+			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'])
 		);
 	}
 
@@ -1221,15 +1221,15 @@ 
 		$found_key = false;
 		$keys = $this->options_page_keys();
 
-		if ( empty( $keys ) ) {
+		if (empty($keys)) {
 			return $found_key;
 		}
 
-		if ( ! empty( $_GET['page'] ) && in_array( $_GET['page'], $keys ) ) {
+		if ( ! empty($_GET['page']) && in_array($_GET['page'], $keys)) {
 			$found_key = $_GET['page'];
 		}
 
-		if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $keys ) ) {
+		if ( ! empty($_POST['action']) && in_array($_POST['action'], $keys)) {
 			$found_key = $_POST['action'];
 		}
 
@@ -1244,25 +1244,25 @@ 
 	 */
 	public function options_page_keys() {
 		$key = '';
-		if ( ! $this->is_options_page_mb() ) {
+		if ( ! $this->is_options_page_mb()) {
 			return $key;
 		}
 
 		$values = null;
-		if ( ! empty( $this->meta_box['show_on']['value'] ) ) {
+		if ( ! empty($this->meta_box['show_on']['value'])) {
 			$values = $this->meta_box['show_on']['value'];
-		} elseif ( ! empty( $this->meta_box['show_on']['options-page'] ) ) {
+		} elseif ( ! empty($this->meta_box['show_on']['options-page'])) {
 			$values = $this->meta_box['show_on']['options-page'];
-		} elseif ( $this->prop( 'option_key' ) ) {
-			$values = $this->prop( 'option_key' );
+		} elseif ($this->prop('option_key')) {
+			$values = $this->prop('option_key');
 		}
 
-		if ( $values ) {
+		if ($values) {
 			$key = $values;
 		}
 
-		if ( ! is_array( $key ) ) {
-			$key = array( $key );
+		if ( ! is_array($key)) {
+			$key = array($key);
 		}
 
 		return $key;
@@ -1275,13 +1275,13 @@ 
 	 * @param string $object_type Type of object being saved. (e.g., post, user, or comment). Optional.
 	 * @return string Object type.
 	 */
-	public function object_type( $object_type = '' ) {
-		if ( $object_type ) {
+	public function object_type($object_type = '') {
+		if ($object_type) {
 			$this->object_type = $object_type;
 			return $this->object_type;
 		}
 
-		if ( $this->object_type ) {
+		if ($this->object_type) {
 			return $this->object_type;
 		}
 
@@ -1300,24 +1300,24 @@ 
 		global $pagenow;
 		$type = 'post';
 
-		if ( in_array( $pagenow, array( 'user-edit.php', 'profile.php', 'user-new.php' ), true ) ) {
+		if (in_array($pagenow, array('user-edit.php', 'profile.php', 'user-new.php'), true)) {
 			$type = 'user';
 		}
 
-		if ( in_array( $pagenow, array( 'edit-comments.php', 'comment.php' ), true ) ) {
+		if (in_array($pagenow, array('edit-comments.php', 'comment.php'), true)) {
 			$type = 'comment';
 		}
 
-		if ( in_array( $pagenow, array( 'edit-tags.php', 'term.php' ), true ) ) {
+		if (in_array($pagenow, array('edit-tags.php', 'term.php'), true)) {
 			$type = 'term';
 		}
 
-		if ( defined( 'DOING_AJAX' ) && isset( $_POST['action'] ) && 'add-tag' === $_POST['action'] ) {
+		if (defined('DOING_AJAX') && isset($_POST['action']) && 'add-tag' === $_POST['action']) {
 			$type = 'term';
 		}
 
 		if (
-			in_array( $pagenow, array( 'admin.php', 'admin-post.php' ), true )
+			in_array($pagenow, array('admin.php', 'admin-post.php'), true)
 			&& $this->doing_options_page()
 		) {
 			$type = 'options-page';
@@ -1334,10 +1334,10 @@ 
 	 * @param  mixed  $value    Value to set if no value found.
 	 * @return mixed            Metabox config property value or false.
 	 */
-	public function set_prop( $property, $value ) {
-		$this->meta_box[ $property ] = $value;
+	public function set_prop($property, $value) {
+		$this->meta_box[$property] = $value;
 
-		return $this->prop( $property );
+		return $this->prop($property);
 	}
 
 	/**
@@ -1348,11 +1348,11 @@ 
 	 * @param  mixed  $fallback Fallback value to set if no value found.
 	 * @return mixed            Metabox config property value or false.
 	 */
-	public function prop( $property, $fallback = null ) {
-		if ( array_key_exists( $property, $this->meta_box ) ) {
-			return $this->meta_box[ $property ];
-		} elseif ( $fallback ) {
-			return $this->meta_box[ $property ] = $fallback;
+	public function prop($property, $fallback = null) {
+		if (array_key_exists($property, $this->meta_box)) {
+			return $this->meta_box[$property];
+		} elseif ($fallback) {
+			return $this->meta_box[$property] = $fallback;
 		}
 	}
 
@@ -1367,31 +1367,31 @@ 
 	 *
 	 * @return CMB2_Field|false                     CMB2_Field object (or false).
 	 */
-	public function get_field( $field, $field_group = null, $reset_cached = false ) {
-		if ( $field instanceof CMB2_Field ) {
+	public function get_field($field, $field_group = null, $reset_cached = false) {
+		if ($field instanceof CMB2_Field) {
 			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 );
+		$parent_field_id = ! empty($field_group) ? $field_group->id() : '';
+		$ids = $this->get_field_ids($field_id, $parent_field_id);
 
-		if ( ! $ids ) {
+		if ( ! $ids) {
 			return false;
 		}
 
-		list( $field_id, $sub_field_id ) = $ids;
+		list($field_id, $sub_field_id) = $ids;
 
-		$index = implode( '', $ids ) . ( $field_group ? $field_group->index : '' );
+		$index = implode('', $ids) . ($field_group ? $field_group->index : '');
 
-		if ( array_key_exists( $index, $this->fields ) && ! $reset_cached ) {
-			return $this->fields[ $index ];
+		if (array_key_exists($index, $this->fields) && ! $reset_cached) {
+			return $this->fields[$index];
 		}
 
-		$this->fields[ $index ] = new CMB2_Field( $this->get_field_args( $field_id, $field, $sub_field_id, $field_group ) );
+		$this->fields[$index] = new CMB2_Field($this->get_field_args($field_id, $field, $sub_field_id, $field_group));
 
-		return $this->fields[ $index ];
+		return $this->fields[$index];
 	}
 
 	/**
@@ -1404,22 +1404,22 @@ 
 	 * @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 ) {
+	public function get_field_args($field_id, $field_args, $sub_field_id, $field_group) {
 
 		// Check if group is passed and if fields were added in the old-school fields array.
-		if ( $field_group && ( $sub_field_id || 0 === $sub_field_id ) ) {
+		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 );
+			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 ] );
+		if (is_array($field_args)) {
+			$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]);
 	}
 
 	/**
@@ -1430,8 +1430,8 @@ 
 	 * @param  CMB2_Field $field_group (optional) CMB2_Field object (group parent).
 	 * @return array                   Array of field arguments.
 	 */
-	protected function get_default_args( $field_args, $field_group = null ) {
-		if ( $field_group ) {
+	protected function get_default_args($field_args, $field_group = null) {
+		if ($field_group) {
 			$args = array(
 				'field_args'  => $field_args,
 				'group_field' => $field_group,
@@ -1457,21 +1457,21 @@ 
 	 *
 	 * @return CMB2
 	 */
-	protected function add_fields( $fields, $parent_field_id = null ) {
-		foreach ( $fields as $field ) {
+	protected function add_fields($fields, $parent_field_id = null) {
+		foreach ($fields as $field) {
 
 			$sub_fields = false;
-			if ( array_key_exists( 'fields', $field ) ) {
+			if (array_key_exists('fields', $field)) {
 				$sub_fields = $field['fields'];
-				unset( $field['fields'] );
+				unset($field['fields']);
 			}
 
 			$field_id = $parent_field_id
-				? $this->add_group_field( $parent_field_id, $field )
-				: $this->add_field( $field );
+				? $this->add_group_field($parent_field_id, $field)
+				: $this->add_field($field);
 
-			if ( $sub_fields ) {
-				$this->add_fields( $sub_fields, $field_id );
+			if ($sub_fields) {
+				$this->add_fields($sub_fields, $field_id);
 			}
 		}
 
@@ -1486,8 +1486,8 @@ 
 	 * @param  int   $position (optional) Position of metabox. 1 for first, etc.
 	 * @return string|false    Field id or false.
 	 */
-	public function add_field( array $field, $position = 0 ) {
-		if ( ! array_key_exists( 'id', $field ) ) {
+	public function add_field(array $field, $position = 0) {
+		if ( ! array_key_exists('id', $field)) {
 			return false;
 		}
 
@@ -1509,28 +1509,28 @@ 
 	 * @param  int    $position        (optional) Position of metabox. 1 for first, etc.
 	 * @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'] ) ) {
+	public function add_group_field($parent_field_id, array $field, $position = 0) {
+		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']);
 	}
 
 	/**
@@ -1540,13 +1540,13 @@ 
 	 * @param  array $field Metabox field config array.
 	 * @return void
 	 */
-	protected function field_actions( $field ) {
-		switch ( $field['type'] ) {
+	protected function field_actions($field) {
+		switch ($field['type']) {
 			case 'file':
 			case 'file_list':
 
 				// Initiate attachment JS hooks.
-				add_filter( 'wp_prepare_attachment_for_js', array( 'CMB2_Type_File_Base', 'prepare_image_sizes_for_js' ), 10, 3 );
+				add_filter('wp_prepare_attachment_for_js', array('CMB2_Type_File_Base', 'prepare_image_sizes_for_js'), 10, 3);
 				break;
 
 			case 'oembed':
@@ -1555,8 +1555,8 @@ 
 				break;
 
 			case 'group':
-				if ( empty( $field['render_row_cb'] ) ) {
-					$field['render_row_cb'] = array( $this, 'render_group_callback' );
+				if (empty($field['render_row_cb'])) {
+					$field['render_row_cb'] = array($this, 'render_group_callback');
 				}
 				break;
 			case 'colorpicker':
@@ -1564,16 +1564,16 @@ 
 				// https://github.com/JayWood/CMB2_RGBa_Picker
 				// Dequeue the rgba_colorpicker custom field script if it is used,
 				// since we now enqueue our own more current version.
-				add_action( 'admin_enqueue_scripts', array( 'CMB2_Type_Colorpicker', 'dequeue_rgba_colorpicker_script' ), 99 );
+				add_action('admin_enqueue_scripts', array('CMB2_Type_Colorpicker', 'dequeue_rgba_colorpicker_script'), 99);
 				break;
 		}
 
-		if ( isset( $field['column'] ) && false !== $field['column'] ) {
-			$field = $this->define_field_column( $field );
+		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'];
 		}
 
 		return $field;
@@ -1586,15 +1586,15 @@ 
 	 * @param  array $field Metabox field config array.
 	 * @return array         Modified metabox field config array.
 	 */
-	protected function define_field_column( array $field ) {
+	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,
-		) );
+		));
 
 		return $field;
 	}
@@ -1607,13 +1607,13 @@ 
 	 * @param array   $fields   Array (passed by reference) to append the field (array) to.
 	 * @param integer $position Optionally specify a position in the array to be inserted.
 	 */
-	protected function _add_field_to_array( $field, &$fields, $position = 0 ) {
-		$field = $this->field_actions( $field );
+	protected function _add_field_to_array($field, &$fields, $position = 0) {
+		$field = $this->field_actions($field);
 
-		if ( $position ) {
-			CMB2_Utils::array_insert( $fields, array( $field['id'] => $field ), $position );
+		if ($position) {
+			CMB2_Utils::array_insert($fields, array($field['id'] => $field), $position);
 		} else {
-			$fields[ $field['id'] ] = $field;
+			$fields[$field['id']] = $field;
 		}
 	}
 
@@ -1625,27 +1625,27 @@ 
 	 * @param  string $parent_field_id (optional) The field id of the group field to remove field from.
 	 * @return bool                    True if field was removed.
 	 */
-	public function remove_field( $field_id, $parent_field_id = '' ) {
-		$ids = $this->get_field_ids( $field_id, $parent_field_id );
+	public function remove_field($field_id, $parent_field_id = '') {
+		$ids = $this->get_field_ids($field_id, $parent_field_id);
 
-		if ( ! $ids ) {
+		if ( ! $ids) {
 			return false;
 		}
 
-		list( $field_id, $sub_field_id ) = $ids;
+		list($field_id, $sub_field_id) = $ids;
 
-		unset( $this->fields[ implode( '', $ids ) ] );
+		unset($this->fields[implode('', $ids)]);
 
-		if ( ! $sub_field_id ) {
-			unset( $this->meta_box['fields'][ $field_id ] );
+		if ( ! $sub_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;
@@ -1661,21 +1661,21 @@ 
 	 * @param  string $parent_field_id (optional) The field id of the group field to remove field from.
 	 * @return mixed                   Field id. Strict compare to false, as success can return a falsey value (like 0).
 	 */
-	public function update_field_property( $field_id, $property, $value, $parent_field_id = '' ) {
-		$ids = $this->get_field_ids( $field_id, $parent_field_id );
+	public function update_field_property($field_id, $property, $value, $parent_field_id = '') {
+		$ids = $this->get_field_ids($field_id, $parent_field_id);
 
-		if ( ! $ids ) {
+		if ( ! $ids) {
 			return false;
 		}
 
-		list( $field_id, $sub_field_id ) = $ids;
+		list($field_id, $sub_field_id) = $ids;
 
-		if ( ! $sub_field_id ) {
-			$this->meta_box['fields'][ $field_id ][ $property ] = $value;
+		if ( ! $sub_field_id) {
+			$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;
 	}
 
@@ -1687,32 +1687,32 @@ 
 	 * @param  string $parent_field_id (optional) Parent field id.
 	 * @return mixed                    Array of field/parent ids, or false.
 	 */
-	public function get_field_ids( $field_id, $parent_field_id = '' ) {
+	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 );
+		if ( ! array_key_exists($field_id, $fields)) {
+			$field_id = $this->search_old_school_array($field_id, $fields);
 		}
 
-		if ( false === $field_id ) {
+		if (false === $field_id) {
 			return false;
 		}
 
-		if ( ! $sub_field_id ) {
-			return array( $field_id, $sub_field_id );
+		if ( ! $sub_field_id) {
+			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 );
+		return false === $sub_field_id ? false : array($field_id, $sub_field_id);
 	}
 
 	/**
@@ -1723,9 +1723,9 @@ 
 	 * @param  array  $fields   Array of fields to search.
 	 * @return mixed            Field index or false.
 	 */
-	public function search_old_school_array( $field_id, $fields ) {
-		$ids = wp_list_pluck( $fields, 'id' );
-		$index = array_search( $field_id, $ids );
+	public function search_old_school_array($field_id, $fields) {
+		$ids = wp_list_pluck($fields, 'id');
+		$index = array_search($field_id, $ids);
 		return false !== $index ? $index : false;
 	}
 
@@ -1737,8 +1737,8 @@ 
 	 * @param  mixed    $additional_params Any additoinal parameters which should be passed to the callback.
 	 * @return mixed                       Return of the callback function.
 	 */
-	public function do_callback( $cb, $additional_params = null ) {
-		return call_user_func( $cb, $this, $additional_params );
+	public function do_callback($cb, $additional_params = null) {
+		return call_user_func($cb, $this, $additional_params);
 	}
 
 	/**
@@ -1748,7 +1748,7 @@ 
 	 * @return void
 	 */
 	public function nonce_field() {
-		wp_nonce_field( $this->nonce(), $this->nonce(), false, true );
+		wp_nonce_field($this->nonce(), $this->nonce(), false, true);
 	}
 
 	/**
@@ -1758,8 +1758,8 @@ 
 	 * @return string unique nonce string.
 	 */
 	public function nonce() {
-		if ( ! $this->generated_nonce ) {
-			$this->generated_nonce = sanitize_html_class( 'nonce_' . basename( __FILE__ ) . $this->cmb_id );
+		if ( ! $this->generated_nonce) {
+			$this->generated_nonce = sanitize_html_class('nonce_' . basename(__FILE__) . $this->cmb_id);
 		}
 
 		return $this->generated_nonce;
@@ -1773,7 +1773,7 @@ 
 	 * @return bool
 	 */
 	public function was_updated() {
-		return ! empty( $this->updated );
+		return ! empty($this->updated);
 	}
 
 	/**
@@ -1784,7 +1784,7 @@ 
 	 * @return bool
 	 */
 	public function is_alternate_context_box() {
-		return $this->prop( 'context' ) && in_array( $this->prop( 'context' ), array( 'form_top', 'before_permalink', 'after_title', 'after_editor' ), true );
+		return $this->prop('context') && in_array($this->prop('context'), array('form_top', 'before_permalink', 'after_title', 'after_editor'), true);
 	}
 
 	/**
@@ -1794,14 +1794,14 @@ 
 	 * @throws Exception Throws an exception if the field is invalid.
 	 * @return mixed
 	 */
-	public function __get( $property ) {
-		switch ( $property ) {
+	public function __get($property) {
+		switch ($property) {
 			case 'updated':
 			case 'has_columns':
 			case 'tax_metaboxes_to_remove':
 				return $this->{$property};
 			default:
-				return parent::__get( $property );
+				return parent::__get($property);
 		}
 	}
 

vendor/CMB2/includes/CMB2_Utils.php

Spacing +152 added lines, -153 removed lines

@@ -35,16 +35,16 @@ 
 	 * @param  string $img_url Attachment url.
 	 * @return int|false            Attachment ID or false
 	 */
-	public static function image_id_from_url( $img_url ) {
+	public static function image_id_from_url($img_url) {
 		$attachment_id = 0;
 		$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;
 		}
 
-		$file = basename( $img_url );
+		$file = basename($img_url);
 
 		$query_args = array(
 			'post_type'   => 'attachment',
@@ -59,15 +59,15 @@ 
 			),
 		);
 
-		$query = new WP_Query( $query_args );
+		$query = new WP_Query($query_args);
 
-		if ( $query->have_posts() ) {
+		if ($query->have_posts()) {
 
-			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();
-				if ( $original_file === $file || in_array( $file, $cropped_image_files ) ) {
+			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();
+				if ($original_file === $file || in_array($file, $cropped_image_files)) {
 					$attachment_id = $post_id;
 					break;
 				}
@@ -88,17 +88,17 @@ 
 	public static function get_available_image_sizes() {
 		global $_wp_additional_image_sizes;
 
-		$default_image_sizes = array( 'thumbnail', 'medium', 'large' );
-		foreach ( $default_image_sizes as $size ) {
-			$image_sizes[ $size ] = array(
-				'height' => intval( get_option( "{$size}_size_h" ) ),
-				'width'  => intval( get_option( "{$size}_size_w" ) ),
-				'crop'   => get_option( "{$size}_crop" ) ? get_option( "{$size}_crop" ) : false,
+		$default_image_sizes = array('thumbnail', 'medium', 'large');
+		foreach ($default_image_sizes as $size) {
+			$image_sizes[$size] = array(
+				'height' => intval(get_option("{$size}_size_h")),
+				'width'  => intval(get_option("{$size}_size_w")),
+				'crop'   => get_option("{$size}_crop") ? get_option("{$size}_crop") : false,
 			);
 		}
 
-		if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) ) {
-			$image_sizes = array_merge( $image_sizes, $_wp_additional_image_sizes );
+		if (isset($_wp_additional_image_sizes) && count($_wp_additional_image_sizes)) {
+			$image_sizes = array_merge($image_sizes, $_wp_additional_image_sizes);
 		}
 
 		return $image_sizes;
@@ -117,55 +117,55 @@ 
 	 * @param  array|string $size Image size. Accepts an array of width and height (in that order).
 	 * @return false|string       Named image size e.g. 'thumbnail'
 	 */
-	public static function get_named_size( $size ) {
+	public static function get_named_size($size) {
 		$data = array();
 
 		// Find the best match when '$size' is an array.
-		if ( is_array( $size ) ) {
+		if (is_array($size)) {
 			$image_sizes = self::get_available_image_sizes();
 			$candidates = array();
 
-			foreach ( $image_sizes as $_size => $data ) {
+			foreach ($image_sizes as $_size => $data) {
 
 				// If there's an exact match to an existing image size, short circuit.
-				if ( $data['width'] == $size[0] && $data['height'] == $size[1] ) {
-					$candidates[ $data['width'] * $data['height'] ] = array( $_size, $data );
+				if ($data['width'] == $size[0] && $data['height'] == $size[1]) {
+					$candidates[$data['width'] * $data['height']] = array($_size, $data);
 					break;
 				}
 
 				// If it's not an exact match, consider larger sizes with the same aspect ratio.
-				if ( $data['width'] >= $size[0] && $data['height'] >= $size[1] ) {
+				if ($data['width'] >= $size[0] && $data['height'] >= $size[1]) {
 
 					/**
 					 * To test for varying crops, we constrain the dimensions of the larger image
 					 * to the dimensions of the smaller image and see if they match.
 					 */
-					if ( $data['width'] > $size[0] ) {
-						$constrained_size = wp_constrain_dimensions( $data['width'], $data['height'], $size[0] );
-						$expected_size = array( $size[0], $size[1] );
+					if ($data['width'] > $size[0]) {
+						$constrained_size = wp_constrain_dimensions($data['width'], $data['height'], $size[0]);
+						$expected_size = array($size[0], $size[1]);
 					} else {
-						$constrained_size = wp_constrain_dimensions( $size[0], $size[1], $data['width'] );
-						$expected_size = array( $data['width'], $data['height'] );
+						$constrained_size = wp_constrain_dimensions($size[0], $size[1], $data['width']);
+						$expected_size = array($data['width'], $data['height']);
 					}
 
 					// If the image dimensions are within 1px of the expected size, we consider it a match.
-					$matched = ( abs( $constrained_size[0] - $expected_size[0] ) <= 1 && abs( $constrained_size[1] - $expected_size[1] ) <= 1 );
+					$matched = (abs($constrained_size[0] - $expected_size[0]) <= 1 && abs($constrained_size[1] - $expected_size[1]) <= 1);
 
-					if ( $matched ) {
-						$candidates[ $data['width'] * $data['height'] ] = array( $_size, $data );
+					if ($matched) {
+						$candidates[$data['width'] * $data['height']] = array($_size, $data);
 					}
 				}
 			}
 
-			if ( ! empty( $candidates ) ) {
+			if ( ! empty($candidates)) {
 				// Sort the array by size if we have more than one candidate.
-				if ( 1 < count( $candidates ) ) {
-					ksort( $candidates );
+				if (1 < count($candidates)) {
+					ksort($candidates);
 				}
 
-				$data = array_shift( $candidates );
+				$data = array_shift($candidates);
 				$data = $data[0];
-			} elseif ( ! empty( $image_sizes['thumbnail'] ) && $image_sizes['thumbnail']['width'] >= $size[0] && $image_sizes['thumbnail']['width'] >= $size[1] ) {
+			} elseif ( ! empty($image_sizes['thumbnail']) && $image_sizes['thumbnail']['width'] >= $size[0] && $image_sizes['thumbnail']['width'] >= $size[1]) {
 				/*
 				 * When the size requested is smaller than the thumbnail dimensions, we
 				 * fall back to the thumbnail size.
@@ -174,12 +174,12 @@ 
 			} else {
 				return false;
 			}
-		} elseif ( ! empty( $image_sizes[ $size ] ) ) {
+		} elseif ( ! empty($image_sizes[$size])) {
 			$data = $size;
 		}// End if.
 
 		// If we still don't have a match at this point, return false.
-		if ( empty( $data ) ) {
+		if (empty($data)) {
 			return false;
 		}
 
@@ -193,20 +193,20 @@ 
 	 * @param  string $tzstring Time string.
 	 * @return string           Offset time string
 	 */
-	public static function timezone_offset( $tzstring ) {
+	public static function timezone_offset($tzstring) {
 		$tz_offset = 0;
 
-		if ( ! empty( $tzstring ) && is_string( $tzstring ) ) {
-			if ( 'UTC' === substr( $tzstring, 0, 3 ) ) {
-				$tzstring = str_replace( array( ':15', ':30', ':45' ), array( '.25', '.5', '.75' ), $tzstring );
-				return intval( floatval( substr( $tzstring, 3 ) ) * HOUR_IN_SECONDS );
+		if ( ! empty($tzstring) && is_string($tzstring)) {
+			if ('UTC' === substr($tzstring, 0, 3)) {
+				$tzstring = str_replace(array(':15', ':30', ':45'), array('.25', '.5', '.75'), $tzstring);
+				return intval(floatval(substr($tzstring, 3)) * HOUR_IN_SECONDS);
 			}
 
 			try {
-				$date_time_zone_selected = new DateTimeZone( $tzstring );
-				$tz_offset = timezone_offset_get( $date_time_zone_selected, date_create() );
-			} catch ( Exception $e ) {
-				self::log_if_debug( __METHOD__, __LINE__, $e->getMessage() );
+				$date_time_zone_selected = new DateTimeZone($tzstring);
+				$tz_offset = timezone_offset_get($date_time_zone_selected, date_create());
+			} catch (Exception $e) {
+				self::log_if_debug(__METHOD__, __LINE__, $e->getMessage());
 			}
 		}
 
@@ -225,18 +225,18 @@ 
 	 * @return string Timezone string
 	 */
 	public static function timezone_string() {
-		$current_offset = get_option( 'gmt_offset' );
-		$tzstring       = get_option( 'timezone_string' );
+		$current_offset = get_option('gmt_offset');
+		$tzstring       = get_option('timezone_string');
 
 		// Remove old Etc mappings. Fallback to gmt_offset.
-		if ( false !== strpos( $tzstring, 'Etc/GMT' ) ) {
+		if (false !== strpos($tzstring, 'Etc/GMT')) {
 			$tzstring = '';
 		}
 
-		if ( empty( $tzstring ) ) { // Create a UTC+- zone if no timezone string exists.
-			if ( 0 == $current_offset ) {
+		if (empty($tzstring)) { // Create a UTC+- zone if no timezone string exists.
+			if (0 == $current_offset) {
 				$tzstring = 'UTC+0';
-			} elseif ( $current_offset < 0 ) {
+			} elseif ($current_offset < 0) {
 				$tzstring = 'UTC' . $current_offset;
 			} else {
 				$tzstring = 'UTC+' . $current_offset;
@@ -253,14 +253,13 @@ 
 	 * @param  string|int $string Possible timestamp string.
 	 * @return int Time stamp.
 	 */
-	public static function make_valid_time_stamp( $string ) {
-		if ( ! $string ) {
+	public static function make_valid_time_stamp($string) {
+		if ( ! $string) {
 			return 0;
 		}
 
-		return self::is_valid_time_stamp( $string )
-			? (int) $string :
-			strtotime( (string) $string );
+		return self::is_valid_time_stamp($string)
+			? (int) $string : strtotime((string) $string);
 	}
 
 	/**
@@ -270,7 +269,7 @@ 
 	 * @param  mixed $timestamp Value to check.
 	 * @return boolean           Whether value is a valid timestamp
 	 */
-	public static function is_valid_time_stamp( $timestamp ) {
+	public static function is_valid_time_stamp($timestamp) {
 		return (string) (int) $timestamp === (string) $timestamp
 			&& $timestamp <= PHP_INT_MAX
 			&& $timestamp >= ~PHP_INT_MAX;
@@ -283,7 +282,7 @@ 
 	 * @param  mixed $value Value to check.
 	 * @return bool         True or false
 	 */
-	public static function isempty( $value ) {
+	public static function isempty($value) {
 		return null === $value || '' === $value || false === $value || array() === $value;
 	}
 
@@ -294,7 +293,7 @@ 
 	 * @param  mixed $value Value to check.
 	 * @return bool         True or false
 	 */
-	public static function notempty( $value ) {
+	public static function notempty($value) {
 		return null !== $value && '' !== $value && false !== $value && array() !== $value;
 	}
 
@@ -305,8 +304,8 @@ 
 	 * @param  mixed $value Value to check.
 	 * @return array True or false.
 	 */
-	public static function filter_empty( $value ) {
-		return array_filter( $value, array( __CLASS__, 'notempty' ) );
+	public static function filter_empty($value) {
+		return array_filter($value, array(__CLASS__, 'notempty'));
 	}
 
 	/**
@@ -317,10 +316,10 @@ 
 	 * @param  array $new      New array to insert.
 	 * @param  int   $position Position in the main array to insert the new array.
 	 */
-	public static function array_insert( &$array, $new, $position ) {
-		$before = array_slice( $array, 0, $position - 1 );
-		$after  = array_diff_key( $array, $before );
-		$array  = array_merge( $before, $new, $after );
+	public static function array_insert(&$array, $new, $position) {
+		$before = array_slice($array, 0, $position - 1);
+		$after  = array_diff_key($array, $before);
+		$array  = array_merge($before, $new, $after);
 	}
 
 	/**
@@ -333,19 +332,19 @@ 
 	 * @param string $path URL path.
 	 * @return string URL to CMB2 resources
 	 */
-	public static function url( $path = '' ) {
-		if ( self::$url ) {
+	public static function url($path = '') {
+		if (self::$url) {
 			return self::$url . $path;
 		}
 
-		$cmb2_url = self::get_url_from_dir( cmb2_dir() );
+		$cmb2_url = self::get_url_from_dir(cmb2_dir());
 
 		/**
 		 * Filter the CMB location url.
 		 *
 		 * @param string $cmb2_url Currently registered url.
 		 */
-		self::$url = trailingslashit( apply_filters( 'cmb2_meta_box_url', $cmb2_url, CMB2_VERSION ) );
+		self::$url = trailingslashit(apply_filters('cmb2_meta_box_url', $cmb2_url, CMB2_VERSION));
 
 		return self::$url . $path;
 	}
@@ -357,28 +356,28 @@ 
 	 * @param  string $dir Directory path to convert.
 	 * @return string      Converted URL.
 	 */
-	public static function get_url_from_dir( $dir ) {
-		$dir = self::normalize_path( $dir );
+	public static function get_url_from_dir($dir) {
+		$dir = self::normalize_path($dir);
 
 		// Let's test if We are in the plugins or mu-plugins dir.
-		$test_dir = trailingslashit( $dir ) . 'unneeded.php';
+		$test_dir = trailingslashit($dir) . 'unneeded.php';
 		if (
-			0 === strpos( $test_dir, self::normalize_path( WPMU_PLUGIN_DIR ) )
-			|| 0 === strpos( $test_dir, self::normalize_path( WP_PLUGIN_DIR ) )
+			0 === strpos($test_dir, self::normalize_path(WPMU_PLUGIN_DIR))
+			|| 0 === strpos($test_dir, self::normalize_path(WP_PLUGIN_DIR))
 		) {
 			// Ok, then use plugins_url, as it is more reliable.
-			return trailingslashit( plugins_url( '', $test_dir ) );
+			return trailingslashit(plugins_url('', $test_dir));
 		}
 
 		// Ok, now let's test if we are in the theme dir.
-		$theme_root = self::normalize_path( get_theme_root() );
-		if ( 0 === strpos( $dir, $theme_root ) ) {
+		$theme_root = self::normalize_path(get_theme_root());
+		if (0 === strpos($dir, $theme_root)) {
 			// Ok, then use get_theme_root_uri.
 			return set_url_scheme(
 				trailingslashit(
 					str_replace(
-						untrailingslashit( $theme_root ),
-						untrailingslashit( get_theme_root_uri() ),
+						untrailingslashit($theme_root),
+						untrailingslashit(get_theme_root_uri()),
 						$dir
 					)
 				)
@@ -387,15 +386,15 @@ 
 
 		// Check to see if it's anywhere in the root directory.
 		$site_dir = self::get_normalized_abspath();
-		$site_url = trailingslashit( is_multisite() ? network_site_url() : site_url() );
+		$site_url = trailingslashit(is_multisite() ? network_site_url() : site_url());
 
 		$url = str_replace(
-			array( $site_dir, WP_PLUGIN_DIR ),
-			array( $site_url, WP_PLUGIN_URL ),
+			array($site_dir, WP_PLUGIN_DIR),
+			array($site_url, WP_PLUGIN_URL),
 			$dir
 		);
 
-		return set_url_scheme( $url );
+		return set_url_scheme($url);
 	}
 
 	/**
@@ -406,7 +405,7 @@ 
 	 * @return string  Normalized absolute path.
 	 */
 	protected static function get_normalized_abspath() {
-		return self::normalize_path( self::$ABSPATH );
+		return self::normalize_path(self::$ABSPATH);
 	}
 
 	/**
@@ -422,16 +421,16 @@ 
 	 * @param string $path Path to normalize.
 	 * @return string Normalized path.
 	 */
-	protected static function normalize_path( $path ) {
-		if ( function_exists( 'wp_normalize_path' ) ) {
-			return wp_normalize_path( $path );
+	protected static function normalize_path($path) {
+		if (function_exists('wp_normalize_path')) {
+			return wp_normalize_path($path);
 		}
 
 		// Replace newer WP's version of wp_normalize_path.
-		$path = str_replace( '\\', '/', $path );
-		$path = preg_replace( '|(?<=.)/+|', '/', $path );
-		if ( ':' === substr( $path, 1, 1 ) ) {
-			$path = ucfirst( $path );
+		$path = str_replace('\\', '/', $path);
+		$path = preg_replace('|(?<=.)/+|', '/', $path);
+		if (':' === substr($path, 1, 1)) {
+			$path = ucfirst($path);
 		}
 
 		return $path;
@@ -445,9 +444,9 @@ 
 	 * @param  string $date_format Expected date format.
 	 * @return mixed               Unix timestamp representing the date.
 	 */
-	public static function get_timestamp_from_value( $value, $date_format ) {
-		$date_object = date_create_from_format( $date_format, $value );
-		return $date_object ? $date_object->setTime( 0, 0, 0 )->getTimeStamp() : strtotime( $value );
+	public static function get_timestamp_from_value($value, $date_format) {
+		$date_object = date_create_from_format($date_format, $value);
+		return $date_object ? $date_object->setTime(0, 0, 0)->getTimeStamp() : strtotime($value);
 	}
 
 	/**
@@ -465,48 +464,48 @@ 
 	 * @param string $format PHP date format.
 	 * @return string reformatted string
 	 */
-	public static function php_to_js_dateformat( $format ) {
+	public static function php_to_js_dateformat($format) {
 
 		// 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.
-			'l, ' => 'DD, ',  // Day name full, idem before.
-			'm'   => 'mm',  // Month of the year, leading 0.
-			'n'   => 'm',   // Month of the year, no leading 0.
+			'l '  => 'DD ', // Day name full, idem before.
+			'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' => 'M',   // Month, Short name.
-			'F '  => 'MM ',  // Month, full 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.
+			'F '  => 'MM ', // Month, full 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.
 			'A'   => 'TT', // AM/PM.
 		);
 
-		foreach ( $supported_options as $php => $js ) {
+		foreach ($supported_options as $php => $js) {
 			// replaces every instance of a supported option, but skips escaped characters.
-			$format = preg_replace( "~(?<!\\\\)$php~", $js, $format );
+			$format = preg_replace("~(?<!\\\\)$php~", $js, $format);
 		}
 
 		$supported_options = array(
-			'l' => 'DD',  // Day name full, idem before.
-			'F' => 'MM',  // Month, full name.
+			'l' => 'DD', // Day name full, idem before.
+			'F' => 'MM', // Month, full name.
 		);
 
-		if ( isset( $supported_options[ $format ] ) ) {
-			$format = $supported_options[ $format ];
+		if (isset($supported_options[$format])) {
+			$format = $supported_options[$format];
 		}
 
-		$format = preg_replace_callback( '~(?:\\\.)+~', array( __CLASS__, 'wrap_escaped_chars' ), $format );
+		$format = preg_replace_callback('~(?:\\\.)+~', array(__CLASS__, 'wrap_escaped_chars'), $format);
 
 		return $format;
 	}
@@ -518,8 +517,8 @@ 
 	 * @param  string $value Value to wrap/escape.
 	 * @return string Modified value
 	 */
-	public static function wrap_escaped_chars( $value ) {
-		return '&#39;' . str_replace( '\\', '', $value[0] ) . '&#39;';
+	public static function wrap_escaped_chars($value) {
+		return '&#39;' . str_replace('\\', '', $value[0]) . '&#39;';
 	}
 
 	/**
@@ -532,9 +531,9 @@ 
 	 * @param  mixed  $msg      Message to output.
 	 * @param  mixed  $debug    Variable to print_r.
 	 */
-	public static function log_if_debug( $function, $line, $msg, $debug = null ) {
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-			error_log( "In $function, $line:" . print_r( $msg, true ) . ( $debug ? print_r( $debug, true ) : '' ) );
+	public static function log_if_debug($function, $line, $msg, $debug = null) {
+		if (defined('WP_DEBUG') && WP_DEBUG) {
+			error_log("In $function, $line:" . print_r($msg, true) . ($debug ? print_r($debug, true) : ''));
 		}
 	}
 
@@ -545,9 +544,9 @@ 
 	 * @param  string $file File url.
 	 * @return string|false       File extension or false
 	 */
-	public static function get_file_ext( $file ) {
-		$parsed = parse_url( $file, PHP_URL_PATH );
-		return $parsed ? strtolower( pathinfo( $parsed, PATHINFO_EXTENSION ) ) : false;
+	public static function get_file_ext($file) {
+		$parsed = parse_url($file, PHP_URL_PATH);
+		return $parsed ? strtolower(pathinfo($parsed, PATHINFO_EXTENSION)) : false;
 	}
 
 	/**
@@ -557,9 +556,9 @@ 
 	 * @param  string $value File url or path.
 	 * @return string        File name
 	 */
-	public static function get_file_name_from_path( $value ) {
-		$parts = explode( '/', $value );
-		return is_array( $parts ) ? end( $parts ) : $value;
+	public static function get_file_name_from_path($value) {
+		$parts = explode('/', $value);
+		return is_array($parts) ? end($parts) : $value;
 	}
 
 	/**
@@ -569,8 +568,8 @@ 
 	 * @param  string $version WP version string to compare.
 	 * @return bool            Result of comparison check.
 	 */
-	public static function wp_at_least( $version ) {
-		return version_compare( get_bloginfo( 'version' ), $version, '>=' );
+	public static function wp_at_least($version) {
+		return version_compare(get_bloginfo('version'), $version, '>=');
 	}
 
 	/**
@@ -581,18 +580,18 @@ 
 	 * @param  array $attr_exclude Attributes that should NOT be concatenated.
 	 * @return string              String of attributes for form element.
 	 */
-	public static function concat_attrs( $attrs, $attr_exclude = array() ) {
+	public static function concat_attrs($attrs, $attr_exclude = array()) {
 		$attr_exclude[] = 'rendered';
 		$attr_exclude[] = 'js_dependencies';
 
 		$attributes = '';
-		foreach ( $attrs as $attr => $val ) {
-			$excluded = in_array( $attr, (array) $attr_exclude, true );
+		foreach ($attrs as $attr => $val) {
+			$excluded = in_array($attr, (array) $attr_exclude, true);
 			$empty    = false === $val && 'value' !== $attr;
-			if ( ! $excluded && ! $empty ) {
+			if ( ! $excluded && ! $empty) {
 				// if data attribute, use single quote wraps, else double.
-				$quotes = self::is_data_attribute( $attr ) ? "'" : '"';
-				$attributes .= sprintf( ' %1$s=%3$s%2$s%3$s', $attr, $val, $quotes );
+				$quotes = self::is_data_attribute($attr) ? "'" : '"';
+				$attributes .= sprintf(' %1$s=%3$s%2$s%3$s', $attr, $val, $quotes);
 			}
 		}
 		return $attributes;
@@ -606,8 +605,8 @@ 
 	 * @param string $att HTML attribute.
 	 * @return boolean
 	 */
-	public static function is_data_attribute( $att ) {
-		return 0 === stripos( $att, 'data-' );
+	public static function is_data_attribute($att) {
+		return 0 === stripos($att, 'data-');
 	}
 
 	/**
@@ -620,17 +619,17 @@ 
 	 *
 	 * @return array          The array.
 	 */
-	public static function ensure_array( $value, $default = array() ) {
-		if ( empty( $value ) ) {
+	public static function ensure_array($value, $default = array()) {
+		if (empty($value)) {
 			return $default;
 		}
 
-		if ( is_array( $value ) || is_object( $value ) ) {
+		if (is_array($value) || is_object($value)) {
 			return (array) $value;
 		}
 
 		// Not sure anything would be non-scalar that is not an array or object?
-		if ( ! is_scalar( $value ) ) {
+		if ( ! is_scalar($value)) {
 			return $default;
 		}
 
@@ -645,9 +644,9 @@ 
 	 * @param mixed $value Value to normalize (if numeric).
 	 * @return mixed         Possibly normalized value.
 	 */
-	public static function normalize_if_numeric( $value ) {
-		if ( is_numeric( $value ) ) {
-			$value = false !== strpos( $value, '.' ) ? floatval( $value ) : intval( $value );
+	public static function normalize_if_numeric($value) {
+		if (is_numeric($value)) {
+			$value = false !== strpos($value, '.') ? floatval($value) : intval($value);
 		}
 
 		return $value;
@@ -662,8 +661,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function generate_hash( $string ) {
-		return substr( base_convert( md5( $string ), 16, 32 ), 0, 12 );
+	public static function generate_hash($string) {
+		return substr(base_convert(md5($string), 16, 32), 0, 12);
 	}
 
 }

vendor/CMB2/includes/CMB2_Types.php

Spacing +145 added lines, -145 removed lines

@@ -36,7 +36,7 @@ 
 	 */
 	public $type = null;
 
-	public function __construct( CMB2_Field $field ) {
+	public function __construct(CMB2_Field $field) {
 		$this->field = $field;
 	}
 
@@ -47,15 +47,15 @@ 
 	 * @param string $fieldtype Non-existent field type name
 	 * @param array  $arguments All arguments passed to the method
 	 */
-	public function __call( $fieldtype, $arguments ) {
+	public function __call($fieldtype, $arguments) {
 
 		// Check for methods to be proxied to the CMB2_Type_Base object.
-		if ( $exists = $this->maybe_proxy_method( $fieldtype, $arguments ) ) {
+		if ($exists = $this->maybe_proxy_method($fieldtype, $arguments)) {
 			return $exists['value'];
 		}
 
 		// Check for custom field type class.
-		if ( $object = $this->maybe_custom_field_object( $fieldtype, $arguments ) ) {
+		if ($object = $this->maybe_custom_field_object($fieldtype, $arguments)) {
 			return $object->render();
 		}
 
@@ -75,7 +75,7 @@ 
 		 *                                   but could also be `comment`, `user` or `options-page`.
 		 * @param object $field_type_object  This `CMB2_Types` object
 		 */
-		do_action( "cmb2_render_{$fieldtype}", $this->field, $this->field->escaped_value(), $this->field->object_id, $this->field->object_type, $this );
+		do_action("cmb2_render_{$fieldtype}", $this->field, $this->field->escaped_value(), $this->field->object_id, $this->field->object_type, $this);
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 	 * @since  1.1.0
 	 */
 	public function render() {
-		if ( $this->field->args( 'repeatable' ) ) {
+		if ($this->field->args('repeatable')) {
 			$this->render_repeatable_field();
 		} else {
 			$this->_render();
@@ -97,9 +97,9 @@ 
 	 * @since  1.1.0
 	 */
 	protected function _render() {
-		$this->field->peform_param_callback( 'before_field' );
+		$this->field->peform_param_callback('before_field');
 		echo $this->{$this->field->type()}();
-		$this->field->peform_param_callback( 'after_field' );
+		$this->field->peform_param_callback('after_field');
 	}
 
 	/**
@@ -113,16 +113,16 @@ 
 	 *
 	 * @return mixed           Results from called method.
 	 */
-	protected function proxy_method( $method, $default, $args = array() ) {
-		if ( ! is_object( $this->type ) ) {
-			$this->guess_type_object( $method );
+	protected function proxy_method($method, $default, $args = array()) {
+		if ( ! is_object($this->type)) {
+			$this->guess_type_object($method);
 		}
 
-		if ( is_object( $this->type ) && method_exists( $this->type, $method ) ) {
+		if (is_object($this->type) && method_exists($this->type, $method)) {
 
-			return empty( $args )
+			return empty($args)
 				? $this->type->$method()
-				: call_user_func_array( array( $this->type, $method ), $args );
+				: call_user_func_array(array($this->type, $method), $args);
 		}
 
 		return $default;
@@ -138,35 +138,35 @@ 
 	 * @param string $method  Method attempting to be called on the CMB2_Type_Base object.
 	 * @return bool
 	 */
-	protected function guess_type_object( $method ) {
+	protected function guess_type_object($method) {
 		$fieldtype = $this->field->type();
 
 		// Try to "guess" the Type object based on the method requested.
-		switch ( $method ) {
+		switch ($method) {
 			case 'select_option':
 			case 'list_input':
 			case 'list_input_checkbox':
 			case 'concat_items':
-				$this->get_new_render_type( $fieldtype, 'CMB2_Type_Select' );
+				$this->get_new_render_type($fieldtype, 'CMB2_Type_Select');
 				break;
 			case 'is_valid_img_ext':
 			case 'img_status_output':
 			case 'file_status_output':
-				$this->get_new_render_type( $fieldtype, 'CMB2_Type_File_Base' );
+				$this->get_new_render_type($fieldtype, 'CMB2_Type_File_Base');
 				break;
 			case 'parse_picker_options':
-				$this->get_new_render_type( $fieldtype, 'CMB2_Type_Text_Date' );
+				$this->get_new_render_type($fieldtype, 'CMB2_Type_Text_Date');
 				break;
 			case 'get_object_terms':
 			case 'get_terms':
-				$this->get_new_render_type( $fieldtype, 'CMB2_Type_Taxonomy_Multicheck' );
+				$this->get_new_render_type($fieldtype, 'CMB2_Type_Taxonomy_Multicheck');
 				break;
 			case 'date_args':
 			case 'time_args':
-				$this->get_new_render_type( $fieldtype, 'CMB2_Type_Text_Datetime_Timestamp' );
+				$this->get_new_render_type($fieldtype, 'CMB2_Type_Text_Datetime_Timestamp');
 				break;
 			case 'parse_args':
-				$this->get_new_render_type( $fieldtype, 'CMB2_Type_Text' );
+				$this->get_new_render_type($fieldtype, 'CMB2_Type_Text');
 				break;
 		}
 
@@ -181,7 +181,7 @@ 
 	 * @param  array  $arguments All arguments passed to the method.
 	 * @return bool|array        False if not proxied, else array with 'value' key being the return of the method.
 	 */
-	public function maybe_proxy_method( $method, $arguments ) {
+	public function maybe_proxy_method($method, $arguments) {
 		$exists = false;
 
 		$proxied = array(
@@ -196,10 +196,10 @@ 
 			'file_status_output'   => '',
 			'parse_picker_options' => array(),
 		);
-		if ( isset( $proxied[ $method ] ) ) {
+		if (isset($proxied[$method])) {
 			$exists = array(
 				// Ok, proxy the method call to the CMB2_Type_Base object.
-				'value' => $this->proxy_method( $method, $proxied[ $method ], $arguments ),
+				'value' => $this->proxy_method($method, $proxied[$method], $arguments),
 			);
 		}
 
@@ -218,12 +218,12 @@ 
 	 *                             `cmb2_render_{$field_type}` action.
 	 * @throws Exception if custom field type class does not extend CMB2_Type_Base.
 	 */
-	public function maybe_custom_field_object( $fieldtype, $args = array() ) {
-		if ( $render_class_name = $this->get_render_type_class( $fieldtype ) ) {
-			$this->type = new $render_class_name( $this, $args );
+	public function maybe_custom_field_object($fieldtype, $args = array()) {
+		if ($render_class_name = $this->get_render_type_class($fieldtype)) {
+			$this->type = new $render_class_name($this, $args);
 
-			if ( ! ( $this->type instanceof CMB2_Type_Base ) ) {
-				throw new Exception( __( 'Custom CMB2 field type classes must extend CMB2_Type_Base.', 'cmb2' ) );
+			if ( ! ($this->type instanceof CMB2_Type_Base)) {
+				throw new Exception(__('Custom CMB2 field type classes must extend CMB2_Type_Base.', 'cmb2'));
 			}
 
 			return $this->type;
@@ -242,9 +242,9 @@ 
 	 * @param  mixed  $additional        Optional additional argument to pass to type class.
 	 * @return CMB2_Type_Base            Type object.
 	 */
-	public function get_new_render_type( $fieldtype, $render_class_name = null, $args = array(), $additional = '' ) {
-		$render_class_name = $this->get_render_type_class( $fieldtype, $render_class_name );
-		$this->type = new $render_class_name( $this, $args, $additional );
+	public function get_new_render_type($fieldtype, $render_class_name = null, $args = array(), $additional = '') {
+		$render_class_name = $this->get_render_type_class($fieldtype, $render_class_name);
+		$this->type = new $render_class_name($this, $args, $additional);
 
 		return $this->type;
 	}
@@ -257,10 +257,10 @@ 
 	 * @param  string $render_class_name The default field type class to use. Defaults to null.
 	 * @return string                    The field type class to use.
 	 */
-	public function get_render_type_class( $fieldtype, $render_class_name = null ) {
-		$render_class_name = $this->field->args( 'render_class' ) ? $this->field->args( 'render_class' ) : $render_class_name;
+	public function get_render_type_class($fieldtype, $render_class_name = null) {
+		$render_class_name = $this->field->args('render_class') ? $this->field->args('render_class') : $render_class_name;
 
-		if ( has_action( "cmb2_render_class_{$fieldtype}" ) ) {
+		if (has_action("cmb2_render_class_{$fieldtype}")) {
 
 			/**
 			 * Filters the custom field type class used for rendering the field. Class is required to extend CMB2_Type_Base.
@@ -272,10 +272,10 @@ 
 			 * @param string $render_class_name The custom field type class to use. Default null.
 			 * @param object $field_type_object This `CMB2_Types` object.
 			 */
-			$render_class_name = apply_filters( "cmb2_render_class_{$fieldtype}", $render_class_name, $this );
+			$render_class_name = apply_filters("cmb2_render_class_{$fieldtype}", $render_class_name, $this);
 		}
 
-		return $render_class_name && class_exists( $render_class_name ) ? $render_class_name : false;
+		return $render_class_name && class_exists($render_class_name) ? $render_class_name : false;
 	}
 
 	/**
@@ -286,8 +286,8 @@ 
 	 * @param  string $fallback Fallback text.
 	 * @return string
 	 */
-	public function _text( $text_key, $fallback = '' ) {
-		return $this->field->get_string( $text_key, $fallback );
+	public function _text($text_key, $fallback = '') {
+		return $this->field->get_string($text_key, $fallback);
 	}
 
 	/**
@@ -297,8 +297,8 @@ 
 	 * @param  string $file File url
 	 * @return string|false File extension or false
 	 */
-	public function get_file_ext( $file ) {
-		return CMB2_Utils::get_file_ext( $file );
+	public function get_file_ext($file) {
+		return CMB2_Utils::get_file_ext($file);
 	}
 
 	/**
@@ -308,8 +308,8 @@ 
 	 * @param  string $value File url or path
 	 * @return string        File name
 	 */
-	public function get_file_name_from_path( $value ) {
-		return CMB2_Utils::get_file_name_from_path( $value );
+	public function get_file_name_from_path($value) {
+		return CMB2_Utils::get_file_name_from_path($value);
 	}
 
 	/**
@@ -320,8 +320,8 @@ 
 	 * @param  array $attr_exclude Attributes that should NOT be concatenated
 	 * @return string               String of attributes for form element
 	 */
-	public function concat_attrs( $attrs, $attr_exclude = array() ) {
-		return CMB2_Utils::concat_attrs( $attrs, $attr_exclude );
+	public function concat_attrs($attrs, $attr_exclude = array()) {
+		return CMB2_Utils::concat_attrs($attrs, $attr_exclude);
 	}
 
 	/**
@@ -332,7 +332,7 @@ 
 	public function render_repeatable_field() {
 		$table_id = $this->field->id() . '_repeat';
 
-		$this->_desc( true, true, true );
+		$this->_desc(true, true, true);
 		?>
 
 		<div id="<?php echo $table_id; ?>" class="cmb-repeat-table cmb-nested">
@@ -341,7 +341,7 @@ 
 			</div>
 		</div>
 		<p class="cmb-add-row">
-			<button type="button" data-selector="<?php echo $table_id; ?>" class="cmb-add-row-button button-secondary"><?php echo esc_html( $this->_text( 'add_row_text', esc_html__( 'Add Row', 'cmb2' ) ) ); ?></button>
+			<button type="button" data-selector="<?php echo $table_id; ?>" class="cmb-add-row-button button-secondary"><?php echo esc_html($this->_text('add_row_text', esc_html__('Add Row', 'cmb2'))); ?></button>
 		</p>
 
 		<?php
@@ -355,21 +355,21 @@ 
 	 * @since  1.1.0
 	 */
 	public function repeatable_rows() {
-		$meta_value = array_filter( (array) $this->field->escaped_value() );
+		$meta_value = array_filter((array) $this->field->escaped_value());
 		// check for default content
 		$default    = $this->field->get_default();
 
 		// check for saved data
-		if ( ! empty( $meta_value ) ) {
-			$meta_value = is_array( $meta_value ) ? array_filter( $meta_value ) : $meta_value;
-			$meta_value = ! empty( $meta_value ) ? $meta_value : $default;
+		if ( ! empty($meta_value)) {
+			$meta_value = is_array($meta_value) ? array_filter($meta_value) : $meta_value;
+			$meta_value = ! empty($meta_value) ? $meta_value : $default;
 		} else {
 			$meta_value = $default;
 		}
 
 		// Loop value array and add a row
-		if ( ! empty( $meta_value ) ) {
-			foreach ( (array) $meta_value as $val ) {
+		if ( ! empty($meta_value)) {
+			foreach ((array) $meta_value as $val) {
 				$this->field->escaped_value = $val;
 				$this->repeat_row();
 				$this->iterator++;
@@ -386,7 +386,7 @@ 
 		// Then add an empty row
 		$this->field->escaped_value = $default;
 		$this->iterator = $this->iterator ? $this->iterator : 1;
-		$this->repeat_row( 'empty-row hidden' );
+		$this->repeat_row('empty-row hidden');
 	}
 
 	/**
@@ -395,17 +395,17 @@ 
 	 * @since 1.1.0
 	 * @param string $classes Repeatable table row's class
 	 */
-	protected function repeat_row( $classes = 'cmb-repeat-row' ) {
-		$classes = explode( ' ', $classes );
-		$classes = array_map( 'sanitize_html_class', $classes );
+	protected function repeat_row($classes = 'cmb-repeat-row') {
+		$classes = explode(' ', $classes);
+		$classes = array_map('sanitize_html_class', $classes);
 		?>
 
-		<div class="cmb-row <?php echo esc_attr( implode( ' ', $classes ) ); ?>">
+		<div class="cmb-row <?php echo esc_attr(implode(' ', $classes)); ?>">
 			<div class="cmb-td">
 				<?php $this->_render(); ?>
 			</div>
 			<div class="cmb-td cmb-remove-row">
-				<button type="button" class="button-secondary cmb-remove-row-button" title="<?php echo esc_attr( $this->_text( 'remove_row_button_title', esc_html__( 'Remove Row', 'cmb2' ) ) ); ?>"><?php echo esc_html( $this->_text( 'remove_row_text', esc_html__( 'Remove', 'cmb2' ) ) ); ?></button>
+				<button type="button" class="button-secondary cmb-remove-row-button" title="<?php echo esc_attr($this->_text('remove_row_button_title', esc_html__('Remove Row', 'cmb2'))); ?>"><?php echo esc_html($this->_text('remove_row_text', esc_html__('Remove', 'cmb2'))); ?></button>
 			</div>
 		</div>
 
@@ -421,22 +421,22 @@ 
 	 * @param bool $repeat_group Whether to repeat the group.
 	 * @return string Field's description markup.
 	 */
-	public function _desc( $paragraph = false, $echo = false, $repeat_group = false ) {
+	public function _desc($paragraph = false, $echo = false, $repeat_group = false) {
 		// Prevent description from printing multiple times for repeatable fields
-		if ( ! $repeat_group && ( $this->field->args( 'repeatable' ) || $this->iterator > 0 ) ) {
+		if ( ! $repeat_group && ($this->field->args('repeatable') || $this->iterator > 0)) {
 			return '';
 		}
 
-		$desc = $this->field->args( 'description' );
+		$desc = $this->field->args('description');
 
-		if ( ! $desc ) {
+		if ( ! $desc) {
 			return;
 		}
 
 		$tag = $paragraph ? 'p' : 'span';
-		$desc = sprintf( "\n" . '<%1$s class="cmb2-metabox-description">%2$s</%1$s>' . "\n", $tag, $desc );
+		$desc = sprintf("\n" . '<%1$s class="cmb2-metabox-description">%2$s</%1$s>' . "\n", $tag, $desc);
 
-		if ( $echo ) {
+		if ($echo) {
 			echo $desc;
 		}
 
@@ -450,8 +450,8 @@ 
 	 * @param  string $suffix For multi-part fields
 	 * @return string          Name attribute
 	 */
-	public function _name( $suffix = '' ) {
-		return $this->field->args( '_name' ) . ( $this->field->args( 'repeatable' ) ? '[' . $this->iterator . ']' : '' ) . $suffix;
+	public function _name($suffix = '') {
+		return $this->field->args('_name') . ($this->field->args('repeatable') ? '[' . $this->iterator . ']' : '') . $suffix;
 	}
 
 	/**
@@ -462,10 +462,10 @@ 
 	 * @param  bool   $append_repeatable_iterator Whether to append the iterator attribue if the field is repeatable.
 	 * @return string                             Id attribute
 	 */
-	public function _id( $suffix = '', $append_repeatable_iterator = true ) {
-		$id = $this->field->id() . $suffix . ( $this->field->args( 'repeatable' ) ? '_' . $this->iterator : '' );
+	public function _id($suffix = '', $append_repeatable_iterator = true) {
+		$id = $this->field->id() . $suffix . ($this->field->args('repeatable') ? '_' . $this->iterator : '');
 
-		if ( $append_repeatable_iterator && $this->field->args( 'repeatable' ) ) {
+		if ($append_repeatable_iterator && $this->field->args('repeatable')) {
 			$id .= '" data-iterator="' . $this->iterator;
 		}
 
@@ -480,8 +480,8 @@ 
 	 * @param  string $type Field type
 	 * @return string       Form input element
 	 */
-	public function input( $args = array(), $type = __FUNCTION__ ) {
-		return $this->get_new_render_type( 'text', 'CMB2_Type_Text', $args, $type )->render();
+	public function input($args = array(), $type = __FUNCTION__) {
+		return $this->get_new_render_type('text', 'CMB2_Type_Text', $args, $type)->render();
 	}
 
 	/**
@@ -491,8 +491,8 @@ 
 	 * @param  array $args Override arguments
 	 * @return string       Form textarea element
 	 */
-	public function textarea( $args = array() ) {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Textarea', $args )->render();
+	public function textarea($args = array()) {
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Textarea', $args)->render();
 	}
 
 	/**
@@ -509,167 +509,167 @@ 
 			'desc'  => '',
 			'class' => 'cmb2-hidden',
 		);
-		if ( $this->field->group ) {
+		if ($this->field->group) {
 			$args['data-groupid'] = $this->field->group->id();
 			$args['data-iterator'] = $this->iterator;
 		}
 
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Text', $args, 'input' )->render();
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Text', $args, 'input')->render();
 	}
 
 	public function text_small() {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Text', array(
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Text', array(
 			'class' => 'cmb2-text-small',
 			'desc'  => $this->_desc(),
-		), 'input' )->render();
+		), 'input')->render();
 	}
 
 	public function text_medium() {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Text', array(
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Text', array(
 			'class' => 'cmb2-text-medium',
 			'desc'  => $this->_desc(),
-		), 'input' )->render();
+		), 'input')->render();
 	}
 
 	public function text_email() {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Text', array(
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Text', array(
 			'class' => 'cmb2-text-email cmb2-text-medium',
 			'type'  => 'email',
-		), 'input' )->render();
+		), 'input')->render();
 	}
 
 	public function text_url() {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Text', array(
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Text', array(
 			'class' => 'cmb2-text-url cmb2-text-medium regular-text',
-			'value' => $this->field->escaped_value( 'esc_url' ),
-		), 'input' )->render();
+			'value' => $this->field->escaped_value('esc_url'),
+		), 'input')->render();
 	}
 
 	public function text_money() {
-		$input = $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Text', array(
+		$input = $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Text', array(
 			'class' => 'cmb2-text-money',
 			'desc'  => $this->_desc(),
-		), 'input' )->render();
-		return ( ! $this->field->get_param_callback_result( 'before_field' ) ? '$ ' : ' ' ) . $input;
+		), 'input')->render();
+		return ( ! $this->field->get_param_callback_result('before_field') ? '$ ' : ' ') . $input;
 	}
 
 	public function textarea_small() {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Textarea', array(
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Textarea', array(
 			'class' => 'cmb2-textarea-small',
 			'rows'  => 4,
-		) )->render();
+		))->render();
 	}
 
-	public function textarea_code( $args = array() ) {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Textarea_Code', $args )->render();
+	public function textarea_code($args = array()) {
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Textarea_Code', $args)->render();
 	}
 
-	public function wysiwyg( $args = array() ) {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Wysiwyg', $args )->render();
+	public function wysiwyg($args = array()) {
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Wysiwyg', $args)->render();
 	}
 
-	public function text_date( $args = array() ) {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Text_Date', $args )->render();
+	public function text_date($args = array()) {
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Text_Date', $args)->render();
 	}
 
 	// Alias for text_date
-	public function text_date_timestamp( $args = array() ) {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Text_Date', $args )->render();
+	public function text_date_timestamp($args = array()) {
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Text_Date', $args)->render();
 	}
 
-	public function text_time( $args = array() ) {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Text_Time', $args )->render();
+	public function text_time($args = array()) {
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Text_Time', $args)->render();
 	}
 
-	public function text_datetime_timestamp( $args = array() ) {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Text_Datetime_Timestamp', $args )->render();
+	public function text_datetime_timestamp($args = array()) {
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Text_Datetime_Timestamp', $args)->render();
 	}
 
-	public function text_datetime_timestamp_timezone( $args = array() ) {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Text_Datetime_Timestamp_Timezone', $args )->render();
+	public function text_datetime_timestamp_timezone($args = array()) {
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Text_Datetime_Timestamp_Timezone', $args)->render();
 	}
 
-	public function select_timezone( $args = array() ) {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Select_Timezone', $args )->render();
+	public function select_timezone($args = array()) {
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Select_Timezone', $args)->render();
 	}
 
-	public function colorpicker( $args = array(), $meta_value = '' ) {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Colorpicker', $args, $meta_value )->render();
+	public function colorpicker($args = array(), $meta_value = '') {
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Colorpicker', $args, $meta_value)->render();
 	}
 
-	public function title( $args = array() ) {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Title', $args )->render();
+	public function title($args = array()) {
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Title', $args)->render();
 	}
 
-	public function select( $args = array() ) {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Select', $args )->render();
+	public function select($args = array()) {
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Select', $args)->render();
 	}
 
-	public function taxonomy_select( $args = array() ) {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Taxonomy_Select', $args )->render();
+	public function taxonomy_select($args = array()) {
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Taxonomy_Select', $args)->render();
 	}
 
-	public function taxonomy_select_hierarchical( $args = array() ) {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Taxonomy_Select_Hierarchical', $args )->render();
+	public function taxonomy_select_hierarchical($args = array()) {
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Taxonomy_Select_Hierarchical', $args)->render();
 	}
 
-	public function radio( $args = array(), $type = __FUNCTION__ ) {
-		return $this->get_new_render_type( $type, 'CMB2_Type_Radio', $args, $type )->render();
+	public function radio($args = array(), $type = __FUNCTION__) {
+		return $this->get_new_render_type($type, 'CMB2_Type_Radio', $args, $type)->render();
 	}
 
-	public function radio_inline( $args = array() ) {
-		return $this->radio( $args, __FUNCTION__ );
+	public function radio_inline($args = array()) {
+		return $this->radio($args, __FUNCTION__);
 	}
 
-	public function multicheck( $type = 'checkbox' ) {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Multicheck', array(), $type )->render();
+	public function multicheck($type = 'checkbox') {
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Multicheck', array(), $type)->render();
 	}
 
 	public function multicheck_inline() {
-		return $this->multicheck( 'multicheck_inline' );
+		return $this->multicheck('multicheck_inline');
 	}
 
-	public function checkbox( $args = array(), $is_checked = null ) {
+	public function checkbox($args = array(), $is_checked = null) {
 		// Avoid get_new_render_type since we need a different default for the 3rd argument than ''.
-		$render_class_name = $this->get_render_type_class( __FUNCTION__, 'CMB2_Type_Checkbox' );
-		$this->type = new $render_class_name( $this, $args, $is_checked );
+		$render_class_name = $this->get_render_type_class(__FUNCTION__, 'CMB2_Type_Checkbox');
+		$this->type = new $render_class_name($this, $args, $is_checked);
 		return $this->type->render();
 	}
 
-	public function taxonomy_radio( $args = array() ) {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Taxonomy_Radio', $args )->render();
+	public function taxonomy_radio($args = array()) {
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Taxonomy_Radio', $args)->render();
 	}
 
-	public function taxonomy_radio_hierarchical( $args = array() ) {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Taxonomy_Radio_Hierarchical', $args )->render();
+	public function taxonomy_radio_hierarchical($args = array()) {
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Taxonomy_Radio_Hierarchical', $args)->render();
 	}
 
-	public function taxonomy_radio_inline( $args = array() ) {
-		return $this->taxonomy_radio( $args );
+	public function taxonomy_radio_inline($args = array()) {
+		return $this->taxonomy_radio($args);
 	}
 
-	public function taxonomy_multicheck( $args = array() ) {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Taxonomy_Multicheck', $args )->render();
+	public function taxonomy_multicheck($args = array()) {
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Taxonomy_Multicheck', $args)->render();
 	}
 
-	public function taxonomy_multicheck_hierarchical( $args = array() ) {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Taxonomy_Multicheck_Hierarchical', $args )->render();
+	public function taxonomy_multicheck_hierarchical($args = array()) {
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Taxonomy_Multicheck_Hierarchical', $args)->render();
 	}
 
-	public function taxonomy_multicheck_inline( $args = array() ) {
-		return $this->taxonomy_multicheck( $args );
+	public function taxonomy_multicheck_inline($args = array()) {
+		return $this->taxonomy_multicheck($args);
 	}
 
-	public function oembed( $args = array() ) {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Oembed', $args )->render();
+	public function oembed($args = array()) {
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_Oembed', $args)->render();
 	}
 
-	public function file_list( $args = array() ) {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_File_List', $args )->render();
+	public function file_list($args = array()) {
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_File_List', $args)->render();
 	}
 
-	public function file( $args = array() ) {
-		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_File', $args )->render();
+	public function file($args = array()) {
+		return $this->get_new_render_type(__FUNCTION__, 'CMB2_Type_File', $args)->render();
 	}
 
 }

vendor/CMB2/includes/CMB2_Options_Hookup.php

Spacing +69 added lines, -69 removed lines

@@ -36,46 +36,46 @@ 
 	 * @param CMB2   $cmb        The CMB2 object to hookup.
 	 * @param string $option_key Option key to use.
 	 */
-	public function __construct( CMB2 $cmb, $option_key ) {
+	public function __construct(CMB2 $cmb, $option_key) {
 		$this->cmb = $cmb;
 		$this->option_key = $option_key;
 	}
 
 	public function hooks() {
-		if ( empty( $this->option_key ) ) {
+		if (empty($this->option_key)) {
 			return;
 		}
 
-		if ( ! $this->cmb->prop( 'autoload', true ) ) {
+		if ( ! $this->cmb->prop('autoload', true)) {
 			// Disable option autoload if requested.
-			add_filter( "cmb2_should_autoload_{$this->option_key}", '__return_false' );
+			add_filter("cmb2_should_autoload_{$this->option_key}", '__return_false');
 		}
 
 		/**
 		 * For WP < 4.7. Ensure the register_setting function exists.
 		 */
-		if ( ! CMB2_Utils::wp_at_least( '4.7' ) && ! function_exists( 'register_setting' ) ) {
+		if ( ! CMB2_Utils::wp_at_least('4.7') && ! function_exists('register_setting')) {
 			require_once ABSPATH . 'wp-admin/includes/plugin.php';
 		}
 
 		// Register setting to cmb2 group.
-		register_setting( 'cmb2', $this->option_key );
+		register_setting('cmb2', $this->option_key);
 
 		// Handle saving the data.
-		add_action( 'admin_post_' . $this->option_key, array( $this, 'save_options' ) );
+		add_action('admin_post_' . $this->option_key, array($this, 'save_options'));
 
 		// Optionally network_admin_menu.
-		$hook = $this->cmb->prop( 'admin_menu_hook' );
+		$hook = $this->cmb->prop('admin_menu_hook');
 
 		// Hook in to add our menu.
-		add_action( $hook, array( $this, 'options_page_menu_hooks' ) );
+		add_action($hook, array($this, 'options_page_menu_hooks'));
 
 		// If in the network admin, need to use get/update_site_option.
-		if ( 'network_admin_menu' === $hook ) {
+		if ('network_admin_menu' === $hook) {
 			// Override CMB's getter.
-			add_filter( "cmb2_override_option_get_{$this->option_key}", array( $this, 'network_get_override' ), 10, 2 );
+			add_filter("cmb2_override_option_get_{$this->option_key}", array($this, 'network_get_override'), 10, 2);
 			// Override CMB's setter.
-			add_filter( "cmb2_override_option_save_{$this->option_key}", array( $this, 'network_update_override' ), 10, 2 );
+			add_filter("cmb2_override_option_save_{$this->option_key}", array($this, 'network_update_override'), 10, 2);
 		}
 	}
 
@@ -87,13 +87,13 @@ 
 	 * @return void
 	 */
 	public function options_page_menu_hooks() {
-		$parent_slug = $this->cmb->prop( 'parent_slug' );
-		$title       = $this->cmb->prop( 'title' );
-		$menu_title  = $this->cmb->prop( 'menu_title', $title );
-		$capability  = $this->cmb->prop( 'capability' );
-		$callback    = array( $this, 'options_page_output' );
+		$parent_slug = $this->cmb->prop('parent_slug');
+		$title       = $this->cmb->prop('title');
+		$menu_title  = $this->cmb->prop('menu_title', $title);
+		$capability  = $this->cmb->prop('capability');
+		$callback    = array($this, 'options_page_output');
 
-		if ( $parent_slug ) {
+		if ($parent_slug) {
 			$page_hook = add_submenu_page(
 				$parent_slug,
 				$title,
@@ -109,14 +109,14 @@ 
 				$capability,
 				$this->option_key,
 				$callback,
-				$this->cmb->prop( 'icon_url' ),
-				$this->cmb->prop( 'position' )
+				$this->cmb->prop('icon_url'),
+				$this->cmb->prop('position')
 			);
 		}
 
-		if ( $this->cmb->prop( 'cmb_styles' ) ) {
+		if ($this->cmb->prop('cmb_styles')) {
 			// Include CMB CSS in the head to avoid FOUC.
-			add_action( "admin_print_styles-{$page_hook}", array( 'CMB2_Hookup', 'enqueue_cmb_css' ) );
+			add_action("admin_print_styles-{$page_hook}", array('CMB2_Hookup', 'enqueue_cmb_css'));
 		}
 
 		$this->maybe_register_message();
@@ -131,21 +131,21 @@ 
 	 * @return void
 	 */
 	public function maybe_register_message() {
-		$is_options_page = self::is_page( $this->option_key );
-		$should_notify   = ! $this->cmb->prop( 'disable_settings_errors' ) && isset( $_GET['settings-updated'] ) && $is_options_page;
+		$is_options_page = self::is_page($this->option_key);
+		$should_notify   = ! $this->cmb->prop('disable_settings_errors') && isset($_GET['settings-updated']) && $is_options_page;
 		$is_updated      = $should_notify && 'true' === $_GET['settings-updated'];
 		$setting         = "{$this->option_key}-notices";
 		$code            = '';
-		$message         = __( 'Nothing to update.', 'cmb2' );
+		$message         = __('Nothing to update.', 'cmb2');
 		$type            = 'notice-warning';
 
-		if ( $is_updated ) {
-			$message = __( 'Settings updated.', 'cmb2' );
+		if ($is_updated) {
+			$message = __('Settings updated.', 'cmb2');
 			$type    = 'updated';
 		}
 
 		// Check if parameter has registered a callback.
-		if ( $cb = $this->cmb->maybe_callback( 'message_cb' ) ) {
+		if ($cb = $this->cmb->maybe_callback('message_cb')) {
 
 			/**
 			 * The 'message_cb' callback will receive the following parameters.
@@ -171,13 +171,13 @@ 
 			 *                                   Will be 'updated' if $is_updated is true, else 'notice-warning'.
 			 * }
 			 */
-			$args = compact( 'is_options_page', 'should_notify', 'is_updated', 'setting', 'code', 'message', 'type' );
+			$args = compact('is_options_page', 'should_notify', 'is_updated', 'setting', 'code', 'message', 'type');
 
-			$this->cmb->do_callback( $cb, $args );
+			$this->cmb->do_callback($cb, $args);
 
-		} elseif ( $should_notify ) {
+		} elseif ($should_notify) {
 
-			add_settings_error( $setting, $code, $message, $type );
+			add_settings_error($setting, $code, $message, $type);
 		}
 	}
 
@@ -189,28 +189,28 @@ 
 	public function options_page_output() {
 		$this->maybe_output_settings_notices();
 
-		$callback = $this->cmb->prop( 'display_cb' );
-		if ( is_callable( $callback ) ) {
-			return call_user_func( $callback, $this );
+		$callback = $this->cmb->prop('display_cb');
+		if (is_callable($callback)) {
+			return call_user_func($callback, $this);
 		}
 
 		$tabs = $this->get_tab_group_tabs();
 		?>
-		<div class="wrap cmb2-options-page option-<?php echo esc_attr( sanitize_html_class( $this->option_key ) ); ?>">
-			<?php if ( $this->cmb->prop( 'title' ) ) : ?>
-				<h2><?php echo wp_kses_post( $this->cmb->prop( 'title' ) ); ?></h2>
+		<div class="wrap cmb2-options-page option-<?php echo esc_attr(sanitize_html_class($this->option_key)); ?>">
+			<?php if ($this->cmb->prop('title')) : ?>
+				<h2><?php echo wp_kses_post($this->cmb->prop('title')); ?></h2>
 			<?php endif; ?>
-			<?php if ( ! empty( $tabs ) ) : ?>
+			<?php if ( ! empty($tabs)) : ?>
 				<h2 class="nav-tab-wrapper">
-					<?php foreach ( $tabs as $option_key => $tab_title ) : ?>
-						<a class="nav-tab<?php if ( self::is_page( $option_key ) ) : ?> nav-tab-active<?php endif; ?>" href="<?php menu_page_url( $option_key ); ?>"><?php echo wp_kses_post( $tab_title ); ?></a>
+					<?php foreach ($tabs as $option_key => $tab_title) : ?>
+						<a class="nav-tab<?php if (self::is_page($option_key)) : ?> nav-tab-active<?php endif; ?>" href="<?php menu_page_url($option_key); ?>"><?php echo wp_kses_post($tab_title); ?></a>
 					<?php endforeach; ?>
 				</h2>
 			<?php endif; ?>
-			<form class="cmb-form" action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>" method="POST" id="<?php echo $this->cmb->cmb_id; ?>" enctype="multipart/form-data" encoding="multipart/form-data">
-				<input type="hidden" name="action" value="<?php echo esc_attr( $this->option_key ); ?>">
+			<form class="cmb-form" action="<?php echo esc_url(admin_url('admin-post.php')); ?>" method="POST" id="<?php echo $this->cmb->cmb_id; ?>" enctype="multipart/form-data" encoding="multipart/form-data">
+				<input type="hidden" name="action" value="<?php echo esc_attr($this->option_key); ?>">
 				<?php $this->options_page_metabox(); ?>
-				<?php submit_button( esc_attr( $this->cmb->prop( 'save_button' ) ), 'primary', 'submit-cmb' ); ?>
+				<?php submit_button(esc_attr($this->cmb->prop('save_button')), 'primary', 'submit-cmb'); ?>
 			</form>
 		</div>
 		<?php
@@ -228,8 +228,8 @@ 
 		global $parent_file;
 
 		// The settings sub-pages will already have settings_errors() called in wp-admin/options-head.php.
-		if ( 'options-general.php' !== $parent_file ) {
-			settings_errors( "{$this->option_key}-notices" );
+		if ('options-general.php' !== $parent_file) {
+			settings_errors("{$this->option_key}-notices");
 		}
 	}
 
@@ -241,21 +241,21 @@ 
 	 * @return array Array of tab information ($option_key => $tab_title)
 	 */
 	public function get_tab_group_tabs() {
-		$tab_group = $this->cmb->prop( 'tab_group' );
+		$tab_group = $this->cmb->prop('tab_group');
 		$tabs      = array();
 
-		if ( $tab_group ) {
-			$boxes = CMB2_Boxes::get_by( 'tab_group', $tab_group );
+		if ($tab_group) {
+			$boxes = CMB2_Boxes::get_by('tab_group', $tab_group);
 
-			foreach ( $boxes as $cmb_id => $cmb ) {
+			foreach ($boxes as $cmb_id => $cmb) {
 				$option_key = $cmb->options_page_keys();
 
 				// Must have an option key, must be an options page box.
-				if ( ! isset( $option_key[0] ) || 'options-page' !== $cmb->mb_object_type() ) {
+				if ( ! isset($option_key[0]) || 'options-page' !== $cmb->mb_object_type()) {
 					continue;
 				}
 
-				$tabs[ $option_key[0] ] = $cmb->prop( 'tab_title', $cmb->prop( 'title' ) );
+				$tabs[$option_key[0]] = $cmb->prop('tab_title', $cmb->prop('title'));
 			}
 		}
 
@@ -268,7 +268,7 @@ 
 	 * @since  2.2.5
 	 */
 	public function options_page_metabox() {
-		$this->show_form_for_type( 'options-page' );
+		$this->show_form_for_type('options-page');
 	}
 
 	/**
@@ -279,26 +279,26 @@ 
 	 */
 	public function save_options() {
 		$url = wp_get_referer();
-		if ( ! $url ) {
+		if ( ! $url) {
 			$url = admin_url();
 		}
 
 		if (
-			$this->can_save( 'options-page' )
+			$this->can_save('options-page')
 			// check params.
-			&& isset( $_POST['submit-cmb'], $_POST['action'] )
+			&& isset($_POST['submit-cmb'], $_POST['action'])
 			&& $this->option_key === $_POST['action']
 		) {
 
 			$updated = $this->cmb
-				->save_fields( $this->option_key, $this->cmb->object_type(), $_POST )
+				->save_fields($this->option_key, $this->cmb->object_type(), $_POST)
 				->was_updated(); // Will be false if no values were changed/updated.
 
-			$url = add_query_arg( 'settings-updated', $updated ? 'true' : 'false', $url );
-			$url = apply_filters( 'cmb2_options_page_redirect_url', $url );
+			$url = add_query_arg('settings-updated', $updated ? 'true' : 'false', $url);
+			$url = apply_filters('cmb2_options_page_redirect_url', $url);
 		}
 
-		wp_safe_redirect( esc_url_raw( $url ), 303 /* WP_Http::SEE_OTHER */ );
+		wp_safe_redirect(esc_url_raw($url), 303 /* WP_Http::SEE_OTHER */);
 		exit;
 	}
 
@@ -311,8 +311,8 @@ 
 	 * @param mixed $default Default value to use.
 	 * @return mixed Value set for the network option.
 	 */
-	public function network_get_override( $test, $default = false ) {
-		return get_site_option( $this->option_key, $default );
+	public function network_get_override($test, $default = false) {
+		return get_site_option($this->option_key, $default);
 	}
 
 	/**
@@ -324,8 +324,8 @@ 
 	 * @param mixed $option_value Value to use.
 	 * @return bool Success/Failure
 	 */
-	public function network_update_override( $test, $option_value ) {
-		return update_site_option( $this->option_key, $option_value );
+	public function network_update_override($test, $option_value) {
+		return update_site_option($this->option_key, $option_value);
 	}
 
 	/**
@@ -336,8 +336,8 @@ 
 	 * @param  string $page Page slug.
 	 * @return boolean
 	 */
-	public static function is_page( $page ) {
-		return isset( $_GET['page'] ) && $page === $_GET['page'];
+	public static function is_page($page) {
+		return isset($_GET['page']) && $page === $_GET['page'];
 	}
 
 	/**
@@ -348,14 +348,14 @@ 
 	 * @throws Exception Throws an exception if the field is invalid.
 	 * @return mixed
 	 */
-	public function __get( $field ) {
-		switch ( $field ) {
+	public function __get($field) {
+		switch ($field) {
 			case 'object_type':
 			case 'option_key':
 			case 'cmb':
 				return $this->{$field};
 			default:
-				throw new Exception( sprintf( esc_html__( 'Invalid %1$s property: %2$s', 'cmb2' ), __CLASS__, $field ) );
+				throw new Exception(sprintf(esc_html__('Invalid %1$s property: %2$s', 'cmb2'), __CLASS__, $field));
 		}
 	}
 }

vendor/CMB2/includes/CMB2_Options.php

Spacing +36 added lines, -36 removed lines

@@ -24,13 +24,13 @@ 
 	 */
 	protected static $option_sets = array();
 
-	public static function get( $option_key ) {
+	public static function get($option_key) {
 
-		if ( empty( self::$option_sets ) || empty( self::$option_sets[ $option_key ] ) ) {
-			self::$option_sets[ $option_key ] = new CMB2_Option( $option_key );
+		if (empty(self::$option_sets) || empty(self::$option_sets[$option_key])) {
+			self::$option_sets[$option_key] = new CMB2_Option($option_key);
 		}
 
-		return self::$option_sets[ $option_key ];
+		return self::$option_sets[$option_key];
 	}
 }
 
@@ -64,8 +64,8 @@ 
 	 *                           Leave empty for temporary data store.
 	 * @since 2.0.0
 	 */
-	public function __construct( $option_key = '' ) {
-		$this->key = ! empty( $option_key ) ? $option_key : '';
+	public function __construct($option_key = '') {
+		$this->key = ! empty($option_key) ? $option_key : '';
 	}
 
 	/**
@@ -75,7 +75,7 @@ 
 	 * @return mixed Delete success or failure
 	 */
 	public function delete_option() {
-		$deleted = $this->key ? delete_option( $this->key ) : true;
+		$deleted = $this->key ? delete_option($this->key) : true;
 		$this->options = $deleted ? array() : $this->options;
 		return $this->options;
 	}
@@ -88,15 +88,15 @@ 
 	 * @param bool   $resave Whether or not to resave.
 	 * @return array             Modified options
 	 */
-	public function remove( $field_id, $resave = false ) {
+	public function remove($field_id, $resave = false) {
 
 		$this->get_options();
 
-		if ( isset( $this->options[ $field_id ] ) ) {
-			unset( $this->options[ $field_id ] );
+		if (isset($this->options[$field_id])) {
+			unset($this->options[$field_id]);
 		}
 
-		if ( $resave ) {
+		if ($resave) {
 			$this->set();
 		}
 
@@ -111,13 +111,13 @@ 
 	 * @param mixed  $default  Fallback value for the option.
 	 * @return array             Requested field or default
 	 */
-	public function get( $field_id, $default = false ) {
+	public function get($field_id, $default = false) {
 		$opts = $this->get_options();
 
-		if ( 'all' == $field_id ) {
+		if ('all' == $field_id) {
 			return $opts;
-		} elseif ( array_key_exists( $field_id, $opts ) ) {
-			return false !== $opts[ $field_id ] ? $opts[ $field_id ] : $default;
+		} elseif (array_key_exists($field_id, $opts)) {
+			return false !== $opts[$field_id] ? $opts[$field_id] : $default;
 		}
 
 		return $default;
@@ -133,20 +133,20 @@ 
 	 * @param bool   $single   Whether data should not be an array.
 	 * @return boolean Return status of update.
 	 */
-	public function update( $field_id, $value = '', $resave = false, $single = true ) {
+	public function update($field_id, $value = '', $resave = false, $single = true) {
 		$this->get_options();
 
-		if ( true !== $field_id ) {
+		if (true !== $field_id) {
 
-			if ( ! $single ) {
+			if ( ! $single) {
 				// If multiple, add to array.
-				$this->options[ $field_id ][] = $value;
+				$this->options[$field_id][] = $value;
 			} else {
-				$this->options[ $field_id ] = $value;
+				$this->options[$field_id] = $value;
 			}
 		}
 
-		if ( $resave || true === $field_id ) {
+		if ($resave || true === $field_id) {
 			return $this->set();
 		}
 
@@ -164,20 +164,20 @@ 
 	 * @param  array $options Optional options to override.
 	 * @return bool           Success/Failure
 	 */
-	public function set( $options = array() ) {
-		if ( ! empty( $options ) || empty( $options ) && empty( $this->key ) ) {
+	public function set($options = array()) {
+		if ( ! empty($options) || empty($options) && empty($this->key)) {
 			$this->options = $options;
 		}
 
-		$this->options = wp_unslash( $this->options ); // get rid of those evil magic quotes.
+		$this->options = wp_unslash($this->options); // get rid of those evil magic quotes.
 
-		if ( empty( $this->key ) ) {
+		if (empty($this->key)) {
 			return false;
 		}
 
-		$test_save = apply_filters( "cmb2_override_option_save_{$this->key}", 'cmb2_no_override_option_save', $this->options, $this );
+		$test_save = apply_filters("cmb2_override_option_save_{$this->key}", 'cmb2_no_override_option_save', $this->options, $this);
 
-		if ( 'cmb2_no_override_option_save' !== $test_save ) {
+		if ('cmb2_no_override_option_save' !== $test_save) {
 			// If override, do not proceed to update the option, just return result.
 			return $test_save;
 		}
@@ -192,7 +192,7 @@ 
 		 * @param bool        $autoload   Whether to load the option when WordPress starts up.
 		 * @param CMB2_Option $cmb_option This object.
 		 */
-		$autoload = apply_filters( "cmb2_should_autoload_{$this->key}", true, $this );
+		$autoload = apply_filters("cmb2_should_autoload_{$this->key}", true, $this);
 
 		return update_option(
 			$this->key,
@@ -211,16 +211,16 @@ 
 	 * @param  mixed $default Optional. Default value to return if the option does not exist.
 	 * @return mixed          Value set for the option.
 	 */
-	public function get_options( $default = null ) {
-		if ( empty( $this->options ) && ! empty( $this->key ) ) {
+	public function get_options($default = null) {
+		if (empty($this->options) && ! empty($this->key)) {
 
-			$test_get = apply_filters( "cmb2_override_option_get_{$this->key}", 'cmb2_no_override_option_get', $default, $this );
+			$test_get = apply_filters("cmb2_override_option_get_{$this->key}", 'cmb2_no_override_option_get', $default, $this);
 
-			if ( 'cmb2_no_override_option_get' !== $test_get ) {
+			if ('cmb2_no_override_option_get' !== $test_get) {
 				$this->options = $test_get;
 			} else {
 				// If no override, get the option.
-				$this->options = get_option( $this->key, $default );
+				$this->options = get_option($this->key, $default);
 			}
 		}
 
@@ -238,13 +238,13 @@ 
 	 * @throws Exception Throws an exception if the field is invalid.
 	 * @return mixed
 	 */
-	public function __get( $field ) {
-		switch ( $field ) {
+	public function __get($field) {
+		switch ($field) {
 			case 'options':
 			case 'key':
 				return $this->{$field};
 			default:
-				throw new Exception( sprintf( esc_html__( 'Invalid %1$s property: %2$s', 'cmb2' ), __CLASS__, $field ) );
+				throw new Exception(sprintf(esc_html__('Invalid %1$s property: %2$s', 'cmb2'), __CLASS__, $field));
 		}
 	}
 }