Merge pull request #1532 from lukasbableck/contao-driver

Update `ContaoValetDriver` to support current Contao versions

Author: mattstauffer

cli/Valet/Drivers/Specific/ContaoValetDriver.php

@@ -11,15 +11,36 @@ class ContaoValetDriver extends ValetDriver
      */
     public function serves(string $sitePath, string $siteName, string $uri): bool
     {
-        return is_dir($sitePath.'/vendor/contao') && file_exists($sitePath.'/web/app.php');
+        $frontControllerDirectory = $this->frontControllerDirectory($sitePath);
+
+        return is_dir($sitePath.'/vendor/contao') && file_exists($sitePath.'/'.$frontControllerDirectory.'/index.php');
+    }
+
+    /**
+     * Determine the name of the directory where the front controller lives.
+     */
+    public function frontControllerDirectory($sitePath): string
+    {
+        $dirs = ['web', 'public'];
+
+        foreach ($dirs as $dir) {
+            if (is_dir($sitePath.'/'.$dir)) {
+                return $dir;
+            }
+        }
+
+        // Give up, and just return the default
+        return 'public';
     }
 
     /**
      * Determine if the incoming request is for a static file.
      */
     public function isStaticFile(string $sitePath, string $siteName, string $uri)/* : string|false */
     {
-        if ($this->isActualFile($staticFilePath = $sitePath.'/web'.$uri)) {
+        $frontControllerDirectory = $this->frontControllerDirectory($sitePath);
+
+        if ($this->isActualFile($staticFilePath = $sitePath.'/'.$frontControllerDirectory.$uri)) {
             return $staticFilePath;
         }
 
@@ -31,17 +52,21 @@ public function isStaticFile(string $sitePath, string $siteName, string $uri)/*
      */
     public function frontControllerPath(string $sitePath, string $siteName, string $uri): ?string
     {
-        if ($uri === '/install.php') {
-            return $sitePath.'/web/install.php';
+        $frontControllerDirectory = $this->frontControllerDirectory($sitePath);
+
+        if (strncmp($uri, '/contao-manager.phar.php', 24) === 0) {
+            $_SERVER['SCRIPT_NAME'] = '/contao-manager.phar.php';
+            $_SERVER['SCRIPT_FILENAME'] = $sitePath.'/contao-manager.phar.php';
+            return $sitePath.'/'.$frontControllerDirectory.'/contao-manager.phar.php';
         }
 
-        if (strncmp($uri, '/app_dev.php', 12) === 0) {
-            $_SERVER['SCRIPT_NAME'] = '/app_dev.php';
-            $_SERVER['SCRIPT_FILENAME'] = $sitePath.'/app_dev.php';
+        if (strncmp($uri, '/preview.php', 12) === 0) {
+            $_SERVER['SCRIPT_NAME'] = '/preview.php';
+            $_SERVER['SCRIPT_FILENAME'] = $sitePath.'/preview.php';
 
-            return $sitePath.'/web/app_dev.php';
+            return $sitePath.'/'.$frontControllerDirectory.'/preview.php';
         }
 
-        return $sitePath.'/web/app.php';
+        return $sitePath.'/'.$frontControllerDirectory.'/index.php';
     }
 }

tests/Drivers/ContaoValetDriverTest.php

@@ -23,6 +23,6 @@ public function test_it_gets_front_controller()
         $driver = new ContaoValetDriver;
 
         $projectPath = $this->projectDir('contao');
-        $this->assertEquals($projectPath.'/web/app.php', $driver->frontControllerPath($projectPath, 'my-site', '/'));
+        $this->assertEquals($projectPath.'/public/index.php', $driver->frontControllerPath($projectPath, 'my-site', '/'));
     }
 }