From 615051cf66aace73096cb747fc446865470a4ffc Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 25 Nov 2020 01:19:32 -0800 Subject: [PATCH 1/2] =?UTF-8?q?Skip=20posix=5Fgetpwuid=20in=20upgrader=20i?= =?UTF-8?q?f=20posix=20isn=E2=80=99t=20installed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don’t need it for anything else, so no need to require it. Posix not being installed usually means it’s a windows machine. --- upgrade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/upgrade.php b/upgrade.php index 013b819536..0382171e98 100644 --- a/upgrade.php +++ b/upgrade.php @@ -3,8 +3,8 @@ $required_version = '7.2.0'; -if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { - echo "Skipping user check as it is not supported on Windows\n"; +if ((strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') || (!function_exists('posix_getpwuid'))) { + echo "Skipping user check as it is not supported on Windows or Posix is not installed on this server. \n"; } else { $pwu_data = posix_getpwuid(posix_geteuid()); $username = $pwu_data['name']; From 820a39cc909b02b6a4cf5c1e9e1abae8dddc01df Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 25 Nov 2020 01:52:56 -0800 Subject: [PATCH 2/2] Fixed #8814 - added App\Models\Recipients\AlertRecipient --- app/Console/Commands/SendExpectedCheckinAlerts.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Console/Commands/SendExpectedCheckinAlerts.php b/app/Console/Commands/SendExpectedCheckinAlerts.php index f56f6f88c6..b0cbb1f518 100644 --- a/app/Console/Commands/SendExpectedCheckinAlerts.php +++ b/app/Console/Commands/SendExpectedCheckinAlerts.php @@ -8,6 +8,7 @@ use App\Notifications\ExpectedCheckinAdminNotification; use App\Notifications\ExpectedCheckinNotification; use Carbon\Carbon; use Illuminate\Console\Command; +use App\Models\Recipients\AlertRecipient; class SendExpectedCheckinAlerts extends Command {