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

Use proper type hint for local repo

pull/9465/head
Jordi Boggiano 2020-11-12 10:38:45 +01:00
parent b78b2df5bb
commit dfca939f3b
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Composer/Installer.php
View File

@ -54,12 +54,12 @@ use Composer\Package\PackageInterface;
use Composer\Package\RootPackageInterface; use Composer\Package\RootPackageInterface;
use Composer\Repository\CompositeRepository; use Composer\Repository\CompositeRepository;
use Composer\Repository\InstalledArrayRepository; use Composer\Repository\InstalledArrayRepository;
use Composer\Repository\InstalledRepositoryInterface;
use Composer\Repository\InstalledRepository; use Composer\Repository\InstalledRepository;
use Composer\Repository\RootPackageRepository; use Composer\Repository\RootPackageRepository;
use Composer\Repository\PlatformRepository; use Composer\Repository\PlatformRepository;
use Composer\Repository\RepositoryInterface; use Composer\Repository\RepositoryInterface;
use Composer\Repository\RepositoryManager; use Composer\Repository\RepositoryManager;
use Composer\Repository\WritableRepositoryInterface;
use Composer\Script\ScriptEvents; use Composer\Script\ScriptEvents;
/** /**
@ -353,7 +353,7 @@ class Installer
return 0; return 0;
} }
protected function doUpdate(RepositoryInterface $localRepo, $doInstall) protected function doUpdate(InstalledRepositoryInterface $localRepo, $doInstall)
{ {
$platformRepo = $this->createPlatformRepo(true); $platformRepo = $this->createPlatformRepo(true);
$aliases = $this->getRootAliases(true); $aliases = $this->getRootAliases(true);
@ -612,11 +612,11 @@ class Installer
} }
/** /**
* @param RepositoryInterface $localRepo * @param InstalledRepositoryInterface $localRepo
* @param bool $alreadySolved Whether the function is called as part of an update command or independently * @param bool $alreadySolved Whether the function is called as part of an update command or independently
* @return int exit code * @return int exit code
*/ */
protected function doInstall(RepositoryInterface $localRepo, $alreadySolved = false) protected function doInstall(InstalledRepositoryInterface $localRepo, $alreadySolved = false)
{ {
$this->io->writeError('<info>Installing dependencies from lock file'.($this->devMode ? ' (including require-dev)' : '').'</info>'); $this->io->writeError('<info>Installing dependencies from lock file'.($this->devMode ? ' (including require-dev)' : '').'</info>');
@ -717,9 +717,7 @@ class Installer
} }
if ($this->executeOperations) { if ($this->executeOperations) {
if ($localRepo instanceof WritableRepositoryInterface) { $localRepo->setDevPackageNames($this->locker->getDevPackageNames());
$localRepo->setDevPackageNames($this->locker->getDevPackageNames());
}
$this->installationManager->execute($localRepo, $localRepoTransaction->getOperations(), $this->devMode, $this->runScripts); $this->installationManager->execute($localRepo, $localRepoTransaction->getOperations(), $this->devMode, $this->runScripts);
} else { } else {
foreach ($localRepoTransaction->getOperations() as $operation) { foreach ($localRepoTransaction->getOperations() as $operation) {