From bb526f508724eb11551be67d6985578eea8a5215 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 6 May 2020 16:25:09 +0000 Subject: [PATCH] Script Loader: Add the `$group` parameter to `WP_Dependencies::do_item()`. Previously, the method was called with two parameters in `::do_items()`, while the method signature only included one parameter. Technically, this was not an issue as `WP_Dependencies::do_item()` is a placeholder meant to be overwritten when extending the class. When handling scripts, `WP_Dependencies` is extended with `WP_Scripts`, and the `$group` parameter was only used in `WP_Scripts::do_item()`, which does expect a second argument. However, officially adding the parameter to `WP_Dependencies::do_item()` signature prevents code misunderstanding and avoids a warning in PHP code inspection tools. Props kaggdesign, soulseekah, azaozz, SergeyBiryukov. Fixes #43627. git-svn-id: https://develop.svn.wordpress.org/trunk@47769 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/class.wp-dependencies.php | 7 +++++-- src/wp-includes/class.wp-styles.php | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/class.wp-dependencies.php b/src/wp-includes/class.wp-dependencies.php index 313faa19ed..9ed26568ed 100644 --- a/src/wp-includes/class.wp-dependencies.php +++ b/src/wp-includes/class.wp-dependencies.php @@ -128,11 +128,14 @@ class WP_Dependencies { * Processes a dependency. * * @since 2.6.0 + * @since 5.5.0 Added the `$group` parameter. * - * @param string $handle Name of the item. Should be unique. + * @param string $handle Name of the item. Should be unique. + * @param int|false $group Optional. Group level: level (int), no groups (false). + * Default false. * @return bool True on success, false if not set. */ - public function do_item( $handle ) { + public function do_item( $handle, $group = false ) { return isset( $this->registered[ $handle ] ); } diff --git a/src/wp-includes/class.wp-styles.php b/src/wp-includes/class.wp-styles.php index a84efb278f..2a4780222a 100644 --- a/src/wp-includes/class.wp-styles.php +++ b/src/wp-includes/class.wp-styles.php @@ -139,13 +139,16 @@ class WP_Styles extends WP_Dependencies { * Processes a style dependency. * * @since 2.6.0 + * @since 5.5.0 Added the `$group` parameter. * * @see WP_Dependencies::do_item() * - * @param string $handle The style's registered handle. + * @param string $handle The style's registered handle. + * @param int|false $group Optional. Group level: level (int), no groups (false). + * Default false. * @return bool True on success, false on failure. */ - public function do_item( $handle ) { + public function do_item( $handle, $group = false ) { if ( ! parent::do_item( $handle ) ) { return false; }