Fix logging

commands/local_new.go

@@ -327,7 +327,7 @@ func runComposer(c *console.Context, dir string, args []string, debug bool) erro
 		env = append(env, "SYMFONY_DOCKER=1")
 	}
 
-	if err := php.Composer(dir, args, env, out, err, os.Stderr); err.ExitCode() != 0 {
+	if err := php.Composer(dir, args, env, out, err, os.Stderr, terminal.Logger); err.ExitCode() != 0 {
 		terminal.Println(buf.String())
 		terminal.Logger.Debug().Msg(buf.String())
 		return err

local/php/composer.go

@@ -33,8 +33,8 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
 	"github.com/symfony-cli/symfony-cli/util"
-	"github.com/symfony-cli/terminal"
 )
 
 const DefaultComposerVersion = 2
@@ -56,24 +56,23 @@ func (c ComposerResult) ExitCode() int {
 	return c.code
 }
 
-func Composer(dir string, args, env []string, stdout, stderr, logger io.Writer) ComposerResult {
+func Composer(dir string, args, env []string, stdout, stderr, logger io.Writer, debugLogger zerolog.Logger) ComposerResult {
 	e := &Executor{
 		Dir:        dir,
 		BinName:    "php",
 		Stdout:     stdout,
 		Stderr:     stderr,
 		SkipNbArgs: -1,
 		ExtraEnv:   env,
-		Logger:     terminal.Logger,
+		Logger:     debugLogger,
 	}
-
 	composerBin := "composer1"
 	if composerVersion() == 2 {
 		composerBin = "composer2"
 	}
 	path, err := e.findComposer(composerBin)
 	if err != nil || !isComposerPHPScript(path) {
-		fmt.Println("  WARNING: Unable to find Composer, downloading one. It is recommended to install Composer yourself at https://getcomposer.org/download/")
+		fmt.Fprintln(logger, "  WARNING: Unable to find Composer, downloading one. It is recommended to install Composer yourself at https://getcomposer.org/download/")
 		// we don't store it under bin/ to avoid it being found by findComposer as we want to only use it as a fallback
 		binDir := filepath.Join(util.GetHomeDir(), "composer")
 		if path, err = downloadComposer(binDir); err != nil {

main.go

@@ -27,6 +27,7 @@ import (
 	"os"
 	"time"
 
+	"github.com/rs/zerolog"
 	"github.com/symfony-cli/console"
 	"github.com/symfony-cli/symfony-cli/commands"
 	"github.com/symfony-cli/symfony-cli/local/php"
@@ -73,7 +74,7 @@ func main() {
 	}
 	// called via "symfony composer"?
 	if len(args) >= 2 && args[1] == "composer" {
-		res := php.Composer("", args[2:], []string{}, os.Stdout, os.Stderr, ioutil.Discard)
+		res := php.Composer("", args[2:], []string{}, os.Stdout, os.Stderr, ioutil.Discard, zerolog.Nop())
 		terminal.Eprintln(res.Error())
 		os.Exit(res.ExitCode())
 	}