Restore original return value for WP_Script_Modules::get_dependencies()

Author: westonruter

src/wp-includes/class-wp-script-modules.php

@@ -398,7 +398,7 @@ public function print_head_enqueued_script_modules() {
 				! $this->registered[ $id ]['in_footer']
 			) {
 				// If any dependency is set to be printed in footer, skip printing this module in head.
-				$dependencies = $this->get_dependencies( array( $id ) );
+				$dependencies = array_keys( $this->get_dependencies( array( $id ) ) );
 				foreach ( $dependencies as $dependency_id ) {
 					if (
 						in_array( $dependency_id, $this->queue, true ) &&
@@ -528,7 +528,7 @@ public function print_import_map() {
 	 */
 	private function get_import_map(): array {
 		$imports = array();
-		foreach ( $this->get_dependencies( $this->queue ) as $id ) {
+		foreach ( array_keys( $this->get_dependencies( $this->queue ) ) as $id ) {
 			$src = $this->get_src( $id );
 			if ( '' !== $src ) {
 				$imports[ $id ] = $src;
@@ -566,7 +566,7 @@ private function get_marked_for_enqueue(): array {
 	 * @param string[] $ids          The identifiers of the script modules for which to gather dependencies.
 	 * @param string[] $import_types Optional. Import types of dependencies to retrieve: 'static', 'dynamic', or both.
 	 *                                         Default is both.
-	 * @return string[] List of IDs for script module dependencies.
+	 * @return array<string, array> Script modules keyed by ID.
 	 */
 	private function get_dependencies( array $ids, array $import_types = array( 'static', 'dynamic' ) ): array {
 		$all_dependencies = array();
@@ -584,15 +584,15 @@ private function get_dependencies( array $ids, array $import_types = array( 'sta
 					in_array( $dependency['import'], $import_types, true ) &&
 					isset( $this->registered[ $dependency['id'] ] )
 				) {
-					$all_dependencies[ $dependency['id'] ] = true;
+					$all_dependencies[ $dependency['id'] ] = $this->registered[ $dependency['id'] ];
 
 					// Add this dependency to the list to get dependencies for.
 					$id_queue[] = $dependency['id'];
 				}
 			}
 		}
 
-		return array_keys( $all_dependencies );
+		return $all_dependencies;
 	}
 
 	/**

tests/phpunit/tests/script-modules/wpScriptModules.php

@@ -225,8 +225,10 @@ public function test_comprehensive_methods( bool $use_global_function, bool $onl
 
 		$reflection_class       = new ReflectionClass( wp_script_modules() );
 		$get_marked_for_enqueue = $reflection_class->getMethod( 'get_marked_for_enqueue' );
+		$get_dependencies       = $reflection_class->getMethod( 'get_dependencies' );
 		if ( PHP_VERSION_ID < 80100 ) {
 			$get_marked_for_enqueue->setAccessible( true );
+			$get_dependencies->setAccessible( true );
 		}
 
 		$register_and_enqueue = static function ( ...$args ) use ( $use_global_function, $only_enqueue ) {
@@ -254,12 +256,25 @@ public function test_comprehensive_methods( bool $use_global_function, bool $onl
 		$this->assertSame( wp_script_modules()->get_queue(), array_keys( $marked_for_enqueue ), 'Expected get_queue() to match keys returned by get_marked_for_enqueue().' );
 		$this->assertIsArray( $marked_for_enqueue['a'], 'Expected script module "a" to have an array entry.' );
 		$this->assertSame( '/a.js', $marked_for_enqueue['a']['src'], 'Expected script module "a" to have the given src.' );
+		$this->assertSame( array(), $get_dependencies->invoke( wp_script_modules(), array( 'a' ) ) );
 
 		// One Dependency.
 		$register( 'b-dep', '/b-dep.js' );
 		$register_and_enqueue( 'b', '/b.js', array( 'b-dep' ) );
 		$this->assertTrue( wp_script_modules()->set_fetchpriority( 'b', 'low' ) );
 		$this->assertSame( array( 'a', 'b' ), wp_script_modules()->get_queue() );
+		$this->assertSame(
+			array(
+				'b-dep' => array(
+					'src'           => '/b-dep.js',
+					'version'       => false,
+					'dependencies'  => array(),
+					'in_footer'     => false,
+					'fetchpriority' => 'auto',
+				),
+			),
+			$get_dependencies->invoke( wp_script_modules(), array( 'b' ) )
+		);
 
 		// Two dependencies with different formats and a false version.
 		$register( 'c-dep', '/c-static.js', array(), false, array( 'fetchpriority' => 'low' ) );