From 050fa45993a980f249b2efa16684b76e347aaac8 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Thu, 12 Sep 2019 19:31:48 +0800 Subject: [PATCH] Preprocess PHP version --- app/Http/Controllers/UpdateController.php | 4 +++- bootstrap/chkenv.php | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/UpdateController.php b/app/Http/Controllers/UpdateController.php index fb123fc9..a4801cc4 100644 --- a/app/Http/Controllers/UpdateController.php +++ b/app/Http/Controllers/UpdateController.php @@ -98,7 +98,9 @@ class UpdateController extends Controller $this->getUpdateInfo(); $php = Arr::get($this->info, 'php'); - if (Comparator::lessThan(PHP_VERSION, $php)) { + preg_match('/(\d+\.\d+\.\d+)/', PHP_VERSION, $matches); + $version = $matches[1]; + if (Comparator::lessThan($version, $php)) { $this->error = trans('admin.update.errors.php', ['version' => $php]); return false; diff --git a/bootstrap/chkenv.php b/bootstrap/chkenv.php index 03c895ea..28cf3182 100644 --- a/bootstrap/chkenv.php +++ b/bootstrap/chkenv.php @@ -7,10 +7,12 @@ exit($error); } - if (version_compare(PHP_VERSION, '7.2.0', '<')) { + preg_match('/(\d+\.\d+\.\d+)/', PHP_VERSION, $matches); + $version = $matches[1]; + if (version_compare($version, '7.2.0', '<')) { die_with_utf8_encoding( - '[Error] Blessing Skin requires PHP version >= 7.2.0, you are now using '.PHP_VERSION.'
'. - '[错误] 你的 PHP 版本过低（'.PHP_VERSION.'），Blessing Skin 要求至少为 7.2.0' + '[Error] Blessing Skin requires PHP version >= 7.2.0, you are now using '.$version.'
'. + '[错误] 你的 PHP 版本过低（'.$version.'），Blessing Skin 要求至少为 7.2.0' ); }