Merge branch 'release/v6.0.30'

v6.0.29

.github/workflows/sonarcloud.yml

@@ -1,6 +1,7 @@
 name: 'Code - Run Sonarcloud'
 on:
   pull_request:
+  workflow_dispatch:
   push:
     branches:
       - main

app/Http/Controllers/NewUserController.php

@@ -104,7 +104,7 @@ class NewUserController extends Controller
 
         // if is null, set to EUR:
         if (null === $currency) {
-            $currency = $currencyRepository->findByCodeNull('EUR');
+            $currency = $currencyRepository->findByCode('EUR');
         }
         $currencyRepository->enable($currency);
 

app/Repositories/Budget/BudgetRepository.php

@@ -435,7 +435,7 @@ class BudgetRepository implements BudgetRepositoryInterface
             $currencyCode = (string)($data['currency_code'] ?? '');
             $currency     = $repos->find($currencyId);
             if (null === $currency) {
-                $currency = $repos->findByCodeNull($currencyCode);
+                $currency = $repos->findByCode($currencyCode);
             }
             if (null !== $currency) {
                 $autoBudget->transaction_currency_id = $currency->id;

app/Repositories/UserGroups/Currency/CurrencyRepository.php

@@ -239,6 +239,14 @@ class CurrencyRepository implements CurrencyRepositoryInterface
         $currency->save();
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function findByName(string $name): ?TransactionCurrency
+    {
+        return TransactionCurrency::where('name', $name)->first();
+    }
+
     /**
      * Find by object, ID or code. Returns user default or system default.
      *

app/Repositories/UserGroups/Currency/CurrencyRepositoryInterface.php

@@ -84,6 +84,13 @@ interface CurrencyRepositoryInterface
      */
     public function findByCode(string $currencyCode): ?TransactionCurrency;
 
+    /**
+     * @param string $name
+     *
+     * @return TransactionCurrency|null
+     */
+    public function findByName(string $name): ?TransactionCurrency;
+
     /**
      * Find by object, ID or code. Returns user default or system default.
      *

app/Support/Search/OperatorQuerySearch.php

@@ -1536,9 +1536,9 @@ class OperatorQuerySearch implements SearchInterface
             $parts = explode(' ', $value);
             $value = trim($parts[count($parts) - 1], "() \t\n\r\0\x0B");
         }
-        $result = $this->currencyRepository->findByCodeNull($value);
+        $result = $this->currencyRepository->findByCode($value);
         if (null === $result) {
-            $result = $this->currencyRepository->findByNameNull($value);
+            $result = $this->currencyRepository->findByName($value);
         }
 
         return $result;

app/Transformers/BillTransformer.php

@@ -86,7 +86,7 @@ class BillTransformer extends AbstractTransformer
         foreach ($payDates as $string) {
             $payDatesFormatted[] = Carbon::createFromFormat('!Y-m-d', $string, config('app.timezone'))->toAtomString();
         }
-        $nextExpectedMatch = null;
+        $nextExpectedMatch = '';
         if (null !== ($payDates[0] ?? null)) {
             $nextExpectedMatch = Carbon::createFromFormat('!Y-m-d', $payDates[0], config('app.timezone'))->toAtomString();
         }

changelog.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.0.30 - 2023-10-29
+
+### Fixed
+
+- Missing method after refactoring.
+
+## 6.0.29 - 2023-10-29
+
+### Fixed
+
+- Null pointer in bill overview
+
 ## 6.0.28 - 2023-10-29
 
 ### Added

config/firefly.php

@@ -112,7 +112,7 @@ return [
         'handle_debts' => true,
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => '6.0.28',
+    'version'                      => '6.0.30',
     'api_version'                  => '2.0.11',
     'db_version'                   => 21,