refactor: add Executor.CommandLine

tucksaun · tucksaun · commit 09df7fa43d0f · 2025-02-25T10:31:23.000+01:00
diff --git a/local/php/composer.go b/local/php/composer.go
@@ -89,15 +89,17 @@ func Composer(dir string, args, env []string, stdout, stderr, logger io.Writer,
 				error: errors.Wrap(err, "unable to find composer, get it at https://getcomposer.org/download/"),
 			}
 		}
-		fmt.Fprintf(logger, "  (running %s %s)\n\n", path, strings.TrimSpace(strings.Join(args, " ")))
+		e.Args = append([]string{"php", path}, args...)
+		fmt.Fprintf(logger, "  (running %s)\n\n", e.CommandLine())
+	} else {
+		e.Args = append([]string{"php", path}, args...)
 	}
 
-	e.Args = append([]string{"php", path}, args...)
 	ret := e.Execute(false)
 	if ret != 0 {
 		return ComposerResult{
 			code:  ret,
-			error: errors.Errorf("unable to run %s %s", path, strings.Join(args, " ")),
+			error: errors.Errorf("unable to run %s", e.CommandLine()),
 		}
 	}
 	return ComposerResult{}
diff --git a/local/php/executor.go b/local/php/executor.go
@@ -74,6 +74,10 @@ func GetBinaryNames() []string {
 	return []string{"php", "pecl", "pear", "php-fpm", "php-cgi", "php-config", "phpdbg", "phpize"}
 }
 
+func (e Executor) CommandLine() string {
+	return strings.TrimSpace(strings.Join(e.Args, " "))
+}
+
 func (e *Executor) lookupPHP(cliDir string, forceReload bool) (*phpstore.Version, string, bool, error) {
 	phpStore := phpstore.New(cliDir, forceReload, nil)
 	v, source, warning, err := phpStore.BestVersionForDir(e.scriptDir)
diff --git a/local/php/executor_test.go b/local/php/executor_test.go
@@ -112,6 +112,14 @@ func (s *ExecutorSuite) TestNotEnoughArgs(c *C) {
 	c.Assert((&Executor{BinName: "php"}).Execute(true), Equals, 1)
 }
 
+func (s *ExecutorSuite) TestCommandLineFormatting(c *C) {
+	c.Assert((&Executor{}).CommandLine(), Equals, "")
+
+	c.Assert((&Executor{Args: []string{"php"}}).CommandLine(), Equals, "php")
+
+	c.Assert((&Executor{Args: []string{"php", "-dmemory_limit=-1", "/path/to/composer.phar"}}).CommandLine(), Equals, "php -dmemory_limit=-1 /path/to/composer.phar")
+}
+
 func (s *ExecutorSuite) TestForwardExitCode(c *C) {
 	defer restoreExecCommand()
 	fakeExecCommand("exit-code", "5")

Original file line number	Diff line number	Diff line change
`@@ -89,15 +89,17 @@ func Composer(dir string, args, env []string, stdout, stderr, logger io.Writer,`
`89`	`89`	`error: errors.Wrap(err, "unable to find composer, get it at https://getcomposer.org/download/"),`
`90`	`90`	`}`
`91`	`91`	`}`
`92`		`- fmt.Fprintf(logger, " (running %s %s)\n\n", path, strings.TrimSpace(strings.Join(args, " ")))`
	`92`	`+ e.Args = append([]string{"php", path}, args...)`
	`93`	`+ fmt.Fprintf(logger, " (running %s)\n\n", e.CommandLine())`
	`94`	`+ } else {`
	`95`	`+ e.Args = append([]string{"php", path}, args...)`
`93`	`96`	`}`
`94`	`97`
`95`		`- e.Args = append([]string{"php", path}, args...)`
`96`	`98`	`ret := e.Execute(false)`
`97`	`99`	`if ret != 0 {`
`98`	`100`	`return ComposerResult{`
`99`	`101`	`code: ret,`
`100`		`- error: errors.Errorf("unable to run %s %s", path, strings.Join(args, " ")),`
	`102`	`+ error: errors.Errorf("unable to run %s", e.CommandLine()),`
`101`	`103`	`}`
`102`	`104`	`}`
`103`	`105`	`return ComposerResult{}`