From 60cb20c4cc48b8de808cd307128dd171f05454ae Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 26 Apr 2022 14:26:38 +0000 Subject: [PATCH] Code Modernization: Rename parameters that use reserved keywords in `wp-includes/class-wp-query.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 `$list` parameter to `$status` in `WP_Dependencies::query()`. 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]. Props jrf, aristath, poena, justinahinon, SergeyBiryukov. See #55327. git-svn-id: https://develop.svn.wordpress.org/trunk@53281 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/class.wp-dependencies.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/wp-includes/class.wp-dependencies.php b/src/wp-includes/class.wp-dependencies.php index 2157871ea5..c527715a63 100644 --- a/src/wp-includes/class.wp-dependencies.php +++ b/src/wp-includes/class.wp-dependencies.php @@ -431,17 +431,17 @@ class WP_Dependencies { } /** - * Query list for an item. + * Query the list for an item. * * @since 2.1.0 * @since 2.6.0 Moved from `WP_Scripts`. * * @param string $handle Name of the item. Should be unique. - * @param string $list Optional. Property name of list array. Default 'registered'. + * @param string $status Optional. Status of the item to query. Default 'registered'. * @return bool|_WP_Dependency Found, or object Item data. */ - public function query( $handle, $list = 'registered' ) { - switch ( $list ) { + public function query( $handle, $status = 'registered' ) { + switch ( $status ) { case 'registered': case 'scripts': // Back compat. if ( isset( $this->registered[ $handle ] ) ) { @@ -450,7 +450,7 @@ class WP_Dependencies { return false; case 'enqueued': - case 'queue': + case 'queue': // Back compat. if ( in_array( $handle, $this->queue, true ) ) { return true; } @@ -464,6 +464,7 @@ class WP_Dependencies { case 'printed': // Back compat. return in_array( $handle, $this->done, true ); } + return false; }