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

Fix tests and edge case

pull/9615/head
Jordi Boggiano 2021-01-12 14:00:02 +01:00
parent 94076c0bb9
commit d94e638461
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,7 +175,8 @@ class PluginManager
$localRepo = $this->composer->getRepositoryManager()->getLocalRepository(); $localRepo = $this->composer->getRepositoryManager()->getLocalRepository();
$globalRepo = $this->globalComposer ? $this->globalComposer->getRepositoryManager()->getLocalRepository() : null; $globalRepo = $this->globalComposer ? $this->globalComposer->getRepositoryManager()->getLocalRepository() : null;
$rootPackageRepo = new RootPackageRepository($this->composer->getPackage()); $rootPackage = clone $this->composer->getPackage();
$rootPackageRepo = new RootPackageRepository($rootPackage);
$installedRepo = new InstalledRepository(array($localRepo, $rootPackageRepo)); $installedRepo = new InstalledRepository(array($localRepo, $rootPackageRepo));
if ($globalRepo) { if ($globalRepo) {
$installedRepo->addRepository($globalRepo); $installedRepo->addRepository($globalRepo);
@ -187,7 +188,7 @@ class PluginManager
$generator = $this->composer->getAutoloadGenerator(); $generator = $this->composer->getAutoloadGenerator();
$autoloads = array(); $autoloads = array();
foreach ($autoloadPackages as $autoloadPackage) { foreach ($autoloadPackages as $autoloadPackage) {
if ($autoloadPackage === $this->composer->getPackage()) { if ($autoloadPackage === $rootPackage) {
$downloadPath = ''; $downloadPath = '';
} else { } else {
$downloadPath = $this->getInstallPath($autoloadPackage, $globalRepo && $globalRepo->hasPackage($autoloadPackage)); $downloadPath = $this->getInstallPath($autoloadPackage, $globalRepo && $globalRepo->hasPackage($autoloadPackage));
@ -195,7 +196,7 @@ class PluginManager
$autoloads[] = array($autoloadPackage, $downloadPath); $autoloads[] = array($autoloadPackage, $downloadPath);
} }
$map = $generator->parseAutoloads($autoloads, $this->composer->getPackage()); $map = $generator->parseAutoloads($autoloads, $rootPackage);
$classLoader = $generator->createLoader($map); $classLoader = $generator->createLoader($map);
$classLoader->register(); $classLoader->register();

2
tests/Composer/Test/Plugin/PluginInstallerTest.php
View File

@ -18,6 +18,7 @@ use Composer\Installer\PluginInstaller;
use Composer\Package\CompletePackage; use Composer\Package\CompletePackage;
use Composer\Package\Loader\JsonLoader; use Composer\Package\Loader\JsonLoader;
use Composer\Package\Loader\ArrayLoader; use Composer\Package\Loader\ArrayLoader;
use Composer\Package\RootPackage;
use Composer\Plugin\PluginManager; use Composer\Plugin\PluginManager;
use Composer\IO\BufferIO; use Composer\IO\BufferIO;
use Composer\EventDispatcher\EventDispatcher; use Composer\EventDispatcher\EventDispatcher;
@ -111,6 +112,7 @@ class PluginInstallerTest extends TestCase
$this->composer->setInstallationManager($im); $this->composer->setInstallationManager($im);
$this->composer->setAutoloadGenerator($this->autoloadGenerator); $this->composer->setAutoloadGenerator($this->autoloadGenerator);
$this->composer->setEventDispatcher(new EventDispatcher($this->composer, $this->io)); $this->composer->setEventDispatcher(new EventDispatcher($this->composer, $this->io));
$this->composer->setPackage(new RootPackage('dummy/root', '1.0.0.0', '1.0.0'));
$this->pm = new PluginManager($this->io, $this->composer); $this->pm = new PluginManager($this->io, $this->composer);
$this->composer->setPluginManager($this->pm); $this->composer->setPluginManager($this->pm);