Removed unused variables and includes, fixed functions being called with more arguments than declared.

src/Composer/Autoload/ClassMapGenerator.php

@@ -18,7 +18,6 @@
 
 namespace Composer\Autoload;
 
-use Composer\Util\Silencer;
 use Symfony\Component\Finder\Finder;
 use Composer\IO\IOInterface;
 

src/Composer/Command/ShowCommand.php

@@ -125,7 +125,6 @@ EOT
 
         // show single package or single version
         if ($input->getArgument('package') || !empty($package)) {
-            $versions = array();
             if (empty($package)) {
                 list($package, $versions) = $this->getPackage($installedRepo, $repos, $input->getArgument('package'), $input->getArgument('version'));
 
@@ -139,7 +138,7 @@ EOT
             if ($input->getOption('tree')) {
                 $this->displayPackageTree($package, $installedRepo, $repos);
             } else {
-                $this->printMeta($package, $versions, $installedRepo, $repos);
+                $this->printMeta($package, $versions, $installedRepo);
                 $this->printLinks($package, 'requires');
                 $this->printLinks($package, 'devRequires', 'requires (dev)');
                 if ($package->getSuggests()) {

src/Composer/Command/StatusCommand.php

@@ -19,7 +19,6 @@ use Composer\Downloader\ChangeReportInterface;
 use Composer\Plugin\CommandEvent;
 use Composer\Plugin\PluginEvents;
 use Composer\Script\ScriptEvents;
-use Composer\Downloader\VcsDownloader;
 use Composer\Downloader\DvcsDownloaderInterface;
 
 /**

src/Composer/DependencyResolver/PolicyInterface.php

@@ -23,5 +23,5 @@ interface PolicyInterface
 
     public function findUpdatePackages(Pool $pool, array $installedMap, PackageInterface $package);
 
-    public function selectPreferredPackages(Pool $pool, array $installedMap, array $literals);
+    public function selectPreferredPackages(Pool $pool, array $installedMap, array $literals, $requiredPackage = null);
 }

src/Composer/DependencyResolver/Solver.php

@@ -789,7 +789,6 @@ class Solver
                     continue;
                 }
 
-                $oLevel = $level;
                 $level = $this->selectAndInstall($level, $decisionQueue, $disableRules, $rule);
 
                 if (0 === $level) {
@@ -810,7 +809,6 @@ class Solver
                 $lastLevel = null;
                 $lastBranchIndex = 0;
                 $lastBranchOffset  = 0;
-                $l = 0;
 
                 for ($i = count($this->branches) - 1; $i >= 0; $i--) {
                     list($literals, $l) = $this->branches[$i];
@@ -833,7 +831,6 @@ class Solver
 
                     $why = $this->decisions->lastReason();
 
-                    $oLevel = $level;
                     $level = $this->setPropagateLearn($level, $lastLiteral, $disableRules, $why);
 
                     if ($level == 0) {

src/Composer/Package/Version/VersionSelector.php

@@ -17,7 +17,6 @@ use Composer\Package\BasePackage;
 use Composer\Package\PackageInterface;
 use Composer\Package\Loader\ArrayLoader;
 use Composer\Package\Dumper\ArrayDumper;
-use Composer\Semver\Semver;
 use Composer\Semver\Constraint\Constraint;
 
 /**

src/Composer/Repository/Pear/BaseChannelReader.php

@@ -74,7 +74,6 @@ abstract class BaseChannelReader
         $xml = simplexml_load_string($this->requestContent($origin, $path), "SimpleXMLElement", LIBXML_NOERROR);
 
         if (false == $xml) {
-            $url = rtrim($origin, '/') . '/' . ltrim($path, '/');
             throw new \UnexpectedValueException(sprintf('The PEAR channel at ' . $origin . ' is broken. (Invalid XML at file `%s`)', $path));
         }