Completed
Pull Request — trunk (#838)
by Andrew
06:40
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/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,18 +86,18 @@  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 93
 	$error = sprintf(
94 94
 		/* translators: 1: results for. 2: link to codex.wordpress.org/Embeds */
95 95
 		esc_html__( 'No oEmbed Results Found for %1$s. View more info at %2$s.', 'cmb2' ),
96
-		$oembed['fallback'],
96
+		$oembed[ 'fallback' ],
97 97
 		'<a href="https://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>'
98 98
 	);
99 99
 
100
-	if ( isset( $args['wp_error'] ) && $args['wp_error'] ) {
100
+	if ( isset( $args[ 'wp_error' ] ) && $args[ 'wp_error' ] ) {
101 101
 		return new WP_Error( 'cmb2_get_oembed_result', $wp_error, compact( 'oembed', 'args' ) );
102 102
 	}
103 103
 
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 		$cmb = CMB2_Boxes::get( $meta_box );
213 213
 	} else {
214 214
 		// See if we already have an instance of this metabox
215
-		$cmb = CMB2_Boxes::get( $meta_box['id'] );
215
+		$cmb = CMB2_Boxes::get( $meta_box[ 'id' ] );
216 216
 		// If not, we'll initate a new metabox
217 217
 		$cmb = $cmb ? $cmb : new CMB2( $meta_box, $object_id );
218 218
 	}
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
 	) );
289 289
 
290 290
 	// Set object type explicitly (rather than trying to guess from context)
291
-	$cmb->object_type( $args['object_type'] );
291
+	$cmb->object_type( $args[ 'object_type' ] );
292 292
 
293 293
 	// Save the metabox if it's been submitted
294 294
 	// check permissions
@@ -296,32 +296,32 @@  discard block
 block discarded – undo
296 296
 	if (
297 297
 		$cmb->prop( 'save_fields' )
298 298
 		// check nonce
299
-		&& isset( $_POST['submit-cmb'], $_POST['object_id'], $_POST[ $cmb->nonce() ] )
299
+		&& isset( $_POST[ 'submit-cmb' ], $_POST[ 'object_id' ], $_POST[ $cmb->nonce() ] )
300 300
 		&& wp_verify_nonce( $_POST[ $cmb->nonce() ], $cmb->nonce() )
301
-		&& $object_id && $_POST['object_id'] == $object_id
301
+		&& $object_id && $_POST[ 'object_id' ] == $object_id
302 302
 	) {
303 303
 		$cmb->save_fields( $object_id, $cmb->object_type(), $_POST );
304 304
 	}
305 305
 
306 306
 	// Enqueue JS/CSS
307
-	if ( $args['cmb_styles'] ) {
307
+	if ( $args[ 'cmb_styles' ] ) {
308 308
 		CMB2_hookup::enqueue_cmb_css();
309 309
 	}
310 310
 
311
-	if ( $args['enqueue_js'] ) {
311
+	if ( $args[ 'enqueue_js' ] ) {
312 312
 		CMB2_hookup::enqueue_cmb_js();
313 313
 	}
314 314
 
315
-	$form_format = apply_filters( 'cmb2_get_metabox_form_format', $args['form_format'], $object_id, $cmb );
315
+	$form_format = apply_filters( 'cmb2_get_metabox_form_format', $args[ 'form_format' ], $object_id, $cmb );
316 316
 
317 317
 	$format_parts = explode( '%3$s', $form_format );
318 318
 
319 319
 	// Show cmb form
320
-	printf( $format_parts[0], $cmb->cmb_id, $object_id );
320
+	printf( $format_parts[ 0 ], $cmb->cmb_id, $object_id );
321 321
 	$cmb->show_form();
322 322
 
323
-	if ( isset( $format_parts[1] ) && $format_parts[1] ) {
324
-		printf( str_ireplace( '%4$s', '%1$s', $format_parts[1] ), $args['save_button'] );
323
+	if ( isset( $format_parts[ 1 ] ) && $format_parts[ 1 ] ) {
324
+		printf( str_ireplace( '%4$s', '%1$s', $format_parts[ 1 ] ), $args[ 'save_button' ] );
325 325
 	}
326 326
 
327 327
 }
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
  * @param  array   $args      Optional arguments array
335 335
  */
336 336
 function cmb2_metabox_form( $meta_box, $object_id = 0, $args = array() ) {
337
-	if ( ! isset( $args['echo'] ) || $args['echo'] ) {
337
+	if ( ! isset( $args[ 'echo' ] ) || $args[ 'echo' ] ) {
338 338
 		cmb2_print_metabox_form( $meta_box, $object_id, $args );
339 339
 	} else {
340 340
 		return cmb2_get_metabox_form( $meta_box, $object_id, $args );
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
 
357 357
 		$schedule_format = str_replace(
358 358
 			array( 'M', 'Y', 'm', 'd', 'H', 'i', 'a' ),
359
-			array('%b', '%Y', '%m', '%d', '%H', '%M', '%p' ),
359
+			array( '%b', '%Y', '%m', '%d', '%H', '%M', '%p' ),
360 360
 			$date_format
361 361
 		);
362 362
 
@@ -373,14 +373,14 @@  discard block
 block discarded – undo
373 373
 			 * 4 or 2 characters, as needed
374 374
 			 */
375 375
 			'%04d-%02d-%02d %02d:%02d:%02d',
376
-			$parsed_time['tm_year'] + 1900,  // This will be "111", so we need to add 1900.
377
-			$parsed_time['tm_mon'] + 1,      // This will be the month minus one, so we add one.
378
-			$parsed_time['tm_mday'],
379
-			$parsed_time['tm_hour'],
380
-			$parsed_time['tm_min'],
381
-			$parsed_time['tm_sec']
376
+			$parsed_time[ 'tm_year' ] + 1900, // This will be "111", so we need to add 1900.
377
+			$parsed_time[ 'tm_mon' ] + 1, // This will be the month minus one, so we add one.
378
+			$parsed_time[ 'tm_mday' ],
379
+			$parsed_time[ 'tm_hour' ],
380
+			$parsed_time[ 'tm_min' ],
381
+			$parsed_time[ 'tm_sec' ]
382 382
 		);
383 383
 
384
-		return new DateTime($ymd);
384
+		return new DateTime( $ymd );
385 385
 	}
386 386
 }
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,8 +169,8 @@  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'] . '">' . esc_html__( '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' ] . '">' . esc_html__( 'Remove Embed', 'cmb2' ) . '</a></p></div>';
174 174
 		}
175 175
 
176 176
 		// Otherwise, send back error info that no oEmbeds were found
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 			sprintf(
180 180
 				/* translators: 1: results for. 2: link to codex.wordpress.org/Embeds */
181 181
 				esc_html__( 'No oEmbed Results Found for %1$s. View more info at %2$s.', 'cmb2' ),
182
-				$oembed['fallback'],
182
+				$oembed[ 'fallback' ],
183 183
 				'<a href="https://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>'
184 184
 			)
185 185
 		);
@@ -244,15 +244,15 @@  discard block
 block discarded – undo
244 244
 	 */
245 245
 	protected function cache_action( $meta_key ) {
246 246
 		$func_args = func_get_args();
247
-		$action    = isset( $func_args[1] ) ? 'update' : 'get';
247
+		$action    = isset( $func_args[ 1 ] ) ? 'update' : 'get';
248 248
 
249 249
 		if ( 'options-page' === $this->object_type ) {
250 250
 
251 251
 			$args = array( $meta_key );
252 252
 
253 253
 			if ( 'update' === $action ) {
254
-				$args[] = $func_args[1];
255
-				$args[] = true;
254
+				$args[ ] = $func_args[ 1 ];
255
+				$args[ ] = true;
256 256
 			}
257 257
 
258 258
 			// Cache the result to our options
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 		} else {
261 261
 
262 262
 			$args = array( $this->object_type, $this->object_id, $meta_key );
263
-			$args[] = 'update' === $action ? $func_args : true;
263
+			$args[ ] = 'update' === $action ? $func_args : true;
264 264
 
265 265
 			// Cache the result to our metadata
266 266
 			$status = call_user_func_array( $action . '_metadata', $args );
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   +4 added lines, -4 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,7 +52,7 @@  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
 
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 		$group_id = $this->field->group->id();
61 61
 		$field_id = $this->field->id( true );
62 62
 		$options  = $this->field->options();
63
-		$options['textarea_name'] = 'cmb2_n_' . $group_id . $field_id;
63
+		$options[ 'textarea_name' ] = 'cmb2_n_' . $group_id . $field_id;
64 64
 
65 65
 		// Initate the editor with special id/value/name so we can retrieve the options in JS.
66 66
 		$editor = $this->get_wp_editor( array(
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 		// And put the editor instance in a JS template wrapper.
84 84
 		echo '<script type="text/template" id="tmpl-cmb2-wysiwyg-' . $group_id . '-' . $field_id . '">';
85 85
 		// Need to wrap the template in a wrapper div w/ specific data attributes which will be used when adding/removing rows.
86
-		echo '<div class="cmb2-wysiwyg-inner-wrap" data-iterator="{{ data.iterator }}" data-groupid="'. $group_id .'" data-id="'. $field_id .'">'. $editor .'</div>';
86
+		echo '<div class="cmb2-wysiwyg-inner-wrap" data-iterator="{{ data.iterator }}" data-groupid="' . $group_id . '" data-id="' . $field_id . '">' . $editor . '</div>';
87 87
 		echo '</script>';
88 88
 	}
89 89
 
Please login to merge, or discard this patch.
includes/types/CMB2_Type_Title.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,10 +28,10 @@
 block discarded – undo
28 28
 		return $this->rendered(
29 29
 			sprintf(
30 30
 				'<%1$s %2$s>%3$s</%1$s>%4$s',
31
-				$a['tag'],
31
+				$a[ 'tag' ],
32 32
 				$this->concat_attrs( $a, array( 'tag', 'name', 'desc' ) ),
33
-				$a['name'],
34
-				$a['desc']
33
+				$a[ 'name' ],
34
+				$a[ 'desc' ]
35 35
 			)
36 36
 		);
37 37
 	}
Please login to merge, or discard this patch.
includes/CMB2_Utils.php 2 patches
Spacing   +21 added lines, -22 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 		$dir = wp_upload_dir();
38 38
 
39 39
 		// Is URL in uploads directory?
40
-		if ( false === strpos( $img_url, $dir['baseurl'] . '/' ) ) {
40
+		if ( false === strpos( $img_url, $dir[ 'baseurl' ] . '/' ) ) {
41 41
 			return false;
42 42
 		}
43 43
 
@@ -62,8 +62,8 @@  discard block
 block discarded – undo
62 62
 
63 63
 			foreach ( $query->posts as $post_id ) {
64 64
 				$meta = wp_get_attachment_metadata( $post_id );
65
-				$original_file       = basename( $meta['file'] );
66
-				$cropped_image_files = isset( $meta['sizes'] ) ? wp_list_pluck( $meta['sizes'], 'file' ) : array();
65
+				$original_file       = basename( $meta[ 'file' ] );
66
+				$cropped_image_files = isset( $meta[ 'sizes' ] ) ? wp_list_pluck( $meta[ 'sizes' ], 'file' ) : array();
67 67
 				if ( $original_file === $file || in_array( $file, $cropped_image_files ) ) {
68 68
 					$attachment_id = $post_id;
69 69
 					break;
@@ -147,8 +147,7 @@  discard block
 block discarded – undo
147 147
 		}
148 148
 
149 149
 		return self::is_valid_time_stamp( $string )
150
-			? (int) $string :
151
-			strtotime( (string) $string );
150
+			? (int) $string : strtotime( (string) $string );
152 151
 	}
153 152
 
154 153
 	/**
@@ -179,7 +178,7 @@  discard block
 block discarded – undo
179 178
 	 * @param  mixed $value Value to check
180 179
 	 * @return bool         True or false
181 180
 	 */
182
-	public static function notempty( $value ){
181
+	public static function notempty( $value ) {
183 182
 		return null !== $value && '' !== $value && false !== $value;
184 183
 	}
185 184
 
@@ -337,24 +336,24 @@  discard block
 block discarded – undo
337 336
 
338 337
 		// order is relevant here, since the replacement will be done sequentially.
339 338
 		$supported_options = array(
340
-			'd' => 'dd',  // Day, leading 0
341
-			'j' => 'd',   // Day, no 0
342
-			'z' => 'o',   // Day of the year, no leading zeroes,
339
+			'd' => 'dd', // Day, leading 0
340
+			'j' => 'd', // Day, no 0
341
+			'z' => 'o', // Day of the year, no leading zeroes,
343 342
 			// 'D' => 'D',   // Day name short, not sure how it'll work with translations
344 343
 			// 'l' => 'DD',  // Day name full, idem before
345
-			'm' => 'mm',  // Month of the year, leading 0
346
-			'n' => 'm',   // Month of the year, no leading 0
344
+			'm' => 'mm', // Month of the year, leading 0
345
+			'n' => 'm', // Month of the year, no leading 0
347 346
 			// 'M' => 'M',   // Month, Short name
348 347
 			// 'F' => 'MM',  // Month, full name,
349
-			'y' => 'y',   // Year, two digit
350
-			'Y' => 'yy',  // Year, full
351
-			'H' => 'HH',  // Hour with leading 0 (24 hour)
352
-			'G' => 'H',   // Hour with no leading 0 (24 hour)
353
-			'h' => 'hh',  // Hour with leading 0 (12 hour)
354
-			'g' => 'h',   // Hour with no leading 0 (12 hour),
355
-			'i' => 'mm',  // Minute with leading 0,
356
-			's' => 'ss',  // Second with leading 0,
357
-			'a' => 'tt',  // am/pm
348
+			'y' => 'y', // Year, two digit
349
+			'Y' => 'yy', // Year, full
350
+			'H' => 'HH', // Hour with leading 0 (24 hour)
351
+			'G' => 'H', // Hour with no leading 0 (24 hour)
352
+			'h' => 'hh', // Hour with leading 0 (12 hour)
353
+			'g' => 'h', // Hour with no leading 0 (12 hour),
354
+			'i' => 'mm', // Minute with leading 0,
355
+			's' => 'ss', // Second with leading 0,
356
+			'a' => 'tt', // am/pm
358 357
 			'A' => 'TT'   // AM/PM
359 358
 		);
360 359
 
@@ -375,7 +374,7 @@  discard block
 block discarded – undo
375 374
 	 * @return string Modified value
376 375
 	 */
377 376
 	public static function wrap_escaped_chars( $value ) {
378
-		return "&#39;" . str_replace( '\\', '', $value[0] ) . "&#39;";
377
+		return "&#39;" . str_replace( '\\', '', $value[ 0 ] ) . "&#39;";
379 378
 	}
380 379
 
381 380
 	/**
@@ -435,7 +434,7 @@  discard block
 block discarded – undo
435 434
 	 * @return string               String of attributes for form element.
436 435
 	 */
437 436
 	public static function concat_attrs( $attrs, $attr_exclude = array() ) {
438
-		$attr_exclude[] = 'rendered';
437
+		$attr_exclude[ ] = 'rendered';
439 438
 		$attributes = '';
440 439
 		foreach ( $attrs as $attr => $val ) {
441 440
 			$excluded = in_array( $attr, (array) $attr_exclude, true );
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -122,7 +122,8 @@  discard block
 block discarded – undo
122 122
 			$tzstring = '';
123 123
 		}
124 124
 
125
-		if ( empty( $tzstring ) ) { // Create a UTC+- zone if no timezone string exists
125
+		if ( empty( $tzstring ) ) {
126
+// Create a UTC+- zone if no timezone string exists
126 127
 			if ( 0 == $current_offset ) {
127 128
 				$tzstring = 'UTC+0';
128 129
 			} elseif ( $current_offset < 0 ) {
@@ -179,7 +180,7 @@  discard block
 block discarded – undo
179 180
 	 * @param  mixed $value Value to check
180 181
 	 * @return bool         True or false
181 182
 	 */
182
-	public static function notempty( $value ){
183
+	public static function notempty( $value ) {
183 184
 		return null !== $value && '' !== $value && false !== $value;
184 185
 	}
185 186
 
Please login to merge, or discard this patch.
includes/types/CMB2_Type_File_Base.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -55,11 +55,11 @@  discard block
 block discarded – undo
55 55
 	 */
56 56
 	public function img_status_output( $args ) {
57 57
 		return sprintf( '<%1$s class="img-status">%2$s<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button"%3$s>%4$s</a></p>%5$s</%1$s>',
58
-			$args['tag'],
59
-			$args['image'],
60
-			isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '',
58
+			$args[ 'tag' ],
59
+			$args[ 'image' ],
60
+			isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '',
61 61
 			esc_html( $this->_text( 'remove_image_text', esc_html__( 'Remove Image', 'cmb2' ) ) ),
62
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
62
+			isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : ''
63 63
 		);
64 64
 	}
65 65
 
@@ -71,14 +71,14 @@  discard block
 block discarded – undo
71 71
 	 */
72 72
 	public function file_status_output( $args ) {
73 73
 		return sprintf( '<%1$s class="file-status"><span>%2$s <strong>%3$s</strong></span>&nbsp;&nbsp; (<a href="%4$s" target="_blank" rel="external">%5$s</a> / <a href="#" class="cmb2-remove-file-button"%6$s>%7$s</a>)%8$s</%1$s>',
74
-			$args['tag'],
74
+			$args[ 'tag' ],
75 75
 			esc_html( $this->_text( 'file_text', esc_html__( 'File:', 'cmb2' ) ) ),
76
-			CMB2_Utils::get_file_name_from_path( $args['value'] ),
77
-			$args['value'],
76
+			CMB2_Utils::get_file_name_from_path( $args[ 'value' ] ),
77
+			$args[ 'value' ],
78 78
 			esc_html( $this->_text( 'file_download_text', esc_html__( 'Download', 'cmb2' ) ) ),
79
-			isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '',
79
+			isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '',
80 80
 			esc_html( $this->_text( 'remove_text', esc_html__( 'Remove', 'cmb2' ) ) ),
81
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
81
+			isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : ''
82 82
 		);
83 83
 	}
84 84
 
Please login to merge, or discard this patch.