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

Allow parsing of branches with invalid names but explicit versions in composer.json

pull/149/head
Jordi Boggiano 2011-12-07 11:44:03 +01:00
parent 283745d76d
commit 381fcb248a
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Composer/Repository/VcsRepository.php
View File

@ -120,22 +120,27 @@ class VcsRepository extends ArrayRepository
$this->addPackage($loader->load($this->preProcess($driver, $data, $identifier))); $this->addPackage($loader->load($this->preProcess($driver, $data, $identifier)));
} elseif ($debug) { } elseif ($debug) {
echo 'Skipped tag '.$tag.', invalid name or no composer file'.PHP_EOL; echo 'Skipped tag '.$tag.', '.($parsedTag ? 'no composer file was found' : 'invalid name').PHP_EOL;
} }
} }
foreach ($driver->getBranches() as $branch => $identifier) { foreach ($driver->getBranches() as $branch => $identifier) {
$parsedBranch = $this->validateBranch($versionParser, $branch); $parsedBranch = $this->validateBranch($versionParser, $branch);
if ($parsedBranch && $driver->hasComposerFile($identifier)) { if ($driver->hasComposerFile($identifier)) {
$data = $driver->getComposerInformation($identifier); $data = $driver->getComposerInformation($identifier);
// manually versioned package // manually versioned package
if (isset($data['version'])) { if (isset($data['version'])) {
$data['version_normalized'] = $versionParser->normalize($data['version']); $data['version_normalized'] = $versionParser->normalize($data['version']);
} else { } elseif ($parsedBranch) {
// auto-versionned package, read value from branch name // auto-versionned package, read value from branch name
$data['version'] = $branch; $data['version'] = $branch;
$data['version_normalized'] = $parsedBranch; $data['version_normalized'] = $parsedBranch;
} else {
if ($debug) {
echo 'Skipped branch '.$branch.', invalid name and no composer file was found'.PHP_EOL;
}
continue;
} }
// make sure branch packages have a -dev flag // make sure branch packages have a -dev flag
@ -160,7 +165,7 @@ class VcsRepository extends ArrayRepository
$this->addPackage($loader->load($this->preProcess($driver, $data, $identifier))); $this->addPackage($loader->load($this->preProcess($driver, $data, $identifier)));
} elseif ($debug) { } elseif ($debug) {
echo 'Skipped branch '.$branch.', invalid name or no composer file'.PHP_EOL; echo 'Skipped branch '.$branch.', no composer file was found'.PHP_EOL;
} }
} }
} }