WebDevStudios / CMB2

includes/types/CMB2_Type_Base.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 	 */
 	public function __construct( CMB2_Types $types, $args = array() ) {
 		$this->types = $types;
-		$args['rendered'] = isset( $args['rendered'] ) ? (bool) $args['rendered'] : true;
+		$args[ 'rendered' ] = isset( $args[ 'rendered' ] ) ? (bool) $args[ 'rendered' ] : true;
 		$this->args = $args;
 	}
 
@@ -56,7 +56,7 @@ 
 	 * @return string|CMB2_Type_Base           Rendered output or this object.
 	 */
 	public function rendered( $rendered ) {
-		if ( $this->args['rendered'] ) {
+		if ( $this->args[ 'rendered' ] ) {
 			return is_a( $rendered, __CLASS__ ) ? $rendered->rendered : $rendered;
 		}
 

includes/CMB2_Types.php

Spacing +1 added lines, -1 removed lines

@@ -162,7 +162,7 @@
 	 * @return string               String of attributes for form element
 	 */
 	public 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/CMB2_Sanitize.php

Spacing +8 added lines, -8 removed lines

@@ -172,7 +172,7 @@ 
 
 		global $wp_locale;
 
-		$search = array( $wp_locale->number_format['thousands_sep'], $wp_locale->number_format['decimal_point'] );
+		$search = array( $wp_locale->number_format[ 'thousands_sep' ], $wp_locale->number_format[ 'decimal_point' ] );
 		$replace = array( '', '.' );
 
 		// for repeatable
@@ -215,8 +215,8 @@ 
 			return $repeat_value;
 		}
 
-		if ( isset( $this->value['date'], $this->value['time'] ) ) {
-			$this->value = $this->field->get_timestamp_from_value( $this->value['date'] . ' ' . $this->value['time'] );
+		if ( isset( $this->value[ 'date' ], $this->value[ 'time' ] ) ) {
+			$this->value = $this->field->get_timestamp_from_value( $this->value[ 'date' ] . ' ' . $this->value[ 'time' ] );
 		}
 
 		if ( $tz_offset = $this->field->field_timezone_offset() ) {
@@ -254,7 +254,7 @@ 
 		$tzstring = null;
 
 		if ( is_array( $this->value ) && array_key_exists( 'timezone', $this->value ) ) {
-			$tzstring = $this->value['timezone'];
+			$tzstring = $this->value[ 'timezone' ];
 		}
 
 		if ( empty( $tzstring ) ) {
@@ -274,8 +274,8 @@ 
 			$tzstring = false !== $tzstring ? $tzstring : timezone_name_from_abbr( '', 0, 0 );
 		}
 
-		$full_format = $this->field->args['date_format'] . ' ' . $this->field->args['time_format'];
-		$full_date   = $this->value['date'] . ' ' . $this->value['time'];
+		$full_format = $this->field->args[ 'date_format' ] . ' ' . $this->field->args[ 'time_format' ];
+		$full_date   = $this->value[ 'date' ] . ' ' . $this->value[ 'time' ];
 
 		try {
 
@@ -298,7 +298,7 @@ 
 			} else {
 				// Save the utc timestamp supporting field
 				if ( $repeat ) {
-					$utc_values[ $utc_key ][] = $utc_stamp;
+					$utc_values[ $utc_key ][ ] = $utc_stamp;
 				} else {
 					$this->_save_utc_value( $utc_key, $utc_stamp );
 				}
@@ -433,7 +433,7 @@ 
 			if ( $this->value ) {
 				$val = $this->$method( true );
 				if ( ! empty( $val ) ) {
-					$new_value[] = $val;
+					$new_value[ ] = $val;
 				}
 			}
 		}

includes/types/CMB2_Type_File.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 		$output     = '';
 
 		// 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,
@@ -71,7 +71,7 @@ 
 				if ( $_id_value ) {
 					$image = wp_get_attachment_image( $_id_value, $img_size, null, array( 'class' => 'cmb-file-field-image' ) );
 				} else {
-					$size = is_array( $img_size ) ? $img_size[0] : 350;
+					$size = is_array( $img_size ) ? $img_size[ 0 ] : 350;
 					$image = '<img style="max-width: ' . absint( $size ) . 'px; width: 100%; height: auto;" src="' . $meta_value . '" alt="" />';
 				}
 

includes/CMB2_Field.php

Spacing +71 added lines, -71 removed lines

@@ -107,21 +107,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'] );
+		$this->args = $this->_set_field_defaults( $args[ 'field_args' ] );
 
 		if ( $this->object_id ) {
 			$this->value = $this->get_data();
@@ -136,7 +136,7 @@ 
 	 * @return mixed             Value of field argument
 	 */
 	public function __call( $name, $arguments ) {
-		$key = isset( $arguments[0] ) ? $arguments[0] : false;
+		$key = isset( $arguments[ 0 ] ) ? $arguments[ 0 ] : false;
 		return $this->args( $name, $key );
 	}
 
@@ -207,9 +207,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 );
@@ -250,13 +250,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 ) {
@@ -278,7 +278,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.
@@ -314,7 +314,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 ) {
@@ -322,22 +322,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' ] );
 	}
 
 	/**
@@ -387,19 +387,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 );
 	}
 
 	/**
@@ -870,7 +870,7 @@ 
 
 		foreach ( $conditional_classes as $class => $condition ) {
 			if ( $condition ) {
-				$classes[] = $class;
+				$classes[ ] = $class;
 			}
 		}
 
@@ -879,7 +879,7 @@ 
 		}
 
 		if ( $added_classes ) {
-			$classes[] = esc_attr( $added_classes );
+			$classes[ ] = esc_attr( $added_classes );
 		}
 
 		/**
@@ -981,10 +981,10 @@ 
 	public function 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;
@@ -1018,10 +1018,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;
@@ -1043,17 +1043,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, false );
 
 		// 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' ];
 	}
 
 	/**
@@ -1080,68 +1080,68 @@ 
 			'default_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,
 			'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' ),
-			'label_cb'          => 'title' != $args['type'] ? array( $this, 'label' ) : '',
+			'label_cb'          => 'title' != $args[ 'type' ] ? array( $this, 'label' ) : '',
 		) );
 
 		// default param can be passed a callback as well
-		if ( is_callable( $args['default'] ) ) {
-			$args['default_cb'] = $args['default'];
-			$args['default'] = null;
+		if ( is_callable( $args[ 'default' ] ) ) {
+			$args[ 'default_cb' ] = $args[ 'default' ];
+			$args[ 'default' ] = null;
 		}
 
-		$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' );
 
 		// options param can be passed a callback as well
-		if ( is_callable( $args['options'] ) ) {
-			$args['options_cb'] = $args['options'];
-			$args['options'] = array();
+		if ( is_callable( $args[ 'options' ] ) ) {
+			$args[ 'options_cb' ] = $args[ 'options' ];
+			$args[ 'options' ] = array();
 		}
 
-		$args['options']    = 'group' == $args['type'] ? wp_parse_args( $args['options'], array(
+		$args[ 'options' ] = 'group' == $args[ 'type' ] ? wp_parse_args( $args[ 'options' ], array(
 			'add_button'    => __( 'Add Group', 'cmb2' ),
 			'remove_button' => __( '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'] ? __( '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' ] ? __( '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 : __( '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 : __( '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',
@@ -1173,10 +1173,10 @@ 
 			'cmb_id'      => $this->cmb_id,
 		);
 
-		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 new CMB2_Field( $args );

includes/CMB2_Utils.php

Spacing +20 added lines, -21 removed lines

@@ -30,7 +30,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;
 		}
 
@@ -55,8 +55,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;
@@ -140,8 +140,7 @@ 
 		}
 
 		return $this->is_valid_time_stamp( $string )
-			? (int) $string :
-			strtotime( (string) $string );
+			? (int) $string : strtotime( (string) $string );
 	}
 
 	/**
@@ -172,7 +171,7 @@ 
 	 * @param  mixed $value Value to check
 	 * @return bool         True or false
 	 */
-	public function notempty( $value ){
+	public function notempty( $value ) {
 		return null !== $value && '' !== $value && false !== $value;
 	}
 
@@ -322,24 +321,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
 		);
 
@@ -360,7 +359,7 @@ 
 	 * @return string Modified value
 	 */
 	public function wrap_escaped_chars( $value ) {
-		return "'" . str_replace( '\\', '', $value[0] ) . "'";
+		return "'" . str_replace( '\\', '', $value[ 0 ] ) . "'";
 	}
 
 	/**

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/types/CMB2_Type_Title.php

Spacing +1 added lines, -1 removed lines

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

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,12 +169,12 @@ 
 		$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'] . '">' . __( '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' ] . '">' . __( 'Remove Embed', 'cmb2' ) . '</a></p></div>';
 		}
 
 		// Otherwise, send back error info that no oEmbeds were found
-		return '<p class="ui-state-error-text">' . sprintf( __( 'No oEmbed Results Found for %s. View more info at', 'cmb2' ), $oembed['fallback'] ) . ' <a href="http://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>.</p>';
+		return '<p class="ui-state-error-text">' . sprintf( __( 'No oEmbed Results Found for %s. View more info at', 'cmb2' ), $oembed[ 'fallback' ] ) . ' <a href="http://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>.</p>';
 	}
 
 	/**
@@ -236,15 +236,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
@@ -252,7 +252,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 );