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

Check whether services are running as the correct user in valet status (#1348)

Browse Source
This commit is contained in:
Matt Stauffer
2023-01-22 21:56:06 -05:00
committed by GitHub
parent e756613d91
commit f23e1456bb
2 changed files with 57 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
cli/Valet/Status.php
View File

@@ -5,7 +5,7 @@
class Status
{
public $brewServicesUserOutput;
public $brewServicesSudoOutput;
public $brewServicesRootOutput;
public $debugInstructions = [];
public function __construct(public Configuration $config, public Brew $brew, public CommandLine $cli, public Filesystem $files)
@@ -41,6 +41,8 @@ public function check(): array
*/
public function checks(): array
{
$linkedPhp = $this->brew->getLinkedPhpFormula();
return [
[
'description' => 'Is Valet fully installed?',
@@ -91,10 +93,17 @@ public function checks(): array
},
'debug' => 'Run `valet restart`.',
],
[
'description' => 'Is Dnsmasq running as root?',
'check' => function () {
return $this->isBrewServiceRunningAsRoot('dnsmasq');
},
'debug' => 'Uninstall Dnsmasq with Brew and run `valet install`.',
],
[
'description' => 'Is Nginx installed?',
'check' => function () {
return $this->brew->installed('nginx');
return $this->brew->installed('nginx') || $this->brew->installed('nginx-full');
},
'debug' => 'Run `valet install`.',
],
@@ -105,6 +114,13 @@ public function checks(): array
},
'debug' => 'Run `valet restart`.',
],
[
'description' => 'Is Nginx running as root?',
'check' => function () {
return $this->isBrewServiceRunningAsRoot('nginx');
},
'debug' => 'Uninstall nginx with Brew and run `valet install`.',
],
[
'description' => 'Is PHP installed?',
'check' => function () {
@@ -113,12 +129,19 @@ public function checks(): array
'debug' => 'Run `valet install`.',
],
[
'description' => 'Is PHP running?',
'check' => function () {
return $this->isBrewServiceRunning('php', exactMatch: false);
'description' => 'Is linked PHP ('.$linkedPhp.') running?',
'check' => function () use ($linkedPhp) {
return $this->isBrewServiceRunning($linkedPhp);
},
'debug' => 'Run `valet restart`.',
],
[
'description' => 'Is linked PHP ('.$linkedPhp.') running as root?',
'check' => function () use ($linkedPhp) {
return $this->isBrewServiceRunningAsRoot($linkedPhp);
},
'debug' => 'Uninstall PHP with Brew and run `valet use php@8.2`',
],
[
'description' => 'Is valet.sock present?',
'check' => function () {
@@ -130,23 +153,37 @@ public function checks(): array
}
public function isBrewServiceRunning(string $name, bool $exactMatch = true): bool
{
return $this->isBrewServiceRunningAsUser($name, $exactMatch)
|| $this->isBrewServiceRunningAsRoot($name, $exactMatch);
}
public function isBrewServiceRunningAsRoot(string $name, bool $exactMatch = true): bool
{
if (! $this->brewServicesRootOutput) {
$this->brewServicesRootOutput = json_decode($this->cli->run('brew services info --all --json'), false);
}
return $this->isBrewServiceRunningGivenServiceList($this->brewServicesRootOutput, $name, $exactMatch);
}
public function isBrewServiceRunningAsUser(string $name, bool $exactMatch = true): bool
{
if (! $this->brewServicesUserOutput) {
$this->brewServicesUserOutput = json_decode($this->cli->runAsUser('brew services info --all --json'), false);
}
if (! $this->brewServicesSudoOutput) {
$this->brewServicesSudoOutput = json_decode($this->cli->run('brew services info --all --json'), false);
}
return $this->isBrewServiceRunningGivenServiceList($this->brewServicesUserOutput, $name, $exactMatch);
}
foreach ([$this->brewServicesUserOutput, $this->brewServicesSudoOutput] as $output) {
foreach ($output as $service) {
if ($service->running === true) {
if ($exactMatch && $service->name == $name) {
return true;
} elseif (! $exactMatch && str_contains($service->name, $name)) {
return true;
}
protected function isBrewServiceRunningGivenServiceList(array $serviceList, string $name, bool $exactMatch = true): bool
{
foreach ($serviceList as $service) {
if ($service->running === true) {
if ($exactMatch && $service->name == $name) {
return true;
} elseif (! $exactMatch && str_contains($service->name, $name)) {
return true;
}
}
}