WebDevStudios / CMB2

includes/CMB2_Utils.php

Spacing +21 added lines, -22 removed lines

@@ -37,7 +37,7 @@ 
 		$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;
 		}
 
@@ -62,8 +62,8 @@ 
 
 			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();
+				$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;
@@ -147,8 +147,7 @@ 
 		}
 
 		return self::is_valid_time_stamp( $string )
-			? (int) $string :
-			strtotime( (string) $string );
+			? (int) $string : strtotime( (string) $string );
 	}
 
 	/**
@@ -179,7 +178,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;
 	}
 
@@ -337,24 +336,24 @@ 
 
 		// 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
-			'm' => 'mm',  // Month of the year, leading 0
-			'n' => 'm',   // Month of the year, no leading 0
+			'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,
-			'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
+			'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
 		);
 
@@ -375,7 +374,7 @@ 
 	 * @return string Modified value
 	 */
 	public static function wrap_escaped_chars( $value ) {
-		return "'" . str_replace( '\\', '', $value[0] ) . "'";
+		return "'" . str_replace( '\\', '', $value[ 0 ] ) . "'";
 	}
 
 	/**
@@ -435,7 +434,7 @@ 
 	 * @return string               String of attributes for form element.
 	 */
 	public static function concat_attrs( $attrs, $attr_exclude = array() ) {
-		$attr_exclude[] = 'rendered';
+		$attr_exclude[ ] = 'rendered';
 		$attributes = '';
 		foreach ( $attrs as $attr => $val ) {
 			$excluded = in_array( $attr, (array) $attr_exclude, true );

includes/types/CMB2_Type_File_Base.php

Spacing +9 added lines, -9 removed lines

@@ -55,11 +55,11 @@ 
 	 */
 	public function img_status_output( $args ) {
 		return sprintf( '<%1$s class="img-status">%2$s<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button"%3$s>%4$s</a></p>%5$s</%1$s>',
-			$args['tag'],
-			$args['image'],
-			isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '',
+			$args[ 'tag' ],
+			$args[ 'image' ],
+			isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '',
 			esc_html( $this->_text( 'remove_image_text', esc_html__( 'Remove Image', 'cmb2' ) ) ),
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
+			isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : ''
 		);
 	}
 
@@ -71,14 +71,14 @@ 
 	 */
 	public function file_status_output( $args ) {
 		return sprintf( '<%1$s class="file-status"><span>%2$s <strong>%3$s</strong></span>&nbsp;&nbsp; (<a href="%4$s" target="_blank" rel="external">%5$s</a> / <a href="#" class="cmb2-remove-file-button"%6$s>%7$s</a>)%8$s</%1$s>',
-			$args['tag'],
+			$args[ 'tag' ],
 			esc_html( $this->_text( 'file_text', esc_html__( 'File:', 'cmb2' ) ) ),
-			CMB2_Utils::get_file_name_from_path( $args['value'] ),
-			$args['value'],
+			CMB2_Utils::get_file_name_from_path( $args[ 'value' ] ),
+			$args[ 'value' ],
 			esc_html( $this->_text( 'file_download_text', esc_html__( 'Download', 'cmb2' ) ) ),
-			isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '',
+			isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '',
 			esc_html( $this->_text( 'remove_text', esc_html__( 'Remove', 'cmb2' ) ) ),
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
+			isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : ''
 		);
 	}
 

includes/CMB2_Types.php

Spacing +4 added lines, -4 removed lines

@@ -170,11 +170,11 @@ 
 
 		$message = array( sprintf( esc_html__( 'Custom field types require a Type object instantiation to use this method. This method was called by the \'%s\' field type.' ), $this->field->type() ) );
 
-		$message[] = is_object( $this->type )
+		$message[ ] = is_object( $this->type )
 			? esc_html__( 'That field type may not work as expected.', 'cmb2' )
 			: esc_html__( 'That field type will not work as expected.', 'cmb2' );
 
-		$message[] = esc_html__( 'For more information about this change see: https://github.com/mustardBees/cmb-field-select2/pull/34w', 'cmb2' );
+		$message[ ] = esc_html__( 'For more information about this change see: https://github.com/mustardBees/cmb-field-select2/pull/34w', 'cmb2' );
 
 		_doing_it_wrong( __CLASS__ . '::' . $method, implode( ' ', $message ), '2.2.2' );
 	}
@@ -394,8 +394,8 @@ 
 			'class' => 'cmb2-hidden',
 		);
 		if ( $this->field->group ) {
-			$args['data-groupid'] = $this->field->group->id();
-			$args['data-iterator'] = $this->iterator;
+			$args[ 'data-groupid' ] = $this->field->group->id();
+			$args[ 'data-iterator' ] = $this->iterator;
 		}
 		return $this->input( $args );
 	}

includes/CMB2_Field.php

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/CMB2_Base.php

Spacing +3 added lines, -3 removed lines

@@ -335,11 +335,11 @@ 
 			switch ( $message ) {
 
 				case self::DEPRECATED_PARAM:
-					$message = sprintf( __( 'The "%s" field parameter has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[3], $args[4] );
+					$message = sprintf( __( 'The "%s" field parameter has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[ 3 ], $args[ 4 ] );
 					break;
 
 				case self::DEPRECATED_CB_PARAM:
-					$message = sprintf( __( 'Using the "%s" field parameter as a callback has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[3], $args[4] );
+					$message = sprintf( __( 'Using the "%s" field parameter as a callback has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[ 3 ], $args[ 4 ] );
 					break;
 
 				default:
@@ -418,7 +418,7 @@ 
 	public function __call( $method, $args ) {
 		$object_class = strtolower( get_class( $this ) );
 
-		if ( ! has_filter(  "{$object_class}_inherit_{$method}" ) ) {
+		if ( ! has_filter( "{$object_class}_inherit_{$method}" ) ) {
 			throw new Exception( 'Invalid ' . get_class( $this ) . ' method: ' . $method );
 		}
 

includes/shim/WP_REST_Controller.php

Spacing +37 added lines, -37 removed lines

@@ -166,7 +166,7 @@ 
 		}
 
 		if ( ! empty( $links ) ) {
-			$data['_links'] = $links;
+			$data[ '_links' ] = $links;
 		}
 
 		return $data;
@@ -183,21 +183,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 ] );
 						}
@@ -227,9 +227,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' ] );
 			}
 		}
 
@@ -286,18 +286,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 );
 	}
@@ -315,11 +315,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;
@@ -337,7 +337,7 @@ 
 
 		foreach ( $additional_fields as $field_name => $field_options ) {
 
-			if ( ! $field_options['update_callback'] ) {
+			if ( ! $field_options[ 'update_callback' ] ) {
 				continue;
 			}
 
@@ -346,7 +346,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() );
 		}
 	}
 
@@ -358,23 +358,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;
@@ -413,11 +413,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' ];
 	}
 
 	/**
@@ -433,13 +433,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;
 			}
 
@@ -448,16 +448,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 ) {
@@ -467,14 +467,14 @@ 
 			}
 
 			// 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( 'required' => '', 'default' => '' ) );
+					$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' ] );
 			}
 		}
 

includes/CMB2_REST_Controller_Boxes.php

Spacing +8 added lines, -8 removed lines

@@ -87,7 +87,7 @@ 
 		foreach ( CMB2_REST::$boxes as $this->rest_box ) {
 			if ( $this->rest_box->rest_read ) {
 				$rest_box = $this->get_rest_box();
-				$boxes_data[ $this->rest_box->cmb->cmb_id ] = $this->server->response_to_data( $rest_box, isset( $this->request['_embed'] ) );
+				$boxes_data[ $this->rest_box->cmb->cmb_id ] = $this->server->response_to_data( $rest_box, isset( $this->request[ '_embed' ] ) );
 			}
 		}
 
@@ -124,9 +124,9 @@ 
 
 		$boxes_data = $cmb->meta_box;
 
-		if ( isset( $this->request['_rendered'] ) && $this->namespace_base !== CMB2_REST_Controller::get_intial_route() ) {
-			$boxes_data['form_open'] = $this->get_cb_results( array( $cmb, 'render_form_open' ) );
-			$boxes_data['form_close'] = $this->get_cb_results( array( $cmb, 'render_form_close' ) );
+		if ( isset( $this->request[ '_rendered' ] ) && $this->namespace_base !== CMB2_REST_Controller::get_intial_route() ) {
+			$boxes_data[ 'form_open' ] = $this->get_cb_results( array( $cmb, 'render_form_open' ) );
+			$boxes_data[ 'form_close' ] = $this->get_cb_results( array( $cmb, 'render_form_close' ) );
 
 			global $wp_scripts, $wp_styles;
 			$before_css = $wp_styles->queue;
@@ -134,15 +134,15 @@ 
 
 			CMB2_JS::enqueue();
 
-			$boxes_data['js_dependencies'] = array_values( array_diff( $wp_scripts->queue, $before_js ) );
-			$boxes_data['css_dependencies'] = array_values( array_diff( $wp_styles->queue, $before_css ) );
+			$boxes_data[ 'js_dependencies' ] = array_values( array_diff( $wp_scripts->queue, $before_js ) );
+			$boxes_data[ 'css_dependencies' ] = array_values( array_diff( $wp_styles->queue, $before_css ) );
 		}
 
 		// TODO: look into 'embed' parameter.
 		// http://demo.wp-api.org/wp-json/wp/v2/posts?_embed
-		unset( $boxes_data['fields'] );
+		unset( $boxes_data[ 'fields' ] );
 		// Handle callable properties.
-		unset( $boxes_data['show_on_cb'] );
+		unset( $boxes_data[ 'show_on_cb' ] );
 
 		$response = rest_ensure_response( $boxes_data );
 

includes/CMB2_REST_Controller.php

Spacing +7 added lines, -7 removed lines

@@ -226,7 +226,7 @@ 
 	 * @return WP_REST_Response $response
 	 */
 	public function prepare_item_for_response( $data, $request = null ) {
-		$data = $this->filter_response_by_context( $data, $this->request['context'] );
+		$data = $this->filter_response_by_context( $data, $this->request[ 'context' ] );
 
 		/**
 		 * Filter the prepared CMB2 item response.
@@ -297,12 +297,12 @@ 
 
 		} else {
 
-			if ( isset( $this->request['object_id'] ) ) {
-				$this->rest_box->cmb->object_id( sanitize_text_field( $this->request['object_id'] ) );
+			if ( isset( $this->request[ 'object_id' ] ) ) {
+				$this->rest_box->cmb->object_id( sanitize_text_field( $this->request[ 'object_id' ] ) );
 			}
 
-			if ( isset( $this->request['object_type'] ) ) {
-				$this->rest_box->cmb->object_type( sanitize_text_field( $this->request['object_type'] ) );
+			if ( isset( $this->request[ 'object_type' ] ) ) {
+				$this->rest_box->cmb->object_type( sanitize_text_field( $this->request[ 'object_type' ] ) );
 			}
 		}
 	}
@@ -320,8 +320,8 @@ 
 	public function initiate_request( $request, $request_type ) {
 		$this->request = $request;
 
-		if ( ! isset( $this->request['context'] ) || empty( $this->request['context'] ) ) {
-			$this->request['context'] = 'view';
+		if ( ! isset( $this->request[ 'context' ] ) || empty( $this->request[ 'context' ] ) ) {
+			$this->request[ 'context' ] = 'view';
 		}
 
 		if ( ! self::$request_type ) {

includes/CMB2_REST_Controller_Fields.php

Spacing +14 added lines, -14 removed lines

@@ -72,11 +72,11 @@ 
 
 		$fields = array();
 		foreach ( $this->rest_box->cmb->prop( 'fields', array() ) as $field ) {
-			$field_id = $field['id'];
+			$field_id = $field[ 'id' ];
 			$rest_field = $this->get_rest_field( $field_id );
 
 			if ( ! is_wp_error( $rest_field ) ) {
-				$fields[ $field_id ] = $this->server->response_to_data( $rest_field, isset( $this->request['_embed'] ) );
+				$fields[ $field_id ] = $this->server->response_to_data( $rest_field, isset( $this->request[ '_embed' ] ) );
 			} else {
 				$fields[ $field_id ] = array( 'error' => $rest_field->get_error_message() );
 			}
@@ -120,7 +120,7 @@ 
 	public function update_field_value( $request ) {
 		$this->initiate_rest_read_box( $request, 'field_value_update' );
 
-		if ( ! $this->request['value'] ) {
+		if ( ! $this->request[ 'value' ] ) {
 			return $this->prepare_item( array( 'error' => __( 'CMB2 Field value cannot be updated without the value parameter specified.', 'cmb2' ) ) );
 		}
 
@@ -156,7 +156,7 @@ 
 	 */
 	public function modify_field_value( $activity, $field ) {
 
-		if ( ! $this->request['object_id'] && ! $this->request['object_type'] ) {
+		if ( ! $this->request[ 'object_id' ] && ! $this->request[ 'object_type' ] ) {
 			return $this->prepare_item( array( 'error' => __( 'CMB2 Field value cannot be modified without the object_id and object_type parameters specified.', 'cmb2' ) ) );
 		}
 
@@ -168,13 +168,13 @@ 
 			return new WP_Error( 'cmb2_rest_error', __( 'No field found by that id.', 'cmb2' ) );
 		}
 
-		$field->args["value_{$activity}"] = (bool) 'deleted' === $activity
+		$field->args[ "value_{$activity}" ] = (bool) 'deleted' === $activity
 			? $field->remove_data()
-			: $field->save_field( $this->request['value'] );
+			: $field->save_field( $this->request[ 'value' ] );
 
 		// If options page, save the $activity options
-		if ( 'options-page' == $this->request['object_type'] ) {
-			$field->args["value_{$activity}"] = cmb2_options( $this->request['object_id'] )->set();
+		if ( 'options-page' == $this->request[ 'object_type' ] ) {
+			$field->args[ "value_{$activity}" ] = cmb2_options( $this->request[ 'object_id' ] )->set();
 		}
 
 		$field_data = $this->get_rest_field( $field );
@@ -243,13 +243,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 ];
 				}
 			}
 
@@ -262,8 +262,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;
@@ -296,7 +296,7 @@ 
 
 		// Don't embed boxes when looking at boxes route.
 		if ( '/cmb2/v1/boxes' !== CMB2_REST_Controller::get_intial_route() ) {
-			$links['up']['embeddable'] = true;
+			$links[ 'up' ][ 'embeddable' ] = true;
 		}
 
 		return $links;