From ebfceefca6df3c1b184f01921b7f2ce7032e6731 Mon Sep 17 00:00:00 2001 From: Niels Keurentjes Date: Mon, 15 Feb 2016 22:00:54 +0100 Subject: [PATCH] Removed long deprecated functions that were no longer referenced anywhere. --- src/Composer/DependencyResolver/DefaultPolicy.php | 10 ---------- src/Composer/DependencyResolver/Rule.php | 8 -------- src/Composer/Repository/RepositoryManager.php | 13 ------------- 3 files changed, 31 deletions(-) diff --git a/src/Composer/DependencyResolver/DefaultPolicy.php b/src/Composer/DependencyResolver/DefaultPolicy.php index 5c94c4680..542c6e625 100644 --- a/src/Composer/DependencyResolver/DefaultPolicy.php +++ b/src/Composer/DependencyResolver/DefaultPolicy.php @@ -62,16 +62,6 @@ class DefaultPolicy implements PolicyInterface return $pool->getPriority($package->getRepository()); } - /** - * @deprecated Method has been renamed to selectPreferredPackages, you should update usages - */ - public function selectPreferedPackages(Pool $pool, array $installedMap, array $literals, $requiredPackage = null) - { - trigger_error('Method selectPreferedPackages is deprecated and replaced by selectPreferredPackages, please update your usage', E_USER_DEPRECATED); - - return $this->selectPreferredPackages($pool, $installedMap, $literals, $requiredPackage); - } - public function selectPreferredPackages(Pool $pool, array $installedMap, array $literals, $requiredPackage = null) { $packages = $this->groupLiteralsByNamePreferInstalled($pool, $installedMap, $literals); diff --git a/src/Composer/DependencyResolver/Rule.php b/src/Composer/DependencyResolver/Rule.php index 54a002203..fbf2b92f8 100644 --- a/src/Composer/DependencyResolver/Rule.php +++ b/src/Composer/DependencyResolver/Rule.php @@ -147,14 +147,6 @@ class Rule return !(($this->bitfield & (255 << self::BITFIELD_DISABLED)) >> self::BITFIELD_DISABLED); } - /** - * @deprecated Use public literals member - */ - public function getLiterals() - { - return $this->literals; - } - public function isAssertion() { return 1 === count($this->literals); diff --git a/src/Composer/Repository/RepositoryManager.php b/src/Composer/Repository/RepositoryManager.php index 42c14106f..05dcc1b4a 100644 --- a/src/Composer/Repository/RepositoryManager.php +++ b/src/Composer/Repository/RepositoryManager.php @@ -154,17 +154,4 @@ class RepositoryManager { return $this->localRepository; } - - /** - * Returns all local repositories for the project. - * - * @deprecated getLocalDevRepository is gone, so this is useless now, just use getLocalRepository instead - * @return array[WritableRepositoryInterface] - */ - public function getLocalRepositories() - { - trigger_error('This method is deprecated, use getLocalRepository instead since the getLocalDevRepository is now gone', E_USER_DEPRECATED); - - return array($this->localRepository); - } }