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

Fix (really) changes where brew php paths now include @ and semver-style versions in paths

Browse Source
This commit is contained in:
Rob van Hoose
2018-04-04 11:26:06 -04:00
parent 5d74ad18cb
commit 2afc61cc6c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cli/Valet/Brew.php
View File

@@ -52,7 +52,7 @@ function hasInstalledPhp()
*/ */
function supportedPhpVersions() function supportedPhpVersions()
{ {
return collect(['php', 'php@7.2', 'php@7.1', 'php@7.0', 'php@5.6', 'php72', 'php71', 'php70', 'php56' ]); return collect(['php', 'php72', 'php71', 'php70', 'php56']);
} }
/** /**
@@ -182,7 +182,7 @@ function linkedPhp()
$resolvedPath = $this->files->readLink('/usr/local/bin/php'); $resolvedPath = $this->files->readLink('/usr/local/bin/php');
return $this->supportedPhpVersions()->first(function ($version) use ($resolvedPath) { return $this->supportedPhpVersions()->first(function ($version) use ($resolvedPath) {
return strpos($resolvedPath, "/$version/") !== false; return strpos(preg_replace('/([@|\.])/', '', $resolvedPath), "/$version/") !== false;
}, function () { }, function () {
throw new DomainException("Unable to determine linked PHP."); throw new DomainException("Unable to determine linked PHP.");
}); });