hugo
/
composer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move all logic within try/catch to prevent an incorrect version from blowing up the whole package

Browse Source
main
Jordi Boggiano 12 years ago
parent 28941f169b
commit c454d93a20
1 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File

90
src/Composer/Repository/VcsRepository.php
Unescape Escape View File

@ -34,7 +34,7 @@ class VcsRepository extends ArrayRepository
protected $versionParser; protected $versionParser;
protected $type; protected $type;
public function __construct(array $repoConfig, IOInterface $io, Config $config = null, array $drivers = null) public function __construct(array $repoConfig, IOInterface $io, Config $config, array $drivers = null)
{ {
$this->drivers = $drivers ?: array( $this->drivers = $drivers ?: array(
'github' => 'Composer\Repository\Vcs\GitHubDriver', 'github' => 'Composer\Repository\Vcs\GitHubDriver',
@ -104,7 +104,7 @@ class VcsRepository extends ArrayRepository
} }
foreach ($driver->getTags() as $tag => $identifier) { foreach ($driver->getTags() as $tag => $identifier) {
$msg = 'Get composer info for <info>' . ($this->packageName ?: $this->url) . '</info> (<comment>' . $tag . '</comment>)'; $msg = 'Reading composer.json of <info>' . ($this->packageName ?: $this->url) . '</info> (<comment>' . $tag . '</comment>)';
if ($verbose) { if ($verbose) {
$this->io->write($msg); $this->io->write($msg);
} else { } else {
@ -125,45 +125,45 @@ class VcsRepository extends ArrayRepository
} }
continue; continue;
} }
} catch (\Exception $e) {
if ($verbose) { // manually versioned package
$this->io->write('Skipped tag '.$tag.', '.($e instanceof TransportException ? 'no composer file was found' : $e->getMessage())); if (isset($data['version'])) {
$data['version_normalized'] = $this->versionParser->normalize($data['version']);
} else {
// auto-versionned package, read value from tag
$data['version'] = $tag;
$data['version_normalized'] = $parsedTag;
} }
continue;
}
// manually versioned package // make sure tag packages have no -dev flag
if (isset($data['version'])) { $data['version'] = preg_replace('{[.-]?dev$}i', '', $data['version']);
$data['version_normalized'] = $this->versionParser->normalize($data['version']); $data['version_normalized'] = preg_replace('{(^dev-|[.-]?dev$)}i', '', $data['version_normalized']);
} else {
// auto-versionned package, read value from tag
$data['version'] = $tag;
$data['version_normalized'] = $parsedTag;
}
// make sure tag packages have no -dev flag // broken package, version doesn't match tag
$data['version'] = preg_replace('{[.-]?dev$}i', '', $data['version']); if ($data['version_normalized'] !== $parsedTag) {
$data['version_normalized'] = preg_replace('{(^dev-|[.-]?dev$)}i', '', $data['version_normalized']); if ($verbose) {
$this->io->write('Skipped tag '.$tag.', tag ('.$parsedTag.') does not match version ('.$data['version_normalized'].') in composer.json');
}
continue;
}
// broken package, version doesn't match tag
if ($data['version_normalized'] !== $parsedTag) {
if ($verbose) { if ($verbose) {
$this->io->write('Skipped tag '.$tag.', tag ('.$parsedTag.') does not match version ('.$data['version_normalized'].') in composer.json'); $this->io->write('Importing tag '.$tag.' ('.$data['version_normalized'].')');
} }
continue;
}
if ($verbose) { $this->addPackage($loader->load($this->preProcess($driver, $data, $identifier)));
$this->io->write('Importing tag '.$tag.' ('.$data['version_normalized'].')'); } catch (\Exception $e) {
if ($verbose) {
$this->io->write('Skipped tag '.$tag.', '.($e instanceof TransportException ? 'no composer file was found' : $e->getMessage()));
}
continue;
} }
$this->addPackage($loader->load($this->preProcess($driver, $data, $identifier)));
} }
$this->io->overwrite('', false); $this->io->overwrite('', false);
foreach ($driver->getBranches() as $branch => $identifier) { foreach ($driver->getBranches() as $branch => $identifier) {
$msg = 'Get composer info for <info>' . ($this->packageName ?: $this->url) . '</info> (<comment>' . $branch . '</comment>)'; $msg = 'Reading composer.json of <info>' . ($this->packageName ?: $this->url) . '</info> (<comment>' . $branch . '</comment>)';
if ($verbose) { if ($verbose) {
$this->io->write($msg); $this->io->write($msg);
} else { } else {
@ -184,6 +184,23 @@ class VcsRepository extends ArrayRepository
} }
continue; continue;
} }
// branches are always auto-versionned, read value from branch name
$data['version'] = $branch;
$data['version_normalized'] = $parsedBranch;
// make sure branch packages have a dev flag
if ('dev-' === substr($parsedBranch, 0, 4) || '9999999-dev' === $parsedBranch) {
$data['version'] = 'dev-' . $data['version'];
} else {
$data['version'] = preg_replace('{(\.9{7})+}', '.x', $parsedBranch);
}
if ($verbose) {
$this->io->write('Importing branch '.$branch.' ('.$data['version'].')');
}
$this->addPackage($loader->load($this->preProcess($driver, $data, $identifier)));
} catch (TransportException $e) { } catch (TransportException $e) {
if ($verbose) { if ($verbose) {
$this->io->write('Skipped branch '.$branch.', no composer file was found'); $this->io->write('Skipped branch '.$branch.', no composer file was found');
@ -193,23 +210,6 @@ class VcsRepository extends ArrayRepository
$this->io->write('Skipped branch '.$branch.', '.$e->getMessage()); $this->io->write('Skipped branch '.$branch.', '.$e->getMessage());
continue; continue;
} }
// branches are always auto-versionned, read value from branch name
$data['version'] = $branch;
$data['version_normalized'] = $parsedBranch;
// make sure branch packages have a dev flag
if ('dev-' === substr($parsedBranch, 0, 4) || '9999999-dev' === $parsedBranch) {
$data['version'] = 'dev-' . $data['version'];
} else {
$data['version'] = preg_replace('{(\.9{7})+}', '.x', $parsedBranch);
}
if ($verbose) {
$this->io->write('Importing branch '.$branch.' ('.$data['version'].')');
}
$this->addPackage($loader->load($this->preProcess($driver, $data, $identifier)));
} }
$this->io->overwrite('', false); $this->io->overwrite('', false);

Write Preview
Loading…
Cancel
Save