From 1211ba1d5177cf17a635fb8eb0f16db13fdf31a4 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 12 Nov 2018 19:45:10 +0100 Subject: [PATCH] BC break: Remove workaround for loading lock files without dev requires --- src/Composer/Installer.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/Composer/Installer.php b/src/Composer/Installer.php index 19c0015d6..10f115daf 100644 --- a/src/Composer/Installer.php +++ b/src/Composer/Installer.php @@ -350,16 +350,7 @@ class Installer // and a lock file is present as we need to force install non-whitelisted lock file // packages in that case if (!$this->update || (!empty($this->updateWhitelist) && $this->locker->isLocked())) { - try { - $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(); - } + $lockedRepository = $this->locker->getLockedRepository($this->devMode); } $this->whitelistUpdateDependencies(