phpmon/laravel-valet
1
0
Fork 0
mirror of https://github.com/laravel/valet.git synced 2026-02-04 08:10:07 +01:00
Code Activity

Update drivers location and loading

Browse Source 
- Extract much of server.php into a `Server` class
- Move all but the Laravel and Basic drivers into a subfolder
- Load all but the Laravel and Basic drivers via glob
- Add `beforeLoading` hook to simplify the `frontControllerPath` method for some drivers
This commit is contained in:
Matt Stauffer
2022-12-18 15:08:17 -06:00
parent 29b94a48a6
commit efa7937038
68 changed files with 534 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
server.php
View File

@@ -1,9 +1,10 @@
<?php
require_once './cli/includes/require-drivers.php';
require_once './cli/includes/server-helpers.php';
require_once './cli/Valet/Server.php';
use Valet\Drivers\ValetDriver;
use Valet\Server;
/**
* Define the user's "~/.config/valet" path.
@@ -18,28 +19,17 @@
file_get_contents(VALET_HOME_PATH.'/config.json'), true
);
$server = new Server($valetConfig);
/**
* Parse the URI and site / host for the incoming request.
*/
$uri = rawurldecode(
explode('?', $_SERVER['REQUEST_URI'])[0]
);
$uri = $server->uriFromRequestUri($_SERVER['REQUEST_URI']);
$siteName = $server->siteNameFromHttpHost($_SERVER['HTTP_HOST']);
$valetSitePath = $server->sitePath($siteName);
$siteName = basename(
// Filter host to support wildcard dns feature
valet_support_wildcard_dns($_SERVER['HTTP_HOST'], $valetConfig),
'.'.$valetConfig['tld']
);
if (strpos($siteName, 'www.') === 0) {
$siteName = substr($siteName, 4);
}
$domain = array_slice(explode('.', $siteName), -1)[0];
$valetSitePath = get_valet_site_path($valetConfig, $siteName, $domain);
if (is_null($valetSitePath) && is_null($valetSitePath = valet_default_site_path($valetConfig))) {
show_valet_404();
if (is_null($valetSitePath) && is_null($valetSitePath = $server->defaultSitePath())) {
$server->show404();
}
$valetSitePath = realpath($valetSitePath);
@@ -50,7 +40,7 @@
$valetDriver = ValetDriver::assign($valetSitePath, $siteName, $uri);
if (! $valetDriver) {
show_valet_404();
$server->show404();
}
/**
@@ -81,6 +71,12 @@
return $valetDriver->serveStaticFile($staticFilePath, $valetSitePath, $siteName, $uri);
}
/**
* Allow for drivers to take pre-loading actions (e.g. setting server variables)
*/
$valetDriver->beforeLoading($valetSitePath, $siteName, $uri);
/**
* Attempt to dispatch to a front controller.
*/
@@ -90,10 +86,10 @@
if (! $frontControllerPath) {
if (isset($valetConfig['directory-listing']) && $valetConfig['directory-listing'] == 'on') {
show_directory_listing($valetSitePath, $uri);
$server->showDirectoryListing($valetSitePath, $uri);
}
show_valet_404();
$server->show404();
}
chdir(dirname($frontControllerPath));