Merge pull request #516 from nystudio107/craft-driver-web-or-public

mattstauffer · web-flow · commit 7e2785272259 · 2018-02-09T10:17:11.000-05:00
Craft driver web or public
diff --git a/cli/drivers/CraftValetDriver.php b/cli/drivers/CraftValetDriver.php
@@ -23,6 +23,14 @@ public function serves($sitePath, $siteName, $uri)
      */
     public function frontControllerDirectory($sitePath)
     {
+        $dirs = ['web', 'public'];
+
+        foreach ($dirs as $dir) {
+            if (is_dir($sitePath.'/'.$dir)) {
+                return $dir;
+            }
+        }
+        // Give up, and just return the default
         return is_file($sitePath.'/craft') ? 'web' : 'public';
     }
 

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,14 @@ public function serves($sitePath, $siteName, $uri)`
`23`	`23`	`*/`
`24`	`24`	`public function frontControllerDirectory($sitePath)`
`25`	`25`	`{`
	`26`	`+ $dirs = ['web', 'public'];`
	`27`	`+`
	`28`	`+ foreach ($dirs as $dir) {`
	`29`	`+ if (is_dir($sitePath.'/'.$dir)) {`
	`30`	`+ return $dir;`
	`31`	`+ }`
	`32`	`+ }`
	`33`	`+ // Give up, and just return the default`
`26`	`34`	`return is_file($sitePath.'/craft') ? 'web' : 'public';`
`27`	`35`	`}`
`28`	`36`