WebDevStudios / CMB2

includes/rest-api/CMB2_REST.php

Doc Comments +2 added lines, -1 removed lines

@@ -208,6 +208,7 @@ 
 	 * @param string|array $object_types Object(s) the field is being registered
 	 *                                   to, "post"|"term"|"comment" etc.
 	 * @param string       $object_types       Canonical object type for callbacks.
+	 * @param string $object_type
 	 *
 	 * @return void
 	 */
@@ -706,7 +707,7 @@ 
 	 * Retrieve all CMB2_REST instances from the registry.
 	 *
 	 * @since  2.2.3
-	 * @return CMB2[] Array of all registered CMB2_REST instances.
+	 * @return CMB2_REST[] Array of all registered CMB2_REST instances.
 	 */
 	public static function get_all() {
 		return self::$boxes;

Spacing +21 added lines, -21 removed lines

@@ -154,30 +154,30 @@ 
 		foreach ( self::$boxes as $cmb_id => $rest_box ) {
 			$types = array_flip( $rest_box->cmb->box_types() );
 
-			if ( isset( $types['user'] ) ) {
-				unset( $types['user'] );
-				self::$type_boxes['user'][ $cmb_id ] = $cmb_id;
+			if ( isset( $types[ 'user' ] ) ) {
+				unset( $types[ 'user' ] );
+				self::$type_boxes[ 'user' ][ $cmb_id ] = $cmb_id;
 			}
 
-			if ( isset( $types['comment'] ) ) {
-				unset( $types['comment'] );
-				self::$type_boxes['comment'][ $cmb_id ] = $cmb_id;
+			if ( isset( $types[ 'comment' ] ) ) {
+				unset( $types[ 'comment' ] );
+				self::$type_boxes[ 'comment' ][ $cmb_id ] = $cmb_id;
 			}
 
-			if ( isset( $types['term'] ) ) {
-				unset( $types['term'] );
+			if ( isset( $types[ 'term' ] ) ) {
+				unset( $types[ 'term' ] );
 
 				$taxonomies = array_merge(
 					$taxonomies,
 					CMB2_Utils::ensure_array( $rest_box->cmb->prop( 'taxonomies' ) )
 				);
 
-				self::$type_boxes['term'][ $cmb_id ] = $cmb_id;
+				self::$type_boxes[ 'term' ][ $cmb_id ] = $cmb_id;
 			}
 
 			if ( ! empty( $types ) ) {
 				$alltypes = array_merge( $alltypes, array_flip( $types ) );
-				self::$type_boxes['post'][ $cmb_id ] = $cmb_id;
+				self::$type_boxes[ 'post' ][ $cmb_id ] = $cmb_id;
 			}
 		}
 
@@ -187,15 +187,15 @@ 
 			self::register_rest_field( $alltypes, 'post' );
 		}
 
-		if ( ! empty( self::$type_boxes['user'] ) ) {
+		if ( ! empty( self::$type_boxes[ 'user' ] ) ) {
 			self::register_rest_field( 'user', 'user' );
 		}
 
-		if ( ! empty( self::$type_boxes['comment'] ) ) {
+		if ( ! empty( self::$type_boxes[ 'comment' ] ) ) {
 			self::register_rest_field( 'comment', 'comment' );
 		}
 
-		if ( ! empty( self::$type_boxes['term'] ) ) {
+		if ( ! empty( self::$type_boxes[ 'term' ] ) ) {
 			self::register_rest_field( $taxonomies, 'term' );
 		}
 	}
@@ -228,18 +228,18 @@ 
 	 */
 	protected function declare_read_edit_fields() {
 		foreach ( $this->cmb->prop( 'fields' ) as $field ) {
-			$show_in_rest = isset( $field['show_in_rest'] ) ? $field['show_in_rest'] : null;
+			$show_in_rest = isset( $field[ 'show_in_rest' ] ) ? $field[ 'show_in_rest' ] : null;
 
 			if ( false === $show_in_rest ) {
 				continue;
 			}
 
 			if ( $this->can_read( $show_in_rest ) ) {
-				$this->read_fields[] = $field['id'];
+				$this->read_fields[ ] = $field[ 'id' ];
 			}
 
 			if ( $this->can_edit( $show_in_rest ) ) {
-				$this->edit_fields[] = $field['id'];
+				$this->edit_fields[ ] = $field[ 'id' ];
 			}
 		}
 	}
@@ -369,7 +369,7 @@ 
 	 * @return mixed
 	 */
 	protected static function get_rest_values( $object, $request, $object_type, $main_object_type = 'post' ) {
-		if ( ! isset( $object['id'] ) ) {
+		if ( ! isset( $object[ 'id' ] ) ) {
 			return;
 		}
 
@@ -380,12 +380,12 @@ 
 				$rest_box = self::$boxes[ $cmb_id ];
 
 				foreach ( $rest_box->read_fields as $field_id ) {
-					$rest_box->cmb->object_id( $object['id'] );
+					$rest_box->cmb->object_id( $object[ 'id' ] );
 					$rest_box->cmb->object_type( $main_object_type );
 
 					$field = $rest_box->cmb->get_field( $field_id );
 
-					$field->object_id( $object['id'] );
+					$field->object_id( $object[ 'id' ] );
 					$field->object_type( $main_object_type );
 
 					$values[ $cmb_id ][ $field->id( true ) ] = $field->get_data();
@@ -619,8 +619,8 @@ 
 					return intval( $object->comment_ID );
 				}
 			case 'term':
-				if ( is_array( $object ) && isset( $object['term_id'] ) ) {
-					return intval( $object['term_id'] );
+				if ( is_array( $object ) && isset( $object[ 'term_id' ] ) ) {
+					return intval( $object[ 'term_id' ] );
 				} elseif ( isset( $object->term_id ) ) {
 					return intval( $object->term_id );
 				}

includes/types/CMB2_Type_Textarea_Code.php

Doc Comments -1 removed lines

@@ -16,7 +16,6 @@
 	 * Handles outputting an 'textarea' element
 	 *
 	 * @since  1.1.0
-	 * @param  array $args Override arguments
 	 * @return string       Form textarea element
 	 */
 	public function render() {

includes/types/CMB2_Type_Multi_Base.php

Spacing +11 added lines, -11 removed lines

@@ -20,7 +20,7 @@ 
 	 * @return string       Generated option element html
 	 */
 	public function select_option( $args = array() ) {
-		return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args['value'], selected( isset( $args['checked'] ) && $args['checked'], true, false ), $args['label'] ) . "\n";
+		return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args[ 'value' ], selected( isset( $args[ 'checked' ] ) && $args[ 'checked' ], true, false ), $args[ 'label' ] ) . "\n";
 	}
 
 	/**
@@ -41,7 +41,7 @@ 
 			'label' => '',
 		), $args );
 
-		return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a['id'], $a['label'] );
+		return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a[ 'id' ], $a[ 'label' ] );
 	}
 
 	/**
@@ -54,10 +54,10 @@ 
 	 */
 	public function list_input_checkbox( $args, $i ) {
 		$saved_value = $this->field->escaped_value();
-		if ( is_array( $saved_value ) && in_array( $args['value'], $saved_value ) ) {
-			$args['checked'] = 'checked';
+		if ( is_array( $saved_value ) && in_array( $args[ 'value' ], $saved_value ) ) {
+			$args[ 'checked' ] = 'checked';
 		}
-		$args['type'] = 'checkbox';
+		$args[ 'type' ] = 'checkbox';
 		return $this->list_input( $args, $i );
 	}
 
@@ -71,8 +71,8 @@ 
 	public function concat_items( $args = array() ) {
 		$field = $this->field;
 
-		$method = isset( $args['method'] ) ? $args['method'] : 'select_option';
-		unset( $args['method'] );
+		$method = isset( $args[ 'method' ] ) ? $args[ 'method' ] : 'select_option';
+		unset( $args[ 'method' ] );
 
 		$value = null !== $field->escaped_value()
 			? $field->escaped_value()
@@ -87,7 +87,7 @@ 
 
 		$options = array();
 		if ( $option_none = $field->args( 'show_option_none' ) ) {
-			$options[''] = $option_none;
+			$options[ '' ] = $option_none;
 		}
 		$options = $options + (array) $field->options();
 		foreach ( $options as $opt_value => $opt_label ) {
@@ -95,12 +95,12 @@ 
 			// Clone args & modify for just this item
 			$a = $args;
 
-			$a['value'] = $opt_value;
-			$a['label'] = $opt_label;
+			$a[ 'value' ] = $opt_value;
+			$a[ 'label' ] = $opt_label;
 
 			// Check if this option is the value of the input
 			if ( $value === $opt_value ) {
-				$a['checked'] = 'checked';
+				$a[ 'checked' ] = 'checked';
 			}
 
 			$concatenated_items .= $this->$method( $a, $i++ );

includes/types/CMB2_Type_File_List.php

Spacing +2 added lines, -2 removed lines

@@ -29,8 +29,8 @@
 			'size'  => 45,
 			'desc'  => '',
 			'value'  => '',
-			'data-previewsize' => sprintf( '[%d,%d]', $img_size_data['width'], $img_size_data['height'] ),
-			'data-sizename'    => $img_size_data['name'],
+			'data-previewsize' => sprintf( '[%d,%d]', $img_size_data[ 'width' ], $img_size_data[ 'height' ] ),
+			'data-sizename'    => $img_size_data[ 'name' ],
 			'data-queryargs'   => ! empty( $query_args ) ? json_encode( $query_args ) : '',
 			'js_dependencies'  => 'media-editor',
 		) );

includes/CMB2.php

Spacing +75 added lines, -75 removed lines

@@ -139,19 +139,19 @@ 
 	 */
 	public function __construct( $config, $object_id = 0 ) {
 
-		if ( empty( $config['id'] ) ) {
+		if ( empty( $config[ 'id' ] ) ) {
 			wp_die( esc_html__( 'Metabox configuration is required to have an ID parameter.', 'cmb2' ) );
 		}
 
 		$this->meta_box = wp_parse_args( $config, $this->mb_defaults );
-		$this->meta_box['fields'] = array();
+		$this->meta_box[ 'fields' ] = array();
 
 		$this->object_id( $object_id );
 		$this->mb_object_type();
-		$this->cmb_id = $config['id'];
+		$this->cmb_id = $config[ 'id' ];
 
-		if ( ! empty( $config['fields'] ) && is_array( $config['fields'] ) ) {
-			$this->add_fields( $config['fields'] );
+		if ( ! empty( $config[ 'fields' ] ) && is_array( $config[ 'fields' ] ) ) {
+			$this->add_fields( $config[ 'fields' ] );
 		}
 
 		CMB2_Boxes::add( $this );
@@ -261,17 +261,17 @@ 
 
 			// Include custom class if requesting no title.
 			if ( ! $this->prop( 'title' ) && ! $this->prop( 'remove_box_wrap' ) ) {
-				$context[] = 'cmb2-context-wrap-no-title';
+				$context[ ] = 'cmb2-context-wrap-no-title';
 			}
 
 			// Include a generic context wrapper.
-			$context[] = 'cmb2-context-wrap';
+			$context[ ] = 'cmb2-context-wrap';
 
 			// Include a context-type based context wrapper.
-			$context[] = 'cmb2-context-wrap-' . $this->prop( 'context' );
+			$context[ ] = 'cmb2-context-wrap-' . $this->prop( 'context' );
 
 			// Include an ID based context wrapper as well.
-			$context[] = 'cmb2-context-wrap-' . $this->prop( 'id' );
+			$context[ ] = 'cmb2-context-wrap-' . $this->prop( 'id' );
 
 			// And merge all the classes back into the array.
 			$classes = array_merge( $classes, $context );
@@ -352,22 +352,22 @@ 
 	 * @return mixed CMB2_Field object if successful.
 	 */
 	public function render_field( $field_args ) {
-		$field_args['context'] = $this->prop( 'context' );
+		$field_args[ 'context' ] = $this->prop( 'context' );
 
-		if ( 'group' === $field_args['type'] ) {
+		if ( 'group' === $field_args[ 'type' ] ) {
 
-			if ( ! isset( $field_args['show_names'] ) ) {
-				$field_args['show_names'] = $this->prop( 'show_names' );
+			if ( ! isset( $field_args[ 'show_names' ] ) ) {
+				$field_args[ 'show_names' ] = $this->prop( 'show_names' );
 			}
 			$field = $this->render_group( $field_args );
 
-		} elseif ( 'hidden' === $field_args['type'] && $this->get_field( $field_args )->should_show() ) {
+		} elseif ( 'hidden' === $field_args[ 'type' ] && $this->get_field( $field_args )->should_show() ) {
 			// Save rendering for after the metabox.
 			$field = $this->add_hidden_field( $field_args );
 
 		} else {
 
-			$field_args['show_names'] = $this->prop( 'show_names' );
+			$field_args[ 'show_names' ] = $this->prop( 'show_names' );
 
 			// Render default fields.
 			$field = $this->get_field( $field_args )->render_field();
@@ -384,7 +384,7 @@ 
 	 */
 	public function render_group( $args ) {
 
-		if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) {
+		if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) {
 			return;
 		}
 
@@ -496,15 +496,15 @@ 
 			<div class="inside cmb-td cmb-nested cmb-field-list">';
 				// Loop and render repeatable group fields.
 		foreach ( array_values( $field_group->args( 'fields' ) ) as $field_args ) {
-			if ( 'hidden' === $field_args['type'] ) {
+			if ( 'hidden' === $field_args[ 'type' ] ) {
 
 				// Save rendering for after the metabox.
 				$this->add_hidden_field( $field_args, $field_group );
 
 			} else {
 
-				$field_args['show_names'] = $field_group->args( 'show_names' );
-				$field_args['context']    = $field_group->args( 'context' );
+				$field_args[ 'show_names' ] = $field_group->args( 'show_names' );
+				$field_args[ 'context' ]    = $field_group->args( 'context' );
 
 				$field = $this->get_field( $field_args, $field_group )->render_field();
 			}
@@ -534,7 +534,7 @@ 
 	 * @param CMB2_Field|null $field_group CMB2_Field group field object.
 	 */
 	public function add_hidden_field( $field_args, $field_group = null ) {
-		if ( isset( $field_args['field_args'] ) ) {
+		if ( isset( $field_args[ 'field_args' ] ) ) {
 			// For back-compatibility.
 			$field = new CMB2_Field( $field_args );
 		} else {
@@ -547,7 +547,7 @@ 
 			$types->iterator = $field_group->index;
 		}
 
-		$this->hidden_fields[] = $types;
+		$this->hidden_fields[ ] = $types;
 
 		return $field;
 	}
@@ -655,11 +655,11 @@ 
 	 */
 	public function process_field( $field_args ) {
 
-		switch ( $field_args['type'] ) {
+		switch ( $field_args[ 'type' ] ) {
 
 			case 'group':
 				if ( $this->save_group( $field_args ) ) {
-					$this->updated[] = $field_args['id'];
+					$this->updated[ ] = $field_args[ 'id' ];
 				}
 
 				break;
@@ -673,7 +673,7 @@ 
 				$field = $this->get_new_field( $field_args );
 
 				if ( $field->save_field_from_data( $this->data_to_save ) ) {
-					$this->updated[] = $field->id();
+					$this->updated[ ] = $field->id();
 				}
 
 				break;
@@ -756,7 +756,7 @@ 
 	 * @return mixed        Return of CMB2_Field::update_data().
 	 */
 	public function save_group( $args ) {
-		if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) {
+		if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) {
 			return;
 		}
 
@@ -786,7 +786,7 @@ 
 		$field_group->data_to_save = $this->data_to_save;
 
 		foreach ( array_values( $field_group->fields() ) as $field_args ) {
-			if ( 'title' === $field_args['type'] ) {
+			if ( 'title' === $field_args[ 'type' ] ) {
 				// Don't process title fields.
 				continue;
 			}
@@ -809,16 +809,16 @@ 
 						$_new_val = array();
 						foreach ( $new_val as $group_index => $grouped_data ) {
 							// Add the supporting data to the $saved array stack.
-							$saved[ $field_group->index ][ $grouped_data['supporting_field_id'] ][] = $grouped_data['supporting_field_value'];
+							$saved[ $field_group->index ][ $grouped_data[ 'supporting_field_id' ] ][ ] = $grouped_data[ 'supporting_field_value' ];
 							// Reset var to the actual value.
-							$_new_val[ $group_index ] = $grouped_data['value'];
+							$_new_val[ $group_index ] = $grouped_data[ 'value' ];
 						}
 						$new_val = $_new_val;
 					} else {
 						// Add the supporting data to the $saved array stack.
-						$saved[ $field_group->index ][ $new_val['supporting_field_id'] ] = $new_val['supporting_field_value'];
+						$saved[ $field_group->index ][ $new_val[ 'supporting_field_id' ] ] = $new_val[ 'supporting_field_value' ];
 						// Reset var to the actual value.
-						$new_val = $new_val['value'];
+						$new_val = $new_val[ 'value' ];
 					}
 				}
 
@@ -832,7 +832,7 @@ 
 
 				// Compare values and add to `$updated` array.
 				if ( $is_updated || $is_removed ) {
-					$this->updated[] = $base_id . '::' . $field_group->index . '::' . $sub_id;
+					$this->updated[ ] = $base_id . '::' . $field_group->index . '::' . $sub_id;
 				}
 
 				// Add to `$saved` array.
@@ -870,22 +870,22 @@ 
 		// Try to get our object ID from the global space.
 		switch ( $this->object_type() ) {
 			case 'user':
-				$object_id = isset( $_REQUEST['user_id'] ) ? wp_unslash( $_REQUEST['user_id'] ) : $object_id;
-				$object_id = ! $object_id && 'user-new.php' !== $pagenow && isset( $GLOBALS['user_ID'] ) ? $GLOBALS['user_ID'] : $object_id;
+				$object_id = isset( $_REQUEST[ 'user_id' ] ) ? wp_unslash( $_REQUEST[ 'user_id' ] ) : $object_id;
+				$object_id = ! $object_id && 'user-new.php' !== $pagenow && isset( $GLOBALS[ 'user_ID' ] ) ? $GLOBALS[ 'user_ID' ] : $object_id;
 				break;
 
 			case 'comment':
-				$object_id = isset( $_REQUEST['c'] ) ? wp_unslash( $_REQUEST['c'] ) : $object_id;
-				$object_id = ! $object_id && isset( $GLOBALS['comments']->comment_ID ) ? $GLOBALS['comments']->comment_ID : $object_id;
+				$object_id = isset( $_REQUEST[ 'c' ] ) ? wp_unslash( $_REQUEST[ 'c' ] ) : $object_id;
+				$object_id = ! $object_id && isset( $GLOBALS[ 'comments' ]->comment_ID ) ? $GLOBALS[ 'comments' ]->comment_ID : $object_id;
 				break;
 
 			case 'term':
-				$object_id = isset( $_REQUEST['tag_ID'] ) ? wp_unslash( $_REQUEST['tag_ID'] ) : $object_id;
+				$object_id = isset( $_REQUEST[ 'tag_ID' ] ) ? wp_unslash( $_REQUEST[ 'tag_ID' ] ) : $object_id;
 				break;
 
 			default:
-				$object_id = isset( $GLOBALS['post']->ID ) ? $GLOBALS['post']->ID : $object_id;
-				$object_id = isset( $_REQUEST['post'] ) ? wp_unslash( $_REQUEST['post'] ) : $object_id;
+				$object_id = isset( $GLOBALS[ 'post' ]->ID ) ? $GLOBALS[ 'post' ]->ID : $object_id;
+				$object_id = isset( $_REQUEST[ 'post' ] ) ? wp_unslash( $_REQUEST[ 'post' ] ) : $object_id;
 				break;
 		}
 
@@ -959,7 +959,7 @@ 
 	 * @return boolean True/False.
 	 */
 	public function is_options_page_mb() {
-		return ( isset( $this->meta_box['show_on']['key'] ) && 'options-page' === $this->meta_box['show_on']['key'] || array_key_exists( 'options-page', $this->meta_box['show_on'] ) );
+		return ( isset( $this->meta_box[ 'show_on' ][ 'key' ] ) && 'options-page' === $this->meta_box[ 'show_on' ][ 'key' ] || array_key_exists( 'options-page', $this->meta_box[ 'show_on' ] ) );
 	}
 
 	/**
@@ -1006,7 +1006,7 @@ 
 			$type = 'term';
 		}
 
-		if ( defined( 'DOING_AJAX' ) && isset( $_POST['action'] ) && 'add-tag' === $_POST['action'] ) {
+		if ( defined( 'DOING_AJAX' ) && isset( $_POST[ 'action' ] ) && 'add-tag' === $_POST[ 'action' ] ) {
 			$type = 'term';
 		}
 
@@ -1056,7 +1056,7 @@ 
 			return $field;
 		}
 
-		$field_id = is_string( $field ) ? $field : $field['id'];
+		$field_id = is_string( $field ) ? $field : $field[ 'id' ];
 
 		$parent_field_id = ! empty( $field_group ) ? $field_group->id() : '';
 		$ids = $this->get_field_ids( $field_id, $parent_field_id );
@@ -1093,16 +1093,16 @@ 
 		if ( $field_group && ( $sub_field_id || 0 === $sub_field_id ) ) {
 
 			// Update the fields array w/ any modified properties inherited from the group field.
-			$this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] = $field_args;
+			$this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] = $field_args;
 
 			return $this->get_default_args( $field_args, $field_group );
 		}
 
 		if ( is_array( $field_args ) ) {
-			$this->meta_box['fields'][ $field_id ] = array_merge( $field_args, $this->meta_box['fields'][ $field_id ] );
+			$this->meta_box[ 'fields' ][ $field_id ] = array_merge( $field_args, $this->meta_box[ 'fields' ][ $field_id ] );
 		}
 
-		return $this->get_default_args( $this->meta_box['fields'][ $field_id ] );
+		return $this->get_default_args( $this->meta_box[ 'fields' ][ $field_id ] );
 	}
 
 	/**
@@ -1155,8 +1155,8 @@ 
 
 			$sub_fields = false;
 			if ( array_key_exists( 'fields', $field ) ) {
-				$sub_fields = $field['fields'];
-				unset( $field['fields'] );
+				$sub_fields = $field[ 'fields' ];
+				unset( $field[ 'fields' ] );
 			}
 
 			$field_id = $parent_field_id
@@ -1183,7 +1183,7 @@ 
 		}
 
 		// Perform some field-type-specific initiation actions.
-		switch ( $field['type'] ) {
+		switch ( $field[ 'type' ] ) {
 			case 'file':
 			case 'file_list':
 
@@ -1198,21 +1198,21 @@ 
 				break;
 		}
 
-		if ( isset( $field['column'] ) && false !== $field['column'] ) {
+		if ( isset( $field[ 'column' ] ) && false !== $field[ 'column' ] ) {
 			$field = $this->define_field_column( $field );
 		}
 
-		if ( isset( $field['taxonomy'] ) && ! empty( $field['remove_default'] ) ) {
-			$this->tax_metaboxes_to_remove[ $field['taxonomy'] ] = $field['taxonomy'];
+		if ( isset( $field[ 'taxonomy' ] ) && ! empty( $field[ 'remove_default' ] ) ) {
+			$this->tax_metaboxes_to_remove[ $field[ 'taxonomy' ] ] = $field[ 'taxonomy' ];
 		}
 
 		$this->_add_field_to_array(
 			$field,
-			$this->meta_box['fields'],
+			$this->meta_box[ 'fields' ],
 			$position
 		);
 
-		return $field['id'];
+		return $field[ 'id' ];
 	}
 
 	/**
@@ -1225,10 +1225,10 @@ 
 	protected function define_field_column( array $field ) {
 		$this->has_columns = true;
 
-		$column = is_array( $field['column'] ) ? $field['column'] : array();
+		$column = is_array( $field[ 'column' ] ) ? $field[ 'column' ] : array();
 
-		$field['column'] = wp_parse_args( $column, array(
-			'name'     => isset( $field['name'] ) ? $field['name'] : '',
+		$field[ 'column' ] = wp_parse_args( $column, array(
+			'name'     => isset( $field[ 'name' ] ) ? $field[ 'name' ] : '',
 			'position' => false,
 		) );
 
@@ -1245,27 +1245,27 @@ 
 	 * @return mixed                   Array of parent/field ids or false.
 	 */
 	public function add_group_field( $parent_field_id, array $field, $position = 0 ) {
-		if ( ! array_key_exists( $parent_field_id, $this->meta_box['fields'] ) ) {
+		if ( ! array_key_exists( $parent_field_id, $this->meta_box[ 'fields' ] ) ) {
 			return false;
 		}
 
-		$parent_field = $this->meta_box['fields'][ $parent_field_id ];
+		$parent_field = $this->meta_box[ 'fields' ][ $parent_field_id ];
 
-		if ( 'group' !== $parent_field['type'] ) {
+		if ( 'group' !== $parent_field[ 'type' ] ) {
 			return false;
 		}
 
-		if ( ! isset( $parent_field['fields'] ) ) {
-			$this->meta_box['fields'][ $parent_field_id ]['fields'] = array();
+		if ( ! isset( $parent_field[ 'fields' ] ) ) {
+			$this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ] = array();
 		}
 
 		$this->_add_field_to_array(
 			$field,
-			$this->meta_box['fields'][ $parent_field_id ]['fields'],
+			$this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ],
 			$position
 		);
 
-		return array( $parent_field_id, $field['id'] );
+		return array( $parent_field_id, $field[ 'id' ] );
 	}
 
 	/**
@@ -1278,9 +1278,9 @@ 
 	 */
 	protected function _add_field_to_array( $field, &$fields, $position = 0 ) {
 		if ( $position ) {
-			CMB2_Utils::array_insert( $fields, array( $field['id'] => $field ), $position );
+			CMB2_Utils::array_insert( $fields, array( $field[ 'id' ] => $field ), $position );
 		} else {
-			$fields[ $field['id'] ] = $field;
+			$fields[ $field[ 'id' ] ] = $field;
 		}
 	}
 
@@ -1304,15 +1304,15 @@ 
 		unset( $this->fields[ implode( '', $ids ) ] );
 
 		if ( ! $sub_field_id ) {
-			unset( $this->meta_box['fields'][ $field_id ] );
+			unset( $this->meta_box[ 'fields' ][ $field_id ] );
 			return true;
 		}
 
-		if ( isset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] ) ) {
-			unset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] );
+		if ( isset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] ) ) {
+			unset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] );
 		}
-		if ( isset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] ) ) {
-			unset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] );
+		if ( isset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] ) ) {
+			unset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] );
 		}
 		return true;
 	}
@@ -1337,11 +1337,11 @@ 
 		list( $field_id, $sub_field_id ) = $ids;
 
 		if ( ! $sub_field_id ) {
-			$this->meta_box['fields'][ $field_id ][ $property ] = $value;
+			$this->meta_box[ 'fields' ][ $field_id ][ $property ] = $value;
 			return $field_id;
 		}
 
-		$this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ][ $property ] = $value;
+		$this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ][ $property ] = $value;
 		return $field_id;
 	}
 
@@ -1356,7 +1356,7 @@ 
 	public function get_field_ids( $field_id, $parent_field_id = '' ) {
 		$sub_field_id = $parent_field_id ? $field_id : '';
 		$field_id     = $parent_field_id ? $parent_field_id : $field_id;
-		$fields       =& $this->meta_box['fields'];
+		$fields       = & $this->meta_box[ 'fields' ];
 
 		if ( ! array_key_exists( $field_id, $fields ) ) {
 			$field_id = $this->search_old_school_array( $field_id, $fields );
@@ -1370,12 +1370,12 @@ 
 			return array( $field_id, $sub_field_id );
 		}
 
-		if ( 'group' !== $fields[ $field_id ]['type'] ) {
+		if ( 'group' !== $fields[ $field_id ][ 'type' ] ) {
 			return false;
 		}
 
-		if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ]['fields'] ) ) {
-			$sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ]['fields'] );
+		if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ][ 'fields' ] ) ) {
+			$sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ][ 'fields' ] );
 		}
 
 		return false === $sub_field_id ? false : array( $field_id, $sub_field_id );

includes/CMB2_Field_Display.php

Spacing +9 added lines, -9 removed lines

@@ -205,8 +205,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;
@@ -234,9 +234,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 );
 			}
 		}
 
@@ -307,7 +307,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 );
@@ -359,10 +359,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 );
 			}
 		}
 
@@ -371,7 +371,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 ), '">';
@@ -418,7 +418,7 @@ 
 					'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/rest-api/CMB2_REST_Controller_Fields.php

Spacing +15 added lines, -15 removed lines

@@ -49,8 +49,8 @@ 
 		) );
 
 		$delete_args = $args;
-		$delete_args['object_id']['required'] = true;
-		$delete_args['object_type']['required'] = true;
+		$delete_args[ 'object_id' ][ 'required' ] = true;
+		$delete_args[ 'object_type' ][ 'required' ] = true;
 
 		// Returns specific field data.
 		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<cmb_id>[\w-]+)/fields/(?P<field_id>[\w-]+)', array(
@@ -122,13 +122,13 @@ 
 		foreach ( $this->rest_box->cmb->prop( 'fields', array() ) as $field ) {
 
 			// Make sure this field can be read.
-			$this->field = $this->rest_box->field_can_read( $field['id'], true );
+			$this->field = $this->rest_box->field_can_read( $field[ 'id' ], true );
 
 			// And make sure current user can view this box.
 			if ( $this->field && $this->get_item_permissions_check_filter() ) {
-				$fields[ $field['id'] ] = $this->server->response_to_data(
+				$fields[ $field[ 'id' ] ] = $this->server->response_to_data(
 					$this->prepare_field_response(),
-					isset( $this->request['_embed'] )
+					isset( $this->request[ '_embed' ] )
 				);
 			}
 		}
@@ -232,7 +232,7 @@ 
 	public function update_item( $request ) {
 		$this->initiate_rest_read_box( $request, 'field_value_update' );
 
-		if ( ! $this->request['value'] ) {
+		if ( ! $this->request[ 'value' ] ) {
 			return new WP_Error( 'cmb2_rest_update_field_error', __( 'CMB2 Field value cannot be updated without the value parameter specified.', 'cmb2' ), array(
 				'status' => 400,
 			) );
@@ -293,7 +293,7 @@ 
 	 */
 	public function modify_field_value( $activity ) {
 
-		if ( ! $this->request['object_id'] || ! $this->request['object_type'] ) {
+		if ( ! $this->request[ 'object_id' ] || ! $this->request[ 'object_type' ] ) {
 			return new WP_Error( 'cmb2_rest_modify_field_value_error', __( 'CMB2 Field value cannot be modified without the object_id and object_type parameters specified.', 'cmb2' ), array(
 				'status' => 400,
 			) );
@@ -316,11 +316,11 @@ 
 
 		$this->field->args[ "value_{$activity}" ] = (bool) 'deleted' === $activity
 			? $this->field->remove_data()
-			: $this->field->save_field( $this->request['value'] );
+			: $this->field->save_field( $this->request[ 'value' ] );
 
 		// If options page, save the $activity options
-		if ( 'options-page' == $this->request['object_type'] ) {
-			$this->field->args[ "value_{$activity}" ] = cmb2_options( $this->request['object_id'] )->set();
+		if ( 'options-page' == $this->request[ 'object_type' ] ) {
+			$this->field->args[ "value_{$activity}" ] = cmb2_options( $this->request[ 'object_id' ] )->set();
 		}
 
 		return $this->prepare_read_field( $this->field );
@@ -397,13 +397,13 @@ 
 				$value = $field->options();
 			} elseif ( in_array( $key, CMB2_Field::$callable_fields, true ) ) {
 
-				if ( isset( $this->request['_rendered'] ) ) {
+				if ( isset( $this->request[ '_rendered' ] ) ) {
 					$value = $key === 'render_row_cb' ? $rendered : $field->get_param_callback_result( $key );
 				} elseif ( is_array( $value ) ) {
 					// We need to rewrite callbacks as string as they will cause
 					// JSON recursion errors.
-					$class = is_string( $value[0] ) ? $value[0] : get_class( $value[0] );
-					$value = $class . '::' . $value[1];
+					$class = is_string( $value[ 0 ] ) ? $value[ 0 ] : get_class( $value[ 0 ] );
+					$value = $class . '::' . $value[ 1 ];
 				}
 			}
 
@@ -416,8 +416,8 @@ 
 			}
 		}
 
-		if ( $this->request['object_id'] && $this->request['object_type'] ) {
-			$field_data['value'] = $field->get_data();
+		if ( $this->request[ 'object_id' ] && $this->request[ 'object_type' ] ) {
+			$field_data[ 'value' ] = $field->get_data();
 		}
 
 		return $field_data;

includes/shim/WP_REST_Controller.php

Spacing +37 added lines, -37 removed lines

@@ -190,7 +190,7 @@ 
 		}
 
 		if ( ! empty( $links ) ) {
-			$data['_links'] = $links;
+			$data[ '_links' ] = $links;
 		}
 
 		return $data;
@@ -207,21 +207,21 @@ 
 
 		$schema = $this->get_item_schema();
 		foreach ( $data as $key => $value ) {
-			if ( empty( $schema['properties'][ $key ] ) || empty( $schema['properties'][ $key ]['context'] ) ) {
+			if ( empty( $schema[ 'properties' ][ $key ] ) || empty( $schema[ 'properties' ][ $key ][ 'context' ] ) ) {
 				continue;
 			}
 
-			if ( ! in_array( $context, $schema['properties'][ $key ]['context'] ) ) {
+			if ( ! in_array( $context, $schema[ 'properties' ][ $key ][ 'context' ] ) ) {
 				unset( $data[ $key ] );
 				continue;
 			}
 
-			if ( 'object' === $schema['properties'][ $key ]['type'] && ! empty( $schema['properties'][ $key ]['properties'] ) ) {
-				foreach ( $schema['properties'][ $key ]['properties'] as $attribute => $details ) {
-					if ( empty( $details['context'] ) ) {
+			if ( 'object' === $schema[ 'properties' ][ $key ][ 'type' ] && ! empty( $schema[ 'properties' ][ $key ][ 'properties' ] ) ) {
+				foreach ( $schema[ 'properties' ][ $key ][ 'properties' ] as $attribute => $details ) {
+					if ( empty( $details[ 'context' ] ) ) {
 						continue;
 					}
-					if ( ! in_array( $context, $details['context'] ) ) {
+					if ( ! in_array( $context, $details[ 'context' ] ) ) {
 						if ( isset( $data[ $key ][ $attribute ] ) ) {
 							unset( $data[ $key ][ $attribute ] );
 						}
@@ -251,9 +251,9 @@ 
 
 		$schema = $this->get_item_schema();
 
-		foreach ( $schema['properties'] as &$property ) {
-			if ( isset( $property['arg_options'] ) ) {
-				unset( $property['arg_options'] );
+		foreach ( $schema[ 'properties' ] as &$property ) {
+			if ( isset( $property[ 'arg_options' ] ) ) {
+				unset( $property[ 'arg_options' ] );
 			}
 		}
 
@@ -310,18 +310,18 @@ 
 			'validate_callback'  => 'rest_validate_request_arg',
 		);
 		$schema = $this->get_item_schema();
-		if ( empty( $schema['properties'] ) ) {
+		if ( empty( $schema[ 'properties' ] ) ) {
 			return array_merge( $param_details, $args );
 		}
 		$contexts = array();
-		foreach ( $schema['properties'] as $attributes ) {
-			if ( ! empty( $attributes['context'] ) ) {
-				$contexts = array_merge( $contexts, $attributes['context'] );
+		foreach ( $schema[ 'properties' ] as $attributes ) {
+			if ( ! empty( $attributes[ 'context' ] ) ) {
+				$contexts = array_merge( $contexts, $attributes[ 'context' ] );
 			}
 		}
 		if ( ! empty( $contexts ) ) {
-			$param_details['enum'] = array_unique( $contexts );
-			rsort( $param_details['enum'] );
+			$param_details[ 'enum' ] = array_unique( $contexts );
+			rsort( $param_details[ 'enum' ] );
 		}
 		return array_merge( $param_details, $args );
 	}
@@ -339,11 +339,11 @@ 
 
 		foreach ( $additional_fields as $field_name => $field_options ) {
 
-			if ( ! $field_options['get_callback'] ) {
+			if ( ! $field_options[ 'get_callback' ] ) {
 				continue;
 			}
 
-			$object[ $field_name ] = call_user_func( $field_options['get_callback'], $object, $field_name, $request, $this->get_object_type() );
+			$object[ $field_name ] = call_user_func( $field_options[ 'get_callback' ], $object, $field_name, $request, $this->get_object_type() );
 		}
 
 		return $object;
@@ -361,7 +361,7 @@ 
 
 		foreach ( $additional_fields as $field_name => $field_options ) {
 
-			if ( ! $field_options['update_callback'] ) {
+			if ( ! $field_options[ 'update_callback' ] ) {
 				continue;
 			}
 
@@ -370,7 +370,7 @@ 
 				continue;
 			}
 
-			call_user_func( $field_options['update_callback'], $request[ $field_name ], $object, $field_name, $request, $this->get_object_type() );
+			call_user_func( $field_options[ 'update_callback' ], $request[ $field_name ], $object, $field_name, $request, $this->get_object_type() );
 		}
 	}
 
@@ -382,23 +382,23 @@ 
 	 * @param array $schema Schema array.
 	 */
 	protected function add_additional_fields_schema( $schema ) {
-		if ( empty( $schema['title'] ) ) {
+		if ( empty( $schema[ 'title' ] ) ) {
 			return $schema;
 		}
 
 		/**
 		 * Can't use $this->get_object_type otherwise we cause an inf loop.
 		 */
-		$object_type = $schema['title'];
+		$object_type = $schema[ 'title' ];
 
 		$additional_fields = $this->get_additional_fields( $object_type );
 
 		foreach ( $additional_fields as $field_name => $field_options ) {
-			if ( ! $field_options['schema'] ) {
+			if ( ! $field_options[ 'schema' ] ) {
 				continue;
 			}
 
-			$schema['properties'][ $field_name ] = $field_options['schema'];
+			$schema[ 'properties' ][ $field_name ] = $field_options[ 'schema' ];
 		}
 
 		return $schema;
@@ -437,11 +437,11 @@ 
 	protected function get_object_type() {
 		$schema = $this->get_item_schema();
 
-		if ( ! $schema || ! isset( $schema['title'] ) ) {
+		if ( ! $schema || ! isset( $schema[ 'title' ] ) ) {
 			return null;
 		}
 
-		return $schema['title'];
+		return $schema[ 'title' ];
 	}
 
 	/**
@@ -457,13 +457,13 @@ 
 	public function get_endpoint_args_for_item_schema( $method = WP_REST_Server::CREATABLE ) {
 
 		$schema                = $this->get_item_schema();
-		$schema_properties     = ! empty( $schema['properties'] ) ? $schema['properties'] : array();
+		$schema_properties     = ! empty( $schema[ 'properties' ] ) ? $schema[ 'properties' ] : array();
 		$endpoint_args = array();
 
 		foreach ( $schema_properties as $field_id => $params ) {
 
 			// Arguments specified as `readonly` are not allowed to be set.
-			if ( ! empty( $params['readonly'] ) ) {
+			if ( ! empty( $params[ 'readonly' ] ) ) {
 				continue;
 			}
 
@@ -472,16 +472,16 @@ 
 				'sanitize_callback' => 'rest_sanitize_request_arg',
 			);
 
-			if ( isset( $params['description'] ) ) {
-				$endpoint_args[ $field_id ]['description'] = $params['description'];
+			if ( isset( $params[ 'description' ] ) ) {
+				$endpoint_args[ $field_id ][ 'description' ] = $params[ 'description' ];
 			}
 
-			if ( WP_REST_Server::CREATABLE === $method && isset( $params['default'] ) ) {
-				$endpoint_args[ $field_id ]['default'] = $params['default'];
+			if ( WP_REST_Server::CREATABLE === $method && isset( $params[ 'default' ] ) ) {
+				$endpoint_args[ $field_id ][ 'default' ] = $params[ 'default' ];
 			}
 
-			if ( WP_REST_Server::CREATABLE === $method && ! empty( $params['required'] ) ) {
-				$endpoint_args[ $field_id ]['required'] = true;
+			if ( WP_REST_Server::CREATABLE === $method && ! empty( $params[ 'required' ] ) ) {
+				$endpoint_args[ $field_id ][ 'required' ] = true;
 			}
 
 			foreach ( array( 'type', 'format', 'enum' ) as $schema_prop ) {
@@ -491,17 +491,17 @@ 
 			}
 
 			// Merge in any options provided by the schema property.
-			if ( isset( $params['arg_options'] ) ) {
+			if ( isset( $params[ 'arg_options' ] ) ) {
 
 				// Only use required / default from arg_options on CREATABLE endpoints.
 				if ( WP_REST_Server::CREATABLE !== $method ) {
-					$params['arg_options'] = array_diff_key( $params['arg_options'], array(
+					$params[ 'arg_options' ] = array_diff_key( $params[ 'arg_options' ], array(
 						'required' => '',
 						'default' => '',
 					) );
 				}
 
-				$endpoint_args[ $field_id ] = array_merge( $endpoint_args[ $field_id ], $params['arg_options'] );
+				$endpoint_args[ $field_id ] = array_merge( $endpoint_args[ $field_id ], $params[ 'arg_options' ] );
 			}
 		}// End foreach().
 

includes/types/CMB2_Type_File.php

Spacing +4 added lines, -4 removed lines

@@ -24,15 +24,15 @@ 
 		$img_size_data = parent::get_image_size_data( $img_size, 'large' );
 
 		// if options array and 'url' => false, then hide the url field
-		$input_type = array_key_exists( 'url', $options ) && false === $options['url'] ? 'hidden' : 'text';
+		$input_type = array_key_exists( 'url', $options ) && false === $options[ 'url' ] ? 'hidden' : 'text';
 
 		$output .= parent::render( array(
 			'type'  => $input_type,
 			'class' => 'cmb2-upload-file regular-text',
 			'size'  => 45,
 			'desc'  => '',
-			'data-previewsize' => sprintf( '[%d,%d]', $img_size_data['width'], $img_size_data['height'] ),
-			'data-sizename'    => $img_size_data['name'],
+			'data-previewsize' => sprintf( '[%d,%d]', $img_size_data[ 'width' ], $img_size_data[ 'height' ] ),
+			'data-sizename'    => $img_size_data[ 'name' ],
 			'data-queryargs'   => ! empty( $query_args ) ? json_encode( $query_args ) : '',
 			'js_dependencies'  => 'media-editor',
 		) );
@@ -82,7 +82,7 @@ 
 						'class' => 'cmb-file-field-image',
 					) );
 				} else {
-					$image = '<img style="max-width: ' . absint( $img_size_data['width'] ) . 'px; width: 100%;" src="' . $meta_value . '" class="cmb-file-field-image" alt="" />';
+					$image = '<img style="max-width: ' . absint( $img_size_data[ 'width' ] ) . 'px; width: 100%;" src="' . $meta_value . '" class="cmb-file-field-image" alt="" />';
 				}
 
 				$output .= $this->img_status_output( array(