diff --git a/cli/Valet/Brew.php b/cli/Valet/Brew.php index 965075c..cf7cf0a 100644 --- a/cli/Valet/Brew.php +++ b/cli/Valet/Brew.php @@ -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."); }); diff --git a/cli/Valet/PhpFpm.php b/cli/Valet/PhpFpm.php index d2c3ea0..380a722 100644 --- a/cli/Valet/PhpFpm.php +++ b/cli/Valet/PhpFpm.php @@ -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',