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

Normalize PHP version parsing

Browse Source
This commit is contained in:
Chris Brown
2020-11-28 23:17:21 -05:00
parent b01556272d
commit be63541dd8
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cli/Valet/PhpFpm.php
View File

@@ -142,11 +142,8 @@ function fpmConfigPath()
{
$version = $this->brew->linkedPhp();
$versionNormalized = preg_replace(
'/php@?(\d)\.?(\d)/',
'$1.$2',
$version === 'php' ? Brew::LATEST_PHP_VERSION : $version
);
$versionNormalized = $this->normalizePhpVersion($version === 'php' ? Brew::LATEST_PHP_VERSION : $version);
$versionNormalized = preg_replace('~[^\d\.]~', '', $versionNormalized);
return $versionNormalized === '5.6'
? BREW_PREFIX.'/etc/php/5.6/php-fpm.conf'
@@ -195,6 +192,15 @@ function useVersion($version)
return $version === 'php' ? $this->brew->determineAliasedVersion($version) : $version;
}
/**
* If passed php7.4 or php74 formats, normalize to php@7.4 format.
*/
function normalizePhpVersion($version)
{
return preg_replace('/(php)([0-9+])(?:.)?([0-9+])/i', '$1@$2.$3', $version);
}
/**
* Validate the requested version to be sure we can support it.
*
@@ -203,8 +209,7 @@ function useVersion($version)
*/
function validateRequestedVersion($version)
{
// If passed php7.2 or php72 formats, normalize to php@7.2 format:
$version = preg_replace('/(php)([0-9+])(?:.)?([0-9+])/i', '$1@$2.$3', $version);
$version = $this->normalizePhpVersion($version);
if ($version === 'php') {
if (strpos($this->brew->determineAliasedVersion($version), '@')) {