1
0
mirror of https://github.com/laravel/valet.git synced 2026-02-04 08:10:07 +01:00

Merge pull request #1242 from NasirNobin/master

Remove preg_replace deprecation warning
This commit is contained in:
Matt Stauffer
2022-04-18 11:11:59 -04:00
committed by GitHub
2 changed files with 3 additions and 1 deletions

View File

@@ -324,7 +324,7 @@ public function symlinkPrimaryValetSock($phpVersion)
*/ */
public function normalizePhpVersion($version) 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);
} }
/** /**

View File

@@ -63,6 +63,8 @@ public function test_it_normalizes_php_versions()
$this->assertEquals('php@8.1', resolve(PhpFpm::class)->normalizePhpVersion('php81')); $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('8.1'));
$this->assertEquals('php@8.1', resolve(PhpFpm::class)->normalizePhpVersion('81')); $this->assertEquals('php@8.1', resolve(PhpFpm::class)->normalizePhpVersion('81'));
$this->assertEquals('', resolve(PhpFpm::class)->normalizePhpVersion(''));
$this->assertEquals('', resolve(PhpFpm::class)->normalizePhpVersion(null));
} }
public function test_it_validates_php_versions_when_installed() public function test_it_validates_php_versions_when_installed()