From 93f0bea513bd48da214376921b28d4b55c4d8da5 Mon Sep 17 00:00:00 2001 From: Tugdual Saunier Date: Fri, 9 May 2025 12:11:29 +0200 Subject: [PATCH] chore: use raw strings in Regex to improve readability --- discovery.go | 2 +- discovery_others.go | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/discovery.go b/discovery.go index ea305fa..dca8bb2 100644 --- a/discovery.go +++ b/discovery.go @@ -175,7 +175,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) diff --git a/discovery_others.go b/discovery_others.go index 20a02b8..b0051e5 100644 --- a/discovery_others.go +++ b/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: php@5.6/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