From 6b5f61943afcbacf362a0cb4c4f29ef0cfc578a4 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Sat, 17 Sep 2011 13:23:17 +0200 Subject: [PATCH] Lowercase package names in Request (fixes tests) --- src/Composer/Command/InstallCommand.php | 1 - src/Composer/DependencyResolver/Request.php | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Composer/Command/InstallCommand.php b/src/Composer/Command/InstallCommand.php index 1a3bcbadd..07b85f163 100644 --- a/src/Composer/Command/InstallCommand.php +++ b/src/Composer/Command/InstallCommand.php @@ -82,7 +82,6 @@ EOT // TODO there should be an update flag or dedicated update command // TODO check lock file to remove packages that disappeared from the requirements foreach ($config['require'] as $name => $version) { - $name = strtolower($name); if ('latest' === $version) { $request->install($name); } else { diff --git a/src/Composer/DependencyResolver/Request.php b/src/Composer/DependencyResolver/Request.php index e11aa33e4..e5b5b42e5 100644 --- a/src/Composer/DependencyResolver/Request.php +++ b/src/Composer/DependencyResolver/Request.php @@ -29,27 +29,27 @@ class Request public function install($packageName, LinkConstraintInterface $constraint = null) { - $this->addJob($packageName, 'install', $constraint); + $this->addJob(strtolower($packageName), 'install', $constraint); } public function update($packageName, LinkConstraintInterface $constraint = null) { - $this->addJob($packageName, 'update', $constraint); + $this->addJob(strtolower($packageName), 'update', $constraint); } public function remove($packageName, LinkConstraintInterface $constraint = null) { - $this->addJob($packageName, 'remove', $constraint); + $this->addJob(strtolower($packageName), 'remove', $constraint); } protected function addJob($packageName, $cmd, LinkConstraintInterface $constraint = null) { - $packages = $this->pool->whatProvides($packageName, $constraint); + $packages = $this->pool->whatProvides(strtolower($packageName), $constraint); $this->jobs[] = array( 'packages' => $packages, 'cmd' => $cmd, - 'packageName' => $packageName, + 'packageName' => strtolower($packageName), ); }