Fix possible null pointer.

app/Events/StoredTransactionJournal.php

@@ -26,6 +26,7 @@ use FireflyIII\Models\TransactionJournal;
 use Illuminate\Queue\SerializesModels;
 
 /**
+ * @codeCoverageIgnore
  * Class StoredTransactionJournal.
  */
 class StoredTransactionJournal extends Event

app/Events/UpdatedTransactionJournal.php

@@ -27,6 +27,9 @@ use Illuminate\Queue\SerializesModels;
 
 /**
  * Class UpdatedTransactionJournal.
+ *
+ * @codeCoverageIgnore
+ *
  */
 class UpdatedTransactionJournal extends Event
 {

app/Factory/TransactionCurrencyFactory.php

@@ -24,6 +24,8 @@ declare(strict_types=1);
 namespace FireflyIII\Factory;
 
 use FireflyIII\Models\TransactionCurrency;
+use Illuminate\Database\QueryException;
+use Log;
 
 /**
  * Class TransactionCurrencyFactory
@@ -33,21 +35,26 @@ class TransactionCurrencyFactory
     /**
      * @param array $data
      *
-     * @return TransactionCurrency
+     * @return TransactionCurrency|null
      */
-    public function create(array $data): TransactionCurrency
+    public function create(array $data): ?TransactionCurrency
     {
-        /** @var TransactionCurrency $currency */
-        $currency = TransactionCurrency::create(
-            [
-                'name'           => $data['name'],
-                'code'           => $data['code'],
-                'symbol'         => $data['symbol'],
-                'decimal_places' => $data['decimal_places'],
-            ]
-        );
+        $result = null;
+        try {
+            /** @var TransactionCurrency $currency */
+            $result = TransactionCurrency::create(
+                [
+                    'name'           => $data['name'],
+                    'code'           => $data['code'],
+                    'symbol'         => $data['symbol'],
+                    'decimal_places' => $data['decimal_places'],
+                ]
+            );
+        } catch (QueryException $e) {
+            Log::error(sprintf('Could not create new currency: %s', $e->getMessage()));
+        }
 
-        return $currency;
+        return $result;
     }
 
     /**

app/Factory/TransactionJournalMetaFactory.php

@@ -43,7 +43,7 @@ class TransactionJournalMetaFactory
         $value = $data['data'];
         /** @var TransactionJournalMeta $entry */
         $entry = $data['journal']->transactionJournalMeta()->where('name', $data['name'])->first();
-        if (is_null($value) && !is_null($entry)) {
+        if (null === $value && null !== $entry) {
             try {
                 $entry->delete();
             } catch (Exception $e) { // @codeCoverageIgnore
@@ -56,9 +56,9 @@ class TransactionJournalMetaFactory
         if ($data['data'] instanceof Carbon) {
             $value = $data['data']->toW3cString();
         }
-        if (strlen(strval($value)) === 0) {
+        if ((string)$value === '') {
             // don't store blank strings.
-            if (!is_null($entry)) {
+            if (null !== $entry) {
                 try {
                     $entry->delete();
                 } catch (Exception $e) { // @codeCoverageIgnore
@@ -69,7 +69,6 @@ class TransactionJournalMetaFactory
             return null;
         }
 
-
         if (null === $entry) {
             $entry = new TransactionJournalMeta();
             $entry->transactionJournal()->associate($data['journal']);

app/Handlers/Events/AdminEventHandler.php

@@ -24,6 +24,7 @@ namespace FireflyIII\Handlers\Events;
 
 use FireflyIII\Events\AdminRequestedTestMessage;
 use FireflyIII\Mail\AdminTestMail;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Log;
 use Mail;
 use Session;
@@ -43,6 +44,15 @@ class AdminEventHandler
      */
     public function sendTestMessage(AdminRequestedTestMessage $event): bool
     {
+        /** @var UserRepositoryInterface $repository */
+        $repository = app(UserRepositoryInterface::class);
+
+        // is user even admin?
+        if (!$repository->hasRole($event->user, 'owner')) {
+            return true;
+        }
+
+
         $email     = $event->user->email;
         $ipAddress = $event->ipAddress;
 

app/Handlers/Events/VersionCheckEventHandler.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Handlers\Events;
 use FireflyConfig;
 use FireflyIII\Events\RequestedVersionCheckStatus;
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\Services\Github\Object\Release;
 use FireflyIII\Services\Github\Request\UpdateRequest;
 use FireflyIII\User;
@@ -43,22 +44,26 @@ class VersionCheckEventHandler
     public function checkForUpdates(RequestedVersionCheckStatus $event)
     {
         // in Sandstorm, cannot check for updates:
-        $sandstorm = 1 === intval(getenv('SANDSTORM'));
+        $sandstorm = 1 === (int)getenv('SANDSTORM');
         if ($sandstorm === true) {
-            return;
+            return; // @codeCoverageIgnore
         }
 
+        /** @var UserRepositoryInterface $repository */
+        $repository = app(UserRepositoryInterface::class);
 
         /** @var User $user */
         $user = $event->user;
-        if (!$user->hasRole('owner')) {
+        if (!$repository->hasRole($user, 'owner')) {
             return;
         }
 
         $permission    = FireflyConfig::get('permission_update_check', -1);
         $lastCheckTime = FireflyConfig::get('last_update_check', time());
         $now           = time();
-        if ($now - $lastCheckTime->data < 604800) {
+        $diff          = $now - $lastCheckTime->data;
+        Log::debug(sprintf('Difference is %d seconds.', $diff));
+        if ($diff < 604800) {
             Log::debug(sprintf('Checked for updates less than a week ago (on %s).', date('Y-m-d H:i:s', $lastCheckTime->data)));
 
             return;
@@ -70,7 +75,7 @@ class VersionCheckEventHandler
         // have actual permission?
         if ($permission->data === -1) {
             // never asked before.
-            session()->flash('info', strval(trans('firefly.check_for_updates_permission', ['link' => route('admin.update-check')])));
+            session()->flash('info', (string)trans('firefly.check_for_updates_permission', ['link' => route('admin.update-check')]));
 
             return;
         }
@@ -79,7 +84,7 @@ class VersionCheckEventHandler
         /** @var UpdateRequest $request */
         $request = app(UpdateRequest::class);
         $check   = -2;
-        $first   = new Release(['id' => '0', 'title' => '0', 'updated' => '2017-01-01', 'content' => '']);
+        $first   = new Release(['id' => '0', 'title' => '0.2', 'updated' => '2017-01-01', 'content' => '']);
         try {
             $request->call();
             $releases = $request->getReleases();
@@ -87,6 +92,7 @@ class VersionCheckEventHandler
             /** @var Release $first */
             $first = reset($releases);
             $check = version_compare($current, $first->getTitle());
+            Log::debug(sprintf('Comparing %s with %s, result is %s', $current, $first->getTitle(), $check));
             FireflyConfig::set('last_update_check', time());
         } catch (FireflyException $e) {
             Log::error(sprintf('Could not check for updates: %s', $e->getMessage()));
@@ -98,11 +104,13 @@ class VersionCheckEventHandler
         if ($check === -1) {
             // there is a new FF version!
             $monthAndDayFormat = (string)trans('config.month_and_day');
-            $string            = strval(
-                trans(
-                    'firefly.update_new_version_alert',
-                    ['your_version' => $current, 'new_version' => $first->getTitle(), 'date' => $first->getUpdated()->formatLocalized($monthAndDayFormat)]
-                )
+            $string            = (string)trans(
+                'firefly.update_new_version_alert',
+                [
+                    'your_version' => $current,
+                    'new_version'  => $first->getTitle(),
+                    'date'         => $first->getUpdated()->formatLocalized($monthAndDayFormat),
+                ]
             );
         }
         if ($check !== 0) {

app/Http/Controllers/Json/BoxController.php

@@ -238,12 +238,15 @@ class BoxController extends Controller
 
         /** @var Account $account */
         foreach ($accounts as $account) {
-            $accountCurrency = $currency;
+            $accountCurrency = null;
             $balance         = $balances[$account->id] ?? '0';
             $currencyId      = (int)$repository->getMetaValue($account, 'currency_id');
             if ($currencyId !== 0) {
                 $accountCurrency = $currencyRepos->findNull($currencyId);
             }
+            if (null === $accountCurrency) {
+                $accountCurrency = $currency;
+            }
 
             // if the account is a credit card, subtract the virtual balance from the balance,
             // to better reflect that this is not money that is actually "yours".

app/Services/Internal/File/EncryptService.php

@@ -49,4 +49,4 @@ class EncryptService
         file_put_contents($path, $content);
     }
 
-}
+}

app/User.php

@@ -223,6 +223,7 @@ class User extends Authenticatable
      *
      * @param string $name
      *
+     * @deprecated
      * @return bool
      */
     public function hasRole(string $name): bool