symfony-cli
diff --git a/‎local/php/envs.go
Lines changed: 19 additions & 0 deletions b/‎local/php/envs.go
Lines changed: 19 additions & 0 deletions
diff --git a/‎local/php/envs_test.go
Lines changed: 79 additions & 1 deletion b/‎local/php/envs_test.go
Lines changed: 79 additions & 1 deletion
diff --git a/‎local/php/testdata/public/subdirectory/index.php b/‎local/php/testdata/public/subdirectory/index.php
diff --git a/‎local/php/testdata/public/subdirectory/subdirectory/index.php b/‎local/php/testdata/public/subdirectory/subdirectory/index.php
@@ -31,17 +31,36 @@ import (
 
 func (p *Server) generateEnv(req *http.Request) map[string]string {
 	scriptName := p.passthru
+
 	https := ""
 	if req.TLS != nil {
 		https = "On"
 	}
 
 	pathInfo := req.URL.Path
+	filenameMatch := false
+
 	if pos := strings.Index(strings.ToLower(pathInfo), ".php"); pos != -1 {
 		file := pathInfo[:pos+4]
 		if _, err := os.Stat(filepath.Join(p.documentRoot, file)); err == nil {
 			scriptName = file
 			pathInfo = pathInfo[pos+4:]
+			filenameMatch = true
+		}
+
+	}
+
+	if filenameMatch == false && pathInfo != "/" && len(pathInfo) > 0 {
+		paths := strings.Split(strings.Trim(pathInfo, "/"), "/")
+		for i, n := 0, len(paths); i < n; i++ {
+			poppedPath := paths[:len(paths)-i]
+			indexDir := filepath.Join(poppedPath...)
+			file := filepath.Join(indexDir, p.passthru)
+			if _, err := os.Stat(filepath.Join(p.documentRoot, file)); err == nil {
+				scriptName = string(os.PathSeparator) + file
+				pathInfo = pathInfo[strings.Index(pathInfo, indexDir)+len(indexDir):]
+				break
+			}
 		}
 	}
 
 
@@ -33,6 +33,7 @@ type PHPFPMSuite struct{}
 var _ = Suite(&PHPFPMSuite{})
 
 func (s *PHPFPMSuite) TestGenerateEnv(c *C) {
+
 	testdataDir := "testdata"
 	tests := []struct {
 		uri      string
@@ -182,6 +183,83 @@ func (s *PHPFPMSuite) TestGenerateEnv(c *C) {
 				"SCRIPT_NAME":     "/index.php",
 			},
 		},
+		{
+			passthru: "/index.php",
+			uri:      "/subdirectory",
+			expected: map[string]string{
+				"PATH_INFO":       "",
+				"REQUEST_URI":     "/subdirectory",
+				"QUERY_STRING":    "",
+				"SCRIPT_FILENAME": testdataDir + "/public/subdirectory/index.php",
+				"SCRIPT_NAME":     "/subdirectory/index.php",
+			},
+		},
+		{
+			passthru: "/index.php",
+			uri:      "/subdirectory/",
+			expected: map[string]string{
+				"PATH_INFO":       "/",
+				"REQUEST_URI":     "/subdirectory/",
+				"QUERY_STRING":    "",
+				"SCRIPT_FILENAME": testdataDir + "/public/subdirectory/index.php",
+				"SCRIPT_NAME":     "/subdirectory/index.php",
+			},
+		},
+		{
+			passthru: "/index.php",
+			uri:      "/subdirectory/unknown.php",
+			expected: map[string]string{
+				"PATH_INFO":       "/unknown.php",
+				"REQUEST_URI":     "/subdirectory/unknown.php",
+				"QUERY_STRING":    "",
+				"SCRIPT_FILENAME": testdataDir + "/public/subdirectory/index.php",
+				"SCRIPT_NAME":     "/subdirectory/index.php",
+			},
+		},
+		{
+			passthru: "/index.php",
+			uri:      "/subdirectory/unknown.php/",
+			expected: map[string]string{
+				"PATH_INFO":       "/unknown.php/",
+				"REQUEST_URI":     "/subdirectory/unknown.php/",
+				"QUERY_STRING":    "",
+				"SCRIPT_FILENAME": testdataDir + "/public/subdirectory/index.php",
+				"SCRIPT_NAME":     "/subdirectory/index.php",
+			},
+		},
+		{
+			passthru: "/index.php",
+			uri:      "/subdirectory/index.php/foo",
+			expected: map[string]string{
+				"PATH_INFO":       "/foo",
+				"REQUEST_URI":     "/subdirectory/index.php/foo",
+				"QUERY_STRING":    "",
+				"SCRIPT_FILENAME": testdataDir + "/public/subdirectory/index.php",
+				"SCRIPT_NAME":     "/subdirectory/index.php",
+			},
+		},
+		{
+			passthru: "/index.php",
+			uri:      "/subdirectory/subdirectory/",
+			expected: map[string]string{
+				"PATH_INFO":       "/",
+				"REQUEST_URI":     "/subdirectory/subdirectory/",
+				"QUERY_STRING":    "",
+				"SCRIPT_FILENAME": testdataDir + "/public/subdirectory/subdirectory/index.php",
+				"SCRIPT_NAME":     "/subdirectory/subdirectory/index.php",
+			},
+		},
+		{
+			passthru: "/index.php",
+			uri:      "///subdirectory",
+			expected: map[string]string{
+				"PATH_INFO":       "",
+				"REQUEST_URI":     "///subdirectory",
+				"QUERY_STRING":    "",
+				"SCRIPT_FILENAME": testdataDir + "/public/subdirectory/index.php",
+				"SCRIPT_NAME":     "/subdirectory/index.php",
+			},
+		},
 	}
 	for _, test := range tests {
 		process := &Server{
@@ -197,7 +275,7 @@ func (s *PHPFPMSuite) TestGenerateEnv(c *C) {
 		for k, v := range test.expected {
 			vv, ok := env[k]
 			c.Assert(ok, Equals, true)
-			c.Assert(vv, DeepEquals, v)
+			c.Assert(vv, DeepEquals, v, Commentf("#test uri:\"%s\" varName:\"%s\"", test.uri, k))
 		}
 	}
 }