Changeset 47769

Timestamp:

05/06/2020 04:25:09 PM (6 years ago)

Author:

SergeyBiryukov

Message:

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.

Location:

trunk/src/wp-includes

Files:

• class.wp-dependencies.php (modified) (1 diff)
• class.wp-styles.php (modified) (1 diff)

trunk/src/wp-includes/class.wp-dependencies.php

@@ -129 +129 @@
          *
          * @since 2.6.0
-         *
-         * @param string $handle Name of the item. Should be unique.
+         * @since 5.5.0 Added the `$group` parameter.
+         *
+         * @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 ] );
         }

trunk/src/wp-includes/class.wp-styles.php

@@ -140 +140 @@
          *
          * @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;