@@ -301,9 +301,6 @@ protected static function get_script_modules(): ?array {
301301 $ get_src = $ reflector ->getMethod ( 'get_src ' );
302302 ( \PHP_VERSION_ID < 80100 ) && $ get_src ->setAccessible ( true );
303303
304- $ registered_property = $ reflector ->getProperty ( 'registered ' );
305- ( \PHP_VERSION_ID < 80100 ) && $ registered_property ->setAccessible ( true );
306-
307304 /**
308305 * Script modules marked for enqueue, keyed by script module ID.
309306 *
@@ -312,7 +309,7 @@ protected static function get_script_modules(): ?array {
312309 */
313310 $ enqueued = $ get_marked_for_enqueue ->invoke ( $ modules );
314311
315- $ deps = self ::get_module_dependencies ( $ modules , $ registered_property , $ get_dependencies , array_keys ( $ enqueued ) );
312+ $ deps = self ::get_module_dependencies ( $ modules , $ get_dependencies , array_keys ( $ enqueued ) );
316313
317314 $ all_modules = array_merge (
318315 $ enqueued ,
@@ -367,30 +364,10 @@ protected static function get_script_modules(): ?array {
367364 */
368365 private static function get_module_dependencies (
369366 WP_Script_Modules $ modules ,
370- ReflectionProperty $ registered_property ,
371367 ReflectionMethod $ get_dependencies ,
372368 array $ ids
373369 ): array {
374- /**
375- * Prior to WP 6.9 this returned an array of dependency arrays keyed by their ID.
376- * In WP 6.9+ it returns a list of IDs.
377- *
378- * @phpstan-var list<string>|array<string, WPScriptModule> $deps
379- */
380- $ deps = $ get_dependencies ->invoke ( $ modules , $ ids );
381-
382- /** @phpstan-var array<string, WPScriptModule> $return */
383- $ return = array ();
384-
385- foreach ( $ deps as $ key => $ value ) {
386- if ( is_string ( $ value ) ) {
387- $ return [ $ value ] = $ registered_property ->getValue ( $ modules )[ $ value ];
388- } else {
389- $ return [ $ key ] = $ value ;
390- }
391- }
392-
393- return $ return ;
370+ return $ get_dependencies ->invoke ( $ modules , $ ids );
394371 }
395372
396373 /**
0 commit comments