浏览代码

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

Nils Adermann 6 年之前
父节点
当前提交
1211ba1d51
共有 1 个文件被更改,包括 1 次插入10 次删除
  1. 1 10
      src/Composer/Installer.php

+ 1 - 10
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(