Merge branch 'symfony-cli:main' into main

Author: rnapoles

.github/workflows/test.yaml

@@ -5,6 +5,14 @@ on:
     push:
 
 jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v8
+
   test:
     runs-on: ubuntu-latest
     strategy:

.golangci.yml

@@ -0,0 +1,30 @@
+version: "2"
+
+run:
+  issues-exit-code: 1
+
+formatters:
+  enable:
+    - gofmt
+    - gci
+
+linters:
+  enable:
+    - wrapcheck
+  settings:
+    wrapcheck:
+      ignore-package-globs:
+        # We already make sure your own packages wrap errors properly
+        - github.com/symfony-cli/*
+    errcheck:
+        exclude-functions:
+          - github.com/symfony-cli/terminal.Printf
+          - github.com/symfony-cli/terminal.Println
+          - github.com/symfony-cli/terminal.Printfln
+          - github.com/symfony-cli/terminal.Eprintf
+          - github.com/symfony-cli/terminal.Eprintln
+          - github.com/symfony-cli/terminal.Eprintfln
+          - github.com/symfony-cli/terminal.Eprint
+          - fmt.Fprintln
+          - fmt.Fprintf
+          - fmt.Fprint

discovery.go

@@ -59,7 +59,7 @@ func (s *PHPStore) discoverFromDir(root string, phpRegexp *regexp.Regexp, pathRe
 	if pathRegexp != nil {
 		maxDepth += strings.Count(pathRegexp.String(), "/")
 	}
-	filepath.Walk(root, func(path string, finfo os.FileInfo, err error) error {
+	err := filepath.Walk(root, func(path string, finfo os.FileInfo, err error) error {
 		if err != nil {
 			// prevent panic by handling failure accessing a path
 			return nil
@@ -83,6 +83,9 @@ func (s *PHPStore) discoverFromDir(root string, phpRegexp *regexp.Regexp, pathRe
 		}
 		return nil
 	})
+	if err != nil {
+		s.log("error during %s discovery: %s", why, err)
+	}
 }
 
 func (s *PHPStore) addFromDir(dir string, phpRegexp *regexp.Regexp, why string) {
@@ -114,7 +117,7 @@ func (s *PHPStore) findFromDir(dir string, phpRegexp *regexp.Regexp, why string)
 	}
 
 	var versions []*Version
-	filepath.Walk(root, func(path string, finfo os.FileInfo, err error) error {
+	_ = filepath.Walk(root, func(path string, finfo os.FileInfo, err error) error {
 		if err != nil {
 			// prevent panic by handling failure accessing a path
 			return nil
@@ -175,7 +178,7 @@ func (s *PHPStore) discoverPHPViaPHP(dir, binName string) *Version {
 		s.log(`  Unable to run "%s --version: %s"`, php, err)
 		return nil
 	}
-	r := regexp.MustCompile("PHP (\\d+\\.\\d+\\.\\d+)")
+	r := regexp.MustCompile(`PHP (\d+\.\d+\.\d+)`)
 	data := r.FindSubmatch(buf.Bytes())
 	if data == nil {
 		s.log("  %s is not a PHP binary", php)

discovery_others.go

@@ -51,7 +51,7 @@ func (s *PHPStore) doDiscover() {
 
 	// phpenv
 	if homeDir != "" {
-		s.discoverFromDir(filepath.Join(homeDir, ".phpenv", "versions"), nil, regexp.MustCompile("^[\\d\\.]+(?:RC|BETA|snapshot)?$"), "phpenv")
+		s.discoverFromDir(filepath.Join(homeDir, ".phpenv", "versions"), nil, regexp.MustCompile(`^[\d\.]+(?:RC|BETA|snapshot)?$`), "phpenv")
 	}
 
 	// XAMPP
@@ -61,28 +61,28 @@ func (s *PHPStore) doDiscover() {
 	if out, err := exec.Command("brew", "--cellar").Output(); err == nil {
 		prefix := strings.Trim(string(out), "\n")
 		// pattern example: [email protected]/5.6.33_9
-		s.discoverFromDir(prefix, nil, regexp.MustCompile("^php@(?:[\\d\\.]+)/(?:[\\d\\._]+)$"), "homebrew")
+		s.discoverFromDir(prefix, nil, regexp.MustCompile(`^php@(?:[\d\.]+)/(?:[\d\._]+)$`), "homebrew")
 		// pattern example: php/7.2.11
-		s.discoverFromDir(prefix, nil, regexp.MustCompile("^php/(?:[\\d\\._]+)$"), "homebrew")
+		s.discoverFromDir(prefix, nil, regexp.MustCompile(`^php/(?:[\d\._]+)$`), "homebrew")
 	}
 
 	if runtime.GOOS == "darwin" {
 		// Liip PHP https://php-osx.liip.ch/ (pattern example: php5-7.2.0RC1-20170907-205032/bin/php)
-		s.discoverFromDir("/usr/local", nil, regexp.MustCompile("^php5\\-[\\d\\.]+(?:RC|BETA)?\\d*\\-\\d+\\-\\d+$"), "Liip PHP")
+		s.discoverFromDir("/usr/local", nil, regexp.MustCompile(`^php5\-[\d\.]+(?:RC|BETA)?\d*\-\d+\-\d+$`), "Liip PHP")
 
 		// MAMP
-		s.discoverFromDir("/Applications/MAMP/bin/php/", nil, regexp.MustCompile("^php[\\d\\.]+(?:RC|BETA)?$"), "MAMP")
+		s.discoverFromDir("/Applications/MAMP/bin/php/", nil, regexp.MustCompile(`^php[\d\.]+(?:RC|BETA)?$`), "MAMP")
 
 		// MacPorts (/opt/local/sbin/php-fpm71, /opt/local/bin/php71)
-		s.discoverFromDir("/opt/local", regexp.MustCompile("^php(?:[\\d\\.]+)$"), nil, "MacPorts")
+		s.discoverFromDir("/opt/local", regexp.MustCompile(`^php(?:[\d\.]+)$`), nil, "MacPorts")
 	}
 
 	if runtime.GOOS == "linux" {
 		// Ondrej PPA on Linux (bin/php7.2)
-		s.discoverFromDir("/usr", regexp.MustCompile("^php(?:[\\d\\.]+)$"), nil, "Ondrej PPA")
+		s.discoverFromDir("/usr", regexp.MustCompile(`^php(?:[\d\.]+)$`), nil, "Ondrej PPA")
 
 		// Remi's RPM repository
-		s.discoverFromDir("/opt/remi", nil, regexp.MustCompile("^php(?:\\d+)/root/usr$"), "Remi's RPM")
+		s.discoverFromDir("/opt/remi", nil, regexp.MustCompile(`^php(?:\d+)/root/usr$`), "Remi's RPM")
 	}
 
 	// asdf-vm

store.go

@@ -50,7 +50,7 @@ func New(configDir string, reload bool, logger func(msg string, a ...interface{}
 		discoveryLogFunc: logger,
 	}
 	if reload {
-		os.Remove(filepath.Join(configDir, "php_versions.json"))
+		_ = os.Remove(filepath.Join(configDir, "php_versions.json"))
 	}
 	s.loadVersions()
 	return s
@@ -149,7 +149,7 @@ func (s *PHPStore) bestVersion(versionPrefix, source string) (*Version, string,
 	isPatchVersion := false
 	pos := strings.LastIndexByte(versionPrefix, '.')
 	if pos != strings.IndexByte(versionPrefix, '.') {
-		if "99" == versionPrefix[pos+1:] {
+		if versionPrefix[pos+1:] == "99" {
 			versionPrefix = versionPrefix[:pos]
 			pos = strings.LastIndexByte(versionPrefix, '.')
 		} else {