Skip to content

Commit 099b797

Browse files
Code Modernization: Rename parameters that use reserved keywords in wp-includes/rest-api/endpoints/class-wp-rest-controller.php.
While using reserved PHP keywords as parameter name labels is allowed, in the context of function calls using named parameters in PHP 8.0+, this will easily lead to confusion. To avoid that, it is recommended not to use reserved keywords as function parameter names. This commit: * Renames `$object` to `$data_object` in `WP_REST_Controller::update_additional_fields_for_object()`. * Includes a minor code layout fix for better readability. Follow-up to [52946], [52996], [52997], [52998], [53003], [53014], [53029], [53039], [53116], [53117], [53137], [53174], [53184], [53185], [53192], [53193], [53198], [53203], [53207], [53215], [53216], [53220], [53230], [53232], [53236], [53239], [53240], [53242], [53243], [53245], [53246], [53257], [53269], [53270], [53271], [53272], [53273], [53274], [53275], [53276], [53277], [53281], [53283], [53284], [53285], [53287], [53364], [53365], [54927], [54929], [54930], [54931], [54932], [54933], [54938], [54943], [54944], [54945], [54946], [54947], [54948], [54950], [54951], [54952], [54956], [54959], [54960], [54961], [54962], [54964], [54965]. Props jrf, aristath, poena, justinahinon, SergeyBiryukov. See #56788. git-svn-id: https://develop.svn.wordpress.org/trunk@54969 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 4b4faae commit 099b797

File tree

1 file changed

+18
-5
lines changed

1 file changed

+18
-5
lines changed

src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,13 @@ protected function add_additional_fields_to_object( $prepared, $request ) {
431431
continue;
432432
}
433433

434-
$prepared[ $field_name ] = call_user_func( $field_options['get_callback'], $prepared, $field_name, $request, $this->get_object_type() );
434+
$prepared[ $field_name ] = call_user_func(
435+
$field_options['get_callback'],
436+
$prepared,
437+
$field_name,
438+
$request,
439+
$this->get_object_type()
440+
);
435441
}
436442

437443
return $prepared;
@@ -442,11 +448,11 @@ protected function add_additional_fields_to_object( $prepared, $request ) {
442448
*
443449
* @since 4.7.0
444450
*
445-
* @param object $object Data model like WP_Term or WP_Post.
446-
* @param WP_REST_Request $request Full details about the request.
451+
* @param object $data_object Data model like WP_Term or WP_Post.
452+
* @param WP_REST_Request $request Full details about the request.
447453
* @return true|WP_Error True on success, WP_Error object if a field cannot be updated.
448454
*/
449-
protected function update_additional_fields_for_object( $object, $request ) {
455+
protected function update_additional_fields_for_object( $data_object, $request ) {
450456
$additional_fields = $this->get_additional_fields();
451457

452458
foreach ( $additional_fields as $field_name => $field_options ) {
@@ -459,7 +465,14 @@ protected function update_additional_fields_for_object( $object, $request ) {
459465
continue;
460466
}
461467

462-
$result = call_user_func( $field_options['update_callback'], $request[ $field_name ], $object, $field_name, $request, $this->get_object_type() );
468+
$result = call_user_func(
469+
$field_options['update_callback'],
470+
$request[ $field_name ],
471+
$data_object,
472+
$field_name,
473+
$request,
474+
$this->get_object_type()
475+
);
463476

464477
if ( is_wp_error( $result ) ) {
465478
return $result;

0 commit comments

Comments
 (0)