version() to always return a string

davidrjonas · davidrjonas · commit 5d2af3f65571 · 2018-02-18T23:10:45.000-08:00
diff --git a/composer-lock-diff b/composer-lock-diff
@@ -47,15 +47,12 @@ function diff($key, $from, $to, $base_path) {
 
 function version($pkg)
 {
-    $version = null;
-    if(substr($pkg->version,0,4) == 'dev-')
-    {
-        $version = substr($pkg->source->reference,0,7);
-    }
-    else
-    {
-        $version = $pkg->version;
+    if(substr($pkg->version,0,4) == 'dev-') {
+        $version = substr($pkg->source->reference,0,7) ?: '';
+    } else {
+        $version = (string) $pkg->version;
     }
+
     return $version;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -47,15 +47,12 @@ function diff($key, $from, $to, $base_path) {`
`47`	`47`
`48`	`48`	`function version($pkg)`
`49`	`49`	`{`
`50`		`- $version = null;`
`51`		`- if(substr($pkg->version,0,4) == 'dev-')`
`52`		`- {`
`53`		`- $version = substr($pkg->source->reference,0,7);`
`54`		`- }`
`55`		`- else`
`56`		`- {`
`57`		`- $version = $pkg->version;`
	`50`	`+ if(substr($pkg->version,0,4) == 'dev-') {`
	`51`	`+ $version = substr($pkg->source->reference,0,7) ?: '';`
	`52`	`+ } else {`
	`53`	`+ $version = (string) $pkg->version;`
`58`	`54`	`}`
	`55`	`+`
`59`	`56`	`return $version;`
`60`	`57`	`}`
`61`	`58`