public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Never load dev requirements, refs #9683

pull/9702/head
Jordi Boggiano 2021-02-11 16:05:37 +01:00
parent 4c8149a33d
commit 1c715b5821
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Composer/Plugin/PluginManager.php
View File

@ -184,7 +184,7 @@ class PluginManager
} }
$autoloadPackages = array($package->getName() => $package); $autoloadPackages = array($package->getName() => $package);
$autoloadPackages = $this->collectDependencies($installedRepo, $autoloadPackages, $package, $rootPackage); $autoloadPackages = $this->collectDependencies($installedRepo, $autoloadPackages, $package);
$generator = $this->composer->getAutoloadGenerator(); $generator = $this->composer->getAutoloadGenerator();
$autoloads = array(array($rootPackage, '')); $autoloads = array(array($rootPackage, ''));
@ -409,18 +409,13 @@ class PluginManager
* *
* @return array Map of package names to packages * @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(); foreach ($package->getRequires() as $requireLink) {
if ($rootPackage->getName() === $package->getName()) {
$requires = array_merge($requires, $package->getDevRequires());
}
foreach ($requires as $requireLink) {
foreach ($installedRepo->findPackagesWithReplacersAndProviders($requireLink->getTarget()) as $requiredPackage) { foreach ($installedRepo->findPackagesWithReplacersAndProviders($requireLink->getTarget()) as $requiredPackage) {
if (!isset($collected[$requiredPackage->getName()])) { if (!isset($collected[$requiredPackage->getName()])) {
$collected[$requiredPackage->getName()] = $requiredPackage; $collected[$requiredPackage->getName()] = $requiredPackage;
$collected = $this->collectDependencies($installedRepo, $collected, $requiredPackage, $rootPackage); $collected = $this->collectDependencies($installedRepo, $collected, $requiredPackage);
} }
} }
} }