Fix loading files for plugins/scripts (#10279)

composer · Nov 12, 2021 · 0662fa2 · 0662fa2
1 parent 410771a
commit 0662fa2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php
@@ -621,12 +621,6 @@ public function createLoader(array $autoloads, $vendorDir = null)
             }
         }
 
-        if (isset($autoloads['files'])) {
-            foreach ($autoloads['files'] as $fileIdentifier => $file) {
-                composerRequire($fileIdentifier, $file);
-            }
-        }
-
         return $loader;
     }
 

diff --git a/src/Composer/EventDispatcher/EventDispatcher.php b/src/Composer/EventDispatcher/EventDispatcher.php
@@ -508,6 +508,12 @@ protected function getScriptListeners(Event $event)
         $this->loader = $generator->createLoader($map, $this->composer->getConfig()->get('vendor-dir'));
         $this->loader->register(false);
 
+        if (isset($map['files'])) {
+            foreach ($map['files'] as $fileIdentifier => $file) {
+                \Composer\Autoload\composerRequire($fileIdentifier, $file);
+            }
+        }
+
         return $scripts[$event->getName()];
     }
 

diff --git a/src/Composer/Plugin/PluginManager.php b/src/Composer/Plugin/PluginManager.php
@@ -201,6 +201,12 @@ public function registerPackage(PackageInterface $package, $failOnMissingClasses
         $classLoader = $generator->createLoader($map, $this->composer->getConfig()->get('vendor-dir'));
         $classLoader->register(false);
 
+        if (isset($map['files'])) {
+            foreach ($map['files'] as $fileIdentifier => $file) {
+                \Composer\Autoload\composerRequire($fileIdentifier, $file);
+            }
+        }
+
         foreach ($classes as $class) {
             if (class_exists($class, false)) {
                 $class = trim($class, '\\');