From fa0bd53d12e9278fb6605622b737fe60c56ece92 Mon Sep 17 00:00:00 2001 From: NasirNobin Date: Fri, 1 Apr 2022 00:25:46 +0600 Subject: [PATCH] Read .valetphprc on isolation command (#6) * Read .valetphprc on isolation command * wip * wip * wip * remove $site->getSiteUrl() dependency to avoid expection * StyleCI patch --- cli/valet.php | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/cli/valet.php b/cli/valet.php index 58deaa8..05fb4ca 100755 --- a/cli/valet.php +++ b/cli/valet.php @@ -508,7 +508,15 @@ if (! $phpVersion) { $site = basename(getcwd()); $linkedVersion = Brew::linkedPhp(); - $phpVersion = Site::phpRcVersion($site); + + if ($phpVersion = Site::phpRcVersion($site)) { + info("Found '{$site}/.valetphprc' specifying version: {$phpVersion}"); + } else { + $domain = $site.'.'.data_get(Configuration::read(), 'tld'); + if ($phpVersion = PhpFpm::normalizePhpVersion(Site::customPhpVersion($domain))) { + info("Found isolated site '{$domain}' specifying version: {$phpVersion}"); + } + } if (! $phpVersion) { return info("Valet is using {$linkedVersion}."); @@ -517,8 +525,6 @@ if ($linkedVersion == $phpVersion && ! $force) { return info("Valet is already using {$linkedVersion}."); } - - info("Found '{$site}/.valetphprc' specifying version: {$phpVersion}"); } PhpFpm::useVersion($phpVersion, $force); @@ -534,6 +540,11 @@ $site = basename(getcwd()); } + if (! $phpVersion) { + $phpVersion = Site::phpRcVersion($site); + info("Found '{$site}/.valetphprc' specifying version: {$phpVersion}"); + } + PhpFpm::isolateDirectory($site, $phpVersion); })->descriptions('Change the version of PHP used by Valet to serve the current working directory', [ 'phpVersion' => 'The PHP version you want to use; e.g php@8.1',