Remove the handling of updates in the generator
Updates are implicitly handled by whatProvides for install requestspull/2734/head
parent
8a40b2443e
commit
ee56db8767
|
@ -263,30 +263,6 @@ class RuleSetGenerator
|
||||||
return $impossible;
|
return $impossible;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds all rules for all update packages of a given package
|
|
||||||
*
|
|
||||||
* @param PackageInterface $package Rules for this package's updates are to
|
|
||||||
* be added
|
|
||||||
*/
|
|
||||||
private function addRulesForUpdatePackages(PackageInterface $package, $ignorePlatformReqs)
|
|
||||||
{
|
|
||||||
$updates = $this->policy->findUpdatePackages($this->pool, $this->installedMap, $package);
|
|
||||||
|
|
||||||
foreach ($updates as $update) {
|
|
||||||
$this->addRulesForPackage($update, $ignorePlatformReqs);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private function whitelistFromUpdatePackages(PackageInterface $package)
|
|
||||||
{
|
|
||||||
$updates = $this->policy->findUpdatePackages($this->pool, $this->installedMap, $package, true);
|
|
||||||
|
|
||||||
foreach ($updates as $update) {
|
|
||||||
$this->whitelistFromPackage($update);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function whitelistFromJobs()
|
protected function whitelistFromJobs()
|
||||||
{
|
{
|
||||||
foreach ($this->jobs as $job) {
|
foreach ($this->jobs as $job) {
|
||||||
|
@ -344,7 +320,6 @@ class RuleSetGenerator
|
||||||
$this->whitelistedMap = array();
|
$this->whitelistedMap = array();
|
||||||
foreach ($this->installedMap as $package) {
|
foreach ($this->installedMap as $package) {
|
||||||
$this->whitelistFromPackage($package);
|
$this->whitelistFromPackage($package);
|
||||||
$this->whitelistFromUpdatePackages($package);
|
|
||||||
}
|
}
|
||||||
$this->whitelistFromJobs();
|
$this->whitelistFromJobs();
|
||||||
|
|
||||||
|
@ -353,7 +328,6 @@ class RuleSetGenerator
|
||||||
$this->addedMap = array();
|
$this->addedMap = array();
|
||||||
foreach ($this->installedMap as $package) {
|
foreach ($this->installedMap as $package) {
|
||||||
$this->addRulesForPackage($package, $ignorePlatformReqs);
|
$this->addRulesForPackage($package, $ignorePlatformReqs);
|
||||||
$this->addRulesForUpdatePackages($package, $ignorePlatformReqs);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->addRulesForJobs($ignorePlatformReqs);
|
$this->addRulesForJobs($ignorePlatformReqs);
|
||||||
|
|
Loading…
Reference in New Issue