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

Use a separate .ini file instead of editing the main php.ini file

Browse Source
This commit is contained in:
Adam Wathan
2016-09-24 16:28:11 -04:00
parent 60a8f78346
commit 1c29674d7b
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cli/Valet/PhpFpm.php
View File

@@ -74,11 +74,7 @@ function updateConfiguration()
*/
function updateIni()
{
$contents = $this->files->get($this->fpmIniPath());
$contents = preg_replace('/^default_mimetype = .+$/m', 'default_mimetype = ""', $contents);
$this->files->put($this->fpmIniPath(), $contents);
$this->files->copyAsUser(__DIR__.'/../stubs/valet.ini', $this->fpmIniPath());
}
/**
@@ -121,17 +117,17 @@ function fpmConfigPath()
}
/**
* Get the path to the FPM ini file for the current PHP version.
* Get the path to Valet's PHP ini file for the current PHP version.
*
* @return string
*/
function fpmIniPath()
{
$versionLookup = [
'php71' => '/usr/local/etc/php/7.1/php.ini',
'php70' => '/usr/local/etc/php/7.0/php.ini',
'php56' => '/usr/local/etc/php/5.6/php.ini',
'php55' => '/usr/local/etc/php/5.5/php.ini',
'php71' => '/usr/local/etc/php/7.1/conf.d/valet.ini',
'php70' => '/usr/local/etc/php/7.0/conf.d/valet.ini',
'php56' => '/usr/local/etc/php/5.6/conf.d/valet.ini',
'php55' => '/usr/local/etc/php/5.5/conf.d/valet.ini',
];
return $versionLookup[$this->brew->linkedPhp()];