Completed
Push — trunk ( 9de100...661220 )
by Justin
05:36
created
includes/CMB2.php 1 patch
Spacing   +69 added lines, -69 removed lines patch added patch discarded remove patch
@@ -113,19 +113,19 @@  discard block
 block discarded – undo
113 113
 	 */
114 114
 	public function __construct( $config, $object_id = 0 ) {
115 115
 
116
-		if ( empty( $config['id'] ) ) {
116
+		if ( empty( $config[ 'id' ] ) ) {
117 117
 			wp_die( esc_html__( 'Metabox configuration is required to have an ID parameter.', 'cmb2' ) );
118 118
 		}
119 119
 
120 120
 		$this->meta_box = wp_parse_args( $config, $this->mb_defaults );
121
-		$this->meta_box['fields'] = array();
121
+		$this->meta_box[ 'fields' ] = array();
122 122
 
123 123
 		$this->object_id( $object_id );
124 124
 		$this->mb_object_type();
125
-		$this->cmb_id = $config['id'];
125
+		$this->cmb_id = $config[ 'id' ];
126 126
 
127
-		if ( ! empty( $config['fields'] ) && is_array( $config['fields'] ) ) {
128
-			$this->add_fields( $config['fields'] );
127
+		if ( ! empty( $config[ 'fields' ] ) && is_array( $config[ 'fields' ] ) ) {
128
+			$this->add_fields( $config[ 'fields' ] );
129 129
 		}
130 130
 
131 131
 		CMB2_Boxes::add( $this );
@@ -294,22 +294,22 @@  discard block
 block discarded – undo
294 294
 	 * @return mixed CMB2_Field object if successful.
295 295
 	 */
296 296
 	public function render_field( $field_args ) {
297
-		$field_args['context'] = $this->prop( 'context' );
297
+		$field_args[ 'context' ] = $this->prop( 'context' );
298 298
 
299
-		if ( 'group' == $field_args['type'] ) {
299
+		if ( 'group' == $field_args[ 'type' ] ) {
300 300
 
301
-			if ( ! isset( $field_args['show_names'] ) ) {
302
-				$field_args['show_names'] = $this->prop( 'show_names' );
301
+			if ( ! isset( $field_args[ 'show_names' ] ) ) {
302
+				$field_args[ 'show_names' ] = $this->prop( 'show_names' );
303 303
 			}
304 304
 			$field = $this->render_group( $field_args );
305 305
 
306
-		} elseif ( 'hidden' == $field_args['type'] && $this->get_field( $field_args )->should_show() ) {
306
+		} elseif ( 'hidden' == $field_args[ 'type' ] && $this->get_field( $field_args )->should_show() ) {
307 307
 			// Save rendering for after the metabox
308 308
 			$field = $this->add_hidden_field( $field_args );
309 309
 
310 310
 		} else {
311 311
 
312
-			$field_args['show_names'] = $this->prop( 'show_names' );
312
+			$field_args[ 'show_names' ] = $this->prop( 'show_names' );
313 313
 
314 314
 			// Render default fields
315 315
 			$field = $this->get_field( $field_args )->render_field();
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
325 325
 	 */
326 326
 	public function render_group( $args ) {
327 327
 
328
-		if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) {
328
+		if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) {
329 329
 			return;
330 330
 		}
331 331
 
@@ -427,15 +427,15 @@  discard block
 block discarded – undo
427 427
 			<div class="inside cmb-td cmb-nested cmb-field-list">';
428 428
 				// Loop and render repeatable group fields
429 429
 				foreach ( array_values( $field_group->args( 'fields' ) ) as $field_args ) {
430
-					if ( 'hidden' == $field_args['type'] ) {
430
+					if ( 'hidden' == $field_args[ 'type' ] ) {
431 431
 
432 432
 						// Save rendering for after the metabox
433 433
 						$this->add_hidden_field( $field_args, $field_group );
434 434
 
435 435
 					} else {
436 436
 
437
-						$field_args['show_names'] = $field_group->args( 'show_names' );
438
-						$field_args['context']    = $field_group->args( 'context' );
437
+						$field_args[ 'show_names' ] = $field_group->args( 'show_names' );
438
+						$field_args[ 'context' ]    = $field_group->args( 'context' );
439 439
 
440 440
 						$field = $this->get_field( $field_args, $field_group )->render_field();
441 441
 					}
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
463 463
 	 * @param array  $field_args Array of field arguments to be passed to CMB2_Field
464 464
 	 */
465 465
 	public function add_hidden_field( $field_args, $field_group = null ) {
466
-		if ( isset( $field_args['field_args'] ) ) {
466
+		if ( isset( $field_args[ 'field_args' ] ) ) {
467 467
 			// For back-compatibility.
468 468
 			$field = new CMB2_Field( $field_args );
469 469
 		} else {
@@ -476,7 +476,7 @@  discard block
 block discarded – undo
476 476
 			$type->iterator = $field_group->index;
477 477
 		}
478 478
 
479
-		$this->hidden_fields[] = $type;
479
+		$this->hidden_fields[ ] = $type;
480 480
 
481 481
 		return $field;
482 482
 	}
@@ -573,11 +573,11 @@  discard block
 block discarded – undo
573 573
 	 */
574 574
 	public function process_field( $field_args ) {
575 575
 
576
-		switch ( $field_args['type'] ) {
576
+		switch ( $field_args[ 'type' ] ) {
577 577
 
578 578
 			case 'group':
579 579
 				if ( $this->save_group( $field_args ) ) {
580
-					$this->updated[] = $field_args['id'];
580
+					$this->updated[ ] = $field_args[ 'id' ];
581 581
 				}
582 582
 
583 583
 				break;
@@ -591,7 +591,7 @@  discard block
 block discarded – undo
591 591
 				$field = $this->get_new_field( $field_args );
592 592
 
593 593
 				if ( $field->save_field_from_data( $this->data_to_save ) ) {
594
-					$this->updated[] = $field->id();
594
+					$this->updated[ ] = $field->id();
595 595
 				}
596 596
 
597 597
 				break;
@@ -658,7 +658,7 @@  discard block
 block discarded – undo
658 658
 	 * @return mixed        Return of CMB2_Field::update_data()
659 659
 	 */
660 660
 	public function save_group( $args ) {
661
-		if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) {
661
+		if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) {
662 662
 			return;
663 663
 		}
664 664
 
@@ -706,16 +706,16 @@  discard block
 block discarded – undo
706 706
 						$_new_val = array();
707 707
 						foreach ( $new_val as $group_index => $grouped_data ) {
708 708
 							// Add the supporting data to the $saved array stack
709
-							$saved[ $field_group->index ][ $grouped_data['supporting_field_id'] ][] = $grouped_data['supporting_field_value'];
709
+							$saved[ $field_group->index ][ $grouped_data[ 'supporting_field_id' ] ][ ] = $grouped_data[ 'supporting_field_value' ];
710 710
 							// Reset var to the actual value
711
-							$_new_val[ $group_index ] = $grouped_data['value'];
711
+							$_new_val[ $group_index ] = $grouped_data[ 'value' ];
712 712
 						}
713 713
 						$new_val = $_new_val;
714 714
 					} else {
715 715
 						// Add the supporting data to the $saved array stack
716
-						$saved[ $field_group->index ][ $new_val['supporting_field_id'] ] = $new_val['supporting_field_value'];
716
+						$saved[ $field_group->index ][ $new_val[ 'supporting_field_id' ] ] = $new_val[ 'supporting_field_value' ];
717 717
 						// Reset var to the actual value
718
-						$new_val = $new_val['value'];
718
+						$new_val = $new_val[ 'value' ];
719 719
 					}
720 720
 				}
721 721
 
@@ -729,7 +729,7 @@  discard block
 block discarded – undo
729 729
 
730 730
 				// Compare values and add to `$updated` array
731 731
 				if ( $is_updated || $is_removed ) {
732
-					$this->updated[] = $base_id . '::' . $field_group->index . '::' . $sub_id;
732
+					$this->updated[ ] = $base_id . '::' . $field_group->index . '::' . $sub_id;
733 733
 				}
734 734
 
735 735
 				// Add to `$saved` array
@@ -766,22 +766,22 @@  discard block
 block discarded – undo
766 766
 		// Try to get our object ID from the global space
767 767
 		switch ( $this->object_type() ) {
768 768
 			case 'user':
769
-				$object_id = isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id;
770
-				$object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS['user_ID'] ) ? $GLOBALS['user_ID'] : $object_id;
769
+				$object_id = isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id;
770
+				$object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS[ 'user_ID' ] ) ? $GLOBALS[ 'user_ID' ] : $object_id;
771 771
 				break;
772 772
 
773 773
 			case 'comment':
774
-				$object_id = isset( $_REQUEST['c'] ) ? $_REQUEST['c'] : $object_id;
775
-				$object_id = ! $object_id && isset( $GLOBALS['comments']->comment_ID ) ? $GLOBALS['comments']->comment_ID : $object_id;
774
+				$object_id = isset( $_REQUEST[ 'c' ] ) ? $_REQUEST[ 'c' ] : $object_id;
775
+				$object_id = ! $object_id && isset( $GLOBALS[ 'comments' ]->comment_ID ) ? $GLOBALS[ 'comments' ]->comment_ID : $object_id;
776 776
 				break;
777 777
 
778 778
 			case 'term':
779
-				$object_id = isset( $_REQUEST['tag_ID'] ) ? $_REQUEST['tag_ID'] : $object_id;
779
+				$object_id = isset( $_REQUEST[ 'tag_ID' ] ) ? $_REQUEST[ 'tag_ID' ] : $object_id;
780 780
 				break;
781 781
 
782 782
 			default:
783
-				$object_id = isset( $GLOBALS['post']->ID ) ? $GLOBALS['post']->ID : $object_id;
784
-				$object_id = isset( $_REQUEST['post'] ) ? $_REQUEST['post'] : $object_id;
783
+				$object_id = isset( $GLOBALS[ 'post' ]->ID ) ? $GLOBALS[ 'post' ]->ID : $object_id;
784
+				$object_id = isset( $_REQUEST[ 'post' ] ) ? $_REQUEST[ 'post' ] : $object_id;
785 785
 				break;
786 786
 		}
787 787
 
@@ -857,7 +857,7 @@  discard block
 block discarded – undo
857 857
 	 * @return boolean True/False
858 858
 	 */
859 859
 	public function is_options_page_mb() {
860
-		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'] ) );
860
+		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' ] ) );
861 861
 	}
862 862
 
863 863
 	/**
@@ -944,7 +944,7 @@  discard block
 block discarded – undo
944 944
 			return $field;
945 945
 		}
946 946
 
947
-		$field_id = is_string( $field ) ? $field : $field['id'];
947
+		$field_id = is_string( $field ) ? $field : $field[ 'id' ];
948 948
 
949 949
 		$parent_field_id = ! empty( $field_group ) ? $field_group->id() : '';
950 950
 		$ids = $this->get_field_ids( $field_id, $parent_field_id, true );
@@ -980,16 +980,16 @@  discard block
 block discarded – undo
980 980
 		if ( $field_group && ( $sub_field_id || 0 === $sub_field_id ) ) {
981 981
 
982 982
 			// Update the fields array w/ any modified properties inherited from the group field
983
-			$this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] = $field_args;
983
+			$this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] = $field_args;
984 984
 
985 985
 			return $this->get_default_args( $field_args, $field_group );
986 986
 		}
987 987
 
988 988
 		if ( is_array( $field_args ) ) {
989
-			$this->meta_box['fields'][ $field_id ] = array_merge( $field_args, $this->meta_box['fields'][ $field_id ] );
989
+			$this->meta_box[ 'fields' ][ $field_id ] = array_merge( $field_args, $this->meta_box[ 'fields' ][ $field_id ] );
990 990
 		}
991 991
 
992
-		return $this->get_default_args( $this->meta_box['fields'][ $field_id ] );
992
+		return $this->get_default_args( $this->meta_box[ 'fields' ][ $field_id ] );
993 993
 	}
994 994
 
995 995
 	/**
@@ -1039,8 +1039,8 @@  discard block
 block discarded – undo
1039 1039
 
1040 1040
 			$sub_fields = false;
1041 1041
 			if ( array_key_exists( 'fields', $field ) ) {
1042
-				$sub_fields = $field['fields'];
1043
-				unset( $field['fields'] );
1042
+				$sub_fields = $field[ 'fields' ];
1043
+				unset( $field[ 'fields' ] );
1044 1044
 			}
1045 1045
 
1046 1046
 			$field_id = $parent_field_id
@@ -1065,26 +1065,26 @@  discard block
 block discarded – undo
1065 1065
 			return false;
1066 1066
 		}
1067 1067
 
1068
-		if ( 'oembed' === $field['type'] ) {
1068
+		if ( 'oembed' === $field[ 'type' ] ) {
1069 1069
 			// Initiate oembed Ajax hooks
1070 1070
 			cmb2_ajax();
1071 1071
 		}
1072 1072
 
1073
-		if ( isset( $field['column'] ) && false !== $field['column'] ) {
1073
+		if ( isset( $field[ 'column' ] ) && false !== $field[ 'column' ] ) {
1074 1074
 			$field = $this->define_field_column( $field );
1075 1075
 		}
1076 1076
 
1077
-		if ( isset( $field['taxonomy'] ) && ! empty( $field['remove_default'] ) ) {
1078
-			$this->tax_metaboxes_to_remove[ $field['taxonomy'] ] = $field['taxonomy'];
1077
+		if ( isset( $field[ 'taxonomy' ] ) && ! empty( $field[ 'remove_default' ] ) ) {
1078
+			$this->tax_metaboxes_to_remove[ $field[ 'taxonomy' ] ] = $field[ 'taxonomy' ];
1079 1079
 		}
1080 1080
 
1081 1081
 		$this->_add_field_to_array(
1082 1082
 			$field,
1083
-			$this->meta_box['fields'],
1083
+			$this->meta_box[ 'fields' ],
1084 1084
 			$position
1085 1085
 		);
1086 1086
 
1087
-		return $field['id'];
1087
+		return $field[ 'id' ];
1088 1088
 	}
1089 1089
 
1090 1090
 	/**
@@ -1096,10 +1096,10 @@  discard block
 block discarded – undo
1096 1096
 	protected function define_field_column( array $field ) {
1097 1097
 		$this->has_columns = true;
1098 1098
 
1099
-		$column = is_array( $field['column'] ) ? $field['column'] : array();
1099
+		$column = is_array( $field[ 'column' ] ) ? $field[ 'column' ] : array();
1100 1100
 
1101
-		$field['column'] = wp_parse_args( $column, array(
1102
-			'name'     => isset( $field['name'] ) ? $field['name'] : '',
1101
+		$field[ 'column' ] = wp_parse_args( $column, array(
1102
+			'name'     => isset( $field[ 'name' ] ) ? $field[ 'name' ] : '',
1103 1103
 			'position' => false,
1104 1104
 		) );
1105 1105
 
@@ -1115,27 +1115,27 @@  discard block
 block discarded – undo
1115 1115
 	 * @return mixed                   Array of parent/field ids or false
1116 1116
 	 */
1117 1117
 	public function add_group_field( $parent_field_id, array $field, $position = 0 ) {
1118
-		if ( ! array_key_exists( $parent_field_id, $this->meta_box['fields'] ) ) {
1118
+		if ( ! array_key_exists( $parent_field_id, $this->meta_box[ 'fields' ] ) ) {
1119 1119
 			return false;
1120 1120
 		}
1121 1121
 
1122
-		$parent_field = $this->meta_box['fields'][ $parent_field_id ];
1122
+		$parent_field = $this->meta_box[ 'fields' ][ $parent_field_id ];
1123 1123
 
1124
-		if ( 'group' !== $parent_field['type'] ) {
1124
+		if ( 'group' !== $parent_field[ 'type' ] ) {
1125 1125
 			return false;
1126 1126
 		}
1127 1127
 
1128
-		if ( ! isset( $parent_field['fields'] ) ) {
1129
-			$this->meta_box['fields'][ $parent_field_id ]['fields'] = array();
1128
+		if ( ! isset( $parent_field[ 'fields' ] ) ) {
1129
+			$this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ] = array();
1130 1130
 		}
1131 1131
 
1132 1132
 		$this->_add_field_to_array(
1133 1133
 			$field,
1134
-			$this->meta_box['fields'][ $parent_field_id ]['fields'],
1134
+			$this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ],
1135 1135
 			$position
1136 1136
 		);
1137 1137
 
1138
-		return array( $parent_field_id, $field['id'] );
1138
+		return array( $parent_field_id, $field[ 'id' ] );
1139 1139
 	}
1140 1140
 
1141 1141
 	/**
@@ -1147,9 +1147,9 @@  discard block
 block discarded – undo
1147 1147
 	 */
1148 1148
 	protected function _add_field_to_array( $field, &$fields, $position = 0 ) {
1149 1149
 		if ( $position ) {
1150
-			CMB2_Utils::array_insert( $fields, array( $field['id'] => $field ), $position );
1150
+			CMB2_Utils::array_insert( $fields, array( $field[ 'id' ] => $field ), $position );
1151 1151
 		} else {
1152
-			$fields[ $field['id'] ] = $field;
1152
+			$fields[ $field[ 'id' ] ] = $field;
1153 1153
 		}
1154 1154
 	}
1155 1155
 
@@ -1172,15 +1172,15 @@  discard block
 block discarded – undo
1172 1172
 		unset( $this->fields[ implode( '', $ids ) ] );
1173 1173
 
1174 1174
 		if ( ! $sub_field_id ) {
1175
-			unset( $this->meta_box['fields'][ $field_id ] );
1175
+			unset( $this->meta_box[ 'fields' ][ $field_id ] );
1176 1176
 			return true;
1177 1177
 		}
1178 1178
 
1179
-		if ( isset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] ) ) {
1180
-			unset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] );
1179
+		if ( isset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] ) ) {
1180
+			unset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] );
1181 1181
 		}
1182
-		if ( isset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] ) ) {
1183
-			unset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] );
1182
+		if ( isset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] ) ) {
1183
+			unset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] );
1184 1184
 		}
1185 1185
 		return true;
1186 1186
 	}
@@ -1204,11 +1204,11 @@  discard block
 block discarded – undo
1204 1204
 		list( $field_id, $sub_field_id ) = $ids;
1205 1205
 
1206 1206
 		if ( ! $sub_field_id ) {
1207
-			$this->meta_box['fields'][ $field_id ][ $property ] = $value;
1207
+			$this->meta_box[ 'fields' ][ $field_id ][ $property ] = $value;
1208 1208
 			return $field_id;
1209 1209
 		}
1210 1210
 
1211
-		$this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ][ $property ] = $value;
1211
+		$this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ][ $property ] = $value;
1212 1212
 		return $field_id;
1213 1213
 	}
1214 1214
 
@@ -1222,7 +1222,7 @@  discard block
 block discarded – undo
1222 1222
 	public function get_field_ids( $field_id, $parent_field_id = '' ) {
1223 1223
 		$sub_field_id = $parent_field_id ? $field_id : '';
1224 1224
 		$field_id     = $parent_field_id ? $parent_field_id : $field_id;
1225
-		$fields       =& $this->meta_box['fields'];
1225
+		$fields       = & $this->meta_box[ 'fields' ];
1226 1226
 
1227 1227
 		if ( ! array_key_exists( $field_id, $fields ) ) {
1228 1228
 			$field_id = $this->search_old_school_array( $field_id, $fields );
@@ -1236,12 +1236,12 @@  discard block
 block discarded – undo
1236 1236
 			return array( $field_id, $sub_field_id );
1237 1237
 		}
1238 1238
 
1239
-		if ( 'group' !== $fields[ $field_id ]['type'] ) {
1239
+		if ( 'group' !== $fields[ $field_id ][ 'type' ] ) {
1240 1240
 			return false;
1241 1241
 		}
1242 1242
 
1243
-		if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ]['fields'] ) ) {
1244
-			$sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ]['fields'] );
1243
+		if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ][ 'fields' ] ) ) {
1244
+			$sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ][ 'fields' ] );
1245 1245
 		}
1246 1246
 
1247 1247
 		return false === $sub_field_id ? false : array( $field_id, $sub_field_id );
Please login to merge, or discard this patch.
includes/CMB2_Utils.php 2 patches
Spacing   +21 added lines, -22 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 		$dir = wp_upload_dir();
38 38
 
39 39
 		// Is URL in uploads directory?
40
-		if ( false === strpos( $img_url, $dir['baseurl'] . '/' ) ) {
40
+		if ( false === strpos( $img_url, $dir[ 'baseurl' ] . '/' ) ) {
41 41
 			return false;
42 42
 		}
43 43
 
@@ -62,8 +62,8 @@  discard block
 block discarded – undo
62 62
 
63 63
 			foreach ( $query->posts as $post_id ) {
64 64
 				$meta = wp_get_attachment_metadata( $post_id );
65
-				$original_file       = basename( $meta['file'] );
66
-				$cropped_image_files = isset( $meta['sizes'] ) ? wp_list_pluck( $meta['sizes'], 'file' ) : array();
65
+				$original_file       = basename( $meta[ 'file' ] );
66
+				$cropped_image_files = isset( $meta[ 'sizes' ] ) ? wp_list_pluck( $meta[ 'sizes' ], 'file' ) : array();
67 67
 				if ( $original_file === $file || in_array( $file, $cropped_image_files ) ) {
68 68
 					$attachment_id = $post_id;
69 69
 					break;
@@ -147,8 +147,7 @@  discard block
 block discarded – undo
147 147
 		}
148 148
 
149 149
 		return self::is_valid_time_stamp( $string )
150
-			? (int) $string :
151
-			strtotime( (string) $string );
150
+			? (int) $string : strtotime( (string) $string );
152 151
 	}
153 152
 
154 153
 	/**
@@ -179,7 +178,7 @@  discard block
 block discarded – undo
179 178
 	 * @param  mixed $value Value to check
180 179
 	 * @return bool         True or false
181 180
 	 */
182
-	public static function notempty( $value ){
181
+	public static function notempty( $value ) {
183 182
 		return null !== $value && '' !== $value && false !== $value;
184 183
 	}
185 184
 
@@ -337,24 +336,24 @@  discard block
 block discarded – undo
337 336
 
338 337
 		// order is relevant here, since the replacement will be done sequentially.
339 338
 		$supported_options = array(
340
-			'd' => 'dd',  // Day, leading 0
341
-			'j' => 'd',   // Day, no 0
342
-			'z' => 'o',   // Day of the year, no leading zeroes,
339
+			'd' => 'dd', // Day, leading 0
340
+			'j' => 'd', // Day, no 0
341
+			'z' => 'o', // Day of the year, no leading zeroes,
343 342
 			// 'D' => 'D',   // Day name short, not sure how it'll work with translations
344 343
 			// 'l' => 'DD',  // Day name full, idem before
345
-			'm' => 'mm',  // Month of the year, leading 0
346
-			'n' => 'm',   // Month of the year, no leading 0
344
+			'm' => 'mm', // Month of the year, leading 0
345
+			'n' => 'm', // Month of the year, no leading 0
347 346
 			// 'M' => 'M',   // Month, Short name
348 347
 			// 'F' => 'MM',  // Month, full name,
349
-			'y' => 'y',   // Year, two digit
350
-			'Y' => 'yy',  // Year, full
351
-			'H' => 'HH',  // Hour with leading 0 (24 hour)
352
-			'G' => 'H',   // Hour with no leading 0 (24 hour)
353
-			'h' => 'hh',  // Hour with leading 0 (12 hour)
354
-			'g' => 'h',   // Hour with no leading 0 (12 hour),
355
-			'i' => 'mm',  // Minute with leading 0,
356
-			's' => 'ss',  // Second with leading 0,
357
-			'a' => 'tt',  // am/pm
348
+			'y' => 'y', // Year, two digit
349
+			'Y' => 'yy', // Year, full
350
+			'H' => 'HH', // Hour with leading 0 (24 hour)
351
+			'G' => 'H', // Hour with no leading 0 (24 hour)
352
+			'h' => 'hh', // Hour with leading 0 (12 hour)
353
+			'g' => 'h', // Hour with no leading 0 (12 hour),
354
+			'i' => 'mm', // Minute with leading 0,
355
+			's' => 'ss', // Second with leading 0,
356
+			'a' => 'tt', // am/pm
358 357
 			'A' => 'TT'   // AM/PM
359 358
 		);
360 359
 
@@ -375,7 +374,7 @@  discard block
 block discarded – undo
375 374
 	 * @return string Modified value
376 375
 	 */
377 376
 	public static function wrap_escaped_chars( $value ) {
378
-		return "&#39;" . str_replace( '\\', '', $value[0] ) . "&#39;";
377
+		return "&#39;" . str_replace( '\\', '', $value[ 0 ] ) . "&#39;";
379 378
 	}
380 379
 
381 380
 	/**
@@ -435,7 +434,7 @@  discard block
 block discarded – undo
435 434
 	 * @return string               String of attributes for form element.
436 435
 	 */
437 436
 	public static function concat_attrs( $attrs, $attr_exclude = array() ) {
438
-		$attr_exclude[] = 'rendered';
437
+		$attr_exclude[ ] = 'rendered';
439 438
 		$attributes = '';
440 439
 		foreach ( $attrs as $attr => $val ) {
441 440
 			$excluded = in_array( $attr, (array) $attr_exclude, true );
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -122,7 +122,8 @@  discard block
 block discarded – undo
122 122
 			$tzstring = '';
123 123
 		}
124 124
 
125
-		if ( empty( $tzstring ) ) { // Create a UTC+- zone if no timezone string exists
125
+		if ( empty( $tzstring ) ) {
126
+// Create a UTC+- zone if no timezone string exists
126 127
 			if ( 0 == $current_offset ) {
127 128
 				$tzstring = 'UTC+0';
128 129
 			} elseif ( $current_offset < 0 ) {
@@ -179,7 +180,7 @@  discard block
 block discarded – undo
179 180
 	 * @param  mixed $value Value to check
180 181
 	 * @return bool         True or false
181 182
 	 */
182
-	public static function notempty( $value ){
183
+	public static function notempty( $value ) {
183 184
 		return null !== $value && '' !== $value && false !== $value;
184 185
 	}
185 186
 
Please login to merge, or discard this patch.
includes/types/CMB2_Type_File_Base.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -55,11 +55,11 @@  discard block
 block discarded – undo
55 55
 	 */
56 56
 	public function img_status_output( $args ) {
57 57
 		return sprintf( '<%1$s class="img-status">%2$s<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button"%3$s>%4$s</a></p>%5$s</%1$s>',
58
-			$args['tag'],
59
-			$args['image'],
60
-			isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '',
58
+			$args[ 'tag' ],
59
+			$args[ 'image' ],
60
+			isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '',
61 61
 			esc_html( $this->_text( 'remove_image_text', esc_html__( 'Remove Image', 'cmb2' ) ) ),
62
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
62
+			isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : ''
63 63
 		);
64 64
 	}
65 65
 
@@ -71,14 +71,14 @@  discard block
 block discarded – undo
71 71
 	 */
72 72
 	public function file_status_output( $args ) {
73 73
 		return sprintf( '<%1$s class="file-status"><span>%2$s <strong>%3$s</strong></span>&nbsp;&nbsp; (<a href="%4$s" target="_blank" rel="external">%5$s</a> / <a href="#" class="cmb2-remove-file-button"%6$s>%7$s</a>)%8$s</%1$s>',
74
-			$args['tag'],
74
+			$args[ 'tag' ],
75 75
 			esc_html( $this->_text( 'file_text', esc_html__( 'File:', 'cmb2' ) ) ),
76
-			CMB2_Utils::get_file_name_from_path( $args['value'] ),
77
-			$args['value'],
76
+			CMB2_Utils::get_file_name_from_path( $args[ 'value' ] ),
77
+			$args[ 'value' ],
78 78
 			esc_html( $this->_text( 'file_download_text', esc_html__( 'Download', 'cmb2' ) ) ),
79
-			isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '',
79
+			isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '',
80 80
 			esc_html( $this->_text( 'remove_text', esc_html__( 'Remove', 'cmb2' ) ) ),
81
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
81
+			isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : ''
82 82
 		);
83 83
 	}
84 84
 
Please login to merge, or discard this patch.
includes/CMB2_Types.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -170,11 +170,11 @@  discard block
 block discarded – undo
170 170
 
171 171
 		$message = array( sprintf( esc_html__( 'Custom field types require a Type object instantiation to use this method. This method was called by the \'%s\' field type.' ), $this->field->type() ) );
172 172
 
173
-		$message[] = is_object( $this->type )
173
+		$message[ ] = is_object( $this->type )
174 174
 			? esc_html__( 'That field type may not work as expected.', 'cmb2' )
175 175
 			: esc_html__( 'That field type will not work as expected.', 'cmb2' );
176 176
 
177
-		$message[] = esc_html__( 'For more information about this change see: https://github.com/mustardBees/cmb-field-select2/pull/34w', 'cmb2' );
177
+		$message[ ] = esc_html__( 'For more information about this change see: https://github.com/mustardBees/cmb-field-select2/pull/34w', 'cmb2' );
178 178
 
179 179
 		_doing_it_wrong( __CLASS__ . '::' . $method, implode( ' ', $message ), '2.2.2' );
180 180
 	}
@@ -394,8 +394,8 @@  discard block
 block discarded – undo
394 394
 			'class' => 'cmb2-hidden',
395 395
 		);
396 396
 		if ( $this->field->group ) {
397
-			$args['data-groupid'] = $this->field->group->id();
398
-			$args['data-iterator'] = $this->iterator;
397
+			$args[ 'data-groupid' ] = $this->field->group->id();
398
+			$args[ 'data-iterator' ] = $this->iterator;
399 399
 		}
400 400
 		return $this->input( $args );
401 401
 	}
Please login to merge, or discard this patch.