@@ -78,7 +78,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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' |
@@ -54,7 +54,7 @@ |
||
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 |
@@ -1,15 +1,15 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Base class for hooking CMB2 into WordPress. |
|
4 | - * |
|
5 | - * @since 2.2.0 |
|
6 | - * |
|
7 | - * @category WordPress_Plugin |
|
8 | - * @package CMB2 |
|
9 | - * @author WebDevStudios |
|
10 | - * @license GPL-2.0+ |
|
11 | - * @link http://webdevstudios.com |
|
12 | - */ |
|
3 | + * Base class for hooking CMB2 into WordPress. |
|
4 | + * |
|
5 | + * @since 2.2.0 |
|
6 | + * |
|
7 | + * @category WordPress_Plugin |
|
8 | + * @package CMB2 |
|
9 | + * @author WebDevStudios |
|
10 | + * @license GPL-2.0+ |
|
11 | + * @link http://webdevstudios.com |
|
12 | + */ |
|
13 | 13 | abstract class CMB2_Hookup_Base { |
14 | 14 | |
15 | 15 | /** |
@@ -257,7 +257,7 @@ discard block |
||
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 |
||
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 |
||
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 ); |
@@ -152,7 +152,7 @@ discard block |
||
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 |
||
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 ); |
@@ -120,18 +120,18 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 ); |
@@ -620,7 +620,7 @@ discard block |
||
620 | 620 | /** |
621 | 621 | * Save a repeatable group |
622 | 622 | * @since 1.x.x |
623 | - * @param array $field_group CMB2_Field group field object |
|
623 | + * @param CMB2_Field $field_group CMB2_Field group field object |
|
624 | 624 | * @return mixed Return of CMB2_Field::update_data() |
625 | 625 | */ |
626 | 626 | public function save_group_field( $field_group ) { |
@@ -910,7 +910,7 @@ discard block |
||
910 | 910 | * @param mixed $field_id Field (or group field) ID |
911 | 911 | * @param mixed $field_args Array of field arguments |
912 | 912 | * @param mixed $sub_field_id Sub field ID (if field_group exists) |
913 | - * @param mixed $field_group If a sub-field, will be the parent group CMB2_Field object |
|
913 | + * @param CMB2_Field|null $field_group If a sub-field, will be the parent group CMB2_Field object |
|
914 | 914 | * @return array Array of CMB2_Field arguments |
915 | 915 | */ |
916 | 916 | public function get_field_args( $field_id, $field_args, $sub_field_id, $field_group ) { |
@@ -969,7 +969,7 @@ discard block |
||
969 | 969 | * @since 2.0.0 |
970 | 970 | * @param array $field Metabox field config array |
971 | 971 | * @param int $position (optional) Position of metabox. 1 for first, etc |
972 | - * @return mixed Field id or false |
|
972 | + * @return string Field id or false |
|
973 | 973 | */ |
974 | 974 | public function add_field( array $field, $position = 0 ) { |
975 | 975 | if ( ! is_array( $field ) || ! array_key_exists( 'id', $field ) ) { |
@@ -119,19 +119,19 @@ discard block |
||
119 | 119 | */ |
120 | 120 | public function __construct( $meta_box, $object_id = 0 ) { |
121 | 121 | |
122 | - if ( empty( $meta_box['id'] ) ) { |
|
122 | + if ( empty( $meta_box[ 'id' ] ) ) { |
|
123 | 123 | wp_die( __( 'Metabox configuration is required to have an ID parameter', 'cmb2' ) ); |
124 | 124 | } |
125 | 125 | |
126 | 126 | $this->meta_box = wp_parse_args( $meta_box, $this->mb_defaults ); |
127 | - $this->meta_box['fields'] = array(); |
|
127 | + $this->meta_box[ 'fields' ] = array(); |
|
128 | 128 | |
129 | 129 | $this->object_id( $object_id ); |
130 | 130 | $this->mb_object_type(); |
131 | - $this->cmb_id = $meta_box['id']; |
|
131 | + $this->cmb_id = $meta_box[ 'id' ]; |
|
132 | 132 | |
133 | - if ( ! empty( $meta_box['fields'] ) && is_array( $meta_box['fields'] ) ) { |
|
134 | - $this->add_fields( $meta_box['fields'] ); |
|
133 | + if ( ! empty( $meta_box[ 'fields' ] ) && is_array( $meta_box[ 'fields' ] ) ) { |
|
134 | + $this->add_fields( $meta_box[ 'fields' ] ); |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | CMB2_Boxes::add( $this ); |
@@ -262,16 +262,16 @@ discard block |
||
262 | 262 | * @return mixed CMB2_Field object if successful. |
263 | 263 | */ |
264 | 264 | public function render_field( $field_args ) { |
265 | - $field_args['context'] = $this->prop( 'context' ); |
|
265 | + $field_args[ 'context' ] = $this->prop( 'context' ); |
|
266 | 266 | |
267 | - if ( 'group' == $field_args['type'] ) { |
|
267 | + if ( 'group' == $field_args[ 'type' ] ) { |
|
268 | 268 | |
269 | - if ( ! isset( $field_args['show_names'] ) ) { |
|
270 | - $field_args['show_names'] = $this->prop( 'show_names' ); |
|
269 | + if ( ! isset( $field_args[ 'show_names' ] ) ) { |
|
270 | + $field_args[ 'show_names' ] = $this->prop( 'show_names' ); |
|
271 | 271 | } |
272 | 272 | $field = $this->render_group( $field_args ); |
273 | 273 | |
274 | - } elseif ( 'hidden' == $field_args['type'] && $this->get_field( $field_args )->should_show() ) { |
|
274 | + } elseif ( 'hidden' == $field_args[ 'type' ] && $this->get_field( $field_args )->should_show() ) { |
|
275 | 275 | // Save rendering for after the metabox |
276 | 276 | $field = $this->add_hidden_field( array( |
277 | 277 | 'field_args' => $field_args, |
@@ -281,7 +281,7 @@ discard block |
||
281 | 281 | |
282 | 282 | } else { |
283 | 283 | |
284 | - $field_args['show_names'] = $this->prop( 'show_names' ); |
|
284 | + $field_args[ 'show_names' ] = $this->prop( 'show_names' ); |
|
285 | 285 | |
286 | 286 | // Render default fields |
287 | 287 | $field = $this->get_field( $field_args )->render_field(); |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | */ |
298 | 298 | public function render_group( $args ) { |
299 | 299 | |
300 | - if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) { |
|
300 | + if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) { |
|
301 | 301 | return; |
302 | 302 | } |
303 | 303 | |
@@ -379,7 +379,7 @@ discard block |
||
379 | 379 | <div class="inside cmb-td cmb-nested cmb-field-list">'; |
380 | 380 | // Loop and render repeatable group fields |
381 | 381 | foreach ( array_values( $field_group->args( 'fields' ) ) as $field_args ) { |
382 | - if ( 'hidden' == $field_args['type'] ) { |
|
382 | + if ( 'hidden' == $field_args[ 'type' ] ) { |
|
383 | 383 | |
384 | 384 | // Save rendering for after the metabox |
385 | 385 | $this->add_hidden_field( array( |
@@ -389,8 +389,8 @@ discard block |
||
389 | 389 | |
390 | 390 | } else { |
391 | 391 | |
392 | - $field_args['show_names'] = $field_group->args( 'show_names' ); |
|
393 | - $field_args['context'] = $field_group->args( 'context' ); |
|
392 | + $field_args[ 'show_names' ] = $field_group->args( 'show_names' ); |
|
393 | + $field_args[ 'context' ] = $field_group->args( 'context' ); |
|
394 | 394 | |
395 | 395 | $field = $this->get_field( $field_args, $field_group )->render_field(); |
396 | 396 | } |
@@ -419,7 +419,7 @@ discard block |
||
419 | 419 | */ |
420 | 420 | public function add_hidden_field( $args ) { |
421 | 421 | $field = new CMB2_Field( $args ); |
422 | - $this->hidden_fields[] = new CMB2_Types( $field ); |
|
422 | + $this->hidden_fields[ ] = new CMB2_Types( $field ); |
|
423 | 423 | |
424 | 424 | return $field; |
425 | 425 | } |
@@ -516,11 +516,11 @@ discard block |
||
516 | 516 | */ |
517 | 517 | public function process_field( $field_args ) { |
518 | 518 | |
519 | - switch ( $field_args['type'] ) { |
|
519 | + switch ( $field_args[ 'type' ] ) { |
|
520 | 520 | |
521 | 521 | case 'group': |
522 | 522 | if ( $this->save_group( $field_args ) ) { |
523 | - $this->updated[] = $field_args['id']; |
|
523 | + $this->updated[ ] = $field_args[ 'id' ]; |
|
524 | 524 | } |
525 | 525 | |
526 | 526 | break; |
@@ -539,7 +539,7 @@ discard block |
||
539 | 539 | ) ); |
540 | 540 | |
541 | 541 | if ( $field->save_field_from_data( $this->data_to_save ) ) { |
542 | - $this->updated[] = $field->id(); |
|
542 | + $this->updated[ ] = $field->id(); |
|
543 | 543 | } |
544 | 544 | |
545 | 545 | break; |
@@ -606,7 +606,7 @@ discard block |
||
606 | 606 | * @return mixed Return of CMB2_Field::update_data() |
607 | 607 | */ |
608 | 608 | public function save_group( $args ) { |
609 | - if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) ) { |
|
609 | + if ( ! isset( $args[ 'id' ], $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) { |
|
610 | 610 | return; |
611 | 611 | } |
612 | 612 | |
@@ -660,16 +660,16 @@ discard block |
||
660 | 660 | $_new_val = array(); |
661 | 661 | foreach ( $new_val as $group_index => $grouped_data ) { |
662 | 662 | // Add the supporting data to the $saved array stack |
663 | - $saved[ $field_group->index ][ $grouped_data['supporting_field_id'] ][] = $grouped_data['supporting_field_value']; |
|
663 | + $saved[ $field_group->index ][ $grouped_data[ 'supporting_field_id' ] ][ ] = $grouped_data[ 'supporting_field_value' ]; |
|
664 | 664 | // Reset var to the actual value |
665 | - $_new_val[ $group_index ] = $grouped_data['value']; |
|
665 | + $_new_val[ $group_index ] = $grouped_data[ 'value' ]; |
|
666 | 666 | } |
667 | 667 | $new_val = $_new_val; |
668 | 668 | } else { |
669 | 669 | // Add the supporting data to the $saved array stack |
670 | - $saved[ $field_group->index ][ $new_val['supporting_field_id'] ] = $new_val['supporting_field_value']; |
|
670 | + $saved[ $field_group->index ][ $new_val[ 'supporting_field_id' ] ] = $new_val[ 'supporting_field_value' ]; |
|
671 | 671 | // Reset var to the actual value |
672 | - $new_val = $new_val['value']; |
|
672 | + $new_val = $new_val[ 'value' ]; |
|
673 | 673 | } |
674 | 674 | } |
675 | 675 | |
@@ -682,7 +682,7 @@ discard block |
||
682 | 682 | $is_removed = ( empty( $new_val ) && ! empty( $old_val ) ); |
683 | 683 | // Compare values and add to `$updated` array |
684 | 684 | if ( $is_updated || $is_removed ) { |
685 | - $this->updated[] = $base_id . '::' . $field_group->index . '::' . $sub_id; |
|
685 | + $this->updated[ ] = $base_id . '::' . $field_group->index . '::' . $sub_id; |
|
686 | 686 | } |
687 | 687 | |
688 | 688 | // Add to `$saved` array |
@@ -717,22 +717,22 @@ discard block |
||
717 | 717 | // Try to get our object ID from the global space |
718 | 718 | switch ( $this->object_type() ) { |
719 | 719 | case 'user': |
720 | - $object_id = isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id; |
|
721 | - $object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS['user_ID'] ) ? $GLOBALS['user_ID'] : $object_id; |
|
720 | + $object_id = isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id; |
|
721 | + $object_id = ! $object_id && 'user-new.php' != $pagenow && isset( $GLOBALS[ 'user_ID' ] ) ? $GLOBALS[ 'user_ID' ] : $object_id; |
|
722 | 722 | break; |
723 | 723 | |
724 | 724 | case 'comment': |
725 | - $object_id = isset( $_REQUEST['c'] ) ? $_REQUEST['c'] : $object_id; |
|
726 | - $object_id = ! $object_id && isset( $GLOBALS['comments']->comment_ID ) ? $GLOBALS['comments']->comment_ID : $object_id; |
|
725 | + $object_id = isset( $_REQUEST[ 'c' ] ) ? $_REQUEST[ 'c' ] : $object_id; |
|
726 | + $object_id = ! $object_id && isset( $GLOBALS[ 'comments' ]->comment_ID ) ? $GLOBALS[ 'comments' ]->comment_ID : $object_id; |
|
727 | 727 | break; |
728 | 728 | |
729 | 729 | case 'term': |
730 | - $object_id = isset( $_REQUEST['tag_ID'] ) ? $_REQUEST['tag_ID'] : $object_id; |
|
730 | + $object_id = isset( $_REQUEST[ 'tag_ID' ] ) ? $_REQUEST[ 'tag_ID' ] : $object_id; |
|
731 | 731 | break; |
732 | 732 | |
733 | 733 | default: |
734 | - $object_id = isset( $GLOBALS['post']->ID ) ? $GLOBALS['post']->ID : $object_id; |
|
735 | - $object_id = isset( $_REQUEST['post'] ) ? $_REQUEST['post'] : $object_id; |
|
734 | + $object_id = isset( $GLOBALS[ 'post' ]->ID ) ? $GLOBALS[ 'post' ]->ID : $object_id; |
|
735 | + $object_id = isset( $_REQUEST[ 'post' ] ) ? $_REQUEST[ 'post' ] : $object_id; |
|
736 | 736 | break; |
737 | 737 | } |
738 | 738 | |
@@ -804,7 +804,7 @@ discard block |
||
804 | 804 | * @return boolean True/False |
805 | 805 | */ |
806 | 806 | public function is_options_page_mb() { |
807 | - return ( isset( $this->meta_box['show_on']['key'] ) && 'options-page' === $this->meta_box['show_on']['key'] || array_key_exists( 'options-page', $this->meta_box['show_on'] ) ); |
|
807 | + return ( isset( $this->meta_box[ 'show_on' ][ 'key' ] ) && 'options-page' === $this->meta_box[ 'show_on' ][ 'key' ] || array_key_exists( 'options-page', $this->meta_box[ 'show_on' ] ) ); |
|
808 | 808 | } |
809 | 809 | |
810 | 810 | /** |
@@ -883,7 +883,7 @@ discard block |
||
883 | 883 | return $field; |
884 | 884 | } |
885 | 885 | |
886 | - $field_id = is_string( $field ) ? $field : $field['id']; |
|
886 | + $field_id = is_string( $field ) ? $field : $field[ 'id' ]; |
|
887 | 887 | |
888 | 888 | $parent_field_id = ! empty( $field_group ) ? $field_group->id() : ''; |
889 | 889 | $ids = $this->get_field_ids( $field_id, $parent_field_id, true ); |
@@ -919,7 +919,7 @@ discard block |
||
919 | 919 | if ( $field_group && ( $sub_field_id || 0 === $sub_field_id ) ) { |
920 | 920 | |
921 | 921 | // Update the fields array w/ any modified properties inherited from the group field |
922 | - $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] = $field_args; |
|
922 | + $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] = $field_args; |
|
923 | 923 | |
924 | 924 | return array( |
925 | 925 | 'field_args' => $field_args, |
@@ -929,11 +929,11 @@ discard block |
||
929 | 929 | } |
930 | 930 | |
931 | 931 | if ( is_array( $field_args ) ) { |
932 | - $this->meta_box['fields'][ $field_id ] = array_merge( $field_args, $this->meta_box['fields'][ $field_id ] ); |
|
932 | + $this->meta_box[ 'fields' ][ $field_id ] = array_merge( $field_args, $this->meta_box[ 'fields' ][ $field_id ] ); |
|
933 | 933 | } |
934 | 934 | |
935 | 935 | return array( |
936 | - 'field_args' => $this->meta_box['fields'][ $field_id ], |
|
936 | + 'field_args' => $this->meta_box[ 'fields' ][ $field_id ], |
|
937 | 937 | 'object_type' => $this->object_type(), |
938 | 938 | 'object_id' => $this->object_id(), |
939 | 939 | ); |
@@ -950,8 +950,8 @@ discard block |
||
950 | 950 | |
951 | 951 | $sub_fields = false; |
952 | 952 | if ( array_key_exists( 'fields', $field ) ) { |
953 | - $sub_fields = $field['fields']; |
|
954 | - unset( $field['fields'] ); |
|
953 | + $sub_fields = $field[ 'fields' ]; |
|
954 | + unset( $field[ 'fields' ] ); |
|
955 | 955 | } |
956 | 956 | |
957 | 957 | $field_id = $parent_field_id |
@@ -976,18 +976,18 @@ discard block |
||
976 | 976 | return false; |
977 | 977 | } |
978 | 978 | |
979 | - if ( 'oembed' === $field['type'] ) { |
|
979 | + if ( 'oembed' === $field[ 'type' ] ) { |
|
980 | 980 | // Initiate oembed Ajax hooks |
981 | 981 | cmb2_ajax(); |
982 | 982 | } |
983 | 983 | |
984 | 984 | $this->_add_field_to_array( |
985 | 985 | $field, |
986 | - $this->meta_box['fields'], |
|
986 | + $this->meta_box[ 'fields' ], |
|
987 | 987 | $position |
988 | 988 | ); |
989 | 989 | |
990 | - return $field['id']; |
|
990 | + return $field[ 'id' ]; |
|
991 | 991 | } |
992 | 992 | |
993 | 993 | /** |
@@ -999,27 +999,27 @@ discard block |
||
999 | 999 | * @return mixed Array of parent/field ids or false |
1000 | 1000 | */ |
1001 | 1001 | public function add_group_field( $parent_field_id, array $field, $position = 0 ) { |
1002 | - if ( ! array_key_exists( $parent_field_id, $this->meta_box['fields'] ) ) { |
|
1002 | + if ( ! array_key_exists( $parent_field_id, $this->meta_box[ 'fields' ] ) ) { |
|
1003 | 1003 | return false; |
1004 | 1004 | } |
1005 | 1005 | |
1006 | - $parent_field = $this->meta_box['fields'][ $parent_field_id ]; |
|
1006 | + $parent_field = $this->meta_box[ 'fields' ][ $parent_field_id ]; |
|
1007 | 1007 | |
1008 | - if ( 'group' !== $parent_field['type'] ) { |
|
1008 | + if ( 'group' !== $parent_field[ 'type' ] ) { |
|
1009 | 1009 | return false; |
1010 | 1010 | } |
1011 | 1011 | |
1012 | - if ( ! isset( $parent_field['fields'] ) ) { |
|
1013 | - $this->meta_box['fields'][ $parent_field_id ]['fields'] = array(); |
|
1012 | + if ( ! isset( $parent_field[ 'fields' ] ) ) { |
|
1013 | + $this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ] = array(); |
|
1014 | 1014 | } |
1015 | 1015 | |
1016 | 1016 | $this->_add_field_to_array( |
1017 | 1017 | $field, |
1018 | - $this->meta_box['fields'][ $parent_field_id ]['fields'], |
|
1018 | + $this->meta_box[ 'fields' ][ $parent_field_id ][ 'fields' ], |
|
1019 | 1019 | $position |
1020 | 1020 | ); |
1021 | 1021 | |
1022 | - return array( $parent_field_id, $field['id'] ); |
|
1022 | + return array( $parent_field_id, $field[ 'id' ] ); |
|
1023 | 1023 | } |
1024 | 1024 | |
1025 | 1025 | /** |
@@ -1031,9 +1031,9 @@ discard block |
||
1031 | 1031 | */ |
1032 | 1032 | protected function _add_field_to_array( $field, &$fields, $position = 0 ) { |
1033 | 1033 | if ( $position ) { |
1034 | - cmb2_utils()->array_insert( $fields, array( $field['id'] => $field ), $position ); |
|
1034 | + cmb2_utils()->array_insert( $fields, array( $field[ 'id' ] => $field ), $position ); |
|
1035 | 1035 | } else { |
1036 | - $fields[ $field['id'] ] = $field; |
|
1036 | + $fields[ $field[ 'id' ] ] = $field; |
|
1037 | 1037 | } |
1038 | 1038 | } |
1039 | 1039 | |
@@ -1056,15 +1056,15 @@ discard block |
||
1056 | 1056 | unset( $this->fields[ implode( '', $ids ) ] ); |
1057 | 1057 | |
1058 | 1058 | if ( ! $sub_field_id ) { |
1059 | - unset( $this->meta_box['fields'][ $field_id ] ); |
|
1059 | + unset( $this->meta_box[ 'fields' ][ $field_id ] ); |
|
1060 | 1060 | return true; |
1061 | 1061 | } |
1062 | 1062 | |
1063 | - if ( isset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] ) ) { |
|
1064 | - unset( $this->fields[ $field_id ]->args['fields'][ $sub_field_id ] ); |
|
1063 | + if ( isset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] ) ) { |
|
1064 | + unset( $this->fields[ $field_id ]->args[ 'fields' ][ $sub_field_id ] ); |
|
1065 | 1065 | } |
1066 | - if ( isset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] ) ) { |
|
1067 | - unset( $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ] ); |
|
1066 | + if ( isset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] ) ) { |
|
1067 | + unset( $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ] ); |
|
1068 | 1068 | } |
1069 | 1069 | return true; |
1070 | 1070 | } |
@@ -1088,11 +1088,11 @@ discard block |
||
1088 | 1088 | list( $field_id, $sub_field_id ) = $ids; |
1089 | 1089 | |
1090 | 1090 | if ( ! $sub_field_id ) { |
1091 | - $this->meta_box['fields'][ $field_id ][ $property ] = $value; |
|
1091 | + $this->meta_box[ 'fields' ][ $field_id ][ $property ] = $value; |
|
1092 | 1092 | return $field_id; |
1093 | 1093 | } |
1094 | 1094 | |
1095 | - $this->meta_box['fields'][ $field_id ]['fields'][ $sub_field_id ][ $property ] = $value; |
|
1095 | + $this->meta_box[ 'fields' ][ $field_id ][ 'fields' ][ $sub_field_id ][ $property ] = $value; |
|
1096 | 1096 | return $field_id; |
1097 | 1097 | } |
1098 | 1098 | |
@@ -1106,7 +1106,7 @@ discard block |
||
1106 | 1106 | public function get_field_ids( $field_id, $parent_field_id = '' ) { |
1107 | 1107 | $sub_field_id = $parent_field_id ? $field_id : ''; |
1108 | 1108 | $field_id = $parent_field_id ? $parent_field_id : $field_id; |
1109 | - $fields =& $this->meta_box['fields']; |
|
1109 | + $fields = & $this->meta_box[ 'fields' ]; |
|
1110 | 1110 | |
1111 | 1111 | if ( ! array_key_exists( $field_id, $fields ) ) { |
1112 | 1112 | $field_id = $this->search_old_school_array( $field_id, $fields ); |
@@ -1120,12 +1120,12 @@ discard block |
||
1120 | 1120 | return array( $field_id, $sub_field_id ); |
1121 | 1121 | } |
1122 | 1122 | |
1123 | - if ( 'group' !== $fields[ $field_id ]['type'] ) { |
|
1123 | + if ( 'group' !== $fields[ $field_id ][ 'type' ] ) { |
|
1124 | 1124 | return false; |
1125 | 1125 | } |
1126 | 1126 | |
1127 | - if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ]['fields'] ) ) { |
|
1128 | - $sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ]['fields'] ); |
|
1127 | + if ( ! array_key_exists( $sub_field_id, $fields[ $field_id ][ 'fields' ] ) ) { |
|
1128 | + $sub_field_id = $this->search_old_school_array( $sub_field_id, $fields[ $field_id ][ 'fields' ] ); |
|
1129 | 1129 | } |
1130 | 1130 | |
1131 | 1131 | return false === $sub_field_id ? false : array( $field_id, $sub_field_id ); |
@@ -94,7 +94,6 @@ discard block |
||
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 |
||
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 |
||
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 |
@@ -128,7 +128,7 @@ discard block |
||
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 |
||
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; |
@@ -100,7 +100,6 @@ |
||
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() { |
@@ -70,7 +70,7 @@ discard block |
||
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 |
||
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 |
||
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 |
@@ -67,11 +67,11 @@ discard block |
||
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 |
||
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 |
||
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; |
@@ -1,13 +1,13 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * CMB2 Helper Functions |
|
4 | - * |
|
5 | - * @category WordPress_Plugin |
|
6 | - * @package CMB2 |
|
7 | - * @author WebDevStudios |
|
8 | - * @license GPL-2.0+ |
|
9 | - * @link http://webdevstudios.com |
|
10 | - */ |
|
3 | + * CMB2 Helper Functions |
|
4 | + * |
|
5 | + * @category WordPress_Plugin |
|
6 | + * @package CMB2 |
|
7 | + * @author WebDevStudios |
|
8 | + * @license GPL-2.0+ |
|
9 | + * @link http://webdevstudios.com |
|
10 | + */ |
|
11 | 11 | |
12 | 12 | /** |
13 | 13 | * Helper function to provide directory path to CMB2 |