From 1c715b5821dd3b58c022be381a09aaaf8905b0ae Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 11 Feb 2021 16:05:37 +0100 Subject: [PATCH] Never load dev requirements, refs #9683 --- src/Composer/Plugin/PluginManager.php | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/Composer/Plugin/PluginManager.php b/src/Composer/Plugin/PluginManager.php index 058c03ecd..4c5d4d9bf 100644 --- a/src/Composer/Plugin/PluginManager.php +++ b/src/Composer/Plugin/PluginManager.php @@ -184,7 +184,7 @@ class PluginManager } $autoloadPackages = array($package->getName() => $package); - $autoloadPackages = $this->collectDependencies($installedRepo, $autoloadPackages, $package, $rootPackage); + $autoloadPackages = $this->collectDependencies($installedRepo, $autoloadPackages, $package); $generator = $this->composer->getAutoloadGenerator(); $autoloads = array(array($rootPackage, '')); @@ -409,18 +409,13 @@ class PluginManager * * @return array Map of package names to packages */ - private function collectDependencies(InstalledRepository $installedRepo, array $collected, PackageInterface $package, RootPackageInterface $rootPackage) + private function collectDependencies(InstalledRepository $installedRepo, array $collected, PackageInterface $package) { - $requires = $package->getRequires(); - if ($rootPackage->getName() === $package->getName()) { - $requires = array_merge($requires, $package->getDevRequires()); - } - - foreach ($requires as $requireLink) { + foreach ($package->getRequires() as $requireLink) { foreach ($installedRepo->findPackagesWithReplacersAndProviders($requireLink->getTarget()) as $requiredPackage) { if (!isset($collected[$requiredPackage->getName()])) { $collected[$requiredPackage->getName()] = $requiredPackage; - $collected = $this->collectDependencies($installedRepo, $collected, $requiredPackage, $rootPackage); + $collected = $this->collectDependencies($installedRepo, $collected, $requiredPackage); } } }