Merge branch 'release/5.6.8'

app/Helpers/Collector/GroupCollector.php

@@ -239,9 +239,6 @@ class GroupCollector implements GroupCollectorInterface
     {
         $result = $this->query->get($this->fields);
 
-        //Log::debug('Query in full');
-        //$this->dumpQueryInLogs();
-
         // now to parse this into an array.
         $collection  = $this->parseArray($result);
         $this->total = $collection->count();

app/Http/Middleware/StartFireflySession.php

@@ -46,16 +46,11 @@ class StartFireflySession extends StartSession
         $safeUrl = app('steam')->getSafeUrl($url, route('index'));
 
         if ($url !== $safeUrl) {
-            //Log::debug(sprintf('storeCurrentUrl: converted "%s" to "%s", so will not use it.', $url, $safeUrl));
             return;
         }
 
         if ('GET' === $request->method() && !$request->ajax()) {
-            //Log::debug(sprintf('storeCurrentUrl: Redirect is now "%s".', $safeUrl));
             $session->setPreviousUrl($safeUrl);
-
-            // return;
         }
-        //Log::debug(sprintf('storeCurrentUrl: Refuse to set "%s" as current URL.', $safeUrl));
     }
 }

app/Support/ParseDateString.php

@@ -217,26 +217,33 @@ class ParseDateString
     public function parseRange(string $date): array
     {
         // several types of range can be submitted
+        $result = [
+            'exact' => new Carbon('1984-09-17'),
+        ];
         switch (true) {
             default:
                 break;
             case $this->isDayRange($date):
-                return $this->parseDayRange($date);
+                $result = $this->parseDayRange($date);
+                break;
             case $this->isMonthRange($date):
-                return $this->parseMonthRange($date);
+                $result = $this->parseMonthRange($date);
+                break;
             case $this->isYearRange($date):
-                return $this->parseYearRange($date);
+                $result = $this->parseYearRange($date);
+                break;
             case $this->isMonthDayRange($date):
-                return $this->parseMonthDayRange($date);
+                $result = $this->parseMonthDayRange($date);
+                break;
             case $this->isDayYearRange($date):
-                return $this->parseDayYearRange($date);
+                $result = $this->parseDayYearRange($date);
+                break;
             case $this->isMonthYearRange($date):
-                return $this->parseMonthYearRange($date);
+                $result = $this->parseMonthYearRange($date);
+                break;
         }
 
-        return [
+        return $result;
-            'exact' => new Carbon('1984-09-17'),
-        ];
     }
 
     /**

app/Validation/TransactionValidation.php

@@ -190,7 +190,7 @@ trait TransactionValidation
             Log::debug('Will try to validate source account information.');
             $sourceId    = (int)($transaction['source_id'] ?? 0);
             $sourceName  = $transaction['source_name'] ?? null;
-            $validSource = $accountValidator->validateSource($sourceId, $sourceName, null);
+            $validSource = $accountValidator->validateSource(['id' => $sourceId, 'name' => $sourceName]);
 
             // do something with result:
             if (false === $validSource) {

changelog.md

@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 5.6.8 - 2021-12-19
+
+### Fixed
+- Account validation was broken in some edge cases, making it impossible to edit transactions.
+
 ## 5.6.7 - 2021-12-19
 
 ### Changed

config/firefly.php

@@ -101,7 +101,7 @@ return [
         'webhooks'     => true,
         'handle_debts' => true,
     ],
-    'version'                      => '5.6.7',
+    'version'                      => '5.6.8',
     'api_version'                  => '1.5.5',
     'db_version'                   => 18,