Merge branch '2.0'
commit
22cc96682d
|
@ -17,6 +17,7 @@ use Composer\DependencyResolver\Request;
|
||||||
use Composer\Installer;
|
use Composer\Installer;
|
||||||
use Composer\IO\IOInterface;
|
use Composer\IO\IOInterface;
|
||||||
use Composer\Package\Loader\RootPackageLoader;
|
use Composer\Package\Loader\RootPackageLoader;
|
||||||
|
use Composer\Package\RootPackage;
|
||||||
use Composer\Plugin\CommandEvent;
|
use Composer\Plugin\CommandEvent;
|
||||||
use Composer\Plugin\PluginEvents;
|
use Composer\Plugin\PluginEvents;
|
||||||
use Composer\Package\Version\VersionParser;
|
use Composer\Package\Version\VersionParser;
|
||||||
|
@ -155,7 +156,9 @@ EOT
|
||||||
}
|
}
|
||||||
$rootPackage->setRequires($rootRequires);
|
$rootPackage->setRequires($rootRequires);
|
||||||
$rootPackage->setDevRequires($rootDevRequires);
|
$rootPackage->setDevRequires($rootDevRequires);
|
||||||
$rootPackage->setReferences(RootPackageLoader::extractReferences($reqs, $rootPackage->getReferences()));
|
if ($rootPackage instanceof RootPackage) {
|
||||||
|
$rootPackage->setReferences(RootPackageLoader::extractReferences($reqs, $rootPackage->getReferences()));
|
||||||
|
}
|
||||||
$rootPackage->setStabilityFlags(RootPackageLoader::extractStabilityFlags($reqs, $rootPackage->getMinimumStability(), $rootPackage->getStabilityFlags()));
|
$rootPackage->setStabilityFlags(RootPackageLoader::extractStabilityFlags($reqs, $rootPackage->getMinimumStability(), $rootPackage->getStabilityFlags()));
|
||||||
|
|
||||||
if ($input->getOption('interactive')) {
|
if ($input->getOption('interactive')) {
|
||||||
|
|
Loading…
Reference in New Issue