From 0267da704eb406b56130c12ab9096481449d762d Mon Sep 17 00:00:00 2001 From: NasirNobin Date: Sat, 16 Apr 2022 18:47:38 +0600 Subject: [PATCH] remove preg_replace deprecation warning --- cli/Valet/PhpFpm.php | 2 +- tests/PhpFpmTest.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cli/Valet/PhpFpm.php b/cli/Valet/PhpFpm.php index 990a373..28c0933 100644 --- a/cli/Valet/PhpFpm.php +++ b/cli/Valet/PhpFpm.php @@ -324,7 +324,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); } /** diff --git a/tests/PhpFpmTest.php b/tests/PhpFpmTest.php index 0258861..b9bfc4f 100644 --- a/tests/PhpFpmTest.php +++ b/tests/PhpFpmTest.php @@ -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('8.1')); $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()