From c993f3e92d40f90d0e46d2cec71c503b35db553c Mon Sep 17 00:00:00 2001 From: Hugo Hamon Date: Wed, 11 Jan 2012 09:02:59 +0100 Subject: [PATCH 01/11] [Command] removed unused local $recommendedDependencies variable in DependsCommand::getReferences() method. --- src/Composer/Command/DependsCommand.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Composer/Command/DependsCommand.php b/src/Composer/Command/DependsCommand.php index 9079e46af..aa720adaa 100644 --- a/src/Composer/Command/DependsCommand.php +++ b/src/Composer/Command/DependsCommand.php @@ -63,7 +63,6 @@ EOT $needle = $input->getArgument('package'); $references = array(); - $recommendedDependencies = array(); // check if we have a local installation so we can grab the right package/version $repos = array_merge( From 747abf6843281c78e5b9a6d18b0abef85299568a Mon Sep 17 00:00:00 2001 From: Hugo Hamon Date: Wed, 11 Jan 2012 09:05:23 +0100 Subject: [PATCH 02/11] [Command] removed unused local variable $composer in UpdateCommand::execute() method. --- src/Composer/Command/UpdateCommand.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Composer/Command/UpdateCommand.php b/src/Composer/Command/UpdateCommand.php index 4384b955f..6b46199c0 100644 --- a/src/Composer/Command/UpdateCommand.php +++ b/src/Composer/Command/UpdateCommand.php @@ -53,9 +53,8 @@ EOT protected function execute(InputInterface $input, OutputInterface $output) { - $composer = $this->getComposer(); - $installCommand = $this->getApplication()->find('install'); + return $installCommand->install($input, $output, true); } } From 9acbb0c026d3855d7ef150e105f31c6af677e4b0 Mon Sep 17 00:00:00 2001 From: Hugo Hamon Date: Wed, 11 Jan 2012 09:11:27 +0100 Subject: [PATCH 03/11] [DependencyResolver] removed unused local variables and fixed some wrong local variable names in Solver class. --- src/Composer/DependencyResolver/Solver.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Composer/DependencyResolver/Solver.php b/src/Composer/DependencyResolver/Solver.php index cc1ec4e92..2b6498965 100644 --- a/src/Composer/DependencyResolver/Solver.php +++ b/src/Composer/DependencyResolver/Solver.php @@ -1078,9 +1078,7 @@ class Solver protected function createTransaction() { $transaction = array(); - $installMeansUpdateMap = array(); - $ignoreRemoveMap = array(); foreach ($this->decisionQueue as $i => $literal) { $package = $literal->getPackage(); @@ -1739,7 +1737,7 @@ class Solver $level = 1; $systemLevel = $level + 1; - $minimizationsteps = 0; + $minimizationSteps = 0; $installedPos = 0; $this->installedPackages = $this->installed->getPackages(); @@ -1930,7 +1928,7 @@ class Solver $installedPos = 0; } - $systemlevel = $level + 1; + $systemLevel = $level + 1; if ($pass < 2) { // had trouble => retry From 535455606b5742c74351f872ef18cc365948de7c Mon Sep 17 00:00:00 2001 From: Hugo Hamon Date: Wed, 11 Jan 2012 11:23:23 +0100 Subject: [PATCH 04/11] [Downloader] fixed incorrect variable name in FileDownloader class. --- src/Composer/Downloader/FileDownloader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/Downloader/FileDownloader.php b/src/Composer/Downloader/FileDownloader.php index aeb655be4..4508eb294 100644 --- a/src/Composer/Downloader/FileDownloader.php +++ b/src/Composer/Downloader/FileDownloader.php @@ -75,7 +75,7 @@ abstract class FileDownloader implements DownloaderInterface ), )); - copy($url, $filename, $ctx); + copy($url, $fileName, $ctx); } else { copy($url, $fileName); } From 2d1ad6ca327bbe789d4d10c72d16c31f3d6f807c Mon Sep 17 00:00:00 2001 From: Hugo Hamon Date: Wed, 11 Jan 2012 11:26:45 +0100 Subject: [PATCH 05/11] [Package] removed unused local $repositories variable from RootPackageLoader::load() method. --- src/Composer/Package/Loader/RootPackageLoader.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Composer/Package/Loader/RootPackageLoader.php b/src/Composer/Package/Loader/RootPackageLoader.php index 1ce78cc82..294dd3f42 100644 --- a/src/Composer/Package/Loader/RootPackageLoader.php +++ b/src/Composer/Package/Loader/RootPackageLoader.php @@ -44,7 +44,6 @@ class RootPackageLoader extends ArrayLoader $package = parent::load($config); if (isset($config['repositories'])) { - $repositories = array(); foreach ($config['repositories'] as $repoName => $repo) { if (false === $repo && 'packagist' === $repoName) { continue; From 488928b9b50f2f83810cd05a19d76ecd35836acb Mon Sep 17 00:00:00 2001 From: Hugo Hamon Date: Wed, 11 Jan 2012 11:29:12 +0100 Subject: [PATCH 06/11] [Package] removed unused local $key variable from VersionParser::parseConstraints() method. --- src/Composer/Package/Version/VersionParser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/Package/Version/VersionParser.php b/src/Composer/Package/Version/VersionParser.php index e5006d824..7bd941d93 100644 --- a/src/Composer/Package/Version/VersionParser.php +++ b/src/Composer/Package/Version/VersionParser.php @@ -112,7 +112,7 @@ class VersionParser if (count($constraints) > 1) { $constraintObjects = array(); - foreach ($constraints as $key => $constraint) { + foreach ($constraints as $constraint) { $constraintObjects = array_merge($constraintObjects, $this->parseConstraint($constraint)); } } else { From 66f214e446639e9a48a69ac0be659b2b342201fa Mon Sep 17 00:00:00 2001 From: Hugo Hamon Date: Wed, 11 Jan 2012 11:30:46 +0100 Subject: [PATCH 07/11] [Repository] removed unused $requires local variable from PearRepository::fetchFromServer() method. --- src/Composer/Repository/PearRepository.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Composer/Repository/PearRepository.php b/src/Composer/Repository/PearRepository.php index b19620b3a..0e00a39c7 100644 --- a/src/Composer/Repository/PearRepository.php +++ b/src/Composer/Repository/PearRepository.php @@ -102,7 +102,6 @@ class PearRepository extends ArrayRepository } $deps = unserialize($deps); if (isset($deps['required']['package'])) { - $requires = array(); if (isset($deps['required']['package']['name'])) { $deps['required']['package'] = array($deps['required']['package']); From 7842149a518e04e075ecade299cbcceee5d29e1a Mon Sep 17 00:00:00 2001 From: Hugo Hamon Date: Wed, 11 Jan 2012 11:33:21 +0100 Subject: [PATCH 08/11] [Repository] removed unused local $match variable from GitBitbucketDriver::supports() method. --- src/Composer/Repository/Vcs/GitBitbucketDriver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/Repository/Vcs/GitBitbucketDriver.php b/src/Composer/Repository/Vcs/GitBitbucketDriver.php index 0578a8e85..6a15a4fa7 100644 --- a/src/Composer/Repository/Vcs/GitBitbucketDriver.php +++ b/src/Composer/Repository/Vcs/GitBitbucketDriver.php @@ -158,6 +158,6 @@ class GitBitbucketDriver implements VcsDriverInterface */ public static function supports($url, $deep = false) { - return preg_match('#^https://bitbucket\.org/([^/]+)/(.+?)\.git$#', $url, $match); + return preg_match('#^https://bitbucket\.org/([^/]+)/(.+?)\.git$#', $url); } } From 70d7ab43ee458f3ab7462d03efa0e01357fe501c Mon Sep 17 00:00:00 2001 From: Hugo Hamon Date: Wed, 11 Jan 2012 11:34:45 +0100 Subject: [PATCH 09/11] [Repository] removed unused local $match variable from GitHubDriver::supports() method. --- src/Composer/Repository/Vcs/GitHubDriver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/Repository/Vcs/GitHubDriver.php b/src/Composer/Repository/Vcs/GitHubDriver.php index 44227ef91..8e7cb46c5 100644 --- a/src/Composer/Repository/Vcs/GitHubDriver.php +++ b/src/Composer/Repository/Vcs/GitHubDriver.php @@ -146,6 +146,6 @@ class GitHubDriver implements VcsDriverInterface */ public static function supports($url, $deep = false) { - return extension_loaded('openssl') && preg_match('#^(?:https?|git)://github\.com/([^/]+)/(.+?)(?:\.git)?$#', $url, $match); + return extension_loaded('openssl') && preg_match('#^(?:https?|git)://github\.com/([^/]+)/(.+?)(?:\.git)?$#', $url); } } From 09f0ba66042b04d4805608308f22a37188397ae6 Mon Sep 17 00:00:00 2001 From: Hugo Hamon Date: Wed, 11 Jan 2012 11:35:36 +0100 Subject: [PATCH 10/11] [Repository] removed unused local $match variable from HgBitbucketDriver::supports() method. --- src/Composer/Repository/Vcs/HgBitbucketDriver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/Repository/Vcs/HgBitbucketDriver.php b/src/Composer/Repository/Vcs/HgBitbucketDriver.php index 515e90d36..3594270d6 100644 --- a/src/Composer/Repository/Vcs/HgBitbucketDriver.php +++ b/src/Composer/Repository/Vcs/HgBitbucketDriver.php @@ -158,6 +158,6 @@ class HgBitbucketDriver implements VcsDriverInterface */ public static function supports($url, $deep = false) { - return preg_match('#^https://bitbucket\.org/([^/]+)/([^/]+)/?$#', $url, $match); + return preg_match('#^https://bitbucket\.org/([^/]+)/([^/]+)/?$#', $url); } } From 398efbb894c8830d1ac07e1a9f9b2f8ae44e7da1 Mon Sep 17 00:00:00 2001 From: Hugo Hamon Date: Wed, 11 Jan 2012 11:38:51 +0100 Subject: [PATCH 11/11] [Repository] removed unused local $versions variable from VcsRepository::initialize() method. --- src/Composer/Repository/VcsRepository.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Composer/Repository/VcsRepository.php b/src/Composer/Repository/VcsRepository.php index 9b66963bc..009f66549 100644 --- a/src/Composer/Repository/VcsRepository.php +++ b/src/Composer/Repository/VcsRepository.php @@ -70,7 +70,6 @@ class VcsRepository extends ArrayRepository $versionParser = new VersionParser; $loader = new ArrayLoader(); - $versions = array(); if ($driver->hasComposerFile($driver->getRootIdentifier())) { $data = $driver->getComposerInformation($driver->getRootIdentifier());