Merge pull request #1072 from jakubtobiasz/fix-for-symfony5-and-up

Set the $_SERVER['SCRIPT_FILENAME'] to the front controller path

Author: mattstauffer

cli/drivers/SymfonyValetDriver.php

@@ -47,12 +47,17 @@ public function isStaticFile($sitePath, $siteName, $uri)
      */
     public function frontControllerPath($sitePath, $siteName, $uri)
     {
-        if (file_exists($frontControllerPath = $sitePath.'/web/app_dev.php')) {
-            return $frontControllerPath;
-        } elseif (file_exists($frontControllerPath = $sitePath.'/web/app.php')) {
-            return $frontControllerPath;
-        } elseif (file_exists($frontControllerPath = $sitePath.'/public/index.php')) {
-            return $frontControllerPath;
+        $frontControllerPath = null;
+
+        if (file_exists($path = $sitePath.'/web/app_dev.php')) {
+            $frontControllerPath = $path;
+        } elseif (file_exists($path = $sitePath.'/web/app.php')) {
+            $frontControllerPath = $path;
+        } elseif (file_exists($path = $sitePath.'/public/index.php')) {
+            $frontControllerPath = $path;
         }
+
+        $_SERVER['SCRIPT_FILENAME'] = $frontControllerPath;
+        return $frontControllerPath;
     }
 }

server.php

@@ -21,12 +21,12 @@ function show_valet_404()
  * Show directory listing or 404 if directory doesn't exist.
  */
 function show_directory_listing($valetSitePath, $uri)
-{ 
+{
     $is_root = ($uri == '/');
     $directory = ($is_root) ? $valetSitePath : $valetSitePath.$uri;
 
-    if (!file_exists($directory)) { 
-        show_valet_404(); 
+    if (!file_exists($directory)) {
+        show_valet_404();
     }
 
     // Sort directories at the top