Make WordPress Core

Changeset 54930


Ignore:
Timestamp:
12/04/2022 12:44:21 PM (12 months ago)
Author:
SergeyBiryukov
Message:

Code Modernization: Rename parameters that use reserved keywords in wp-includes/functions.wp-scripts.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 $function_name in _wp_scripts_maybe_doing_it_wrong().
  • Renames the $list parameter to $status in wp_script_is().

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].

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/functions.wp-scripts.php

    r54470 r54930  
    3535 * @since 5.5.0 Added the `$handle` parameter.
    3636 *
    37  * @param string $function Function name.
    38  * @param string $handle   Optional. Name of the script or stylesheet that was
    39  *                         registered or enqueued too early. Default empty.
    40  */
    41 function _wp_scripts_maybe_doing_it_wrong( $function, $handle = '' ) {
     37 * @param string $function_name Function name.
     38 * @param string $handle        Optional. Name of the script or stylesheet that was
     39 *                              registered or enqueued too early. Default empty.
     40 */
     41function _wp_scripts_maybe_doing_it_wrong( $function_name, $handle = '' ) {
    4242    if ( did_action( 'init' ) || did_action( 'wp_enqueue_scripts' )
    4343        || did_action( 'admin_enqueue_scripts' ) || did_action( 'login_enqueue_scripts' )
     
    6363
    6464    _doing_it_wrong(
    65         $function,
     65        $function_name,
    6666        $message,
    6767        '3.3.0'
     
    390390 *
    391391 * @param string $handle Name of the script.
    392  * @param string $list  Optional. Status of the script to check. Default 'enqueued'.
     392 * @param string $status Optional. Status of the script to check. Default 'enqueued'.
    393393 *                       Accepts 'enqueued', 'registered', 'queue', 'to_do', and 'done'.
    394394 * @return bool Whether the script is queued.
    395395 */
    396 function wp_script_is( $handle, $list = 'enqueued' ) {
    397     _wp_scripts_maybe_doing_it_wrong( __FUNCTION__, $handle );
    398 
    399     return (bool) wp_scripts()->query( $handle, $list );
     396function wp_script_is( $handle, $status = 'enqueued' ) {
     397    _wp_scripts_maybe_doing_it_wrong( __FUNCTION__, $handle );
     398
     399    return (bool) wp_scripts()->query( $handle, $status );
    400400}
    401401
Note: See TracChangeset for help on using the changeset viewer.