File tree Expand file tree Collapse file tree 1 file changed +18
-4
lines changed Expand file tree Collapse file tree 1 file changed +18
-4
lines changed Original file line number Diff line number Diff line change @@ -22,27 +22,41 @@ function diff($key) {
22
22
$ data = json_decode (implode ("\n" , $ lines ));
23
23
24
24
foreach ($ data ->$ key as $ pkg ) {
25
- $ pkgs [$ pkg ->name ] = array ($ pkg-> version , 'REMOVED ' );
25
+ $ pkgs [$ pkg ->name ] = array (version ( $ pkg) , 'REMOVED ' );
26
26
}
27
27
28
28
$ data = json_decode (file_get_contents ('composer.lock ' ));
29
29
30
30
foreach ($ data ->$ key as $ pkg ) {
31
31
if (! array_key_exists ($ pkg ->name , $ pkgs )) {
32
- $ pkgs [$ pkg ->name ] = array ('NEW ' , $ pkg-> version );
32
+ $ pkgs [$ pkg ->name ] = array ('NEW ' , version ( $ pkg) );
33
33
continue ;
34
34
}
35
35
36
- if ($ pkgs [$ pkg ->name ][0 ] == $ pkg-> version ) {
36
+ if ($ pkgs [$ pkg ->name ][0 ] == version ( $ pkg) ) {
37
37
unset($ pkgs [$ pkg ->name ]);
38
38
} else {
39
- $ pkgs [$ pkg ->name ][1 ] = $ pkg-> version ;
39
+ $ pkgs [$ pkg ->name ][1 ] = version ( $ pkg) ;
40
40
}
41
41
}
42
42
43
43
return $ pkgs ;
44
44
}
45
45
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
+
46
60
function hasOpt ($ opt ) {
47
61
global $ argv ;
48
62
$ prefix = strlen ($ opt ) === 1 ? '- ' : '-- ' ;
You can’t perform that action at this time.
0 commit comments