Completed
Pull Request — trunk (#541)
by Justin
05:57
created
includes/CMB2_JS.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -51,17 +51,17 @@
 block discarded – undo
51 51
 		$dependencies = apply_filters( 'cmb2_script_dependencies', self::$dependencies );
52 52
 
53 53
 		// if colorpicker
54
-		if ( ! is_admin() && isset( $dependencies['wp-color-picker'] ) ) {
54
+		if ( ! is_admin() && isset( $dependencies[ 'wp-color-picker' ] ) ) {
55 55
 			self::colorpicker_frontend();
56 56
 		}
57 57
 
58 58
 		// if file/file_list
59
-		if ( isset( $dependencies['media-editor'] ) ) {
59
+		if ( isset( $dependencies[ 'media-editor' ] ) ) {
60 60
 			wp_enqueue_media();
61 61
 		}
62 62
 
63 63
 		// if timepicker
64
-		if ( isset( $dependencies['jquery-ui-datetimepicker'] ) ) {
64
+		if ( isset( $dependencies[ 'jquery-ui-datetimepicker' ] ) ) {
65 65
 			wp_register_script( 'jquery-ui-datetimepicker', cmb2_utils()->url( 'js/jquery-ui-timepicker-addon.min.js' ), array( 'jquery-ui-slider' ), CMB2_VERSION );
66 66
 		}
67 67
 
Please login to merge, or discard this patch.
includes/CMB2_Options.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -131,7 +131,7 @@
 block discarded – undo
131 131
 
132 132
 			if ( ! $single ) {
133 133
 				// If multiple, add to array
134
-				$this->options[ $field_id ][] = $value;
134
+				$this->options[ $field_id ][ ] = $value;
135 135
 			} else {
136 136
 				$this->options[ $field_id ] = $value;
137 137
 			}
Please login to merge, or discard this patch.
includes/CMB2_Show_Filters.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -27,15 +27,15 @@  discard block
 block discarded – undo
27 27
 	 * @return mixed                show_on key or false
28 28
 	 */
29 29
 	private static function get_show_on_key( $meta_box_args ) {
30
-		$show_on = isset( $meta_box_args['show_on'] ) ? (array) $meta_box_args['show_on'] : false;
30
+		$show_on = isset( $meta_box_args[ 'show_on' ] ) ? (array) $meta_box_args[ 'show_on' ] : false;
31 31
 		if ( $show_on && is_array( $show_on ) ) {
32 32
 
33 33
 			if ( array_key_exists( 'key', $show_on ) ) {
34
-				return $show_on['key'];
34
+				return $show_on[ 'key' ];
35 35
 			}
36 36
 
37 37
 			$keys = array_keys( $show_on );
38
-			return $keys[0];
38
+			return $keys[ 0 ];
39 39
 		}
40 40
 
41 41
 		return false;
@@ -51,17 +51,17 @@  discard block
 block discarded – undo
51 51
 	 * @return mixed                show_on value or false
52 52
 	 */
53 53
 	private static function get_show_on_value( $meta_box_args ) {
54
-		$show_on = isset( $meta_box_args['show_on'] ) ? (array) $meta_box_args['show_on'] : false;
54
+		$show_on = isset( $meta_box_args[ 'show_on' ] ) ? (array) $meta_box_args[ 'show_on' ] : false;
55 55
 
56 56
 		if ( $show_on && is_array( $show_on ) ) {
57 57
 
58 58
 			if ( array_key_exists( 'value', $show_on ) ) {
59
-				return $show_on['value'];
59
+				return $show_on[ 'value' ];
60 60
 			}
61 61
 
62 62
 			$keys = array_keys( $show_on );
63 63
 
64
-			return $show_on[ $keys[0] ];
64
+			return $show_on[ $keys[ 0 ] ];
65 65
 		}
66 66
 
67 67
 		return array();
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 		if ( is_admin() ) {
142 142
 
143 143
 			// If there is no 'page' query var, our filter isn't applicable
144
-			if ( ! isset( $_GET['page'] ) ) {
144
+			if ( ! isset( $_GET[ 'page' ] ) ) {
145 145
 				return $display;
146 146
 			}
147 147
 
@@ -153,12 +153,12 @@  discard block
 block discarded – undo
153 153
 
154 154
 			if ( is_array( $show_on ) ) {
155 155
 				foreach ( $show_on as $page ) {
156
-					if ( $_GET['page'] == $page ) {
156
+					if ( $_GET[ 'page' ] == $page ) {
157 157
 						return true;
158 158
 					}
159 159
 				}
160 160
 			} else {
161
-				if ( $_GET['page'] == $show_on ) {
161
+				if ( $_GET[ 'page' ] == $show_on ) {
162 162
 					return true;
163 163
 				}
164 164
 			}
Please login to merge, or discard this patch.
includes/helper-functions.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 		$cmb = CMB2_Boxes::get( $meta_box );
179 179
 	} else {
180 180
 		// See if we already have an instance of this metabox
181
-		$cmb = CMB2_Boxes::get( $meta_box['id'] );
181
+		$cmb = CMB2_Boxes::get( $meta_box[ 'id' ] );
182 182
 		// If not, we'll initate a new metabox
183 183
 		$cmb = $cmb ? $cmb : new CMB2( $meta_box, $object_id );
184 184
 	}
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
 	) );
255 255
 
256 256
 	// Set object type explicitly (rather than trying to guess from context)
257
-	$cmb->object_type( $args['object_type'] );
257
+	$cmb->object_type( $args[ 'object_type' ] );
258 258
 
259 259
 	// Save the metabox if it's been submitted
260 260
 	// check permissions
@@ -262,32 +262,32 @@  discard block
 block discarded – undo
262 262
 	if (
263 263
 		$cmb->prop( 'save_fields' )
264 264
 		// check nonce
265
-		&& isset( $_POST['submit-cmb'], $_POST['object_id'], $_POST[ $cmb->nonce() ] )
265
+		&& isset( $_POST[ 'submit-cmb' ], $_POST[ 'object_id' ], $_POST[ $cmb->nonce() ] )
266 266
 		&& wp_verify_nonce( $_POST[ $cmb->nonce() ], $cmb->nonce() )
267
-		&& $object_id && $_POST['object_id'] == $object_id
267
+		&& $object_id && $_POST[ 'object_id' ] == $object_id
268 268
 	) {
269 269
 		$cmb->save_fields( $object_id, $cmb->object_type(), $_POST );
270 270
 	}
271 271
 
272 272
 	// Enqueue JS/CSS
273
-	if ( $args['cmb_styles'] ) {
273
+	if ( $args[ 'cmb_styles' ] ) {
274 274
 		CMB2_hookup::enqueue_cmb_css();
275 275
 	}
276 276
 
277
-	if ( $args['enqueue_js'] ) {
277
+	if ( $args[ 'enqueue_js' ] ) {
278 278
 		CMB2_hookup::enqueue_cmb_js();
279 279
 	}
280 280
 
281
-	$form_format = apply_filters( 'cmb2_get_metabox_form_format', $args['form_format'], $object_id, $cmb );
281
+	$form_format = apply_filters( 'cmb2_get_metabox_form_format', $args[ 'form_format' ], $object_id, $cmb );
282 282
 
283 283
 	$format_parts = explode( '%3$s', $form_format );
284 284
 
285 285
 	// Show cmb form
286
-	printf( $format_parts[0], $cmb->cmb_id, $object_id );
286
+	printf( $format_parts[ 0 ], $cmb->cmb_id, $object_id );
287 287
 	$cmb->show_form();
288 288
 
289
-	if ( isset( $format_parts[1] ) && $format_parts[1] ) {
290
-		printf( str_ireplace( '%4$s', '%1$s', $format_parts[1] ), $args['save_button'] );
289
+	if ( isset( $format_parts[ 1 ] ) && $format_parts[ 1 ] ) {
290
+		printf( str_ireplace( '%4$s', '%1$s', $format_parts[ 1 ] ), $args[ 'save_button' ] );
291 291
 	}
292 292
 
293 293
 }
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
  * @param  array   $args      Optional arguments array
301 301
  */
302 302
 function cmb2_metabox_form( $meta_box, $object_id = 0, $args = array() ) {
303
-	if ( ! isset( $args['echo'] ) || $args['echo'] ) {
303
+	if ( ! isset( $args[ 'echo' ] ) || $args[ 'echo' ] ) {
304 304
 		cmb2_print_metabox_form( $meta_box, $object_id, $args );
305 305
 	} else {
306 306
 		return cmb2_get_metabox_form( $meta_box, $object_id, $args );
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
 
323 323
 		$schedule_format = str_replace(
324 324
 			array( 'M', 'Y', 'm', 'd', 'H', 'i', 'a' ),
325
-			array('%b', '%Y', '%m', '%d', '%H', '%M', '%p' ),
325
+			array( '%b', '%Y', '%m', '%d', '%H', '%M', '%p' ),
326 326
 			$date_format
327 327
 		);
328 328
 
@@ -339,14 +339,14 @@  discard block
 block discarded – undo
339 339
 			 * 4 or 2 characters, as needed
340 340
 			 */
341 341
 			'%04d-%02d-%02d %02d:%02d:%02d',
342
-			$parsed_time['tm_year'] + 1900,  // This will be "111", so we need to add 1900.
343
-			$parsed_time['tm_mon'] + 1,      // This will be the month minus one, so we add one.
344
-			$parsed_time['tm_mday'],
345
-			$parsed_time['tm_hour'],
346
-			$parsed_time['tm_min'],
347
-			$parsed_time['tm_sec']
342
+			$parsed_time[ 'tm_year' ] + 1900, // This will be "111", so we need to add 1900.
343
+			$parsed_time[ 'tm_mon' ] + 1, // This will be the month minus one, so we add one.
344
+			$parsed_time[ 'tm_mday' ],
345
+			$parsed_time[ 'tm_hour' ],
346
+			$parsed_time[ 'tm_min' ],
347
+			$parsed_time[ 'tm_sec' ]
348 348
 		);
349 349
 
350
-		return new DateTime($ymd);
350
+		return new DateTime( $ymd );
351 351
 	}
352 352
 }
Please login to merge, or discard this patch.
example-functions.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 	$cmb_demo = new_cmb2_box( array(
79 79
 		'id'              => $prefix . 'metabox',
80 80
 		'title'           => __( 'Test Metabox', 'cmb2' ),
81
-		'object_types'    => array( 'page', ), // Post type
81
+		'object_types'    => array( 'page',), // Post type
82 82
 		// 'show_on_cb'   => 'yourprefix_show_if_front_page', // function should return a bool value
83 83
 		// 'context'      => 'normal',
84 84
 		// 'priority'     => 'high',
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
 		'desc'    => __( 'field description (optional)', 'cmb2' ),
323 323
 		'id'      => $prefix . 'wysiwyg',
324 324
 		'type'    => 'wysiwyg',
325
-		'options' => array( 'textarea_rows' => 5, ),
325
+		'options' => array( 'textarea_rows' => 5,),
326 326
 	) );
327 327
 
328 328
 	$cmb_demo->add_field( array(
@@ -374,11 +374,11 @@  discard block
 block discarded – undo
374 374
 	$cmb_about_page = new_cmb2_box( array(
375 375
 		'id'           => $prefix . 'metabox',
376 376
 		'title'        => __( 'About Page Metabox', 'cmb2' ),
377
-		'object_types' => array( 'page', ), // Post type
377
+		'object_types' => array( 'page',), // Post type
378 378
 		'context'      => 'normal',
379 379
 		'priority'     => 'high',
380 380
 		'show_names'   => true, // Show field names on the left
381
-		'show_on'      => array( 'id' => array( 2, ) ), // Specific post IDs to display this metabox
381
+		'show_on'      => array( 'id' => array( 2,) ), // Specific post IDs to display this metabox
382 382
 	) );
383 383
 
384 384
 	$cmb_about_page->add_field( array(
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
403 403
 	$cmb_group = new_cmb2_box( array(
404 404
 		'id'           => $prefix . 'metabox',
405 405
 		'title'        => __( 'Repeating Field Group', 'cmb2' ),
406
-		'object_types' => array( 'page', ),
406
+		'object_types' => array( 'page',),
407 407
 	) );
408 408
 
409 409
 	// $group_field_id is the field id string, so in this case: $prefix . 'demo'
Please login to merge, or discard this patch.
includes/CMB2_Hookup_Base.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@
 block discarded – undo
54 54
 			return;
55 55
 		}
56 56
 
57
-		self::$hooks_completed[] = $key;
57
+		self::$hooks_completed[ ] = $key;
58 58
 		add_filter( $action, $hook, $priority, $accepted_args );
59 59
 	}
60 60
 
Please login to merge, or discard this patch.
includes/CMB2_hookup.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 	 * @return array           Modified array of classes
258 258
 	 */
259 259
 	public function close_metabox_class( $classes ) {
260
-		$classes[] = 'closed';
260
+		$classes[ ] = 'closed';
261 261
 		return $classes;
262 262
 	}
263 263
 
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
 	public function user_new_metabox( $section ) {
278 278
 		if ( $section == $this->cmb->prop( 'new_user_section' ) ) {
279 279
 			$object_id = $this->cmb->object_id();
280
-			$this->cmb->object_id( isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id );
280
+			$this->cmb->object_id( isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id );
281 281
 			$this->user_metabox();
282 282
 		}
283 283
 	}
@@ -428,7 +428,7 @@  discard block
 block discarded – undo
428 428
 		if ( $this->taxonomy_can_save( $taxonomy ) ) {
429 429
 
430 430
 			foreach ( $this->cmb->prop( 'fields' ) as $field ) {
431
-				$data_to_delete[ $field['id'] ] = '';
431
+				$data_to_delete[ $field[ 'id' ] ] = '';
432 432
 			}
433 433
 
434 434
 			$this->cmb->save_fields( $term_id, 'term', $data_to_delete );
Please login to merge, or discard this patch.
includes/CMB2_REST.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -120,18 +120,18 @@  discard block
 block discarded – undo
120 120
 
121 121
 	protected function declare_read_write_fields() {
122 122
 		foreach ( $this->cmb->prop( 'fields' ) as $field ) {
123
-			$show_in_rest = isset( $field['show_in_rest'] ) ? $field['show_in_rest'] : null;
123
+			$show_in_rest = isset( $field[ 'show_in_rest' ] ) ? $field[ 'show_in_rest' ] : null;
124 124
 
125 125
 			if ( false === $show_in_rest ) {
126 126
 				continue;
127 127
 			}
128 128
 
129 129
 			if ( $this->can_read( $show_in_rest ) ) {
130
-				$this->read_fields[] = $field['id'];
130
+				$this->read_fields[ ] = $field[ 'id' ];
131 131
 			}
132 132
 
133 133
 			if ( $this->can_write( $show_in_rest ) ) {
134
-				$this->write_fields[] = $field['id'];
134
+				$this->write_fields[ ] = $field[ 'id' ];
135 135
 			}
136 136
 
137 137
 		}
@@ -159,14 +159,14 @@  discard block
 block discarded – undo
159 159
 	 */
160 160
 	public static function get_restable_field_values( $object, $field_id, $request ) {
161 161
 		$values = array();
162
-		if ( ! isset( $object['id'] ) ) {
162
+		if ( ! isset( $object[ 'id' ] ) ) {
163 163
 			return;
164 164
 		}
165 165
 
166 166
 		foreach ( self::$boxes as $cmb_id => $rest_box ) {
167 167
 			foreach ( $rest_box->read_fields as $field_id ) {
168 168
 				$field = $rest_box->cmb->get_field( $field_id );
169
-				$field->object_id = $object['id'];
169
+				$field->object_id = $object[ 'id' ];
170 170
 
171 171
 				// TODO: test other object types (users, comments, etc)
172 172
 				if ( isset( $object->type ) ) {
@@ -205,8 +205,8 @@  discard block
 block discarded – undo
205 205
 				continue;
206 206
 			}
207 207
 
208
-			$rest_box->cmb->object_id( $data['object_id'] );
209
-			$rest_box->cmb->object_type( $data['object_type'] );
208
+			$rest_box->cmb->object_id( $data[ 'object_id' ] );
209
+			$rest_box->cmb->object_type( $data[ 'object_type' ] );
210 210
 
211 211
 			// TODO: Test since refactor.
212 212
 			$updated[ $cmb_id ] = $rest_box->sanitize_box_values( $values );
@@ -304,8 +304,8 @@  discard block
 block discarded – undo
304 304
 		} elseif ( isset( $object->comment_ID ) ) {
305 305
 			$object_id   = intval( $object->comment_ID );
306 306
 			$object_type = 'comment';
307
-		} elseif ( is_array( $object ) && isset( $object['term_id'] ) ) {
308
-			$object_id   = intval( $object['term_id'] );
307
+		} elseif ( is_array( $object ) && isset( $object[ 'term_id' ] ) ) {
308
+			$object_id   = intval( $object[ 'term_id' ] );
309 309
 			$object_type = 'term';
310 310
 		} elseif ( isset( $object->term_id ) ) {
311 311
 			$object_id   = intval( $object->term_id );
Please login to merge, or discard this patch.
includes/CMB2_REST_Controller.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 	 * @return array $data
129 129
 	 */
130 130
 	public function prepare_item_for_response( $data, $request = null ) {
131
-		$data = $this->filter_response_by_context( $data, $this->request['context'] );
131
+		$data = $this->filter_response_by_context( $data, $this->request[ 'context' ] );
132 132
 
133 133
 		/**
134 134
 		 * Filter the prepared CMB2 item response.
@@ -170,16 +170,16 @@  discard block
 block discarded – undo
170 170
 
171 171
 	public function initiate_request( $request, $request_type ) {
172 172
 		$this->request = $request;
173
-		$this->request['context'] = isset( $this->request['context'] ) && ! empty( $this->request['context'] )
174
-			? $this->request['context']
173
+		$this->request[ 'context' ] = isset( $this->request[ 'context' ] ) && ! empty( $this->request[ 'context' ] )
174
+			? $this->request[ 'context' ]
175 175
 			: 'view';
176 176
 
177
-		if ( isset( $_REQUEST['object_id'] ) ) {
178
-			$this->object_id = absint( $_REQUEST['object_id'] );
177
+		if ( isset( $_REQUEST[ 'object_id' ] ) ) {
178
+			$this->object_id = absint( $_REQUEST[ 'object_id' ] );
179 179
 		}
180 180
 
181
-		if ( isset( $_REQUEST['object_type'] ) ) {
182
-			$this->object_type = absint( $_REQUEST['object_type'] );
181
+		if ( isset( $_REQUEST[ 'object_type' ] ) ) {
182
+			$this->object_type = absint( $_REQUEST[ 'object_type' ] );
183 183
 		}
184 184
 
185 185
 		self::$request_type = self::$request_type ? self::$request_type : $request_type;
Please login to merge, or discard this patch.