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

Apply refactor & cleanup from the code review

Browse Source
This commit is contained in:
Nasir Uddin Nobin
2022-02-15 16:44:29 +06:00
committed by GitHub
parent 794e366ba5
commit 5c1043776e
4 changed files with 128 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
cli/Valet/PhpFpm.php
View File

@@ -9,6 +9,9 @@ class PhpFpm
public $brew;
public $cli;
public $files;
public $config;
public $site;
public $nginx;
public $taps = [
'homebrew/homebrew-core',
@@ -21,22 +24,27 @@ class PhpFpm
* @param Brew $brew
* @param CommandLine $cli
* @param Filesystem $files
* @param Configuration $config
* @param Site $site
* @param Nginx $nginx
* @return void
*/
public function __construct(Brew $brew, CommandLine $cli, Filesystem $files)
public function __construct(Brew $brew, CommandLine $cli, Filesystem $files, Configuration $config, Site $site, Nginx $nginx)
{
$this->cli = $cli;
$this->brew = $brew;
$this->files = $files;
$this->config = $config;
$this->site = $site;
$this->nginx = $nginx;
}
/**
* Install and configure PhpFpm.
*
* @param string|null $phpVersion
* @return void
*/
public function install($phpVersion = null)
public function install()
{
if (! $this->brew->hasInstalledPhp()) {
$this->brew->ensureInstalled('php', [], $this->taps);
@@ -44,9 +52,9 @@ public function install($phpVersion = null)
$this->files->ensureDirExists(VALET_HOME_PATH.'/Log', user());
$this->updateConfiguration($phpVersion);
$this->updateConfiguration();
$this->restart($phpVersion);
$this->restart();
}
/**
@@ -181,11 +189,19 @@ public function stopRunning()
/**
* Stop PHP, if a specific version isn't being used globally or by any sites.
*
* @param string $phpVersion
* @param string|null $phpVersion
* @return void
*/
public function maybeStop($phpVersion)
{
if (! $phpVersion) {
return;
}
if (strpos($phpVersion, 'php') === false) {
$phpVersion = 'php'.$phpVersion;
}
$phpVersion = $this->normalizePhpVersion($phpVersion);
if (! in_array($phpVersion, $this->utilizedPhpVersions())) {
@@ -198,11 +214,29 @@ public function maybeStop($phpVersion)
*
* @param $version
* @param bool $force
* @param string|null $site
* @return string
* @param string|null $directory
* @return string|void
*/
public function useVersion($version, $force = false, $site = null)
public function useVersion($version, $force = false, $directory = null)
{
if ($directory) {
$site = $this->site->getSiteUrl($directory);
if (! $site) {
warning(sprintf('The [%s] site could not be found in valet site list.', $directory));
exit();
}
if ($version == 'default') { // Remove isolation for this site
$customPhpVersion = $this->site->customPhpVersion($site); // Example output: "74"
$this->site->removeIsolation($site);
$this->maybeStop($customPhpVersion);
$this->nginx->restart();
info(sprintf('The [%s] site is now using default php version.', $site));
exit();
}
}
$version = $this->validateRequestedVersion($version);
try {
@@ -220,40 +254,55 @@ public function useVersion($version, $force = false, $site = null)
}
// Delete old Valet sock files, install the new version, and, if this is a global change, unlink and link PHP
if ($site) {
if ($directory && $site) {
$customPhpVersion = $this->site->customPhpVersion($site); // Example output: "74"
$this->cli->quietly('sudo rm '.VALET_HOME_PATH.'/'.$this->fpmSockName($version));
$this->install($version);
} else {
// Unlink the current global PHP if there is one installed
if ($this->brew->hasLinkedPhp()) {
$linkedPhp = $this->brew->linkedPhp();
$this->updateConfiguration($version);
$this->site->installSiteConfig($site, $this->fpmSockName($version), $version);
// Update the old FPM to keep running, using a custom sock file, so existing isolated sites aren't broken
$this->updateConfiguration($linkedPhp);
// Update existing custom Nginx config files; if they're using the old or new PHP version,
// update them to the new correct sock file location
$this->updateConfigurationForGlobalUpdate($version, $linkedPhp);
$currentVersion = $this->brew->getLinkedPhpFormula();
info(sprintf('Unlinking current version: %s', $currentVersion));
$this->brew->unlink($currentVersion);
}
info(sprintf('Linking new version: %s', $version));
$this->brew->link($version, true);
$this->stopRunning();
// remove any orphaned valet.sock files that PHP didn't clean up due to version conflicts
$this->files->unlink(VALET_HOME_PATH.'/valet.sock');
$this->cli->quietly('sudo rm '.VALET_HOME_PATH.'/valet*.sock');
// ensure configuration is correct and start the linked version
$this->install();
$this->maybeStop($customPhpVersion);
$this->restart($version);
$this->nginx->restart();
info(sprintf('The [%s] site is now using %s.', $site, $version));
exit();
}
return $version === 'php' ? $this->brew->determineAliasedVersion($version) : $version;
// Unlink the current global PHP if there is one installed
if ($this->brew->hasLinkedPhp()) {
$linkedPhp = $this->brew->linkedPhp();
// Update the old FPM to keep running, using a custom sock file, so existing isolated sites aren't broken
$this->updateConfiguration($linkedPhp);
// Update existing custom Nginx config files; if they're using the old or new PHP version,
// update them to the new correct sock file location
$this->updateConfigurationForGlobalUpdate($version, $linkedPhp);
$currentVersion = $this->brew->getLinkedPhpFormula();
info(sprintf('Unlinking current version: %s', $currentVersion));
$this->brew->unlink($currentVersion);
}
info(sprintf('Linking new version: %s', $version));
$this->brew->link($version, true);
$this->stopRunning();
// remove any orphaned valet.sock files that PHP didn't clean up due to version conflicts
$this->files->unlink(VALET_HOME_PATH.'/valet.sock');
$this->cli->quietly('sudo rm '.VALET_HOME_PATH.'/valet*.sock');
// ensure configuration is correct and start the linked version
$this->install();
$newVersion = $version === 'php' ? $this->brew->determineAliasedVersion($version) : $version;
$this->nginx->restart();
info(sprintf('Valet is now using %s.', $newVersion).PHP_EOL);
info('Note that you might need to run <comment>composer global update</comment> if your PHP version change affects the dependencies of global packages required by Composer.');
return $newVersion;
}
/**

32
cli/Valet/Site.php
View File

@@ -191,17 +191,26 @@ public function proxies()
}
/**
* Determine if the provided site is a valid site, whether parked or linked.
* Determine if the provided site is a valid site, whether parked or linked and get the site url.
*
* @param string $valetSite
* @return bool
* @param string $directory
* @return string|false
*/
public function isValidSite($valetSite)
public function getSiteUrl($directory)
{
// Remove .tld from sitename if it was provided
$siteName = str_replace('.'.$this->config->read()['tld'], '', $valetSite);
$tld = $this->config->read()['tld'];
return $this->parked()->merge($this->links())->where('site', $siteName)->count() > 0;
if ($directory == '.') { // Allow user to use dot as current dir's site `--site=.`
$directory = $this->host(getcwd());
}
$directory = str_replace('.'.$tld, '', $directory); // Remove .tld from sitename if it was provided
if ($this->parked()->merge($this->links())->where('site', $directory)->count() > 0) {
return $directory.'.'.$tld;
}
return false; // Invalid directory provided
}
/**
@@ -692,7 +701,7 @@ public function buildSecureNginxServer($url, $siteConf = null)
*
* @param string $valetSite
* @param string $fpmSockName
* @param $phpVersion
* @param string $phpVersion
* @return void
*/
public function installSiteConfig($valetSite, $fpmSockName, $phpVersion)
@@ -1091,11 +1100,8 @@ public function customPhpVersion($url)
public function replaceSockFile($siteConf, $sockFile, $phpVersion)
{
$siteConf = preg_replace('/valet[0-9]*.sock/', $sockFile, $siteConf);
$siteConf = preg_replace('/# Valet isolated PHP version.*\n/', '', $siteConf); // Remove `Valet isolated PHP version` line from config
if (! starts_with($siteConf, '# Valet isolated PHP version')) {
$siteConf = '# Valet isolated PHP version : '.$phpVersion.PHP_EOL.$siteConf;
}
return $siteConf;
return '# Valet isolated PHP version : '.$phpVersion.PHP_EOL.$siteConf;
}
}

40
cli/valet.php
View File

@@ -509,45 +509,7 @@
}
}
if ($site) {
$tld = Configuration::read()['tld'];
if ($site == '.') { // Allow user to use dot as current dir's site `--site=.`
$site = Site::host(getcwd()).'.'.$tld;
}
if (false === strpos($site, '.'.$tld)) {
$site = $site.'.'.$tld; // Allow user to pass just the site's directory name
}
if (! Site::isValidSite($site)) {
return warning(sprintf('Site %s could not be found in valet site list.', $site));
}
if ($phpVersion == 'default') {
$customPhpVersion = Site::customPhpVersion($site); // Example output: "74"
Site::removeIsolation($site);
if ($customPhpVersion) {
PhpFpm::maybeStop('php'.$customPhpVersion);
}
Nginx::restart();
info(sprintf('The [%s] site is now using default php version.', $site));
} else {
$newVersion = PhpFpm::useVersion($phpVersion, $force, $site);
Site::installSiteConfig($site, PhpFpm::fpmSockName($phpVersion), $phpVersion);
Nginx::restart();
info(sprintf('The [%s] site is now using %s.', $site, $newVersion));
}
} else {
$newVersion = PhpFpm::useVersion($phpVersion, $force);
Nginx::restart();
info(sprintf('Valet is now using %s.', $newVersion).PHP_EOL);
info('Note that you might need to run <comment>composer global update</comment> if your PHP version change affects the dependencies of global packages required by Composer.');
}
PhpFpm::useVersion($phpVersion, $force, $site);
})->descriptions('Change the version of PHP used by valet', [
'phpVersion' => 'The PHP version you want to use, e.g php@7.3',
'--site' => 'Isolate PHP version of a specific valet site. e.g: --site=site.test',