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

[wip] Valet run/refactor with brew opt (#9)

Browse Source
This commit is contained in:
Nasir Uddin Nobin
2022-03-24 05:15:45 +06:00
committed by GitHub
parent fbf96b9abc
commit 6d3d191f44
3 changed files with 95 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
cli/Valet/Brew.php
View File

@@ -251,16 +251,7 @@ public function getParsedLinkedPhp()
$resolvedPath = $this->files->readLink(BREW_PREFIX.'/bin/php');
/**
* Typical homebrew path resolutions are like:
* "../Cellar/php@7.4/7.4.13/bin/php"
* or older styles:
* "../Cellar/php/7.4.9_2/bin/php
* "../Cellar/php55/bin/php.
*/
preg_match('~\w{3,}/(php)(@?\d\.?\d)?/(\d\.\d)?([_\d\.]*)?/?\w{3,}~', $resolvedPath, $matches);
return $matches;
return $this->parsePhpPath($resolvedPath);
}
/**
@@ -289,82 +280,46 @@ public function linkedPhp()
return $this->supportedPhpVersions()->first(
function ($version) use ($resolvedPhpVersion) {
$resolvedVersionNormalized = preg_replace('/[^\d]/', '', $resolvedPhpVersion);
$versionNormalized = preg_replace('/[^\d]/', '', $version);
return $resolvedVersionNormalized === $versionNormalized;
return $this->isPhpVersionsEqual($resolvedPhpVersion, $version);
}, function () use ($resolvedPhpVersion) {
throw new DomainException("Unable to determine linked PHP when parsing '$resolvedPhpVersion'");
});
}
/**
* Get PHP executable path for a given PHP Version.
*
* @param string|null $phpVersion
* @param bool $skipCache
* @return string
*/
public function whichPhp($phpVersion = null, $skipCache = false)
{
if (! $phpVersion) {
return BREW_PREFIX.'/bin/php';
}
$versionInteger = preg_replace('~[^\d]~', '', $phpVersion);
$symlinkedValetPhpPath = BREW_PREFIX."/bin/valetphp{$versionInteger}";
// If the symlinked Valet PHP path exists, then we can use that
if (! $skipCache && $this->files->isLink($symlinkedValetPhpPath)) {
$phpExecutablePath = $this->files->readLink($symlinkedValetPhpPath);
// Still make sure that the version of the executable exists
if ($this->files->exists($phpExecutablePath)) {
return $phpExecutablePath;
}
}
// If the symlinked Valet PHP path doesn't exist, then we need to look for the correct executable path
// Create a symlink to the Valet PHP version, so next time Valet won't have to look for the executable path
if ($phpExecutablePath = $this->getPhpExecutablePath($phpVersion)) {
$this->files->symlinkAsUser($phpExecutablePath, $symlinkedValetPhpPath);
}
return $phpExecutablePath ?: BREW_PREFIX.'/bin/php';
}
/**
* Extract PHP executable path from PHP Version.
*
* @param string $phpVersion
* @return string
*/
public function getPhpExecutablePath($phpVersion)
public function getPhpExecutablePath($phpVersion = null)
{
$phpExecutablePath = null;
if (! $phpVersion) {
return BREW_PREFIX.'/bin/php';
}
$cellar = $this->cli->runAsUser("brew --cellar $phpVersion"); // Example output: `/opt/homebrew/Cellar/php@8.0`
$details = json_decode($this->cli->runAsUser("brew info --json $phpVersion"), true);
$phpDirectory = data_get($details, '0.linked_keg');
// Check the default `/opt/homebrew/opt/php@8.1/bin/php` location first
if ($this->files->exists(BREW_PREFIX."/opt/{$phpVersion}/bin/php")) {
return BREW_PREFIX."/opt/{$phpVersion}/bin/php";
}
if (is_null($phpDirectory) && $installed = data_get($details, '0.installed')) {
$phpDirectory = data_get(collect($installed)->where('installed_as_dependency', false)->last(), 'version');
// Check the `/opt/homebrew/opt/php71/bin/php` location for older installations
$phpVersion = str_replace(['@', '.'], '' , $phpVersion); // php@8.1 to php81
if ($this->files->exists(BREW_PREFIX."/opt/{$phpVersion}/bin/php")) {
return BREW_PREFIX."/opt/{$phpVersion}/bin/php";
}
if (is_null($phpDirectory)) {
$phpDirectory = data_get(collect($installed)->last(), 'version');
// Check if the default PHP is the version we are looking for
if ($this->files->isLink(BREW_PREFIX."/opt/php")) {
$resolvedPath = $this->files->readLink(BREW_PREFIX."/opt/php");
$matches = $this->parsePhpPath($resolvedPath);
$resolvedPhpVersion = $matches[3] ?: $matches[2];
if ($this->isPhpVersionsEqual($resolvedPhpVersion, $phpVersion)) {
return BREW_PREFIX."/opt/php/bin/php";
}
}
if (isset($phpDirectory) && $this->files->exists(trim($cellar).'/'.$phpDirectory.'/bin/php')) {
$phpExecutablePath = trim($cellar).'/'.$phpDirectory.'/bin/php';
}
// When PHP Version is installed directly though shivammathur/homebrew-php, it usually stores the binaries in this directory
if (is_null($phpExecutablePath) && $this->files->exists(BREW_PREFIX."/opt/{$phpVersion}/bin/php")) {
$phpExecutablePath = BREW_PREFIX."/opt/{$phpVersion}/bin/php";
}
return $phpExecutablePath;
return BREW_PREFIX.'/bin/php';
}
/**
@@ -532,4 +487,41 @@ function ($exitCode, $errorOutput) {
}
);
}
/**
* Parse homebrew PHP Path
*
* @param string $resolvedPath
*
* @return mixed
*/
public function parsePhpPath($resolvedPath)
{
/**
* Typical homebrew path resolutions are like:
* "../Cellar/php@7.4/7.4.13/bin/php"
* or older styles:
* "../Cellar/php/7.4.9_2/bin/php
* "../Cellar/php55/bin/php.
*/
preg_match('~\w{3,}/(php)(@?\d\.?\d)?/(\d\.\d)?([_\d\.]*)?/?\w{3,}~', $resolvedPath, $matches);
return $matches;
}
/**
* Check if two PHP versions are equal
*
* @param string $resolvedPhpVersion
* @param string $version
*
* @return bool
*/
public function isPhpVersionsEqual($resolvedPhpVersion, $version)
{
$resolvedVersionNormalized = preg_replace('/[^\d]/', '', $resolvedPhpVersion);
$versionNormalized = preg_replace('/[^\d]/', '', $version);
return $resolvedVersionNormalized === $versionNormalized;
}
}

5
cli/valet.php
View File

@@ -564,7 +564,7 @@
/**
* Get the PHP executable path for a site.
*/
$app->command('which-php [site] [--skip-cache]', function ($site, $skipCache) {
$app->command('which-php [site]', function ($site) {
$host = Site::host($site ?: getcwd()).'.'.Configuration::read()['tld'];
$phpVersion = Site::customPhpVersion($host);
@@ -577,10 +577,9 @@
$phpVersion = $phpVersion ? PhpFpm::normalizePhpVersion($phpVersion) : null;
return output(Brew::whichPhp($phpVersion, $skipCache));
return output(Brew::getPhpExecutablePath($phpVersion));
})->descriptions('Get the PHP executable path for a given site', [
'site' => 'The site to get the PHP executable path for',
'--skip-cache' => 'Force re-check of the PHP executable path',
]);
/**