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

Move server helpers to their own file; add type hints

Browse Source
This commit is contained in:
Matt Stauffer
2022-12-15 21:34:48 -06:00
parent b2b0e1d592
commit 29b94a48a6
4 changed files with 163 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cli/Valet/Drivers/ValetDriver.php
View File

@@ -6,6 +6,7 @@
use RecursiveIteratorIterator;
use RecursiveRegexIterator;
use RegexIterator;
use Throwable;
abstract class ValetDriver
{
@@ -17,7 +18,7 @@ abstract class ValetDriver
* @param string $uri
* @return bool
*/
abstract public function serves($sitePath, $siteName, $uri);
abstract public function serves(string $sitePath, string $siteName, string $uri): bool;
/**
* Determine if the incoming request is for a static file.
@@ -27,7 +28,7 @@ abstract public function serves($sitePath, $siteName, $uri);
* @param string $uri
* @return string|false
*/
abstract public function isStaticFile($sitePath, $siteName, $uri);
abstract public function isStaticFile(string $sitePath, string $siteName, string $uri): string|false;
/**
* Get the fully resolved path to the application's front controller.
@@ -37,7 +38,7 @@ abstract public function isStaticFile($sitePath, $siteName, $uri);
* @param string $uri
* @return string
*/
abstract public function frontControllerPath($sitePath, $siteName, $uri);
abstract public function frontControllerPath(string $sitePath, string $siteName, string $uri): string;
/**
* Find a driver that can serve the incoming request.
@@ -47,7 +48,7 @@ abstract public function frontControllerPath($sitePath, $siteName, $uri);
* @param string $uri
* @return ValetDriver|null
*/
public static function assign($sitePath, $siteName, $uri)
public static function assign(string $sitePath, string $siteName, string $uri): ?ValetDriver
{
$drivers = [];
@@ -84,8 +85,8 @@ public static function assign($sitePath, $siteName, $uri)
try {
// Try for old, un-namespaced drivers
$driver = new $driver;
} catch (\Throwable $e) {
$className = "Valet\Drivers\\$driver";
} catch (Throwable $e) {
$className = "Valet\Drivers\\{$driver}";
$driver = new $className;
}
@@ -99,9 +100,9 @@ public static function assign($sitePath, $siteName, $uri)
* Get the custom driver class from the site path, if one exists.
*
* @param string $sitePath
* @return string
* @return string|null
*/
public static function customSiteDriver($sitePath)
public static function customSiteDriver(string $sitePath): ?string
{
if (! file_exists($sitePath.'/LocalValetDriver.php')) {
return;
@@ -118,7 +119,7 @@ public static function customSiteDriver($sitePath)
* @param string $path
* @return array
*/
public static function driversIn($path)
public static function driversIn(string $path): array
{
if (! is_dir($path)) {
return [];
@@ -145,7 +146,7 @@ public static function driversIn($path)
* @param string $uri
* @return string
*/
public function mutateUri($uri)
public function mutateUri(string $uri): string
{
return $uri;
}
@@ -159,7 +160,7 @@ public function mutateUri($uri)
* @param string $uri
* @return void
*/
public function serveStaticFile($staticFilePath, $sitePath, $siteName, $uri)
public function serveStaticFile(string $staticFilePath, string $sitePath, string $siteName, string $uri): void
{
/**
* Back story...
@@ -201,7 +202,7 @@ protected function isActualFile($path)
* @param string $siteName
* @return void
*/
public function loadServerEnvironmentVariables($sitePath, $siteName)
public function loadServerEnvironmentVariables(string $sitePath, string $siteName): void
{
$varFilePath = $sitePath.'/.valet-env.php';
if (! file_exists($varFilePath)) {