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

BC break: Remove workaround for loading lock files without dev requires

pull/7936/head
Nils Adermann 2018-11-12 19:45:10 +01:00
parent 287419f6a0
commit 1211ba1d51
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Composer/Installer.php
View File

@ -350,16 +350,7 @@ class Installer
// and a lock file is present as we need to force install non-whitelisted lock file // and a lock file is present as we need to force install non-whitelisted lock file
// packages in that case // packages in that case
if (!$this->update || (!empty($this->updateWhitelist) && $this->locker->isLocked())) { if (!$this->update || (!empty($this->updateWhitelist) && $this->locker->isLocked())) {
try {
$lockedRepository = $this->locker->getLockedRepository($this->devMode); $lockedRepository = $this->locker->getLockedRepository($this->devMode);
} catch (\RuntimeException $e) {
// if there are dev requires, then we really can not install
if ($this->package->getDevRequires()) {
throw $e;
}
// no require-dev in composer.json and the lock file was created with no dev info, so skip them
$lockedRepository = $this->locker->getLockedRepository();
}
} }
$this->whitelistUpdateDependencies( $this->whitelistUpdateDependencies(