Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-12 02:21:51 +01:00
Code Issues Projects Releases Wiki Activity

Script Loader: Add the $group parameter to WP_Dependencies::do_item().

Browse Source 
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.
Built from https://develop.svn.wordpress.org/trunk@47769


git-svn-id: http://core.svn.wordpress.org/trunk@47545 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-05-06 16:27:12 +00:00
parent 86ac5e1432
commit bf3296a9a0
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/class.wp-dependencies.php
View File

@ -128,11 +128,14 @@ class WP_Dependencies {
* Processes a dependency. * Processes a dependency.
* *
* @since 2.6.0 * @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. * @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 ] ); return isset( $this->registered[ $handle ] );
} }

5
wp-includes/class.wp-styles.php
View File

@ -139,13 +139,16 @@ class WP_Styles extends WP_Dependencies {
* Processes a style dependency. * Processes a style dependency.
* *
* @since 2.6.0 * @since 2.6.0
* @since 5.5.0 Added the `$group` parameter.
* *
* @see WP_Dependencies::do_item() * @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. * @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 ) ) { if ( ! parent::do_item( $handle ) ) {
return false; return false;
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.5-alpha-47768'; $wp_version = '5.5-alpha-47769';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.