Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix PHP warning when preloading scripts on WPEngine (https://github.com/woocommerce/woocommerce-admin/pull/4856) 

* Handle missing script dependencies when preloading.

* Updated terminology.
This commit is contained in:
Jeff Stieler 2020-07-23 15:02:31 -04:00 committed by GitHub
parent cc8b7982a3
commit fe1e422039
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/woocommerce-admin/src/Loader.php
View File

@ -519,16 +519,16 @@ class Loader {
/** /**
* Render a preload link tag for a dependency, optionally * Render a preload link tag for a dependency, optionally
* checked against a provided whitelist. * checked against a provided allowlist.
* *
* See: https://macarthur.me/posts/preloading-javascript-in-wordpress * See: https://macarthur.me/posts/preloading-javascript-in-wordpress
* *
* @param WP_Dependency $dependency The WP_Dependency being preloaded. * @param WP_Dependency $dependency The WP_Dependency being preloaded.
* @param string $type Dependency type - 'script' or 'style'. * @param string $type Dependency type - 'script' or 'style'.
* @param array $whitelist Optional. List of allowed dependency handles. * @param array $allowlist Optional. List of allowed dependency handles.
*/ */
public static function maybe_output_preload_link_tag( $dependency, $type, $whitelist = array() ) { public static function maybe_output_preload_link_tag( $dependency, $type, $allowlist = array() ) {
if ( ! empty( $whitelist ) && ! in_array( $dependency->handle, $whitelist, true ) ) { if ( ! empty( $allowlist ) && ! in_array( $dependency->handle, $allowlist, true ) ) {
return; return;
} }
@ -539,14 +539,14 @@ class Loader {
/** /**
* Output a preload link tag for dependencies (and their sub dependencies) * Output a preload link tag for dependencies (and their sub dependencies)
* with an optional whitelist. * with an optional allowlist.
* *
* See: https://macarthur.me/posts/preloading-javascript-in-wordpress * See: https://macarthur.me/posts/preloading-javascript-in-wordpress
* *
* @param string $type Dependency type - 'script' or 'style'. * @param string $type Dependency type - 'script' or 'style'.
* @param array $whitelist Optional. List of allowed dependency handles. * @param array $allowlist Optional. List of allowed dependency handles.
*/ */
public static function output_header_preload_tags_for_type( $type, $whitelist = array() ) { public static function output_header_preload_tags_for_type( $type, $allowlist = array() ) {
if ( 'script' === $type ) { if ( 'script' === $type ) {
$dependencies_of_type = wp_scripts(); $dependencies_of_type = wp_scripts();
} elseif ( 'style' === $type ) { } elseif ( 'style' === $type ) {
@ -556,15 +556,22 @@ class Loader {
} }
foreach ( $dependencies_of_type->queue as $dependency_handle ) { foreach ( $dependencies_of_type->queue as $dependency_handle ) {
$dependency = $dependencies_of_type->registered[ $dependency_handle ]; $dependency = $dependencies_of_type->query( $dependency_handle, 'registered' );
if ( false === $dependency ) {
continue;
}
// Preload the subdependencies first. // Preload the subdependencies first.
foreach ( $dependency->deps as $sub_dependency_handle ) { foreach ( $dependency->deps as $sub_dependency_handle ) {
$sub_dependency = $dependencies_of_type->registered[ $sub_dependency_handle ]; $sub_dependency = $dependencies_of_type->query( $sub_dependency_handle, 'registered' );
self::maybe_output_preload_link_tag( $sub_dependency, $type, $whitelist );
if ( $sub_dependency ) {
self::maybe_output_preload_link_tag( $sub_dependency, $type, $allowlist );
}
} }
self::maybe_output_preload_link_tag( $dependency, $type, $whitelist ); self::maybe_output_preload_link_tag( $dependency, $type, $allowlist );
} }
} }