Normalize configuration for PHP versions

LeoOnTheEarth · LeoOnTheEarth · commit a61a88c4d9fb · 2023-01-14T13:17:56.000+08:00
diff --git a/configuration/configuration.go b/configuration/configuration.go
@@ -145,6 +145,17 @@ func (c *Configuration) OnlyRunExtraAnsiblePlaybooks() bool {
 	return c.onlyRunExtraAnsiblePlaybooks
 }
 
+func (c *Configuration) Normalize() {
+	phpVersions := make([]string, 0)
+	for _, version := range c.PHP.Versions {
+		if version != c.PHP.DefaultVersion {
+			phpVersions = append(phpVersions, version)
+		}
+	}
+	phpVersions = append(phpVersions, c.PHP.DefaultVersion)
+	c.PHP.Versions = phpVersions
+}
+
 // Load loads configuration from config.json file.
 func Load() (c *Configuration, err error) {
 	var content []byte
@@ -165,6 +176,8 @@ func Load() (c *Configuration, err error) {
 		}
 	}
 
+	c.Normalize()
+
 	if content, err = json.MarshalIndent(c, "", "  "); nil != err {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,17 @@ func (c *Configuration) OnlyRunExtraAnsiblePlaybooks() bool {`
`145`	`145`	`return c.onlyRunExtraAnsiblePlaybooks`
`146`	`146`	`}`
`147`	`147`
	`148`	`+func (c *Configuration) Normalize() {`
	`149`	`+ phpVersions := make([]string, 0)`
	`150`	`+ for _, version := range c.PHP.Versions {`
	`151`	`+ if version != c.PHP.DefaultVersion {`
	`152`	`+ phpVersions = append(phpVersions, version)`
	`153`	`+ }`
	`154`	`+ }`
	`155`	`+ phpVersions = append(phpVersions, c.PHP.DefaultVersion)`
	`156`	`+ c.PHP.Versions = phpVersions`
	`157`	`+}`
	`158`	`+`
`148`	`159`	`// Load loads configuration from config.json file.`
`149`	`160`	`func Load() (c *Configuration, err error) {`
`150`	`161`	`var content []byte`
`@@ -165,6 +176,8 @@ func Load() (c *Configuration, err error) {`
`165`	`176`	`}`
`166`	`177`	`}`
`167`	`178`
	`179`	`+ c.Normalize()`
	`180`	`+`
`168`	`181`	`if content, err = json.MarshalIndent(c, "", " "); nil != err {`
`169`	`182`	`return nil, err`
`170`	`183`	`}`