From de1765aa486673bb6c55d414c31b1edbc5841c56 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 20 Feb 2012 11:10:36 +0100 Subject: [PATCH] Remove workaround error detection in install command --- src/Composer/Command/InstallCommand.php | 28 ------------------------- 1 file changed, 28 deletions(-) diff --git a/src/Composer/Command/InstallCommand.php b/src/Composer/Command/InstallCommand.php index fb7531139..5885b033d 100644 --- a/src/Composer/Command/InstallCommand.php +++ b/src/Composer/Command/InstallCommand.php @@ -156,34 +156,6 @@ EOT // solve dependencies $operations = $solver->solve($request); - // check for missing deps - // TODO this belongs in the solver, but this will do for now to report top-level deps missing at least - foreach ($request->getJobs() as $job) { - if ('install' === $job['cmd']) { - foreach ($installedRepo->getPackages() as $package ) { - if ($installedRepo->hasPackage($package) && !$package->isPlatform() && !$installationManager->isPackageInstalled($package)) { - $operations[$job['packageName']] = new InstallOperation($package, Solver::RULE_PACKAGE_NOT_EXIST); - } - if (in_array($job['packageName'], $package->getNames())) { - continue 2; - } - } - foreach ($operations as $operation) { - if ('install' === $operation->getJobType() && in_array($job['packageName'], $operation->getPackage()->getNames())) { - continue 2; - } - if ('update' === $operation->getJobType() && in_array($job['packageName'], $operation->getTargetPackage()->getNames())) { - continue 2; - } - } - - if ($pool->whatProvides($job['packageName'])) { - throw new \UnexpectedValueException('Package '.$job['packageName'].' can not be installed, either because its version constraint is incorrect, or because one of its dependencies was not found.'); - } - throw new \UnexpectedValueException('Package '.$job['packageName'].' was not found in the package pool, check the name for typos.'); - } - } - // execute operations if (!$operations) { $io->write('Nothing to install/update');