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

Update normalizePhpVersion regex

Browse Source 
Handle "php@8.1"
Simplify the entire method into one block

Co-Authored-By: Nathan Morgan <nathan@fuelingtheweb.com>
This commit is contained in:
Matt Stauffer
2022-03-13 22:17:50 -04:00
parent 7226da5bb7
commit 530e4c30dd
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cli/Valet/PhpFpm.php
View File

@@ -311,11 +311,7 @@ public function symlinkPrimaryValetSock($phpVersion)
*/ */
public function normalizePhpVersion($version) public function normalizePhpVersion($version)
{ {
if (strpos($version, 'php') === false) { return preg_replace('/(?:php@?)?([0-9+])(?:.)?([0-9+])/i', 'php@$1.$2', $version);
$version = 'php'.$version;
}
return preg_replace('/(php)([0-9+])(?:.)?([0-9+])/i', '$1@$2.$3', $version);
} }
/** /**

9
tests/PhpFpmTest.php
View File

@@ -51,6 +51,15 @@ public function test_it_can_generate_sock_file_name_from_php_version()
$this->assertEquals('valet72.sock', resolve(PhpFpm::class)->fpmSockName('72')); $this->assertEquals('valet72.sock', resolve(PhpFpm::class)->fpmSockName('72'));
} }
public function test_it_normalizes_php_versions()
{
$this->assertEquals('php@8.1', resolve(PhpFpm::class)->normalizePhpVersion('php@8.1'));
$this->assertEquals('php@8.1', resolve(PhpFpm::class)->normalizePhpVersion('php8.1'));
$this->assertEquals('php@8.1', resolve(PhpFpm::class)->normalizePhpVersion('php81'));
$this->assertEquals('php@8.1', resolve(PhpFpm::class)->normalizePhpVersion('8.1'));
$this->assertEquals('php@8.1', resolve(PhpFpm::class)->normalizePhpVersion('81'));
}
public function test_utilized_php_versions() public function test_utilized_php_versions()
{ {
$fileSystemMock = Mockery::mock(Filesystem::class); $fileSystemMock = Mockery::mock(Filesystem::class);