organize better

cli/valet.php

@@ -4,8 +4,8 @@
 /**
  * Load correct autoloader depending on install location.
  */
-if (file_exists(__DIR__.'/vendor/autoload.php')) {
+if (file_exists(__DIR__.'/../vendor/autoload.php')) {
-    require __DIR__.'/vendor/autoload.php';
+    require __DIR__.'/../vendor/autoload.php';
 } else {
     require __DIR__.'/../../autoload.php';
 }

composer.json

@@ -15,12 +15,12 @@
     ],
     "autoload": {
         "files": [
-            "includes/compatibility.php",
+            "cli/includes/compatibility.php",
-            "includes/facades.php",
+            "cli/includes/facades.php",
-            "includes/helpers.php"
+            "cli/includes/helpers.php"
         ],
         "psr-4": {
-            "Valet\\": "src/"
+            "Valet\\": "cli/Valet/"
         }
     },
     "require": {

server.php

@@ -12,7 +12,7 @@
 function show_valet_404()
 {
     http_response_code(404);
-    require __DIR__.'/404.html';
+    require __DIR__.'/cli/templates/404.html';
     exit;
 }
 
@@ -61,7 +61,7 @@ function show_valet_404()
  */
 $valetDriver = null;
 
-require __DIR__.'/drivers/require.php';
+require __DIR__.'/cli/drivers/require.php';
 
 $valetDriver = ValetDriver::assign($valetSitePath, $siteName, $uri);
 

valet

@@ -2,7 +2,7 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-if [ ! -f "$DIR/valet.php" ]
+if [ ! -f "$DIR/cli/valet.php" ]
 then
     OLDPWD="$PWD"
     cd "$DIR/../laravel/valet"
@@ -12,11 +12,11 @@ fi
 
 if [[ "$1" = "install" ]] || [[ "$1" = "domain" ]] || [[ "$1" = "start" ]] || [[ "$1" = "restart" ]] || [[ "$1" = "stop" ]] || [[ "$1" = "uninstall" ]]
 then
-    sudo php "$DIR/valet.php" "$@"
+    sudo php "$DIR/cli/valet.php" "$@"
 elif [[ "$1" = "share" ]]
 then
     HOST="${PWD##*/}"
-    DOMAIN=$(php "$DIR/valet.php" current-domain)
+    DOMAIN=$(php "$DIR/cli/valet.php" current-domain)
 
 
     for linkname in ~/.valet/Sites/*; do
@@ -29,9 +29,9 @@ then
     done
 
     # Fetch Ngrok URL In Background...
-    bash "$DIR/fetch-share-url.sh" &
+    bash "$DIR/cli/fetch-share-url.sh" &
 
     "$DIR/bin/ngrok" http -host-header=rewrite "$HOST.$DOMAIN:80"
 else
-    php "$DIR/valet.php" $@
+    php "$DIR/cli/valet.php" $@
 fi