kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 03:43:07 +00:00
Code Issues Projects Releases Wiki Activity

Clean up various code.

Browse Source
This commit is contained in:
James Cole
2021-12-19 08:47:02 +01:00
parent 7c780dd75c
commit 179b86c3ba
4 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Helpers/Collector/GroupCollector.php
View File

@@ -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();

5
app/Http/Middleware/StartFireflySession.php
View File

@@ -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));
}
}

25
app/Support/ParseDateString.php
View File

@@ -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 [
'exact' => new Carbon('1984-09-17'),
];
return $result;
}
/**

2
app/Validation/TransactionValidation.php
View File

@@ -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) {