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

Merge branch 'master' into feature/custom-site-stubs

Browse Source
This commit is contained in:
Jerry Price
2022-07-08 09:21:51 -04:00
parent c35900eacb 3a243c65c3
commit e668e77f3d
13 changed files with 219 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cli/Valet/PhpFpm.php
View File

@@ -46,6 +46,8 @@ public function __construct(Brew $brew, CommandLine $cli, Filesystem $files, Con
*/
public function install()
{
info('Installing and configuring phpfpm...');
if (! $this->brew->hasInstalledPhp()) {
$this->brew->ensureInstalled('php', [], $this->taps);
}
@@ -324,7 +326,7 @@ public function symlinkPrimaryValetSock($phpVersion)
*/
public function normalizePhpVersion($version)
{
return preg_replace('/(?:php@?)?([0-9+])(?:.)?([0-9+])/i', 'php@$1.$2', $version);
return preg_replace('/(?:php@?)?([0-9+])(?:.)?([0-9+])/i', 'php@$1.$2', (string) $version);
}
/**