Completed
Pull Request — trunk (#588)
by Juliette
26:43 queued 11:51
created
example-functions.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 	$cmb_demo = new_cmb2_box( array(
79 79
 		'id'            => $prefix . 'metabox',
80 80
 		'title'         => __( 'Test Metabox', 'cmb2' ),
81
-		'object_types'  => array( 'page', ), // Post type
81
+		'object_types'  => array( 'page',), // Post type
82 82
 		// 'show_on_cb' => 'yourprefix_show_if_front_page', // function should return a bool value
83 83
 		// 'context'    => 'normal',
84 84
 		// 'priority'   => 'high',
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
 		'desc'    => __( 'field description (optional)', 'cmb2' ),
330 330
 		'id'      => $prefix . 'wysiwyg',
331 331
 		'type'    => 'wysiwyg',
332
-		'options' => array( 'textarea_rows' => 5, ),
332
+		'options' => array( 'textarea_rows' => 5,),
333 333
 	) );
334 334
 
335 335
 	$cmb_demo->add_field( array(
@@ -381,11 +381,11 @@  discard block
 block discarded – undo
381 381
 	$cmb_about_page = new_cmb2_box( array(
382 382
 		'id'           => $prefix . 'metabox',
383 383
 		'title'        => __( 'About Page Metabox', 'cmb2' ),
384
-		'object_types' => array( 'page', ), // Post type
384
+		'object_types' => array( 'page',), // Post type
385 385
 		'context'      => 'normal',
386 386
 		'priority'     => 'high',
387 387
 		'show_names'   => true, // Show field names on the left
388
-		'show_on'      => array( 'id' => array( 2, ) ), // Specific post IDs to display this metabox
388
+		'show_on'      => array( 'id' => array( 2,) ), // Specific post IDs to display this metabox
389 389
 	) );
390 390
 
391 391
 	$cmb_about_page->add_field( array(
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
 	$cmb_group = new_cmb2_box( array(
411 411
 		'id'           => $prefix . 'metabox',
412 412
 		'title'        => __( 'Repeating Field Group', 'cmb2' ),
413
-		'object_types' => array( 'page', ),
413
+		'object_types' => array( 'page',),
414 414
 	) );
415 415
 
416 416
 	// $group_field_id is the field id string, so in this case: $prefix . 'demo'
Please login to merge, or discard this patch.
includes/CMB2_JS.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -51,17 +51,17 @@
 block discarded – undo
51 51
 		$dependencies = apply_filters( 'cmb2_script_dependencies', self::$dependencies );
52 52
 
53 53
 		// if colorpicker
54
-		if ( ! is_admin() && isset( $dependencies['wp-color-picker'] ) ) {
54
+		if ( ! is_admin() && isset( $dependencies[ 'wp-color-picker' ] ) ) {
55 55
 			self::colorpicker_frontend();
56 56
 		}
57 57
 
58 58
 		// if file/file_list
59
-		if ( isset( $dependencies['media-editor'] ) ) {
59
+		if ( isset( $dependencies[ 'media-editor' ] ) ) {
60 60
 			wp_enqueue_media();
61 61
 		}
62 62
 
63 63
 		// if timepicker
64
-		if ( isset( $dependencies['jquery-ui-datetimepicker'] ) ) {
64
+		if ( isset( $dependencies[ 'jquery-ui-datetimepicker' ] ) ) {
65 65
 			wp_register_script( 'jquery-ui-datetimepicker', cmb2_utils()->url( 'js/jquery-ui-timepicker-addon.min.js' ), array( 'jquery-ui-slider' ), CMB2_VERSION );
66 66
 		}
67 67
 
Please login to merge, or discard this patch.
includes/CMB2_Options.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -131,7 +131,7 @@
 block discarded – undo
131 131
 
132 132
 			if ( ! $single ) {
133 133
 				// If multiple, add to array
134
-				$this->options[ $field_id ][] = $value;
134
+				$this->options[ $field_id ][ ] = $value;
135 135
 			} else {
136 136
 				$this->options[ $field_id ] = $value;
137 137
 			}
Please login to merge, or discard this patch.
includes/CMB2_Sanitize.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 
173 173
 		global $wp_locale;
174 174
 
175
-		$search = array( $wp_locale->number_format['thousands_sep'], $wp_locale->number_format['decimal_point'] );
175
+		$search = array( $wp_locale->number_format[ 'thousands_sep' ], $wp_locale->number_format[ 'decimal_point' ] );
176 176
 		$replace = array( '', '.' );
177 177
 
178 178
 		// for repeatable
@@ -215,8 +215,8 @@  discard block
 block discarded – undo
215 215
 			return $repeat_value;
216 216
 		}
217 217
 
218
-		if ( isset( $this->value['date'], $this->value['time'] ) ) {
219
-			$this->value = $this->field->get_timestamp_from_value( $this->value['date'] . ' ' . $this->value['time'] );
218
+		if ( isset( $this->value[ 'date' ], $this->value[ 'time' ] ) ) {
219
+			$this->value = $this->field->get_timestamp_from_value( $this->value[ 'date' ] . ' ' . $this->value[ 'time' ] );
220 220
 		}
221 221
 
222 222
 		if ( $tz_offset = $this->field->field_timezone_offset() ) {
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
 		$tzstring = null;
255 255
 
256 256
 		if ( is_array( $this->value ) && array_key_exists( 'timezone', $this->value ) ) {
257
-			$tzstring = $this->value['timezone'];
257
+			$tzstring = $this->value[ 'timezone' ];
258 258
 		}
259 259
 
260 260
 		if ( empty( $tzstring ) ) {
@@ -274,8 +274,8 @@  discard block
 block discarded – undo
274 274
 			$tzstring = false !== $tzstring ? $tzstring : timezone_name_from_abbr( '', 0, 0 );
275 275
 		}
276 276
 
277
-		$full_format = $this->field->args['date_format'] . ' ' . $this->field->args['time_format'];
278
-		$full_date   = $this->value['date'] . ' ' . $this->value['time'];
277
+		$full_format = $this->field->args[ 'date_format' ] . ' ' . $this->field->args[ 'time_format' ];
278
+		$full_date   = $this->value[ 'date' ] . ' ' . $this->value[ 'time' ];
279 279
 
280 280
 		try {
281 281
 
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 			} else {
299 299
 				// Save the utc timestamp supporting field
300 300
 				if ( $repeat ) {
301
-					$utc_values[ $utc_key ][] = $utc_stamp;
301
+					$utc_values[ $utc_key ][ ] = $utc_stamp;
302 302
 				} else {
303 303
 					$this->_save_utc_value( $utc_key, $utc_stamp );
304 304
 				}
@@ -409,10 +409,10 @@  discard block
 block discarded – undo
409 409
 	 */
410 410
 	public function _new_supporting_field( $new_field_id ) {
411 411
 		$args = $this->field->args();
412
-		unset( $args['_id'], $args['_name'] );
412
+		unset( $args[ '_id' ], $args[ '_name' ] );
413 413
 
414
-		$args['id'] = $new_field_id;
415
-		$args['sanitization_cb'] = false;
414
+		$args[ 'id' ] = $new_field_id;
415
+		$args[ 'sanitization_cb' ] = false;
416 416
 
417 417
 		// And get new field object
418 418
 		return new CMB2_Field( array(
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
 			if ( $this->value ) {
443 443
 				$val = $this->$method( true );
444 444
 				if ( ! empty( $val ) ) {
445
-					$new_value[] = $val;
445
+					$new_value[ ] = $val;
446 446
 				}
447 447
 			}
448 448
 		}
Please login to merge, or discard this patch.
includes/CMB2_Show_Filters.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -27,15 +27,15 @@  discard block
 block discarded – undo
27 27
 	 * @return mixed                show_on key or false
28 28
 	 */
29 29
 	private static function get_show_on_key( $meta_box_args ) {
30
-		$show_on = isset( $meta_box_args['show_on'] ) ? (array) $meta_box_args['show_on'] : false;
30
+		$show_on = isset( $meta_box_args[ 'show_on' ] ) ? (array) $meta_box_args[ 'show_on' ] : false;
31 31
 		if ( $show_on && is_array( $show_on ) ) {
32 32
 
33 33
 			if ( array_key_exists( 'key', $show_on ) ) {
34
-				return $show_on['key'];
34
+				return $show_on[ 'key' ];
35 35
 			}
36 36
 
37 37
 			$keys = array_keys( $show_on );
38
-			return $keys[0];
38
+			return $keys[ 0 ];
39 39
 		}
40 40
 
41 41
 		return false;
@@ -51,17 +51,17 @@  discard block
 block discarded – undo
51 51
 	 * @return mixed                show_on value or false
52 52
 	 */
53 53
 	private static function get_show_on_value( $meta_box_args ) {
54
-		$show_on = isset( $meta_box_args['show_on'] ) ? (array) $meta_box_args['show_on'] : false;
54
+		$show_on = isset( $meta_box_args[ 'show_on' ] ) ? (array) $meta_box_args[ 'show_on' ] : false;
55 55
 
56 56
 		if ( $show_on && is_array( $show_on ) ) {
57 57
 
58 58
 			if ( array_key_exists( 'value', $show_on ) ) {
59
-				return $show_on['value'];
59
+				return $show_on[ 'value' ];
60 60
 			}
61 61
 
62 62
 			$keys = array_keys( $show_on );
63 63
 
64
-			return $show_on[ $keys[0] ];
64
+			return $show_on[ $keys[ 0 ] ];
65 65
 		}
66 66
 
67 67
 		return array();
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 		if ( is_admin() ) {
142 142
 
143 143
 			// If there is no 'page' query var, our filter isn't applicable
144
-			if ( ! isset( $_GET['page'] ) ) {
144
+			if ( ! isset( $_GET[ 'page' ] ) ) {
145 145
 				return $display;
146 146
 			}
147 147
 
@@ -153,12 +153,12 @@  discard block
 block discarded – undo
153 153
 
154 154
 			if ( is_array( $show_on ) ) {
155 155
 				foreach ( $show_on as $page ) {
156
-					if ( $_GET['page'] == $page ) {
156
+					if ( $_GET[ 'page' ] == $page ) {
157 157
 						return true;
158 158
 					}
159 159
 				}
160 160
 			} else {
161
-				if ( $_GET['page'] == $show_on ) {
161
+				if ( $_GET[ 'page' ] == $show_on ) {
162 162
 					return true;
163 163
 				}
164 164
 			}
Please login to merge, or discard this patch.
includes/CMB2_Types.php 1 patch
Spacing   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -200,8 +200,8 @@  discard block
 block discarded – undo
200 200
 	 */
201 201
 	public function concat_items( $args = array() ) {
202 202
 
203
-		$method = isset( $args['method'] ) ? $args['method'] : 'select_option';
204
-		unset( $args['method'] );
203
+		$method = isset( $args[ 'method' ] ) ? $args[ 'method' ] : 'select_option';
204
+		unset( $args[ 'method' ] );
205 205
 
206 206
 		$value = $this->field->escaped_value()
207 207
 			? $this->field->escaped_value()
@@ -219,12 +219,12 @@  discard block
 block discarded – undo
219 219
 			// Clone args & modify for just this item
220 220
 			$a = $args;
221 221
 
222
-			$a['value'] = $opt_value;
223
-			$a['label'] = $opt_label;
222
+			$a[ 'value' ] = $opt_value;
223
+			$a[ 'label' ] = $opt_label;
224 224
 
225 225
 			// Check if this option is the value of the input
226 226
 			if ( $value == $opt_value ) {
227
-				$a['checked'] = 'checked';
227
+				$a[ 'checked' ] = 'checked';
228 228
 			}
229 229
 
230 230
 			$concatenated_items .= $this->$method( $a, $i++ );
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 	 * @return string       Generated option element html
241 241
 	 */
242 242
 	public function select_option( $args = array() ) {
243
-		return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args['value'], selected( isset( $args['checked'] ) && $args['checked'], true, false ), $args['label'] ) . "\n";
243
+		return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args[ 'value' ], selected( isset( $args[ 'checked' ] ) && $args[ 'checked' ], true, false ), $args[ 'label' ] ) . "\n";
244 244
 	}
245 245
 
246 246
 	/**
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 			'label' => '',
261 261
 		) );
262 262
 
263
-		return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a['id'], $a['label'] );
263
+		return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a[ 'id' ], $a[ 'label' ] );
264 264
 	}
265 265
 
266 266
 	/**
@@ -272,10 +272,10 @@  discard block
 block discarded – undo
272 272
 	 */
273 273
 	public function list_input_checkbox( $args, $i ) {
274 274
 		$saved_value = $this->field->escaped_value();
275
-		if ( is_array( $saved_value ) && in_array( $args['value'], $saved_value ) ) {
276
-			$args['checked'] = 'checked';
275
+		if ( is_array( $saved_value ) && in_array( $args[ 'value' ], $saved_value ) ) {
276
+			$args[ 'checked' ] = 'checked';
277 277
 		}
278
-		$args['type'] = 'checkbox';
278
+		$args[ 'type' ] = 'checkbox';
279 279
 		return $this->list_input( $args, $i );
280 280
 	}
281 281
 
@@ -426,11 +426,11 @@  discard block
 block discarded – undo
426 426
 			'js_dependencies' => array(),
427 427
 		) );
428 428
 
429
-		if ( ! empty( $a['js_dependencies'] ) ) {
430
-			CMB2_JS::add_dependencies( $a['js_dependencies'] );
429
+		if ( ! empty( $a[ 'js_dependencies' ] ) ) {
430
+			CMB2_JS::add_dependencies( $a[ 'js_dependencies' ] );
431 431
 		}
432 432
 
433
-		return sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a['desc'] );
433
+		return sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a[ 'desc' ] );
434 434
 	}
435 435
 
436 436
 	/**
@@ -449,7 +449,7 @@  discard block
 block discarded – undo
449 449
 			'value' => $this->field->escaped_value( 'esc_textarea' ),
450 450
 			'desc'  => $this->_desc( true ),
451 451
 		) );
452
-		return sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attrs( $a, array( 'desc', 'value' ) ), $a['value'], $a['desc'] );
452
+		return sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attrs( $a, array( 'desc', 'value' ) ), $a[ 'value' ], $a[ 'desc' ] );
453 453
 	}
454 454
 
455 455
 	/**
@@ -500,8 +500,8 @@  discard block
 block discarded – undo
500 500
 			'options' => $this->field->options(),
501 501
 		) );
502 502
 
503
-		wp_editor( $a['value'], $a['id'], $a['options'] );
504
-		echo $a['desc'];
503
+		wp_editor( $a[ 'value' ], $a[ 'id' ], $a[ 'options' ] );
504
+		echo $a[ 'desc' ];
505 505
 	}
506 506
 
507 507
 	public function text_date( $args = array() ) {
@@ -512,7 +512,7 @@  discard block
 block discarded – undo
512 512
 			'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker' ),
513 513
 		) );
514 514
 
515
-		if ( false === strpos( $args['class'], 'timepicker' ) ) {
515
+		if ( false === strpos( $args[ 'class' ], 'timepicker' ) ) {
516 516
 			$this->parse_picker_options( 'date' );
517 517
 		}
518 518
 
@@ -544,34 +544,34 @@  discard block
 block discarded – undo
544 544
 			'timepicker' => array(),
545 545
 		) );
546 546
 
547
-		if ( empty( $args['value'] ) ) {
548
-			$args['value'] = $this->field->escaped_value();
547
+		if ( empty( $args[ 'value' ] ) ) {
548
+			$args[ 'value' ] = $this->field->escaped_value();
549 549
 			// This will be used if there is a select_timezone set for this field
550 550
 			$tz_offset = $this->field->field_timezone_offset();
551 551
 			if ( ! empty( $tz_offset ) ) {
552
-				$args['value'] -= $tz_offset;
552
+				$args[ 'value' ] -= $tz_offset;
553 553
 			}
554 554
 		}
555 555
 
556
-		$has_good_value = ! empty( $args['value'] ) && ! is_array( $args['value'] );
556
+		$has_good_value = ! empty( $args[ 'value' ] ) && ! is_array( $args[ 'value' ] );
557 557
 
558
-		$date_args = wp_parse_args( $args['datepicker'], array(
558
+		$date_args = wp_parse_args( $args[ 'datepicker' ], array(
559 559
 			'class' => 'cmb2-text-small cmb2-datepicker',
560 560
 			'name'  => $this->_name( '[date]' ),
561 561
 			'id'    => $this->_id( '_date' ),
562
-			'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args['value'] ) : '',
562
+			'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args[ 'value' ] ) : '',
563 563
 			'desc'  => '',
564 564
 		) );
565 565
 
566 566
 		// Let's get the date-format, and set it up as a data attr for the field.
567 567
 		$date_args = $this->parse_picker_options( 'date', $date_args );
568 568
 
569
-		$time_args = wp_parse_args( $args['timepicker'], array(
569
+		$time_args = wp_parse_args( $args[ 'timepicker' ], array(
570 570
 			'class' => 'cmb2-timepicker text-time',
571 571
 			'name'  => $this->_name( '[time]' ),
572 572
 			'id'    => $this->_id( '_time' ),
573
-			'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args['value'] ) : '',
574
-			'desc'  => $args['desc'],
573
+			'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args[ 'value' ] ) : '',
574
+			'desc'  => $args[ 'desc' ],
575 575
 			'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker', 'jquery-ui-datetimepicker' ),
576 576
 		) );
577 577
 
@@ -589,12 +589,12 @@  discard block
 block discarded – undo
589 589
 			'select_timezone'         => array(),
590 590
 		) );
591 591
 
592
-		$args['value'] = $this->field->escaped_value();
593
-		if ( is_array( $args['value'] ) ) {
594
-			$args['value'] = '';
592
+		$args[ 'value' ] = $this->field->escaped_value();
593
+		if ( is_array( $args[ 'value' ] ) ) {
594
+			$args[ 'value' ] = '';
595 595
 		}
596 596
 
597
-		$datetime = maybe_unserialize( $args['value'] );
597
+		$datetime = maybe_unserialize( $args[ 'value' ] );
598 598
 		$value = $tzstring = '';
599 599
 
600 600
 		if ( $datetime && $datetime instanceof DateTime ) {
@@ -603,24 +603,24 @@  discard block
 block discarded – undo
603 603
 			$value    = $datetime->getTimestamp();
604 604
 		}
605 605
 
606
-		$timestamp_args = wp_parse_args( $args['text_datetime_timestamp'], array(
606
+		$timestamp_args = wp_parse_args( $args[ 'text_datetime_timestamp' ], array(
607 607
 			'desc'  => '',
608 608
 			'value' => $value,
609 609
 		) );
610 610
 
611
-		$timezone_args = wp_parse_args( $args['select_timezone'], array(
611
+		$timezone_args = wp_parse_args( $args[ 'select_timezone' ], array(
612 612
 			'class'   => 'cmb2_select cmb2-select-timezone',
613 613
 			'name'    => $this->_name( '[timezone]' ),
614 614
 			'id'      => $this->_id( '_timezone' ),
615 615
 			'options' => wp_timezone_choice( $tzstring ),
616
-			'desc'    => $args['desc'],
616
+			'desc'    => $args[ 'desc' ],
617 617
 		) );
618 618
 
619 619
 		return $this->text_datetime_timestamp( $timestamp_args ) . "\n" . $this->select( $timezone_args );
620 620
 	}
621 621
 
622 622
 	public function select_timezone() {
623
-		$this->field->args['default'] = $this->field->args( 'default' )
623
+		$this->field->args[ 'default' ] = $this->field->args( 'default' )
624 624
 			? $this->field->args( 'default' )
625 625
 			: cmb2_utils()->timezone_string();
626 626
 
@@ -662,7 +662,7 @@  discard block
 block discarded – undo
662 662
 			'desc'  => $this->_desc( true ),
663 663
 		) );
664 664
 
665
-		return sprintf( '<%1$s class="%2$s">%3$s</%1$s>%4$s', $a['tag'], $a['class'], $a['name'], $a['desc'] );
665
+		return sprintf( '<%1$s class="%2$s">%3$s</%1$s>%4$s', $a[ 'tag' ], $a[ 'class' ], $a[ 'name' ], $a[ 'desc' ] );
666 666
 	}
667 667
 
668 668
 	public function select( $args = array() ) {
@@ -675,17 +675,17 @@  discard block
 block discarded – undo
675 675
 		) );
676 676
 
677 677
 		$attrs = $this->concat_attrs( $a, array( 'desc', 'options' ) );
678
-		return sprintf( '<select%s>%s</select>%s', $attrs, $a['options'], $a['desc'] );
678
+		return sprintf( '<select%s>%s</select>%s', $attrs, $a[ 'options' ], $a[ 'desc' ] );
679 679
 	}
680 680
 
681 681
 	public function taxonomy_select() {
682 682
 
683 683
 		$names      = $this->get_object_terms();
684
-		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[key( $names )]->slug;
684
+		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[ key( $names ) ]->slug;
685 685
 		$terms      = get_terms( $this->field->args( 'taxonomy' ), 'hide_empty=0' );
686 686
 		$options    = '';
687 687
 
688
-		$option_none  = $this->field->args( 'show_option_none' );
688
+		$option_none = $this->field->args( 'show_option_none' );
689 689
 		if ( ! empty( $option_none ) ) {
690 690
 			$option_none_value = apply_filters( 'cmb2_taxonomy_select_default_value', '' );
691 691
 			$option_none_value = apply_filters( "cmb2_taxonomy_select_{$this->_id()}_default_value", $option_none_value );
@@ -715,7 +715,7 @@  discard block
 block discarded – undo
715 715
 			'desc'    => $this->_desc( true ),
716 716
 		) );
717 717
 
718
-		return sprintf( '<ul class="%s">%s</ul>%s', $a['class'], $a['options'], $a['desc'] );
718
+		return sprintf( '<ul class="%s">%s</ul>%s', $a[ 'class' ], $a[ 'options' ], $a[ 'desc' ] );
719 719
 	}
720 720
 
721 721
 	public function radio_inline() {
@@ -750,7 +750,7 @@  discard block
 block discarded – undo
750 750
 			: $is_checked;
751 751
 
752 752
 		if ( $is_checked ) {
753
-			$defaults['checked'] = 'checked';
753
+			$defaults[ 'checked' ] = 'checked';
754 754
 		}
755 755
 
756 756
 		$args = $this->parse_args( $args, 'checkbox', $defaults );
@@ -760,14 +760,14 @@  discard block
 block discarded – undo
760 760
 
761 761
 	public function taxonomy_radio() {
762 762
 		$names      = $this->get_object_terms();
763
-		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[key( $names )]->slug;
763
+		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[ key( $names ) ]->slug;
764 764
 		$terms      = get_terms( $this->field->args( 'taxonomy' ), 'hide_empty=0' );
765 765
 		$options    = ''; $i = 1;
766 766
 
767 767
 		if ( ! $terms ) {
768 768
 			$options .= sprintf( '<li><label>%s</label></li>', esc_html( $this->_text( 'no_terms_text', __( 'No terms', 'cmb2' ) ) ) );
769 769
 		} else {
770
-			$option_none  = $this->field->args( 'show_option_none' );
770
+			$option_none = $this->field->args( 'show_option_none' );
771 771
 			if ( ! empty( $option_none ) ) {
772 772
 				$option_none_value = apply_filters( "cmb2_taxonomy_radio_{$this->_id()}_default_value", apply_filters( 'cmb2_taxonomy_radio_default_value', '' ) );
773 773
 				$args = array(
@@ -775,7 +775,7 @@  discard block
 block discarded – undo
775 775
 					'label' => $option_none,
776 776
 				);
777 777
 				if ( $saved_term == $option_none_value ) {
778
-					$args['checked'] = 'checked';
778
+					$args[ 'checked' ] = 'checked';
779 779
 				}
780 780
 				$options .= $this->list_input( $args, $i );
781 781
 				$i++;
@@ -788,7 +788,7 @@  discard block
 block discarded – undo
788 788
 				);
789 789
 
790 790
 				if ( $saved_term == $term->slug ) {
791
-					$args['checked'] = 'checked';
791
+					$args[ 'checked' ] = 'checked';
792 792
 				}
793 793
 				$options .= $this->list_input( $args, $i );
794 794
 				$i++;
@@ -825,7 +825,7 @@  discard block
 block discarded – undo
825 825
 				);
826 826
 
827 827
 				if ( is_array( $saved_terms ) && in_array( $term->slug, $saved_terms ) ) {
828
-					$args['checked'] = 'checked';
828
+					$args[ 'checked' ] = 'checked';
829 829
 				}
830 830
 				$options .= $this->list_input( $args, $i );
831 831
 				$i++;
@@ -930,7 +930,7 @@  discard block
 block discarded – undo
930 930
 		$query_args = $this->field->args( 'query_args' );
931 931
 
932 932
 		// if options array and 'url' => false, then hide the url field
933
-		$input_type = array_key_exists( 'url', $options ) && false === $options['url'] ? 'hidden' : 'text';
933
+		$input_type = array_key_exists( 'url', $options ) && false === $options[ 'url' ] ? 'hidden' : 'text';
934 934
 
935 935
 		echo $this->input( array(
936 936
 			'type'  => $input_type,
@@ -951,8 +951,8 @@  discard block
 block discarded – undo
951 951
 		// Reset field args for attachment ID
952 952
 		$args = $this->field->args();
953 953
 		// If we're looking at a file in a group, we need to get the non-prefixed id
954
-		$args['id'] = ( $this->field->group ? $this->field->args( '_id' ) : $cached_id ) . '_id';
955
-		unset( $args['_id'], $args['_name'] );
954
+		$args[ 'id' ] = ( $this->field->group ? $this->field->args( '_id' ) : $cached_id ) . '_id';
955
+		unset( $args[ '_id' ], $args[ '_name' ] );
956 956
 
957 957
 		// And get new field object
958 958
 		$this->field = new CMB2_Field( array(
@@ -984,7 +984,7 @@  discard block
 block discarded – undo
984 984
 				if ( $_id_value ) {
985 985
 					$image = wp_get_attachment_image( $_id_value, $img_size, null, array( 'class' => 'cmb-file-field-image' ) );
986 986
 				} else {
987
-					$size = is_array( $img_size ) ? $img_size[0] : 350;
987
+					$size = is_array( $img_size ) ? $img_size[ 0 ] : 350;
988 988
 					$image = '<img style="max-width: ' . absint( $size ) . 'px; width: 100%; height: auto;" src="' . $meta_value . '" alt="" />';
989 989
 				}
990 990
 
@@ -1015,11 +1015,11 @@  discard block
 block discarded – undo
1015 1015
 	 */
1016 1016
 	public function img_status_output( $args ) {
1017 1017
 		printf( '<%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>',
1018
-			$args['tag'],
1019
-			$args['image'],
1020
-			isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '',
1018
+			$args[ 'tag' ],
1019
+			$args[ 'image' ],
1020
+			isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '',
1021 1021
 			esc_html( $this->_text( 'remove_image_text', __( 'Remove Image', 'cmb2' ) ) ),
1022
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
1022
+			isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : ''
1023 1023
 		);
1024 1024
 	}
1025 1025
 
@@ -1031,14 +1031,14 @@  discard block
 block discarded – undo
1031 1031
 	 */
1032 1032
 	public function file_status_output( $args ) {
1033 1033
 		printf( '<%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>',
1034
-			$args['tag'],
1034
+			$args[ 'tag' ],
1035 1035
 			esc_html( $this->_text( 'file_text', __( 'File:', 'cmb2' ) ) ),
1036
-			$this->get_file_name_from_path( $args['value'] ),
1037
-			$args['value'],
1036
+			$this->get_file_name_from_path( $args[ 'value' ] ),
1037
+			$args[ 'value' ],
1038 1038
 			esc_html( $this->_text( 'file_download_text', __( 'Download', 'cmb2' ) ) ),
1039
-			isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '',
1039
+			isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '',
1040 1040
 			esc_html( $this->_text( 'remove_text', __( 'Remove', 'cmb2' ) ) ),
1041
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
1041
+			isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : ''
1042 1042
 		);
1043 1043
 	}
1044 1044
 
@@ -1060,8 +1060,8 @@  discard block
 block discarded – undo
1060 1060
 			if ( $update ) {
1061 1061
 				$atts = $this->field->args( 'attributes' );
1062 1062
 			} else {
1063
-				$atts = isset( $args['attributes'] )
1064
-					? $args['attributes']
1063
+				$atts = isset( $args[ 'attributes' ] )
1064
+					? $args[ 'attributes' ]
1065 1065
 					: $atts;
1066 1066
 			}
1067 1067
 
@@ -1077,7 +1077,7 @@  discard block
 block discarded – undo
1077 1077
 		}
1078 1078
 
1079 1079
 		if ( $update ) {
1080
-			$this->field->args['attributes'] = $atts;
1080
+			$this->field->args[ 'attributes' ] = $atts;
1081 1081
 		}
1082 1082
 
1083 1083
 		return array_merge( $args, $atts );
Please login to merge, or discard this patch.
includes/CMB2_Utils.php 1 patch
Spacing   +19 added lines, -20 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 		$dir = wp_upload_dir();
31 31
 
32 32
 		// Is URL in uploads directory?
33
-		if ( false === strpos( $img_url, $dir['baseurl'] . '/' ) ) {
33
+		if ( false === strpos( $img_url, $dir[ 'baseurl' ] . '/' ) ) {
34 34
 			return false;
35 35
 		}
36 36
 
@@ -55,8 +55,8 @@  discard block
 block discarded – undo
55 55
 
56 56
 			foreach ( $query->posts as $post_id ) {
57 57
 				$meta = wp_get_attachment_metadata( $post_id );
58
-				$original_file       = basename( $meta['file'] );
59
-				$cropped_image_files = isset( $meta['sizes'] ) ? wp_list_pluck( $meta['sizes'], 'file' ) : array();
58
+				$original_file       = basename( $meta[ 'file' ] );
59
+				$cropped_image_files = isset( $meta[ 'sizes' ] ) ? wp_list_pluck( $meta[ 'sizes' ], 'file' ) : array();
60 60
 				if ( $original_file === $file || in_array( $file, $cropped_image_files ) ) {
61 61
 					$attachment_id = $post_id;
62 62
 					break;
@@ -135,8 +135,7 @@  discard block
 block discarded – undo
135 135
 		}
136 136
 
137 137
 		return $this->is_valid_time_stamp( $string )
138
-			? (int) $string :
139
-			strtotime( (string) $string );
138
+			? (int) $string : strtotime( (string) $string );
140 139
 	}
141 140
 
142 141
 	/**
@@ -241,24 +240,24 @@  discard block
 block discarded – undo
241 240
 
242 241
 		// order is relevant here, since the replacement will be done sequentially.
243 242
 		$supported_options = array(
244
-			'd' => 'dd',  // Day, leading 0
245
-			'j' => 'd',   // Day, no 0
246
-			'z' => 'o',   // Day of the year, no leading zeroes,
243
+			'd' => 'dd', // Day, leading 0
244
+			'j' => 'd', // Day, no 0
245
+			'z' => 'o', // Day of the year, no leading zeroes,
247 246
 			// 'D' => 'D',   // Day name short, not sure how it'll work with translations
248 247
 			// 'l' => 'DD',  // Day name full, idem before
249
-			'm' => 'mm',  // Month of the year, leading 0
250
-			'n' => 'm',   // Month of the year, no leading 0
248
+			'm' => 'mm', // Month of the year, leading 0
249
+			'n' => 'm', // Month of the year, no leading 0
251 250
 			// 'M' => 'M',   // Month, Short name
252 251
 			// 'F' => 'MM',  // Month, full name,
253
-			'y' => 'y',   // Year, two digit
254
-			'Y' => 'yy',  // Year, full
255
-			'H' => 'HH',  // Hour with leading 0 (24 hour)
256
-			'G' => 'H',   // Hour with no leading 0 (24 hour)
257
-			'h' => 'hh',  // Hour with leading 0 (12 hour)
258
-			'g' => 'h',   // Hour with no leading 0 (12 hour),
259
-			'i' => 'mm',  // Minute with leading 0,
260
-			's' => 'ss',  // Second with leading 0,
261
-			'a' => 'tt',  // am/pm
252
+			'y' => 'y', // Year, two digit
253
+			'Y' => 'yy', // Year, full
254
+			'H' => 'HH', // Hour with leading 0 (24 hour)
255
+			'G' => 'H', // Hour with no leading 0 (24 hour)
256
+			'h' => 'hh', // Hour with leading 0 (12 hour)
257
+			'g' => 'h', // Hour with no leading 0 (12 hour),
258
+			'i' => 'mm', // Minute with leading 0,
259
+			's' => 'ss', // Second with leading 0,
260
+			'a' => 'tt', // am/pm
262 261
 			'A' => 'TT'   // AM/PM
263 262
 		);
264 263
 
@@ -279,7 +278,7 @@  discard block
 block discarded – undo
279 278
 	 * @return string Modified value
280 279
 	 */
281 280
 	public function wrap_escaped_chars( $value ) {
282
-		return "&#39;" . str_replace( '\\', '', $value[0] ) . "&#39;";
281
+		return "&#39;" . str_replace( '\\', '', $value[ 0 ] ) . "&#39;";
283 282
 	}
284 283
 
285 284
 	/**
Please login to merge, or discard this patch.
includes/CMB2_hookup.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 	 * @return array           Modified array of classes
271 271
 	 */
272 272
 	public function close_metabox_class( $classes ) {
273
-		$classes[] = 'closed';
273
+		$classes[ ] = 'closed';
274 274
 		return $classes;
275 275
 	}
276 276
 
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 	public function user_new_metabox( $section ) {
291 291
 		if ( $section == $this->cmb->prop( 'new_user_section' ) ) {
292 292
 			$object_id = $this->cmb->object_id();
293
-			$this->cmb->object_id( isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id );
293
+			$this->cmb->object_id( isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id );
294 294
 			$this->user_metabox();
295 295
 		}
296 296
 	}
@@ -441,7 +441,7 @@  discard block
 block discarded – undo
441 441
 		if ( $this->taxonomy_can_save( $taxonomy ) ) {
442 442
 
443 443
 			foreach ( $this->cmb->prop( 'fields' ) as $field ) {
444
-				$data_to_delete[ $field['id'] ] = '';
444
+				$data_to_delete[ $field[ 'id' ] ] = '';
445 445
 			}
446 446
 
447 447
 			$this->cmb->save_fields( $term_id, 'term', $data_to_delete );
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
504 504
 			return;
505 505
 		}
506 506
 
507
-		self::$hooks_completed[] = $key;
507
+		self::$hooks_completed[ ] = $key;
508 508
 		add_filter( $action, $hook, $priority, $accepted_args );
509 509
 	}
510 510
 
Please login to merge, or discard this patch.
includes/helper-functions.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 		$cmb = CMB2_Boxes::get( $meta_box );
179 179
 	} else {
180 180
 		// See if we already have an instance of this metabox
181
-		$cmb = CMB2_Boxes::get( $meta_box['id'] );
181
+		$cmb = CMB2_Boxes::get( $meta_box[ 'id' ] );
182 182
 		// If not, we'll initate a new metabox
183 183
 		$cmb = $cmb ? $cmb : new CMB2( $meta_box, $object_id );
184 184
 	}
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
 	) );
255 255
 
256 256
 	// Set object type explicitly (rather than trying to guess from context)
257
-	$cmb->object_type( $args['object_type'] );
257
+	$cmb->object_type( $args[ 'object_type' ] );
258 258
 
259 259
 	// Save the metabox if it's been submitted
260 260
 	// check permissions
@@ -262,32 +262,32 @@  discard block
 block discarded – undo
262 262
 	if (
263 263
 		$cmb->prop( 'save_fields' )
264 264
 		// check nonce
265
-		&& isset( $_POST['submit-cmb'], $_POST['object_id'], $_POST[ $cmb->nonce() ] )
265
+		&& isset( $_POST[ 'submit-cmb' ], $_POST[ 'object_id' ], $_POST[ $cmb->nonce() ] )
266 266
 		&& wp_verify_nonce( $_POST[ $cmb->nonce() ], $cmb->nonce() )
267
-		&& $object_id && $_POST['object_id'] == $object_id
267
+		&& $object_id && $_POST[ 'object_id' ] == $object_id
268 268
 	) {
269 269
 		$cmb->save_fields( $object_id, $cmb->object_type(), $_POST );
270 270
 	}
271 271
 
272 272
 	// Enqueue JS/CSS
273
-	if ( $args['cmb_styles'] ) {
273
+	if ( $args[ 'cmb_styles' ] ) {
274 274
 		CMB2_hookup::enqueue_cmb_css();
275 275
 	}
276 276
 
277
-	if ( $args['enqueue_js'] ) {
277
+	if ( $args[ 'enqueue_js' ] ) {
278 278
 		CMB2_hookup::enqueue_cmb_js();
279 279
 	}
280 280
 
281
-	$form_format = apply_filters( 'cmb2_get_metabox_form_format', $args['form_format'], $object_id, $cmb );
281
+	$form_format = apply_filters( 'cmb2_get_metabox_form_format', $args[ 'form_format' ], $object_id, $cmb );
282 282
 
283 283
 	$format_parts = explode( '%3$s', $form_format );
284 284
 
285 285
 	// Show cmb form
286
-	printf( $format_parts[0], $cmb->cmb_id, $object_id );
286
+	printf( $format_parts[ 0 ], $cmb->cmb_id, $object_id );
287 287
 	$cmb->show_form();
288 288
 
289
-	if ( isset( $format_parts[1] ) && $format_parts[1] ) {
290
-		printf( str_ireplace( '%4$s', '%1$s', $format_parts[1] ), $args['save_button'] );
289
+	if ( isset( $format_parts[ 1 ] ) && $format_parts[ 1 ] ) {
290
+		printf( str_ireplace( '%4$s', '%1$s', $format_parts[ 1 ] ), $args[ 'save_button' ] );
291 291
 	}
292 292
 
293 293
 }
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
  * @param  array   $args      Optional arguments array
301 301
  */
302 302
 function cmb2_metabox_form( $meta_box, $object_id = 0, $args = array() ) {
303
-	if ( ! isset( $args['echo'] ) || $args['echo'] ) {
303
+	if ( ! isset( $args[ 'echo' ] ) || $args[ 'echo' ] ) {
304 304
 		cmb2_print_metabox_form( $meta_box, $object_id, $args );
305 305
 	} else {
306 306
 		return cmb2_get_metabox_form( $meta_box, $object_id, $args );
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
 
323 323
 		$schedule_format = str_replace(
324 324
 			array( 'M', 'Y', 'm', 'd', 'H', 'i', 'a' ),
325
-			array('%b', '%Y', '%m', '%d', '%H', '%M', '%p' ),
325
+			array( '%b', '%Y', '%m', '%d', '%H', '%M', '%p' ),
326 326
 			$date_format
327 327
 		);
328 328
 
@@ -339,14 +339,14 @@  discard block
 block discarded – undo
339 339
 			 * 4 or 2 characters, as needed
340 340
 			 */
341 341
 			'%04d-%02d-%02d %02d:%02d:%02d',
342
-			$parsed_time['tm_year'] + 1900,  // This will be "111", so we need to add 1900.
343
-			$parsed_time['tm_mon'] + 1,      // This will be the month minus one, so we add one.
344
-			$parsed_time['tm_mday'],
345
-			$parsed_time['tm_hour'],
346
-			$parsed_time['tm_min'],
347
-			$parsed_time['tm_sec']
342
+			$parsed_time[ 'tm_year' ] + 1900, // This will be "111", so we need to add 1900.
343
+			$parsed_time[ 'tm_mon' ] + 1, // This will be the month minus one, so we add one.
344
+			$parsed_time[ 'tm_mday' ],
345
+			$parsed_time[ 'tm_hour' ],
346
+			$parsed_time[ 'tm_min' ],
347
+			$parsed_time[ 'tm_sec' ]
348 348
 		);
349 349
 
350
-		return new DateTime($ymd);
350
+		return new DateTime( $ymd );
351 351
 	}
352 352
 }
Please login to merge, or discard this patch.