Completed
Push — trunk ( 2e33bd...5f30a5 )
by Justin
10:38
created
includes/CMB2.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -866,7 +866,7 @@  discard block
 block discarded – undo
866 866
 	 * @param  mixed  $field_id     Field (or group field) ID
867 867
 	 * @param  mixed  $field_args   Array of field arguments
868 868
 	 * @param  mixed  $sub_field_id Sub field ID (if field_group exists)
869
-	 * @param  mixed  $field_group  If a sub-field, will be the parent group CMB2_Field object
869
+	 * @param  CMB2_Field|null  $field_group  If a sub-field, will be the parent group CMB2_Field object
870 870
 	 * @return array                Array of CMB2_Field arguments
871 871
 	 */
872 872
 	public function get_field_args( $field_id, $field_args, $sub_field_id, $field_group ) {
@@ -925,7 +925,7 @@  discard block
 block discarded – undo
925 925
 	 * @since  2.0.0
926 926
 	 * @param  array  $field           Metabox field config array
927 927
 	 * @param  int    $position        (optional) Position of metabox. 1 for first, etc
928
-	 * @return mixed                   Field id or false
928
+	 * @return string                   Field id or false
929 929
 	 */
930 930
 	public function add_field( array $field, $position = 0 ) {
931 931
 		if ( ! is_array( $field ) || ! array_key_exists( 'id', $field ) ) {
Please login to merge, or discard this patch.
Spacing   +62 added lines, -62 removed lines patch added patch discarded remove patch
@@ -118,19 +118,19 @@  discard block
 block discarded – undo
118 118
 	 */
119 119
 	public function __construct( $meta_box, $object_id = 0 ) {
120 120
 
121
-		if ( empty( $meta_box['id'] ) ) {
121
+		if ( empty( $meta_box[ 'id' ] ) ) {
122 122
 			wp_die( __( 'Metabox configuration is required to have an ID parameter', 'cmb2' ) );
123 123
 		}
124 124
 
125 125
 		$this->meta_box = wp_parse_args( $meta_box, $this->mb_defaults );
126
-		$this->meta_box['fields'] = array();
126
+		$this->meta_box[ 'fields' ] = array();
127 127
 
128 128
 		$this->object_id( $object_id );
129 129
 		$this->mb_object_type();
130
-		$this->cmb_id = $meta_box['id'];
130
+		$this->cmb_id = $meta_box[ 'id' ];
131 131
 
132
-		if ( ! empty( $meta_box['fields'] ) && is_array( $meta_box['fields'] ) ) {
133
-			$this->add_fields( $meta_box['fields'] );
132
+		if ( ! empty( $meta_box[ 'fields' ] ) && is_array( $meta_box[ 'fields' ] ) ) {
133
+			$this->add_fields( $meta_box[ 'fields' ] );
134 134
 		}
135 135
 
136 136
 		CMB2_Boxes::add( $this );
@@ -261,16 +261,16 @@  discard block
 block discarded – undo
261 261
 	 * @return mixed CMB2_Field object if successful.
262 262
 	 */
263 263
 	public function render_field( $field_args ) {
264
-		$field_args['context'] = $this->prop( 'context' );
264
+		$field_args[ 'context' ] = $this->prop( 'context' );
265 265
 
266
-		if ( 'group' == $field_args['type'] ) {
266
+		if ( 'group' == $field_args[ 'type' ] ) {
267 267
 
268
-			if ( ! isset( $field_args['show_names'] ) ) {
269
-				$field_args['show_names'] = $this->prop( 'show_names' );
268
+			if ( ! isset( $field_args[ 'show_names' ] ) ) {
269
+				$field_args[ 'show_names' ] = $this->prop( 'show_names' );
270 270
 			}
271 271
 			$field = $this->render_group( $field_args );
272 272
 
273
-		} elseif ( 'hidden' == $field_args['type'] && $this->get_field( $field_args )->should_show() ) {
273
+		} elseif ( 'hidden' == $field_args[ 'type' ] && $this->get_field( $field_args )->should_show() ) {
274 274
 			// Save rendering for after the metabox
275 275
 			$field = $this->add_hidden_field( array(
276 276
 				'field_args'  => $field_args,
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
 
281 281
 		} else {
282 282
 
283
-			$field_args['show_names'] = $this->prop( 'show_names' );
283
+			$field_args[ 'show_names' ] = $this->prop( 'show_names' );
284 284
 
285 285
 			// Render default fields
286 286
 			$field = $this->get_field( $field_args )->render_field();
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
 	 */
297 297
 	public function render_group( $args ) {
298 298
 
299
-		if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) {
299
+		if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) {
300 300
 			return;
301 301
 		}
302 302
 
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
 			<div class="inside cmb-td cmb-nested cmb-field-list">';
379 379
 				// Loop and render repeatable group fields
380 380
 				foreach ( array_values( $field_group->args( 'fields' ) ) as $field_args ) {
381
-					if ( 'hidden' == $field_args['type'] ) {
381
+					if ( 'hidden' == $field_args[ 'type' ] ) {
382 382
 
383 383
 						// Save rendering for after the metabox
384 384
 						$this->add_hidden_field( array(
@@ -388,8 +388,8 @@  discard block
 block discarded – undo
388 388
 
389 389
 					} else {
390 390
 
391
-						$field_args['show_names'] = $field_group->args( 'show_names' );
392
-						$field_args['context']    = $field_group->args( 'context' );
391
+						$field_args[ 'show_names' ] = $field_group->args( 'show_names' );
392
+						$field_args[ 'context' ]    = $field_group->args( 'context' );
393 393
 
394 394
 						$field = $this->get_field( $field_args, $field_group )->render_field();
395 395
 					}
@@ -418,7 +418,7 @@  discard block
 block discarded – undo
418 418
 	 */
419 419
 	public function add_hidden_field( $args ) {
420 420
 		$field = new CMB2_Field( $args );
421
-		$this->hidden_fields[] = new CMB2_Types( $field );
421
+		$this->hidden_fields[ ] = new CMB2_Types( $field );
422 422
 
423 423
 		return $field;
424 424
 	}
@@ -557,7 +557,7 @@  discard block
 block discarded – undo
557 557
 	 */
558 558
 	public function process_field( $field_args ) {
559 559
 
560
-		switch ( $field_args['type'] ) {
560
+		switch ( $field_args[ 'type' ] ) {
561 561
 
562 562
 			case 'group':
563 563
 				$this->save_group( $field_args );
@@ -577,7 +577,7 @@  discard block
 block discarded – undo
577 577
 				) );
578 578
 
579 579
 				if ( $field->save_field_from_data( $this->data_to_save ) ) {
580
-					$this->updated[] = $field->id();
580
+					$this->updated[ ] = $field->id();
581 581
 				}
582 582
 
583 583
 				break;
@@ -590,11 +590,11 @@  discard block
 block discarded – undo
590 590
 	 */
591 591
 	public function save_group( $args ) {
592 592
 
593
-		if ( ! isset( $args['id'], $args['fields'], $this->data_to_save[ $args['id'] ] ) || ! is_array( $args['fields'] ) ) {
593
+		if ( ! isset( $args[ 'id' ], $args[ 'fields' ], $this->data_to_save[ $args[ 'id' ] ] ) || ! is_array( $args[ 'fields' ] ) ) {
594 594
 			return;
595 595
 		}
596 596
 
597
-		$field_group        = new CMB2_Field( array(
597
+		$field_group = new CMB2_Field( array(
598 598
 			'field_args'  => $args,
599 599
 			'object_type' => $this->object_type(),
600 600
 			'object_id'   => $this->object_id(),
@@ -629,16 +629,16 @@  discard block
 block discarded – undo
629 629
 						$_new_val = array();
630 630
 						foreach ( $new_val as $group_index => $grouped_data ) {
631 631
 							// Add the supporting data to the $saved array stack
632
-							$saved[ $field_group->index ][ $grouped_data['supporting_field_id'] ][] = $grouped_data['supporting_field_value'];
632
+							$saved[ $field_group->index ][ $grouped_data[ 'supporting_field_id' ] ][ ] = $grouped_data[ 'supporting_field_value' ];
633 633
 							// Reset var to the actual value
634
-							$_new_val[ $group_index ] = $grouped_data['value'];
634
+							$_new_val[ $group_index ] = $grouped_data[ 'value' ];
635 635
 						}
636 636
 						$new_val = $_new_val;
637 637
 					} else {
638 638
 						// Add the supporting data to the $saved array stack
639
-						$saved[ $field_group->index ][ $new_val['supporting_field_id'] ] = $new_val['supporting_field_value'];
639
+						$saved[ $field_group->index ][ $new_val[ 'supporting_field_id' ] ] = $new_val[ 'supporting_field_value' ];
640 640
 						// Reset var to the actual value
641
-						$new_val = $new_val['value'];
641
+						$new_val = $new_val[ 'value' ];
642 642
 					}
643 643
 				}
644 644
 
@@ -651,7 +651,7 @@  discard block
 block discarded – undo
651 651
 				$is_removed = ( empty( $new_val ) && ! empty( $old_val ) );
652 652
 				// Compare values and add to `$updated` array
653 653
 				if ( $is_updated || $is_removed ) {
654
-					$this->updated[] = $base_id . '::' . $field_group->index . '::' . $sub_id;
654
+					$this->updated[ ] = $base_id . '::' . $field_group->index . '::' . $sub_id;
655 655
 				}
656 656
 
657 657
 				// Add to `$saved` array
@@ -686,22 +686,22 @@  discard block
 block discarded – undo
686 686
 		// Try to get our object ID from the global space
687 687
 		switch ( $this->object_type() ) {
688 688
 			case 'user':
689
-				$object_id = isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id;
690
-				$object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS['user_ID'] ) ? $GLOBALS['user_ID'] : $object_id;
689
+				$object_id = isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id;
690
+				$object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS[ 'user_ID' ] ) ? $GLOBALS[ 'user_ID' ] : $object_id;
691 691
 				break;
692 692
 
693 693
 			case 'comment':
694
-				$object_id = isset( $_REQUEST['c'] ) ? $_REQUEST['c'] : $object_id;
695
-				$object_id = ! $object_id && isset( $GLOBALS['comments']->comment_ID ) ? $GLOBALS['comments']->comment_ID : $object_id;
694
+				$object_id = isset( $_REQUEST[ 'c' ] ) ? $_REQUEST[ 'c' ] : $object_id;
695
+				$object_id = ! $object_id && isset( $GLOBALS[ 'comments' ]->comment_ID ) ? $GLOBALS[ 'comments' ]->comment_ID : $object_id;
696 696
 				break;
697 697
 
698 698
 			case 'term':
699
-				$object_id = isset( $_REQUEST['tag_ID'] ) ? $_REQUEST['tag_ID'] : $object_id;
699
+				$object_id = isset( $_REQUEST[ 'tag_ID' ] ) ? $_REQUEST[ 'tag_ID' ] : $object_id;
700 700
 				break;
701 701
 
702 702
 			default:
703
-				$object_id = isset( $GLOBALS['post']->ID ) ? $GLOBALS['post']->ID : $object_id;
704
-				$object_id = isset( $_REQUEST['post'] ) ? $_REQUEST['post'] : $object_id;
703
+				$object_id = isset( $GLOBALS[ 'post' ]->ID ) ? $GLOBALS[ 'post' ]->ID : $object_id;
704
+				$object_id = isset( $_REQUEST[ 'post' ] ) ? $_REQUEST[ 'post' ] : $object_id;
705 705
 				break;
706 706
 		}
707 707
 
@@ -773,7 +773,7 @@  discard block
 block discarded – undo
773 773
 	 * @return boolean True/False
774 774
 	 */
775 775
 	public function is_options_page_mb() {
776
-		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'] ) );
776
+		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' ] ) );
777 777
 	}
778 778
 
779 779
 	/**
@@ -839,7 +839,7 @@  discard block
 block discarded – undo
839 839
 			return $field;
840 840
 		}
841 841
 
842
-		$field_id = is_string( $field ) ? $field : $field['id'];
842
+		$field_id = is_string( $field ) ? $field : $field[ 'id' ];
843 843
 
844 844
 		$parent_field_id = ! empty( $field_group ) ? $field_group->id() : '';
845 845
 		$ids = $this->get_field_ids( $field_id, $parent_field_id, true );
@@ -875,7 +875,7 @@  discard block
 block discarded – undo
875 875
 		if ( $field_group && ( $sub_field_id || 0 === $sub_field_id ) ) {
876 876
 
877 877
 			// Update the fields array w/ any modified properties inherited from the group field
878
-			$this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] = $field_args;
878
+			$this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] = $field_args;
879 879
 
880 880
 			return array(
881 881
 				'field_args'  => $field_args,
@@ -885,11 +885,11 @@  discard block
 block discarded – undo
885 885
 		}
886 886
 
887 887
 		if ( is_array( $field_args ) ) {
888
-			$this->meta_box['fields'][ $field_id ] = array_merge( $field_args, $this->meta_box['fields'][ $field_id ] );
888
+			$this->meta_box[ 'fields' ][ $field_id ] = array_merge( $field_args, $this->meta_box[ 'fields' ][ $field_id ] );
889 889
 		}
890 890
 
891 891
 		return array(
892
-			'field_args'  => $this->meta_box['fields'][ $field_id ],
892
+			'field_args'  => $this->meta_box[ 'fields' ][ $field_id ],
893 893
 			'object_type' => $this->object_type(),
894 894
 			'object_id'   => $this->object_id(),
895 895
 		);
@@ -906,8 +906,8 @@  discard block
 block discarded – undo
906 906
 
907 907
 			$sub_fields = false;
908 908
 			if ( array_key_exists( 'fields', $field ) ) {
909
-				$sub_fields = $field['fields'];
910
-				unset( $field['fields'] );
909
+				$sub_fields = $field[ 'fields' ];
910
+				unset( $field[ 'fields' ] );
911 911
 			}
912 912
 
913 913
 			$field_id = $parent_field_id
@@ -932,18 +932,18 @@  discard block
 block discarded – undo
932 932
 			return false;
933 933
 		}
934 934
 
935
-		if ( 'oembed' === $field['type'] ) {
935
+		if ( 'oembed' === $field[ 'type' ] ) {
936 936
 			// Initiate oembed Ajax hooks
937 937
 			cmb2_ajax();
938 938
 		}
939 939
 
940 940
 		$this->_add_field_to_array(
941 941
 			$field,
942
-			$this->meta_box['fields'],
942
+			$this->meta_box[ 'fields' ],
943 943
 			$position
944 944
 		);
945 945
 
946
-		return $field['id'];
946
+		return $field[ 'id' ];
947 947
 	}
948 948
 
949 949
 	/**
@@ -955,27 +955,27 @@  discard block
 block discarded – undo
955 955
 	 * @return mixed                   Array of parent/field ids or false
956 956
 	 */
957 957
 	public function add_group_field( $parent_field_id, array $field, $position = 0 ) {
958
-		if ( ! array_key_exists( $parent_field_id, $this->meta_box['fields'] ) ) {
958
+		if ( ! array_key_exists( $parent_field_id, $this->meta_box[ 'fields' ] ) ) {
959 959
 			return false;
960 960
 		}
961 961
 
962
-		$parent_field = $this->meta_box['fields'][ $parent_field_id ];
962
+		$parent_field = $this->meta_box[ 'fields' ][ $parent_field_id ];
963 963
 
964
-		if ( 'group' !== $parent_field['type'] ) {
964
+		if ( 'group' !== $parent_field[ 'type' ] ) {
965 965
 			return false;
966 966
 		}
967 967
 
968
-		if ( ! isset( $parent_field['fields'] ) ) {
969
-			$this->meta_box['fields'][ $parent_field_id ]['fields'] = array();
968
+		if ( ! isset( $parent_field[ 'fields' ] ) ) {
969
+			$this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ] = array();
970 970
 		}
971 971
 
972 972
 		$this->_add_field_to_array(
973 973
 			$field,
974
-			$this->meta_box['fields'][ $parent_field_id ]['fields'],
974
+			$this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ],
975 975
 			$position
976 976
 		);
977 977
 
978
-		return array( $parent_field_id, $field['id'] );
978
+		return array( $parent_field_id, $field[ 'id' ] );
979 979
 	}
980 980
 
981 981
 	/**
@@ -987,9 +987,9 @@  discard block
 block discarded – undo
987 987
 	 */
988 988
 	protected function _add_field_to_array( $field, &$fields, $position = 0 ) {
989 989
 		if ( $position ) {
990
-			cmb2_utils()->array_insert( $fields, array( $field['id'] => $field ), $position );
990
+			cmb2_utils()->array_insert( $fields, array( $field[ 'id' ] => $field ), $position );
991 991
 		} else {
992
-			$fields[ $field['id'] ] = $field;
992
+			$fields[ $field[ 'id' ] ] = $field;
993 993
 		}
994 994
 	}
995 995
 
@@ -1012,15 +1012,15 @@  discard block
 block discarded – undo
1012 1012
 		unset( $this->fields[ implode( '', $ids ) ] );
1013 1013
 
1014 1014
 		if ( ! $sub_field_id ) {
1015
-			unset( $this->meta_box['fields'][ $field_id ] );
1015
+			unset( $this->meta_box[ 'fields' ][ $field_id ] );
1016 1016
 			return true;
1017 1017
 		}
1018 1018
 
1019
-		if ( isset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] ) ) {
1020
-			unset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] );
1019
+		if ( isset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] ) ) {
1020
+			unset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] );
1021 1021
 		}
1022
-		if ( isset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] ) ) {
1023
-			unset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] );
1022
+		if ( isset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] ) ) {
1023
+			unset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] );
1024 1024
 		}
1025 1025
 		return true;
1026 1026
 	}
@@ -1044,11 +1044,11 @@  discard block
 block discarded – undo
1044 1044
 		list( $field_id, $sub_field_id ) = $ids;
1045 1045
 
1046 1046
 		if ( ! $sub_field_id ) {
1047
-			$this->meta_box['fields'][ $field_id ][ $property ] = $value;
1047
+			$this->meta_box[ 'fields' ][ $field_id ][ $property ] = $value;
1048 1048
 			return $field_id;
1049 1049
 		}
1050 1050
 
1051
-		$this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ][ $property ] = $value;
1051
+		$this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ][ $property ] = $value;
1052 1052
 		return $field_id;
1053 1053
 	}
1054 1054
 
@@ -1062,7 +1062,7 @@  discard block
 block discarded – undo
1062 1062
 	public function get_field_ids( $field_id, $parent_field_id = '' ) {
1063 1063
 		$sub_field_id = $parent_field_id ? $field_id : '';
1064 1064
 		$field_id     = $parent_field_id ? $parent_field_id : $field_id;
1065
-		$fields       =& $this->meta_box['fields'];
1065
+		$fields       = & $this->meta_box[ 'fields' ];
1066 1066
 
1067 1067
 		if ( ! array_key_exists( $field_id, $fields ) ) {
1068 1068
 			$field_id = $this->search_old_school_array( $field_id, $fields );
@@ -1076,12 +1076,12 @@  discard block
 block discarded – undo
1076 1076
 			return array( $field_id, $sub_field_id );
1077 1077
 		}
1078 1078
 
1079
-		if ( 'group' !== $fields[ $field_id ]['type'] ) {
1079
+		if ( 'group' !== $fields[ $field_id ][ 'type' ] ) {
1080 1080
 			return false;
1081 1081
 		}
1082 1082
 
1083
-		if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ]['fields'] ) ) {
1084
-			$sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ]['fields'] );
1083
+		if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ][ 'fields' ] ) ) {
1084
+			$sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ][ 'fields' ] );
1085 1085
 		}
1086 1086
 
1087 1087
 		return false === $sub_field_id ? false : array( $field_id, $sub_field_id );
Please login to merge, or discard this patch.
includes/CMB2_hookup.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -267,7 +267,7 @@
 block discarded – undo
267 267
 	 * Add 'closed' class to metabox
268 268
 	 * @since  2.0.0
269 269
 	 * @param  array  $classes Array of classes
270
-	 * @return array           Modified array of classes
270
+	 * @return string[]           Modified array of classes
271 271
 	 */
272 272
 	public function close_metabox_class( $classes ) {
273 273
 		$classes[] = 'closed';
Please login to merge, or discard this 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/CMB2_Sanitize.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -357,6 +357,7 @@  discard block
 block discarded – undo
357 357
 	/**
358 358
 	 * Gets the values for the `file` field type from the data being saved.
359 359
 	 * @since  2.2.0
360
+	 * @param string $id_key
360 361
 	 */
361 362
 	public function _get_group_file_value_array( $id_key ) {
362 363
 		$alldata = $this->field->group->data_to_save;
@@ -378,6 +379,7 @@  discard block
 block discarded – undo
378 379
 	/**
379 380
 	 * Peforms saving of `file` attachement's ID
380 381
 	 * @since  1.1.0
382
+	 * @param string $file_id_key
381 383
 	 */
382 384
 	public function _save_file_id_value( $file_id_key ) {
383 385
 		$id_field = $this->_new_supporting_field( $file_id_key );
@@ -398,6 +400,7 @@  discard block
 block discarded – undo
398 400
 	/**
399 401
 	 * Peforms saving of `text_datetime_timestamp_timezone` utc timestamp
400 402
 	 * @since  2.2.0
403
+	 * @param string $utc_key
401 404
 	 */
402 405
 	public function _save_utc_value( $utc_key, $utc_stamp ) {
403 406
 		return $this->_new_supporting_field( $utc_key )->save_field( $utc_stamp );
Please login to merge, or discard this 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_Types.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -175,7 +175,7 @@
 block discarded – undo
175 175
 	 * Combines attributes into a string for a form element
176 176
 	 * @since  1.1.0
177 177
 	 * @param  array  $attrs        Attributes to concatenate
178
-	 * @param  array  $attr_exclude Attributes that should NOT be concatenated
178
+	 * @param  string[]  $attr_exclude Attributes that should NOT be concatenated
179 179
 	 * @return string               String of attributes for form element
180 180
 	 */
181 181
 	public function concat_attrs( $attrs, $attr_exclude = array() ) {
Please login to merge, or discard this patch.
Spacing   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -197,8 +197,8 @@  discard block
 block discarded – undo
197 197
 	 */
198 198
 	public function concat_items( $args = array() ) {
199 199
 
200
-		$method = isset( $args['method'] ) ? $args['method'] : 'select_option';
201
-		unset( $args['method'] );
200
+		$method = isset( $args[ 'method' ] ) ? $args[ 'method' ] : 'select_option';
201
+		unset( $args[ 'method' ] );
202 202
 
203 203
 		$value = $this->field->escaped_value()
204 204
 			? $this->field->escaped_value()
@@ -216,12 +216,12 @@  discard block
 block discarded – undo
216 216
 			// Clone args & modify for just this item
217 217
 			$a = $args;
218 218
 
219
-			$a['value'] = $opt_value;
220
-			$a['label'] = $opt_label;
219
+			$a[ 'value' ] = $opt_value;
220
+			$a[ 'label' ] = $opt_label;
221 221
 
222 222
 			// Check if this option is the value of the input
223 223
 			if ( $value == $opt_value ) {
224
-				$a['checked'] = 'checked';
224
+				$a[ 'checked' ] = 'checked';
225 225
 			}
226 226
 
227 227
 			$concatenated_items .= $this->$method( $a, $i++ );
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
 	 * @return string       Generated option element html
238 238
 	 */
239 239
 	public function select_option( $args = array() ) {
240
-		return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args['value'], selected( isset( $args['checked'] ) && $args['checked'], true, false ), $args['label'] ) . "\n";
240
+		return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args[ 'value' ], selected( isset( $args[ 'checked' ] ) && $args[ 'checked' ], true, false ), $args[ 'label' ] ) . "\n";
241 241
 	}
242 242
 
243 243
 	/**
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 			'label' => '',
258 258
 		) );
259 259
 
260
-		return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a['id'], $a['label'] );
260
+		return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a[ 'id' ], $a[ 'label' ] );
261 261
 	}
262 262
 
263 263
 	/**
@@ -269,10 +269,10 @@  discard block
 block discarded – undo
269 269
 	 */
270 270
 	public function list_input_checkbox( $args, $i ) {
271 271
 		$saved_value = $this->field->escaped_value();
272
-		if ( is_array( $saved_value ) && in_array( $args['value'], $saved_value ) ) {
273
-			$args['checked'] = 'checked';
272
+		if ( is_array( $saved_value ) && in_array( $args[ 'value' ], $saved_value ) ) {
273
+			$args[ 'checked' ] = 'checked';
274 274
 		}
275
-		$args['type'] = 'checkbox';
275
+		$args[ 'type' ] = 'checkbox';
276 276
 		return $this->list_input( $args, $i );
277 277
 	}
278 278
 
@@ -423,11 +423,11 @@  discard block
 block discarded – undo
423 423
 			'js_dependencies' => array(),
424 424
 		) );
425 425
 
426
-		if ( ! empty( $a['js_dependencies'] ) ) {
427
-			CMB2_JS::add_dependencies( $a['js_dependencies'] );
426
+		if ( ! empty( $a[ 'js_dependencies' ] ) ) {
427
+			CMB2_JS::add_dependencies( $a[ 'js_dependencies' ] );
428 428
 		}
429 429
 
430
-		return sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a['desc'] );
430
+		return sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a[ 'desc' ] );
431 431
 	}
432 432
 
433 433
 	/**
@@ -446,7 +446,7 @@  discard block
 block discarded – undo
446 446
 			'value' => $this->field->escaped_value( 'esc_textarea' ),
447 447
 			'desc'  => $this->_desc( true ),
448 448
 		) );
449
-		return sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attrs( $a, array( 'desc', 'value' ) ), $a['value'], $a['desc'] );
449
+		return sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attrs( $a, array( 'desc', 'value' ) ), $a[ 'value' ], $a[ 'desc' ] );
450 450
 	}
451 451
 
452 452
 	/**
@@ -497,8 +497,8 @@  discard block
 block discarded – undo
497 497
 			'options' => $this->field->options(),
498 498
 		) );
499 499
 
500
-		wp_editor( $a['value'], $a['id'], $a['options'] );
501
-		echo $a['desc'];
500
+		wp_editor( $a[ 'value' ], $a[ 'id' ], $a[ 'options' ] );
501
+		echo $a[ 'desc' ];
502 502
 	}
503 503
 
504 504
 	public function text_date( $args = array() ) {
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
 			'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker' ),
510 510
 		) );
511 511
 
512
-		if ( false === strpos( $args['class'], 'timepicker' ) ) {
512
+		if ( false === strpos( $args[ 'class' ], 'timepicker' ) ) {
513 513
 			$this->parse_picker_options( 'date' );
514 514
 		}
515 515
 
@@ -541,34 +541,34 @@  discard block
 block discarded – undo
541 541
 			'timepicker' => array(),
542 542
 		) );
543 543
 
544
-		if ( empty( $args['value'] ) ) {
545
-			$args['value'] = $this->field->escaped_value();
544
+		if ( empty( $args[ 'value' ] ) ) {
545
+			$args[ 'value' ] = $this->field->escaped_value();
546 546
 			// This will be used if there is a select_timezone set for this field
547 547
 			$tz_offset = $this->field->field_timezone_offset();
548 548
 			if ( ! empty( $tz_offset ) ) {
549
-				$args['value'] -= $tz_offset;
549
+				$args[ 'value' ] -= $tz_offset;
550 550
 			}
551 551
 		}
552 552
 
553
-		$has_good_value = ! empty( $args['value'] ) && ! is_array( $args['value'] );
553
+		$has_good_value = ! empty( $args[ 'value' ] ) && ! is_array( $args[ 'value' ] );
554 554
 
555
-		$date_args = wp_parse_args( $args['datepicker'], array(
555
+		$date_args = wp_parse_args( $args[ 'datepicker' ], array(
556 556
 			'class' => 'cmb2-text-small cmb2-datepicker',
557 557
 			'name'  => $this->_name( '[date]' ),
558 558
 			'id'    => $this->_id( '_date' ),
559
-			'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args['value'] ) : '',
559
+			'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args[ 'value' ] ) : '',
560 560
 			'desc'  => '',
561 561
 		) );
562 562
 
563 563
 		// Let's get the date-format, and set it up as a data attr for the field.
564 564
 		$date_args = $this->parse_picker_options( 'date', $date_args );
565 565
 
566
-		$time_args = wp_parse_args( $args['timepicker'], array(
566
+		$time_args = wp_parse_args( $args[ 'timepicker' ], array(
567 567
 			'class' => 'cmb2-timepicker text-time',
568 568
 			'name'  => $this->_name( '[time]' ),
569 569
 			'id'    => $this->_id( '_time' ),
570
-			'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args['value'] ) : '',
571
-			'desc'  => $args['desc'],
570
+			'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args[ 'value' ] ) : '',
571
+			'desc'  => $args[ 'desc' ],
572 572
 			'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker', 'jquery-ui-datetimepicker' ),
573 573
 		) );
574 574
 
@@ -586,12 +586,12 @@  discard block
 block discarded – undo
586 586
 			'select_timezone'         => array(),
587 587
 		) );
588 588
 
589
-		$args['value'] = $this->field->escaped_value();
590
-		if ( is_array( $args['value'] ) ) {
591
-			$args['value'] = '';
589
+		$args[ 'value' ] = $this->field->escaped_value();
590
+		if ( is_array( $args[ 'value' ] ) ) {
591
+			$args[ 'value' ] = '';
592 592
 		}
593 593
 
594
-		$datetime = maybe_unserialize( $args['value'] );
594
+		$datetime = maybe_unserialize( $args[ 'value' ] );
595 595
 		$value = $tzstring = '';
596 596
 
597 597
 		if ( $datetime && $datetime instanceof DateTime ) {
@@ -600,24 +600,24 @@  discard block
 block discarded – undo
600 600
 			$value    = $datetime->getTimestamp();
601 601
 		}
602 602
 
603
-		$timestamp_args = wp_parse_args( $args['text_datetime_timestamp'], array(
603
+		$timestamp_args = wp_parse_args( $args[ 'text_datetime_timestamp' ], array(
604 604
 			'desc'  => '',
605 605
 			'value' => $value,
606 606
 		) );
607 607
 
608
-		$timezone_args = wp_parse_args( $args['select_timezone'], array(
608
+		$timezone_args = wp_parse_args( $args[ 'select_timezone' ], array(
609 609
 			'class'   => 'cmb2_select cmb2-select-timezone',
610 610
 			'name'    => $this->_name( '[timezone]' ),
611 611
 			'id'      => $this->_id( '_timezone' ),
612 612
 			'options' => wp_timezone_choice( $tzstring ),
613
-			'desc'    => $args['desc'],
613
+			'desc'    => $args[ 'desc' ],
614 614
 		) );
615 615
 
616 616
 		return $this->text_datetime_timestamp( $timestamp_args ) . "\n" . $this->select( $timezone_args );
617 617
 	}
618 618
 
619 619
 	public function select_timezone() {
620
-		$this->field->args['default'] = $this->field->get_default()
620
+		$this->field->args[ 'default' ] = $this->field->get_default()
621 621
 			? $this->field->get_default()
622 622
 			: cmb2_utils()->timezone_string();
623 623
 
@@ -659,7 +659,7 @@  discard block
 block discarded – undo
659 659
 			'desc'  => $this->_desc( true ),
660 660
 		) );
661 661
 
662
-		return sprintf( '<%1$s class="%2$s">%3$s</%1$s>%4$s', $a['tag'], $a['class'], $a['name'], $a['desc'] );
662
+		return sprintf( '<%1$s class="%2$s">%3$s</%1$s>%4$s', $a[ 'tag' ], $a[ 'class' ], $a[ 'name' ], $a[ 'desc' ] );
663 663
 	}
664 664
 
665 665
 	public function select( $args = array() ) {
@@ -672,17 +672,17 @@  discard block
 block discarded – undo
672 672
 		) );
673 673
 
674 674
 		$attrs = $this->concat_attrs( $a, array( 'desc', 'options' ) );
675
-		return sprintf( '<select%s>%s</select>%s', $attrs, $a['options'], $a['desc'] );
675
+		return sprintf( '<select%s>%s</select>%s', $attrs, $a[ 'options' ], $a[ 'desc' ] );
676 676
 	}
677 677
 
678 678
 	public function taxonomy_select() {
679 679
 
680 680
 		$names      = $this->get_object_terms();
681
-		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->get_default() : $names[key( $names )]->slug;
681
+		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->get_default() : $names[ key( $names ) ]->slug;
682 682
 		$terms      = get_terms( $this->field->args( 'taxonomy' ), 'hide_empty=0' );
683 683
 		$options    = '';
684 684
 
685
-		$option_none  = $this->field->args( 'show_option_none' );
685
+		$option_none = $this->field->args( 'show_option_none' );
686 686
 		if ( ! empty( $option_none ) ) {
687 687
 			$option_none_value = apply_filters( 'cmb2_taxonomy_select_default_value', '' );
688 688
 			$option_none_value = apply_filters( "cmb2_taxonomy_select_{$this->_id()}_default_value", $option_none_value );
@@ -712,7 +712,7 @@  discard block
 block discarded – undo
712 712
 			'desc'    => $this->_desc( true ),
713 713
 		) );
714 714
 
715
-		return sprintf( '<ul class="%s">%s</ul>%s', $a['class'], $a['options'], $a['desc'] );
715
+		return sprintf( '<ul class="%s">%s</ul>%s', $a[ 'class' ], $a[ 'options' ], $a[ 'desc' ] );
716 716
 	}
717 717
 
718 718
 	public function radio_inline() {
@@ -747,7 +747,7 @@  discard block
 block discarded – undo
747 747
 			: $is_checked;
748 748
 
749 749
 		if ( $is_checked ) {
750
-			$defaults['checked'] = 'checked';
750
+			$defaults[ 'checked' ] = 'checked';
751 751
 		}
752 752
 
753 753
 		$args = $this->parse_args( $args, 'checkbox', $defaults );
@@ -757,7 +757,7 @@  discard block
 block discarded – undo
757 757
 
758 758
 	public function taxonomy_radio() {
759 759
 		$names      = $this->get_object_terms();
760
-		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->get_default() : $names[key( $names )]->slug;
760
+		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->get_default() : $names[ key( $names ) ]->slug;
761 761
 		$terms      = get_terms( $this->field->args( 'taxonomy' ), 'hide_empty=0' );
762 762
 		$options    = '';
763 763
 		$i = 1;
@@ -765,7 +765,7 @@  discard block
 block discarded – undo
765 765
 		if ( ! $terms ) {
766 766
 			$options .= sprintf( '<li><label>%s</label></li>', esc_html( $this->_text( 'no_terms_text', __( 'No terms', 'cmb2' ) ) ) );
767 767
 		} else {
768
-			$option_none  = $this->field->args( 'show_option_none' );
768
+			$option_none = $this->field->args( 'show_option_none' );
769 769
 			if ( ! empty( $option_none ) ) {
770 770
 				$option_none_value = apply_filters( "cmb2_taxonomy_radio_{$this->_id()}_default_value", apply_filters( 'cmb2_taxonomy_radio_default_value', '' ) );
771 771
 				$args = array(
@@ -773,7 +773,7 @@  discard block
 block discarded – undo
773 773
 					'label' => $option_none,
774 774
 				);
775 775
 				if ( $saved_term == $option_none_value ) {
776
-					$args['checked'] = 'checked';
776
+					$args[ 'checked' ] = 'checked';
777 777
 				}
778 778
 				$options .= $this->list_input( $args, $i );
779 779
 				$i++;
@@ -786,7 +786,7 @@  discard block
 block discarded – undo
786 786
 				);
787 787
 
788 788
 				if ( $saved_term == $term->slug ) {
789
-					$args['checked'] = 'checked';
789
+					$args[ 'checked' ] = 'checked';
790 790
 				}
791 791
 				$options .= $this->list_input( $args, $i );
792 792
 				$i++;
@@ -823,7 +823,7 @@  discard block
 block discarded – undo
823 823
 				);
824 824
 
825 825
 				if ( is_array( $saved_terms ) && in_array( $term->slug, $saved_terms ) ) {
826
-					$args['checked'] = 'checked';
826
+					$args[ 'checked' ] = 'checked';
827 827
 				}
828 828
 				$options .= $this->list_input( $args, $i );
829 829
 				$i++;
@@ -928,7 +928,7 @@  discard block
 block discarded – undo
928 928
 		$query_args = $this->field->args( 'query_args' );
929 929
 
930 930
 		// if options array and 'url' => false, then hide the url field
931
-		$input_type = array_key_exists( 'url', $options ) && false === $options['url'] ? 'hidden' : 'text';
931
+		$input_type = array_key_exists( 'url', $options ) && false === $options[ 'url' ] ? 'hidden' : 'text';
932 932
 
933 933
 		echo $this->input( array(
934 934
 			'type'  => $input_type,
@@ -949,8 +949,8 @@  discard block
 block discarded – undo
949 949
 		// Reset field args for attachment ID
950 950
 		$args = $this->field->args();
951 951
 		// If we're looking at a file in a group, we need to get the non-prefixed id
952
-		$args['id'] = ( $this->field->group ? $this->field->args( '_id' ) : $cached_id ) . '_id';
953
-		unset( $args['_id'], $args['_name'] );
952
+		$args[ 'id' ] = ( $this->field->group ? $this->field->args( '_id' ) : $cached_id ) . '_id';
953
+		unset( $args[ '_id' ], $args[ '_name' ] );
954 954
 
955 955
 		// And get new field object
956 956
 		$this->field = new CMB2_Field( array(
@@ -982,7 +982,7 @@  discard block
 block discarded – undo
982 982
 				if ( $_id_value ) {
983 983
 					$image = wp_get_attachment_image( $_id_value, $img_size, null, array( 'class' => 'cmb-file-field-image' ) );
984 984
 				} else {
985
-					$size = is_array( $img_size ) ? $img_size[0] : 350;
985
+					$size = is_array( $img_size ) ? $img_size[ 0 ] : 350;
986 986
 					$image = '<img style="max-width: ' . absint( $size ) . 'px; width: 100%; height: auto;" src="' . $meta_value . '" alt="" />';
987 987
 				}
988 988
 
@@ -1013,11 +1013,11 @@  discard block
 block discarded – undo
1013 1013
 	 */
1014 1014
 	public function img_status_output( $args ) {
1015 1015
 		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>',
1016
-			$args['tag'],
1017
-			$args['image'],
1018
-			isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '',
1016
+			$args[ 'tag' ],
1017
+			$args[ 'image' ],
1018
+			isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '',
1019 1019
 			esc_html( $this->_text( 'remove_image_text', __( 'Remove Image', 'cmb2' ) ) ),
1020
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
1020
+			isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : ''
1021 1021
 		);
1022 1022
 	}
1023 1023
 
@@ -1029,14 +1029,14 @@  discard block
 block discarded – undo
1029 1029
 	 */
1030 1030
 	public function file_status_output( $args ) {
1031 1031
 		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>',
1032
-			$args['tag'],
1032
+			$args[ 'tag' ],
1033 1033
 			esc_html( $this->_text( 'file_text', __( 'File:', 'cmb2' ) ) ),
1034
-			$this->get_file_name_from_path( $args['value'] ),
1035
-			$args['value'],
1034
+			$this->get_file_name_from_path( $args[ 'value' ] ),
1035
+			$args[ 'value' ],
1036 1036
 			esc_html( $this->_text( 'file_download_text', __( 'Download', 'cmb2' ) ) ),
1037
-			isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '',
1037
+			isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '',
1038 1038
 			esc_html( $this->_text( 'remove_text', __( 'Remove', 'cmb2' ) ) ),
1039
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
1039
+			isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : ''
1040 1040
 		);
1041 1041
 	}
1042 1042
 
@@ -1058,8 +1058,8 @@  discard block
 block discarded – undo
1058 1058
 			if ( $update ) {
1059 1059
 				$atts = $this->field->args( 'attributes' );
1060 1060
 			} else {
1061
-				$atts = isset( $args['attributes'] )
1062
-					? $args['attributes']
1061
+				$atts = isset( $args[ 'attributes' ] )
1062
+					? $args[ 'attributes' ]
1063 1063
 					: $atts;
1064 1064
 			}
1065 1065
 
@@ -1075,7 +1075,7 @@  discard block
 block discarded – undo
1075 1075
 		}
1076 1076
 
1077 1077
 		if ( $update ) {
1078
-			$this->field->args['attributes'] = $atts;
1078
+			$this->field->args[ 'attributes' ] = $atts;
1079 1079
 		}
1080 1080
 
1081 1081
 		return array_merge( $args, $atts );
Please login to merge, or discard this patch.
example-functions.php 2 patches
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.
Braces   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -15,9 +15,9 @@  discard block
 block discarded – undo
15 15
  * Get the bootstrap! If using the plugin from wordpress.org, REMOVE THIS!
16 16
  */
17 17
 
18
-if ( file_exists( dirname( __FILE__ ) . '/cmb2/init.php' ) ) {
18
+if ( file_exists( dirname( __FILE__ ) . '/cmb2/init.php' ) ) {
19 19
 	require_once dirname( __FILE__ ) . '/cmb2/init.php';
20
-} elseif ( file_exists( dirname( __FILE__ ) . '/CMB2/init.php' ) ) {
20
+} elseif ( file_exists( dirname( __FILE__ ) . '/CMB2/init.php' ) ) {
21 21
 	require_once dirname( __FILE__ ) . '/CMB2/init.php';
22 22
 }
23 23
 
@@ -28,9 +28,9 @@  discard block
 block discarded – undo
28 28
  *
29 29
  * @return bool             True if metabox should show
30 30
  */
31
-function yourprefix_show_if_front_page( $cmb ) {
31
+function yourprefix_show_if_front_page( $cmb ) {
32 32
 	// Don't show this metabox if it's not the front page template
33
-	if ( $cmb->object_id !== get_option( 'page_on_front' ) ) {
33
+	if ( $cmb->object_id !== get_option( 'page_on_front' ) ) {
34 34
 		return false;
35 35
 	}
36 36
 	return true;
@@ -43,9 +43,9 @@  discard block
 block discarded – undo
43 43
  *
44 44
  * @return bool                     True if metabox should show
45 45
  */
46
-function yourprefix_hide_if_no_cats( $field ) {
46
+function yourprefix_hide_if_no_cats( $field ) {
47 47
 	// Don't show this field if not in the cats category
48
-	if ( ! has_tag( 'cats', $field->object_id ) ) {
48
+	if ( ! has_tag( 'cats', $field->object_id ) ) {
49 49
 		return false;
50 50
 	}
51 51
 	return true;
@@ -57,10 +57,10 @@  discard block
 block discarded – undo
57 57
  * @param  array             $field_args Array of field parameters
58 58
  * @param  CMB2_Field object $field      Field object
59 59
  */
60
-function yourprefix_before_row_if_2( $field_args, $field ) {
61
-	if ( 2 == $field->object_id ) {
60
+function yourprefix_before_row_if_2( $field_args, $field ) {
61
+	if ( 2 == $field->object_id ) {
62 62
 		echo '<p>Testing <b>"before_row"</b> parameter (on $post_id 2)</p>';
63
-	} else {
63
+	} else {
64 64
 		echo '<p>Testing <b>"before_row"</b> parameter (<b>NOT</b> on $post_id 2)</p>';
65 65
 	}
66 66
 }
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 /**
70 70
  * Hook in and add a demo metabox. Can only happen on the 'cmb2_admin_init' or 'cmb2_init' hook.
71 71
  */
72
-function yourprefix_register_demo_metabox() {
72
+function yourprefix_register_demo_metabox() {
73 73
 	$prefix = 'yourprefix_demo_';
74 74
 
75 75
 	/**
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
 /**
373 373
  * Hook in and add a metabox that only appears on the 'About' page
374 374
  */
375
-function yourprefix_register_about_page_metabox() {
375
+function yourprefix_register_about_page_metabox() {
376 376
 	$prefix = 'yourprefix_about_';
377 377
 
378 378
 	/**
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
401 401
 /**
402 402
  * Hook in and add a metabox to demonstrate repeatable grouped fields
403 403
  */
404
-function yourprefix_register_repeatable_group_field_metabox() {
404
+function yourprefix_register_repeatable_group_field_metabox() {
405 405
 	$prefix = 'yourprefix_group_';
406 406
 
407 407
 	/**
@@ -465,7 +465,7 @@  discard block
 block discarded – undo
465 465
 /**
466 466
  * Hook in and add a metabox to add fields to the user profile pages
467 467
  */
468
-function yourprefix_register_user_profile_metabox() {
468
+function yourprefix_register_user_profile_metabox() {
469 469
 	$prefix = 'yourprefix_user_';
470 470
 
471 471
 	/**
@@ -535,7 +535,7 @@  discard block
 block discarded – undo
535 535
 /**
536 536
  * Hook in and add a metabox to add fields to taxonomy terms
537 537
  */
538
-function yourprefix_register_taxonomy_metabox() {
538
+function yourprefix_register_taxonomy_metabox() {
539 539
 	$prefix = 'yourprefix_term_';
540 540
 
541 541
 	/**
@@ -577,7 +577,7 @@  discard block
 block discarded – undo
577 577
 /**
578 578
  * Hook in and register a metabox to handle a theme options page
579 579
  */
580
-function yourprefix_register_theme_options_metabox() {
580
+function yourprefix_register_theme_options_metabox() {
581 581
 
582 582
 	$option_key = 'yourprefix_theme_options';
583 583
 
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_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_Utils.php 3 patches
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.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -110,7 +110,8 @@
 block discarded – undo
110 110
 		$current_offset = get_option( 'gmt_offset' );
111 111
 		$tzstring       = get_option( 'timezone_string' );
112 112
 
113
-		if ( empty( $tzstring ) ) { // Create a UTC+- zone if no timezone string exists
113
+		if ( empty( $tzstring ) ) {
114
+// Create a UTC+- zone if no timezone string exists
114 115
 			if ( 0 == $current_offset ) {
115 116
 				$tzstring = 'UTC+0';
116 117
 			} elseif ( $current_offset < 0 ) {
Please login to merge, or discard this patch.
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * CMB2 Utilities
4
- *
5
- * @since  1.1.0
6
- *
7
- * @category  WordPress_Plugin
8
- * @package   CMB2
9
- * @author    WebDevStudios
10
- * @license   GPL-2.0+
11
- * @link      http://webdevstudios.com
12
- */
3
+	 * CMB2 Utilities
4
+	 *
5
+	 * @since  1.1.0
6
+	 *
7
+	 * @category  WordPress_Plugin
8
+	 * @package   CMB2
9
+	 * @author    WebDevStudios
10
+	 * @license   GPL-2.0+
11
+	 * @link      http://webdevstudios.com
12
+	 */
13 13
 class CMB2_Utils {
14 14
 
15 15
 	/**
Please login to merge, or discard this patch.