Merge f1c820e into a497d3a

wptide · Oct 13, 2019 · d55f1df · d55f1df
2 parents a497d3a + f1c820e
commit d55f1df
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/cmd/phpcs-server/main.go b/cmd/phpcs-server/main.go
@@ -265,6 +265,7 @@ func processMessage(msg message.Message, wg *sync.WaitGroup) error {
 		TempFolder:      procCfg.phpcsTempFolder,
 		Config:          config,
 		StorageProvider: procCfg.phpcsStorageProvider,
+		PhpcsVersions:   getPhpcsVersions(),
 	}
 	if err := doPHPCSProcess(phpcsProc, msg, results); err != nil {
 		return err
@@ -466,3 +467,17 @@ func getServiceConfig() map[string]map[string]string {
 		},
 	}
 }
+
+func getPhpcsVersions() map[string]map[string]string {
+	return map[string]map[string]string{
+		"phpcompatibility": {
+			"phpcs":              env.GetEnv("PHPCS", ""),
+			"phpcompatibility":   env.GetEnv("PHPCOMPAT", ""),
+			"phpcompatibilitywp": env.GetEnv("PHPCOMPAT_WP", ""),
+		},
+		"wordpress": {
+			"phpcs": env.GetEnv("PHPCS", ""),
+			"wpcs":  env.GetEnv("WPCS", ""),
+		},
+	}
+}
diff --git a/glide.lock b/glide.lock