Re-add PHP 7.4 compatibility

silinternational · Oct 1, 2024 · aee1705 · aee1705
1 parent 8976497
commit aee1705
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/application/common/components/Emailer.php b/application/common/components/Emailer.php
@@ -358,7 +358,7 @@ public function sendMessageTo(
         array $data = [],
         int $delaySeconds = 0
     ) {
-        if ($user?->active === 'no') {
+        if ($user && $user->active === 'no') {
             \Yii::warning([
                 'action' => 'send message',
                 'status' => 'canceled',
@@ -369,7 +369,7 @@ public function sendMessageTo(
         }
 
         $dataForEmail = ArrayHelper::merge(
-            $user?->getAttributesForEmail() ?? [],
+            $user ? $user->getAttributesForEmail() : [],
             $this->otherDataForEmails,
             $data
         );

diff --git a/application/composer.json b/application/composer.json
@@ -8,7 +8,7 @@
     }
   ],
   "require": {
-    "php": ">=8.0",
+    "php": ">=7.4",
     "ext-json": "*",
     "codemix/yii2-streamlog": "^1.3",
     "fillup/fake-bower-assets": "2.0.9",

diff --git a/application/composer.lock b/application/composer.lock
diff --git a/application/features/bootstrap/fakes/FakeEmailer.php b/application/features/bootstrap/fakes/FakeEmailer.php
@@ -67,7 +67,7 @@ public function getFakeEmailsSent()
     public function isSubjectForMessageType(string $subject, string $messageType, ?User $user)
     {
         $dataForEmail = ArrayHelper::merge(
-            $user?->getAttributesForEmail() ?? [],
+            $user ? $user->getAttributesForEmail() : [],
             $this->otherDataForEmails
         );