Skip to content

Commit 98a427e

Browse files
authored
Merge pull request #23 from tucksaun/chore/raw-strings
chore: use raw strings in Regex to improve readability
2 parents 650d5bc + 93f0bea commit 98a427e

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

discovery.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ func (s *PHPStore) discoverPHPViaPHP(dir, binName string) *Version {
175175
s.log(` Unable to run "%s --version: %s"`, php, err)
176176
return nil
177177
}
178-
r := regexp.MustCompile("PHP (\\d+\\.\\d+\\.\\d+)")
178+
r := regexp.MustCompile(`PHP (\d+\.\d+\.\d+)`)
179179
data := r.FindSubmatch(buf.Bytes())
180180
if data == nil {
181181
s.log(" %s is not a PHP binary", php)

discovery_others.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func (s *PHPStore) doDiscover() {
5151

5252
// phpenv
5353
if homeDir != "" {
54-
s.discoverFromDir(filepath.Join(homeDir, ".phpenv", "versions"), nil, regexp.MustCompile("^[\\d\\.]+(?:RC|BETA|snapshot)?$"), "phpenv")
54+
s.discoverFromDir(filepath.Join(homeDir, ".phpenv", "versions"), nil, regexp.MustCompile(`^[\d\.]+(?:RC|BETA|snapshot)?$`), "phpenv")
5555
}
5656

5757
// XAMPP
@@ -61,28 +61,28 @@ func (s *PHPStore) doDiscover() {
6161
if out, err := exec.Command("brew", "--cellar").Output(); err == nil {
6262
prefix := strings.Trim(string(out), "\n")
6363
// pattern example: [email protected]/5.6.33_9
64-
s.discoverFromDir(prefix, nil, regexp.MustCompile("^php@(?:[\\d\\.]+)/(?:[\\d\\._]+)$"), "homebrew")
64+
s.discoverFromDir(prefix, nil, regexp.MustCompile(`^php@(?:[\d\.]+)/(?:[\d\._]+)$`), "homebrew")
6565
// pattern example: php/7.2.11
66-
s.discoverFromDir(prefix, nil, regexp.MustCompile("^php/(?:[\\d\\._]+)$"), "homebrew")
66+
s.discoverFromDir(prefix, nil, regexp.MustCompile(`^php/(?:[\d\._]+)$`), "homebrew")
6767
}
6868

6969
if runtime.GOOS == "darwin" {
7070
// Liip PHP https://php-osx.liip.ch/ (pattern example: php5-7.2.0RC1-20170907-205032/bin/php)
71-
s.discoverFromDir("/usr/local", nil, regexp.MustCompile("^php5\\-[\\d\\.]+(?:RC|BETA)?\\d*\\-\\d+\\-\\d+$"), "Liip PHP")
71+
s.discoverFromDir("/usr/local", nil, regexp.MustCompile(`^php5\-[\d\.]+(?:RC|BETA)?\d*\-\d+\-\d+$`), "Liip PHP")
7272

7373
// MAMP
74-
s.discoverFromDir("/Applications/MAMP/bin/php/", nil, regexp.MustCompile("^php[\\d\\.]+(?:RC|BETA)?$"), "MAMP")
74+
s.discoverFromDir("/Applications/MAMP/bin/php/", nil, regexp.MustCompile(`^php[\d\.]+(?:RC|BETA)?$`), "MAMP")
7575

7676
// MacPorts (/opt/local/sbin/php-fpm71, /opt/local/bin/php71)
77-
s.discoverFromDir("/opt/local", regexp.MustCompile("^php(?:[\\d\\.]+)$"), nil, "MacPorts")
77+
s.discoverFromDir("/opt/local", regexp.MustCompile(`^php(?:[\d\.]+)$`), nil, "MacPorts")
7878
}
7979

8080
if runtime.GOOS == "linux" {
8181
// Ondrej PPA on Linux (bin/php7.2)
82-
s.discoverFromDir("/usr", regexp.MustCompile("^php(?:[\\d\\.]+)$"), nil, "Ondrej PPA")
82+
s.discoverFromDir("/usr", regexp.MustCompile(`^php(?:[\d\.]+)$`), nil, "Ondrej PPA")
8383

8484
// Remi's RPM repository
85-
s.discoverFromDir("/opt/remi", nil, regexp.MustCompile("^php(?:\\d+)/root/usr$"), "Remi's RPM")
85+
s.discoverFromDir("/opt/remi", nil, regexp.MustCompile(`^php(?:\d+)/root/usr$`), "Remi's RPM")
8686
}
8787

8888
// asdf-vm

0 commit comments

Comments
 (0)