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

Only load dev requirements for the root package when collecting autoload dependencies during plugin activation, fixes #9683

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

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

@ -23,6 +23,7 @@ use Composer\Repository\RepositoryInterface;
use Composer\Repository\InstalledRepository; use Composer\Repository\InstalledRepository;
use Composer\Repository\RootPackageRepository; use Composer\Repository\RootPackageRepository;
use Composer\Package\PackageInterface; use Composer\Package\PackageInterface;
use Composer\Package\RootPackageInterface;
use Composer\Package\Link; use Composer\Package\Link;
use Composer\Semver\Constraint\Constraint; use Composer\Semver\Constraint\Constraint;
use Composer\Plugin\Capability\Capability; use Composer\Plugin\Capability\Capability;
@ -183,7 +184,7 @@ class PluginManager
} }
$autoloadPackages = array($package->getName() => $package); $autoloadPackages = array($package->getName() => $package);
$autoloadPackages = $this->collectDependencies($installedRepo, $autoloadPackages, $package); $autoloadPackages = $this->collectDependencies($installedRepo, $autoloadPackages, $package, $rootPackage);
$generator = $this->composer->getAutoloadGenerator(); $generator = $this->composer->getAutoloadGenerator();
$autoloads = array(array($rootPackage, '')); $autoloads = array(array($rootPackage, ''));
@ -408,18 +409,18 @@ 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) private function collectDependencies(InstalledRepository $installedRepo, array $collected, PackageInterface $package, RootPackageInterface $rootPackage)
{ {
$requires = array_merge( $requires = $package->getRequires();
$package->getRequires(), if ($rootPackage->getName() === $package->getName()) {
$package->getDevRequires() $requires = array_merge($requires, $package->getDevRequires());
); }
foreach ($requires as $requireLink) { 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); $collected = $this->collectDependencies($installedRepo, $collected, $requiredPackage, $rootPackage);
} }
} }
} }