--- a/wp/wp-includes/class.wp-dependencies.php Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-includes/class.wp-dependencies.php Mon Oct 14 17:39:30 2019 +0200
@@ -1,20 +1,24 @@
<?php
/**
- * BackPress Scripts enqueue
+ * Dependencies API: WP_Dependencies base class
*
- * Classes were refactored from the WP_Scripts and WordPress script enqueue API.
+ * @since 2.6.0
*
- * @since BackPress r74
+ * @package WordPress
+ * @subpackage Dependencies
+ */
+
+/**
+ * Core base class extended to register items.
*
- * @package BackPress
- * @uses _WP_Dependency
- * @since r74
+ * @since 2.6.0
+ *
+ * @see _WP_Dependency
*/
class WP_Dependencies {
/**
* An array of registered handle objects.
*
- * @access public
* @since 2.6.8
* @var array
*/
@@ -23,7 +27,6 @@
/**
* An array of queued _WP_Dependency handle objects.
*
- * @access public
* @since 2.6.8
* @var array
*/
@@ -32,7 +35,6 @@
/**
* An array of _WP_Dependency handle objects to queue.
*
- * @access public
* @since 2.6.0
* @var array
*/
@@ -41,7 +43,6 @@
/**
* An array of _WP_Dependency handle objects already queued.
*
- * @access public
* @since 2.6.0
* @var array
*/
@@ -52,7 +53,6 @@
*
* Arguments are appended to the item query string.
*
- * @access public
* @since 2.6.0
* @var array
*/
@@ -61,7 +61,6 @@
/**
* An array of handle groups to enqueue.
*
- * @access public
* @since 2.8.0
* @var array
*/
@@ -70,19 +69,19 @@
/**
* A handle group to enqueue.
*
- * @access public
* @since 2.8.0
+ * @deprecated 4.5.0
* @var int
*/
public $group = 0;
/**
- * Process the items and dependencies.
+ * Processes the items and dependencies.
*
* Processes the items passed to it or the queue, and their dependencies.
*
- * @access public
- * @since 2.1.0
+ * @since 2.6.0
+ * @since 2.8.0 Added the `$group` parameter.
*
* @param mixed $handles Optional. Items to be processed: Process queue (false), process item (string), process items (array of strings).
* @param mixed $group Group level: level (int), no groups (false).
@@ -96,23 +95,8 @@
$handles = false === $handles ? $this->queue : (array) $handles;
$this->all_deps( $handles );
- foreach( $this->to_do as $key => $handle ) {
+ foreach ( $this->to_do as $key => $handle ) {
if ( !in_array($handle, $this->done, true) && isset($this->registered[$handle]) ) {
-
- /*
- * A single item may alias a set of items, by having dependencies,
- * but no source. Queuing the item queues the dependencies.
- *
- * Example: The extending class WP_Scripts is used to register 'scriptaculous' as a set of registered handles:
- * <code>add( 'scriptaculous', false, array( 'scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls' ) );</code>
- *
- * The src property is false.
- */
- if ( ! $this->registered[$handle]->src ) {
- $this->done[] = $handle;
- continue;
- }
-
/*
* Attempt to process the item. If successful,
* add the handle to the done array.
@@ -130,9 +114,8 @@
}
/**
- * Process a dependency.
+ * Processes a dependency.
*
- * @access public
* @since 2.6.0
*
* @param string $handle Name of the item. Should be unique.
@@ -143,17 +126,18 @@
}
/**
- * Determine dependencies.
+ * Determines dependencies.
*
* Recursively builds an array of items to process taking
* dependencies into account. Does NOT catch infinite loops.
*
- * @access public
* @since 2.1.0
+ * @since 2.6.0 Moved from `WP_Scripts`.
+ * @since 2.8.0 Added the `$group` parameter.
*
- * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings).
- * @param bool $recursion Internal flag that function is calling itself.
- * @param mixed $group Group level: (int) level, (false) no groups.
+ * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings).
+ * @param bool $recursion Internal flag that function is calling itself.
+ * @param int|false $group Group level: (int) level, (false) no groups.
* @return bool True on success, false on failure.
*/
public function all_deps( $handles, $recursion = false, $group = false ) {
@@ -168,7 +152,8 @@
if ( in_array($handle, $this->done, true) ) // Already done
continue;
- $moved = $this->set_group( $handle, $recursion, $group );
+ $moved = $this->set_group( $handle, $recursion, $group );
+ $new_group = $this->groups[ $handle ];
if ( $queued && !$moved ) // already queued and in the right group
continue;
@@ -178,7 +163,7 @@
$keep_going = false; // Item doesn't exist.
elseif ( $this->registered[$handle]->deps && array_diff($this->registered[$handle]->deps, array_keys($this->registered)) )
$keep_going = false; // Item requires dependencies that don't exist.
- elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $group ) )
+ elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $new_group ) )
$keep_going = false; // Item requires dependencies that don't exist.
if ( ! $keep_going ) { // Either item or its dependencies don't exist.
@@ -205,15 +190,18 @@
*
* Registers the item if no item of that name already exists.
*
- * @access public
* @since 2.1.0
+ * @since 2.6.0 Moved from `WP_Scripts`.
*
- * @param string $handle Unique item name.
- * @param string $src The item url.
- * @param array $deps Optional. An array of item handle strings on which this item depends.
- * @param string $ver Optional. Version (used for cache busting).
- * @param mixed $args Optional. Custom property of the item. NOT the class property $args. Examples: $media, $in_footer.
- * @return bool True on success, false on failure.
+ * @param string $handle Name of the item. Should be unique.
+ * @param string $src Full URL of the item, or path of the item relative to the WordPress root directory.
+ * @param array $deps Optional. An array of registered item handles this item depends on. Default empty array.
+ * @param string|bool|null $ver Optional. String specifying item version number, if it has one, which is added to the URL
+ * as a query string for cache busting purposes. If version is set to false, a version
+ * number is automatically added equal to current installed WordPress version.
+ * If set to null, no version is added.
+ * @param mixed $args Optional. Custom property of the item. NOT the class property $args. Examples: $media, $in_footer.
+ * @return bool Whether the item has been registered. True on success, false on failure.
*/
public function add( $handle, $src, $deps = array(), $ver = false, $args = null ) {
if ( isset($this->registered[$handle]) )
@@ -227,7 +215,6 @@
*
* Adds data to a registered item.
*
- * @access public
* @since 2.6.0
*
* @param string $handle Name of the item. Should be unique.
@@ -247,7 +234,6 @@
*
* Gets data associated with a registered item.
*
- * @access public
* @since 3.3.0
*
* @param string $handle Name of the item. Should be unique.
@@ -267,8 +253,8 @@
/**
* Un-register an item or items.
*
- * @access public
* @since 2.1.0
+ * @since 2.6.0 Moved from `WP_Scripts`.
*
* @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings).
* @return void
@@ -286,8 +272,8 @@
* classes, $args is appended to the item url as a query string.
* Note $args is NOT the $args property of items in the $registered array.
*
- * @access public
* @since 2.1.0
+ * @since 2.6.0 Moved from `WP_Scripts`.
*
* @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings).
*/
@@ -308,8 +294,8 @@
* Decodes handles and arguments, then dequeues handles
* and removes arguments from the class property $args.
*
- * @access public
* @since 2.1.0
+ * @since 2.6.0 Moved from `WP_Scripts`.
*
* @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings).
*/
@@ -331,7 +317,7 @@
*
* @param array $queue An array of queued _WP_Dependency handle objects.
* @param string $handle Name of the item. Should be unique.
- * @return boolean Whether the handle is found after recursively searching the dependency tree.
+ * @return bool Whether the handle is found after recursively searching the dependency tree.
*/
protected function recurse_deps( $queue, $handle ) {
foreach ( $queue as $queued ) {
@@ -352,12 +338,12 @@
/**
* Query list for an item.
*
- * @access public
* @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 Property name of list array.
- * @return bool Found, or object Item data.
+ * @return bool|_WP_Dependency Found, or object Item data.
*/
public function query( $handle, $list = 'registered' ) {
switch ( $list ) {
@@ -388,7 +374,6 @@
/**
* Set item group, unless already in a lower group.
*
- * @access public
* @since 2.8.0
*
* @param string $handle Name of the item. Should be unique.
@@ -399,111 +384,13 @@
public function set_group( $handle, $recursion, $group ) {
$group = (int) $group;
- if ( $recursion )
- $group = min($this->group, $group);
- else
- $this->group = $group;
+ if ( isset( $this->groups[ $handle ] ) && $this->groups[ $handle ] <= $group ) {
+ return false;
+ }
- if ( isset($this->groups[$handle]) && $this->groups[$handle] <= $group )
- return false;
+ $this->groups[ $handle ] = $group;
- $this->groups[$handle] = $group;
return true;
}
-} // WP_Dependencies
-
-/**
- * Class _WP_Dependency
- *
- * Helper class to register a handle and associated data.
- *
- * @access private
- * @since 2.6.0
- */
-class _WP_Dependency {
- /**
- * The handle name.
- *
- * @access public
- * @since 2.6.0
- * @var null
- */
- public $handle;
-
- /**
- * The handle source.
- *
- * @access public
- * @since 2.6.0
- * @var null
- */
- public $src;
-
- /**
- * An array of handle dependencies.
- *
- * @access public
- * @since 2.6.0
- * @var array
- */
- public $deps = array();
-
- /**
- * The handle version.
- *
- * Used for cache-busting.
- *
- * @access public
- * @since 2.6.0
- * @var bool|string
- */
- public $ver = false;
-
- /**
- * Additional arguments for the handle.
- *
- * @access public
- * @since 2.6.0
- * @var null
- */
- public $args = null; // Custom property, such as $in_footer or $media.
-
- /**
- * Extra data to supply to the handle.
- *
- * @access public
- * @since 2.6.0
- * @var array
- */
- public $extra = array();
-
- /**
- * Setup dependencies.
- *
- * @since 2.6.0
- */
- public function __construct() {
- @list( $this->handle, $this->src, $this->deps, $this->ver, $this->args ) = func_get_args();
- if ( ! is_array($this->deps) )
- $this->deps = array();
- }
-
- /**
- * Add handle data.
- *
- * @access public
- * @since 2.6.0
- *
- * @param string $name The data key to add.
- * @param mixed $data The data value to add.
- * @return bool False if not scalar, true otherwise.
- */
- public function add_data( $name, $data ) {
- if ( !is_scalar($name) )
- return false;
- $this->extra[$name] = $data;
- return true;
- }
-
-} // _WP_Dependencies
+}