WebDevStudios / CMB2

includes/CMB2_Field.php

Doc Comments +2 added lines, -2 removed lines

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

Spacing +78 added lines, -78 removed lines

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

includes/types/CMB2_Type_Taxonomy_Select.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 	public function render() {
 		$names = $this->get_object_terms();
 
-		$saved_term  = is_wp_error( $names ) || empty( $names ) ? $this->field->get_default() : $names[key( $names )]->slug;
+		$saved_term  = is_wp_error( $names ) || empty( $names ) ? $this->field->get_default() : $names[ key( $names ) ]->slug;
 		$terms       = $this->get_terms();
 		$options     = '';
 		$option_none = $this->field->args( 'show_option_none' );

includes/CMB2_Field_Display.php

Spacing +12 added lines, -12 removed lines

@@ -124,7 +124,7 @@ 
 			if ( is_array( $this->field->value ) ) {
 
 				// Then loop and output.
-				echo '<ul class="cmb2-'. str_replace( '_', '-', $this->field->type() ) .'">';
+				echo '<ul class="cmb2-' . str_replace( '_', '-', $this->field->type() ) . '">';
 				foreach ( $this->field->value as $val ) {
 					$this->value = $val;
 					echo '<li>', $this->_display(), '</li>';
@@ -197,8 +197,8 @@ 
 		$options = $this->field->options();
 
 		$fallback = $this->field->args( 'show_option_none' );
-		if ( ! $fallback && isset( $options[''] ) ) {
-			$fallback = $options[''];
+		if ( ! $fallback && isset( $options[ '' ] ) ) {
+			$fallback = $options[ '' ];
 		}
 		if ( ! $this->value && $fallback ) {
 			echo $fallback;
@@ -225,9 +225,9 @@ 
 		$output = array();
 		foreach ( $this->value as $val ) {
 			if ( isset( $options[ $val ] ) ) {
-				$output[] = $options[ $val ];
+				$output[ ] = $options[ $val ];
 			} else {
-				$output[] = esc_attr( $val );
+				$output[ ] = esc_attr( $val );
 			}
 		}
 
@@ -251,7 +251,7 @@ 
 	 * @since 2.2.2
 	 */
 	protected function _display() {
-		echo '<xmp class="cmb2-code">'. print_r( $this->value, true ) .'</xmp>';
+		echo '<xmp class="cmb2-code">' . print_r( $this->value, true ) . '</xmp>';
 	}
 }
 
@@ -293,7 +293,7 @@ 
 		if ( $datetime && $datetime instanceof DateTime ) {
 			$tz       = $datetime->getTimezone();
 			$tzstring = $tz->getName();
-			$this->value    = $datetime->getTimestamp();
+			$this->value = $datetime->getTimestamp();
 		}
 
 		$date = $this->field->get_timestamp_format( 'date_format', $this->value );
@@ -317,7 +317,7 @@ 
 		if ( is_wp_error( $terms ) || empty( $terms ) && ( $default = $this->field->get_default() ) ) {
 			$term = get_term_by( 'slug', $default, $taxonomy );
 		} elseif ( ! empty( $terms ) ) {
-			$term = $terms[key( $terms )];
+			$term = $terms[ key( $terms ) ];
 		}
 
 		if ( $term ) {
@@ -341,10 +341,10 @@ 
 			$terms = array();
 			if ( is_array( $default ) ) {
 				foreach ( $default as $slug ) {
-					$terms[] = get_term_by( 'slug', $slug, $taxonomy );
+					$terms[ ] = get_term_by( 'slug', $slug, $taxonomy );
 				}
 			} else {
-				$terms[] = get_term_by( 'slug', $default, $taxonomy );
+				$terms[ ] = get_term_by( 'slug', $default, $taxonomy );
 			}
 		}
 
@@ -353,7 +353,7 @@ 
 			$links = array();
 			foreach ( $terms as $term ) {
 				$link = get_edit_term_link( $term->term_id, $taxonomy );
-				$links[] = '<a href="'. esc_url( $link ) .'">'. esc_html( $term->name ) .'</a>';
+				$links[ ] = '<a href="' . esc_url( $link ) . '">' . esc_html( $term->name ) . '</a>';
 			}
 			// Then loop and output.
 			echo '<div class="cmb2-taxonomy-terms-', esc_attr( $taxonomy ), '">';
@@ -396,7 +396,7 @@ 
 			if ( $id ) {
 				$image = wp_get_attachment_image( $id, $img_size, null, array( 'class' => 'cmb-image-display' ) );
 			} else {
-				$size = is_array( $img_size ) ? $img_size[0] : 200;
+				$size = is_array( $img_size ) ? $img_size[ 0 ] : 200;
 				$image = '<img class="cmb-image-display" style="max-width: ' . absint( $size ) . 'px; width: 100%; height: auto;" src="' . $url_value . '" alt="" />';
 			}
 

includes/CMB2_hookup.php

Spacing +15 added lines, -15 removed lines

@@ -119,7 +119,7 @@ 
 
 		if ( $this->cmb->has_columns ) {
 			add_filter( 'manage_edit-comments_columns', array( $this, 'register_column_headers' ) );
-			add_action( 'manage_comments_custom_column', array( $this, 'column_display'  ), 10, 3 );
+			add_action( 'manage_comments_custom_column', array( $this, 'column_display' ), 10, 3 );
 		}
 	}
 
@@ -136,7 +136,7 @@ 
 
 		if ( $this->cmb->has_columns ) {
 			add_filter( 'manage_users_columns', array( $this, 'register_column_headers' ) );
-			add_filter( 'manage_users_custom_column', array( $this, 'return_column_display'  ), 10, 3 );
+			add_filter( 'manage_users_custom_column', array( $this, 'return_column_display' ), 10, 3 );
 		}
 	}
 
@@ -170,7 +170,7 @@ 
 
 			if ( $this->cmb->has_columns ) {
 				add_filter( "manage_edit-{$taxonomy}_columns", array( $this, 'register_column_headers' ) );
-				add_filter( "manage_{$taxonomy}_custom_column", array( $this, 'return_column_display'  ), 10, 3 );
+				add_filter( "manage_{$taxonomy}_custom_column", array( $this, 'return_column_display' ), 10, 3 );
 			}
 		}
 
@@ -263,25 +263,25 @@ 
 		$fields = $this->cmb->prop( 'fields' );
 
 		foreach ( $fields as $key => $field ) {
-			if ( ! isset( $field['column'] ) ) {
+			if ( ! isset( $field[ 'column' ] ) ) {
 				continue;
 			}
 
-			$column = $field['column'];
+			$column = $field[ 'column' ];
 
-			if ( false === $column['position'] ) {
+			if ( false === $column[ 'position' ] ) {
 
-				$columns[ $field['id'] ] = $column['name'];
+				$columns[ $field[ 'id' ] ] = $column[ 'name' ];
 
 			} else {
 
-				$before = array_slice( $columns, 0, absint( $column['position'] ) );
-				$before[ $field['id'] ] = $column['name'];
+				$before = array_slice( $columns, 0, absint( $column[ 'position' ] ) );
+				$before[ $field[ 'id' ] ] = $column[ 'name' ];
 				$columns = $before + $columns;
 			}
 
-			$column['field'] = $field;
-			$this->columns[ $field['id'] ] = $column;
+			$column[ 'field' ] = $field;
+			$this->columns[ $field[ 'id' ] ] = $column;
 		}
 
 		return $columns;
@@ -294,7 +294,7 @@ 
 	public function column_display( $column_name, $object_id ) {
 		if ( isset( $this->columns[ $column_name ] ) ) {
  			$field = new CMB2_Field( array(
-				'field_args'  => $this->columns[ $column_name ]['field'],
+				'field_args'  => $this->columns[ $column_name ][ 'field' ],
 				'object_type' => $this->object_type,
 				'object_id'   => $this->cmb->object_id( $object_id ),
 				'cmb_id'      => $this->cmb->cmb_id,
@@ -355,7 +355,7 @@ 
 	 * @return array           Modified array of classes
 	 */
 	public function close_metabox_class( $classes ) {
-		$classes[] = 'closed';
+		$classes[ ] = 'closed';
 		return $classes;
 	}
 
@@ -375,7 +375,7 @@ 
 	public function user_new_metabox( $section ) {
 		if ( $section == $this->cmb->prop( 'new_user_section' ) ) {
 			$object_id = $this->cmb->object_id();
-			$this->cmb->object_id( isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id );
+			$this->cmb->object_id( isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id );
 			$this->user_metabox();
 		}
 	}
@@ -555,7 +555,7 @@ 
 		if ( $this->taxonomy_can_save( $taxonomy ) ) {
 
 			foreach ( $this->cmb->prop( 'fields' ) as $field ) {
-				$data_to_delete[ $field['id'] ] = '';
+				$data_to_delete[ $field[ 'id' ] ] = '';
 			}
 
 			$this->cmb->save_fields( $term_id, 'term', $data_to_delete );

includes/helper-functions.php

Spacing +23 added lines, -23 removed lines

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

includes/CMB2_Ajax.php

Spacing +20 added lines, -20 removed lines

@@ -59,12 +59,12 @@ 
 	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 ) ) {
@@ -72,7 +72,7 @@ 
 		}
 
 		// 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 );
@@ -85,10 +85,10 @@ 
 		// Get embed code (or fallback link)
 		$html = $this->get_oembed( array(
 			'url'         => $oembed_url,
-			'object_id'   => $_REQUEST['object_id'],
-			'object_type' => isset( $_REQUEST['object_type'] ) ? $_REQUEST['object_type'] : 'post',
+			'object_id'   => $_REQUEST[ 'object_id' ],
+			'object_type' => isset( $_REQUEST[ 'object_type' ] ) ? $_REQUEST[ 'object_type' ] : 'post',
 			'oembed_args' => $embed_args,
-			'field_id'    => $_REQUEST['field_id'],
+			'field_id'    => $_REQUEST[ 'field_id' ],
 		) );
 
 		wp_send_json_success( $html );
@@ -103,10 +103,10 @@ 
 	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(
 			'object_type' => 'post',
@@ -115,7 +115,7 @@ 
 			'wp_error'    => false,
 		) );
 
-		$this->embed_args =& $args;
+		$this->embed_args = & $args;
 
 		/**
 		 * Set the post_ID so oEmbed won't fail
@@ -124,9 +124,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;
@@ -134,7 +134,7 @@ 
 
 			// Ok, we need to hijack the oembed cache system
 			$this->hijack = true;
-			$this->object_type = $args['object_type'];
+			$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 );
@@ -146,7 +146,7 @@ 
 
 		$embed_args = '';
 
-		foreach ( $args['oembed_args'] as $key => $val ) {
+		foreach ( $args[ 'oembed_args' ] as $key => $val ) {
 			$embed_args .= " $key=\"$val\"";
 		}
 
@@ -169,8 +169,8 @@ 
 		$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
@@ -179,7 +179,7 @@ 
 			sprintf(
 				/* translators: 1: results for. 2: link to codex.wordpress.org/Embeds */
 				esc_html__( 'No oEmbed Results Found for %1$s. View more info at %2$s.', 'cmb2' ),
-				$oembed['fallback'],
+				$oembed[ 'fallback' ],
 				'<a href="https://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>'
 			)
 		);
@@ -244,15 +244,15 @@ 
 	 */
 	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 ) {
 
 			$args = array( $meta_key );
 
 			if ( 'update' === $action ) {
-				$args[] = $func_args[1];
-				$args[] = true;
+				$args[ ] = $func_args[ 1 ];
+				$args[ ] = true;
 			}
 
 			// Cache the result to our options
@@ -260,7 +260,7 @@ 
 		} else {
 
 			$args = array( $this->object_type, $this->object_id, $meta_key );
-			$args[] = 'update' === $action ? $func_args : true;
+			$args[ ] = 'update' === $action ? $func_args : true;
 
 			// Cache the result to our metadata
 			$status = call_user_func_array( $action . '_metadata', $args );

includes/CMB2_JS.php

Spacing +5 added lines, -5 removed lines

@@ -56,23 +56,23 @@
 		$min = $debug ? '' : '.min';
 
 		// if colorpicker
-		if ( ! is_admin() && isset( $dependencies['wp-color-picker'] ) ) {
+		if ( ! is_admin() && isset( $dependencies[ 'wp-color-picker' ] ) ) {
 			self::colorpicker_frontend();
 		}
 
 		// if file/file_list
-		if ( isset( $dependencies['media-editor'] ) ) {
+		if ( isset( $dependencies[ 'media-editor' ] ) ) {
 			wp_enqueue_media();
 		}
 
 		// if timepicker
-		if ( isset( $dependencies['jquery-ui-datetimepicker'] ) ) {
+		if ( isset( $dependencies[ 'jquery-ui-datetimepicker' ] ) ) {
 			wp_register_script( 'jquery-ui-datetimepicker', cmb2_utils()->url( 'js/jquery-ui-timepicker-addon.min.js' ), array( 'jquery-ui-slider' ), CMB2_VERSION );
 		}
 
 		// 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' ] );
 
 		// Enqueue cmb JS
 		wp_enqueue_script( self::$handle, cmb2_utils()->url( "js/cmb2{$min}.js" ), $dependencies, CMB2_VERSION, true );

includes/types/CMB2_Type_Wysiwyg.php

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
 		) );
 
 		if ( ! $field->group ) {
-			return $this->rendered( $this->get_wp_editor( $a ) . $a['desc'] );
+			return $this->rendered( $this->get_wp_editor( $a ) . $a[ 'desc' ] );
 		}
 
 		// wysiwyg fields in a group need some special handling.
@@ -52,7 +52,7 @@ 
 
 	protected function get_wp_editor( $args ) {
 		ob_start();
-		wp_editor( $args['value'], $args['id'], $args['options'] );
+		wp_editor( $args[ 'value' ], $args[ 'id' ], $args[ 'options' ] );
 		return ob_get_clean();
 	}
 
@@ -60,7 +60,7 @@ 
 		$group_id = $this->field->group->id();
 		$field_id = $this->field->id( true );
 		$options  = $this->field->options();
-		$options['textarea_name'] = 'cmb2_n_' . $group_id . $field_id;
+		$options[ 'textarea_name' ] = 'cmb2_n_' . $group_id . $field_id;
 
 		// Initate the editor with special id/value/name so we can retrieve the options in JS.
 		$editor = $this->get_wp_editor( array(
@@ -83,7 +83,7 @@ 
 		// And put the editor instance in a JS template wrapper.
 		echo '<script type="text/template" id="tmpl-cmb2-wysiwyg-' . $group_id . '-' . $field_id . '">';
 		// Need to wrap the template in a wrapper div w/ specific data attributes which will be used when adding/removing rows.
-		echo '<div class="cmb2-wysiwyg-inner-wrap" data-iterator="{{ data.iterator }}" data-groupid="'. $group_id .'" data-id="'. $field_id .'">'. $editor .'</div>';
+		echo '<div class="cmb2-wysiwyg-inner-wrap" data-iterator="{{ data.iterator }}" data-groupid="' . $group_id . '" data-id="' . $field_id . '">' . $editor . '</div>';
 		echo '</script>';
 	}
 

includes/types/CMB2_Type_Title.php

Spacing +3 added lines, -3 removed lines

@@ -28,10 +28,10 @@
 		return $this->rendered(
 			sprintf(
 				'<%1$s %2$s>%3$s</%1$s>%4$s',
-				$a['tag'],
+				$a[ 'tag' ],
 				$this->concat_attrs( $a, array( 'tag', 'name', 'desc' ) ),
-				$a['name'],
-				$a['desc']
+				$a[ 'name' ],
+				$a[ 'desc' ]
 			)
 		);
 	}