Completed
Pull Request — trunk (#541)
by Justin
22:39 queued 06:07
created
includes/CMB2_hookup.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -267,7 +267,7 @@
 block discarded – undo
267 267
 	 * Add 'closed' class to metabox
268 268
 	 * @since  2.0.0
269 269
 	 * @param  array  $classes Array of classes
270
-	 * @return array           Modified array of classes
270
+	 * @return string[]           Modified array of classes
271 271
 	 */
272 272
 	public function close_metabox_class( $classes ) {
273 273
 		$classes[] = 'closed';
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 
120 120
 		if ( $this->cmb->has_columns ) {
121 121
 			add_filter( 'manage_edit-comments_columns', array( $this, 'register_column_headers' ) );
122
-			add_action( 'manage_comments_custom_column', array( $this, 'column_display'  ), 10, 3 );
122
+			add_action( 'manage_comments_custom_column', array( $this, 'column_display' ), 10, 3 );
123 123
 		}
124 124
 	}
125 125
 
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 
137 137
 		if ( $this->cmb->has_columns ) {
138 138
 			add_filter( 'manage_users_columns', array( $this, 'register_column_headers' ) );
139
-			add_filter( 'manage_users_custom_column', array( $this, 'return_column_display'  ), 10, 3 );
139
+			add_filter( 'manage_users_custom_column', array( $this, 'return_column_display' ), 10, 3 );
140 140
 		}
141 141
 	}
142 142
 
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 
171 171
 			if ( $this->cmb->has_columns ) {
172 172
 				add_filter( "manage_edit-{$taxonomy}_columns", array( $this, 'register_column_headers' ) );
173
-				add_filter( "manage_{$taxonomy}_custom_column", array( $this, 'return_column_display'  ), 10, 3 );
173
+				add_filter( "manage_{$taxonomy}_custom_column", array( $this, 'return_column_display' ), 10, 3 );
174 174
 			}
175 175
 		}
176 176
 
@@ -263,25 +263,25 @@  discard block
 block discarded – undo
263 263
 		$fields = $this->cmb->prop( 'fields' );
264 264
 
265 265
 		foreach ( $fields as $key => $field ) {
266
-			if ( ! isset( $field['column'] ) ) {
266
+			if ( ! isset( $field[ 'column' ] ) ) {
267 267
 				continue;
268 268
 			}
269 269
 
270
-			$column = $field['column'];
270
+			$column = $field[ 'column' ];
271 271
 
272
-			if ( false === $column['position'] ) {
272
+			if ( false === $column[ 'position' ] ) {
273 273
 
274
-				$columns[ $field['id'] ] = $column['name'];
274
+				$columns[ $field[ 'id' ] ] = $column[ 'name' ];
275 275
 
276 276
 			} else {
277 277
 
278
-				$before = array_slice( $columns, 0, absint( $column['position'] ) );
279
-				$before[ $field['id'] ] = $column['name'];
278
+				$before = array_slice( $columns, 0, absint( $column[ 'position' ] ) );
279
+				$before[ $field[ 'id' ] ] = $column[ 'name' ];
280 280
 				$columns = $before + $columns;
281 281
 			}
282 282
 
283
-			$column['field'] = $field;
284
-			$this->columns[ $field['id'] ] = $column;
283
+			$column[ 'field' ] = $field;
284
+			$this->columns[ $field[ 'id' ] ] = $column;
285 285
 		}
286 286
 
287 287
 		return $columns;
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
 	public function column_display( $column_name, $object_id ) {
295 295
 		if ( isset( $this->columns[ $column_name ] ) ) {
296 296
  			$field = new CMB2_Field( array(
297
-				'field_args'  => $this->columns[ $column_name ]['field'],
297
+				'field_args'  => $this->columns[ $column_name ][ 'field' ],
298 298
 				'object_type' => $this->object_type,
299 299
 				'object_id'   => $this->cmb->object_id( $object_id ),
300 300
 				'cmb_id'      => $this->cmb->cmb_id,
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
 	 * @return array           Modified array of classes
356 356
 	 */
357 357
 	public function close_metabox_class( $classes ) {
358
-		$classes[] = 'closed';
358
+		$classes[ ] = 'closed';
359 359
 		return $classes;
360 360
 	}
361 361
 
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
 	public function user_new_metabox( $section ) {
376 376
 		if ( $section == $this->cmb->prop( 'new_user_section' ) ) {
377 377
 			$object_id = $this->cmb->object_id();
378
-			$this->cmb->object_id( isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id );
378
+			$this->cmb->object_id( isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id );
379 379
 			$this->user_metabox();
380 380
 		}
381 381
 	}
@@ -555,7 +555,7 @@  discard block
 block discarded – undo
555 555
 		if ( $this->taxonomy_can_save( $taxonomy ) ) {
556 556
 
557 557
 			foreach ( $this->cmb->prop( 'fields' ) as $field ) {
558
-				$data_to_delete[ $field['id'] ] = '';
558
+				$data_to_delete[ $field[ 'id' ] ] = '';
559 559
 			}
560 560
 
561 561
 			$this->cmb->save_fields( $term_id, 'term', $data_to_delete );
Please login to merge, or discard this patch.
includes/CMB2_Sanitize.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -357,6 +357,7 @@  discard block
 block discarded – undo
357 357
 	/**
358 358
 	 * Gets the values for the `file` field type from the data being saved.
359 359
 	 * @since  2.2.0
360
+	 * @param string $id_key
360 361
 	 */
361 362
 	public function _get_group_file_value_array( $id_key ) {
362 363
 		$alldata = $this->field->group->data_to_save;
@@ -378,6 +379,7 @@  discard block
 block discarded – undo
378 379
 	/**
379 380
 	 * Peforms saving of `file` attachement's ID
380 381
 	 * @since  1.1.0
382
+	 * @param string $file_id_key
381 383
 	 */
382 384
 	public function _save_file_id_value( $file_id_key ) {
383 385
 		$id_field = $this->_new_supporting_field( $file_id_key );
@@ -398,6 +400,7 @@  discard block
 block discarded – undo
398 400
 	/**
399 401
 	 * Peforms saving of `text_datetime_timestamp_timezone` utc timestamp
400 402
 	 * @since  2.2.0
403
+	 * @param string $utc_key
401 404
 	 */
402 405
 	public function _save_utc_value( $utc_key, $utc_stamp ) {
403 406
 		return $this->_new_supporting_field( $utc_key )->save_field( $utc_stamp );
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 
173 173
 		global $wp_locale;
174 174
 
175
-		$search = array( $wp_locale->number_format['thousands_sep'], $wp_locale->number_format['decimal_point'] );
175
+		$search = array( $wp_locale->number_format[ 'thousands_sep' ], $wp_locale->number_format[ 'decimal_point' ] );
176 176
 		$replace = array( '', '.' );
177 177
 
178 178
 		// for repeatable
@@ -215,8 +215,8 @@  discard block
 block discarded – undo
215 215
 			return $repeat_value;
216 216
 		}
217 217
 
218
-		if ( isset( $this->value['date'], $this->value['time'] ) ) {
219
-			$this->value = $this->field->get_timestamp_from_value( $this->value['date'] . ' ' . $this->value['time'] );
218
+		if ( isset( $this->value[ 'date' ], $this->value[ 'time' ] ) ) {
219
+			$this->value = $this->field->get_timestamp_from_value( $this->value[ 'date' ] . ' ' . $this->value[ 'time' ] );
220 220
 		}
221 221
 
222 222
 		if ( $tz_offset = $this->field->field_timezone_offset() ) {
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
 		$tzstring = null;
255 255
 
256 256
 		if ( is_array( $this->value ) && array_key_exists( 'timezone', $this->value ) ) {
257
-			$tzstring = $this->value['timezone'];
257
+			$tzstring = $this->value[ 'timezone' ];
258 258
 		}
259 259
 
260 260
 		if ( empty( $tzstring ) ) {
@@ -274,8 +274,8 @@  discard block
 block discarded – undo
274 274
 			$tzstring = false !== $tzstring ? $tzstring : timezone_name_from_abbr( '', 0, 0 );
275 275
 		}
276 276
 
277
-		$full_format = $this->field->args['date_format'] . ' ' . $this->field->args['time_format'];
278
-		$full_date   = $this->value['date'] . ' ' . $this->value['time'];
277
+		$full_format = $this->field->args[ 'date_format' ] . ' ' . $this->field->args[ 'time_format' ];
278
+		$full_date   = $this->value[ 'date' ] . ' ' . $this->value[ 'time' ];
279 279
 
280 280
 		try {
281 281
 
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 			} else {
299 299
 				// Save the utc timestamp supporting field
300 300
 				if ( $repeat ) {
301
-					$utc_values[ $utc_key ][] = $utc_stamp;
301
+					$utc_values[ $utc_key ][ ] = $utc_stamp;
302 302
 				} else {
303 303
 					$this->_save_utc_value( $utc_key, $utc_stamp );
304 304
 				}
@@ -433,7 +433,7 @@  discard block
 block discarded – undo
433 433
 			if ( $this->value ) {
434 434
 				$val = $this->$method( true );
435 435
 				if ( ! empty( $val ) ) {
436
-					$new_value[] = $val;
436
+					$new_value[ ] = $val;
437 437
 				}
438 438
 			}
439 439
 		}
Please login to merge, or discard this patch.
example-functions.php 2 patches
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',
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
 		'desc'    => __( 'field description (optional)', 'cmb2' ),
330 330
 		'id'      => $prefix . 'wysiwyg',
331 331
 		'type'    => 'wysiwyg',
332
-		'options' => array( 'textarea_rows' => 5, ),
332
+		'options' => array( 'textarea_rows' => 5,),
333 333
 	) );
334 334
 
335 335
 	$cmb_demo->add_field( array(
@@ -381,11 +381,11 @@  discard block
 block discarded – undo
381 381
 	$cmb_about_page = new_cmb2_box( array(
382 382
 		'id'           => $prefix . 'metabox',
383 383
 		'title'        => __( 'About Page Metabox', 'cmb2' ),
384
-		'object_types' => array( 'page', ), // Post type
384
+		'object_types' => array( 'page',), // Post type
385 385
 		'context'      => 'normal',
386 386
 		'priority'     => 'high',
387 387
 		'show_names'   => true, // Show field names on the left
388
-		'show_on'      => array( 'id' => array( 2, ) ), // Specific post IDs to display this metabox
388
+		'show_on'      => array( 'id' => array( 2,) ), // Specific post IDs to display this metabox
389 389
 	) );
390 390
 
391 391
 	$cmb_about_page->add_field( array(
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
 	$cmb_group = new_cmb2_box( array(
411 411
 		'id'           => $prefix . 'metabox',
412 412
 		'title'        => __( 'Repeating Field Group', 'cmb2' ),
413
-		'object_types' => array( 'page', ),
413
+		'object_types' => array( 'page',),
414 414
 	) );
415 415
 
416 416
 	// $group_field_id is the field id string, so in this case: $prefix . 'demo'
Please login to merge, or discard this patch.
Braces   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -15,9 +15,9 @@  discard block
 block discarded – undo
15 15
  * Get the bootstrap! If using the plugin from wordpress.org, REMOVE THIS!
16 16
  */
17 17
 
18
-if ( file_exists( dirname( __FILE__ ) . '/cmb2/init.php' ) ) {
18
+if ( file_exists( dirname( __FILE__ ) . '/cmb2/init.php' ) ) {
19 19
 	require_once dirname( __FILE__ ) . '/cmb2/init.php';
20
-} elseif ( file_exists( dirname( __FILE__ ) . '/CMB2/init.php' ) ) {
20
+} elseif ( file_exists( dirname( __FILE__ ) . '/CMB2/init.php' ) ) {
21 21
 	require_once dirname( __FILE__ ) . '/CMB2/init.php';
22 22
 }
23 23
 
@@ -28,9 +28,9 @@  discard block
 block discarded – undo
28 28
  *
29 29
  * @return bool             True if metabox should show
30 30
  */
31
-function yourprefix_show_if_front_page( $cmb ) {
31
+function yourprefix_show_if_front_page( $cmb ) {
32 32
 	// Don't show this metabox if it's not the front page template
33
-	if ( $cmb->object_id !== get_option( 'page_on_front' ) ) {
33
+	if ( $cmb->object_id !== get_option( 'page_on_front' ) ) {
34 34
 		return false;
35 35
 	}
36 36
 	return true;
@@ -43,9 +43,9 @@  discard block
 block discarded – undo
43 43
  *
44 44
  * @return bool                     True if metabox should show
45 45
  */
46
-function yourprefix_hide_if_no_cats( $field ) {
46
+function yourprefix_hide_if_no_cats( $field ) {
47 47
 	// Don't show this field if not in the cats category
48
-	if ( ! has_tag( 'cats', $field->object_id ) ) {
48
+	if ( ! has_tag( 'cats', $field->object_id ) ) {
49 49
 		return false;
50 50
 	}
51 51
 	return true;
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
  * @param  array      $field_args Array of field arguments.
58 58
  * @param  CMB2_Field $field      The field object
59 59
  */
60
-function yourprefix_render_row_cb( $field_args, $field ) {
60
+function yourprefix_render_row_cb( $field_args, $field ) {
61 61
 	$classes     = $field->row_classes();
62 62
 	$id          = $field->args( 'id' );
63 63
 	$label       = $field->args( 'name' );
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
  * @param  array      $field_args Array of field arguments.
80 80
  * @param  CMB2_Field $field      The field object
81 81
  */
82
-function yourprefix_display_text_small_column( $field_args, $field ) {
82
+function yourprefix_display_text_small_column( $field_args, $field ) {
83 83
 	?>
84 84
 	<div class="custom-column-display <?php echo $field->row_classes(); ?>">
85 85
 		<p><?php echo $field->escaped_value(); ?></p>
@@ -94,10 +94,10 @@  discard block
 block discarded – undo
94 94
  * @param  array             $field_args Array of field parameters
95 95
  * @param  CMB2_Field object $field      Field object
96 96
  */
97
-function yourprefix_before_row_if_2( $field_args, $field ) {
98
-	if ( 2 == $field->object_id ) {
97
+function yourprefix_before_row_if_2( $field_args, $field ) {
98
+	if ( 2 == $field->object_id ) {
99 99
 		echo '<p>Testing <b>"before_row"</b> parameter (on $post_id 2)</p>';
100
-	} else {
100
+	} else {
101 101
 		echo '<p>Testing <b>"before_row"</b> parameter (<b>NOT</b> on $post_id 2)</p>';
102 102
 	}
103 103
 }
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 /**
107 107
  * Hook in and add a demo metabox. Can only happen on the 'cmb2_admin_init' or 'cmb2_init' hook.
108 108
  */
109
-function yourprefix_register_demo_metabox() {
109
+function yourprefix_register_demo_metabox() {
110 110
 	$prefix = 'yourprefix_demo_';
111 111
 
112 112
 	/**
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
416 416
 /**
417 417
  * Hook in and add a metabox that only appears on the 'About' page
418 418
  */
419
-function yourprefix_register_about_page_metabox() {
419
+function yourprefix_register_about_page_metabox() {
420 420
 	$prefix = 'yourprefix_about_';
421 421
 
422 422
 	/**
@@ -445,7 +445,7 @@  discard block
 block discarded – undo
445 445
 /**
446 446
  * Hook in and add a metabox to demonstrate repeatable grouped fields
447 447
  */
448
-function yourprefix_register_repeatable_group_field_metabox() {
448
+function yourprefix_register_repeatable_group_field_metabox() {
449 449
 	$prefix = 'yourprefix_group_';
450 450
 
451 451
 	/**
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
 /**
510 510
  * Hook in and add a metabox to add fields to the user profile pages
511 511
  */
512
-function yourprefix_register_user_profile_metabox() {
512
+function yourprefix_register_user_profile_metabox() {
513 513
 	$prefix = 'yourprefix_user_';
514 514
 
515 515
 	/**
@@ -579,7 +579,7 @@  discard block
 block discarded – undo
579 579
 /**
580 580
  * Hook in and add a metabox to add fields to taxonomy terms
581 581
  */
582
-function yourprefix_register_taxonomy_metabox() {
582
+function yourprefix_register_taxonomy_metabox() {
583 583
 	$prefix = 'yourprefix_term_';
584 584
 
585 585
 	/**
@@ -621,7 +621,7 @@  discard block
 block discarded – undo
621 621
 /**
622 622
  * Hook in and register a metabox to handle a theme options page
623 623
  */
624
-function yourprefix_register_theme_options_metabox() {
624
+function yourprefix_register_theme_options_metabox() {
625 625
 
626 626
 	$option_key = 'yourprefix_theme_options';
627 627
 
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/CMB2_REST.php 2 patches
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 	/**
153 153
 	 * Handler for updating custom field data.
154 154
 	 * @since  2.2.0
155
-	 * @param  mixed    $value    The value of the field
155
+	 * @param  mixed    $values    The value of the field
156 156
 	 * @param  object   $object   The object from the response
157 157
 	 * @param  string   $field_id Name of field
158 158
 	 * @return bool|int
@@ -233,6 +233,9 @@  discard block
 block discarded – undo
233 233
 		return $protected;
234 234
 	}
235 235
 
236
+	/**
237
+	 * @param string $field_id
238
+	 */
236 239
 	public function field_can_update( $field_id ) {
237 240
 
238 241
 		$field        = $this->cmb->get_field( $field_id );
Please login to merge, or discard this 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 2 patches
Doc Comments   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -94,7 +94,6 @@  discard block
 block discarded – undo
94 94
 	 *
95 95
 	 * @since 2.2.0
96 96
 	 *
97
-	 * @param  mixed $data
98 97
 	 * @return array $data
99 98
 	 */
100 99
 	public function prepare_item( $post ) {
@@ -107,7 +106,7 @@  discard block
 block discarded – undo
107 106
 	 * @since  2.2.0
108 107
 	 *
109 108
 	 * @param  mixed $cb Callable function/method.
110
-	 * @return mixed     Results of output buffer after calling function/method.
109
+	 * @return string     Results of output buffer after calling function/method.
111 110
 	 */
112 111
 	public function get_cb_results( $cb ) {
113 112
 		$args = func_get_args();
@@ -142,6 +141,9 @@  discard block
 block discarded – undo
142 141
 		return apply_filters( 'cmb2_rest_prepare', rest_ensure_response( $data ), $this->request, $this );
143 142
 	}
144 143
 
144
+	/**
145
+	 * @param string $request_type
146
+	 */
145 147
 	protected function initiate_rest_read_box( $request, $request_type ) {
146 148
 		$this->initiate_rest_box( $request, $request_type );
147 149
 
Please login to merge, or discard this 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.
includes/CMB2_REST_Controller_Boxes.php 2 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,6 @@
 block discarded – undo
100 100
 	 *
101 101
 	 * @since 2.2.0
102 102
 	 *
103
-	 * @param CMB2 $cmb
104 103
 	 * @return array
105 104
 	 */
106 105
 	public function get_rest_box() {
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 		foreach ( CMB2_REST::$boxes as $this->rest_box ) {
71 71
 			if ( $this->rest_box->rest_read ) {
72 72
 				$rest_box = $this->get_rest_box();
73
-				$boxes_data[ $this->rest_box->cmb->cmb_id ] = $this->server->response_to_data( $rest_box, isset( $_GET['_embed'] ) );
73
+				$boxes_data[ $this->rest_box->cmb->cmb_id ] = $this->server->response_to_data( $rest_box, isset( $_GET[ '_embed' ] ) );
74 74
 			}
75 75
 		}
76 76
 
@@ -110,9 +110,9 @@  discard block
 block discarded – undo
110 110
 
111 111
 		$boxes_data = $cmb->meta_box;
112 112
 
113
-		if ( isset( $_REQUEST['_rendered'] ) && '/cmb2/v1/boxes' !== CMB2_REST_Controller::get_intial_route() ) {
114
-			$boxes_data['form_open'] = $this->get_cb_results( array( $cmb, 'render_form_open' ) );
115
-			$boxes_data['form_close'] = $this->get_cb_results( array( $cmb, 'render_form_close' ) );
113
+		if ( isset( $_REQUEST[ '_rendered' ] ) && '/cmb2/v1/boxes' !== CMB2_REST_Controller::get_intial_route() ) {
114
+			$boxes_data[ 'form_open' ] = $this->get_cb_results( array( $cmb, 'render_form_open' ) );
115
+			$boxes_data[ 'form_close' ] = $this->get_cb_results( array( $cmb, 'render_form_close' ) );
116 116
 
117 117
 			global $wp_scripts, $wp_styles;
118 118
 			$before_css = $wp_styles->queue;
@@ -120,15 +120,15 @@  discard block
 block discarded – undo
120 120
 
121 121
 			CMB2_JS::enqueue();
122 122
 
123
-			$boxes_data['js_dependencies'] = array_values( array_diff( $wp_scripts->queue, $before_js ) );
124
-			$boxes_data['css_dependencies'] = array_values( array_diff( $wp_styles->queue, $before_css ) );
123
+			$boxes_data[ 'js_dependencies' ] = array_values( array_diff( $wp_scripts->queue, $before_js ) );
124
+			$boxes_data[ 'css_dependencies' ] = array_values( array_diff( $wp_styles->queue, $before_css ) );
125 125
 		}
126 126
 
127 127
 		// TODO: look into 'embed' parameter.
128 128
 		// http://demo.wp-api.org/wp-json/wp/v2/posts?_embed
129
-		unset( $boxes_data['fields'] );
129
+		unset( $boxes_data[ 'fields' ] );
130 130
 		// Handle callable properties.
131
-		unset( $boxes_data['show_on_cb'] );
131
+		unset( $boxes_data[ 'show_on_cb' ] );
132 132
 
133 133
 		$response = rest_ensure_response( $boxes_data );
134 134
 
Please login to merge, or discard this patch.
includes/CMB2_REST_Controller_Fields.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -67,11 +67,11 @@  discard block
 block discarded – undo
67 67
 
68 68
 		$fields = array();
69 69
 		foreach ( $this->rest_box->cmb->prop( 'fields', array() ) as $field ) {
70
-			$field_id = $field['id'];
70
+			$field_id = $field[ 'id' ];
71 71
 			$rest_field = $this->get_rest_field( $field_id );
72 72
 
73 73
 			if ( ! is_wp_error( $rest_field ) ) {
74
-				$fields[ $field_id ] = $this->server->response_to_data( $rest_field, isset( $_GET['_embed'] ) );
74
+				$fields[ $field_id ] = $this->server->response_to_data( $rest_field, isset( $_GET[ '_embed' ] ) );
75 75
 			} else {
76 76
 				$fields[ $field_id ] = array( 'error' => $rest_field->get_error_message() );
77 77
 			}
@@ -165,11 +165,11 @@  discard block
 block discarded – undo
165 165
 			}
166 166
 		}
167 167
 
168
-		if ( isset( $_REQUEST['_rendered'] ) ) {
169
-			$field_data['rendered'] = $rendered;
168
+		if ( isset( $_REQUEST[ '_rendered' ] ) ) {
169
+			$field_data[ 'rendered' ] = $rendered;
170 170
 		}
171 171
 
172
-		$field_data['value'] = $field->get_data();
172
+		$field_data[ 'value' ] = $field->get_data();
173 173
 
174 174
 		return $field_data;
175 175
 	}
@@ -190,14 +190,14 @@  discard block
 block discarded – undo
190 190
 		);
191 191
 
192 192
 		// TODO ?
193
-		error_log( '$this->request[context]: '. print_r( $this->request['context'], true ) );
194
-		error_log( 'CMB2_REST_Controller::get_intial_route(): '. print_r( CMB2_REST_Controller::get_intial_route(), true ) );
195
-		error_log( '$match: '. print_r( 'box_read' === CMB2_REST_Controller::get_intial_request_type(), true ) );
193
+		error_log( '$this->request[context]: ' . print_r( $this->request[ 'context' ], true ) );
194
+		error_log( 'CMB2_REST_Controller::get_intial_route(): ' . print_r( CMB2_REST_Controller::get_intial_route(), true ) );
195
+		error_log( '$match: ' . print_r( 'box_read' === CMB2_REST_Controller::get_intial_request_type(), true ) );
196 196
 
197 197
 
198 198
 		// Don't embed boxes when looking at boxes route.
199 199
 		if ( '/cmb2/v1/boxes' !== CMB2_REST_Controller::get_intial_route() ) {
200
-			$links['up']['embeddable'] = true;
200
+			$links[ 'up' ][ 'embeddable' ] = true;
201 201
 		}
202 202
 
203 203
 		return $links;
Please login to merge, or discard this patch.