Merge pull request davidrjonas#34 from stof/patch-1

davidrjonas · web-flow · commit 4b2c196d335f · 2022-03-11T09:20:03.000-08:00
Fix the detection of dev versions for semver branches
diff --git a/composer-lock-diff b/composer-lock-diff
@@ -69,7 +69,7 @@ function diff($key, $data_from, $data_to) {
 
 function version($pkg)
 {
-    if(substr($pkg->version,0,4) == 'dev-' && isset($pkg->source) && isset($pkg->source->reference)) {
+    if((substr($pkg->version,0,4) == 'dev-' || '-dev' === substr($pkg->version, -4)) && isset($pkg->source) && isset($pkg->source->reference)) {
         $version = substr($pkg->source->reference,0,7) ?: '';
     } else {
         $version = (string) $pkg->version;

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ function diff($key, $data_from, $data_to) {`
`69`	`69`
`70`	`70`	`function version($pkg)`
`71`	`71`	`{`
`72`		`- if(substr($pkg->version,0,4) == 'dev-' && isset($pkg->source) && isset($pkg->source->reference)) {`
	`72`	`+ if((substr($pkg->version,0,4) == 'dev-' \|\| '-dev' === substr($pkg->version, -4)) && isset($pkg->source) && isset($pkg->source->reference)) {`
`73`	`73`	`$version = substr($pkg->source->reference,0,7) ?: '';`
`74`	`74`	`} else {`
`75`	`75`	`$version = (string) $pkg->version;`