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

Make sure branches have proper .x suffix so that they can be parsed properly

pull/571/head
Jordi Boggiano 2012-04-13 02:35:52 +02:00
parent 98380f3aad
commit 2d49090ffd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Package/Loader/ArrayLoader.php
View File

@ -151,7 +151,7 @@ class ArrayLoader
} }
$package->setAlias($validatedTargetBranch); $package->setAlias($validatedTargetBranch);
$package->setPrettyAlias($targetBranch); $package->setPrettyAlias(preg_replace('{(\.9{7})+}', '.x', $validatedTargetBranch));
break; break;
} }
} }

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

@ -200,7 +200,7 @@ class VcsRepository extends ArrayRepository
if ('dev-' === substr($parsedBranch, 0, 4) || '9999999-dev' === $parsedBranch) { if ('dev-' === substr($parsedBranch, 0, 4) || '9999999-dev' === $parsedBranch) {
$data['version'] = 'dev-' . $data['version']; $data['version'] = 'dev-' . $data['version'];
} else { } else {
$data['version'] = $data['version'] . '-dev'; $data['version'] = preg_replace('{(\.9{7})+}', '.x', $parsedBranch);
} }
if ($verbose) { if ($verbose) {