refacto

Author: tucksaun

store.go

@@ -44,18 +44,24 @@ type PHPStore struct {
 
 // New creates a new PHP store
 func New(configDir string, reload bool, logger func(msg string, a ...interface{})) *PHPStore {
-	s := &PHPStore{
-		configDir:        configDir,
-		seen:             make(map[string]int),
-		discoveryLogFunc: logger,
-	}
+	s := newEmpty(configDir, logger)
+
 	if reload {
 		_ = os.Remove(filepath.Join(configDir, "php_versions.json"))
 	}
 	s.loadVersions()
 	return s
 }
 
+// newEmpty creates a new "empty" (without loading versions) PHP store
+func newEmpty(configDir string, logger func(msg string, a ...interface{})) *PHPStore {
+	return &PHPStore{
+		configDir:        configDir,
+		seen:             make(map[string]int),
+		discoveryLogFunc: logger,
+	}
+}
+
 // Versions returns all available PHP versions
 func (s *PHPStore) Versions() []*Version {
 	return s.versions

store_test.go

@@ -6,12 +6,11 @@ import (
 )
 
 func TestBestVersion(t *testing.T) {
-	store := New("/dev/null", false, nil)
+	store := newEmpty("/dev/null", nil)
 	for _, v := range []string{"7.4.33", "8.0.27", "8.1.2", "8.1.14", "8.2.1"} {
-		store.addVersion(&Version{
-			Version: v,
-			PHPPath: filepath.Join("/foo", v, "bin", "php"),
-		})
+		ver := NewVersion(v)
+		ver.PHPPath = filepath.Join("/foo", v, "bin", "php")
+		store.addVersion(ver)
 
 		if !store.IsVersionAvailable(v) {
 			t.Errorf("Version %s should be shown as available", v)
@@ -23,7 +22,7 @@ func TestBestVersion(t *testing.T) {
 		if bestVersion == nil {
 			t.Error("8 requirement should find a best version")
 		} else if bestVersion.Version != "8.2.1" {
-			t.Error("8 requirement should find 8.2.1 as best version")
+			t.Errorf("8 requirement should find 8.2.1 as best version, got %s", bestVersion.Version)
 		}
 	}
 
@@ -32,7 +31,7 @@ func TestBestVersion(t *testing.T) {
 		if bestVersion == nil {
 			t.Error("8.1 requirement should find a best version")
 		} else if bestVersion.Version != "8.1.14" {
-			t.Error("8.1 requirement should find 8.1.14 as best version")
+			t.Errorf("8.1 requirement should find 8.1.14 as best version, got %s", bestVersion.Version)
 		}
 	}
 
@@ -41,7 +40,7 @@ func TestBestVersion(t *testing.T) {
 		if bestVersion == nil {
 			t.Error("8.0.10 requirement should find a best version")
 		} else if bestVersion.Version != "8.0.27" {
-			t.Error("8.0.10 requirement should find 8.0.27 as best version")
+			t.Errorf("8.0.10 requirement should find 8.0.27 as best version, got %s", bestVersion.Version)
 		} else if warning == "" {
 			t.Error("8.0.10 requirement should trigger a warning")
 		}
@@ -52,7 +51,7 @@ func TestBestVersion(t *testing.T) {
 		if bestVersion == nil {
 			t.Error("8.0.99 requirement should find a best version")
 		} else if bestVersion.Version != "8.0.27" {
-			t.Error("8.0.99 requirement should find 8.0.27 as best version")
+			t.Errorf("8.0.99 requirement should find 8.0.27 as best version, got %s", bestVersion.Version)
 		} else if warning != "" {
 			t.Error("8.0.99 requirement should not trigger a warning")
 		}

version.go

@@ -51,6 +51,13 @@ type Version struct {
 	FrankenPHP    bool             `json:"frankenphp"`
 }
 
+func NewVersion(v string) *Version {
+	return &Version{
+		Version:     v,
+		FullVersion: version.Must(version.NewVersion(v)),
+	}
+}
+
 type versions []*Version
 
 func (vs versions) Len() int           { return len(vs) }