Skip to content

Commit b7bad2c

Browse files
authored
Merge pull request #3 from delamart/master
Show commit when version is dev-*
2 parents 7c646d8 + a0726e0 commit b7bad2c

File tree

1 file changed

+18
-4
lines changed

1 file changed

+18
-4
lines changed

composer-lock-diff

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,41 @@ function diff($key) {
2222
$data = json_decode(implode("\n", $lines));
2323

2424
foreach($data->$key as $pkg) {
25-
$pkgs[$pkg->name] = array($pkg->version, 'REMOVED');
25+
$pkgs[$pkg->name] = array(version($pkg), 'REMOVED');
2626
}
2727

2828
$data = json_decode(file_get_contents('composer.lock'));
2929

3030
foreach($data->$key as $pkg) {
3131
if (! array_key_exists($pkg->name, $pkgs)) {
32-
$pkgs[$pkg->name] = array('NEW', $pkg->version);
32+
$pkgs[$pkg->name] = array('NEW', version($pkg));
3333
continue;
3434
}
3535

36-
if ($pkgs[$pkg->name][0] == $pkg->version) {
36+
if ($pkgs[$pkg->name][0] == version($pkg)) {
3737
unset($pkgs[$pkg->name]);
3838
} else {
39-
$pkgs[$pkg->name][1] = $pkg->version;
39+
$pkgs[$pkg->name][1] = version($pkg);
4040
}
4141
}
4242

4343
return $pkgs;
4444
}
4545

46+
function version($pkg)
47+
{
48+
$version = null;
49+
if(substr($pkg->version,0,4) == 'dev-')
50+
{
51+
$version = substr($pkg->source->reference,0,7);
52+
}
53+
else
54+
{
55+
$version = $pkg->version;
56+
}
57+
return $version;
58+
}
59+
4660
function hasOpt($opt) {
4761
global $argv;
4862
$prefix = strlen($opt) === 1 ? '-' : '--';

0 commit comments

Comments
 (0)