Make WordPress Core

Changeset 55023


Ignore:
Timestamp:
12/31/2022 01:15:42 AM (18 months ago)
Author:
SergeyBiryukov
Message:

Code Modernization: Rename parameters that use reserved keywords in phpunit/includes/functions.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 the $function parameter to $callback in _test_filter_build_unique_id().

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], [54969], [54970], [54971], [54972], [54996], [55000], [55011], [55013], [55014], [55015], [55016], [55017], [55020], [55021].

Props jrf, aristath, poena, justinahinon, SergeyBiryukov.
See #56788.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tests/phpunit/includes/functions.php

    r53688 r55023  
    7272 *
    7373 * @param string   $tag      Unused. The name of the filter to build ID for.
    74  * @param callable $function The function to generate ID for.
     74 * @param callable $callback The function to generate ID for.
    7575 * @param int      $priority Unused. The order in which the functions
    7676 *                           associated with a particular action are executed.
    7777 * @return string Unique function ID for usage as array key.
    7878 */
    79 function _test_filter_build_unique_id( $tag, $function, $priority ) {
    80     if ( is_string( $function ) ) {
    81         return $function;
    82     }
    83 
    84     if ( is_object( $function ) ) {
     79function _test_filter_build_unique_id( $tag, $callback, $priority ) {
     80    if ( is_string( $callback ) ) {
     81        return $callback;
     82    }
     83
     84    if ( is_object( $callback ) ) {
    8585        // Closures are currently implemented as objects.
    86         $function = array( $function, '' );
     86        $callback = array( $callback, '' );
    8787    } else {
    88         $function = (array) $function;
    89     }
    90 
    91     if ( is_object( $function[0] ) ) {
     88        $callback = (array) $callback;
     89    }
     90
     91    if ( is_object( $callback[0] ) ) {
    9292        // Object class calling.
    93         return spl_object_hash( $function[0] ) . $function[1];
    94     } elseif ( is_string( $function[0] ) ) {
     93        return spl_object_hash( $callback[0] ) . $callback[1];
     94    } elseif ( is_string( $callback[0] ) ) {
    9595        // Static calling.
    96         return $function[0] . '::' . $function[1];
     96        return $callback[0] . '::' . $callback[1];
    9797    }
    9898}
Note: See TracChangeset for help on using the changeset viewer.