feat: allow PHP executor to run executables other than PHP ones

tucksaun · tucksaun · commit b15651258a45 · 2025-02-25T10:31:23.000+01:00
diff --git a/local/php/executor.go b/local/php/executor.go
@@ -288,9 +288,11 @@ func (e *Executor) Config(loadDotEnv bool) error {
 		}
 	}
 
-	// args[0] MUST be the same as path
-	// but as we change the path, we should update args[0] accordingly
-	e.Args[0] = path
+	if IsBinaryName(e.Args[0]) {
+		// args[0] MUST be the same as path
+		// but as we change the path, we should update args[0] accordingly
+		e.Args[0] = path
+	}
 
 	return err
 }
diff --git a/local/php/executor_test.go b/local/php/executor_test.go
@@ -99,11 +99,12 @@ func TestHelperProcess(t *testing.T) {
 		for _, v := range os.Environ() {
 			fmt.Println(v)
 		}
+		os.Exit(0)
 	case "exit-code":
 		code, _ := strconv.Atoi(os.Args[4])
 		os.Exit(code)
 	}
-	os.Exit(0)
+	os.Exit(1)
 }
 
 func (s *ExecutorSuite) TestNotEnoughArgs(c *C) {
@@ -139,6 +140,63 @@ func (s *ExecutorSuite) TestForwardExitCode(c *C) {
 	c.Assert((&Executor{BinName: "php", Args: []string{"php"}}).Execute(true), Equals, 5)
 }
 
+func (s *ExecutorSuite) TestExecutorRunsPHP(c *C) {
+	defer restoreExecCommand()
+	execCommand = func(name string, arg ...string) *exec.Cmd {
+		c.Assert(name, Equals, "../bin/php")
+
+		cmd := exec.Command(os.Args[0], "-test.run=TestHelperProcess", "--", "exit-code", "0")
+		cmd.Env = []string{"GO_WANT_HELPER_PROCESS=1"}
+		// Set the working directory right now so that it can be changed by
+		// calling test case
+		cmd.Dir, _ = os.Getwd()
+		return cmd
+	}
+
+	home, err := filepath.Abs("testdata/executor")
+	c.Assert(err, IsNil)
+
+	homedir.Reset()
+	os.Setenv("HOME", home)
+	defer homedir.Reset()
+
+	oldwd, _ := os.Getwd()
+	defer os.Chdir(oldwd)
+	os.Chdir(filepath.Join(home, "project"))
+	defer cleanupExecutorTempFiles()
+
+	c.Assert((&Executor{BinName: "php", Args: []string{"php"}}).Execute(true), Equals, 0)
+
+}
+
+func (s *ExecutorSuite) TestBinaryOtherThanPhp(c *C) {
+	defer restoreExecCommand()
+	execCommand = func(name string, arg ...string) *exec.Cmd {
+		c.Assert(name, Equals, "not-php")
+
+		cmd := exec.Command(os.Args[0], "-test.run=TestHelperProcess", "--", "exit-code", "0")
+		cmd.Env = []string{"GO_WANT_HELPER_PROCESS=1"}
+		// Set the working directory right now so that it can be changed by
+		// calling test case
+		cmd.Dir, _ = os.Getwd()
+		return cmd
+	}
+
+	home, err := filepath.Abs("testdata/executor")
+	c.Assert(err, IsNil)
+
+	homedir.Reset()
+	os.Setenv("HOME", home)
+	defer homedir.Reset()
+
+	oldwd, _ := os.Getwd()
+	defer os.Chdir(oldwd)
+	os.Chdir(filepath.Join(home, "project"))
+	defer cleanupExecutorTempFiles()
+
+	c.Assert((&Executor{BinName: "php", Args: []string{"not-php"}}).Execute(true), Equals, 0)
+}
+
 func (s *ExecutorSuite) TestEnvInjection(c *C) {
 	defer restoreExecCommand()
 	fakeExecCommand("dump-env")

Original file line number	Diff line number	Diff line change
`@@ -288,9 +288,11 @@ func (e *Executor) Config(loadDotEnv bool) error {`
`288`	`288`	`}`
`289`	`289`	`}`
`290`	`290`
`291`		`- // args[0] MUST be the same as path`
`292`		`- // but as we change the path, we should update args[0] accordingly`
`293`		`- e.Args[0] = path`
	`291`	`+ if IsBinaryName(e.Args[0]) {`
	`292`	`+ // args[0] MUST be the same as path`
	`293`	`+ // but as we change the path, we should update args[0] accordingly`
	`294`	`+ e.Args[0] = path`
	`295`	`+ }`
`294`	`296`
`295`	`297`	`return err`
`296`	`298`	`}`