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

fixes

Browse Source
This commit is contained in:
Taylor Otwell
2018-03-02 08:25:57 -06:00
parent 466d66eb9f
commit 884753b75e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/Valet/Brew.php
View File

@@ -182,7 +182,7 @@ function linkedPhp()
$resolvedPath = $this->files->readLink('/usr/local/bin/php');
return $this->supportedPhpVersions()->first(function ($version) use ($resolvedPath) {
return strpos($resolvedPath, $version) !== false;
return strpos($resolvedPath, "/$version/") !== false;
}, function () {
throw new DomainException("Unable to determine linked PHP.");
});

3
cli/Valet/PhpFpm.php
View File

@@ -95,7 +95,7 @@ function restart()
*/
function stop()
{
$this->brew->stopService('php56', 'php70', 'php71', 'php72');
$this->brew->stopService('php56', 'php70', 'php71', 'php72', 'php');
}
/**
@@ -106,6 +106,7 @@ function stop()
function fpmConfigPath()
{
$confLookup = [
'php' => '/usr/local/etc/php/7.2/php-fpm.d/www.conf',
'php72' => '/usr/local/etc/php/7.2/php-fpm.d/www.conf',
'php71' => '/usr/local/etc/php/7.1/php-fpm.d/www.conf',
'php70' => '/usr/local/etc/php/7.0/php-fpm.d/www.conf',