|
@@ -263,30 +263,6 @@ class RuleSetGenerator
|
|
|
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()
|
|
|
{
|
|
|
foreach ($this->jobs as $job) {
|
|
@@ -344,7 +320,6 @@ class RuleSetGenerator
|
|
|
$this->whitelistedMap = array();
|
|
|
foreach ($this->installedMap as $package) {
|
|
|
$this->whitelistFromPackage($package);
|
|
|
- $this->whitelistFromUpdatePackages($package);
|
|
|
}
|
|
|
$this->whitelistFromJobs();
|
|
|
|
|
@@ -353,7 +328,6 @@ class RuleSetGenerator
|
|
|
$this->addedMap = array();
|
|
|
foreach ($this->installedMap as $package) {
|
|
|
$this->addRulesForPackage($package, $ignorePlatformReqs);
|
|
|
- $this->addRulesForUpdatePackages($package, $ignorePlatformReqs);
|
|
|
}
|
|
|
|
|
|
$this->addRulesForJobs($ignorePlatformReqs);
|