Completed
Pull Request — trunk (#541)
by Justin
13:08
created
includes/types/CMB2_Type_Title.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 		), $this->args );
30 30
 
31 31
 		return $this->rendered(
32
-			sprintf( '<%1$s %2$s>%3$s</%1$s>%4$s', $a['tag'], $this->concat_attrs( $a, array( 'tag', 'name', 'desc' ) ), $a['name'], $a['desc'] )
32
+			sprintf( '<%1$s %2$s>%3$s</%1$s>%4$s', $a[ 'tag' ], $this->concat_attrs( $a, array( 'tag', 'name', 'desc' ) ), $a[ 'name' ], $a[ 'desc' ] )
33 33
 		);
34 34
 	}
35 35
 
Please login to merge, or discard this patch.
includes/CMB2_Ajax.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -59,12 +59,12 @@  discard block
 block discarded – undo
59 59
 	public function oembed_handler() {
60 60
 
61 61
 		// Verify our nonce
62
-		if ( ! ( isset( $_REQUEST['cmb2_ajax_nonce'], $_REQUEST['oembed_url'] ) && wp_verify_nonce( $_REQUEST['cmb2_ajax_nonce'], 'ajax_nonce' ) ) ) {
62
+		if ( ! ( isset( $_REQUEST[ 'cmb2_ajax_nonce' ], $_REQUEST[ 'oembed_url' ] ) && wp_verify_nonce( $_REQUEST[ 'cmb2_ajax_nonce' ], 'ajax_nonce' ) ) ) {
63 63
 			die();
64 64
 		}
65 65
 
66 66
 		// Sanitize our search string
67
-		$oembed_string = sanitize_text_field( $_REQUEST['oembed_url'] );
67
+		$oembed_string = sanitize_text_field( $_REQUEST[ 'oembed_url' ] );
68 68
 
69 69
 		// Send back error if empty
70 70
 		if ( empty( $oembed_string ) ) {
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 		}
73 73
 
74 74
 		// Set width of embed
75
-		$embed_width = isset( $_REQUEST['oembed_width'] ) && intval( $_REQUEST['oembed_width'] ) < 640 ? intval( $_REQUEST['oembed_width'] ) : '640';
75
+		$embed_width = isset( $_REQUEST[ 'oembed_width' ] ) && intval( $_REQUEST[ 'oembed_width' ] ) < 640 ? intval( $_REQUEST[ 'oembed_width' ] ) : '640';
76 76
 
77 77
 		// Set url
78 78
 		$oembed_url = esc_url( $oembed_string );
@@ -85,10 +85,10 @@  discard block
 block discarded – undo
85 85
 		// Get embed code (or fallback link)
86 86
 		$html = $this->get_oembed( array(
87 87
 			'url'         => $oembed_url,
88
-			'object_id'   => $_REQUEST['object_id'],
89
-			'object_type' => isset( $_REQUEST['object_type'] ) ? $_REQUEST['object_type'] : 'post',
88
+			'object_id'   => $_REQUEST[ 'object_id' ],
89
+			'object_type' => isset( $_REQUEST[ 'object_type' ] ) ? $_REQUEST[ 'object_type' ] : 'post',
90 90
 			'oembed_args' => $embed_args,
91
-			'field_id'    => $_REQUEST['field_id'],
91
+			'field_id'    => $_REQUEST[ 'field_id' ],
92 92
 		) );
93 93
 
94 94
 		wp_send_json_success( $html );
@@ -103,10 +103,10 @@  discard block
 block discarded – undo
103 103
 	public function get_oembed_no_edit( $args ) {
104 104
 		global $wp_embed;
105 105
 
106
-		$oembed_url = esc_url( $args['url'] );
106
+		$oembed_url = esc_url( $args[ 'url' ] );
107 107
 
108 108
 		// Sanitize object_id
109
-		$this->object_id = is_numeric( $args['object_id'] ) ? absint( $args['object_id'] ) : sanitize_text_field( $args['object_id'] );
109
+		$this->object_id = is_numeric( $args[ 'object_id' ] ) ? absint( $args[ 'object_id' ] ) : sanitize_text_field( $args[ 'object_id' ] );
110 110
 
111 111
 		$args = wp_parse_args( $args, array(
112 112
 			'object_type' => 'post',
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 			'wp_error'    => false,
116 116
 		) );
117 117
 
118
-		$this->embed_args =& $args;
118
+		$this->embed_args = & $args;
119 119
 
120 120
 		/**
121 121
 		 * Set the post_ID so oEmbed won't fail
@@ -124,9 +124,9 @@  discard block
 block discarded – undo
124 124
 		$wp_embed->post_ID = $this->object_id;
125 125
 
126 126
 		// Special scenario if NOT a post object
127
-		if ( isset( $args['object_type'] ) && 'post' != $args['object_type'] ) {
127
+		if ( isset( $args[ 'object_type' ] ) && 'post' != $args[ 'object_type' ] ) {
128 128
 
129
-			if ( 'options-page' == $args['object_type'] ) {
129
+			if ( 'options-page' == $args[ 'object_type' ] ) {
130 130
 
131 131
 				// Bogus id to pass some numeric checks. Issue with a VERY large WP install?
132 132
 				$wp_embed->post_ID = 1987645321;
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 
135 135
 			// Ok, we need to hijack the oembed cache system
136 136
 			$this->hijack = true;
137
-			$this->object_type = $args['object_type'];
137
+			$this->object_type = $args[ 'object_type' ];
138 138
 
139 139
 			// Gets ombed cache from our object's meta (vs postmeta)
140 140
 			add_filter( 'get_post_metadata', array( $this, 'hijack_oembed_cache_get' ), 10, 3 );
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 
147 147
 		$embed_args = '';
148 148
 
149
-		foreach ( $args['oembed_args'] as $key => $val ) {
149
+		foreach ( $args[ 'oembed_args' ] as $key => $val ) {
150 150
 			$embed_args .= " $key=\"$val\"";
151 151
 		}
152 152
 
@@ -169,12 +169,12 @@  discard block
 block discarded – undo
169 169
 		$oembed = $this->get_oembed_no_edit( $args );
170 170
 
171 171
 		// Send back our embed
172
-		if ( $oembed['embed'] && $oembed['embed'] != $oembed['fallback'] ) {
173
-			return '<div class="cmb2-oembed embed-status">' . $oembed['embed'] . '<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button" rel="' . $oembed['args']['field_id'] . '">' . __( 'Remove Embed', 'cmb2' ) . '</a></p></div>';
172
+		if ( $oembed[ 'embed' ] && $oembed[ 'embed' ] != $oembed[ 'fallback' ] ) {
173
+			return '<div class="cmb2-oembed embed-status">' . $oembed[ 'embed' ] . '<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button" rel="' . $oembed[ 'args' ][ 'field_id' ] . '">' . __( 'Remove Embed', 'cmb2' ) . '</a></p></div>';
174 174
 		}
175 175
 
176 176
 		// Otherwise, send back error info that no oEmbeds were found
177
-		return '<p class="ui-state-error-text">' . sprintf( __( 'No oEmbed Results Found for %s. View more info at', 'cmb2' ), $oembed['fallback'] ) . ' <a href="http://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>.</p>';
177
+		return '<p class="ui-state-error-text">' . sprintf( __( 'No oEmbed Results Found for %s. View more info at', 'cmb2' ), $oembed[ 'fallback' ] ) . ' <a href="http://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>.</p>';
178 178
 	}
179 179
 
180 180
 	/**
@@ -236,15 +236,15 @@  discard block
 block discarded – undo
236 236
 	 */
237 237
 	protected function cache_action( $meta_key ) {
238 238
 		$func_args = func_get_args();
239
-		$action    = isset( $func_args[1] ) ? 'update' : 'get';
239
+		$action    = isset( $func_args[ 1 ] ) ? 'update' : 'get';
240 240
 
241 241
 		if ( 'options-page' === $this->object_type ) {
242 242
 
243 243
 			$args = array( $meta_key );
244 244
 
245 245
 			if ( 'update' === $action ) {
246
-				$args[] = $func_args[1];
247
-				$args[] = true;
246
+				$args[ ] = $func_args[ 1 ];
247
+				$args[ ] = true;
248 248
 			}
249 249
 
250 250
 			// Cache the result to our options
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
 		} else {
253 253
 
254 254
 			$args = array( $this->object_type, $this->object_id, $meta_key );
255
-			$args[] = 'update' === $action ? $func_args : true;
255
+			$args[ ] = 'update' === $action ? $func_args : true;
256 256
 
257 257
 			// Cache the result to our metadata
258 258
 			$status = call_user_func_array( $action . '_metadata', $args );
Please login to merge, or discard this patch.
includes/CMB2_Field_Display.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 			if ( is_array( $this->field->value ) ) {
125 125
 
126 126
 				// Then loop and output.
127
-				echo '<ul class="cmb2-'. str_replace( '_', '-', $this->field->type() ) .'">';
127
+				echo '<ul class="cmb2-' . str_replace( '_', '-', $this->field->type() ) . '">';
128 128
 				foreach ( $this->field->value as $val ) {
129 129
 					$this->value = $val;
130 130
 					echo '<li>', $this->_display(), '</li>';
@@ -197,8 +197,8 @@  discard block
 block discarded – undo
197 197
 		$options = $this->field->options();
198 198
 
199 199
 		$fallback = $this->field->args( 'show_option_none' );
200
-		if ( ! $fallback && isset( $options[''] ) ) {
201
-			$fallback = $options[''];
200
+		if ( ! $fallback && isset( $options[ '' ] ) ) {
201
+			$fallback = $options[ '' ];
202 202
 		}
203 203
 		if ( ! $this->value && $fallback ) {
204 204
 			echo $fallback;
@@ -225,9 +225,9 @@  discard block
 block discarded – undo
225 225
 		$output = array();
226 226
 		foreach ( $this->value as $val ) {
227 227
 			if ( isset( $options[ $val ] ) ) {
228
-				$output[] = $options[ $val ];
228
+				$output[ ] = $options[ $val ];
229 229
 			} else {
230
-				$output[] = esc_attr( $val );
230
+				$output[ ] = esc_attr( $val );
231 231
 			}
232 232
 		}
233 233
 
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 	 * @since 2.2.2
252 252
 	 */
253 253
 	protected function _display() {
254
-		echo '<xmp class="cmb2-code">'. print_r( $this->value, true ) .'</xmp>';
254
+		echo '<xmp class="cmb2-code">' . print_r( $this->value, true ) . '</xmp>';
255 255
 	}
256 256
 }
257 257
 
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
 		if ( $datetime && $datetime instanceof DateTime ) {
294 294
 			$tz       = $datetime->getTimezone();
295 295
 			$tzstring = $tz->getName();
296
-			$this->value    = $datetime->getTimestamp();
296
+			$this->value = $datetime->getTimestamp();
297 297
 		}
298 298
 
299 299
 		$date = $this->field->get_timestamp_format( 'date_format', $this->value );
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
317 317
 		if ( is_wp_error( $terms ) || empty( $terms ) && ( $default = $this->field->get_default() ) ) {
318 318
 			$term = get_term_by( 'slug', $default, $taxonomy );
319 319
 		} elseif ( ! empty( $terms ) ) {
320
-			$term = $terms[key( $terms )];
320
+			$term = $terms[ key( $terms ) ];
321 321
 		}
322 322
 
323 323
 		if ( $term ) {
@@ -341,10 +341,10 @@  discard block
 block discarded – undo
341 341
 			$terms = array();
342 342
 			if ( is_array( $default ) ) {
343 343
 				foreach ( $default as $slug ) {
344
-					$terms[] = get_term_by( 'slug', $slug, $taxonomy );
344
+					$terms[ ] = get_term_by( 'slug', $slug, $taxonomy );
345 345
 				}
346 346
 			} else {
347
-				$terms[] = get_term_by( 'slug', $default, $taxonomy );
347
+				$terms[ ] = get_term_by( 'slug', $default, $taxonomy );
348 348
 			}
349 349
 		}
350 350
 
@@ -353,7 +353,7 @@  discard block
 block discarded – undo
353 353
 			$links = array();
354 354
 			foreach ( $terms as $term ) {
355 355
 				$link = get_edit_term_link( $term->term_id, $taxonomy );
356
-				$links[] = '<a href="'. esc_url( $link ) .'">'. esc_html( $term->name ) .'</a>';
356
+				$links[ ] = '<a href="' . esc_url( $link ) . '">' . esc_html( $term->name ) . '</a>';
357 357
 			}
358 358
 			// Then loop and output.
359 359
 			echo '<div class="cmb2-taxonomy-terms-', esc_attr( $taxonomy ), '">';
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
396 396
 			if ( $id ) {
397 397
 				$image = wp_get_attachment_image( $id, $img_size, null, array( 'class' => 'cmb-image-display' ) );
398 398
 			} else {
399
-				$size = is_array( $img_size ) ? $img_size[0] : 200;
399
+				$size = is_array( $img_size ) ? $img_size[ 0 ] : 200;
400 400
 				$image = '<img class="cmb-image-display" style="max-width: ' . absint( $size ) . 'px; width: 100%; height: auto;" src="' . $url_value . '" alt="" />';
401 401
 			}
402 402
 
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/helper-functions.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -86,13 +86,13 @@  discard block
 block discarded – undo
86 86
 	$oembed = cmb2_ajax()->get_oembed_no_edit( $args );
87 87
 
88 88
 	// Send back our embed
89
-	if ( $oembed['embed'] && $oembed['embed'] != $oembed['fallback'] ) {
90
-		return '<div class="cmb2-oembed">' . $oembed['embed'] . '</div>';
89
+	if ( $oembed[ 'embed' ] && $oembed[ 'embed' ] != $oembed[ 'fallback' ] ) {
90
+		return '<div class="cmb2-oembed">' . $oembed[ 'embed' ] . '</div>';
91 91
 	}
92 92
 
93
-	$error = sprintf( __( 'No oEmbed Results Found for %s. View more info at %s.', 'cmb2' ), $oembed['fallback'], ' <a href="http://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>' );
93
+	$error = sprintf( __( 'No oEmbed Results Found for %s. View more info at %s.', 'cmb2' ), $oembed[ 'fallback' ], ' <a href="http://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>' );
94 94
 
95
-	if ( isset( $args['wp_error'] ) && $args['wp_error'] ) {
95
+	if ( isset( $args[ 'wp_error' ] ) && $args[ 'wp_error' ] ) {
96 96
 		return new WP_Error( 'cmb2_get_oembed_result', $wp_error, compact( 'oembed', 'args' ) );
97 97
 	}
98 98
 
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
 		$cmb = CMB2_Boxes::get( $meta_box );
208 208
 	} else {
209 209
 		// See if we already have an instance of this metabox
210
-		$cmb = CMB2_Boxes::get( $meta_box['id'] );
210
+		$cmb = CMB2_Boxes::get( $meta_box[ 'id' ] );
211 211
 		// If not, we'll initate a new metabox
212 212
 		$cmb = $cmb ? $cmb : new CMB2( $meta_box, $object_id );
213 213
 	}
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
 	) );
284 284
 
285 285
 	// Set object type explicitly (rather than trying to guess from context)
286
-	$cmb->object_type( $args['object_type'] );
286
+	$cmb->object_type( $args[ 'object_type' ] );
287 287
 
288 288
 	// Save the metabox if it's been submitted
289 289
 	// check permissions
@@ -291,32 +291,32 @@  discard block
 block discarded – undo
291 291
 	if (
292 292
 		$cmb->prop( 'save_fields' )
293 293
 		// check nonce
294
-		&& isset( $_POST['submit-cmb'], $_POST['object_id'], $_POST[ $cmb->nonce() ] )
294
+		&& isset( $_POST[ 'submit-cmb' ], $_POST[ 'object_id' ], $_POST[ $cmb->nonce() ] )
295 295
 		&& wp_verify_nonce( $_POST[ $cmb->nonce() ], $cmb->nonce() )
296
-		&& $object_id && $_POST['object_id'] == $object_id
296
+		&& $object_id && $_POST[ 'object_id' ] == $object_id
297 297
 	) {
298 298
 		$cmb->save_fields( $object_id, $cmb->object_type(), $_POST );
299 299
 	}
300 300
 
301 301
 	// Enqueue JS/CSS
302
-	if ( $args['cmb_styles'] ) {
302
+	if ( $args[ 'cmb_styles' ] ) {
303 303
 		CMB2_hookup::enqueue_cmb_css();
304 304
 	}
305 305
 
306
-	if ( $args['enqueue_js'] ) {
306
+	if ( $args[ 'enqueue_js' ] ) {
307 307
 		CMB2_hookup::enqueue_cmb_js();
308 308
 	}
309 309
 
310
-	$form_format = apply_filters( 'cmb2_get_metabox_form_format', $args['form_format'], $object_id, $cmb );
310
+	$form_format = apply_filters( 'cmb2_get_metabox_form_format', $args[ 'form_format' ], $object_id, $cmb );
311 311
 
312 312
 	$format_parts = explode( '%3$s', $form_format );
313 313
 
314 314
 	// Show cmb form
315
-	printf( $format_parts[0], $cmb->cmb_id, $object_id );
315
+	printf( $format_parts[ 0 ], $cmb->cmb_id, $object_id );
316 316
 	$cmb->show_form();
317 317
 
318
-	if ( isset( $format_parts[1] ) && $format_parts[1] ) {
319
-		printf( str_ireplace( '%4$s', '%1$s', $format_parts[1] ), $args['save_button'] );
318
+	if ( isset( $format_parts[ 1 ] ) && $format_parts[ 1 ] ) {
319
+		printf( str_ireplace( '%4$s', '%1$s', $format_parts[ 1 ] ), $args[ 'save_button' ] );
320 320
 	}
321 321
 
322 322
 }
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
  * @param  array   $args      Optional arguments array
330 330
  */
331 331
 function cmb2_metabox_form( $meta_box, $object_id = 0, $args = array() ) {
332
-	if ( ! isset( $args['echo'] ) || $args['echo'] ) {
332
+	if ( ! isset( $args[ 'echo' ] ) || $args[ 'echo' ] ) {
333 333
 		cmb2_print_metabox_form( $meta_box, $object_id, $args );
334 334
 	} else {
335 335
 		return cmb2_get_metabox_form( $meta_box, $object_id, $args );
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
 
352 352
 		$schedule_format = str_replace(
353 353
 			array( 'M', 'Y', 'm', 'd', 'H', 'i', 'a' ),
354
-			array('%b', '%Y', '%m', '%d', '%H', '%M', '%p' ),
354
+			array( '%b', '%Y', '%m', '%d', '%H', '%M', '%p' ),
355 355
 			$date_format
356 356
 		);
357 357
 
@@ -368,14 +368,14 @@  discard block
 block discarded – undo
368 368
 			 * 4 or 2 characters, as needed
369 369
 			 */
370 370
 			'%04d-%02d-%02d %02d:%02d:%02d',
371
-			$parsed_time['tm_year'] + 1900,  // This will be "111", so we need to add 1900.
372
-			$parsed_time['tm_mon'] + 1,      // This will be the month minus one, so we add one.
373
-			$parsed_time['tm_mday'],
374
-			$parsed_time['tm_hour'],
375
-			$parsed_time['tm_min'],
376
-			$parsed_time['tm_sec']
371
+			$parsed_time[ 'tm_year' ] + 1900, // This will be "111", so we need to add 1900.
372
+			$parsed_time[ 'tm_mon' ] + 1, // This will be the month minus one, so we add one.
373
+			$parsed_time[ 'tm_mday' ],
374
+			$parsed_time[ 'tm_hour' ],
375
+			$parsed_time[ 'tm_min' ],
376
+			$parsed_time[ 'tm_sec' ]
377 377
 		);
378 378
 
379
-		return new DateTime($ymd);
379
+		return new DateTime( $ymd );
380 380
 	}
381 381
 }
Please login to merge, or discard this patch.
includes/CMB2_Types.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -170,11 +170,11 @@  discard block
 block discarded – undo
170 170
 
171 171
 		$message = array( sprintf( __( '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
 			? __( 'That field type may not work as expected.', 'cmb2' )
175 175
 			: __( 'That field type will not work as expected.', 'cmb2' );
176 176
 
177
-		$message[] = __( 'See: https://github.com/mustardBees/cmb-field-select2/pull/34w for more information about this change.', 'cmb2' );
177
+		$message[ ] = __( 'See: https://github.com/mustardBees/cmb-field-select2/pull/34w for more information about this change.', 'cmb2' );
178 178
 
179 179
 		_doing_it_wrong( __CLASS__ . '::' . $method, implode( ' ', $message ), '2.2.2' );
180 180
 	}
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
 	 * @return string               String of attributes for form element
219 219
 	 */
220 220
 	public function concat_attrs( $attrs, $attr_exclude = array() ) {
221
-		$attr_exclude[] = 'rendered';
221
+		$attr_exclude[ ] = 'rendered';
222 222
 		$attributes = '';
223 223
 		foreach ( $attrs as $attr => $val ) {
224 224
 			$excluded = in_array( $attr, (array) $attr_exclude, true );
@@ -405,8 +405,8 @@  discard block
 block discarded – undo
405 405
 			'class' => 'cmb2-hidden',
406 406
 		);
407 407
 		if ( $this->field->group ) {
408
-			$args['data-groupid'] = $this->field->group->id();
409
-			$args['data-iterator'] = $this->iterator;
408
+			$args[ 'data-groupid' ] = $this->field->group->id();
409
+			$args[ 'data-iterator' ] = $this->iterator;
410 410
 		}
411 411
 		return $this->input( $args );
412 412
 	}
Please login to merge, or discard this patch.
includes/CMB2.php 1 patch
Spacing   +67 added lines, -67 removed lines patch added patch discarded remove patch
@@ -104,19 +104,19 @@  discard block
 block discarded – undo
104 104
 	 */
105 105
 	public function __construct( $config, $object_id = 0 ) {
106 106
 
107
-		if ( empty( $config['id'] ) ) {
107
+		if ( empty( $config[ 'id' ] ) ) {
108 108
 			wp_die( __( 'Metabox configuration is required to have an ID parameter', 'cmb2' ) );
109 109
 		}
110 110
 
111 111
 		$this->meta_box = wp_parse_args( $config, $this->mb_defaults );
112
-		$this->meta_box['fields'] = array();
112
+		$this->meta_box[ 'fields' ] = array();
113 113
 
114 114
 		$this->object_id( $object_id );
115 115
 		$this->mb_object_type();
116
-		$this->cmb_id = $config['id'];
116
+		$this->cmb_id = $config[ 'id' ];
117 117
 
118
-		if ( ! empty( $config['fields'] ) && is_array( $config['fields'] ) ) {
119
-			$this->add_fields( $config['fields'] );
118
+		if ( ! empty( $config[ 'fields' ] ) && is_array( $config[ 'fields' ] ) ) {
119
+			$this->add_fields( $config[ 'fields' ] );
120 120
 		}
121 121
 
122 122
 		CMB2_Boxes::add( $this );
@@ -285,22 +285,22 @@  discard block
 block discarded – undo
285 285
 	 * @return mixed CMB2_Field object if successful.
286 286
 	 */
287 287
 	public function render_field( $field_args ) {
288
-		$field_args['context'] = $this->prop( 'context' );
288
+		$field_args[ 'context' ] = $this->prop( 'context' );
289 289
 
290
-		if ( 'group' == $field_args['type'] ) {
290
+		if ( 'group' == $field_args[ 'type' ] ) {
291 291
 
292
-			if ( ! isset( $field_args['show_names'] ) ) {
293
-				$field_args['show_names'] = $this->prop( 'show_names' );
292
+			if ( ! isset( $field_args[ 'show_names' ] ) ) {
293
+				$field_args[ 'show_names' ] = $this->prop( 'show_names' );
294 294
 			}
295 295
 			$field = $this->render_group( $field_args );
296 296
 
297
-		} elseif ( 'hidden' == $field_args['type'] && $this->get_field( $field_args )->should_show() ) {
297
+		} elseif ( 'hidden' == $field_args[ 'type' ] && $this->get_field( $field_args )->should_show() ) {
298 298
 			// Save rendering for after the metabox
299 299
 			$field = $this->add_hidden_field( $field_args );
300 300
 
301 301
 		} else {
302 302
 
303
-			$field_args['show_names'] = $this->prop( 'show_names' );
303
+			$field_args[ 'show_names' ] = $this->prop( 'show_names' );
304 304
 
305 305
 			// Render default fields
306 306
 			$field = $this->get_field( $field_args )->render_field();
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 	 */
317 317
 	public function render_group( $args ) {
318 318
 
319
-		if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) {
319
+		if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) {
320 320
 			return;
321 321
 		}
322 322
 
@@ -398,15 +398,15 @@  discard block
 block discarded – undo
398 398
 			<div class="inside cmb-td cmb-nested cmb-field-list">';
399 399
 				// Loop and render repeatable group fields
400 400
 				foreach ( array_values( $field_group->args( 'fields' ) ) as $field_args ) {
401
-					if ( 'hidden' == $field_args['type'] ) {
401
+					if ( 'hidden' == $field_args[ 'type' ] ) {
402 402
 
403 403
 						// Save rendering for after the metabox
404 404
 						$this->add_hidden_field( $field_args, $field_group );
405 405
 
406 406
 					} else {
407 407
 
408
-						$field_args['show_names'] = $field_group->args( 'show_names' );
409
-						$field_args['context']    = $field_group->args( 'context' );
408
+						$field_args[ 'show_names' ] = $field_group->args( 'show_names' );
409
+						$field_args[ 'context' ]    = $field_group->args( 'context' );
410 410
 
411 411
 						$field = $this->get_field( $field_args, $field_group )->render_field();
412 412
 					}
@@ -434,7 +434,7 @@  discard block
 block discarded – undo
434 434
 	 * @param array  $field_args Array of field arguments to be passed to CMB2_Field
435 435
 	 */
436 436
 	public function add_hidden_field( $field_args, $field_group = null ) {
437
-		if ( isset( $field_args['field_args'] ) ) {
437
+		if ( isset( $field_args[ 'field_args' ] ) ) {
438 438
 			// For back-compatibility.
439 439
 			$field = new CMB2_Field( $field_args );
440 440
 		} else {
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
 			$type->iterator = $field_group->index;
448 448
 		}
449 449
 
450
-		$this->hidden_fields[] = $type;
450
+		$this->hidden_fields[ ] = $type;
451 451
 
452 452
 		return $field;
453 453
 	}
@@ -544,11 +544,11 @@  discard block
 block discarded – undo
544 544
 	 */
545 545
 	public function process_field( $field_args ) {
546 546
 
547
-		switch ( $field_args['type'] ) {
547
+		switch ( $field_args[ 'type' ] ) {
548 548
 
549 549
 			case 'group':
550 550
 				if ( $this->save_group( $field_args ) ) {
551
-					$this->updated[] = $field_args['id'];
551
+					$this->updated[ ] = $field_args[ 'id' ];
552 552
 				}
553 553
 
554 554
 				break;
@@ -562,7 +562,7 @@  discard block
 block discarded – undo
562 562
 				$field = $this->get_new_field( $field_args );
563 563
 
564 564
 				if ( $field->save_field_from_data( $this->data_to_save ) ) {
565
-					$this->updated[] = $field->id();
565
+					$this->updated[ ] = $field->id();
566 566
 				}
567 567
 
568 568
 				break;
@@ -629,7 +629,7 @@  discard block
 block discarded – undo
629 629
 	 * @return mixed        Return of CMB2_Field::update_data()
630 630
 	 */
631 631
 	public function save_group( $args ) {
632
-		if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) {
632
+		if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) {
633 633
 			return;
634 634
 		}
635 635
 
@@ -677,16 +677,16 @@  discard block
 block discarded – undo
677 677
 						$_new_val = array();
678 678
 						foreach ( $new_val as $group_index => $grouped_data ) {
679 679
 							// Add the supporting data to the $saved array stack
680
-							$saved[ $field_group->index ][ $grouped_data['supporting_field_id'] ][] = $grouped_data['supporting_field_value'];
680
+							$saved[ $field_group->index ][ $grouped_data[ 'supporting_field_id' ] ][ ] = $grouped_data[ 'supporting_field_value' ];
681 681
 							// Reset var to the actual value
682
-							$_new_val[ $group_index ] = $grouped_data['value'];
682
+							$_new_val[ $group_index ] = $grouped_data[ 'value' ];
683 683
 						}
684 684
 						$new_val = $_new_val;
685 685
 					} else {
686 686
 						// Add the supporting data to the $saved array stack
687
-						$saved[ $field_group->index ][ $new_val['supporting_field_id'] ] = $new_val['supporting_field_value'];
687
+						$saved[ $field_group->index ][ $new_val[ 'supporting_field_id' ] ] = $new_val[ 'supporting_field_value' ];
688 688
 						// Reset var to the actual value
689
-						$new_val = $new_val['value'];
689
+						$new_val = $new_val[ 'value' ];
690 690
 					}
691 691
 				}
692 692
 
@@ -700,7 +700,7 @@  discard block
 block discarded – undo
700 700
 
701 701
 				// Compare values and add to `$updated` array
702 702
 				if ( $is_updated || $is_removed ) {
703
-					$this->updated[] = $base_id . '::' . $field_group->index . '::' . $sub_id;
703
+					$this->updated[ ] = $base_id . '::' . $field_group->index . '::' . $sub_id;
704 704
 				}
705 705
 
706 706
 				// Add to `$saved` array
@@ -737,22 +737,22 @@  discard block
 block discarded – undo
737 737
 		// Try to get our object ID from the global space
738 738
 		switch ( $this->object_type() ) {
739 739
 			case 'user':
740
-				$object_id = isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id;
741
-				$object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS['user_ID'] ) ? $GLOBALS['user_ID'] : $object_id;
740
+				$object_id = isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id;
741
+				$object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS[ 'user_ID' ] ) ? $GLOBALS[ 'user_ID' ] : $object_id;
742 742
 				break;
743 743
 
744 744
 			case 'comment':
745
-				$object_id = isset( $_REQUEST['c'] ) ? $_REQUEST['c'] : $object_id;
746
-				$object_id = ! $object_id && isset( $GLOBALS['comments']->comment_ID ) ? $GLOBALS['comments']->comment_ID : $object_id;
745
+				$object_id = isset( $_REQUEST[ 'c' ] ) ? $_REQUEST[ 'c' ] : $object_id;
746
+				$object_id = ! $object_id && isset( $GLOBALS[ 'comments' ]->comment_ID ) ? $GLOBALS[ 'comments' ]->comment_ID : $object_id;
747 747
 				break;
748 748
 
749 749
 			case 'term':
750
-				$object_id = isset( $_REQUEST['tag_ID'] ) ? $_REQUEST['tag_ID'] : $object_id;
750
+				$object_id = isset( $_REQUEST[ 'tag_ID' ] ) ? $_REQUEST[ 'tag_ID' ] : $object_id;
751 751
 				break;
752 752
 
753 753
 			default:
754
-				$object_id = isset( $GLOBALS['post']->ID ) ? $GLOBALS['post']->ID : $object_id;
755
-				$object_id = isset( $_REQUEST['post'] ) ? $_REQUEST['post'] : $object_id;
754
+				$object_id = isset( $GLOBALS[ 'post' ]->ID ) ? $GLOBALS[ 'post' ]->ID : $object_id;
755
+				$object_id = isset( $_REQUEST[ 'post' ] ) ? $_REQUEST[ 'post' ] : $object_id;
756 756
 				break;
757 757
 		}
758 758
 
@@ -828,7 +828,7 @@  discard block
 block discarded – undo
828 828
 	 * @return boolean True/False
829 829
 	 */
830 830
 	public function is_options_page_mb() {
831
-		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'] ) );
831
+		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' ] ) );
832 832
 	}
833 833
 
834 834
 	/**
@@ -915,7 +915,7 @@  discard block
 block discarded – undo
915 915
 			return $field;
916 916
 		}
917 917
 
918
-		$field_id = is_string( $field ) ? $field : $field['id'];
918
+		$field_id = is_string( $field ) ? $field : $field[ 'id' ];
919 919
 
920 920
 		$parent_field_id = ! empty( $field_group ) ? $field_group->id() : '';
921 921
 		$ids = $this->get_field_ids( $field_id, $parent_field_id, true );
@@ -951,16 +951,16 @@  discard block
 block discarded – undo
951 951
 		if ( $field_group && ( $sub_field_id || 0 === $sub_field_id ) ) {
952 952
 
953 953
 			// Update the fields array w/ any modified properties inherited from the group field
954
-			$this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] = $field_args;
954
+			$this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] = $field_args;
955 955
 
956 956
 			return $this->get_default_args( $field_args, $field_group );
957 957
 		}
958 958
 
959 959
 		if ( is_array( $field_args ) ) {
960
-			$this->meta_box['fields'][ $field_id ] = array_merge( $field_args, $this->meta_box['fields'][ $field_id ] );
960
+			$this->meta_box[ 'fields' ][ $field_id ] = array_merge( $field_args, $this->meta_box[ 'fields' ][ $field_id ] );
961 961
 		}
962 962
 
963
-		return $this->get_default_args( $this->meta_box['fields'][ $field_id ] );
963
+		return $this->get_default_args( $this->meta_box[ 'fields' ][ $field_id ] );
964 964
 	}
965 965
 
966 966
 	/**
@@ -1010,8 +1010,8 @@  discard block
 block discarded – undo
1010 1010
 
1011 1011
 			$sub_fields = false;
1012 1012
 			if ( array_key_exists( 'fields', $field ) ) {
1013
-				$sub_fields = $field['fields'];
1014
-				unset( $field['fields'] );
1013
+				$sub_fields = $field[ 'fields' ];
1014
+				unset( $field[ 'fields' ] );
1015 1015
 			}
1016 1016
 
1017 1017
 			$field_id = $parent_field_id
@@ -1036,29 +1036,29 @@  discard block
 block discarded – undo
1036 1036
 			return false;
1037 1037
 		}
1038 1038
 
1039
-		if ( 'oembed' === $field['type'] ) {
1039
+		if ( 'oembed' === $field[ 'type' ] ) {
1040 1040
 			// Initiate oembed Ajax hooks
1041 1041
 			cmb2_ajax();
1042 1042
 		}
1043 1043
 
1044
-		if ( isset( $field['column'] ) && false !== $field['column'] ) {
1044
+		if ( isset( $field[ 'column' ] ) && false !== $field[ 'column' ] ) {
1045 1045
 			$this->has_columns = true;
1046 1046
 
1047
-			$column = is_array( $field['column'] ) ? $field['column'] : array();
1047
+			$column = is_array( $field[ 'column' ] ) ? $field[ 'column' ] : array();
1048 1048
 
1049
-			$field['column'] = wp_parse_args( $column, array(
1050
-				'name'     => isset( $field['name'] ) ? $field['name'] : '',
1049
+			$field[ 'column' ] = wp_parse_args( $column, array(
1050
+				'name'     => isset( $field[ 'name' ] ) ? $field[ 'name' ] : '',
1051 1051
 				'position' => false,
1052 1052
 			) );
1053 1053
 		}
1054 1054
 
1055 1055
 		$this->_add_field_to_array(
1056 1056
 			$field,
1057
-			$this->meta_box['fields'],
1057
+			$this->meta_box[ 'fields' ],
1058 1058
 			$position
1059 1059
 		);
1060 1060
 
1061
-		return $field['id'];
1061
+		return $field[ 'id' ];
1062 1062
 	}
1063 1063
 
1064 1064
 	/**
@@ -1070,27 +1070,27 @@  discard block
 block discarded – undo
1070 1070
 	 * @return mixed                   Array of parent/field ids or false
1071 1071
 	 */
1072 1072
 	public function add_group_field( $parent_field_id, array $field, $position = 0 ) {
1073
-		if ( ! array_key_exists( $parent_field_id, $this->meta_box['fields'] ) ) {
1073
+		if ( ! array_key_exists( $parent_field_id, $this->meta_box[ 'fields' ] ) ) {
1074 1074
 			return false;
1075 1075
 		}
1076 1076
 
1077
-		$parent_field = $this->meta_box['fields'][ $parent_field_id ];
1077
+		$parent_field = $this->meta_box[ 'fields' ][ $parent_field_id ];
1078 1078
 
1079
-		if ( 'group' !== $parent_field['type'] ) {
1079
+		if ( 'group' !== $parent_field[ 'type' ] ) {
1080 1080
 			return false;
1081 1081
 		}
1082 1082
 
1083
-		if ( ! isset( $parent_field['fields'] ) ) {
1084
-			$this->meta_box['fields'][ $parent_field_id ]['fields'] = array();
1083
+		if ( ! isset( $parent_field[ 'fields' ] ) ) {
1084
+			$this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ] = array();
1085 1085
 		}
1086 1086
 
1087 1087
 		$this->_add_field_to_array(
1088 1088
 			$field,
1089
-			$this->meta_box['fields'][ $parent_field_id ]['fields'],
1089
+			$this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ],
1090 1090
 			$position
1091 1091
 		);
1092 1092
 
1093
-		return array( $parent_field_id, $field['id'] );
1093
+		return array( $parent_field_id, $field[ 'id' ] );
1094 1094
 	}
1095 1095
 
1096 1096
 	/**
@@ -1102,9 +1102,9 @@  discard block
 block discarded – undo
1102 1102
 	 */
1103 1103
 	protected function _add_field_to_array( $field, &$fields, $position = 0 ) {
1104 1104
 		if ( $position ) {
1105
-			cmb2_utils()->array_insert( $fields, array( $field['id'] => $field ), $position );
1105
+			cmb2_utils()->array_insert( $fields, array( $field[ 'id' ] => $field ), $position );
1106 1106
 		} else {
1107
-			$fields[ $field['id'] ] = $field;
1107
+			$fields[ $field[ 'id' ] ] = $field;
1108 1108
 		}
1109 1109
 	}
1110 1110
 
@@ -1127,15 +1127,15 @@  discard block
 block discarded – undo
1127 1127
 		unset( $this->fields[ implode( '', $ids ) ] );
1128 1128
 
1129 1129
 		if ( ! $sub_field_id ) {
1130
-			unset( $this->meta_box['fields'][ $field_id ] );
1130
+			unset( $this->meta_box[ 'fields' ][ $field_id ] );
1131 1131
 			return true;
1132 1132
 		}
1133 1133
 
1134
-		if ( isset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] ) ) {
1135
-			unset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] );
1134
+		if ( isset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] ) ) {
1135
+			unset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] );
1136 1136
 		}
1137
-		if ( isset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] ) ) {
1138
-			unset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] );
1137
+		if ( isset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] ) ) {
1138
+			unset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] );
1139 1139
 		}
1140 1140
 		return true;
1141 1141
 	}
@@ -1159,11 +1159,11 @@  discard block
 block discarded – undo
1159 1159
 		list( $field_id, $sub_field_id ) = $ids;
1160 1160
 
1161 1161
 		if ( ! $sub_field_id ) {
1162
-			$this->meta_box['fields'][ $field_id ][ $property ] = $value;
1162
+			$this->meta_box[ 'fields' ][ $field_id ][ $property ] = $value;
1163 1163
 			return $field_id;
1164 1164
 		}
1165 1165
 
1166
-		$this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ][ $property ] = $value;
1166
+		$this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ][ $property ] = $value;
1167 1167
 		return $field_id;
1168 1168
 	}
1169 1169
 
@@ -1177,7 +1177,7 @@  discard block
 block discarded – undo
1177 1177
 	public function get_field_ids( $field_id, $parent_field_id = '' ) {
1178 1178
 		$sub_field_id = $parent_field_id ? $field_id : '';
1179 1179
 		$field_id     = $parent_field_id ? $parent_field_id : $field_id;
1180
-		$fields       =& $this->meta_box['fields'];
1180
+		$fields       = & $this->meta_box[ 'fields' ];
1181 1181
 
1182 1182
 		if ( ! array_key_exists( $field_id, $fields ) ) {
1183 1183
 			$field_id = $this->search_old_school_array( $field_id, $fields );
@@ -1191,12 +1191,12 @@  discard block
 block discarded – undo
1191 1191
 			return array( $field_id, $sub_field_id );
1192 1192
 		}
1193 1193
 
1194
-		if ( 'group' !== $fields[ $field_id ]['type'] ) {
1194
+		if ( 'group' !== $fields[ $field_id ][ 'type' ] ) {
1195 1195
 			return false;
1196 1196
 		}
1197 1197
 
1198
-		if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ]['fields'] ) ) {
1199
-			$sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ]['fields'] );
1198
+		if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ][ 'fields' ] ) ) {
1199
+			$sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ][ 'fields' ] );
1200 1200
 		}
1201 1201
 
1202 1202
 		return false === $sub_field_id ? false : array( $field_id, $sub_field_id );
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.