Merge pull request #7016 from firefly-iii/patch-2

Patch 2
This commit is contained in:
James Cole 2023-02-12 08:13:44 +01:00 committed by GitHub
commit c64227d90b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 5 additions and 20 deletions

View File

@ -51,7 +51,7 @@ class Sha3SignatureGenerator implements SignatureGeneratorInterface
$json = json_encode($message->message, JSON_THROW_ON_ERROR); $json = json_encode($message->message, JSON_THROW_ON_ERROR);
} catch (JsonException $e) { } catch (JsonException $e) {
Log::error('Could not generate hash.'); Log::error('Could not generate hash.');
Log::error(sprintf('JSON value: %s', $message->message)); Log::error(sprintf('JSON value: %s', $json));
Log::error($e->getMessage()); Log::error($e->getMessage());
Log::error($e->getTraceAsString()); Log::error($e->getTraceAsString());
throw new FireflyException('Could not generate JSON for SHA3 hash.', 0, $e); throw new FireflyException('Could not generate JSON for SHA3 hash.', 0, $e);

View File

@ -36,9 +36,6 @@ use stdClass;
*/ */
class JournalCLIRepository implements JournalCLIRepositoryInterface class JournalCLIRepository implements JournalCLIRepositoryInterface
{ {
/** @var User */
private $user;
/** /**
* Get all transaction journals with a specific type, regardless of user. * Get all transaction journals with a specific type, regardless of user.
* *
@ -234,6 +231,6 @@ class JournalCLIRepository implements JournalCLIRepositoryInterface
*/ */
public function setUser(User $user): void public function setUser(User $user): void
{ {
$this->user = $user; return;
} }
} }

View File

@ -44,7 +44,6 @@ class FrontpageChartGenerator
private Carbon $end; private Carbon $end;
private string $monthAndDayFormat; private string $monthAndDayFormat;
private Carbon $start; private Carbon $start;
private User $user;
/** /**
* FrontpageChartGenerator constructor. * FrontpageChartGenerator constructor.
@ -226,7 +225,6 @@ class FrontpageChartGenerator
*/ */
public function setUser(User $user): void public function setUser(User $user): void
{ {
$this->user = $user;
$this->budgetRepository->setUser($user); $this->budgetRepository->setUser($user);
$this->blRepository->setUser($user); $this->blRepository->setUser($user);
$this->opsRepository->setUser($user); $this->opsRepository->setUser($user);

View File

@ -69,7 +69,6 @@ class OperatorQuerySearch implements SearchInterface
private CategoryRepositoryInterface $categoryRepository; private CategoryRepositoryInterface $categoryRepository;
private GroupCollectorInterface $collector; private GroupCollectorInterface $collector;
private CurrencyRepositoryInterface $currencyRepository; private CurrencyRepositoryInterface $currencyRepository;
private Carbon $date;
private array $invalidOperators; private array $invalidOperators;
private int $limit; private int $limit;
private Collection $operators; private Collection $operators;
@ -94,7 +93,6 @@ class OperatorQuerySearch implements SearchInterface
$this->prohibitedWords = []; $this->prohibitedWords = [];
$this->invalidOperators = []; $this->invalidOperators = [];
$this->limit = 25; $this->limit = 25;
$this->date = today(config('app.timezone'));
$this->validOperators = array_keys(config('search.operators')); $this->validOperators = array_keys(config('search.operators'));
$this->startTime = microtime(true); $this->startTime = microtime(true);
$this->accountRepository = app(AccountRepositoryInterface::class); $this->accountRepository = app(AccountRepositoryInterface::class);
@ -2019,14 +2017,6 @@ class OperatorQuerySearch implements SearchInterface
return $this->words; return $this->words;
} }
/**
* @param Carbon $date
*/
public function setDate(Carbon $date): void
{
$this->date = $date;
}
/** /**
* @inheritDoc * @inheritDoc

View File

@ -1806,7 +1806,7 @@ a:focus {
left: auto; left: auto;
} }
.box-header > .box-tools .dropdown-menu > li > a { .box-header > .box-tools .dropdown-menu > li > a {
color: #444 !important; color: #444;
} }
.btn-box-tool { .btn-box-tool {
padding: 5px; padding: 5px;

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
profile: profile:
name: qodana.starter name: qodana.recommended
version: "1.0" version: "1.0"
linter: jetbrains/qodana-php:2022.3-eap linter: jetbrains/qodana-php:2022.3-eap