Merge pull request #1068 from stidges/fix/subdomains

Fix subdomain using root domain link

Author: mattstauffer

server.php

@@ -128,23 +128,40 @@ function valet_default_site_path($config)
 function get_valet_site_path($valetConfig, $siteName, $domain)
 {
     $valetSitePath = null;
+
     foreach ($valetConfig['paths'] as $path) {
-        if ($handle = opendir($path)) {
-            while (false !== ($file = readdir($handle))) {
-                if (! is_dir($path.'/'.$file)) continue;
-                if (in_array($file, ['.', '..', '.DS_Store'])) continue;
-
-                // match dir for lowercase, because Nginx only tells us lowercase names
-                if (strtolower($file) === $siteName || strtolower($file) === $domain) {
-                    $valetSitePath = $path.'/'.$file;
-                }
+        $handle = opendir($path);
+
+        if ($handle === false) {
+            continue;
+        }
+
+        $dirs = [];
+
+        while (false !== ($file = readdir($handle))) {
+            if (is_dir($path.'/'.$file) && ! in_array($file, ['.', '..'])) {
+                $dirs[] = $file;
+            }
+        }
+
+        closedir($handle);
+
+        // Note: strtolower used below because Nginx only tells us lowercase names
+        foreach ($dirs as $dir) {
+            if (strtolower($dir) === $siteName) {
+                // early return when exact match for linked subdomain
+                return $path.'/'.$dir;
             }
-            closedir($handle);
-            
-            if ($valetSitePath) {
-                return $valetSitePath;
+
+            if (strtolower($dir) === $domain) {
+                // no early return here because the foreach may still have some subdomains to process with higher priority
+                $valetSitePath = $path.'/'.$dir;
             }
         }
+
+        if ($valetSitePath) {
+            return $valetSitePath;
+        }
     }
 }