Changeset 47359

Timestamp:

02/25/2020 01:40:52 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Script Loader: Improve performance of wp_script_is() for scripts registered with complex dependencies.

This switches WP_Dependencies::recurse_deps() from recursively checking the same handles over and over again to keep a flattened array of queued items and their dependencies for faster lookup in WP_Dependencies::query().

Props superdav42.
Fixes #46469.

File:

• trunk/src/wp-includes/class.wp-dependencies.php (modified) (7 diffs)

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

@@ -75 +75 @@
      */
     public $group = 0;
+
+    /**
+     * Cached lookup array of flattened queued items and dependencies.
+     *
+     * @since 5.4.0
+     * @var array
+     */
+    private $all_queued_deps;
 
     /**
@@ -303 +311 @@
         foreach ( (array) $handles as $handle ) {
             $handle = explode( '?', $handle );
-            if ( ! in_array( $handle[0], $this->queue ) && isset( $this->registered[ $handle[0] ] ) ) {
+
+            if ( ! in_array( $handle[0], $this->queue, true ) && isset( $this->registered[ $handle[0] ] ) ) {
                 $this->queue[] = $handle[0];
+
+                // Reset all dependencies so they must be recalculated in recurse_deps().
+                $this->all_queued_deps = null;
+
                 if ( isset( $handle[1] ) ) {
                     $this->args[ $handle[0] ] = $handle[1];
@@ -326 +339 @@
         foreach ( (array) $handles as $handle ) {
             $handle = explode( '?', $handle );
-            $key    = array_search( $handle[0], $this->queue );
+            $key    = array_search( $handle[0], $this->queue, true );
+
             if ( false !== $key ) {
+                // 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] ] );
@@ -335 +352 @@
 
     /**
-     * Recursively search the passed dependency tree for $handle
+     * Recursively search the passed dependency tree for $handle.
      *
      * @since 4.0.0
@@ -344 +361 @@
      */
     protected function recurse_deps( $queue, $handle ) {
-        foreach ( $queue as $queued ) {
-            if ( ! isset( $this->registered[ $queued ] ) ) {
-                continue;
-            }
-
-            if ( in_array( $handle, $this->registered[ $queued ]->deps ) ) {
-                return true;
-            } elseif ( $this->recurse_deps( $this->registered[ $queued ]->deps, $handle ) ) {
-                return true;
-            }
-        }
-
-        return false;
+        if ( isset( $this->all_queued_deps ) ) {
+            return isset( $this->all_queued_deps[ $handle ] );
+        }
+
+        $all_deps = array_fill_keys( $queue, true );
+        $queues   = array();
+        $done     = array();
+
+        while ( $queue ) {
+            foreach ( $queue as $queued ) {
+                if ( ! isset( $done[ $queued ] ) && isset( $this->registered[ $queued ] ) ) {
+                    $deps = $this->registered[ $queued ]->deps;
+                    if ( $deps ) {
+                        $all_deps += array_fill_keys( $deps, true );
+                        array_push( $queues, $deps );
+                    }
+                    $done[ $queued ] = true;
+                }
+            }
+            $queue = array_pop( $queues );
+        }
+
+        $this->all_queued_deps = $all_deps;
+
+        return isset( $this->all_queued_deps[ $handle ] );
     }
 
@@ -380 +409 @@
             case 'enqueued':
             case 'queue':
-                if ( in_array( $handle, $this->queue ) ) {
+                if ( in_array( $handle, $this->queue, true ) ) {
                     return true;
                 }
@@ -387 +416 @@
             case 'to_do':
             case 'to_print': // Back compat.
-                return in_array( $handle, $this->to_do );
+                return in_array( $handle, $this->to_do, true );
 
             case 'done':
             case 'printed': // Back compat.
-                return in_array( $handle, $this->done );
+                return in_array( $handle, $this->done, true );
         }
         return false;