enmi-conf.org: comparison wp/wp-includes/class.wp-dependencies.php

equal deleted inserted replaced

-:be944660c56a
+:3d72ae0968f4
 *
 * @see _WP_Dependency
 */
 class WP_Dependencies {
 	/**
-	 * An array of registered handle objects.
+	 * An array of all registered dependencies keyed by handle.
 	 *
 	 * @since 2.6.8
+	 *
+	 * @var _WP_Dependency[]
+	 */
+	public $registered = array();
+	/**
+	 * An array of handles of queued dependencies.
+	 *
+	 * @since 2.6.8
+	 *
+	 * @var string[]
+	 */
+	public $queue = array();
+	/**
+	 * An array of handles of dependencies to queue.
+	 *
+	 * @since 2.6.0
+	 *
+	 * @var string[]
+	 */
+	public $to_do = array();
+	/**
+	 * An array of handles of dependencies already queued.
+	 *
+	 * @since 2.6.0
+	 *
+	 * @var string[]
+	 */
+	public $done = array();
+	/**
+	 * An array of additional arguments passed when a handle is registered.
+	 *
+	 * Arguments are appended to the item query string.
+	 *
+	 * @since 2.6.0
+	 *
 	 * @var array
 	 */
-	public $registered = array();
-	/**
-	 * An array of handles of queued objects.
-	 *
-	 * @since 2.6.8
-	 * @var string[]
-	 */
-	public $queue = array();
-	/**
-	 * An array of handles of objects to queue.
-	 *
-	 * @since 2.6.0
-	 * @var string[]
-	 */
-	public $to_do = array();
-	/**
-	 * An array of handles of objects already queued.
-	 *
-	 * @since 2.6.0
-	 * @var string[]
-	 */
-	public $done = array();
-	/**
-	 * An array of additional arguments passed when a handle is registered.
-	 *
-	 * Arguments are appended to the item query string.
-	 *
-	 * @since 2.6.0
-	 * @var array
-	 */
 	public $args = array();
 	/**
-	 * An array of handle groups to enqueue.
+	 * An array of dependency groups to enqueue.
+	 *
+	 * Each entry is keyed by handle and represents the integer group level or boolean
+	 * false if the handle has no group.
 	 *
 	 * @since 2.8.0
-	 * @var array
+	 *
+	 * @var (int|false)[]
 	 */
 	public $groups = array();
 	/**
 	 * A handle group to enqueue.
 	 *
 	 * @since 2.8.0
+	 *
 	 * @deprecated 4.5.0
 	 * @var int
 	 */
 	public $group = 0;
 	/**
 	 * Cached lookup array of flattened queued items and dependencies.
 	 *
 	 * @since 5.4.0
+	 *
 	 * @var array
 	 */
 	private $all_queued_deps;
+	/**
+	 * List of assets enqueued before details were registered.
+	 *
+	 * @since 5.9.0
+	 *
+	 * @var array
+	 */
+	private $queued_before_register = array();
 	/**
 	 * Processes the items and dependencies.
 	 *
 	 * Processes the items passed to it or the queue, and their dependencies.
 	 * @since 2.8.0 Added the `$group` parameter.
 	 *
 	 * @param string|string[]|false $handles Optional. Items to be processed: queue (false),
 	 *                                       single item (string), or multiple items (array of strings).
 	 *                                       Default false.
-	 * @param int|false             $group   Optional. Group level: level (int), no groups (false).
+	 * @param int|false             $group   Optional. Group level: level (int), no group (false).
 	 * @return string[] Array of handles of items that have been processed.
 	 */
 	public function do_items( $handles = false, $group = false ) {
 		/*
 		 * If nothing is passed, print the queue. If a string is passed,
 	 *
 	 * @since 2.6.0
 	 * @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).
+	 * @param int|false $group  Optional. Group level: level (int), no group (false).
 	 *                          Default false.
 	 * @return bool True on success, false if not set.
 	 */
 	public function do_item( $handle, $group = false ) {
 		return isset( $this->registered[ $handle ] );
 	 * @since 2.8.0 Added the `$group` parameter.
 	 *
 	 * @param string|string[] $handles   Item handle (string) or item handles (array of strings).
 	 * @param bool            $recursion Optional. Internal flag that function is calling itself.
 	 *                                   Default false.
-	 * @param int|false       $group     Optional. Group level: level (int), no groups (false).
+	 * @param int|false       $group     Optional. Group level: level (int), no group (false).
 	 *                                   Default false.
 	 * @return bool True on success, false on failure.
 	 */
 	public function all_deps( $handles, $recursion = false, $group = false ) {
 		$handles = (array) $handles;
 	public function add( $handle, $src, $deps = array(), $ver = false, $args = null ) {
 		if ( isset( $this->registered[ $handle ] ) ) {
 			return false;
 		}
 		$this->registered[ $handle ] = new _WP_Dependency( $handle, $src, $deps, $ver, $args );
+		// If the item was enqueued before the details were registered, enqueue it now.
+		if ( array_key_exists( $handle, $this->queued_before_register ) ) {
+			if ( ! is_null( $this->queued_before_register[ $handle ] ) ) {
+				$this->enqueue( $handle . '?' . $this->queued_before_register[ $handle ] );
+			} else {
+				$this->enqueue( $handle );
+			}
+			unset( $this->queued_before_register[ $handle ] );
+		}
 		return true;
 	}
 	/**
 	 * Add extra item data.
 				$this->all_queued_deps = null;
 				if ( isset( $handle[1] ) ) {
 					$this->args[ $handle[0] ] = $handle[1];
 				}
+			} elseif ( ! isset( $this->registered[ $handle[0] ] ) ) {
+				$this->queued_before_register[ $handle[0] ] = null; // $args
+				if ( isset( $handle[1] ) ) {
+					$this->queued_before_register[ $handle[0] ] = $handle[1];
+				}
 			}
 		}
 	}
 	/**
 				// Reset all dependencies so they must be recalculated in recurse_deps().
 				$this->all_queued_deps = null;
 				unset( $this->queue[ $key ] );
 				unset( $this->args[ $handle[0] ] );
-			}
+			} elseif ( array_key_exists( $handle[0], $this->queued_before_register ) ) {
-		}
+				unset( $this->queued_before_register[ $handle[0] ] );
-	}
+			}
+		}
-	/**
+	}
-	 * Recursively search the passed dependency tree for $handle.
+	/**
+	 * Recursively search the passed dependency tree for a handle.
 	 *
 	 * @since 4.0.0
 	 *
 	 * @param string[] $queue  An array of queued _WP_Dependency handles.
 	 * @param string   $handle Name of the item. Should be unique.
 		return isset( $this->all_queued_deps[ $handle ] );
 	}
 	/**
-	 * 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' ) {
+	public function query( $handle, $status = 'registered' ) {
-		switch ( $list ) {
+		switch ( $status ) {
 			case 'registered':
 			case 'scripts': // Back compat.
 				if ( isset( $this->registered[ $handle ] ) ) {
 					return $this->registered[ $handle ];
 				}
 				return false;
 			case 'enqueued':
-			case 'queue':
+			case 'queue': // Back compat.
 				if ( in_array( $handle, $this->queue, true ) ) {
 					return true;
 				}
 				return $this->recurse_deps( $this->queue, $handle );
 			case 'done':
 			case 'printed': // Back compat.
 				return in_array( $handle, $this->done, true );
 		}
 		return false;
 	}
 	/**
 	 * Set item group, unless already in a lower group.
 	 *
 	 * @since 2.8.0
 	 *
 	 * @param string    $handle    Name of the item. Should be unique.
 	 * @param bool      $recursion Internal flag that calling function was called recursively.
-	 * @param int|false $group     Group level: level (int), no groups (false).
+	 * @param int|false $group     Group level: level (int), no group (false).
 	 * @return bool Not already in the group or a lower group.
 	 */
 	public function set_group( $handle, $recursion, $group ) {
 		$group = (int) $group;

changeset 19	3d72ae0968f4
parent 16	a86126ab1dd4
child 21	48c4eec2b7e6