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

Update minimum PHP requirement to 5.6

Browse Source 
... because it's not actually compatible with 5.5 anymore - Ref: https://github.com/laravel/valet/issues/279
This commit is contained in:
Chris Brown
2016-12-27 15:58:16 -05:00
parent 42e5fc325b
commit e208ca2340
5 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cli/Valet/Brew.php
View File

@@ -42,8 +42,7 @@ function hasInstalledPhp()
{
return $this->installed('php71')
|| $this->installed('php70')
|| $this->installed('php56')
|| $this->installed('php55');
|| $this->installed('php56');
}
/**
@@ -146,8 +145,6 @@ function linkedPhp()
return 'php70';
} elseif (strpos($resolvedPath, 'php56') !== false) {
return 'php56';
} elseif (strpos($resolvedPath, 'php55') !== false) {
return 'php55';
} else {
throw new DomainException("Unable to determine linked PHP.");
}

6
cli/Valet/PhpFpm.php
View File

@@ -38,8 +38,7 @@ function install()
{
if (! $this->brew->installed('php71') &&
! $this->brew->installed('php70') &&
! $this->brew->installed('php56') &&
! $this->brew->installed('php55')) {
! $this->brew->installed('php56')) {
$this->brew->ensureInstalled('php71', [], $this->taps);
}
@@ -88,7 +87,7 @@ function restart()
*/
function stop()
{
$this->brew->stopService('php55', 'php56', 'php70', 'php71');
$this->brew->stopService('php56', 'php70', 'php71');
}
/**
@@ -102,7 +101,6 @@ function fpmConfigPath()
'php71' => '/usr/local/etc/php/7.1/php-fpm.d/www.conf',
'php70' => '/usr/local/etc/php/7.0/php-fpm.d/www.conf',
'php56' => '/usr/local/etc/php/5.6/php-fpm.conf',
'php55' => '/usr/local/etc/php/5.5/php-fpm.conf',
];
return $confLookup[$this->brew->linkedPhp()];