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

Apply suggestions from code review

Browse Source 
Co-authored-by: Matt Stauffer <mattstauffer@users.noreply.github.com>
This commit is contained in:
Nasir Uddin Nobin
2022-03-29 08:56:01 +06:00
committed by GitHub
parent 9a9f73faf9
commit 40cb21ec91
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cli/Valet/Brew.php
View File

@@ -280,7 +280,7 @@ public function linkedPhp()
return $this->supportedPhpVersions()->first(
function ($version) use ($resolvedPhpVersion) {
return $this->isPhpVersionsEqual($resolvedPhpVersion, $version);
return $this->arePhpVersionsEqual($resolvedPhpVersion, $version);
}, function () use ($resolvedPhpVersion) {
throw new DomainException("Unable to determine linked PHP when parsing '$resolvedPhpVersion'");
});
@@ -289,7 +289,7 @@ function ($version) use ($resolvedPhpVersion) {
/**
* Extract PHP executable path from PHP Version.
*
* @param string $phpVersion
* @param string $phpVersion For example, "php@8.1"
* @return string
*/
public function getPhpExecutablePath($phpVersion = null)
@@ -314,7 +314,8 @@ public function getPhpExecutablePath($phpVersion = null)
$resolvedPath = $this->files->readLink(BREW_PREFIX.'/opt/php');
$matches = $this->parsePhpPath($resolvedPath);
$resolvedPhpVersion = $matches[3] ?: $matches[2];
if ($this->isPhpVersionsEqual($resolvedPhpVersion, $phpVersion)) {
if ($this->arePhpVersionsEqual($resolvedPhpVersion, $phpVersion)) {
return BREW_PREFIX.'/opt/php/bin/php';
}
}
@@ -511,15 +512,15 @@ public function parsePhpPath($resolvedPath)
/**
* Check if two PHP versions are equal.
*
* @param string $resolvedPhpVersion
* @param string $version
* @param string $versionA
* @param string $versionB
* @return bool
*/
public function isPhpVersionsEqual($resolvedPhpVersion, $version)
public function arePhpVersionsEqual($versionA, $version)
{
$resolvedVersionNormalized = preg_replace('/[^\d]/', '', $resolvedPhpVersion);
$versionNormalized = preg_replace('/[^\d]/', '', $version);
$versionANormalized = preg_replace('/[^\d]/', '', $versionA);
$versionBNormalized = preg_replace('/[^\d]/', '', $versionB);
return $resolvedVersionNormalized === $versionNormalized;
return $versionANormalized === $versionBNormalized;
}
}