Completed
Push — trunk ( 5dfd19...835891 )
by Justin
07:26
created
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/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_hookup.php 1 patch
Spacing   +16 added lines, -16 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 );
@@ -616,7 +616,7 @@  discard block
 block discarded – undo
616 616
 			return;
617 617
 		}
618 618
 
619
-		self::$hooks_completed[] = $key;
619
+		self::$hooks_completed[ ] = $key;
620 620
 		add_filter( $action, $hook, $priority, $accepted_args );
621 621
 	}
622 622
 
Please login to merge, or discard this patch.