Completed
Pull Request — trunk (#698)
by Justin
15:57
created
includes/types/CMB2_Type_Text.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -50,12 +50,12 @@
 block discarded – undo
50 50
 			'js_dependencies' => array(),
51 51
 		), $args );
52 52
 
53
-		if ( ! empty( $a['js_dependencies'] ) ) {
54
-			$this->field->add_js_dependencies( $a['js_dependencies'] );
53
+		if ( ! empty( $a[ 'js_dependencies' ] ) ) {
54
+			$this->field->add_js_dependencies( $a[ 'js_dependencies' ] );
55 55
 		}
56 56
 
57 57
 		return $this->rendered(
58
-			sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a['desc'] )
58
+			sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a[ 'desc' ] )
59 59
 		);
60 60
 	}
61 61
 }
Please login to merge, or discard this patch.
includes/CMB2_hookup.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 
120 120
 		if ( $this->cmb->has_columns ) {
121 121
 			add_filter( 'manage_edit-comments_columns', array( $this, 'register_column_headers' ) );
122
-			add_action( 'manage_comments_custom_column', array( $this, 'column_display'  ), 10, 3 );
122
+			add_action( 'manage_comments_custom_column', array( $this, 'column_display' ), 10, 3 );
123 123
 		}
124 124
 	}
125 125
 
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 
137 137
 		if ( $this->cmb->has_columns ) {
138 138
 			add_filter( 'manage_users_columns', array( $this, 'register_column_headers' ) );
139
-			add_filter( 'manage_users_custom_column', array( $this, 'return_column_display'  ), 10, 3 );
139
+			add_filter( 'manage_users_custom_column', array( $this, 'return_column_display' ), 10, 3 );
140 140
 		}
141 141
 	}
142 142
 
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 
171 171
 			if ( $this->cmb->has_columns ) {
172 172
 				add_filter( "manage_edit-{$taxonomy}_columns", array( $this, 'register_column_headers' ) );
173
-				add_filter( "manage_{$taxonomy}_custom_column", array( $this, 'return_column_display'  ), 10, 3 );
173
+				add_filter( "manage_{$taxonomy}_custom_column", array( $this, 'return_column_display' ), 10, 3 );
174 174
 			}
175 175
 		}
176 176
 
@@ -263,25 +263,25 @@  discard block
 block discarded – undo
263 263
 		$fields = $this->cmb->prop( 'fields' );
264 264
 
265 265
 		foreach ( $fields as $key => $field ) {
266
-			if ( ! isset( $field['column'] ) ) {
266
+			if ( ! isset( $field[ 'column' ] ) ) {
267 267
 				continue;
268 268
 			}
269 269
 
270
-			$column = $field['column'];
270
+			$column = $field[ 'column' ];
271 271
 
272
-			if ( false === $column['position'] ) {
272
+			if ( false === $column[ 'position' ] ) {
273 273
 
274
-				$columns[ $field['id'] ] = $column['name'];
274
+				$columns[ $field[ 'id' ] ] = $column[ 'name' ];
275 275
 
276 276
 			} else {
277 277
 
278
-				$before = array_slice( $columns, 0, absint( $column['position'] ) );
279
-				$before[ $field['id'] ] = $column['name'];
278
+				$before = array_slice( $columns, 0, absint( $column[ 'position' ] ) );
279
+				$before[ $field[ 'id' ] ] = $column[ 'name' ];
280 280
 				$columns = $before + $columns;
281 281
 			}
282 282
 
283
-			$column['field'] = $field;
284
-			$this->columns[ $field['id'] ] = $column;
283
+			$column[ 'field' ] = $field;
284
+			$this->columns[ $field[ 'id' ] ] = $column;
285 285
 		}
286 286
 
287 287
 		return $columns;
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
 	public function column_display( $column_name, $object_id ) {
295 295
 		if ( isset( $this->columns[ $column_name ] ) ) {
296 296
  			$field = new CMB2_Field( array(
297
-				'field_args'  => $this->columns[ $column_name ]['field'],
297
+				'field_args'  => $this->columns[ $column_name ][ 'field' ],
298 298
 				'object_type' => $this->object_type,
299 299
 				'object_id'   => $this->cmb->object_id( $object_id ),
300 300
 				'cmb_id'      => $this->cmb->cmb_id,
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
 	 * @return array           Modified array of classes
356 356
 	 */
357 357
 	public function close_metabox_class( $classes ) {
358
-		$classes[] = 'closed';
358
+		$classes[ ] = 'closed';
359 359
 		return $classes;
360 360
 	}
361 361
 
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
 	public function user_new_metabox( $section ) {
376 376
 		if ( $section == $this->cmb->prop( 'new_user_section' ) ) {
377 377
 			$object_id = $this->cmb->object_id();
378
-			$this->cmb->object_id( isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id );
378
+			$this->cmb->object_id( isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id );
379 379
 			$this->user_metabox();
380 380
 		}
381 381
 	}
@@ -555,7 +555,7 @@  discard block
 block discarded – undo
555 555
 		if ( $this->taxonomy_can_save( $taxonomy ) ) {
556 556
 
557 557
 			foreach ( $this->cmb->prop( 'fields' ) as $field ) {
558
-				$data_to_delete[ $field['id'] ] = '';
558
+				$data_to_delete[ $field[ 'id' ] ] = '';
559 559
 			}
560 560
 
561 561
 			$this->cmb->save_fields( $term_id, 'term', $data_to_delete );
Please login to merge, or discard this patch.
includes/CMB2_Field.php 1 patch
Spacing   +78 added lines, -78 removed lines patch added patch discarded remove patch
@@ -110,21 +110,21 @@  discard block
 block discarded – undo
110 110
 	 */
111 111
 	public function __construct( $args ) {
112 112
 
113
-		if ( ! empty( $args['group_field'] ) ) {
114
-			$this->group       = $args['group_field'];
113
+		if ( ! empty( $args[ 'group_field' ] ) ) {
114
+			$this->group       = $args[ 'group_field' ];
115 115
 			$this->object_id   = $this->group->object_id;
116 116
 			$this->object_type = $this->group->object_type;
117 117
 			$this->cmb_id      = $this->group->cmb_id;
118 118
 		} else {
119
-			$this->object_id   = isset( $args['object_id'] ) && '_' !== $args['object_id'] ? $args['object_id'] : 0;
120
-			$this->object_type = isset( $args['object_type'] ) ? $args['object_type'] : 'post';
119
+			$this->object_id   = isset( $args[ 'object_id' ] ) && '_' !== $args[ 'object_id' ] ? $args[ 'object_id' ] : 0;
120
+			$this->object_type = isset( $args[ 'object_type' ] ) ? $args[ 'object_type' ] : 'post';
121 121
 
122
-			if ( isset( $args['cmb_id'] ) ) {
123
-				$this->cmb_id = $args['cmb_id'];
122
+			if ( isset( $args[ 'cmb_id' ] ) ) {
123
+				$this->cmb_id = $args[ 'cmb_id' ];
124 124
 			}
125 125
 		}
126 126
 
127
-		$this->args = $this->_set_field_defaults( $args['field_args'], $args );
127
+		$this->args = $this->_set_field_defaults( $args[ 'field_args' ], $args );
128 128
 
129 129
 		if ( $this->object_id ) {
130 130
 			$this->value = $this->get_data();
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 	 * @return mixed             Value of field argument
140 140
 	 */
141 141
 	public function __call( $name, $arguments ) {
142
-		$key = isset( $arguments[0] ) ? $arguments[0] : false;
142
+		$key = isset( $arguments[ 0 ] ) ? $arguments[ 0 ] : false;
143 143
 		return $this->args( $name, $key );
144 144
 	}
145 145
 
@@ -210,9 +210,9 @@  discard block
 block discarded – undo
210 210
 	 */
211 211
 	public function get_data( $field_id = '', $args = array() ) {
212 212
 		if ( $field_id ) {
213
-			$args['field_id'] = $field_id;
213
+			$args[ 'field_id' ] = $field_id;
214 214
 		} else if ( $this->group ) {
215
-			$args['field_id'] = $this->group->id();
215
+			$args[ 'field_id' ] = $this->group->id();
216 216
 		}
217 217
 
218 218
 		$a = $this->data_args( $args );
@@ -253,13 +253,13 @@  discard block
 block discarded – undo
253 253
 		 *
254 254
 		 * @since 2.0.0
255 255
 		 */
256
-		$data = apply_filters( "cmb2_override_{$a['field_id']}_meta_value", $data, $this->object_id, $a, $this );
256
+		$data = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_value", $data, $this->object_id, $a, $this );
257 257
 
258 258
 		// If no override, get value normally
259 259
 		if ( 'cmb2_field_no_override_val' === $data ) {
260
-			$data = 'options-page' === $a['type']
261
-				? cmb2_options( $a['id'] )->get( $a['field_id'] )
262
-				: get_metadata( $a['type'], $a['id'], $a['field_id'], ( $a['single'] || $a['repeat'] ) );
260
+			$data = 'options-page' === $a[ 'type' ]
261
+				? cmb2_options( $a[ 'id' ] )->get( $a[ 'field_id' ] )
262
+				: get_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], ( $a[ 'single' ] || $a[ 'repeat' ] ) );
263 263
 		}
264 264
 
265 265
 		if ( $this->group ) {
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
 	public function update_data( $new_value, $single = true ) {
282 282
 		$a = $this->data_args( array( 'single' => $single ) );
283 283
 
284
-		$a['value'] = $a['repeat'] ? array_values( $new_value ) : $new_value;
284
+		$a[ 'value' ] = $a[ 'repeat' ] ? array_values( $new_value ) : $new_value;
285 285
 
286 286
 		/**
287 287
 		 * Filter whether to override saving of meta value.
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
317 317
 		 *
318 318
 		 * @since 2.0.0
319 319
 		 */
320
-		$override = apply_filters( "cmb2_override_{$a['field_id']}_meta_save", $override, $a, $this->args(), $this );
320
+		$override = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_save", $override, $a, $this->args(), $this );
321 321
 
322 322
 		// If override, return that
323 323
 		if ( null !== $override ) {
@@ -325,22 +325,22 @@  discard block
 block discarded – undo
325 325
 		}
326 326
 
327 327
 		// Options page handling (or temp data store)
328
-		if ( 'options-page' === $a['type'] || empty( $a['id'] ) ) {
329
-			return cmb2_options( $a['id'] )->update( $a['field_id'], $a['value'], false, $a['single'] );
328
+		if ( 'options-page' === $a[ 'type' ] || empty( $a[ 'id' ] ) ) {
329
+			return cmb2_options( $a[ 'id' ] )->update( $a[ 'field_id' ], $a[ 'value' ], false, $a[ 'single' ] );
330 330
 		}
331 331
 
332 332
 		// Add metadata if not single
333
-		if ( ! $a['single'] ) {
334
-			return add_metadata( $a['type'], $a['id'], $a['field_id'], $a['value'], false );
333
+		if ( ! $a[ 'single' ] ) {
334
+			return add_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $a[ 'value' ], false );
335 335
 		}
336 336
 
337 337
 		// Delete meta if we have an empty array
338
-		if ( is_array( $a['value'] ) && empty( $a['value'] ) ) {
339
-			return delete_metadata( $a['type'], $a['id'], $a['field_id'], $this->value );
338
+		if ( is_array( $a[ 'value' ] ) && empty( $a[ 'value' ] ) ) {
339
+			return delete_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $this->value );
340 340
 		}
341 341
 
342 342
 		// Update metadata
343
-		return update_metadata( $a['type'], $a['id'], $a['field_id'], $a['value'] );
343
+		return update_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $a[ 'value' ] );
344 344
 	}
345 345
 
346 346
 	/**
@@ -390,19 +390,19 @@  discard block
 block discarded – undo
390 390
 		 * @param array $field_args All field arguments
391 391
 		 * @param CMB2_Field object $field This field object
392 392
 		 */
393
-		$override = apply_filters( "cmb2_override_{$a['field_id']}_meta_remove", $override, $a, $this->args(), $this );
393
+		$override = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_remove", $override, $a, $this->args(), $this );
394 394
 
395 395
 		// If no override, remove as usual
396 396
 		if ( null !== $override ) {
397 397
 			return $override;
398 398
 		}
399 399
 		// Option page handling
400
-		elseif ( 'options-page' === $a['type'] || empty( $a['id'] ) ) {
401
-			return cmb2_options( $a['id'] )->remove( $a['field_id'] );
400
+		elseif ( 'options-page' === $a[ 'type' ] || empty( $a[ 'id' ] ) ) {
401
+			return cmb2_options( $a[ 'id' ] )->remove( $a[ 'field_id' ] );
402 402
 		}
403 403
 
404 404
 		// Remove metadata
405
-		return delete_metadata( $a['type'], $a['id'], $a['field_id'], $old );
405
+		return delete_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $old );
406 406
 	}
407 407
 
408 408
 	/**
@@ -854,7 +854,7 @@  discard block
 block discarded – undo
854 854
 
855 855
 		foreach ( $conditional_classes as $class => $condition ) {
856 856
 			if ( $condition ) {
857
-				$classes[] = $class;
857
+				$classes[ ] = $class;
858 858
 			}
859 859
 		}
860 860
 
@@ -866,7 +866,7 @@  discard block
 block discarded – undo
866 866
 
867 867
 
868 868
 		if ( $added_classes ) {
869
-			$classes[] = esc_attr( $added_classes );
869
+			$classes[ ] = esc_attr( $added_classes );
870 870
 		}
871 871
 
872 872
 		/**
@@ -966,10 +966,10 @@  discard block
 block discarded – undo
966 966
 	public function string( $text_key, $fallback ) {
967 967
 		// If null, populate with our field strings values.
968 968
 		if ( null === $this->strings ) {
969
-			$this->strings = (array) $this->args['text'];
969
+			$this->strings = (array) $this->args[ 'text' ];
970 970
 
971
-			if ( is_callable( $this->args['text_cb'] ) ) {
972
-				$strings = call_user_func( $this->args['text_cb'], $this );
971
+			if ( is_callable( $this->args[ 'text_cb' ] ) ) {
972
+				$strings = call_user_func( $this->args[ 'text_cb' ], $this );
973 973
 
974 974
 				if ( $strings && is_array( $strings ) ) {
975 975
 					$this->strings += $strings;
@@ -1003,10 +1003,10 @@  discard block
 block discarded – undo
1003 1003
 			return $this->field_options;
1004 1004
 		}
1005 1005
 
1006
-		$this->field_options = (array) $this->args['options'];
1006
+		$this->field_options = (array) $this->args[ 'options' ];
1007 1007
 
1008
-		if ( is_callable( $this->args['options_cb'] ) ) {
1009
-			$options = call_user_func( $this->args['options_cb'], $this );
1008
+		if ( is_callable( $this->args[ 'options_cb' ] ) ) {
1009
+			$options = call_user_func( $this->args[ 'options_cb' ], $this );
1010 1010
 
1011 1011
 			if ( $options && is_array( $options ) ) {
1012 1012
 				$this->field_options = $options + $this->field_options;
@@ -1027,7 +1027,7 @@  discard block
 block discarded – undo
1027 1027
 	 */
1028 1028
 	public function add_js_dependencies( $dependencies = array() ) {
1029 1029
 		foreach ( (array) $dependencies as $dependency ) {
1030
-			$this->args['js_dependencies'][ $dependency ] = $dependency;
1030
+			$this->args[ 'js_dependencies' ][ $dependency ] = $dependency;
1031 1031
 		}
1032 1032
 
1033 1033
 		CMB2_JS::add_dependencies( $dependencies );
@@ -1041,17 +1041,17 @@  discard block
 block discarded – undo
1041 1041
 	 * @return mixed  Default field value
1042 1042
 	 */
1043 1043
 	public function get_default() {
1044
-		if ( null !== $this->args['default'] ) {
1045
-			return $this->args['default'];
1044
+		if ( null !== $this->args[ 'default' ] ) {
1045
+			return $this->args[ 'default' ];
1046 1046
 		}
1047 1047
 
1048
-		$param = is_callable( $this->args['default_cb'] ) ? 'default_cb' : 'default';
1048
+		$param = is_callable( $this->args[ 'default_cb' ] ) ? 'default_cb' : 'default';
1049 1049
 		$default = $this->get_param_callback_result( $param );
1050 1050
 
1051 1051
 		// Allow a filter override of the default value
1052
-		$this->args['default'] = apply_filters( 'cmb2_default_filter', $default, $this );
1052
+		$this->args[ 'default' ] = apply_filters( 'cmb2_default_filter', $default, $this );
1053 1053
 
1054
-		return $this->args['default'];
1054
+		return $this->args[ 'default' ];
1055 1055
 	}
1056 1056
 
1057 1057
 	/**
@@ -1089,18 +1089,18 @@  discard block
 block discarded – undo
1089 1089
 			'classes_cb'        => '',
1090 1090
 			'select_all_button' => true,
1091 1091
 			'multiple'          => false,
1092
-			'repeatable'        => isset( $args['type'] ) && 'group' == $args['type'],
1092
+			'repeatable'        => isset( $args[ 'type' ] ) && 'group' == $args[ 'type' ],
1093 1093
 			'inline'            => false,
1094 1094
 			'on_front'          => true,
1095 1095
 			'show_names'        => true,
1096 1096
 			'save_field'        => true, // Will not save if false
1097 1097
 			'date_format'       => 'm\/d\/Y',
1098 1098
 			'time_format'       => 'h:i A',
1099
-			'description'       => isset( $args['desc'] ) ? $args['desc'] : '',
1100
-			'preview_size'      => 'file' == $args['type'] ? array( 350, 350 ) : array( 50, 50 ),
1099
+			'description'       => isset( $args[ 'desc' ] ) ? $args[ 'desc' ] : '',
1100
+			'preview_size'      => 'file' == $args[ 'type' ] ? array( 350, 350 ) : array( 50, 50 ),
1101 1101
 			'render_row_cb'     => array( $this, 'render_field_callback' ),
1102 1102
 			'display_cb'        => array( $this, 'display_value_callback' ),
1103
-			'label_cb'          => 'title' != $args['type'] ? array( $this, 'label' ) : '',
1103
+			'label_cb'          => 'title' != $args[ 'type' ] ? array( $this, 'label' ) : '',
1104 1104
 			'column'            => false,
1105 1105
 			'show_in_rest'      => null,
1106 1106
 			'js_dependencies'   => array(),
@@ -1110,73 +1110,73 @@  discard block
 block discarded – undo
1110 1110
 		 * Deprecated usage.
1111 1111
 		 */
1112 1112
 
1113
-		if ( isset( $args['row_classes'] ) ) {
1113
+		if ( isset( $args[ 'row_classes' ] ) ) {
1114 1114
 
1115 1115
 			// row_classes param could be a callback
1116
-			if ( is_callable( $args['row_classes'] ) ) {
1117
-				$args['classes_cb'] = $args['row_classes'];
1118
-				$args['classes'] = null;
1116
+			if ( is_callable( $args[ 'row_classes' ] ) ) {
1117
+				$args[ 'classes_cb' ] = $args[ 'row_classes' ];
1118
+				$args[ 'classes' ] = null;
1119 1119
 			} else {
1120
-				$args['classes'] = $args['row_classes'];
1120
+				$args[ 'classes' ] = $args[ 'row_classes' ];
1121 1121
 			}
1122 1122
 
1123
-			unset( $args['row_classes'] );
1123
+			unset( $args[ 'row_classes' ] );
1124 1124
 		}
1125 1125
 
1126 1126
 		// default param can be passed a callback as well
1127
-		if ( is_callable( $args['default'] ) ) {
1128
-			$args['default_cb'] = $args['default'];
1129
-			$args['default'] = null;
1127
+		if ( is_callable( $args[ 'default' ] ) ) {
1128
+			$args[ 'default_cb' ] = $args[ 'default' ];
1129
+			$args[ 'default' ] = null;
1130 1130
 		}
1131 1131
 
1132 1132
 		/*
1133 1133
 		 * END deprecated usage.
1134 1134
 		 */
1135 1135
 
1136
-		$args['repeatable'] = $args['repeatable'] && ! $this->repeatable_exception( $args['type'] );
1137
-		$args['inline']     = $args['inline'] || false !== stripos( $args['type'], '_inline' );
1136
+		$args[ 'repeatable' ] = $args[ 'repeatable' ] && ! $this->repeatable_exception( $args[ 'type' ] );
1137
+		$args[ 'inline' ]     = $args[ 'inline' ] || false !== stripos( $args[ 'type' ], '_inline' );
1138 1138
 
1139 1139
 		// options param can be passed a callback as well
1140
-		if ( is_callable( $args['options'] ) ) {
1141
-			$args['options_cb'] = $args['options'];
1142
-			$args['options'] = array();
1140
+		if ( is_callable( $args[ 'options' ] ) ) {
1141
+			$args[ 'options_cb' ] = $args[ 'options' ];
1142
+			$args[ 'options' ] = array();
1143 1143
 		}
1144 1144
 
1145
-		$args['options']    = 'group' == $args['type'] ? wp_parse_args( $args['options'], array(
1145
+		$args[ 'options' ] = 'group' == $args[ 'type' ] ? wp_parse_args( $args[ 'options' ], array(
1146 1146
 			'add_button'    => __( 'Add Group', 'cmb2' ),
1147 1147
 			'remove_button' => __( 'Remove Group', 'cmb2' ),
1148
-		) ) : $args['options'];
1148
+		) ) : $args[ 'options' ];
1149 1149
 
1150
-		$args['_id']        = $args['id'];
1151
-		$args['_name']      = $args['id'];
1150
+		$args[ '_id' ]        = $args[ 'id' ];
1151
+		$args[ '_name' ]      = $args[ 'id' ];
1152 1152
 
1153 1153
 		if ( $this->group ) {
1154 1154
 
1155
-			$args['id']    = $this->group->args( 'id' ) . '_' . $this->group->index . '_' . $args['id'];
1156
-			$args['_name'] = $this->group->args( 'id' ) . '[' . $this->group->index . '][' . $args['_name'] . ']';
1155
+			$args[ 'id' ]    = $this->group->args( 'id' ) . '_' . $this->group->index . '_' . $args[ 'id' ];
1156
+			$args[ '_name' ] = $this->group->args( 'id' ) . '[' . $this->group->index . '][' . $args[ '_name' ] . ']';
1157 1157
 		}
1158 1158
 
1159
-		if ( 'wysiwyg' == $args['type'] ) {
1160
-			$args['id'] = strtolower( str_ireplace( '-', '_', $args['id'] ) );
1161
-			$args['options']['textarea_name'] = $args['_name'];
1159
+		if ( 'wysiwyg' == $args[ 'type' ] ) {
1160
+			$args[ 'id' ] = strtolower( str_ireplace( '-', '_', $args[ 'id' ] ) );
1161
+			$args[ 'options' ][ 'textarea_name' ] = $args[ '_name' ];
1162 1162
 		}
1163 1163
 
1164 1164
 		$option_types = apply_filters( 'cmb2_all_or_nothing_types', array( 'select', 'radio', 'radio_inline', 'taxonomy_select', 'taxonomy_radio', 'taxonomy_radio_inline' ), $this );
1165 1165
 
1166
-		if ( in_array( $args['type'], $option_types, true ) ) {
1166
+		if ( in_array( $args[ 'type' ], $option_types, true ) ) {
1167 1167
 
1168
-			$args['show_option_none'] = isset( $args['show_option_none'] ) ? $args['show_option_none'] : null;
1169
-			$args['show_option_none'] = true === $args['show_option_none'] ? __( 'None', 'cmb2' ) : $args['show_option_none'];
1168
+			$args[ 'show_option_none' ] = isset( $args[ 'show_option_none' ] ) ? $args[ 'show_option_none' ] : null;
1169
+			$args[ 'show_option_none' ] = true === $args[ 'show_option_none' ] ? __( 'None', 'cmb2' ) : $args[ 'show_option_none' ];
1170 1170
 
1171
-			if ( null === $args['show_option_none'] ) {
1172
-				$off_by_default = in_array( $args['type'], array( 'select', 'radio', 'radio_inline' ), true );
1173
-				$args['show_option_none'] = $off_by_default ? false : __( 'None', 'cmb2' );
1171
+			if ( null === $args[ 'show_option_none' ] ) {
1172
+				$off_by_default = in_array( $args[ 'type' ], array( 'select', 'radio', 'radio_inline' ), true );
1173
+				$args[ 'show_option_none' ] = $off_by_default ? false : __( 'None', 'cmb2' );
1174 1174
 			}
1175 1175
 
1176 1176
 		}
1177 1177
 
1178
-		$args['has_supporting_data'] = in_array(
1179
-			$args['type'],
1178
+		$args[ 'has_supporting_data' ] = in_array(
1179
+			$args[ 'type' ],
1180 1180
 			array(
1181 1181
 				// CMB2_Sanitize::_save_file_id_value()/CMB2_Sanitize::_get_group_file_value_array()
1182 1182
 				'file',
@@ -1199,10 +1199,10 @@  discard block
 block discarded – undo
1199 1199
 	protected function get_default_args( $field_args, $field_group = null ) {
1200 1200
 		$args = parent::get_default_args( array(), $this->group );
1201 1201
 
1202
-		if ( isset( $field_args['field_args'] ) ) {
1202
+		if ( isset( $field_args[ 'field_args' ] ) ) {
1203 1203
 			$args = wp_parse_args( $field_args, $args );
1204 1204
 		} else {
1205
-			$args['field_args'] = wp_parse_args( $field_args, $this->args );
1205
+			$args[ 'field_args' ] = wp_parse_args( $field_args, $this->args );
1206 1206
 		}
1207 1207
 
1208 1208
 		return $args;
Please login to merge, or discard this patch.
includes/CMB2_Hookup_Base.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@
 block discarded – undo
54 54
 			return;
55 55
 		}
56 56
 
57
-		$hooks_completed[] = $key;
57
+		$hooks_completed[ ] = $key;
58 58
 		add_filter( $action, $hook, $priority, $accepted_args );
59 59
 	}
60 60
 
Please login to merge, or discard this patch.
includes/CMB2_JS.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -56,23 +56,23 @@
 block discarded – undo
56 56
 		$min = $debug ? '' : '.min';
57 57
 
58 58
 		// if colorpicker
59
-		if ( ! is_admin() && isset( $dependencies['wp-color-picker'] ) ) {
59
+		if ( ! is_admin() && isset( $dependencies[ 'wp-color-picker' ] ) ) {
60 60
 			self::colorpicker_frontend();
61 61
 		}
62 62
 
63 63
 		// if file/file_list
64
-		if ( isset( $dependencies['media-editor'] ) ) {
64
+		if ( isset( $dependencies[ 'media-editor' ] ) ) {
65 65
 			wp_enqueue_media();
66 66
 		}
67 67
 
68 68
 		// if timepicker
69
-		if ( isset( $dependencies['jquery-ui-datetimepicker'] ) ) {
69
+		if ( isset( $dependencies[ 'jquery-ui-datetimepicker' ] ) ) {
70 70
 			wp_register_script( 'jquery-ui-datetimepicker', cmb2_utils()->url( 'js/jquery-ui-timepicker-addon.min.js' ), array( 'jquery-ui-slider' ), CMB2_VERSION );
71 71
 		}
72 72
 
73 73
 		// if cmb2-wysiwyg
74
-		$enqueue_wysiwyg = isset( $dependencies['cmb2-wysiwyg'] ) && $debug;
75
-		unset( $dependencies['cmb2-wysiwyg'] );
74
+		$enqueue_wysiwyg = isset( $dependencies[ 'cmb2-wysiwyg' ] ) && $debug;
75
+		unset( $dependencies[ 'cmb2-wysiwyg' ] );
76 76
 
77 77
 		// Enqueue cmb JS
78 78
 		wp_enqueue_script( self::$handle, cmb2_utils()->url( "js/cmb2{$min}.js" ), $dependencies, CMB2_VERSION, true );
Please login to merge, or discard this patch.
includes/types/CMB2_Type_Wysiwyg.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 		) );
29 29
 
30 30
 		if ( ! $field->group ) {
31
-			return $this->rendered( $this->get_wp_editor( $a ) . $a['desc'] );
31
+			return $this->rendered( $this->get_wp_editor( $a ) . $a[ 'desc' ] );
32 32
 		}
33 33
 
34 34
 		// wysiwyg fields in a group need some special handling.
@@ -52,27 +52,27 @@  discard block
 block discarded – undo
52 52
 
53 53
 	protected function get_wp_editor( $args ) {
54 54
 		ob_start();
55
-		wp_editor( $args['value'], $args['id'], $args['options'] );
55
+		wp_editor( $args[ 'value' ], $args[ 'id' ], $args[ 'options' ] );
56 56
 		return ob_get_clean();
57 57
 	}
58 58
 
59 59
 	public function add_wysiwyg_template_for_group() {
60 60
 		$group_id = $this->field->group->id();
61 61
 		$options  = $this->field->options();
62
-		$options['textarea_name'] = 'cmb2_replace_name_'. $group_id;
62
+		$options[ 'textarea_name' ] = 'cmb2_replace_name_' . $group_id;
63 63
 
64 64
 		// Initate the editor with special id/value/name so we can retrieve the options in JS.
65 65
 		$editor = $this->get_wp_editor( array(
66
-			'value'   => 'cmb2_replace_value_'. $group_id,
67
-			'id'      => 'cmb2_replace_id_'. $group_id,
66
+			'value'   => 'cmb2_replace_value_' . $group_id,
67
+			'id'      => 'cmb2_replace_id_' . $group_id,
68 68
 			'options' => $options,
69 69
 		) );
70 70
 
71 71
 		// Then replace the special id/value/name with underscore placeholders.
72 72
 		$editor = str_replace( array(
73
-			'cmb2_replace_name_'. $group_id,
74
-			'cmb2_replace_value_'. $group_id,
75
-			'cmb2_replace_id_'. $group_id,
73
+			'cmb2_replace_name_' . $group_id,
74
+			'cmb2_replace_value_' . $group_id,
75
+			'cmb2_replace_id_' . $group_id,
76 76
 		), array(
77 77
 			'{{ data.name }}',
78 78
 			'{{{ data.value }}}',
@@ -80,9 +80,9 @@  discard block
 block discarded – undo
80 80
 		), $editor );
81 81
 
82 82
 		// And put the editor instance in a JS template wrapper.
83
-		echo '<script type="text/template" id="tmpl-cmb2-wysiwyg-'. $group_id .'">';
83
+		echo '<script type="text/template" id="tmpl-cmb2-wysiwyg-' . $group_id . '">';
84 84
 		// Need to wrap the template in a wrapper div w/ specific data attributes which will be used when adding/removing rows.
85
-		echo '<div class="cmb2-wysiwyg-inner-wrap" data-iterator="{{ data.iterator }}" data-groupid="'. $group_id .'" data-id="'. $this->field->id( true ) .'">'. $editor .'</div>';
85
+		echo '<div class="cmb2-wysiwyg-inner-wrap" data-iterator="{{ data.iterator }}" data-groupid="' . $group_id . '" data-id="' . $this->field->id( true ) . '">' . $editor . '</div>';
86 86
 		echo '</script>';
87 87
 	}
88 88
 
Please login to merge, or discard this patch.