PHP 7.4 Support

app/Models/Account.php

@@ -1123,7 +1123,11 @@ class Account extends Eloquent
         Session::put(SESSION_DATE_FORMAT, $this->date_format ? $this->date_format->format : DEFAULT_DATE_FORMAT);
         Session::put(SESSION_DATE_PICKER_FORMAT, $this->date_format ? $this->date_format->picker_format : DEFAULT_DATE_PICKER_FORMAT);
 
-        $currencyId = ($client && $client->currency_id) ? $client->currency_id : $this->currency_id ?: DEFAULT_CURRENCY;
+        //php 7.3
+        // $currencyId = ($client && $client->currency_id) ? $client->currency_id : $this->currency_id ?: DEFAULT_CURRENCY;
+        //php 7.4
+        $currencyId = ($client && $client->currency_id) ? $client->currency_id : ($this->currency_id ?: DEFAULT_CURRENCY);
+
         $locale = ($client && $client->language_id) ? $client->language->locale : ($this->language_id ? $this->Language->locale : DEFAULT_LOCALE);
 
         Session::put(SESSION_CURRENCY, $currencyId);

app/Models/Traits/Inviteable.php

@@ -74,7 +74,12 @@ trait Inviteable
             }
         }
 
-        return $hasValue ? implode($parts, '<br/>') : false;
+        //php 7.3
+        // return $hasValue ? implode($parts, '<br/>') : false;
+
+
+        //php 7.4
+        return $hasValue ? implode('<br/>', $parts) : false;
     }
 
     /**

composer.json

@@ -52,8 +52,8 @@
         "league/flysystem-rackspace": "~1.0",
         "league/fractal": "0.13.*",
         "maatwebsite/excel": "~2.0",
-        "mashape/unirest-php": "^3.0",
-        "mpdf/mpdf": "7.1.7",
+        "mashape/unirest-php": "^3.0.5",
+        "mpdf/mpdf": "^8.0",
         "nesbot/carbon": "^1.26",
         "nwidart/laravel-modules": "2.0.*",
         "omnipay/authorizenet": "dev-solution-id as 2.5.0",
@@ -187,6 +187,10 @@
         {
             "type": "vcs",
             "url": "https://github.com/hillelcoren/omnipay-authorizenet"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/loverg-c/unirest-php"
         }
     ]
 }