Merge branch 'trac-64238-dependencies-phpstan' into fix/dependency-enqueue-args

* trac-64238-dependencies-phpstan:
  Use string type check before passing into in_default_dir()
  Specify that default_dirs may be null
  Fix typo
  Clarify WP_Dependencies::$args

Author: westonruter

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

@@ -56,7 +56,8 @@ class WP_Dependencies {
 	/**
 	 * An array of additional arguments passed when a handle is registered.
 	 *
-	 * Arguments are appended to the item query string.
+	 * The keys are dependency handles and the values are query strings which are appended to the item URL's query
+	 * string, after the `ver` if provided.
 	 *
 	 * @since 2.6.0
 	 *

src/wp-includes/class-wp-scripts.php

@@ -118,7 +118,7 @@ class WP_Scripts extends WP_Dependencies {
 	 * List of default directories.
 	 *
 	 * @since 2.8.0
-	 * @var string[]
+	 * @var string[]|null
 	 */
 	public $default_dirs;
 
@@ -374,7 +374,8 @@ public function do_item( $handle, $group = false ) {
 			$filtered_src = apply_filters( 'script_loader_src', $src, $handle );
 
 			if (
-				$this->in_default_dir( $filtered_src )
+				is_string( $filtered_src )
+				&& $this->in_default_dir( $filtered_src )
 				&& ( $before_script || $after_script || $translations_stop_concat || $this->is_delayed_strategy( $strategy ) )
 			) {
 				$this->do_concat = false;

src/wp-includes/class-wp-styles.php

@@ -96,7 +96,7 @@ class WP_Styles extends WP_Dependencies {
 	 * List of default directories.
 	 *
 	 * @since 2.8.0
-	 * @var string[]
+	 * @var string[]|null
 	 */
 	public $default_dirs;
 
@@ -183,7 +183,7 @@ public function do_item( $handle, $group = false ) {
 		}
 
 		if ( $this->do_concat ) {
-			if ( $src && $this->in_default_dir( $src ) && ! isset( $obj->extra['alt'] ) ) {
+			if ( is_string( $src ) && $this->in_default_dir( $src ) && ! isset( $obj->extra['alt'] ) ) {
 				$this->concat         .= "$handle,";
 				$this->concat_version .= "$handle$ver";