Fix previous commit
parent
b2076c2462
commit
70bea8fe57
|
@ -14,6 +14,7 @@ namespace Composer;
|
||||||
|
|
||||||
use Composer\Json\JsonFile;
|
use Composer\Json\JsonFile;
|
||||||
use Composer\IO\IOInterface;
|
use Composer\IO\IOInterface;
|
||||||
|
use Composer\Repository\RepositoryManager;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates an configured instance of composer.
|
* Creates an configured instance of composer.
|
||||||
|
@ -69,23 +70,24 @@ class Factory
|
||||||
// initialize repository manager
|
// initialize repository manager
|
||||||
$rm = $this->createRepositoryManager($io);
|
$rm = $this->createRepositoryManager($io);
|
||||||
|
|
||||||
// initialize download manager
|
|
||||||
$dm = $this->createDownloadManager($io);
|
|
||||||
|
|
||||||
// initialize installation manager
|
|
||||||
$im = $this->createInstallationManager($rm, $dm, $vendorDir, $binDir, $io);
|
|
||||||
|
|
||||||
// load default repository unless it's explicitly disabled
|
// load default repository unless it's explicitly disabled
|
||||||
if (!isset($packageConfig['repositories']['packagist']) || $packageConfig['repositories']['packagist'] !== false) {
|
if (!isset($packageConfig['repositories']['packagist']) || $packageConfig['repositories']['packagist'] !== false) {
|
||||||
$this->addPackagistRepository($rm);
|
$this->addPackagistRepository($rm);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// load local repository
|
||||||
$this->addLocalRepository($rm, $vendorDir);
|
$this->addLocalRepository($rm, $vendorDir);
|
||||||
|
|
||||||
// load package
|
// load package
|
||||||
$loader = new Package\Loader\RootPackageLoader($rm);
|
$loader = new Package\Loader\RootPackageLoader($rm);
|
||||||
$package = $loader->load($packageConfig);
|
$package = $loader->load($packageConfig);
|
||||||
|
|
||||||
|
// initialize download manager
|
||||||
|
$dm = $this->createDownloadManager($io);
|
||||||
|
|
||||||
|
// initialize installation manager
|
||||||
|
$im = $this->createInstallationManager($rm, $dm, $vendorDir, $binDir, $io);
|
||||||
|
|
||||||
// init locker
|
// init locker
|
||||||
$lockFile = substr($composerFile, -5) === '.json' ? substr($composerFile, 0, -4).'lock' : $composerFile . '.lock';
|
$lockFile = substr($composerFile, -5) === '.json' ? substr($composerFile, 0, -4).'lock' : $composerFile . '.lock';
|
||||||
$locker = new Package\Locker(new JsonFile($lockFile), $rm, md5_file($composerFile));
|
$locker = new Package\Locker(new JsonFile($lockFile), $rm, md5_file($composerFile));
|
||||||
|
@ -101,9 +103,9 @@ class Factory
|
||||||
return $composer;
|
return $composer;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function createRepositoryManager(IOInterface $io, $vendorDir)
|
protected function createRepositoryManager(IOInterface $io)
|
||||||
{
|
{
|
||||||
$rm = new Repository\RepositoryManager($io);
|
$rm = new RepositoryManager($io);
|
||||||
$rm->setRepositoryClass('composer', 'Composer\Repository\ComposerRepository');
|
$rm->setRepositoryClass('composer', 'Composer\Repository\ComposerRepository');
|
||||||
$rm->setRepositoryClass('vcs', 'Composer\Repository\VcsRepository');
|
$rm->setRepositoryClass('vcs', 'Composer\Repository\VcsRepository');
|
||||||
$rm->setRepositoryClass('pear', 'Composer\Repository\PearRepository');
|
$rm->setRepositoryClass('pear', 'Composer\Repository\PearRepository');
|
||||||
|
|
Loading…
Reference in New Issue