Expose the CLI version in the WDT, fix #365

tucksaun · tucksaun · commit 2e5951f86c11 · 2023-11-02T20:31:48.000+01:00
diff --git a/local/php/php_server.go b/local/php/php_server.go
@@ -51,6 +51,7 @@ import (
 type Server struct {
 	Version      *phpstore.Version
 	logger       zerolog.Logger
+	appVersion   string
 	homeDir      string
 	projectDir   string
 	documentRoot string
@@ -62,7 +63,7 @@ type Server struct {
 var addslashes = strings.NewReplacer("\\", "\\\\", "'", "\\'")
 
 // NewServer creates a new PHP server backend
-func NewServer(homeDir, projectDir, documentRoot, passthru string, logger zerolog.Logger) (*Server, error) {
+func NewServer(homeDir, projectDir, documentRoot, passthru, appVersion string, logger zerolog.Logger) (*Server, error) {
 	logger.Debug().Str("source", "PHP").Msg("Reloading PHP versions")
 	phpStore := phpstore.New(homeDir, true, nil)
 	version, source, warning, err := phpStore.BestVersionForDir(projectDir)
@@ -76,6 +77,7 @@ func NewServer(homeDir, projectDir, documentRoot, passthru string, logger zerolo
 	return &Server{
 		Version:      version,
 		logger:       logger.With().Str("source", "PHP").Str("php", version.Version).Str("path", version.ServerPath()).Logger(),
+		appVersion:   appVersion,
 		homeDir:      homeDir,
 		projectDir:   projectDir,
 		documentRoot: documentRoot,
diff --git a/local/php/toolbar.go b/local/php/toolbar.go
@@ -129,7 +129,10 @@ func (p *Server) tweakToolbar(body io.ReadCloser, env map[string]string) (io.Rea
 	<div class="sf-toolbar-info" style="left: 0px;">
 		<div class="sf-toolbar-info-group">
 			<div class="sf-toolbar-info-piece">
-				<b>Server</b>` + p.Version.ServerTypeName() + ` ` + p.Version.Version + `
+				<b>Server</b>` + p.appVersion + `
+			</div>
+			<div class="sf-toolbar-info-piece">
+				<b>PHP</b>` + p.Version.ServerTypeName() + ` ` + p.Version.Version + `
 			</div>
 			<div class="sf-toolbar-info-piece">
 				<b>Tunnel</b>` + tunnel + `
diff --git a/local/project/project.go b/local/project/project.go
@@ -76,7 +76,7 @@ func New(c *Config) (*Project, error) {
 			return nil
 		}
 	} else {
-		p.PHPServer, err = php.NewServer(c.HomeDir, c.ProjectDir, documentRoot, passthru, c.Logger)
+		p.PHPServer, err = php.NewServer(c.HomeDir, c.ProjectDir, documentRoot, passthru, c.AppVersion, c.Logger)
 		if err != nil {
 			return nil, err
 		}

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ func New(c Config) (Project, error) {`
`76`	`76`	`return nil`
`77`	`77`	`}`
`78`	`78`	`} else {`
`79`		`- p.PHPServer, err = php.NewServer(c.HomeDir, c.ProjectDir, documentRoot, passthru, c.Logger)`
	`79`	`+ p.PHPServer, err = php.NewServer(c.HomeDir, c.ProjectDir, documentRoot, passthru, c.AppVersion, c.Logger)`
`80`	`80`	`if err != nil {`
`81`	`81`	`return nil, err`
`82`	`82`	`}`