Fix #8425

app/Models/Transaction.php

@@ -106,6 +106,7 @@ class Transaction extends Model
             'encrypted'           => 'boolean', // model does not have these fields though
             'bill_name_encrypted' => 'boolean',
             'reconciled'          => 'boolean',
+            'date'                => 'datetime',
         ];
 
     protected $fillable

app/Support/Search/OperatorQuerySearch.php

@@ -232,7 +232,7 @@ class OperatorQuerySearch implements SearchInterface
         $this->collector->setUser($user);
         $this->collector->withAccountInformation()->withCategoryInformation()->withBudgetInformation();
 
-        $this->setLimit((int) app('preferences')->getForUser($user, 'listPageSize', 50)->data);
+        $this->setLimit((int)app('preferences')->getForUser($user, 'listPageSize', 50)->data);
     }
 
     public function setLimit(int $limit): void
@@ -274,7 +274,7 @@ class OperatorQuerySearch implements SearchInterface
             case Emoticon::class:
             case Emoji::class:
             case Mention::class:
-                $allWords      = (string) $searchNode->getValue();
+                $allWords      = (string)$searchNode->getValue();
                 app('log')->debug(sprintf('Add words "%s" to search string, because Node class is "%s"', $allWords, $class));
                 $this->words[] = $allWords;
 
@@ -304,11 +304,11 @@ class OperatorQuerySearch implements SearchInterface
                 // must be valid operator:
                 if (
                     in_array($operator, $this->validOperators, true)
-                    && $this->updateCollector($operator, (string) $value, $prohibited)) {
+                    && $this->updateCollector($operator, (string)$value, $prohibited)) {
                     $this->operators->push(
                         [
                             'type'       => self::getRootOperator($operator),
-                            'value'      => (string) $value,
+                            'value'      => (string)$value,
                             'prohibited' => $prohibited,
                         ]
                     );
@@ -318,7 +318,7 @@ class OperatorQuerySearch implements SearchInterface
                     app('log')->debug(sprintf('Added INVALID operator type "%s"', $operator));
                     $this->invalidOperators[] = [
                         'type'  => $operator,
-                        'value' => (string) $value,
+                        'value' => (string)$value,
                     ];
                 }
         }
@@ -518,7 +518,7 @@ class OperatorQuerySearch implements SearchInterface
                 break;
 
             case 'source_account_id':
-                $account                 = $this->accountRepository->find((int) $value);
+                $account                 = $this->accountRepository->find((int)$value);
                 if (null !== $account) {
                     $this->collector->setSourceAccounts(new Collection([$account]));
                 }
@@ -530,7 +530,7 @@ class OperatorQuerySearch implements SearchInterface
                 break;
 
             case '-source_account_id':
-                $account                 = $this->accountRepository->find((int) $value);
+                $account                 = $this->accountRepository->find((int)$value);
                 if (null !== $account) {
                     $this->collector->excludeSourceAccounts(new Collection([$account]));
                 }
@@ -646,7 +646,7 @@ class OperatorQuerySearch implements SearchInterface
                 break;
 
             case 'destination_account_id':
-                $account                 = $this->accountRepository->find((int) $value);
+                $account                 = $this->accountRepository->find((int)$value);
                 if (null !== $account) {
                     $this->collector->setDestinationAccounts(new Collection([$account]));
                 }
@@ -657,7 +657,7 @@ class OperatorQuerySearch implements SearchInterface
                 break;
 
             case '-destination_account_id':
-                $account                 = $this->accountRepository->find((int) $value);
+                $account                 = $this->accountRepository->find((int)$value);
                 if (null !== $account) {
                     $this->collector->excludeDestinationAccounts(new Collection([$account]));
                 }
@@ -671,7 +671,7 @@ class OperatorQuerySearch implements SearchInterface
                 $parts                   = explode(',', $value);
                 $collection              = new Collection();
                 foreach ($parts as $accountId) {
-                    $account = $this->accountRepository->find((int) $accountId);
+                    $account = $this->accountRepository->find((int)$accountId);
                     if (null !== $account) {
                         $collection->push($account);
                     }
@@ -689,7 +689,7 @@ class OperatorQuerySearch implements SearchInterface
                 $parts                   = explode(',', $value);
                 $collection              = new Collection();
                 foreach ($parts as $accountId) {
-                    $account = $this->accountRepository->find((int) $accountId);
+                    $account = $this->accountRepository->find((int)$accountId);
                     if (null !== $account) {
                         $collection->push($account);
                     }
@@ -1904,6 +1904,7 @@ class OperatorQuerySearch implements SearchInterface
      * stringPosition: 1 = start (default), 2 = end, 3 = contains, 4 = is
      *
      * @SuppressWarnings(PHPMD.BooleanArgumentFlag)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     private function searchAccount(string $value, SearchDirection $searchDirection, StringPosition $stringPosition, bool $prohibited = false): void
     {
@@ -2043,7 +2044,7 @@ class OperatorQuerySearch implements SearchInterface
         $filtered        = $accounts->filter(
             static function (Account $account) use ($value, $stringMethod) {
                 // either IBAN or account number
-                $ibanMatch      = $stringMethod(strtolower((string) $account->iban), strtolower($value));
+                $ibanMatch      = $stringMethod(strtolower((string)$account->iban), strtolower($value));
                 $accountNrMatch = false;
 
                 /** @var AccountMeta $meta */

app/Support/Steam.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Support;
 
 use Carbon\Carbon;
+use Carbon\Exceptions\InvalidFormatException;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Transaction;
@@ -44,7 +45,7 @@ class Steam
         $repository     = app(AccountRepositoryInterface::class);
         $repository->setUser($account->user);
 
-        $currencyId     = (int) $repository->getMetaValue($account, 'currency_id');
+        $currencyId     = (int)$repository->getMetaValue($account, 'currency_id');
         $transactions   = $account->transactions()
             ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
             ->where('transaction_journals.date', '<=', $date->format('Y-m-d 23:59:59'))
@@ -73,7 +74,7 @@ class Steam
 
         /** @var array $transaction */
         foreach ($transactions as $transaction) {
-            $value = (string) ($transaction[$key] ?? '0');
+            $value = (string)($transaction[$key] ?? '0');
             $value = '' === $value ? '0' : $value;
             $sum   = bcadd($sum, $value);
         }
@@ -142,14 +143,14 @@ class Steam
         /** @var Transaction $entry */
         foreach ($set as $entry) {
             // normal amount and foreign amount
-            $modified        = (string) (null === $entry->modified ? '0' : $entry->modified);
+            $modified        = (string)(null === $entry->modified ? '0' : $entry->modified);
-            $foreignModified = (string) (null === $entry->modified_foreign ? '0' : $entry->modified_foreign);
+            $foreignModified = (string)(null === $entry->modified_foreign ? '0' : $entry->modified_foreign);
             $amount          = '0';
-            if ($currencyId === (int) $entry->transaction_currency_id || 0 === $currencyId) {
+            if ($currencyId === (int)$entry->transaction_currency_id || 0 === $currencyId) {
                 // use normal amount:
                 $amount = $modified;
             }
-            if ($currencyId === (int) $entry->foreign_currency_id) {
+            if ($currencyId === (int)$entry->foreign_currency_id) {
                 // use foreign amount:
                 $amount = $foreignModified;
             }
@@ -274,7 +275,7 @@ class Steam
             }
             $format                  = $day->format('Y-m-d');
             // if the transaction is in the expected currency, change nothing.
-            if ((int) $transaction['transaction_currency_id'] === $native->id) {
+            if ((int)$transaction['transaction_currency_id'] === $native->id) {
                 // change the current balance, set it to today, continue the loop.
                 $currentBalance    = bcadd($currentBalance, $transaction['amount']);
                 $balances[$format] = $currentBalance;
@@ -283,7 +284,7 @@ class Steam
                 continue;
             }
             // if foreign currency is in the expected currency, do nothing:
-            if ((int) $transaction['foreign_currency_id'] === $native->id) {
+            if ((int)$transaction['foreign_currency_id'] === $native->id) {
                 $currentBalance    = bcadd($currentBalance, $transaction['foreign_amount']);
                 $balances[$format] = $currentBalance;
                 Log::debug(sprintf('%s: transaction in %s (foreign), new balance is %s.', $format, $native->code, $currentBalance));
@@ -291,7 +292,7 @@ class Steam
                 continue;
             }
             // otherwise, convert 'amount' to the necessary currency:
-            $currencyId              = (int) $transaction['transaction_currency_id'];
+            $currencyId              = (int)$transaction['transaction_currency_id'];
             $currency                = $currencies[$currencyId] ?? TransactionCurrency::find($currencyId);
             $currencies[$currencyId] = $currency;
 
@@ -429,7 +430,13 @@ class Steam
         $converter  = new ExchangeRateConverter();
         foreach ($new as $set) {
             foreach ($set as $transaction) {
-                $currentDate = Carbon::createFromFormat('Y-m-d H:i:s', $transaction['date']);
+                $currentDate = false;
+
+                try {
+                    $currentDate = Carbon::parse($transaction['date'], config('app.timezone'));
+                } catch(InvalidFormatException $e) {
+                    Log::error(sprintf('Could not parse date "%s" in %s', $transaction['date'], __METHOD__));
+                }
                 if (false === $currentDate) {
                     $currentDate = today(config('app.timezone'));
                 }
@@ -443,7 +450,13 @@ class Steam
 
         foreach ($new as $set) {
             foreach ($set as $transaction) {
-                $currentDate     = Carbon::createFromFormat('Y-m-d H:i:s', $transaction['date']);
+                $currentDate     = false;
+
+                try {
+                    $currentDate = Carbon::parse($transaction['date'], config('app.timezone'));
+                } catch(InvalidFormatException $e) {
+                    Log::error(sprintf('Could not parse date "%s" in %s', $transaction['date'], __METHOD__));
+                }
                 if (false === $currentDate) {
                     $currentDate = today(config('app.timezone'));
                 }
@@ -578,7 +591,7 @@ class Steam
 
         /** @var \stdClass $entry */
         foreach ($balances as $entry) {
-            $return[(int) $entry->transaction_currency_id] = (string) $entry->sum_for_currency;
+            $return[(int)$entry->transaction_currency_id] = (string)$entry->sum_for_currency;
         }
         $cache->store($return);
 
@@ -681,7 +694,7 @@ class Steam
             throw new FireflyException($e->getMessage(), 0, $e);
         }
 
-        return (string) $hostName;
+        return (string)$hostName;
     }
 
     public function getLastActivities(array $accounts): array
@@ -716,7 +729,7 @@ class Steam
         if ('equal' === $locale) {
             $locale = $this->getLanguage();
         }
-        $locale = (string) $locale;
+        $locale = (string)$locale;
 
         // Check for Windows to replace the locale correctly.
         if ('WIN' === strtoupper(substr(PHP_OS, 0, 3))) {
@@ -815,20 +828,20 @@ class Steam
             return $value;
         }
 
-        $number = substr($value, 0, (int) strpos($value, 'E'));
+        $number = substr($value, 0, (int)strpos($value, 'E'));
         if (str_contains($number, '.')) {
-            $post   = strlen(substr($number, (int) strpos($number, '.') + 1));
+            $post   = strlen(substr($number, (int)strpos($number, '.') + 1));
-            $mantis = substr($value, (int) strpos($value, 'E') + 1);
+            $mantis = substr($value, (int)strpos($value, 'E') + 1);
             if ($mantis < 0) {
-                $post += abs((int) $mantis);
+                $post += abs((int)$mantis);
             }
 
             // TODO careless float could break financial math.
-            return number_format((float) $value, $post, '.', '');
+            return number_format((float)$value, $post, '.', '');
         }
 
         // TODO careless float could break financial math.
-        return number_format((float) $value, 0, '.', '');
+        return number_format((float)$value, 0, '.', '');
     }
 
     public function opposite(string $amount = null): ?string
@@ -848,24 +861,24 @@ class Steam
             // has a K in it, remove the K and multiply by 1024.
             $bytes = bcmul(rtrim($string, 'k'), '1024');
 
-            return (int) $bytes;
+            return (int)$bytes;
         }
 
         if (false !== stripos($string, 'm')) {
             // has a M in it, remove the M and multiply by 1048576.
             $bytes = bcmul(rtrim($string, 'm'), '1048576');
 
-            return (int) $bytes;
+            return (int)$bytes;
         }
 
         if (false !== stripos($string, 'g')) {
             // has a G in it, remove the G and multiply by (1024)^3.
             $bytes = bcmul(rtrim($string, 'g'), '1073741824');
 
-            return (int) $bytes;
+            return (int)$bytes;
         }
 
-        return (int) $string;
+        return (int)$string;
     }
 
     public function positive(string $amount): string

app/Transformers/RuleTransformer.php

@@ -72,7 +72,7 @@ class RuleTransformer extends AbstractTransformer
             'links'            => [
                 [
                     'rel' => 'self',
-                    'uri' => '/rules/' . $rule->id,
+                    'uri' => '/rules/'.$rule->id,
                 ],
             ],
         ];

app/Validation/FireflyValidator.php

@@ -185,7 +185,7 @@ class FireflyValidator extends Validator
         // take
         $first   = substr($value, 0, 4);
         $last    = substr($value, 4);
-        $iban  = $last . $first;
+        $iban    = $last.$first;
         $iban    = trim(str_replace($search, $replace, $iban));
         if ('' === $iban) {
             return false;
@@ -516,7 +516,8 @@ class FireflyValidator extends Validator
             ->whereNull('accounts.deleted_at')
             ->where('accounts.user_id', auth()->user()->id)
             ->where('account_meta.name', 'account_number')
-                            ->where('account_meta.data', json_encode($value));
+            ->where('account_meta.data', json_encode($value))
+        ;
 
         if ($accountId > 0) {
             // exclude current account from check.
@@ -558,7 +559,7 @@ class FireflyValidator extends Validator
     /**
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function validateUniqueCurrencyCode(null | string $attribute, null | string $value): bool
+    public function validateUniqueCurrencyCode(null|string $attribute, null|string $value): bool
     {
         return $this->validateUniqueCurrency('code', (string)$attribute, (string)$value);
     }
@@ -571,12 +572,12 @@ class FireflyValidator extends Validator
         return 0 === \DB::table('transaction_currencies')->where($field, $value)->whereNull('deleted_at')->count();
     }
 
-    public function validateUniqueCurrencyName(null | string $attribute, null | string $value): bool
+    public function validateUniqueCurrencyName(null|string $attribute, null|string $value): bool
     {
         return $this->validateUniqueCurrency('name', (string)$attribute, (string)$value);
     }
 
-    public function validateUniqueCurrencySymbol(null | string $attribute, null | string $value): bool
+    public function validateUniqueCurrencySymbol(null|string $attribute, null|string $value): bool
     {
         return $this->validateUniqueCurrency('symbol', (string)$attribute, (string)$value);
     }
@@ -623,7 +624,8 @@ class FireflyValidator extends Validator
                 ->where('response', $response)
                 ->where('delivery', $delivery)
                 ->where('id', '!=', $existingId)
-                                ->where('url', $url)->count();
+                ->where('url', $url)->count()
+            ;
         }
 
         return false;
@@ -659,7 +661,8 @@ class FireflyValidator extends Validator
         $result          = \DB::table($table)->where('user_id', auth()->user()->id)->whereNull('deleted_at')
             ->where('id', '!=', $exclude)
             ->where($field, $value)
-                     ->first([$field]);
+            ->first([$field])
+        ;
         if (null === $result) {
             return true; // not found, so true.
         }
@@ -681,7 +684,8 @@ class FireflyValidator extends Validator
         $query   = \DB::table('object_groups')
             ->whereNull('object_groups.deleted_at')
             ->where('object_groups.user_id', auth()->user()->id)
-                      ->where('object_groups.title', $value);
+            ->where('object_groups.title', $value)
+        ;
         if (null !== $exclude) {
             $query->where('object_groups.id', '!=', (int)$exclude);
         }
@@ -700,7 +704,8 @@ class FireflyValidator extends Validator
     {
         $exclude = $parameters[0] ?? null;
         $query   = \DB::table('piggy_banks')->whereNull('piggy_banks.deleted_at')
-                      ->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')->where('accounts.user_id', auth()->user()->id);
+            ->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')->where('accounts.user_id', auth()->user()->id)
+        ;
         if (null !== $exclude) {
             $query->where('piggy_banks.id', '!=', (int)$exclude);
         }
@@ -733,7 +738,8 @@ class FireflyValidator extends Validator
                 ->where('trigger', $trigger)
                 ->where('response', $response)
                 ->where('delivery', $delivery)
-                                ->where('url', $url)->count();
+                ->where('url', $url)->count()
+            ;
         }
 
         return false;
@@ -759,7 +765,7 @@ class FireflyValidator extends Validator
     private function validateByAccountTypeString(string $value, array $parameters, string $type): bool
     {
         /** @var null|array $search */
-        $search = \Config::get('firefly.accountTypeByIdentifier.' . $type);
+        $search         = \Config::get('firefly.accountTypeByIdentifier.'.$type);
 
         if (null === $search) {
             return false;
@@ -772,7 +778,8 @@ class FireflyValidator extends Validator
         /** @var null|Account $result */
         $result         = auth()->user()->accounts()->whereIn('account_type_id', $accountTypeIds)->where('id', '!=', $ignore)
             ->where('name', $value)
-                        ->first();
+            ->first()
+        ;
 
         return null === $result;
     }
@@ -789,7 +796,8 @@ class FireflyValidator extends Validator
         /** @var null|Account $result */
         $result = auth()->user()->accounts()->where('account_type_id', $type->id)->where('id', '!=', $ignore)
             ->where('name', $value)
-                        ->first();
+            ->first()
+        ;
 
         return null === $result;
     }
@@ -807,7 +815,8 @@ class FireflyValidator extends Validator
 
         $entry           = auth()->user()->accounts()->where('account_type_id', $type->id)->where('id', '!=', $ignore)
             ->where('name', $value)
-                       ->first();
+            ->first()
+        ;
 
         return null === $entry;
     }
@@ -825,7 +834,8 @@ class FireflyValidator extends Validator
 
         $entry           = auth()->user()->accounts()->where('account_type_id', $type->id)->where('id', '!=', $ignore)
             ->where('name', $value)
-                       ->first();
+            ->first()
+        ;
 
         return null === $entry;
     }