Add some more logging to help debugging issues

fabpot · fabpot · commit 28d59d11f28e · 2022-01-23T18:10:20.000+01:00
diff --git a/commands/local_new.go b/commands/local_new.go
@@ -367,16 +367,15 @@ func getSpecialVersion(version string) (string, error) {
 }
 
 func forcePHPVersion(v, dir string) (string, error) {
+	store := phpstore.New(util.GetHomeDir(), true, nil)
 	if v == "" {
-		store := phpstore.New(util.GetHomeDir(), true, nil)
 		minor, _, _, err := store.BestVersionForDir(dir)
 		return strings.Join(strings.Split(minor.Version, ".")[0:2], "."), err
 	}
 	if _, err := version.NewVersion(v); err != nil {
 		return "", errors.Errorf("unable to parse PHP version \"%s\"", v)
 	}
 	// check that the version is available
-	store := phpstore.New(util.GetHomeDir(), true, nil)
 	if !store.IsVersionAvailable(v) {
 		return "", errors.Errorf("PHP version \"%s\" is not available locally", v)
 	}
diff --git a/commands/local_server_status.go b/commands/local_server_status.go
@@ -62,9 +62,12 @@ func printWebServerStatus(projectDir string) error {
 		terminal.Printfln("    Listening on <href=%s://127.0.0.1:%d>%s://127.0.0.1:%d</>", pidFile.Scheme, pidFile.Port, pidFile.Scheme, pidFile.Port)
 		homeDir := util.GetHomeDir()
 		phpStore := phpstore.New(homeDir, true, nil)
-		version, _, _, err := phpStore.BestVersionForDir(projectDir)
+		version, source, warning, err := phpStore.BestVersionForDir(projectDir)
 		if err == nil {
-			terminal.Printfln("    The Web server is using <info>%s %s</>", version.ServerTypeName(), version.Version)
+			terminal.Printfln("    The Web server is using <info>%s %s</> (from %s)", version.ServerTypeName(), version.Version, source)
+			if warning != "" {
+				terminal.Printfln("    <warning>WARNING</> %s", warning)
+			}
 		}
 		terminal.Println()
 		terminal.Println("<info>Local Domains</>")
diff --git a/local/php/composer.go b/local/php/composer.go
@@ -34,6 +34,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/symfony-cli/symfony-cli/util"
+	"github.com/symfony-cli/terminal"
 )
 
 const DefaultComposerVersion = 2
@@ -63,6 +64,7 @@ func Composer(dir string, args, env []string, stdout, stderr, logger io.Writer)
 		Stderr:     stderr,
 		SkipNbArgs: -1,
 		ExtraEnv:   env,
+		Logger:     terminal.Logger,
 	}
 
 	composerBin := "composer1"
diff --git a/local/php/executor.go b/local/php/executor.go
@@ -35,6 +35,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/rs/xid"
+	"github.com/rs/zerolog"
 	"github.com/symfony-cli/phpstore"
 	"github.com/symfony-cli/symfony-cli/envs"
 	"github.com/symfony-cli/symfony-cli/util"
@@ -51,6 +52,7 @@ type Executor struct {
 	Stdin      io.Reader
 	Paths      []string
 	ExtraEnv   []string
+	Logger     zerolog.Logger
 
 	environ   []string
 	iniDir    string
@@ -76,13 +78,14 @@ func GetBinaryNames() []string {
 
 func (e *Executor) lookupPHP(cliDir string, forceReload bool) (*phpstore.Version, string, bool, error) {
 	phpStore := phpstore.New(cliDir, forceReload, nil)
-	v, _, warning, err := phpStore.BestVersionForDir(e.scriptDir)
+	v, source, warning, err := phpStore.BestVersionForDir(e.scriptDir)
 	if warning != "" {
 		terminal.Eprintfln("<warning>WARNING</> %s", warning)
 	}
 	if err != nil {
 		return nil, "", true, err
 	}
+	e.Logger.Debug().Str("source", "PHP").Msgf("Using PHP version %s (from %s)", v.Version, source)
 	path := v.PHPPath
 	phpiniArgs := true
 	if e.BinName == "php-fpm" {

Original file line number	Diff line number	Diff line change
`@@ -367,16 +367,15 @@ func getSpecialVersion(version string) (string, error) {`
`367`	`367`	`}`
`368`	`368`
`369`	`369`	`func forcePHPVersion(v, dir string) (string, error) {`
	`370`	`+ store := phpstore.New(util.GetHomeDir(), true, nil)`
`370`	`371`	`if v == "" {`
`371`		`- store := phpstore.New(util.GetHomeDir(), true, nil)`
`372`	`372`	`minor, _, _, err := store.BestVersionForDir(dir)`
`373`	`373`	`return strings.Join(strings.Split(minor.Version, ".")[0:2], "."), err`
`374`	`374`	`}`
`375`	`375`	`if _, err := version.NewVersion(v); err != nil {`
`376`	`376`	`return "", errors.Errorf("unable to parse PHP version \"%s\"", v)`
`377`	`377`	`}`
`378`	`378`	`// check that the version is available`
`379`		`- store := phpstore.New(util.GetHomeDir(), true, nil)`
`380`	`379`	`if !store.IsVersionAvailable(v) {`
`381`	`380`	`return "", errors.Errorf("PHP version \"%s\" is not available locally", v)`
`382`	`381`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ import (`
`34`	`34`
`35`	`35`	`"github.com/pkg/errors"`
`36`	`36`	`"github.com/symfony-cli/symfony-cli/util"`
	`37`	`+ "github.com/symfony-cli/terminal"`
`37`	`38`	`)`
`38`	`39`
`39`	`40`	`const DefaultComposerVersion = 2`
`@@ -63,6 +64,7 @@ func Composer(dir string, args, env []string, stdout, stderr, logger io.Writer)`
`63`	`64`	`Stderr: stderr,`
`64`	`65`	`SkipNbArgs: -1,`
`65`	`66`	`ExtraEnv: env,`
	`67`	`+ Logger: terminal.Logger,`
`66`	`68`	`}`
`67`	`69`
`68`	`70`	`composerBin := "composer1"`