Merge pull request #483 from symfony-cli/psh-tweaks

fabpot · web-flow · commit 7412ef6b610a · 2024-06-04T13:10:55.000+02:00
Make Composer 2 the default Composer binary
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 = "composer2"
+		composerBin = "composer"
 	}
 	path, err := e.findComposer(composerBin)
 	if err != nil || !isPHPScript(path) {
@@ -139,7 +139,7 @@ func findComposer(extraBin string) (string, error) {
 	// Special support for OS specific things. They need to run before the
 	// PATH detection because most of them adds shell wrappers that we
 	// can't run via PHP.
-	if pharPath := findComposerSystemSpecific(extraBin); pharPath != "" {
+	if pharPath := findComposerSystemSpecific(); pharPath != "" {
 		return pharPath, nil
 	}
 	for _, file := range []string{extraBin, "composer", "composer.phar"} {
diff --git a/local/php/composer_unix.go b/local/php/composer_unix.go
@@ -28,7 +28,7 @@ import (
 	"strings"
 )
 
-func findComposerSystemSpecific(extraBin string) string {
+func findComposerSystemSpecific() string {
 	// Special Support for NixOS
 	for _, path := range strings.Split(os.Getenv("buildInputs"), " ") {
 		nixPharPath := filepath.Join(path, "libexec/composer/composer.phar")
diff --git a/local/php/composer_windows.go b/local/php/composer_windows.go
@@ -20,13 +20,14 @@
 package php
 
 import (
-	"github.com/mitchellh/go-homedir"
 	"os"
 	"os/exec"
 	"path/filepath"
+
+	"github.com/mitchellh/go-homedir"
 )
 
-func findComposerSystemSpecific(extraBin string) string {
+func findComposerSystemSpecific() string {
 	// Special Support for Scoop
 	scoopPaths := []string{}
 

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 = "composer2"`
	`74`	`+ composerBin = "composer"`
`75`	`75`	`}`
`76`	`76`	`path, err := e.findComposer(composerBin)`
`77`	`77`	`if err != nil \|\| !isPHPScript(path) {`
`@@ -139,7 +139,7 @@ func findComposer(extraBin string) (string, error) {`
`139`	`139`	`// Special support for OS specific things. They need to run before the`
`140`	`140`	`// PATH detection because most of them adds shell wrappers that we`
`141`	`141`	`// can't run via PHP.`
`142`		`- if pharPath := findComposerSystemSpecific(extraBin); pharPath != "" {`
	`142`	`+ if pharPath := findComposerSystemSpecific(); pharPath != "" {`
`143`	`143`	`return pharPath, nil`
`144`	`144`	`}`
`145`	`145`	`for _, file := range []string{extraBin, "composer", "composer.phar"} {`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ import (`
`28`	`28`	`"strings"`
`29`	`29`	`)`
`30`	`30`
`31`		`-func findComposerSystemSpecific(extraBin string) string {`
	`31`	`+func findComposerSystemSpecific() string {`
`32`	`32`	`// Special Support for NixOS`
`33`	`33`	`for _, path := range strings.Split(os.Getenv("buildInputs"), " ") {`
`34`	`34`	`nixPharPath := filepath.Join(path, "libexec/composer/composer.phar")`