public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Refactor self.version update to work on all link types, refs #1883

pull/1887/merge
Jordi Boggiano 2013-05-12 13:50:54 +02:00
parent 460ab04d4d
commit bebe86262a
1 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/Composer/Command/CreateProjectCommand.php
View File

@ -32,10 +32,10 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Finder\Finder; use Symfony\Component\Finder\Finder;
use Composer\Json\JsonFile; use Composer\Json\JsonFile;
use Composer\Config\JsonConfigSource;
use Composer\Util\Filesystem; use Composer\Util\Filesystem;
use Composer\Util\RemoteFilesystem; use Composer\Util\RemoteFilesystem;
use Composer\Package\Version\VersionParser; use Composer\Package\Version\VersionParser;
use Composer\Json\JsonManipulator;
/** /**
* Install a package as new project into new directory. * Install a package as new project into new directory.
@ -236,7 +236,7 @@ EOT
return 1; return 1;
} }
$vcsWasRemoved = false; $hasVcs = $installedFromVcs;
if (!$keepVcs && $installedFromVcs if (!$keepVcs && $installedFromVcs
&& ( && (
!$io->isInteractive() !$io->isInteractive()
@ -262,46 +262,25 @@ EOT
$io->write('<error>An error occurred while removing the VCS metadata: '.$e->getMessage().'</error>'); $io->write('<error>An error occurred while removing the VCS metadata: '.$e->getMessage().'</error>');
} }
$vcsWasRemoved = true; $hasVcs = false;
} }
// Rewriting self.version dependencies with explicit version numbers // rewriting self.version dependencies with explicit version numbers if the package's vcs metadata is gone
if($vcsWasRemoved || !$installedFromVcs) { if (!$hasVcs) {
$package = $composer->getPackage(); $package = $composer->getPackage();
$requires = $package->getRequires(); $configSource = new JsonConfigSource(new JsonFile('composer.json'));
foreach (BasePackage::$supportedLinkTypes as $type => $meta) {
$requirementsToUpdate = array(); foreach ($package->{'get'.$meta['method']}() as $link) {
foreach($requires as $require) { if ($link->getPrettyConstraint() === 'self.version') {
if($require->getPrettyConstraint() == 'self.version') { $configSource->addLink($type, $link->getTarget(), $package->getPrettyVersion());
$requirementsToUpdate[] = $require->getTarget();
} }
} }
if($requirementsToUpdate) {
$io->write("<info>Rewriting self.version entries for " . implode(", ",$requirementsToUpdate) . " to " . $package->getVersion() . "</info>");
$this->rewriteSelfVersion(Factory::getComposerFile(), $requirementsToUpdate, $package->getVersion());
} }
} }
return 0; return 0;
} }
private function rewriteSelfVersion($filename, array $packages, $newVersion)
{
$contents = file_get_contents($filename);
$manipulator = new JsonManipulator($contents);
foreach ($packages as $package) {
if (!$manipulator->addLink('require', $package, $newVersion)) {
return false;
}
}
file_put_contents($filename, $manipulator->getContents());
return true;
}
protected function createDownloadManager(IOInterface $io, Config $config) protected function createDownloadManager(IOInterface $io, Config $config)
{ {
$factory = new Factory(); $factory = new Factory();