1
0
mirror of https://github.com/laravel/valet.git synced 2026-02-04 16:10:08 +01:00
This commit is contained in:
NasirNobin
2022-03-22 02:02:12 +06:00
parent b7880793a9
commit 09f3d3e392

View File

@@ -311,8 +311,11 @@ public function getPhpBinaryPath($phpVersion)
$versionInteger = preg_replace('~[^\d]~', '', $phpVersion);
$binPath = null;
if (file_exists(BREW_PREFIX . "/bin/valetphp{$versionInteger}")) {
return BREW_PREFIX . "/bin/valetphp{$versionInteger}";
if ($this->files->isLink(BREW_PREFIX . "/bin/valetphp{$versionInteger}")) {
$binPath = $this->files->readLink(BREW_PREFIX . "/bin/valetphp{$versionInteger}");
if($this->files->exists($binPath)){
return $binPath;
}
}
$cellar = $this->cli->runAsUser("brew --cellar $phpVersion");
@@ -320,11 +323,11 @@ public function getPhpBinaryPath($phpVersion)
$path = !empty($details[0]->linked_keg) ? $details[0]->linked_keg : $details[0]->installed[0]->version;
if (file_exists(trim($cellar).'/'.$path.'/bin/php')) {
if ($this->files->exists(trim($cellar).'/'.$path.'/bin/php')) {
$binPath = trim($cellar).'/'.$path.'/bin/php';
}
// if (!$binPath && file_exists(BREW_PREFIX . "/opt/$phpVersion/bin/php")) {
// if (!$binPath && $this->>files->exists(BREW_PREFIX . "/opt/$phpVersion/bin/php")) {
// return BREW_PREFIX . "/opt/$phpVersion/bin/php";
// }