Re-add composer2 as a valid binary name for composer

fabpot · fabpot · commit 4b9ff06afd62 · 2024-06-04T14:17:24.000+02:00
diff --git a/local/php/composer.go b/local/php/composer.go
@@ -71,7 +71,7 @@ func Composer(dir string, args, env []string, stdout, stderr, logger io.Writer,
 	}
 	composerBin := "composer1"
 	if composerVersion() == 2 {
-		composerBin = "composer"
+		composerBin = "composer2"
 	}
 	path, err := e.findComposer(composerBin)
 	if err != nil || !isPHPScript(path) {

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func Composer(dir string, args, env []string, stdout, stderr, logger io.Writer,`
`71`	`71`	`}`
`72`	`72`	`composerBin := "composer1"`
`73`	`73`	`if composerVersion() == 2 {`
`74`		`- composerBin = "composer"`
	`74`	`+ composerBin = "composer2"`
`75`	`75`	`}`
`76`	`76`	`path, err := e.findComposer(composerBin)`
`77`	`77`	`if err != nil \|\| !isPHPScript(path) {`