kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 08:35:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix various phpstan issues.

Browse Source
This commit is contained in:
James Cole
2023-11-04 11:31:14 +01:00
parent ef428a0226
commit 0220cf9784
64 changed files with 195 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Support/Authentication/RemoteUserGuard.php
View File

@@ -40,7 +40,9 @@ use Psr\Container\NotFoundExceptionInterface;
class RemoteUserGuard implements Guard
{
protected Application $application;
/** @var UserProvider */
protected $provider;
/** @var User|null */
protected $user;
/**
@@ -166,10 +168,14 @@ class RemoteUserGuard implements Guard
/**
* @inheritDoc
*/
public function setUser(Authenticatable $user)
public function setUser(Authenticatable | User | null $user)
{
app('log')->debug(sprintf('Now at %s', __METHOD__));
$this->user = $user;
if ($user instanceof User) {
$this->user = $user;
return;
}
app('log')->error(sprintf('Did not set user at %s', __METHOD__));
}
/**

1
app/Support/NullArrayObject.php
View File

@@ -32,6 +32,7 @@ use ArrayObject;
*/
class NullArrayObject extends ArrayObject
{
/** @var mixed|null */
public $default = null;
/**

4
app/Support/Preferences.php
View File

@@ -78,12 +78,12 @@ class Preferences
/**
* @param User $user
* @param string $name
* @param null|string|int $default
* @param null|string|int|bool|array $default
*
* @return Preference|null
* @throws FireflyException
*/
public function getForUser(User $user, string $name, $default = null): ?Preference
public function getForUser(User $user, string $name, string|int|bool|null|array $default = null): ?Preference
{
if ('currencyPreference' === $name) {
throw new FireflyException('No longer supports "currencyPreference", please refactor me.');

4
app/Support/Request/ConvertsDataTypes.php
View File

@@ -274,6 +274,10 @@ trait ConvertsDataTypes
return null;
}
if(false === $carbon) {
app('log')->error(sprintf('[2] "%s" is of an invalid format.', $value));
return null;
}
return $carbon;
}
// is an atom string, I hope?

6
app/Support/Search/AccountSearch.php
View File

@@ -69,7 +69,7 @@ class AccountSearch implements GenericSearchInterface
default:
case self::SEARCH_ALL:
$searchQuery->where(
static function (Builder $q) use ($like) {
static function (Builder $q) use ($like) { // @phpstan-ignore-line
$q->where('accounts.id', 'LIKE', $like);
$q->orWhere('accounts.name', 'LIKE', $like);
$q->orWhere('accounts.iban', 'LIKE', $like);
@@ -77,7 +77,7 @@ class AccountSearch implements GenericSearchInterface
);
// meta data:
$searchQuery->orWhere(
static function (Builder $q) use ($originalQuery) {
static function (Builder $q) use ($originalQuery) { // @phpstan-ignore-line
$json = json_encode($originalQuery, JSON_THROW_ON_ERROR);
$q->where('account_meta.name', '=', 'account_number');
$q->where('account_meta.data', 'LIKE', $json);
@@ -96,7 +96,7 @@ class AccountSearch implements GenericSearchInterface
case self::SEARCH_NUMBER:
// meta data:
$searchQuery->Where(
static function (Builder $q) use ($originalQuery) {
static function (Builder $q) use ($originalQuery) { // @phpstan-ignore-line
$json = json_encode($originalQuery, JSON_THROW_ON_ERROR);
$q->where('account_meta.name', 'account_number');
$q->where('account_meta.data', $json);

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

@@ -148,7 +148,7 @@ class OperatorQuerySearch implements SearchInterface
* @inheritDoc
* @throws FireflyException
*/
public function parseQuery(string $query)
public function parseQuery(string $query): void
{
app('log')->debug(sprintf('Now in parseQuery(%s)', $query));
$parser = new QueryParser();
@@ -1671,7 +1671,7 @@ class OperatorQuerySearch implements SearchInterface
*
* @throws FireflyException
*/
private function setDateAfterParams(array $range, bool $prohibited = false)
private function setDateAfterParams(array $range, bool $prohibited = false): void
{
/**
* @var string $key

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

@@ -61,7 +61,7 @@ interface SearchInterface
/**
* @param string $query
*/
public function parseQuery(string $query);
public function parseQuery(string $query): void;
/**
* @return float
@@ -91,5 +91,5 @@ interface SearchInterface
/**
* @param User $user
*/
public function setUser(User $user);
public function setUser(User $user): void;
}