@@ -28,10 +28,10 @@ |
||
| 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 | } |
@@ -37,7 +37,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 375 | 374 | * @return string Modified value |
| 376 | 375 | */ |
| 377 | 376 | public static function wrap_escaped_chars( $value ) { |
| 378 | - return "'" . str_replace( '\\', '', $value[0] ) . "'"; |
|
| 377 | + return "'" . str_replace( '\\', '', $value[ 0 ] ) . "'"; |
|
| 379 | 378 | } |
| 380 | 379 | |
| 381 | 380 | /** |
@@ -435,7 +434,7 @@ discard block |
||
| 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 ); |
@@ -122,7 +122,8 @@ discard block |
||
| 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 |
||
| 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 | |
@@ -55,11 +55,11 @@ discard block |
||
| 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 |
||
| 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> (<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 | |
@@ -370,15 +370,13 @@ |
||
| 370 | 370 | if ( function_exists( '__' ) ) { |
| 371 | 371 | if ( ! is_null( $message ) ) { |
| 372 | 372 | trigger_error( sprintf( __( '%1$s was called with a parameter that is <strong>deprecated</strong> since version %2$s! %3$s', 'cmb2' ), $function, $version, $message ) ); |
| 373 | - } |
|
| 374 | - else { |
|
| 373 | + } else { |
|
| 375 | 374 | trigger_error( sprintf( __( '%1$s was called with a parameter that is <strong>deprecated</strong> since version %2$s with no alternative available.', 'cmb2' ), $function, $version ) ); |
| 376 | 375 | } |
| 377 | 376 | } else { |
| 378 | 377 | if ( ! is_null( $message ) ) { |
| 379 | 378 | trigger_error( sprintf( '%1$s was called with a parameter that is <strong>deprecated</strong> since version %2$s! %3$s', $function, $version, $message ) ); |
| 380 | - } |
|
| 381 | - else { |
|
| 379 | + } else { |
|
| 382 | 380 | trigger_error( sprintf( '%1$s was called with a parameter that is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) ); |
| 383 | 381 | } |
| 384 | 382 | } |
@@ -413,7 +413,6 @@ |
||
| 413 | 413 | * Allows overloading the object with methods... Whooaaa oooh it's magic, y'knoooow. |
| 414 | 414 | * @since 1.0.0 |
| 415 | 415 | * @param string $method Non-existent method. |
| 416 | - * @param array $arguments All arguments passed to the method |
|
| 417 | 416 | */ |
| 418 | 417 | public function __call( $method, $args ) { |
| 419 | 418 | $object_class = strtolower( get_class( $this ) ); |
@@ -335,11 +335,11 @@ discard block |
||
| 335 | 335 | switch ( $message ) { |
| 336 | 336 | |
| 337 | 337 | case self::DEPRECATED_PARAM: |
| 338 | - $message = sprintf( __( 'The "%s" field parameter has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[3], $args[4] ); |
|
| 338 | + $message = sprintf( __( 'The "%s" field parameter has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[ 3 ], $args[ 4 ] ); |
|
| 339 | 339 | break; |
| 340 | 340 | |
| 341 | 341 | case self::DEPRECATED_CB_PARAM: |
| 342 | - $message = sprintf( __( 'Using the "%s" field parameter as a callback has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[3], $args[4] ); |
|
| 342 | + $message = sprintf( __( 'Using the "%s" field parameter as a callback has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[ 3 ], $args[ 4 ] ); |
|
| 343 | 343 | break; |
| 344 | 344 | |
| 345 | 345 | default: |
@@ -418,7 +418,7 @@ discard block |
||
| 418 | 418 | public function __call( $method, $args ) { |
| 419 | 419 | $object_class = strtolower( get_class( $this ) ); |
| 420 | 420 | |
| 421 | - if ( ! has_filter( "{$object_class}_inherit_{$method}" ) ) { |
|
| 421 | + if ( ! has_filter( "{$object_class}_inherit_{$method}" ) ) { |
|
| 422 | 422 | throw new Exception( 'Invalid ' . get_class( $this ) . ' method: ' . $method ); |
| 423 | 423 | } |
| 424 | 424 | |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | if ( ! empty( $links ) ) { |
| 169 | - $data['_links'] = $links; |
|
| 169 | + $data[ '_links' ] = $links; |
|
| 170 | 170 | } |
| 171 | 171 | |
| 172 | 172 | return $data; |
@@ -183,21 +183,21 @@ discard block |
||
| 183 | 183 | |
| 184 | 184 | $schema = $this->get_item_schema(); |
| 185 | 185 | foreach ( $data as $key => $value ) { |
| 186 | - if ( empty( $schema['properties'][ $key ] ) || empty( $schema['properties'][ $key ]['context'] ) ) { |
|
| 186 | + if ( empty( $schema[ 'properties' ][ $key ] ) || empty( $schema[ 'properties' ][ $key ][ 'context' ] ) ) { |
|
| 187 | 187 | continue; |
| 188 | 188 | } |
| 189 | 189 | |
| 190 | - if ( ! in_array( $context, $schema['properties'][ $key ]['context'] ) ) { |
|
| 190 | + if ( ! in_array( $context, $schema[ 'properties' ][ $key ][ 'context' ] ) ) { |
|
| 191 | 191 | unset( $data[ $key ] ); |
| 192 | 192 | continue; |
| 193 | 193 | } |
| 194 | 194 | |
| 195 | - if ( 'object' === $schema['properties'][ $key ]['type'] && ! empty( $schema['properties'][ $key ]['properties'] ) ) { |
|
| 196 | - foreach ( $schema['properties'][ $key ]['properties'] as $attribute => $details ) { |
|
| 197 | - if ( empty( $details['context'] ) ) { |
|
| 195 | + if ( 'object' === $schema[ 'properties' ][ $key ][ 'type' ] && ! empty( $schema[ 'properties' ][ $key ][ 'properties' ] ) ) { |
|
| 196 | + foreach ( $schema[ 'properties' ][ $key ][ 'properties' ] as $attribute => $details ) { |
|
| 197 | + if ( empty( $details[ 'context' ] ) ) { |
|
| 198 | 198 | continue; |
| 199 | 199 | } |
| 200 | - if ( ! in_array( $context, $details['context'] ) ) { |
|
| 200 | + if ( ! in_array( $context, $details[ 'context' ] ) ) { |
|
| 201 | 201 | if ( isset( $data[ $key ][ $attribute ] ) ) { |
| 202 | 202 | unset( $data[ $key ][ $attribute ] ); |
| 203 | 203 | } |
@@ -227,9 +227,9 @@ discard block |
||
| 227 | 227 | |
| 228 | 228 | $schema = $this->get_item_schema(); |
| 229 | 229 | |
| 230 | - foreach ( $schema['properties'] as &$property ) { |
|
| 231 | - if ( isset( $property['arg_options'] ) ) { |
|
| 232 | - unset( $property['arg_options'] ); |
|
| 230 | + foreach ( $schema[ 'properties' ] as &$property ) { |
|
| 231 | + if ( isset( $property[ 'arg_options' ] ) ) { |
|
| 232 | + unset( $property[ 'arg_options' ] ); |
|
| 233 | 233 | } |
| 234 | 234 | } |
| 235 | 235 | |
@@ -286,18 +286,18 @@ discard block |
||
| 286 | 286 | 'validate_callback' => 'rest_validate_request_arg', |
| 287 | 287 | ); |
| 288 | 288 | $schema = $this->get_item_schema(); |
| 289 | - if ( empty( $schema['properties'] ) ) { |
|
| 289 | + if ( empty( $schema[ 'properties' ] ) ) { |
|
| 290 | 290 | return array_merge( $param_details, $args ); |
| 291 | 291 | } |
| 292 | 292 | $contexts = array(); |
| 293 | - foreach ( $schema['properties'] as $attributes ) { |
|
| 294 | - if ( ! empty( $attributes['context'] ) ) { |
|
| 295 | - $contexts = array_merge( $contexts, $attributes['context'] ); |
|
| 293 | + foreach ( $schema[ 'properties' ] as $attributes ) { |
|
| 294 | + if ( ! empty( $attributes[ 'context' ] ) ) { |
|
| 295 | + $contexts = array_merge( $contexts, $attributes[ 'context' ] ); |
|
| 296 | 296 | } |
| 297 | 297 | } |
| 298 | 298 | if ( ! empty( $contexts ) ) { |
| 299 | - $param_details['enum'] = array_unique( $contexts ); |
|
| 300 | - rsort( $param_details['enum'] ); |
|
| 299 | + $param_details[ 'enum' ] = array_unique( $contexts ); |
|
| 300 | + rsort( $param_details[ 'enum' ] ); |
|
| 301 | 301 | } |
| 302 | 302 | return array_merge( $param_details, $args ); |
| 303 | 303 | } |
@@ -315,11 +315,11 @@ discard block |
||
| 315 | 315 | |
| 316 | 316 | foreach ( $additional_fields as $field_name => $field_options ) { |
| 317 | 317 | |
| 318 | - if ( ! $field_options['get_callback'] ) { |
|
| 318 | + if ( ! $field_options[ 'get_callback' ] ) { |
|
| 319 | 319 | continue; |
| 320 | 320 | } |
| 321 | 321 | |
| 322 | - $object[ $field_name ] = call_user_func( $field_options['get_callback'], $object, $field_name, $request, $this->get_object_type() ); |
|
| 322 | + $object[ $field_name ] = call_user_func( $field_options[ 'get_callback' ], $object, $field_name, $request, $this->get_object_type() ); |
|
| 323 | 323 | } |
| 324 | 324 | |
| 325 | 325 | return $object; |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | |
| 338 | 338 | foreach ( $additional_fields as $field_name => $field_options ) { |
| 339 | 339 | |
| 340 | - if ( ! $field_options['update_callback'] ) { |
|
| 340 | + if ( ! $field_options[ 'update_callback' ] ) { |
|
| 341 | 341 | continue; |
| 342 | 342 | } |
| 343 | 343 | |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | continue; |
| 347 | 347 | } |
| 348 | 348 | |
| 349 | - call_user_func( $field_options['update_callback'], $request[ $field_name ], $object, $field_name, $request, $this->get_object_type() ); |
|
| 349 | + call_user_func( $field_options[ 'update_callback' ], $request[ $field_name ], $object, $field_name, $request, $this->get_object_type() ); |
|
| 350 | 350 | } |
| 351 | 351 | } |
| 352 | 352 | |
@@ -358,23 +358,23 @@ discard block |
||
| 358 | 358 | * @param array $schema Schema array. |
| 359 | 359 | */ |
| 360 | 360 | protected function add_additional_fields_schema( $schema ) { |
| 361 | - if ( empty( $schema['title'] ) ) { |
|
| 361 | + if ( empty( $schema[ 'title' ] ) ) { |
|
| 362 | 362 | return $schema; |
| 363 | 363 | } |
| 364 | 364 | |
| 365 | 365 | /** |
| 366 | 366 | * Can't use $this->get_object_type otherwise we cause an inf loop. |
| 367 | 367 | */ |
| 368 | - $object_type = $schema['title']; |
|
| 368 | + $object_type = $schema[ 'title' ]; |
|
| 369 | 369 | |
| 370 | 370 | $additional_fields = $this->get_additional_fields( $object_type ); |
| 371 | 371 | |
| 372 | 372 | foreach ( $additional_fields as $field_name => $field_options ) { |
| 373 | - if ( ! $field_options['schema'] ) { |
|
| 373 | + if ( ! $field_options[ 'schema' ] ) { |
|
| 374 | 374 | continue; |
| 375 | 375 | } |
| 376 | 376 | |
| 377 | - $schema['properties'][ $field_name ] = $field_options['schema']; |
|
| 377 | + $schema[ 'properties' ][ $field_name ] = $field_options[ 'schema' ]; |
|
| 378 | 378 | } |
| 379 | 379 | |
| 380 | 380 | return $schema; |
@@ -413,11 +413,11 @@ discard block |
||
| 413 | 413 | protected function get_object_type() { |
| 414 | 414 | $schema = $this->get_item_schema(); |
| 415 | 415 | |
| 416 | - if ( ! $schema || ! isset( $schema['title'] ) ) { |
|
| 416 | + if ( ! $schema || ! isset( $schema[ 'title' ] ) ) { |
|
| 417 | 417 | return null; |
| 418 | 418 | } |
| 419 | 419 | |
| 420 | - return $schema['title']; |
|
| 420 | + return $schema[ 'title' ]; |
|
| 421 | 421 | } |
| 422 | 422 | |
| 423 | 423 | /** |
@@ -433,13 +433,13 @@ discard block |
||
| 433 | 433 | public function get_endpoint_args_for_item_schema( $method = WP_REST_Server::CREATABLE ) { |
| 434 | 434 | |
| 435 | 435 | $schema = $this->get_item_schema(); |
| 436 | - $schema_properties = ! empty( $schema['properties'] ) ? $schema['properties'] : array(); |
|
| 436 | + $schema_properties = ! empty( $schema[ 'properties' ] ) ? $schema[ 'properties' ] : array(); |
|
| 437 | 437 | $endpoint_args = array(); |
| 438 | 438 | |
| 439 | 439 | foreach ( $schema_properties as $field_id => $params ) { |
| 440 | 440 | |
| 441 | 441 | // Arguments specified as `readonly` are not allowed to be set. |
| 442 | - if ( ! empty( $params['readonly'] ) ) { |
|
| 442 | + if ( ! empty( $params[ 'readonly' ] ) ) { |
|
| 443 | 443 | continue; |
| 444 | 444 | } |
| 445 | 445 | |
@@ -448,16 +448,16 @@ discard block |
||
| 448 | 448 | 'sanitize_callback' => 'rest_sanitize_request_arg', |
| 449 | 449 | ); |
| 450 | 450 | |
| 451 | - if ( isset( $params['description'] ) ) { |
|
| 452 | - $endpoint_args[ $field_id ]['description'] = $params['description']; |
|
| 451 | + if ( isset( $params[ 'description' ] ) ) { |
|
| 452 | + $endpoint_args[ $field_id ][ 'description' ] = $params[ 'description' ]; |
|
| 453 | 453 | } |
| 454 | 454 | |
| 455 | - if ( WP_REST_Server::CREATABLE === $method && isset( $params['default'] ) ) { |
|
| 456 | - $endpoint_args[ $field_id ]['default'] = $params['default']; |
|
| 455 | + if ( WP_REST_Server::CREATABLE === $method && isset( $params[ 'default' ] ) ) { |
|
| 456 | + $endpoint_args[ $field_id ][ 'default' ] = $params[ 'default' ]; |
|
| 457 | 457 | } |
| 458 | 458 | |
| 459 | - if ( WP_REST_Server::CREATABLE === $method && ! empty( $params['required'] ) ) { |
|
| 460 | - $endpoint_args[ $field_id ]['required'] = true; |
|
| 459 | + if ( WP_REST_Server::CREATABLE === $method && ! empty( $params[ 'required' ] ) ) { |
|
| 460 | + $endpoint_args[ $field_id ][ 'required' ] = true; |
|
| 461 | 461 | } |
| 462 | 462 | |
| 463 | 463 | foreach ( array( 'type', 'format', 'enum' ) as $schema_prop ) { |
@@ -467,14 +467,14 @@ discard block |
||
| 467 | 467 | } |
| 468 | 468 | |
| 469 | 469 | // Merge in any options provided by the schema property. |
| 470 | - if ( isset( $params['arg_options'] ) ) { |
|
| 470 | + if ( isset( $params[ 'arg_options' ] ) ) { |
|
| 471 | 471 | |
| 472 | 472 | // Only use required / default from arg_options on CREATABLE endpoints. |
| 473 | 473 | if ( WP_REST_Server::CREATABLE !== $method ) { |
| 474 | - $params['arg_options'] = array_diff_key( $params['arg_options'], array( 'required' => '', 'default' => '' ) ); |
|
| 474 | + $params[ 'arg_options' ] = array_diff_key( $params[ 'arg_options' ], array( 'required' => '', 'default' => '' ) ); |
|
| 475 | 475 | } |
| 476 | 476 | |
| 477 | - $endpoint_args[ $field_id ] = array_merge( $endpoint_args[ $field_id ], $params['arg_options'] ); |
|
| 477 | + $endpoint_args[ $field_id ] = array_merge( $endpoint_args[ $field_id ], $params[ 'arg_options' ] ); |
|
| 478 | 478 | } |
| 479 | 479 | } |
| 480 | 480 | |
@@ -52,9 +52,9 @@ |
||
| 52 | 52 | |
| 53 | 53 | // Get object hash.. This bypasses issues with serializing closures. |
| 54 | 54 | if ( is_object( $hook ) ) { |
| 55 | - $args[1] = spl_object_hash( $args[1] ); |
|
| 56 | - } elseif ( is_array( $hook ) && is_object( $hook[0] ) ) { |
|
| 57 | - $args[1][0] = spl_object_hash( $hook[0] ); |
|
| 55 | + $args[ 1 ] = spl_object_hash( $args[ 1 ] ); |
|
| 56 | + } elseif ( is_array( $hook ) && is_object( $hook[ 0 ] ) ) { |
|
| 57 | + $args[ 1 ][ 0 ] = spl_object_hash( $hook[ 0 ] ); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | $key = md5( serialize( $args ) ); |
@@ -385,8 +385,8 @@ |
||
| 385 | 385 | 'class' => 'cmb2-hidden', |
| 386 | 386 | ); |
| 387 | 387 | if ( $this->field->group ) { |
| 388 | - $args['data-groupid'] = $this->field->group->id(); |
|
| 389 | - $args['data-iterator'] = $this->iterator; |
|
| 388 | + $args[ 'data-groupid' ] = $this->field->group->id(); |
|
| 389 | + $args[ 'data-iterator' ] = $this->iterator; |
|
| 390 | 390 | } |
| 391 | 391 | return $this->input( $args ); |
| 392 | 392 | } |
@@ -197,6 +197,7 @@ discard block |
||
| 197 | 197 | * @param string|array $object_types Object(s) the field is being registered |
| 198 | 198 | * to, "post"|"term"|"comment" etc. |
| 199 | 199 | * @param string $object_types Canonical object type for callbacks. |
| 200 | + * @param string $object_type |
|
| 200 | 201 | * |
| 201 | 202 | * @return void |
| 202 | 203 | */ |
@@ -391,7 +392,7 @@ discard block |
||
| 391 | 392 | * |
| 392 | 393 | * @since 2.2.4 |
| 393 | 394 | * |
| 394 | - * @param mixed $value The value of the field |
|
| 395 | + * @param mixed $values The value of the field |
|
| 395 | 396 | * @param object $object The object from the response |
| 396 | 397 | * @param string $field_name Name of field |
| 397 | 398 | * @param WP_REST_Request $request Current request |
@@ -410,7 +411,7 @@ discard block |
||
| 410 | 411 | * |
| 411 | 412 | * @since 2.2.4 |
| 412 | 413 | * |
| 413 | - * @param mixed $value The value of the field |
|
| 414 | + * @param mixed $values The value of the field |
|
| 414 | 415 | * @param object $object The object from the response |
| 415 | 416 | * @param string $field_name Name of field |
| 416 | 417 | * @param WP_REST_Request $request Current request |
@@ -429,7 +430,7 @@ discard block |
||
| 429 | 430 | * |
| 430 | 431 | * @since 2.2.4 |
| 431 | 432 | * |
| 432 | - * @param mixed $value The value of the field |
|
| 433 | + * @param mixed $values The value of the field |
|
| 433 | 434 | * @param object $object The object from the response |
| 434 | 435 | * @param string $field_name Name of field |
| 435 | 436 | * @param WP_REST_Request $request Current request |
@@ -448,7 +449,7 @@ discard block |
||
| 448 | 449 | * |
| 449 | 450 | * @since 2.2.4 |
| 450 | 451 | * |
| 451 | - * @param mixed $value The value of the field |
|
| 452 | + * @param mixed $values The value of the field |
|
| 452 | 453 | * @param object $object The object from the response |
| 453 | 454 | * @param string $field_name Name of field |
| 454 | 455 | * @param WP_REST_Request $request Current request |
@@ -467,7 +468,7 @@ discard block |
||
| 467 | 468 | * |
| 468 | 469 | * @since 2.2.4 |
| 469 | 470 | * |
| 470 | - * @param mixed $value The value of the field |
|
| 471 | + * @param mixed $values The value of the field |
|
| 471 | 472 | * @param object $object The object from the response |
| 472 | 473 | * @param WP_REST_Request $request Current request |
| 473 | 474 | * @param string $object_type The request object type |
@@ -665,7 +666,7 @@ discard block |
||
| 665 | 666 | * Retrieve all CMB2_REST instances from the registry. |
| 666 | 667 | * |
| 667 | 668 | * @since 2.2.4 |
| 668 | - * @return CMB2[] Array of all registered CMB2_REST instances. |
|
| 669 | + * @return CMB2_REST[] Array of all registered CMB2_REST instances. |
|
| 669 | 670 | */ |
| 670 | 671 | public static function get_all() { |
| 671 | 672 | return self::$boxes; |
@@ -143,30 +143,30 @@ discard block |
||
| 143 | 143 | foreach ( self::$boxes as $cmb_id => $rest_box ) { |
| 144 | 144 | $types = array_flip( $rest_box->cmb->box_types() ); |
| 145 | 145 | |
| 146 | - if ( isset( $types['user'] ) ) { |
|
| 147 | - unset( $types['user'] ); |
|
| 148 | - self::$type_boxes['user'][ $cmb_id ] = $cmb_id; |
|
| 146 | + if ( isset( $types[ 'user' ] ) ) { |
|
| 147 | + unset( $types[ 'user' ] ); |
|
| 148 | + self::$type_boxes[ 'user' ][ $cmb_id ] = $cmb_id; |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | - if ( isset( $types['comment'] ) ) { |
|
| 152 | - unset( $types['comment'] ); |
|
| 153 | - self::$type_boxes['comment'][ $cmb_id ] = $cmb_id; |
|
| 151 | + if ( isset( $types[ 'comment' ] ) ) { |
|
| 152 | + unset( $types[ 'comment' ] ); |
|
| 153 | + self::$type_boxes[ 'comment' ][ $cmb_id ] = $cmb_id; |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | - if ( isset( $types['term'] ) ) { |
|
| 157 | - unset( $types['term'] ); |
|
| 156 | + if ( isset( $types[ 'term' ] ) ) { |
|
| 157 | + unset( $types[ 'term' ] ); |
|
| 158 | 158 | |
| 159 | 159 | $taxonomies = array_merge( |
| 160 | 160 | $taxonomies, |
| 161 | 161 | CMB2_Utils::ensure_array( $rest_box->cmb->prop( 'taxonomies' ) ) |
| 162 | 162 | ); |
| 163 | 163 | |
| 164 | - self::$type_boxes['term'][ $cmb_id ] = $cmb_id; |
|
| 164 | + self::$type_boxes[ 'term' ][ $cmb_id ] = $cmb_id; |
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | if ( ! empty( $types ) ) { |
| 168 | 168 | $alltypes = array_merge( $alltypes, array_flip( $types ) ); |
| 169 | - self::$type_boxes['post'][ $cmb_id ] = $cmb_id; |
|
| 169 | + self::$type_boxes[ 'post' ][ $cmb_id ] = $cmb_id; |
|
| 170 | 170 | } |
| 171 | 171 | } |
| 172 | 172 | |
@@ -176,15 +176,15 @@ discard block |
||
| 176 | 176 | self::register_rest_field( $alltypes, 'post' ); |
| 177 | 177 | } |
| 178 | 178 | |
| 179 | - if ( ! empty( self::$type_boxes['user'] ) ) { |
|
| 179 | + if ( ! empty( self::$type_boxes[ 'user' ] ) ) { |
|
| 180 | 180 | self::register_rest_field( 'user', 'user' ); |
| 181 | 181 | } |
| 182 | 182 | |
| 183 | - if ( ! empty( self::$type_boxes['comment'] ) ) { |
|
| 183 | + if ( ! empty( self::$type_boxes[ 'comment' ] ) ) { |
|
| 184 | 184 | self::register_rest_field( 'comment', 'comment' ); |
| 185 | 185 | } |
| 186 | 186 | |
| 187 | - if ( ! empty( self::$type_boxes['term'] ) ) { |
|
| 187 | + if ( ! empty( self::$type_boxes[ 'term' ] ) ) { |
|
| 188 | 188 | self::register_rest_field( $taxonomies, 'term' ); |
| 189 | 189 | } |
| 190 | 190 | } |
@@ -217,18 +217,18 @@ discard block |
||
| 217 | 217 | */ |
| 218 | 218 | protected function declare_read_edit_fields() { |
| 219 | 219 | foreach ( $this->cmb->prop( 'fields' ) as $field ) { |
| 220 | - $show_in_rest = isset( $field['show_in_rest'] ) ? $field['show_in_rest'] : null; |
|
| 220 | + $show_in_rest = isset( $field[ 'show_in_rest' ] ) ? $field[ 'show_in_rest' ] : null; |
|
| 221 | 221 | |
| 222 | 222 | if ( false === $show_in_rest ) { |
| 223 | 223 | continue; |
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | if ( $this->can_read( $show_in_rest ) ) { |
| 227 | - $this->read_fields[] = $field['id']; |
|
| 227 | + $this->read_fields[ ] = $field[ 'id' ]; |
|
| 228 | 228 | } |
| 229 | 229 | |
| 230 | 230 | if ( $this->can_edit( $show_in_rest ) ) { |
| 231 | - $this->edit_fields[] = $field['id']; |
|
| 231 | + $this->edit_fields[ ] = $field[ 'id' ]; |
|
| 232 | 232 | } |
| 233 | 233 | |
| 234 | 234 | } |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | * @return mixed |
| 360 | 360 | */ |
| 361 | 361 | protected static function get_rest_values( $object, $request, $object_type, $main_object_type = 'post' ) { |
| 362 | - if ( ! isset( $object['id'] ) ) { |
|
| 362 | + if ( ! isset( $object[ 'id' ] ) ) { |
|
| 363 | 363 | return; |
| 364 | 364 | } |
| 365 | 365 | |
@@ -370,12 +370,12 @@ discard block |
||
| 370 | 370 | $rest_box = self::$boxes[ $cmb_id ]; |
| 371 | 371 | |
| 372 | 372 | foreach ( $rest_box->read_fields as $field_id ) { |
| 373 | - $rest_box->cmb->object_id( $object['id'] ); |
|
| 373 | + $rest_box->cmb->object_id( $object[ 'id' ] ); |
|
| 374 | 374 | $rest_box->cmb->object_type( $main_object_type ); |
| 375 | 375 | |
| 376 | 376 | $field = $rest_box->cmb->get_field( $field_id ); |
| 377 | 377 | |
| 378 | - $field->object_id( $object['id'] ); |
|
| 378 | + $field->object_id( $object[ 'id' ] ); |
|
| 379 | 379 | $field->object_type( $main_object_type ); |
| 380 | 380 | |
| 381 | 381 | $values[ $cmb_id ][ $field->id( true ) ] = $field->get_data(); |
@@ -609,8 +609,8 @@ discard block |
||
| 609 | 609 | return intval( $object->comment_ID ); |
| 610 | 610 | } |
| 611 | 611 | case 'term': |
| 612 | - if ( is_array( $object ) && isset( $object['term_id'] ) ) { |
|
| 613 | - return intval( $object['term_id'] ); |
|
| 612 | + if ( is_array( $object ) && isset( $object[ 'term_id' ] ) ) { |
|
| 613 | + return intval( $object[ 'term_id' ] ); |
|
| 614 | 614 | } elseif ( isset( $object->term_id ) ) { |
| 615 | 615 | return intval( $object->term_id ); |
| 616 | 616 | } |
@@ -142,7 +142,6 @@ discard block |
||
| 142 | 142 | * |
| 143 | 143 | * @since 2.2.4 |
| 144 | 144 | * |
| 145 | - * @param mixed $data |
|
| 146 | 145 | * @return array $data |
| 147 | 146 | */ |
| 148 | 147 | public function prepare_item( $post ) { |
@@ -155,7 +154,7 @@ discard block |
||
| 155 | 154 | * @since 2.2.4 |
| 156 | 155 | * |
| 157 | 156 | * @param mixed $cb Callable function/method. |
| 158 | - * @return mixed Results of output buffer after calling function/method. |
|
| 157 | + * @return string Results of output buffer after calling function/method. |
|
| 159 | 158 | */ |
| 160 | 159 | public function get_cb_results( $cb ) { |
| 161 | 160 | $args = func_get_args(); |
@@ -171,7 +170,6 @@ discard block |
||
| 171 | 170 | * |
| 172 | 171 | * @since 2.2.4 |
| 173 | 172 | * |
| 174 | - * @param mixed $item WordPress representation of the item. |
|
| 175 | 173 | * @param WP_REST_Request $request Request object. |
| 176 | 174 | * @return WP_REST_Response $response |
| 177 | 175 | */ |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | * @return WP_REST_Response $response |
| 227 | 227 | */ |
| 228 | 228 | public function prepare_item_for_response( $data, $request = null ) { |
| 229 | - $data = $this->filter_response_by_context( $data, $this->request['context'] ); |
|
| 229 | + $data = $this->filter_response_by_context( $data, $this->request[ 'context' ] ); |
|
| 230 | 230 | |
| 231 | 231 | /** |
| 232 | 232 | * Filter the prepared CMB2 item response. |
@@ -297,12 +297,12 @@ discard block |
||
| 297 | 297 | |
| 298 | 298 | } else { |
| 299 | 299 | |
| 300 | - if ( isset( $this->request['object_id'] ) ) { |
|
| 301 | - $this->rest_box->cmb->object_id( sanitize_text_field( $this->request['object_id'] ) ); |
|
| 300 | + if ( isset( $this->request[ 'object_id' ] ) ) { |
|
| 301 | + $this->rest_box->cmb->object_id( sanitize_text_field( $this->request[ 'object_id' ] ) ); |
|
| 302 | 302 | } |
| 303 | 303 | |
| 304 | - if ( isset( $this->request['object_type'] ) ) { |
|
| 305 | - $this->rest_box->cmb->object_type( sanitize_text_field( $this->request['object_type'] ) ); |
|
| 304 | + if ( isset( $this->request[ 'object_type' ] ) ) { |
|
| 305 | + $this->rest_box->cmb->object_type( sanitize_text_field( $this->request[ 'object_type' ] ) ); |
|
| 306 | 306 | } |
| 307 | 307 | } |
| 308 | 308 | } |
@@ -320,8 +320,8 @@ discard block |
||
| 320 | 320 | public function initiate_request( $request, $request_type ) { |
| 321 | 321 | $this->request = $request; |
| 322 | 322 | |
| 323 | - if ( ! isset( $this->request['context'] ) || empty( $this->request['context'] ) ) { |
|
| 324 | - $this->request['context'] = 'view'; |
|
| 323 | + if ( ! isset( $this->request[ 'context' ] ) || empty( $this->request[ 'context' ] ) ) { |
|
| 324 | + $this->request[ 'context' ] = 'view'; |
|
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | if ( ! self::$request_type ) { |