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

chore: fix various small sonacloud issues to see if the actions run correctly.

Browse Source
This commit is contained in:
James Cole
2023-05-29 14:17:10 +02:00
parent 023a3fdade
commit 6ed5892cf9
5 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Transaction/ShowController.php
View File

@@ -41,7 +41,7 @@ use Symfony\Component\HttpFoundation\ParameterBag;
*/ */
class ShowController extends Controller class ShowController extends Controller
{ {
private ALERepositoryInterface $ALERepository; private ALERepositoryInterface $aleRepository;
private TransactionGroupRepositoryInterface $repository; private TransactionGroupRepositoryInterface $repository;
/** /**
@@ -55,7 +55,7 @@ class ShowController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
$this->repository = app(TransactionGroupRepositoryInterface::class); $this->repository = app(TransactionGroupRepositoryInterface::class);
$this->ALERepository = app(ALERepositoryInterface::class); $this->aleRepository = app(ALERepositoryInterface::class);
app('view')->share('title', (string)trans('firefly.transactions')); app('view')->share('title', (string)trans('firefly.transactions'));
app('view')->share('mainTitleIcon', 'fa-exchange'); app('view')->share('mainTitleIcon', 'fa-exchange');
@@ -112,7 +112,7 @@ class ShowController extends Controller
// get audit log entries: // get audit log entries:
$logEntries = []; $logEntries = [];
foreach ($transactionGroup->transactionJournals as $journal) { foreach ($transactionGroup->transactionJournals as $journal) {
$logEntries[$journal->id] = $this->ALERepository->getForObject($journal); $logEntries[$journal->id] = $this->aleRepository->getForObject($journal);
} }
$events = $this->repository->getPiggyEvents($transactionGroup); $events = $this->repository->getPiggyEvents($transactionGroup);

2
app/Repositories/LinkType/LinkTypeRepository.php
View File

@@ -212,7 +212,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
return $merged->filter( return $merged->filter(
function (TransactionJournalLink $link) { function (TransactionJournalLink $link) {
return (null !== $link->source && null !== $link->destination); return null !== $link->source && null !== $link->destination;
} }
); );
} }

5
app/Services/Internal/Update/RecurrenceUpdateService.php
View File

@@ -125,9 +125,8 @@ class RecurrenceUpdateService
$originalCount = $recurrence->recurrenceRepetitions()->count(); $originalCount = $recurrence->recurrenceRepetitions()->count();
if (1 === $originalCount) { if (1 === $originalCount) {
Log::debug('Return the first one'); Log::debug('Return the first one');
/** @var RecurrenceRepetition $result */ /** @var RecurrenceRepetition|null */
$result = $recurrence->recurrenceRepetitions()->first(); return $recurrence->recurrenceRepetitions()->first();
return $result;
} }
// find it: // find it:
$fields = [ $fields = [

4
app/Support/Search/OperatorQuerySearch.php
View File

@@ -437,7 +437,7 @@ class OperatorQuerySearch implements SearchInterface
$stringMethod = 'str_contains'; $stringMethod = 'str_contains';
} }
if (4 === $stringPosition) { if (4 === $stringPosition) {
$stringMethod = 'str_is_equal'; $stringMethod = 'stringIsEqual';
} }
// get accounts: // get accounts:
@@ -515,7 +515,7 @@ class OperatorQuerySearch implements SearchInterface
$stringMethod = 'str_contains'; $stringMethod = 'str_contains';
} }
if (4 === $stringPosition) { if (4 === $stringPosition) {
$stringMethod = 'str_is_equal'; $stringMethod = 'stringIsEqual';
} }
// search for accounts: // search for accounts:

4
bootstrap/app.php
View File

@@ -52,14 +52,14 @@ if (!function_exists('envNonEmpty')) {
} }
} }
if (!function_exists('str_is_equal')) { if (!function_exists('stringIsEqual')) {
/** /**
* @param string $left * @param string $left
* @param string $right * @param string $right
* *
* @return bool * @return bool
*/ */
function str_is_equal(string $left, string $right): bool function stringIsEqual(string $left, string $right): bool
{ {
return $left === $right; return $left === $right;
} }