lightspeeddevelopment / lsx-projects

vendor/CMB2/includes/types/CMB2_Type_File_Base.php

Spacing +36 added lines, -36 removed lines

@@ -19,10 +19,10 @@ 
 	 * @param  string $file File url
 	 * @return bool         Whether file has a valid image extension
 	 */
-	public function is_valid_img_ext( $file, $blah = false ) {
-		$file_ext = CMB2_Utils::get_file_ext( $file );
+	public function is_valid_img_ext($file, $blah = false) {
+		$file_ext = CMB2_Utils::get_file_ext($file);
 
-		$valid_types = array( 'jpg', 'jpeg', 'png', 'gif', 'ico', 'icon' );
+		$valid_types = array('jpg', 'jpeg', 'png', 'gif', 'ico', 'icon');
 
 		/**
 		 * Which image types are considered valid image file extensions.
@@ -31,8 +31,8 @@ 
 		 *
 		 * @param array $valid_types The valid image file extensions.
 		 */
-		$is_valid_types = apply_filters( 'cmb2_valid_img_types', $valid_types );
-		$is_valid = $file_ext && in_array( $file_ext, (array) $is_valid_types );
+		$is_valid_types = apply_filters('cmb2_valid_img_types', $valid_types);
+		$is_valid = $file_ext && in_array($file_ext, (array) $is_valid_types);
 		$field_id = $this->field->id();
 
 		/**
@@ -46,7 +46,7 @@ 
 		 * @param string $file     File url.
 		 * @param string $file_ext File extension.
 		 */
-		return (bool) apply_filters( "cmb2_{$field_id}_is_valid_img_ext", $is_valid, $file, $file_ext );
+		return (bool) apply_filters("cmb2_{$field_id}_is_valid_img_ext", $is_valid, $file, $file_ext);
 	}
 
 	/**
@@ -56,13 +56,13 @@ 
 	 * @param  array $args Array of arguments for output
 	 * @return string       Image wrap output
 	 */
-	public function img_status_output( $args ) {
-		return sprintf( '<%1$s class="img-status cmb2-media-item">%2$s<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button"%3$s>%4$s</a></p>%5$s</%1$s>',
+	public function img_status_output($args) {
+		return sprintf('<%1$s class="img-status cmb2-media-item">%2$s<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button"%3$s>%4$s</a></p>%5$s</%1$s>',
 			$args['tag'],
 			$args['image'],
-			isset( $args['cached_id'] ) ? ' rel="' . esc_attr( $args['cached_id'] ) . '"' : '',
-			esc_html( $this->_text( 'remove_image_text', esc_html__( 'Remove Image', 'cmb2' ) ) ),
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
+			isset($args['cached_id']) ? ' rel="' . esc_attr($args['cached_id']) . '"' : '',
+			esc_html($this->_text('remove_image_text', esc_html__('Remove Image', 'cmb2'))),
+			isset($args['id_input']) ? $args['id_input'] : ''
 		);
 	}
 
@@ -73,16 +73,16 @@ 
 	 * @param  array $args Array of arguments for output
 	 * @return string       File wrap output
 	 */
-	public function file_status_output( $args ) {
-		return sprintf( '<%1$s class="file-status cmb2-media-item"><span>%2$s <strong>%3$s</strong></span>&nbsp;&nbsp; (<a href="%4$s" target="_blank" rel="external">%5$s</a> / <a href="#" class="cmb2-remove-file-button"%6$s>%7$s</a>)%8$s</%1$s>',
+	public function file_status_output($args) {
+		return sprintf('<%1$s class="file-status cmb2-media-item"><span>%2$s <strong>%3$s</strong></span>&nbsp;&nbsp; (<a href="%4$s" target="_blank" rel="external">%5$s</a> / <a href="#" class="cmb2-remove-file-button"%6$s>%7$s</a>)%8$s</%1$s>',
 			$args['tag'],
-			esc_html( $this->_text( 'file_text', esc_html__( 'File:', 'cmb2' ) ) ),
-			esc_html( CMB2_Utils::get_file_name_from_path( $args['value'] ) ),
-			esc_url( $args['value'] ),
-			esc_html( $this->_text( 'file_download_text', esc_html__( 'Download', 'cmb2' ) ) ),
-			isset( $args['cached_id'] ) ? ' rel="' . esc_attr( $args['cached_id'] ) . '"' : '',
-			esc_html( $this->_text( 'remove_text', esc_html__( 'Remove', 'cmb2' ) ) ),
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
+			esc_html($this->_text('file_text', esc_html__('File:', 'cmb2'))),
+			esc_html(CMB2_Utils::get_file_name_from_path($args['value'])),
+			esc_url($args['value']),
+			esc_html($this->_text('file_download_text', esc_html__('Download', 'cmb2'))),
+			isset($args['cached_id']) ? ' rel="' . esc_attr($args['cached_id']) . '"' : '',
+			esc_html($this->_text('remove_text', esc_html__('Remove', 'cmb2'))),
+			isset($args['id_input']) ? $args['id_input'] : ''
 		);
 	}
 
@@ -138,16 +138,16 @@ 
 	 *      'name'   => (string) e.g. 'thumbnail'
 	 *    )
 	 */
-	static function get_image_size_data( $img_size = '', $fallback = 'thumbnail' ) {
+	static function get_image_size_data($img_size = '', $fallback = 'thumbnail') {
 		$data = array();
 
-		if ( is_array( $img_size ) ) {
-			$data['width']  = intval( $img_size[0] );
-			$data['height'] = intval( $img_size[1] );
+		if (is_array($img_size)) {
+			$data['width']  = intval($img_size[0]);
+			$data['height'] = intval($img_size[1]);
 			$data['name']   = '';
 
 			// Try and get the closest named size from our array of dimensions
-			if ( $named_size = CMB2_Utils::get_named_size( $img_size ) ) {
+			if ($named_size = CMB2_Utils::get_named_size($img_size)) {
 				$data['name'] = $named_size;
 			}
 		} else {
@@ -155,18 +155,18 @@ 
 			$image_sizes = CMB2_Utils::get_available_image_sizes();
 
 			// The 'thumb' alias, which works elsewhere, doesn't work in the wp.media uploader
-			if ( 'thumb' == $img_size ) {
+			if ('thumb' == $img_size) {
 				$img_size = 'thumbnail';
 			}
 
 			// Named size doesn't exist, use $fallback
-			if ( ! array_key_exists( $img_size, $image_sizes ) ) {
+			if ( ! array_key_exists($img_size, $image_sizes)) {
 				$img_size = $fallback;
 			}
 
 			// Get image dimensions from named sizes
-			$data['width']  = intval( $image_sizes[ $img_size ]['width'] );
-			$data['height'] = intval( $image_sizes[ $img_size ]['height'] );
+			$data['width']  = intval($image_sizes[$img_size]['width']);
+			$data['height'] = intval($image_sizes[$img_size]['height']);
 			$data['name']   = $img_size;
 		}
 
@@ -185,17 +185,17 @@ 
 	 * @param  array      $meta       Array of attachment meta data ( from wp_get_attachment_metadata() )
 	 * @return array      filtered $response array
 	 */
-	public static function prepare_image_sizes_for_js( $response, $attachment, $meta ) {
-		foreach ( CMB2_Utils::get_available_image_sizes() as $size => $info ) {
+	public static function prepare_image_sizes_for_js($response, $attachment, $meta) {
+		foreach (CMB2_Utils::get_available_image_sizes() as $size => $info) {
 
 			// registered image size exists for this attachment
-			if ( isset( $meta['sizes'][ $size ] ) ) {
+			if (isset($meta['sizes'][$size])) {
 
-				$attachment_url = wp_get_attachment_url( $attachment->ID );
-				$base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
-				$size_meta = $meta['sizes'][ $size ];
+				$attachment_url = wp_get_attachment_url($attachment->ID);
+				$base_url = str_replace(wp_basename($attachment_url), '', $attachment_url);
+				$size_meta = $meta['sizes'][$size];
 
-				$response['sizes'][ $size ] = array(
+				$response['sizes'][$size] = array(
 					'url'         => $base_url . $size_meta['file'],
 					'height'      => $size_meta['height'],
 					'width'       => $size_meta['width'],

vendor/CMB2/includes/types/CMB2_Type_Text_Datetime_Timestamp_Timezone.php

Spacing +17 added lines, -17 removed lines

@@ -12,51 +12,51 @@
  */
 class CMB2_Type_Text_Datetime_Timestamp_Timezone extends CMB2_Type_Base {
 
-	public function render( $args = array() ) {
+	public function render($args = array()) {
 		$field = $this->field;
 
 		$value = $field->escaped_value();
-		if ( empty( $value ) ) {
+		if (empty($value)) {
 			$value = $field->get_default();
 		}
 
-		$args = wp_parse_args( $this->args, array(
+		$args = wp_parse_args($this->args, array(
 			'value'                   => $value,
-			'desc'                    => $this->_desc( true ),
+			'desc'                    => $this->_desc(true),
 			'text_datetime_timestamp' => array(),
 			'select_timezone'         => array(),
-		) );
+		));
 
 		$args['value'] = $value;
-		if ( is_array( $args['value'] ) ) {
+		if (is_array($args['value'])) {
 			$args['value'] = '';
 		}
 
-		$datetime = maybe_unserialize( $args['value'] );
+		$datetime = maybe_unserialize($args['value']);
 		$value = $tzstring = '';
 
-		if ( $datetime && $datetime instanceof DateTime ) {
+		if ($datetime && $datetime instanceof DateTime) {
 			$tz       = $datetime->getTimezone();
 			$tzstring = $tz->getName();
 			$value    = $datetime->getTimestamp();
 		}
 
-		$timestamp_args = wp_parse_args( $args['text_datetime_timestamp'], array(
+		$timestamp_args = wp_parse_args($args['text_datetime_timestamp'], array(
 			'desc'     => '',
 			'value'    => $value,
 			'rendered' => true,
-		) );
-		$datetime_timestamp = $this->types->text_datetime_timestamp( $timestamp_args );
+		));
+		$datetime_timestamp = $this->types->text_datetime_timestamp($timestamp_args);
 
-		$timezone_select_args = wp_parse_args( $args['select_timezone'], array(
+		$timezone_select_args = wp_parse_args($args['select_timezone'], array(
 			'class'    => 'cmb2_select cmb2-select-timezone',
-			'name'     => $this->_name( '[timezone]' ),
-			'id'       => $this->_id( '_timezone' ),
-			'options'  => wp_timezone_choice( $tzstring ),
+			'name'     => $this->_name('[timezone]'),
+			'id'       => $this->_id('_timezone'),
+			'options'  => wp_timezone_choice($tzstring),
 			'desc'     => $args['desc'],
 			'rendered' => true,
-		) );
-		$select = $this->types->select( $timezone_select_args );
+		));
+		$select = $this->types->select($timezone_select_args);
 
 		return $this->rendered(
 			$datetime_timestamp . "\n" . $select

vendor/CMB2/includes/CMB2_Ajax.php

Spacing +63 added lines, -63 removed lines

@@ -35,7 +35,7 @@ 
 	 * @return CMB2_Ajax
 	 */
 	public static function get_instance() {
-		if ( ! ( self::$instance instanceof self ) ) {
+		if ( ! (self::$instance instanceof self)) {
 			self::$instance = new self();
 		}
 
@@ -48,10 +48,10 @@ 
 	 * @since 2.2.0
 	 */
 	protected function __construct() {
-		add_action( 'wp_ajax_cmb2_oembed_handler', array( $this, 'oembed_handler' ) );
-		add_action( 'wp_ajax_nopriv_cmb2_oembed_handler', array( $this, 'oembed_handler' ) );
+		add_action('wp_ajax_cmb2_oembed_handler', array($this, 'oembed_handler'));
+		add_action('wp_ajax_nopriv_cmb2_oembed_handler', array($this, 'oembed_handler'));
 		// Need to occasionally clean stale oembed cache data from the option value.
-		add_action( 'cmb2_save_options-page_fields', array( __CLASS__, 'clean_stale_options_page_oembeds' ) );
+		add_action('cmb2_save_options-page_fields', array(__CLASS__, 'clean_stale_options_page_oembeds'));
 	}
 
 	/**
@@ -63,23 +63,23 @@ 
 	public function oembed_handler() {
 
 		// Verify our nonce.
-		if ( ! ( isset( $_REQUEST['cmb2_ajax_nonce'], $_REQUEST['oembed_url'] ) && wp_verify_nonce( $_REQUEST['cmb2_ajax_nonce'], 'ajax_nonce' ) ) ) {
+		if ( ! (isset($_REQUEST['cmb2_ajax_nonce'], $_REQUEST['oembed_url']) && wp_verify_nonce($_REQUEST['cmb2_ajax_nonce'], 'ajax_nonce'))) {
 			die();
 		}
 
 		// Sanitize our search string.
-		$oembed_string = sanitize_text_field( $_REQUEST['oembed_url'] );
+		$oembed_string = sanitize_text_field($_REQUEST['oembed_url']);
 
 		// Send back error if empty.
-		if ( empty( $oembed_string ) ) {
-			wp_send_json_error( '<p class="ui-state-error-text">' . esc_html__( 'Please Try Again', 'cmb2' ) . '</p>' );
+		if (empty($oembed_string)) {
+			wp_send_json_error('<p class="ui-state-error-text">' . esc_html__('Please Try Again', 'cmb2') . '</p>');
 		}
 
 		// Set width of embed.
-		$embed_width = isset( $_REQUEST['oembed_width'] ) && intval( $_REQUEST['oembed_width'] ) < 640 ? intval( $_REQUEST['oembed_width'] ) : '640';
+		$embed_width = isset($_REQUEST['oembed_width']) && intval($_REQUEST['oembed_width']) < 640 ? intval($_REQUEST['oembed_width']) : '640';
 
 		// Set url.
-		$oembed_url = esc_url( $oembed_string );
+		$oembed_url = esc_url($oembed_string);
 
 		// Set args.
 		$embed_args = array(
@@ -89,15 +89,15 @@ 
 		$this->ajax_update = true;
 
 		// Get embed code (or fallback link).
-		$html = $this->get_oembed( array(
+		$html = $this->get_oembed(array(
 			'url'         => $oembed_url,
 			'object_id'   => $_REQUEST['object_id'],
-			'object_type' => isset( $_REQUEST['object_type'] ) ? $_REQUEST['object_type'] : 'post',
+			'object_type' => isset($_REQUEST['object_type']) ? $_REQUEST['object_type'] : 'post',
 			'oembed_args' => $embed_args,
 			'field_id'    => $_REQUEST['field_id'],
-		) );
+		));
 
-		wp_send_json_success( $html );
+		wp_send_json_success($html);
 	}
 
 	/**
@@ -107,22 +107,22 @@ 
 	 * @param  array $args Arguments for method.
 	 * @return mixed HTML markup with embed or fallback.
 	 */
-	public function get_oembed_no_edit( $args ) {
+	public function get_oembed_no_edit($args) {
 		global $wp_embed;
 
-		$oembed_url = esc_url( $args['url'] );
+		$oembed_url = esc_url($args['url']);
 
 		// Sanitize object_id.
-		$this->object_id = is_numeric( $args['object_id'] ) ? absint( $args['object_id'] ) : sanitize_text_field( $args['object_id'] );
+		$this->object_id = is_numeric($args['object_id']) ? absint($args['object_id']) : sanitize_text_field($args['object_id']);
 
-		$args = wp_parse_args( $args, array(
+		$args = wp_parse_args($args, array(
 			'object_type' => 'post',
 			'oembed_args' => array(),
 			'field_id'    => false,
 			'wp_error'    => false,
-		) );
+		));
 
-		$this->embed_args =& $args;
+		$this->embed_args = & $args;
 
 		/*
 		 * Set the post_ID so oEmbed won't fail
@@ -131,9 +131,9 @@ 
 		$wp_embed->post_ID = $this->object_id;
 
 		// Special scenario if NOT a post object.
-		if ( isset( $args['object_type'] ) && 'post' != $args['object_type'] ) {
+		if (isset($args['object_type']) && 'post' != $args['object_type']) {
 
-			if ( 'options-page' == $args['object_type'] ) {
+			if ('options-page' == $args['object_type']) {
 
 				// Bogus id to pass some numeric checks. Issue with a VERY large WP install?
 				$wp_embed->post_ID = 1987645321;
@@ -144,26 +144,26 @@ 
 			$this->object_type = $args['object_type'];
 
 			// Gets ombed cache from our object's meta (vs postmeta).
-			add_filter( 'get_post_metadata', array( $this, 'hijack_oembed_cache_get' ), 10, 3 );
+			add_filter('get_post_metadata', array($this, 'hijack_oembed_cache_get'), 10, 3);
 
 			// Sets ombed cache in our object's meta (vs postmeta).
-			add_filter( 'update_post_metadata', array( $this, 'hijack_oembed_cache_set' ), 10, 4 );
+			add_filter('update_post_metadata', array($this, 'hijack_oembed_cache_set'), 10, 4);
 
 		}
 
 		$embed_args = '';
 
-		foreach ( $args['oembed_args'] as $key => $val ) {
+		foreach ($args['oembed_args'] as $key => $val) {
 			$embed_args .= " $key=\"$val\"";
 		}
 
 		// Ping WordPress for an embed.
-		$embed = $wp_embed->run_shortcode( '[embed' . $embed_args . ']' . $oembed_url . '[/embed]' );
+		$embed = $wp_embed->run_shortcode('[embed' . $embed_args . ']' . $oembed_url . '[/embed]');
 
 		// Fallback that WordPress creates when no oEmbed was found.
-		$fallback = $wp_embed->maybe_make_link( $oembed_url );
+		$fallback = $wp_embed->maybe_make_link($oembed_url);
 
-		return compact( 'embed', 'fallback', 'args' );
+		return compact('embed', 'fallback', 'args');
 	}
 
 	/**
@@ -173,12 +173,12 @@ 
 	 * @param  array $args Arguments for method.
 	 * @return string HTML markup with embed or fallback.
 	 */
-	public function get_oembed( $args ) {
-		$oembed = $this->get_oembed_no_edit( $args );
+	public function get_oembed($args) {
+		$oembed = $this->get_oembed_no_edit($args);
 
 		// Send back our embed.
-		if ( $oembed['embed'] && $oembed['embed'] != $oembed['fallback'] ) {
-			return '<div class="cmb2-oembed embed-status">' . $oembed['embed'] . '<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button" rel="' . $oembed['args']['field_id'] . '">' . esc_html__( 'Remove Embed', 'cmb2' ) . '</a></p></div>';
+		if ($oembed['embed'] && $oembed['embed'] != $oembed['fallback']) {
+			return '<div class="cmb2-oembed embed-status">' . $oembed['embed'] . '<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button" rel="' . $oembed['args']['field_id'] . '">' . esc_html__('Remove Embed', 'cmb2') . '</a></p></div>';
 		}
 
 		// Otherwise, send back error info that no oEmbeds were found.
@@ -186,7 +186,7 @@ 
 			'<p class="ui-state-error-text">%s</p>',
 			sprintf(
 				/* translators: 1: results for. 2: link to codex.wordpress.org/Embeds */
-				esc_html__( 'No oEmbed Results Found for %1$s. View more info at %2$s.', 'cmb2' ),
+				esc_html__('No oEmbed Results Found for %1$s. View more info at %2$s.', 'cmb2'),
 				$oembed['fallback'],
 				'<a href="https://wordpress.org/support/article/embeds/" target="_blank">codex.wordpress.org/Embeds</a>'
 			)
@@ -203,16 +203,16 @@ 
 	 * @param  string  $meta_key  Object metakey.
 	 * @return mixed              Object's oEmbed cached data.
 	 */
-	public function hijack_oembed_cache_get( $check, $object_id, $meta_key ) {
-		if ( ! $this->hijack || ( $this->object_id != $object_id && 1987645321 !== $object_id ) ) {
+	public function hijack_oembed_cache_get($check, $object_id, $meta_key) {
+		if ( ! $this->hijack || ($this->object_id != $object_id && 1987645321 !== $object_id)) {
 			return $check;
 		}
 
-		if ( $this->ajax_update ) {
+		if ($this->ajax_update) {
 			return false;
 		}
 
-		return $this->cache_action( $meta_key );
+		return $this->cache_action($meta_key);
 	}
 
 	/**
@@ -226,18 +226,18 @@ 
 	 * @param  mixed   $meta_value Value of the postmeta to be saved.
 	 * @return boolean             Whether to continue setting.
 	 */
-	public function hijack_oembed_cache_set( $check, $object_id, $meta_key, $meta_value ) {
+	public function hijack_oembed_cache_set($check, $object_id, $meta_key, $meta_value) {
 
 		if (
 			! $this->hijack
-			|| ( $this->object_id != $object_id && 1987645321 !== $object_id )
+			|| ($this->object_id != $object_id && 1987645321 !== $object_id)
 			// Only want to hijack oembed meta values.
-			|| 0 !== strpos( $meta_key, '_oembed_' )
+			|| 0 !== strpos($meta_key, '_oembed_')
 		) {
 			return $check;
 		}
 
-		$this->cache_action( $meta_key, $meta_value );
+		$this->cache_action($meta_key, $meta_value);
 
 		// Anything other than `null` to cancel saving to postmeta.
 		return true;
@@ -251,28 +251,28 @@ 
 	 * @param string $meta_key Postmeta's key.
 	 * @return mixed
 	 */
-	protected function cache_action( $meta_key ) {
+	protected function cache_action($meta_key) {
 		$func_args = func_get_args();
-		$action    = isset( $func_args[1] ) ? 'update' : 'get';
+		$action    = isset($func_args[1]) ? 'update' : 'get';
 
-		if ( 'options-page' === $this->object_type ) {
+		if ('options-page' === $this->object_type) {
 
-			$args = array( $meta_key );
+			$args = array($meta_key);
 
-			if ( 'update' === $action ) {
+			if ('update' === $action) {
 				$args[] = $func_args[1];
 				$args[] = true;
 			}
 
 			// Cache the result to our options.
-			$status = call_user_func_array( array( cmb2_options( $this->object_id ), $action ), $args );
+			$status = call_user_func_array(array(cmb2_options($this->object_id), $action), $args);
 		} else {
 
-			$args = array( $this->object_type, $this->object_id, $meta_key );
+			$args = array($this->object_type, $this->object_id, $meta_key);
 			$args[] = 'update' === $action ? $func_args[1] : true;
 
 			// Cache the result to our metadata.
-			$status = call_user_func_array( $action . '_metadata', $args );
+			$status = call_user_func_array($action . '_metadata', $args);
 		}
 
 		return $status;
@@ -286,37 +286,37 @@ 
 	 * @param  string $option_key The options-page option key.
 	 * @return void
 	 */
-	public static function clean_stale_options_page_oembeds( $option_key ) {
-		$options = cmb2_options( $option_key )->get_options();
+	public static function clean_stale_options_page_oembeds($option_key) {
+		$options = cmb2_options($option_key)->get_options();
 		$modified = false;
-		if ( is_array( $options ) ) {
+		if (is_array($options)) {
 
-			$ttl = apply_filters( 'oembed_ttl', DAY_IN_SECONDS, '', array(), 0 );
+			$ttl = apply_filters('oembed_ttl', DAY_IN_SECONDS, '', array(), 0);
 			$now = time();
 
-			foreach ( $options as $key => $value ) {
+			foreach ($options as $key => $value) {
 				// Check for cached oembed data.
-				if ( 0 === strpos( $key, '_oembed_time_' ) ) {
-					$cached_recently = ( $now - $value ) < $ttl;
+				if (0 === strpos($key, '_oembed_time_')) {
+					$cached_recently = ($now - $value) < $ttl;
 
-					if ( ! $cached_recently ) {
+					if ( ! $cached_recently) {
 						$modified = true;
 						// Remove the the cached ttl expiration, and the cached oembed value.
-						unset( $options[ $key ] );
-						unset( $options[ str_replace( '_oembed_time_', '_oembed_', $key ) ] );
+						unset($options[$key]);
+						unset($options[str_replace('_oembed_time_', '_oembed_', $key)]);
 					}
 				} // End if.
 				// Remove the cached unknown values.
-				elseif ( '{{unknown}}' === $value ) {
+				elseif ('{{unknown}}' === $value) {
 					$modified = true;
-					unset( $options[ $key ] );
+					unset($options[$key]);
 				}
 			}
 		}
 
 		// Update the option and remove stale cache data.
-		if ( $modified ) {
-			$updated = cmb2_options( $option_key )->set( $options );
+		if ($modified) {
+			$updated = cmb2_options($option_key)->set($options);
 		}
 	}
 

vendor/CMB2/includes/CMB2_JS.php

Spacing +71 added lines, -71 removed lines

@@ -50,9 +50,9 @@ 
 	 * @since 2.0.7
 	 * @param array|string $dependencies Array (or string) of dependencies to add.
 	 */
-	public static function add_dependencies( $dependencies ) {
-		foreach ( (array) $dependencies as $dependency ) {
-			self::$dependencies[ $dependency ] = $dependency;
+	public static function add_dependencies($dependencies) {
+		foreach ((array) $dependencies as $dependency) {
+			self::$dependencies[$dependency] = $dependency;
 		}
 	}
 
@@ -63,10 +63,10 @@ 
 	 *
 	 * @param CMB2_Field $field Field object.
 	 */
-	public static function add_field_data( CMB2_Field $field ) {
+	public static function add_field_data(CMB2_Field $field) {
 		$hash = $field->hash_id();
-		if ( ! isset( self::$fields[ $hash ] ) ) {
-			self::$fields[ $hash ] = $field->js_data();
+		if ( ! isset(self::$fields[$hash])) {
+			self::$fields[$hash] = $field->js_data();
 		}
 	}
 
@@ -77,57 +77,57 @@ 
 	 */
 	public static function enqueue() {
 		// Filter required script dependencies.
-		$dependencies = self::$dependencies = apply_filters( 'cmb2_script_dependencies', self::$dependencies );
+		$dependencies = self::$dependencies = apply_filters('cmb2_script_dependencies', self::$dependencies);
 
 		// Only use minified files if SCRIPT_DEBUG is off.
-		$debug = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG;
+		$debug = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG;
 
 		$min = $debug ? '' : '.min';
 
 		// if colorpicker.
-		if ( isset( $dependencies['wp-color-picker'] ) ) {
-			if ( ! is_admin() ) {
+		if (isset($dependencies['wp-color-picker'])) {
+			if ( ! is_admin()) {
 				self::colorpicker_frontend();
 			}
 
-			if ( isset( $dependencies['wp-color-picker-alpha'] ) ) {
+			if (isset($dependencies['wp-color-picker-alpha'])) {
 				self::register_colorpicker_alpha();
 			}
 		}
 
 		// if file/file_list.
-		if ( isset( $dependencies['media-editor'] ) ) {
+		if (isset($dependencies['media-editor'])) {
 			wp_enqueue_media();
 			CMB2_Type_File_Base::output_js_underscore_templates();
 		}
 
 		// if timepicker.
-		if ( isset( $dependencies['jquery-ui-datetimepicker'] ) ) {
+		if (isset($dependencies['jquery-ui-datetimepicker'])) {
 			self::register_datetimepicker();
 		}
 
 		// if cmb2-wysiwyg.
-		$enqueue_wysiwyg = isset( $dependencies['cmb2-wysiwyg'] ) && $debug;
-		unset( $dependencies['cmb2-wysiwyg'] );
+		$enqueue_wysiwyg = isset($dependencies['cmb2-wysiwyg']) && $debug;
+		unset($dependencies['cmb2-wysiwyg']);
 
 		// if cmb2-char-counter.
-		$enqueue_char_counter = isset( $dependencies['cmb2-char-counter'] ) && $debug;
-		unset( $dependencies['cmb2-char-counter'] );
+		$enqueue_char_counter = isset($dependencies['cmb2-char-counter']) && $debug;
+		unset($dependencies['cmb2-char-counter']);
 
 		// Enqueue cmb JS.
-		wp_enqueue_script( self::$handle, CMB2_Utils::url( "js/cmb2{$min}.js" ), array_values( $dependencies ), CMB2_VERSION, true );
+		wp_enqueue_script(self::$handle, CMB2_Utils::url("js/cmb2{$min}.js"), array_values($dependencies), CMB2_VERSION, true);
 
 		// if SCRIPT_DEBUG, we need to enqueue separately.
-		if ( $enqueue_wysiwyg ) {
-			wp_enqueue_script( 'cmb2-wysiwyg', CMB2_Utils::url( 'js/cmb2-wysiwyg.js' ), array( 'jquery', 'wp-util' ), CMB2_VERSION );
+		if ($enqueue_wysiwyg) {
+			wp_enqueue_script('cmb2-wysiwyg', CMB2_Utils::url('js/cmb2-wysiwyg.js'), array('jquery', 'wp-util'), CMB2_VERSION);
 		}
-		if ( $enqueue_char_counter ) {
-			wp_enqueue_script( 'cmb2-char-counter', CMB2_Utils::url( 'js/cmb2-char-counter.js' ), array( 'jquery', 'wp-util' ), CMB2_VERSION );
+		if ($enqueue_char_counter) {
+			wp_enqueue_script('cmb2-char-counter', CMB2_Utils::url('js/cmb2-char-counter.js'), array('jquery', 'wp-util'), CMB2_VERSION);
 		}
 
-		self::localize( $debug );
+		self::localize($debug);
 
-		do_action( 'cmb2_footer_enqueue' );
+		do_action('cmb2_footer_enqueue');
 	}
 
 	/**
@@ -139,11 +139,11 @@ 
 	 *
 	 * @return void
 	 */
-	public static function register_colorpicker_alpha( $enqueue = false ) {
+	public static function register_colorpicker_alpha($enqueue = false) {
 		// Only use minified files if SCRIPT_DEBUG is off.
-		$min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$min = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 		$func = $enqueue ? 'wp_enqueue_script' : 'wp_register_script';
-		$func( 'wp-color-picker-alpha', CMB2_Utils::url( "js/wp-color-picker-alpha{$min}.js" ), array( 'wp-color-picker' ), '2.1.3' );
+		$func('wp-color-picker-alpha', CMB2_Utils::url("js/wp-color-picker-alpha{$min}.js"), array('wp-color-picker'), '2.1.3');
 	}
 
 	/**
@@ -155,9 +155,9 @@ 
 	 *
 	 * @return void
 	 */
-	public static function register_datetimepicker( $enqueue = false ) {
+	public static function register_datetimepicker($enqueue = false) {
 		$func = $enqueue ? 'wp_enqueue_script' : 'wp_register_script';
-		$func( 'jquery-ui-datetimepicker', CMB2_Utils::url( 'js/jquery-ui-timepicker-addon.min.js' ), array( 'jquery-ui-slider' ), '1.5.0' );
+		$func('jquery-ui-datetimepicker', CMB2_Utils::url('js/jquery-ui-timepicker-addon.min.js'), array('jquery-ui-slider'), '1.5.0');
 	}
 
 	/**
@@ -166,14 +166,14 @@ 
 	 * @since  2.0.7
 	 */
 	protected static function colorpicker_frontend() {
-		wp_register_script( 'iris', admin_url( 'js/iris.min.js' ), array( 'jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch' ), CMB2_VERSION );
-		wp_register_script( 'wp-color-picker', admin_url( 'js/color-picker.min.js' ), array( 'iris' ), CMB2_VERSION );
-		wp_localize_script( 'wp-color-picker', 'wpColorPickerL10n', array(
-			'clear'         => esc_html__( 'Clear', 'cmb2' ),
-			'defaultString' => esc_html__( 'Default', 'cmb2' ),
-			'pick'          => esc_html__( 'Select Color', 'cmb2' ),
-			'current'       => esc_html__( 'Current Color', 'cmb2' ),
-		) );
+		wp_register_script('iris', admin_url('js/iris.min.js'), array('jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch'), CMB2_VERSION);
+		wp_register_script('wp-color-picker', admin_url('js/color-picker.min.js'), array('iris'), CMB2_VERSION);
+		wp_localize_script('wp-color-picker', 'wpColorPickerL10n', array(
+			'clear'         => esc_html__('Clear', 'cmb2'),
+			'defaultString' => esc_html__('Default', 'cmb2'),
+			'pick'          => esc_html__('Select Color', 'cmb2'),
+			'current'       => esc_html__('Current Color', 'cmb2'),
+		));
 	}
 
 	/**
@@ -183,17 +183,17 @@ 
 	 *
 	 * @param mixed $debug Whether or not we are debugging.
 	 */
-	protected static function localize( $debug ) {
+	protected static function localize($debug) {
 		static $localized = false;
-		if ( $localized ) {
+		if ($localized) {
 			return;
 		}
 
 		$localized = true;
 		$l10n = array(
 			'fields'            => self::$fields,
-			'ajax_nonce'        => wp_create_nonce( 'ajax_nonce' ),
-			'ajaxurl'           => admin_url( '/admin-ajax.php' ),
+			'ajax_nonce'        => wp_create_nonce('ajax_nonce'),
+			'ajaxurl'           => admin_url('/admin-ajax.php'),
 			'script_debug'      => $debug,
 			'up_arrow_class'    => 'dashicons dashicons-arrow-up-alt2',
 			'down_arrow_class'  => 'dashicons dashicons-arrow-down-alt2',
@@ -204,49 +204,49 @@ 
 				'date_picker'  => array(
 					'changeMonth'     => true,
 					'changeYear'      => true,
-					'dateFormat'      => _x( 'mm/dd/yy', 'Valid formatDate string for jquery-ui datepicker', 'cmb2' ),
-					'dayNames'        => explode( ',', esc_html__( 'Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday', 'cmb2' ) ),
-					'dayNamesMin'     => explode( ',', esc_html__( 'Su, Mo, Tu, We, Th, Fr, Sa', 'cmb2' ) ),
-					'dayNamesShort'   => explode( ',', esc_html__( 'Sun, Mon, Tue, Wed, Thu, Fri, Sat', 'cmb2' ) ),
-					'monthNames'      => explode( ',', esc_html__( 'January, February, March, April, May, June, July, August, September, October, November, December', 'cmb2' ) ),
-					'monthNamesShort' => explode( ',', esc_html__( 'Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec', 'cmb2' ) ),
-					'nextText'        => esc_html__( 'Next', 'cmb2' ),
-					'prevText'        => esc_html__( 'Prev', 'cmb2' ),
-					'currentText'     => esc_html__( 'Today', 'cmb2' ),
-					'closeText'       => esc_html__( 'Done', 'cmb2' ),
-					'clearText'       => esc_html__( 'Clear', 'cmb2' ),
+					'dateFormat'      => _x('mm/dd/yy', 'Valid formatDate string for jquery-ui datepicker', 'cmb2'),
+					'dayNames'        => explode(',', esc_html__('Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday', 'cmb2')),
+					'dayNamesMin'     => explode(',', esc_html__('Su, Mo, Tu, We, Th, Fr, Sa', 'cmb2')),
+					'dayNamesShort'   => explode(',', esc_html__('Sun, Mon, Tue, Wed, Thu, Fri, Sat', 'cmb2')),
+					'monthNames'      => explode(',', esc_html__('January, February, March, April, May, June, July, August, September, October, November, December', 'cmb2')),
+					'monthNamesShort' => explode(',', esc_html__('Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec', 'cmb2')),
+					'nextText'        => esc_html__('Next', 'cmb2'),
+					'prevText'        => esc_html__('Prev', 'cmb2'),
+					'currentText'     => esc_html__('Today', 'cmb2'),
+					'closeText'       => esc_html__('Done', 'cmb2'),
+					'clearText'       => esc_html__('Clear', 'cmb2'),
 				),
 				'time_picker'  => array(
-					'timeOnlyTitle' => esc_html__( 'Choose Time', 'cmb2' ),
-					'timeText'      => esc_html__( 'Time', 'cmb2' ),
-					'hourText'      => esc_html__( 'Hour', 'cmb2' ),
-					'minuteText'    => esc_html__( 'Minute', 'cmb2' ),
-					'secondText'    => esc_html__( 'Second', 'cmb2' ),
-					'currentText'   => esc_html__( 'Now', 'cmb2' ),
-					'closeText'     => esc_html__( 'Done', 'cmb2' ),
-					'timeFormat'    => _x( 'hh:mm TT', 'Valid formatting string, as per http://trentrichardson.com/examples/timepicker/', 'cmb2' ),
+					'timeOnlyTitle' => esc_html__('Choose Time', 'cmb2'),
+					'timeText'      => esc_html__('Time', 'cmb2'),
+					'hourText'      => esc_html__('Hour', 'cmb2'),
+					'minuteText'    => esc_html__('Minute', 'cmb2'),
+					'secondText'    => esc_html__('Second', 'cmb2'),
+					'currentText'   => esc_html__('Now', 'cmb2'),
+					'closeText'     => esc_html__('Done', 'cmb2'),
+					'timeFormat'    => _x('hh:mm TT', 'Valid formatting string, as per http://trentrichardson.com/examples/timepicker/', 'cmb2'),
 					'controlType'   => 'select',
 					'stepMinute'    => 5,
 				),
 			),
 			'strings' => array(
-				'upload_file'  => esc_html__( 'Use this file', 'cmb2' ),
-				'upload_files' => esc_html__( 'Use these files', 'cmb2' ),
-				'remove_image' => esc_html__( 'Remove Image', 'cmb2' ),
-				'remove_file'  => esc_html__( 'Remove', 'cmb2' ),
-				'file'         => esc_html__( 'File:', 'cmb2' ),
-				'download'     => esc_html__( 'Download', 'cmb2' ),
-				'check_toggle' => esc_html__( 'Select / Deselect All', 'cmb2' ),
+				'upload_file'  => esc_html__('Use this file', 'cmb2'),
+				'upload_files' => esc_html__('Use these files', 'cmb2'),
+				'remove_image' => esc_html__('Remove Image', 'cmb2'),
+				'remove_file'  => esc_html__('Remove', 'cmb2'),
+				'file'         => esc_html__('File:', 'cmb2'),
+				'download'     => esc_html__('Download', 'cmb2'),
+				'check_toggle' => esc_html__('Select / Deselect All', 'cmb2'),
 			),
 		);
 
-		if ( isset( self::$dependencies['code-editor'] ) && function_exists( 'wp_enqueue_code_editor' ) ) {
-			$l10n['defaults']['code_editor'] = wp_enqueue_code_editor( array(
+		if (isset(self::$dependencies['code-editor']) && function_exists('wp_enqueue_code_editor')) {
+			$l10n['defaults']['code_editor'] = wp_enqueue_code_editor(array(
 				'type' => 'text/html',
-			) );
+			));
 		}
 
-		wp_localize_script( self::$handle, self::$js_variable, apply_filters( 'cmb2_localized_data', $l10n ) );
+		wp_localize_script(self::$handle, self::$js_variable, apply_filters('cmb2_localized_data', $l10n));
 	}
 
 }

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

Spacing +83 added lines, -83 removed lines

@@ -16,7 +16,7 @@ 
  * @param  string $path Path to append.
  * @return string        Directory with optional path appended
  */
-function cmb2_dir( $path = '' ) {
+function cmb2_dir($path = '') {
 	return CMB2_DIR . $path;
 }
 
@@ -26,22 +26,22 @@ 
  * @since  1.0.0
  * @param  string $class_name Name of the class being requested.
  */
-function cmb2_autoload_classes( $class_name ) {
-	if ( 0 !== strpos( $class_name, 'CMB2' ) ) {
+function cmb2_autoload_classes($class_name) {
+	if (0 !== strpos($class_name, 'CMB2')) {
 		return;
 	}
 
 	$path = 'includes';
 
-	if ( 'CMB2_Type' === $class_name || 0 === strpos( $class_name, 'CMB2_Type_' ) ) {
+	if ('CMB2_Type' === $class_name || 0 === strpos($class_name, 'CMB2_Type_')) {
 		$path .= '/types';
 	}
 
-	if ( 'CMB2_REST' === $class_name || 0 === strpos( $class_name, 'CMB2_REST_' ) ) {
+	if ('CMB2_REST' === $class_name || 0 === strpos($class_name, 'CMB2_REST_')) {
 		$path .= '/rest-api';
 	}
 
-	include_once( cmb2_dir( "$path/{$class_name}.php" ) );
+	include_once(cmb2_dir("$path/{$class_name}.php"));
 }
 
 /**
@@ -74,8 +74,8 @@ 
  * @param string $key Option key to fetch.
  * @return CMB2_Option object Options class for setting/getting options for metabox
  */
-function cmb2_options( $key ) {
-	return CMB2_Options::get( $key );
+function cmb2_options($key) {
+	return CMB2_Options::get($key);
 }
 
 /**
@@ -94,23 +94,23 @@ 
  *
  * @return string        oEmbed string
  */
-function cmb2_get_oembed( $args = array() ) {
-	$oembed = cmb2_ajax()->get_oembed_no_edit( $args );
+function cmb2_get_oembed($args = array()) {
+	$oembed = cmb2_ajax()->get_oembed_no_edit($args);
 
 	// Send back our embed.
-	if ( $oembed['embed'] && $oembed['embed'] != $oembed['fallback'] ) {
+	if ($oembed['embed'] && $oembed['embed'] != $oembed['fallback']) {
 		return '<div class="cmb2-oembed">' . $oembed['embed'] . '</div>';
 	}
 
 	$error = sprintf(
 		/* translators: 1: results for. 2: link to codex.wordpress.org/Embeds */
-		esc_html__( 'No oEmbed Results Found for %1$s. View more info at %2$s.', 'cmb2' ),
+		esc_html__('No oEmbed Results Found for %1$s. View more info at %2$s.', 'cmb2'),
 		$oembed['fallback'],
 		'<a href="https://wordpress.org/support/article/embeds/" target="_blank">codex.wordpress.org/Embeds</a>'
 	);
 
-	if ( isset( $args['wp_error'] ) && $args['wp_error'] ) {
-		return new WP_Error( 'cmb2_get_oembed_result', $error, compact( 'oembed', 'args' ) );
+	if (isset($args['wp_error']) && $args['wp_error']) {
+		return new WP_Error('cmb2_get_oembed_result', $error, compact('oembed', 'args'));
 	}
 
 	// Otherwise, send back error info that no oEmbeds were found.
@@ -125,10 +125,10 @@ 
  *
  * @param array $args oEmbed args.
  */
-function cmb2_do_oembed( $args = array() ) {
-	echo cmb2_get_oembed( $args );
+function cmb2_do_oembed($args = array()) {
+	echo cmb2_get_oembed($args);
 }
-add_action( 'cmb2_do_oembed', 'cmb2_do_oembed' );
+add_action('cmb2_do_oembed', 'cmb2_do_oembed');
 
 /**
  * A helper function to get an option from a CMB2 options array
@@ -139,8 +139,8 @@ 
  * @param  mixed  $default    Optional default fallback value.
  * @return array               Options array or specific field
  */
-function cmb2_get_option( $option_key, $field_id = '', $default = false ) {
-	return cmb2_options( $option_key )->get( $field_id, $default );
+function cmb2_get_option($option_key, $field_id = '', $default = false) {
+	return cmb2_options($option_key)->get($field_id, $default);
 }
 
 /**
@@ -153,9 +153,9 @@ 
  * @param  boolean $single     Whether data should not be an array.
  * @return boolean             Success/Failure
  */
-function cmb2_update_option( $option_key, $field_id, $value, $single = true ) {
-	if ( cmb2_options( $option_key )->update( $field_id, $value, false, $single ) ) {
-		return cmb2_options( $option_key )->set();
+function cmb2_update_option($option_key, $field_id, $value, $single = true) {
+	if (cmb2_options($option_key)->update($field_id, $value, false, $single)) {
+		return cmb2_options($option_key)->set();
 	}
 
 	return false;
@@ -172,18 +172,18 @@ 
  *                             Defaults to metabox object type.
  * @return CMB2_Field|null     CMB2_Field object unless metabox config cannot be found
  */
-function cmb2_get_field( $meta_box, $field_id, $object_id = 0, $object_type = '' ) {
+function cmb2_get_field($meta_box, $field_id, $object_id = 0, $object_type = '') {
 
 	$object_id = $object_id ? $object_id : get_the_ID();
-	$cmb = $meta_box instanceof CMB2 ? $meta_box : cmb2_get_metabox( $meta_box, $object_id );
+	$cmb = $meta_box instanceof CMB2 ? $meta_box : cmb2_get_metabox($meta_box, $object_id);
 
-	if ( ! $cmb ) {
+	if ( ! $cmb) {
 		return;
 	}
 
-	$cmb->object_type( $object_type ? $object_type : $cmb->mb_object_type() );
+	$cmb->object_type($object_type ? $object_type : $cmb->mb_object_type());
 
-	return $cmb->get_field( $field_id );
+	return $cmb->get_field($field_id);
 }
 
 /**
@@ -197,8 +197,8 @@ 
  *                             Defaults to metabox object type.
  * @return mixed               Maybe escaped value
  */
-function cmb2_get_field_value( $meta_box, $field_id, $object_id = 0, $object_type = '' ) {
-	$field = cmb2_get_field( $meta_box, $field_id, $object_id, $object_type );
+function cmb2_get_field_value($meta_box, $field_id, $object_id = 0, $object_type = '') {
+	$field = cmb2_get_field($meta_box, $field_id, $object_id, $object_type);
 	return $field->escaped_value();
 }
 
@@ -209,8 +209,8 @@ 
  * @param  array $meta_box_config Metabox Config array.
  * @return CMB2 object            Instantiated CMB2 object
  */
-function new_cmb2_box( array $meta_box_config ) {
-	return cmb2_get_metabox( $meta_box_config );
+function new_cmb2_box(array $meta_box_config) {
+	return cmb2_get_metabox($meta_box_config);
 }
 
 /**
@@ -223,27 +223,27 @@ 
  *                             Defaults to metabox object type.
  * @return CMB2 object
  */
-function cmb2_get_metabox( $meta_box, $object_id = 0, $object_type = '' ) {
+function cmb2_get_metabox($meta_box, $object_id = 0, $object_type = '') {
 
-	if ( $meta_box instanceof CMB2 ) {
+	if ($meta_box instanceof CMB2) {
 		return $meta_box;
 	}
 
-	if ( is_string( $meta_box ) ) {
-		$cmb = CMB2_Boxes::get( $meta_box );
+	if (is_string($meta_box)) {
+		$cmb = CMB2_Boxes::get($meta_box);
 	} else {
 		// See if we already have an instance of this metabox.
-		$cmb = CMB2_Boxes::get( $meta_box['id'] );
+		$cmb = CMB2_Boxes::get($meta_box['id']);
 		// If not, we'll initate a new metabox.
-		$cmb = $cmb ? $cmb : new CMB2( $meta_box, $object_id );
+		$cmb = $cmb ? $cmb : new CMB2($meta_box, $object_id);
 	}
 
-	if ( $cmb && $object_id ) {
-		$cmb->object_id( $object_id );
+	if ($cmb && $object_id) {
+		$cmb->object_id($object_id);
 	}
 
-	if ( $cmb && $object_type ) {
-		$cmb->object_type( $object_type );
+	if ($cmb && $object_type) {
+		$cmb->object_type($object_type);
 	}
 
 	return $cmb;
@@ -257,9 +257,9 @@ 
  * @param  array $data_to_sanitize Array of field_id => value data for sanitizing (likely $_POST data).
  * @return mixed                   Array of sanitized values or false if no CMB2 object found
  */
-function cmb2_get_metabox_sanitized_values( $meta_box, array $data_to_sanitize ) {
-	$cmb = cmb2_get_metabox( $meta_box );
-	return $cmb ? $cmb->get_sanitized_values( $data_to_sanitize ) : false;
+function cmb2_get_metabox_sanitized_values($meta_box, array $data_to_sanitize) {
+	$cmb = cmb2_get_metabox($meta_box);
+	return $cmb ? $cmb->get_sanitized_values($data_to_sanitize) : false;
 }
 
 /**
@@ -271,17 +271,17 @@ 
  * @param  array $args      Optional arguments array.
  * @return string             CMB2 html form markup
  */
-function cmb2_get_metabox_form( $meta_box, $object_id = 0, $args = array() ) {
+function cmb2_get_metabox_form($meta_box, $object_id = 0, $args = array()) {
 
 	$object_id = $object_id ? $object_id : get_the_ID();
-	$cmb       = cmb2_get_metabox( $meta_box, $object_id );
+	$cmb       = cmb2_get_metabox($meta_box, $object_id);
 
 	ob_start();
 	// Get cmb form.
-	cmb2_print_metabox_form( $cmb, $object_id, $args );
+	cmb2_print_metabox_form($cmb, $object_id, $args);
 	$form = ob_get_clean();
 
-	return apply_filters( 'cmb2_get_metabox_form', $form, $object_id, $cmb );
+	return apply_filters('cmb2_get_metabox_form', $form, $object_id, $cmb);
 }
 
 /**
@@ -292,59 +292,59 @@ 
  * @param  int   $object_id Object ID.
  * @param  array $args      Optional arguments array.
  */
-function cmb2_print_metabox_form( $meta_box, $object_id = 0, $args = array() ) {
+function cmb2_print_metabox_form($meta_box, $object_id = 0, $args = array()) {
 
 	$object_id = $object_id ? $object_id : get_the_ID();
-	$cmb = cmb2_get_metabox( $meta_box, $object_id );
+	$cmb = cmb2_get_metabox($meta_box, $object_id);
 
 	// if passing a metabox ID, and that ID was not found.
-	if ( ! $cmb ) {
+	if ( ! $cmb) {
 		return;
 	}
 
-	$args = wp_parse_args( $args, array(
+	$args = wp_parse_args($args, array(
 		'form_format' => '<form class="cmb-form" method="post" id="%1$s" enctype="multipart/form-data" encoding="multipart/form-data"><input type="hidden" name="object_id" value="%2$s">%3$s<input type="submit" name="submit-cmb" value="%4$s" class="button-primary"></form>',
-		'save_button' => esc_html__( 'Save', 'cmb2' ),
+		'save_button' => esc_html__('Save', 'cmb2'),
 		'object_type' => $cmb->mb_object_type(),
-		'cmb_styles'  => $cmb->prop( 'cmb_styles' ),
-		'enqueue_js'  => $cmb->prop( 'enqueue_js' ),
-	) );
+		'cmb_styles'  => $cmb->prop('cmb_styles'),
+		'enqueue_js'  => $cmb->prop('enqueue_js'),
+	));
 
 	// Set object type explicitly (rather than trying to guess from context).
-	$cmb->object_type( $args['object_type'] );
+	$cmb->object_type($args['object_type']);
 
 	// Save the metabox if it's been submitted
 	// check permissions
 	// @todo more hardening?
 	if (
-		$cmb->prop( 'save_fields' )
+		$cmb->prop('save_fields')
 		// check nonce.
-		&& isset( $_POST['submit-cmb'], $_POST['object_id'], $_POST[ $cmb->nonce() ] )
-		&& wp_verify_nonce( $_POST[ $cmb->nonce() ], $cmb->nonce() )
+		&& isset($_POST['submit-cmb'], $_POST['object_id'], $_POST[$cmb->nonce()])
+		&& wp_verify_nonce($_POST[$cmb->nonce()], $cmb->nonce())
 		&& $object_id && $_POST['object_id'] == $object_id
 	) {
-		$cmb->save_fields( $object_id, $cmb->object_type(), $_POST );
+		$cmb->save_fields($object_id, $cmb->object_type(), $_POST);
 	}
 
 	// Enqueue JS/CSS.
-	if ( $args['cmb_styles'] ) {
+	if ($args['cmb_styles']) {
 		CMB2_Hookup::enqueue_cmb_css();
 	}
 
-	if ( $args['enqueue_js'] ) {
+	if ($args['enqueue_js']) {
 		CMB2_Hookup::enqueue_cmb_js();
 	}
 
-	$form_format = apply_filters( 'cmb2_get_metabox_form_format', $args['form_format'], $object_id, $cmb );
+	$form_format = apply_filters('cmb2_get_metabox_form_format', $args['form_format'], $object_id, $cmb);
 
-	$format_parts = explode( '%3$s', $form_format );
+	$format_parts = explode('%3$s', $form_format);
 
 	// Show cmb form.
-	printf( $format_parts[0], esc_attr( $cmb->cmb_id ), esc_attr( $object_id ) );
+	printf($format_parts[0], esc_attr($cmb->cmb_id), esc_attr($object_id));
 	$cmb->show_form();
 
-	if ( isset( $format_parts[1] ) && $format_parts[1] ) {
-		printf( str_ireplace( '%4$s', '%1$s', $format_parts[1] ), esc_attr( $args['save_button'] ) );
+	if (isset($format_parts[1]) && $format_parts[1]) {
+		printf(str_ireplace('%4$s', '%1$s', $format_parts[1]), esc_attr($args['save_button']));
 	}
 
 }
@@ -358,15 +358,15 @@ 
  * @param  array $args      Optional arguments array.
  * @return string
  */
-function cmb2_metabox_form( $meta_box, $object_id = 0, $args = array() ) {
-	if ( ! isset( $args['echo'] ) || $args['echo'] ) {
-		cmb2_print_metabox_form( $meta_box, $object_id, $args );
+function cmb2_metabox_form($meta_box, $object_id = 0, $args = array()) {
+	if ( ! isset($args['echo']) || $args['echo']) {
+		cmb2_print_metabox_form($meta_box, $object_id, $args);
 	} else {
-		return cmb2_get_metabox_form( $meta_box, $object_id, $args );
+		return cmb2_get_metabox_form($meta_box, $object_id, $args);
 	}
 }
 
-if ( ! function_exists( 'date_create_from_format' ) ) {
+if ( ! function_exists('date_create_from_format')) {
 
 	/**
 	 * Reimplementation of DateTime::createFromFormat for PHP < 5.3. :(
@@ -377,11 +377,11 @@ 
 	 *
 	 * @return DateTime
 	 */
-	function date_create_from_format( $date_format, $date_value ) {
+	function date_create_from_format($date_format, $date_value) {
 
 		$schedule_format = str_replace(
-			array( 'M', 'Y', 'm', 'd', 'H', 'i', 'a' ),
-			array( '%b', '%Y', '%m', '%d', '%H', '%M', '%p' ),
+			array('M', 'Y', 'm', 'd', 'H', 'i', 'a'),
+			array('%b', '%Y', '%m', '%d', '%H', '%M', '%p'),
 			$date_format
 		);
 
@@ -389,7 +389,7 @@ 
 		 * %Y, %m and %d correspond to date()'s Y m and d.
 		 * %I corresponds to H, %M to i and %p to a
 		 */
-		$parsed_time = strptime( $date_value, $schedule_format );
+		$parsed_time = strptime($date_value, $schedule_format);
 
 		$ymd = sprintf(
 			/**
@@ -398,19 +398,19 @@ 
 			 * 4 or 2 characters, as needed
 			 */
 			'%04d-%02d-%02d %02d:%02d:%02d',
-			$parsed_time['tm_year'] + 1900,  // This will be "111", so we need to add 1900.
-			$parsed_time['tm_mon'] + 1,      // This will be the month minus one, so we add one.
+			$parsed_time['tm_year'] + 1900, // This will be "111", so we need to add 1900.
+			$parsed_time['tm_mon'] + 1, // This will be the month minus one, so we add one.
 			$parsed_time['tm_mday'],
 			$parsed_time['tm_hour'],
 			$parsed_time['tm_min'],
 			$parsed_time['tm_sec']
 		);
 
-		return new DateTime( $ymd );
+		return new DateTime($ymd);
 	}
 }// End if.
 
-if ( ! function_exists( 'date_timestamp_get' ) ) {
+if ( ! function_exists('date_timestamp_get')) {
 
 	/**
 	 * Returns the Unix timestamp representing the date.
@@ -420,7 +420,7 @@ 
 	 *
 	 * @return int
 	 */
-	function date_timestamp_get( DateTime $date ) {
-		return $date->format( 'U' );
+	function date_timestamp_get(DateTime $date) {
+		return $date->format('U');
 	}
 }// End if.

vendor/CMB2/includes/CMB2_Boxes.php

Spacing +23 added lines, -23 removed lines

@@ -26,8 +26,8 @@ 
 	 *
 	 * @param CMB2 $cmb_instance CMB2 instance.
 	 */
-	public static function add( CMB2 $cmb_instance ) {
-		self::$cmb2_instances[ $cmb_instance->cmb_id ] = $cmb_instance;
+	public static function add(CMB2 $cmb_instance) {
+		self::$cmb2_instances[$cmb_instance->cmb_id] = $cmb_instance;
 	}
 
 	/**
@@ -37,9 +37,9 @@ 
 	 *
 	 * @param string $cmb_id A CMB2 instance id.
 	 */
-	public static function remove( $cmb_id ) {
-		if ( array_key_exists( $cmb_id, self::$cmb2_instances ) ) {
-			unset( self::$cmb2_instances[ $cmb_id ] );
+	public static function remove($cmb_id) {
+		if (array_key_exists($cmb_id, self::$cmb2_instances)) {
+			unset(self::$cmb2_instances[$cmb_id]);
 		}
 	}
 
@@ -52,12 +52,12 @@ 
 	 *
 	 * @return CMB2|bool False or CMB2 object instance.
 	 */
-	public static function get( $cmb_id ) {
-		if ( empty( self::$cmb2_instances ) || empty( self::$cmb2_instances[ $cmb_id ] ) ) {
+	public static function get($cmb_id) {
+		if (empty(self::$cmb2_instances) || empty(self::$cmb2_instances[$cmb_id])) {
 			return false;
 		}
 
-		return self::$cmb2_instances[ $cmb_id ];
+		return self::$cmb2_instances[$cmb_id];
 	}
 
 	/**
@@ -78,21 +78,21 @@ 
 	 * @param  mixed  $compare  (Optional) The value to compare.
 	 * @return CMB2[]           Array of matching cmb2 instances.
 	 */
-	public static function get_by( $property, $compare = 'nocompare' ) {
+	public static function get_by($property, $compare = 'nocompare') {
 		$boxes = array();
 
-		foreach ( self::$cmb2_instances as $cmb_id => $cmb ) {
-			$prop = $cmb->prop( $property );
+		foreach (self::$cmb2_instances as $cmb_id => $cmb) {
+			$prop = $cmb->prop($property);
 
-			if ( 'nocompare' === $compare ) {
-				if ( ! empty( $prop ) ) {
-					$boxes[ $cmb_id ] = $cmb;
+			if ('nocompare' === $compare) {
+				if ( ! empty($prop)) {
+					$boxes[$cmb_id] = $cmb;
 				}
 				continue;
 			}
 
-			if ( $compare === $prop ) {
-				$boxes[ $cmb_id ] = $cmb;
+			if ($compare === $prop) {
+				$boxes[$cmb_id] = $cmb;
 			}
 		}
 
@@ -107,16 +107,16 @@ 
 	 * @param  mixed  $to_ignore The value to ignore.
 	 * @return CMB2[]            Array of matching cmb2 instances.
 	 */
-	public static function filter_by( $property, $to_ignore = null ) {
+	public static function filter_by($property, $to_ignore = null) {
 		$boxes = array();
 
-		foreach ( self::$cmb2_instances as $cmb_id => $cmb ) {
+		foreach (self::$cmb2_instances as $cmb_id => $cmb) {
 
-			if ( $to_ignore === $cmb->prop( $property ) ) {
+			if ($to_ignore === $cmb->prop($property)) {
 				continue;
 			}
 
-			$boxes[ $cmb_id ] = $cmb;
+			$boxes[$cmb_id] = $cmb;
 		}
 
 		return $boxes;
@@ -132,8 +132,8 @@ 
 	 * @param  mixed  $to_ignore The value to ignore.
 	 * @return CMB2[]            Array of matching cmb2 instances.
 	 */
-	public static function get_by_property( $property, $to_ignore = null ) {
-		_deprecated_function( __METHOD__, '2.4.0', 'CMB2_Boxes::filter_by()' );
-		return self::filter_by( $property );
+	public static function get_by_property($property, $to_ignore = null) {
+		_deprecated_function(__METHOD__, '2.4.0', 'CMB2_Boxes::filter_by()');
+		return self::filter_by($property);
 	}
 }