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

Apply fixes from StyleCI

Browse Source
This commit is contained in:
StyleCI Bot
2022-12-18 21:08:41 +00:00
parent efa7937038
commit a73be25a76
13 changed files with 48 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cli/Valet/Drivers/BasicValetDriver.php
View File

@@ -20,9 +20,9 @@ public function serves(string $sitePath, string $siteName, string $uri): bool
/**
* Take any steps necessary before loading the front controller for this driver.
*
* @param string $sitePath
* @param string $siteName
* @param string $uri
* @param string $sitePath
* @param string $siteName
* @param string $uri
* @return void
*/
public function beforeLoading(string $sitePath, string $siteName, string $uri): void

6
cli/Valet/Drivers/LaravelValetDriver.php
View File

@@ -21,9 +21,9 @@ public function serves(string $sitePath, string $siteName, string $uri): bool
/**
* Take any steps necessary before loading the front controller for this driver.
*
* @param string $sitePath
* @param string $siteName
* @param string $uri
* @param string $sitePath
* @param string $siteName
* @param string $uri
* @return void
*/
public function beforeLoading(string $sitePath, string $siteName, string $uri): void

6
cli/Valet/Drivers/Specific/BedrockValetDriver.php
View File

@@ -25,9 +25,9 @@ public function serves(string $sitePath, string $siteName, string $uri): bool
/**
* Take any steps necessary before loading the front controller for this driver.
*
* @param string $sitePath
* @param string $siteName
* @param string $uri
* @param string $sitePath
* @param string $siteName
* @param string $uri
* @return void
*/
public function beforeLoading(string $sitePath, string $siteName, string $uri): void

2
cli/Valet/Drivers/Specific/JigsawValetDriver.php
View File

@@ -16,7 +16,7 @@ class JigsawValetDriver extends BasicValetDriver
*/
public function serves(string $sitePath, string $siteName, string $uri): bool
{
return is_dir($sitePath . '/build_local');
return is_dir($sitePath.'/build_local');
}
/**

6
cli/Valet/Drivers/Specific/JoomlaValetDriver.php
View File

@@ -22,9 +22,9 @@ public function serves(string $sitePath, string $siteName, string $uri): bool
/**
* Take any steps necessary before loading the front controller for this driver.
*
* @param string $sitePath
* @param string $siteName
* @param string $uri
* @param string $sitePath
* @param string $siteName
* @param string $uri
* @return void
*/
public function beforeLoading(string $sitePath, string $siteName, string $uri): void

2
cli/Valet/Drivers/Specific/KatanaValetDriver.php
View File

@@ -16,7 +16,7 @@ class KatanaValetDriver extends BasicValetDriver
*/
public function serves(string $sitePath, string $siteName, string $uri): bool
{
return file_exists($sitePath . '/katana');
return file_exists($sitePath.'/katana');
}
/**

8
cli/Valet/Drivers/Specific/NeosValetDriver.php
View File

@@ -22,16 +22,16 @@ public function serves(string $sitePath, string $siteName, string $uri): bool
/**
* Take any steps necessary before loading the front controller for this driver.
*
* @param string $sitePath
* @param string $siteName
* @param string $uri
* @param string $sitePath
* @param string $siteName
* @param string $uri
* @return void
*/
public function beforeLoading(string $sitePath, string $siteName, string $uri): void
{
putenv('FLOW_CONTEXT=Development');
putenv('FLOW_REWRITEURLS=1');
$_SERVER['SCRIPT_FILENAME'] = $sitePath . '/Web/index.php';
$_SERVER['SCRIPT_FILENAME'] = $sitePath.'/Web/index.php';
$_SERVER['SCRIPT_NAME'] = '/index.php';
}

8
cli/Valet/Drivers/Specific/Typo3ValetDriver.php
View File

@@ -44,9 +44,9 @@ class Typo3ValetDriver extends ValetDriver
/**
* Take any steps necessary before loading the front controller for this driver.
*
* @param string $sitePath
* @param string $siteName
* @param string $uri
* @param string $sitePath
* @param string $siteName
* @param string $uri
* @return void
*/
public function beforeLoading(string $sitePath, string $siteName, string $uri): void
@@ -54,7 +54,7 @@ public function beforeLoading(string $sitePath, string $siteName, string $uri):
// without modifying the URI, redirect if necessary
$this->handleRedirectBackendShorthandUris($uri);
$_SERVER['SERVER_NAME'] = $siteName . '.dev';
$_SERVER['SERVER_NAME'] = $siteName.'.dev';
$_SERVER['DOCUMENT_URI'] = $uri;
$_SERVER['SCRIPT_NAME'] = $uri;
$_SERVER['PHP_SELF'] = $uri;

6
cli/Valet/Drivers/Specific/WordPressValetDriver.php
View File

@@ -22,9 +22,9 @@ public function serves(string $sitePath, string $siteName, string $uri): bool
/**
* Take any steps necessary before loading the front controller for this driver.
*
* @param string $sitePath
* @param string $siteName
* @param string $uri
* @param string $sitePath
* @param string $siteName
* @param string $uri
* @return void
*/
public function beforeLoading(string $sitePath, string $siteName, string $uri): void

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

@@ -122,15 +122,15 @@ public static function specificDrivers(): array
{
return array_map(function ($item) {
return 'Specific\\'.$item;
}, static::driversIn(__DIR__ . '/Specific'));
}, static::driversIn(__DIR__.'/Specific'));
}
/**
* Take any steps necessary before loading the front controller for this driver.
*
* @param string $sitePath
* @param string $siteName
* @param string $uri
* @param string $sitePath
* @param string $siteName
* @param string $uri
* @return void
*/
public function beforeLoading(string $sitePath, string $siteName, string $uri): void

32
cli/Valet/Server.php
View File

@@ -12,10 +12,10 @@ public function __construct(array $config)
}
/**
* Extract $uri from $SERVER['REQUEST_URI'] variable
* Extract $uri from $SERVER['REQUEST_URI'] variable.
*
* @param string $requestUri $_SERVER['REQUEST_URI']
* @return string
* @param string $requestUri $_SERVER['REQUEST_URI']
* @return string
*/
public function uriFromRequestUri(string $requestUri): string
{
@@ -25,10 +25,10 @@ public function uriFromRequestUri(string $requestUri): string
}
/**
* Extract site name from HTTP host, stripping www. and supporting wildcard DNS
* Extract site name from HTTP host, stripping www. and supporting wildcard DNS.
*
* @param string $httpHost
* @return string
* @param string $httpHost
* @return string
*/
public function siteNameFromHttpHost(string $httpHost): string
{
@@ -50,8 +50,8 @@ public function siteNameFromHttpHost(string $httpHost): string
* First, determine the IP address of your local computer (like 192.168.0.10).
* Then, visit http://project.your-ip.nip.io - e.g.: http://laravel.192.168.0.10.nip.io.
*
* @param string $domain
* @return string
* @param string $domain
* @return string
*/
public function allowWildcardDnsDomains(string $domain): string
{
@@ -68,12 +68,12 @@ public function allowWildcardDnsDomains(string $domain): string
foreach ($services as $service) {
$pattern = preg_quote($service, '#');
$pattern = str_replace('\*', '.*', $pattern);
$patterns[] = '(.*)' . $pattern;
$patterns[] = '(.*)'.$pattern;
}
$pattern = implode('|', $patterns);
if (preg_match('#(?:' . $pattern . ')\z#u', $domain, $matches)) {
if (preg_match('#(?:'.$pattern.')\z#u', $domain, $matches)) {
$domain = array_pop($matches);
}
@@ -117,7 +117,7 @@ public function sitePath(string $siteName): string
$dirs = [];
while (false !== ($file = readdir($handle))) {
if (is_dir($path . '/' . $file) && !in_array($file, ['.', '..'])) {
if (is_dir($path.'/'.$file) && ! in_array($file, ['.', '..'])) {
$dirs[] = $file;
}
}
@@ -128,12 +128,12 @@ public function sitePath(string $siteName): string
foreach ($dirs as $dir) {
if (strtolower($dir) === $siteName) {
// early return when exact match for linked subdomain
return $path . '/' . $dir;
return $path.'/'.$dir;
}
if (strtolower($dir) === $domain) {
// no early return here because the foreach may still have some subdomains to process with higher priority
$valetSitePath = $path . '/' . $dir;
$valetSitePath = $path.'/'.$dir;
}
}
@@ -149,7 +149,7 @@ public function sitePath(string $siteName): string
public function show404()
{
http_response_code(404);
require __DIR__ . '/cli/templates/404.html';
require __DIR__.'/cli/templates/404.html';
exit;
}
@@ -172,9 +172,9 @@ public function defaultSitePath(): ?string
public function showDirectoryListing(string $valetSitePath, string $uri)
{
$is_root = ($uri == '/');
$directory = ($is_root) ? $valetSitePath : $valetSitePath . $uri;
$directory = ($is_root) ? $valetSitePath : $valetSitePath.$uri;
if (!file_exists($directory)) {
if (! file_exists($directory)) {
show_valet_404();
}

4
cli/includes/require-drivers.php
View File

@@ -3,8 +3,8 @@
require_once './cli/Valet/Drivers/ValetDriver.php';
foreach (scandir('./cli/Valet/Drivers') as $file) {
$path = './cli/Valet/Drivers/' . $file;
if (substr($file, 0, 1) !== '.' && !is_dir($path)) {
$path = './cli/Valet/Drivers/'.$file;
if (substr($file, 0, 1) !== '.' && ! is_dir($path)) {
require_once $path;
}
}

3
server.php
View File

@@ -72,9 +72,8 @@
}
/**
* Allow for drivers to take pre-loading actions (e.g. setting server variables)
* Allow for drivers to take pre-loading actions (e.g. setting server variables).
*/
$valetDriver->beforeLoading($valetSitePath, $siteName, $uri);
/**