Use socket as env var for enabling Blackfire on local web server

envs/envs.go

@@ -260,9 +260,7 @@ func extractRelationshipsEnvs(env Environment) Envs {
 				values[fmt.Sprintf("%sSCHEME", prefix)] = endpoint["scheme"].(string)
 				values[fmt.Sprintf("%sHOST", prefix)] = endpoint["host"].(string)
 				if rel == "blackfire" {
-					// FIXME: That does not work yet as Blackfire does not support it for now
-					// Once fixed, we will be able to remove the ini settings set in local/php/envs.go
-					// values["BLACKFIRE_AGENT_SOCKET"] = values[fmt.Sprintf("%sURL", prefix)]
+					values["BLACKFIRE_AGENT_SOCKET"] = values[fmt.Sprintf("%sURL", prefix)]
 				}
 			} else if rel == "mercure" {
 				values["MERCURE_URL"] = fmt.Sprintf("%s://%s:%s/.well-known/mercure", endpoint["scheme"].(string), endpoint["host"].(string), formatInt(endpoint["port"]))

local/php/executor.go

@@ -22,16 +22,13 @@ package php
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
-	"math/rand"
 	"os"
 	"os/exec"
 	"os/signal"
 	"path/filepath"
 	"runtime"
 	"strings"
 	"syscall"
-	"time"
 
 	"github.com/pkg/errors"
 	"github.com/rs/xid"
@@ -247,11 +244,6 @@ func (e *Executor) Config(loadDotEnv bool) error {
 	}
 	e.Paths = append([]string{path}, e.Paths...)
 	if phpiniArgs {
-		wd, _ := os.Getwd()
-		e.iniDir, err = e.generateLocalPhpIniFile(wd, cliDir)
-		if err != nil {
-			return err
-		}
 		// see https://php.net/manual/en/configuration.file.php
 		// if PHP_INI_SCAN_DIR exists, just append our new directory
 		// if not, add the default one (empty string) and then our new directory
@@ -412,27 +404,6 @@ func LookPath(file string) (string, error) {
 	return exec.LookPath(file)
 }
 
-func (e *Executor) generateLocalPhpIniFile(wd, cliDir string) (string, error) {
-	rand.Seed(time.Now().UnixNano())
-	tmpDir := filepath.Join(cliDir, "var", fmt.Sprintf("%s_%d", name(wd), rand.Intn(99999999)))
-	os.RemoveAll(tmpDir)
-	if err := os.MkdirAll(tmpDir, 0755); err != nil {
-		return "", errors.Errorf("unable to create temp dir %s", tmpDir)
-	}
-	ini := GetPHPINISettings(e.scriptDir).Bytes()
-	// don't write an empty ini file as it might be read as a non-valid ini file by PHP (and Composer)
-	if len(ini) > 0 {
-		extraIni := filepath.Join(tmpDir, "1-extra.ini")
-		if err := ioutil.WriteFile(extraIni, ini, 0666); err != nil {
-			os.RemoveAll(tmpDir)
-			return "", errors.Wrapf(err, "unable to create temp file \"%s\"", extraIni)
-		}
-		return tmpDir, nil
-	}
-	os.RemoveAll(tmpDir)
-	return "", nil
-}
-
 // detectScriptDir tries to get the script directory from args
 func detectScriptDir(args []string) string {
 	script := ""