fix: add support for windows home path

This commit is contained in:
Enzo Innocenzi
2020-06-17 19:41:40 +02:00
parent baa9819daf
commit 54e9d4757d
6 changed files with 1124 additions and 18 deletions

View File

@@ -13,7 +13,7 @@ class PublishCommand extends Command
public function handle() public function handle()
{ {
$configFile = implode(DIRECTORY_SEPARATOR, [ $configFile = implode(DIRECTORY_SEPARATOR, [
$_SERVER['HOME'], $_SERVER['HOME'] ?? $_SERVER['USERPROFILE'],
'.expose', '.expose',
'config.php', 'config.php',
]); ]);

View File

@@ -19,7 +19,7 @@ class ShareCurrentWorkingDirectoryCommand extends ShareCommand
protected function detectTld(): string protected function detectTld(): string
{ {
$valetConfigFile = $_SERVER['HOME'].DIRECTORY_SEPARATOR.'.config'.DIRECTORY_SEPARATOR.'valet'.DIRECTORY_SEPARATOR.'config.json'; $valetConfigFile = $_SERVER['HOME'] ?? $_SERVER['USERPROFILE'].DIRECTORY_SEPARATOR.'.config'.DIRECTORY_SEPARATOR.'valet'.DIRECTORY_SEPARATOR.'config.json';
if (file_exists($valetConfigFile)) { if (file_exists($valetConfigFile)) {
$valetConfig = json_decode(file_get_contents($valetConfigFile)); $valetConfig = json_decode(file_get_contents($valetConfigFile));

View File

@@ -18,13 +18,11 @@ class StoreAuthenticationTokenCommand extends Command
public function handle() public function handle()
{ {
$config = config('expose', []);
if (! is_null($this->argument('token'))) { if (! is_null($this->argument('token'))) {
$this->info('Setting the expose authentication token to "'.$this->argument('token').'"'); $this->info('Setting the expose authentication token to "'.$this->argument('token').'"');
$configFile = implode(DIRECTORY_SEPARATOR, [ $configFile = implode(DIRECTORY_SEPARATOR, [
$_SERVER['HOME'], $_SERVER['HOME'] ?? $_SERVER['USERPROFILE'],
'.expose', '.expose',
'config.php', 'config.php',
]); ]);

View File

@@ -45,7 +45,7 @@ class AppServiceProvider extends ServiceProvider
} }
$configFile = implode(DIRECTORY_SEPARATOR, [ $configFile = implode(DIRECTORY_SEPARATOR, [
$_SERVER['HOME'] ?? __DIR__, $_SERVER['HOME'] ?? $_SERVER['USERPROFILE'] ?? __DIR__,
'.expose', '.expose',
'config.php', 'config.php',
]); ]);

1130
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -152,7 +152,7 @@ return [
| |
*/ */
'database' => implode(DIRECTORY_SEPARATOR, [ 'database' => implode(DIRECTORY_SEPARATOR, [
$_SERVER['HOME'] ?? __DIR__, $_SERVER['HOME'] ?? $_SERVER['USERPROFILE'] ?? __DIR__,
'.expose', '.expose',
'expose.db' 'expose.db'
]), ]),