Completed
Pull Request — trunk (#674)
by
unknown
24:14 queued 10:31
created
includes/types/CMB2_Type_Multi_Base.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 	 * @return string       Generated option element html
20 20
 	 */
21 21
 	public function select_option( $args = array() ) {
22
-		return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args['value'], selected( isset( $args['checked'] ) && $args['checked'], true, false ), $args['label'] ) . "\n";
22
+		return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args[ 'value' ], selected( isset( $args[ 'checked' ] ) && $args[ 'checked' ], true, false ), $args[ 'label' ] ) . "\n";
23 23
 	}
24 24
 
25 25
 	/**
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 			'label' => '',
40 40
 		), $args );
41 41
 
42
-		return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a['id'], $a['label'] );
42
+		return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a[ 'id' ], $a[ 'label' ] );
43 43
 	}
44 44
 
45 45
 	/**
@@ -51,10 +51,10 @@  discard block
 block discarded – undo
51 51
 	 */
52 52
 	public function list_input_checkbox( $args, $i ) {
53 53
 		$saved_value = $this->field->escaped_value();
54
-		if ( is_array( $saved_value ) && in_array( $args['value'], $saved_value ) ) {
55
-			$args['checked'] = 'checked';
54
+		if ( is_array( $saved_value ) && in_array( $args[ 'value' ], $saved_value ) ) {
55
+			$args[ 'checked' ] = 'checked';
56 56
 		}
57
-		$args['type'] = 'checkbox';
57
+		$args[ 'type' ] = 'checkbox';
58 58
 		return $this->list_input( $args, $i );
59 59
 	}
60 60
 
@@ -67,8 +67,8 @@  discard block
 block discarded – undo
67 67
 	public function concat_items( $args = array() ) {
68 68
 		$field = $this->field;
69 69
 
70
-		$method = isset( $args['method'] ) ? $args['method'] : 'select_option';
71
-		unset( $args['method'] );
70
+		$method = isset( $args[ 'method' ] ) ? $args[ 'method' ] : 'select_option';
71
+		unset( $args[ 'method' ] );
72 72
 
73 73
 		$value = $field->escaped_value()
74 74
 			? $field->escaped_value()
@@ -86,12 +86,12 @@  discard block
 block discarded – undo
86 86
 			// Clone args & modify for just this item
87 87
 			$a = $args;
88 88
 
89
-			$a['value'] = $opt_value;
90
-			$a['label'] = $opt_label;
89
+			$a[ 'value' ] = $opt_value;
90
+			$a[ 'label' ] = $opt_label;
91 91
 
92 92
 			// Check if this option is the value of the input
93 93
 			if ( $value == $opt_value ) {
94
-				$a['checked'] = 'checked';
94
+				$a[ 'checked' ] = 'checked';
95 95
 			}
96 96
 
97 97
 			$concatenated_items .= $this->$method( $a, $i++ );
Please login to merge, or discard this patch.
includes/types/CMB2_Type_Select.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
 		$attrs = $this->concat_attrs( $a, array( 'desc', 'options' ) );
25 25
 
26 26
 		return $this->rendered(
27
-			sprintf( '<select%s>%s</select>%s', $attrs, $a['options'], $a['desc'] )
27
+			sprintf( '<select%s>%s</select>%s', $attrs, $a[ 'options' ], $a[ 'desc' ] )
28 28
 		);
29 29
 	}
30 30
 }
Please login to merge, or discard this patch.
includes/types/CMB2_Type_Textarea.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
 		), $args );
32 32
 
33 33
 		return $this->rendered(
34
-			sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attrs( $a, array( 'desc', 'value' ) ), $a['value'], $a['desc'] )
34
+			sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attrs( $a, array( 'desc', 'value' ) ), $a[ 'value' ], $a[ 'desc' ] )
35 35
 		);
36 36
 	}
37 37
 }
Please login to merge, or discard this patch.
includes/types/CMB2_Type_Text.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -50,12 +50,12 @@
 block discarded – undo
50 50
 			'js_dependencies' => array(),
51 51
 		), $args );
52 52
 
53
-		if ( ! empty( $a['js_dependencies'] ) ) {
54
-			CMB2_JS::add_dependencies( $a['js_dependencies'] );
53
+		if ( ! empty( $a[ 'js_dependencies' ] ) ) {
54
+			CMB2_JS::add_dependencies( $a[ 'js_dependencies' ] );
55 55
 		}
56 56
 
57 57
 		return $this->rendered(
58
-			sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a['desc'] )
58
+			sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a[ 'desc' ] )
59 59
 		);
60 60
 	}
61 61
 }
Please login to merge, or discard this patch.
includes/types/CMB2_Type_Text_Datetime_Timestamp_Timezone.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -22,12 +22,12 @@  discard block
 block discarded – undo
22 22
 			'select_timezone'         => array(),
23 23
 		) );
24 24
 
25
-		$args['value'] = $field->escaped_value();
26
-		if ( is_array( $args['value'] ) ) {
27
-			$args['value'] = '';
25
+		$args[ 'value' ] = $field->escaped_value();
26
+		if ( is_array( $args[ 'value' ] ) ) {
27
+			$args[ 'value' ] = '';
28 28
 		}
29 29
 
30
-		$datetime = maybe_unserialize( $args['value'] );
30
+		$datetime = maybe_unserialize( $args[ 'value' ] );
31 31
 		$value = $tzstring = '';
32 32
 
33 33
 		if ( $datetime && $datetime instanceof DateTime ) {
@@ -36,19 +36,19 @@  discard block
 block discarded – undo
36 36
 			$value    = $datetime->getTimestamp();
37 37
 		}
38 38
 
39
-		$timestamp_args = wp_parse_args( $args['text_datetime_timestamp'], array(
39
+		$timestamp_args = wp_parse_args( $args[ 'text_datetime_timestamp' ], array(
40 40
 			'desc'     => '',
41 41
 			'value'    => $value,
42 42
 			'rendered' => true,
43 43
 		) );
44 44
 		$datetime_timestamp = $this->types->text_datetime_timestamp( $timestamp_args );
45 45
 
46
-		$timezone_select_args = wp_parse_args( $args['select_timezone'], array(
46
+		$timezone_select_args = wp_parse_args( $args[ 'select_timezone' ], array(
47 47
 			'class'    => 'cmb2_select cmb2-select-timezone',
48 48
 			'name'     => $this->_name( '[timezone]' ),
49 49
 			'id'       => $this->_id( '_timezone' ),
50 50
 			'options'  => wp_timezone_choice( $tzstring ),
51
-			'desc'     => $args['desc'],
51
+			'desc'     => $args[ 'desc' ],
52 52
 			'rendered' => true,
53 53
 		) );
54 54
 		$select = $this->types->select( $timezone_select_args );
Please login to merge, or discard this patch.
includes/CMB2_Types.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -162,7 +162,7 @@
 block discarded – undo
162 162
 	 * @return string               String of attributes for form element
163 163
 	 */
164 164
 	public function concat_attrs( $attrs, $attr_exclude = array() ) {
165
-		$attr_exclude[] = 'rendered';
165
+		$attr_exclude[ ] = 'rendered';
166 166
 		$attributes = '';
167 167
 		foreach ( $attrs as $attr => $val ) {
168 168
 			$excluded = in_array( $attr, (array) $attr_exclude, true );
Please login to merge, or discard this patch.
includes/types/CMB2_Type_File.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 		$output     = '';
22 22
 
23 23
 		// if options array and 'url' => false, then hide the url field
24
-		$input_type = array_key_exists( 'url', $options ) && false === $options['url'] ? 'hidden' : 'text';
24
+		$input_type = array_key_exists( 'url', $options ) && false === $options[ 'url' ] ? 'hidden' : 'text';
25 25
 
26 26
 		$output .= parent::render( array(
27 27
 			'type'  => $input_type,
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 				if ( $_id_value ) {
72 72
 					$image = wp_get_attachment_image( $_id_value, $img_size, null, array( 'class' => 'cmb-file-field-image' ) );
73 73
 				} else {
74
-					$size = is_array( $img_size ) ? $img_size[0] : 350;
74
+					$size = is_array( $img_size ) ? $img_size[ 0 ] : 350;
75 75
 					$image = '<img style="max-width: ' . absint( $size ) . 'px; width: 100%; height: auto;" src="' . $meta_value . '" alt="" />';
76 76
 				}
77 77
 
Please login to merge, or discard this patch.
includes/helper-functions.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -317,8 +317,8 @@
 block discarded – undo
317 317
 	 * Reimplementation of DateTime::createFromFormat for PHP < 5.3. :(
318 318
 	 * Borrowed from http://stackoverflow.com/questions/5399075/php-datetimecreatefromformat-in-5-2
319 319
 	 *
320
-	 * @param $date_format
321
-	 * @param $date_value
320
+	 * @param string $date_format
321
+	 * @param string $date_value
322 322
 	 *
323 323
 	 * @return DateTime
324 324
 	 */
Please login to merge, or discard this patch.
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -86,13 +86,13 @@  discard block
 block discarded – undo
86 86
 	$oembed = cmb2_ajax()->get_oembed_no_edit( $args );
87 87
 
88 88
 	// Send back our embed
89
-	if ( $oembed['embed'] && $oembed['embed'] != $oembed['fallback'] ) {
90
-		return '<div class="cmb2-oembed">' . $oembed['embed'] . '</div>';
89
+	if ( $oembed[ 'embed' ] && $oembed[ 'embed' ] != $oembed[ 'fallback' ] ) {
90
+		return '<div class="cmb2-oembed">' . $oembed[ 'embed' ] . '</div>';
91 91
 	}
92 92
 
93
-	$error = sprintf( __( 'No oEmbed Results Found for %s. View more info at %s.', 'cmb2' ), $oembed['fallback'], ' <a href="http://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>' );
93
+	$error = sprintf( __( 'No oEmbed Results Found for %s. View more info at %s.', 'cmb2' ), $oembed[ 'fallback' ], ' <a href="http://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>' );
94 94
 
95
-	if ( isset( $args['wp_error'] ) && $args['wp_error'] ) {
95
+	if ( isset( $args[ 'wp_error' ] ) && $args[ 'wp_error' ] ) {
96 96
 		return new WP_Error( 'cmb2_get_oembed_result', $wp_error, compact( 'oembed', 'args' ) );
97 97
 	}
98 98
 
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
 		$cmb = CMB2_Boxes::get( $meta_box );
208 208
 	} else {
209 209
 		// See if we already have an instance of this metabox
210
-		$cmb = CMB2_Boxes::get( $meta_box['id'] );
210
+		$cmb = CMB2_Boxes::get( $meta_box[ 'id' ] );
211 211
 		// If not, we'll initate a new metabox
212 212
 		$cmb = $cmb ? $cmb : new CMB2( $meta_box, $object_id );
213 213
 	}
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
 	) );
284 284
 
285 285
 	// Set object type explicitly (rather than trying to guess from context)
286
-	$cmb->object_type( $args['object_type'] );
286
+	$cmb->object_type( $args[ 'object_type' ] );
287 287
 
288 288
 	// Save the metabox if it's been submitted
289 289
 	// check permissions
@@ -291,32 +291,32 @@  discard block
 block discarded – undo
291 291
 	if (
292 292
 		$cmb->prop( 'save_fields' )
293 293
 		// check nonce
294
-		&& isset( $_POST['submit-cmb'], $_POST['object_id'], $_POST[ $cmb->nonce() ] )
294
+		&& isset( $_POST[ 'submit-cmb' ], $_POST[ 'object_id' ], $_POST[ $cmb->nonce() ] )
295 295
 		&& wp_verify_nonce( $_POST[ $cmb->nonce() ], $cmb->nonce() )
296
-		&& $object_id && $_POST['object_id'] == $object_id
296
+		&& $object_id && $_POST[ 'object_id' ] == $object_id
297 297
 	) {
298 298
 		$cmb->save_fields( $object_id, $cmb->object_type(), $_POST );
299 299
 	}
300 300
 
301 301
 	// Enqueue JS/CSS
302
-	if ( $args['cmb_styles'] ) {
302
+	if ( $args[ 'cmb_styles' ] ) {
303 303
 		CMB2_hookup::enqueue_cmb_css();
304 304
 	}
305 305
 
306
-	if ( $args['enqueue_js'] ) {
306
+	if ( $args[ 'enqueue_js' ] ) {
307 307
 		CMB2_hookup::enqueue_cmb_js();
308 308
 	}
309 309
 
310
-	$form_format = apply_filters( 'cmb2_get_metabox_form_format', $args['form_format'], $object_id, $cmb );
310
+	$form_format = apply_filters( 'cmb2_get_metabox_form_format', $args[ 'form_format' ], $object_id, $cmb );
311 311
 
312 312
 	$format_parts = explode( '%3$s', $form_format );
313 313
 
314 314
 	// Show cmb form
315
-	printf( $format_parts[0], $cmb->cmb_id, $object_id );
315
+	printf( $format_parts[ 0 ], $cmb->cmb_id, $object_id );
316 316
 	$cmb->show_form();
317 317
 
318
-	if ( isset( $format_parts[1] ) && $format_parts[1] ) {
319
-		printf( str_ireplace( '%4$s', '%1$s', $format_parts[1] ), $args['save_button'] );
318
+	if ( isset( $format_parts[ 1 ] ) && $format_parts[ 1 ] ) {
319
+		printf( str_ireplace( '%4$s', '%1$s', $format_parts[ 1 ] ), $args[ 'save_button' ] );
320 320
 	}
321 321
 
322 322
 }
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
  * @param  array   $args      Optional arguments array
330 330
  */
331 331
 function cmb2_metabox_form( $meta_box, $object_id = 0, $args = array() ) {
332
-	if ( ! isset( $args['echo'] ) || $args['echo'] ) {
332
+	if ( ! isset( $args[ 'echo' ] ) || $args[ 'echo' ] ) {
333 333
 		cmb2_print_metabox_form( $meta_box, $object_id, $args );
334 334
 	} else {
335 335
 		return cmb2_get_metabox_form( $meta_box, $object_id, $args );
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
 
352 352
 		$schedule_format = str_replace(
353 353
 			array( 'M', 'Y', 'm', 'd', 'H', 'i', 'a' ),
354
-			array('%b', '%Y', '%m', '%d', '%H', '%M', '%p' ),
354
+			array( '%b', '%Y', '%m', '%d', '%H', '%M', '%p' ),
355 355
 			$date_format
356 356
 		);
357 357
 
@@ -368,14 +368,14 @@  discard block
 block discarded – undo
368 368
 			 * 4 or 2 characters, as needed
369 369
 			 */
370 370
 			'%04d-%02d-%02d %02d:%02d:%02d',
371
-			$parsed_time['tm_year'] + 1900,  // This will be "111", so we need to add 1900.
372
-			$parsed_time['tm_mon'] + 1,      // This will be the month minus one, so we add one.
373
-			$parsed_time['tm_mday'],
374
-			$parsed_time['tm_hour'],
375
-			$parsed_time['tm_min'],
376
-			$parsed_time['tm_sec']
371
+			$parsed_time[ 'tm_year' ] + 1900, // This will be "111", so we need to add 1900.
372
+			$parsed_time[ 'tm_mon' ] + 1, // This will be the month minus one, so we add one.
373
+			$parsed_time[ 'tm_mday' ],
374
+			$parsed_time[ 'tm_hour' ],
375
+			$parsed_time[ 'tm_min' ],
376
+			$parsed_time[ 'tm_sec' ]
377 377
 		);
378 378
 
379
-		return new DateTime($ymd);
379
+		return new DateTime( $ymd );
380 380
 	}
381 381
 }
Please login to merge, or discard this patch.
includes/CMB2.php 2 patches
Doc Comments   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -409,6 +409,7 @@  discard block
 block discarded – undo
409 409
 	 * Add a hidden field to the list of hidden fields to be rendered later
410 410
 	 * @since 2.0.0
411 411
 	 * @param array  $field_args Array of field arguments to be passed to CMB2_Field
412
+	 * @param CMB2_Field $field_group
412 413
 	 */
413 414
 	public function add_hidden_field( $field_args, $field_group = null ) {
414 415
 		if ( isset( $field_args['field_args'] ) ) {
@@ -610,7 +611,7 @@  discard block
 block discarded – undo
610 611
 	/**
611 612
 	 * Save a repeatable group
612 613
 	 * @since  1.x.x
613
-	 * @param  array $field_group CMB2_Field group field object
614
+	 * @param  CMB2_Field $field_group CMB2_Field group field object
614 615
 	 * @return mixed              Return of CMB2_Field::update_data()
615 616
 	 */
616 617
 	public function save_group_field( $field_group ) {
@@ -910,7 +911,7 @@  discard block
 block discarded – undo
910 911
 	 * @param  mixed  $field_id     Field (or group field) ID
911 912
 	 * @param  mixed  $field_args   Array of field arguments
912 913
 	 * @param  mixed  $sub_field_id Sub field ID (if field_group exists)
913
-	 * @param  mixed  $field_group  If a sub-field, will be the parent group CMB2_Field object
914
+	 * @param  CMB2_Field|null  $field_group  If a sub-field, will be the parent group CMB2_Field object
914 915
 	 * @return array                Array of CMB2_Field arguments
915 916
 	 */
916 917
 	public function get_field_args( $field_id, $field_args, $sub_field_id, $field_group ) {
@@ -997,7 +998,7 @@  discard block
 block discarded – undo
997 998
 	 * @since  2.0.0
998 999
 	 * @param  array  $field           Metabox field config array
999 1000
 	 * @param  int    $position        (optional) Position of metabox. 1 for first, etc
1000
-	 * @return mixed                   Field id or false
1001
+	 * @return string                   Field id or false
1001 1002
 	 */
1002 1003
 	public function add_field( array $field, $position = 0 ) {
1003 1004
 		if ( ! is_array( $field ) || ! array_key_exists( 'id', $field ) ) {
Please login to merge, or discard this patch.
Spacing   +67 added lines, -67 removed lines patch added patch discarded remove patch
@@ -104,19 +104,19 @@  discard block
 block discarded – undo
104 104
 	 */
105 105
 	public function __construct( $config, $object_id = 0 ) {
106 106
 
107
-		if ( empty( $config['id'] ) ) {
107
+		if ( empty( $config[ 'id' ] ) ) {
108 108
 			wp_die( __( 'Metabox configuration is required to have an ID parameter', 'cmb2' ) );
109 109
 		}
110 110
 
111 111
 		$this->meta_box = wp_parse_args( $config, $this->mb_defaults );
112
-		$this->meta_box['fields'] = array();
112
+		$this->meta_box[ 'fields' ] = array();
113 113
 
114 114
 		$this->object_id( $object_id );
115 115
 		$this->mb_object_type();
116
-		$this->cmb_id = $config['id'];
116
+		$this->cmb_id = $config[ 'id' ];
117 117
 
118
-		if ( ! empty( $config['fields'] ) && is_array( $config['fields'] ) ) {
119
-			$this->add_fields( $config['fields'] );
118
+		if ( ! empty( $config[ 'fields' ] ) && is_array( $config[ 'fields' ] ) ) {
119
+			$this->add_fields( $config[ 'fields' ] );
120 120
 		}
121 121
 
122 122
 		CMB2_Boxes::add( $this );
@@ -285,22 +285,22 @@  discard block
 block discarded – undo
285 285
 	 * @return mixed CMB2_Field object if successful.
286 286
 	 */
287 287
 	public function render_field( $field_args ) {
288
-		$field_args['context'] = $this->prop( 'context' );
288
+		$field_args[ 'context' ] = $this->prop( 'context' );
289 289
 
290
-		if ( 'group' == $field_args['type'] ) {
290
+		if ( 'group' == $field_args[ 'type' ] ) {
291 291
 
292
-			if ( ! isset( $field_args['show_names'] ) ) {
293
-				$field_args['show_names'] = $this->prop( 'show_names' );
292
+			if ( ! isset( $field_args[ 'show_names' ] ) ) {
293
+				$field_args[ 'show_names' ] = $this->prop( 'show_names' );
294 294
 			}
295 295
 			$field = $this->render_group( $field_args );
296 296
 
297
-		} elseif ( 'hidden' == $field_args['type'] && $this->get_field( $field_args )->should_show() ) {
297
+		} elseif ( 'hidden' == $field_args[ 'type' ] && $this->get_field( $field_args )->should_show() ) {
298 298
 			// Save rendering for after the metabox
299 299
 			$field = $this->add_hidden_field( $field_args );
300 300
 
301 301
 		} else {
302 302
 
303
-			$field_args['show_names'] = $this->prop( 'show_names' );
303
+			$field_args[ 'show_names' ] = $this->prop( 'show_names' );
304 304
 
305 305
 			// Render default fields
306 306
 			$field = $this->get_field( $field_args )->render_field();
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 	 */
317 317
 	public function render_group( $args ) {
318 318
 
319
-		if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) {
319
+		if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) {
320 320
 			return;
321 321
 		}
322 322
 
@@ -398,15 +398,15 @@  discard block
 block discarded – undo
398 398
 			<div class="inside cmb-td cmb-nested cmb-field-list">';
399 399
 				// Loop and render repeatable group fields
400 400
 				foreach ( array_values( $field_group->args( 'fields' ) ) as $field_args ) {
401
-					if ( 'hidden' == $field_args['type'] ) {
401
+					if ( 'hidden' == $field_args[ 'type' ] ) {
402 402
 
403 403
 						// Save rendering for after the metabox
404 404
 						$this->add_hidden_field( $field_args, $field_group );
405 405
 
406 406
 					} else {
407 407
 
408
-						$field_args['show_names'] = $field_group->args( 'show_names' );
409
-						$field_args['context']    = $field_group->args( 'context' );
408
+						$field_args[ 'show_names' ] = $field_group->args( 'show_names' );
409
+						$field_args[ 'context' ]    = $field_group->args( 'context' );
410 410
 
411 411
 						$field = $this->get_field( $field_args, $field_group )->render_field();
412 412
 					}
@@ -434,14 +434,14 @@  discard block
 block discarded – undo
434 434
 	 * @param array  $field_args Array of field arguments to be passed to CMB2_Field
435 435
 	 */
436 436
 	public function add_hidden_field( $field_args, $field_group = null ) {
437
-		if ( isset( $field_args['field_args'] ) ) {
437
+		if ( isset( $field_args[ 'field_args' ] ) ) {
438 438
 			// For back-compatibility.
439 439
 			$field = new CMB2_Field( $field_args );
440 440
 		} else {
441 441
 			$field = $this->get_new_field( $field_args, $field_group );
442 442
 		}
443 443
 
444
-		$this->hidden_fields[] = new CMB2_Types( $field );
444
+		$this->hidden_fields[ ] = new CMB2_Types( $field );
445 445
 
446 446
 		return $field;
447 447
 	}
@@ -538,11 +538,11 @@  discard block
 block discarded – undo
538 538
 	 */
539 539
 	public function process_field( $field_args ) {
540 540
 
541
-		switch ( $field_args['type'] ) {
541
+		switch ( $field_args[ 'type' ] ) {
542 542
 
543 543
 			case 'group':
544 544
 				if ( $this->save_group( $field_args ) ) {
545
-					$this->updated[] = $field_args['id'];
545
+					$this->updated[ ] = $field_args[ 'id' ];
546 546
 				}
547 547
 
548 548
 				break;
@@ -556,7 +556,7 @@  discard block
 block discarded – undo
556 556
 				$field = $this->get_new_field( $field_args );
557 557
 
558 558
 				if ( $field->save_field_from_data( $this->data_to_save ) ) {
559
-					$this->updated[] = $field->id();
559
+					$this->updated[ ] = $field->id();
560 560
 				}
561 561
 
562 562
 				break;
@@ -623,7 +623,7 @@  discard block
 block discarded – undo
623 623
 	 * @return mixed        Return of CMB2_Field::update_data()
624 624
 	 */
625 625
 	public function save_group( $args ) {
626
-		if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) {
626
+		if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) {
627 627
 			return;
628 628
 		}
629 629
 
@@ -671,16 +671,16 @@  discard block
 block discarded – undo
671 671
 						$_new_val = array();
672 672
 						foreach ( $new_val as $group_index => $grouped_data ) {
673 673
 							// Add the supporting data to the $saved array stack
674
-							$saved[ $field_group->index ][ $grouped_data['supporting_field_id'] ][] = $grouped_data['supporting_field_value'];
674
+							$saved[ $field_group->index ][ $grouped_data[ 'supporting_field_id' ] ][ ] = $grouped_data[ 'supporting_field_value' ];
675 675
 							// Reset var to the actual value
676
-							$_new_val[ $group_index ] = $grouped_data['value'];
676
+							$_new_val[ $group_index ] = $grouped_data[ 'value' ];
677 677
 						}
678 678
 						$new_val = $_new_val;
679 679
 					} else {
680 680
 						// Add the supporting data to the $saved array stack
681
-						$saved[ $field_group->index ][ $new_val['supporting_field_id'] ] = $new_val['supporting_field_value'];
681
+						$saved[ $field_group->index ][ $new_val[ 'supporting_field_id' ] ] = $new_val[ 'supporting_field_value' ];
682 682
 						// Reset var to the actual value
683
-						$new_val = $new_val['value'];
683
+						$new_val = $new_val[ 'value' ];
684 684
 					}
685 685
 				}
686 686
 
@@ -694,7 +694,7 @@  discard block
 block discarded – undo
694 694
 
695 695
 				// Compare values and add to `$updated` array
696 696
 				if ( $is_updated || $is_removed ) {
697
-					$this->updated[] = $base_id . '::' . $field_group->index . '::' . $sub_id;
697
+					$this->updated[ ] = $base_id . '::' . $field_group->index . '::' . $sub_id;
698 698
 				}
699 699
 
700 700
 				// Add to `$saved` array
@@ -731,22 +731,22 @@  discard block
 block discarded – undo
731 731
 		// Try to get our object ID from the global space
732 732
 		switch ( $this->object_type() ) {
733 733
 			case 'user':
734
-				$object_id = isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id;
735
-				$object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS['user_ID'] ) ? $GLOBALS['user_ID'] : $object_id;
734
+				$object_id = isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id;
735
+				$object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS[ 'user_ID' ] ) ? $GLOBALS[ 'user_ID' ] : $object_id;
736 736
 				break;
737 737
 
738 738
 			case 'comment':
739
-				$object_id = isset( $_REQUEST['c'] ) ? $_REQUEST['c'] : $object_id;
740
-				$object_id = ! $object_id && isset( $GLOBALS['comments']->comment_ID ) ? $GLOBALS['comments']->comment_ID : $object_id;
739
+				$object_id = isset( $_REQUEST[ 'c' ] ) ? $_REQUEST[ 'c' ] : $object_id;
740
+				$object_id = ! $object_id && isset( $GLOBALS[ 'comments' ]->comment_ID ) ? $GLOBALS[ 'comments' ]->comment_ID : $object_id;
741 741
 				break;
742 742
 
743 743
 			case 'term':
744
-				$object_id = isset( $_REQUEST['tag_ID'] ) ? $_REQUEST['tag_ID'] : $object_id;
744
+				$object_id = isset( $_REQUEST[ 'tag_ID' ] ) ? $_REQUEST[ 'tag_ID' ] : $object_id;
745 745
 				break;
746 746
 
747 747
 			default:
748
-				$object_id = isset( $GLOBALS['post']->ID ) ? $GLOBALS['post']->ID : $object_id;
749
-				$object_id = isset( $_REQUEST['post'] ) ? $_REQUEST['post'] : $object_id;
748
+				$object_id = isset( $GLOBALS[ 'post' ]->ID ) ? $GLOBALS[ 'post' ]->ID : $object_id;
749
+				$object_id = isset( $_REQUEST[ 'post' ] ) ? $_REQUEST[ 'post' ] : $object_id;
750 750
 				break;
751 751
 		}
752 752
 
@@ -822,7 +822,7 @@  discard block
 block discarded – undo
822 822
 	 * @return boolean True/False
823 823
 	 */
824 824
 	public function is_options_page_mb() {
825
-		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'] ) );
825
+		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' ] ) );
826 826
 	}
827 827
 
828 828
 	/**
@@ -909,7 +909,7 @@  discard block
 block discarded – undo
909 909
 			return $field;
910 910
 		}
911 911
 
912
-		$field_id = is_string( $field ) ? $field : $field['id'];
912
+		$field_id = is_string( $field ) ? $field : $field[ 'id' ];
913 913
 
914 914
 		$parent_field_id = ! empty( $field_group ) ? $field_group->id() : '';
915 915
 		$ids = $this->get_field_ids( $field_id, $parent_field_id, true );
@@ -945,16 +945,16 @@  discard block
 block discarded – undo
945 945
 		if ( $field_group && ( $sub_field_id || 0 === $sub_field_id ) ) {
946 946
 
947 947
 			// Update the fields array w/ any modified properties inherited from the group field
948
-			$this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] = $field_args;
948
+			$this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] = $field_args;
949 949
 
950 950
 			return $this->get_default_args( $field_args, $field_group );
951 951
 		}
952 952
 
953 953
 		if ( is_array( $field_args ) ) {
954
-			$this->meta_box['fields'][ $field_id ] = array_merge( $field_args, $this->meta_box['fields'][ $field_id ] );
954
+			$this->meta_box[ 'fields' ][ $field_id ] = array_merge( $field_args, $this->meta_box[ 'fields' ][ $field_id ] );
955 955
 		}
956 956
 
957
-		return $this->get_default_args( $this->meta_box['fields'][ $field_id ] );
957
+		return $this->get_default_args( $this->meta_box[ 'fields' ][ $field_id ] );
958 958
 	}
959 959
 
960 960
 	/**
@@ -1004,8 +1004,8 @@  discard block
 block discarded – undo
1004 1004
 
1005 1005
 			$sub_fields = false;
1006 1006
 			if ( array_key_exists( 'fields', $field ) ) {
1007
-				$sub_fields = $field['fields'];
1008
-				unset( $field['fields'] );
1007
+				$sub_fields = $field[ 'fields' ];
1008
+				unset( $field[ 'fields' ] );
1009 1009
 			}
1010 1010
 
1011 1011
 			$field_id = $parent_field_id
@@ -1030,29 +1030,29 @@  discard block
 block discarded – undo
1030 1030
 			return false;
1031 1031
 		}
1032 1032
 
1033
-		if ( 'oembed' === $field['type'] ) {
1033
+		if ( 'oembed' === $field[ 'type' ] ) {
1034 1034
 			// Initiate oembed Ajax hooks
1035 1035
 			cmb2_ajax();
1036 1036
 		}
1037 1037
 
1038
-		if ( isset( $field['column'] ) && false !== $field['column'] ) {
1038
+		if ( isset( $field[ 'column' ] ) && false !== $field[ 'column' ] ) {
1039 1039
 			$this->has_columns = true;
1040 1040
 
1041
-			$column = is_array( $field['column'] ) ? $field['column'] : array();
1041
+			$column = is_array( $field[ 'column' ] ) ? $field[ 'column' ] : array();
1042 1042
 
1043
-			$field['column'] = wp_parse_args( $column, array(
1044
-				'name'     => isset( $field['name'] ) ? $field['name'] : '',
1043
+			$field[ 'column' ] = wp_parse_args( $column, array(
1044
+				'name'     => isset( $field[ 'name' ] ) ? $field[ 'name' ] : '',
1045 1045
 				'position' => false,
1046 1046
 			) );
1047 1047
 		}
1048 1048
 
1049 1049
 		$this->_add_field_to_array(
1050 1050
 			$field,
1051
-			$this->meta_box['fields'],
1051
+			$this->meta_box[ 'fields' ],
1052 1052
 			$position
1053 1053
 		);
1054 1054
 
1055
-		return $field['id'];
1055
+		return $field[ 'id' ];
1056 1056
 	}
1057 1057
 
1058 1058
 	/**
@@ -1064,27 +1064,27 @@  discard block
 block discarded – undo
1064 1064
 	 * @return mixed                   Array of parent/field ids or false
1065 1065
 	 */
1066 1066
 	public function add_group_field( $parent_field_id, array $field, $position = 0 ) {
1067
-		if ( ! array_key_exists( $parent_field_id, $this->meta_box['fields'] ) ) {
1067
+		if ( ! array_key_exists( $parent_field_id, $this->meta_box[ 'fields' ] ) ) {
1068 1068
 			return false;
1069 1069
 		}
1070 1070
 
1071
-		$parent_field = $this->meta_box['fields'][ $parent_field_id ];
1071
+		$parent_field = $this->meta_box[ 'fields' ][ $parent_field_id ];
1072 1072
 
1073
-		if ( 'group' !== $parent_field['type'] ) {
1073
+		if ( 'group' !== $parent_field[ 'type' ] ) {
1074 1074
 			return false;
1075 1075
 		}
1076 1076
 
1077
-		if ( ! isset( $parent_field['fields'] ) ) {
1078
-			$this->meta_box['fields'][ $parent_field_id ]['fields'] = array();
1077
+		if ( ! isset( $parent_field[ 'fields' ] ) ) {
1078
+			$this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ] = array();
1079 1079
 		}
1080 1080
 
1081 1081
 		$this->_add_field_to_array(
1082 1082
 			$field,
1083
-			$this->meta_box['fields'][ $parent_field_id ]['fields'],
1083
+			$this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ],
1084 1084
 			$position
1085 1085
 		);
1086 1086
 
1087
-		return array( $parent_field_id, $field['id'] );
1087
+		return array( $parent_field_id, $field[ 'id' ] );
1088 1088
 	}
1089 1089
 
1090 1090
 	/**
@@ -1096,9 +1096,9 @@  discard block
 block discarded – undo
1096 1096
 	 */
1097 1097
 	protected function _add_field_to_array( $field, &$fields, $position = 0 ) {
1098 1098
 		if ( $position ) {
1099
-			cmb2_utils()->array_insert( $fields, array( $field['id'] => $field ), $position );
1099
+			cmb2_utils()->array_insert( $fields, array( $field[ 'id' ] => $field ), $position );
1100 1100
 		} else {
1101
-			$fields[ $field['id'] ] = $field;
1101
+			$fields[ $field[ 'id' ] ] = $field;
1102 1102
 		}
1103 1103
 	}
1104 1104
 
@@ -1121,15 +1121,15 @@  discard block
 block discarded – undo
1121 1121
 		unset( $this->fields[ implode( '', $ids ) ] );
1122 1122
 
1123 1123
 		if ( ! $sub_field_id ) {
1124
-			unset( $this->meta_box['fields'][ $field_id ] );
1124
+			unset( $this->meta_box[ 'fields' ][ $field_id ] );
1125 1125
 			return true;
1126 1126
 		}
1127 1127
 
1128
-		if ( isset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] ) ) {
1129
-			unset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] );
1128
+		if ( isset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] ) ) {
1129
+			unset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] );
1130 1130
 		}
1131
-		if ( isset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] ) ) {
1132
-			unset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] );
1131
+		if ( isset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] ) ) {
1132
+			unset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] );
1133 1133
 		}
1134 1134
 		return true;
1135 1135
 	}
@@ -1153,11 +1153,11 @@  discard block
 block discarded – undo
1153 1153
 		list( $field_id, $sub_field_id ) = $ids;
1154 1154
 
1155 1155
 		if ( ! $sub_field_id ) {
1156
-			$this->meta_box['fields'][ $field_id ][ $property ] = $value;
1156
+			$this->meta_box[ 'fields' ][ $field_id ][ $property ] = $value;
1157 1157
 			return $field_id;
1158 1158
 		}
1159 1159
 
1160
-		$this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ][ $property ] = $value;
1160
+		$this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ][ $property ] = $value;
1161 1161
 		return $field_id;
1162 1162
 	}
1163 1163
 
@@ -1171,7 +1171,7 @@  discard block
 block discarded – undo
1171 1171
 	public function get_field_ids( $field_id, $parent_field_id = '' ) {
1172 1172
 		$sub_field_id = $parent_field_id ? $field_id : '';
1173 1173
 		$field_id     = $parent_field_id ? $parent_field_id : $field_id;
1174
-		$fields       =& $this->meta_box['fields'];
1174
+		$fields       = & $this->meta_box[ 'fields' ];
1175 1175
 
1176 1176
 		if ( ! array_key_exists( $field_id, $fields ) ) {
1177 1177
 			$field_id = $this->search_old_school_array( $field_id, $fields );
@@ -1185,12 +1185,12 @@  discard block
 block discarded – undo
1185 1185
 			return array( $field_id, $sub_field_id );
1186 1186
 		}
1187 1187
 
1188
-		if ( 'group' !== $fields[ $field_id ]['type'] ) {
1188
+		if ( 'group' !== $fields[ $field_id ][ 'type' ] ) {
1189 1189
 			return false;
1190 1190
 		}
1191 1191
 
1192
-		if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ]['fields'] ) ) {
1193
-			$sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ]['fields'] );
1192
+		if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ][ 'fields' ] ) ) {
1193
+			$sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ][ 'fields' ] );
1194 1194
 		}
1195 1195
 
1196 1196
 		return false === $sub_field_id ? false : array( $field_id, $sub_field_id );
Please login to merge, or discard this patch.