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

Merge pull request #3352 from phansys/composer_version 

Added branch-alias to version output when no tags present
pull/3357/head
Jordi Boggiano 2014-10-15 14:11:07 +01:00
parent ded4950433 225a8f7a56
commit c33c5196b1
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Composer/Compiler.php
View File

@ -12,6 +12,7 @@
namespace Composer; namespace Composer;
use Composer\Json\JsonFile;
use Symfony\Component\Finder\Finder; use Symfony\Component\Finder\Finder;
use Symfony\Component\Process\Process; use Symfony\Component\Process\Process;
@ -44,6 +45,14 @@ class Compiler
} }
$this->version = trim($process->getOutput()); $this->version = trim($process->getOutput());
$localConfig = __DIR__.'/../../composer.json';
$file = new JsonFile($localConfig);
$localConfig = $file->read();
if (isset($localConfig['extra']['branch-alias']['dev-master'])) {
$this->version = sprintf('%s (%s)', $localConfig['extra']['branch-alias']['dev-master'], $this->version);
}
$process = new Process('git log -n1 --pretty=%ci HEAD', __DIR__); $process = new Process('git log -n1 --pretty=%ci HEAD', __DIR__);
if ($process->run() != 0) { if ($process->run() != 0) {
throw new \RuntimeException('Can\'t run git log. You must ensure to run compile from composer git repository clone and that git binary is available.'); throw new \RuntimeException('Can\'t run git log. You must ensure to run compile from composer git repository clone and that git binary is available.');