kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-04 04:24:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

Browse Source
This commit is contained in:
James Cole
2024-02-29 06:27:24 +01:00
parent a0097bd613 ffc2156e5f
commit d7fa8b283e
53 changed files with 259 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/Report/NetWorth.php
View File

@@ -51,7 +51,7 @@ class NetWorth implements NetWorthInterface
private CurrencyRepositoryInterface $currencyRepos;
private User $user;
private null|UserGroup $userGroup;
private ?UserGroup $userGroup;
/**
* This method collects the user's net worth in ALL the user's currencies

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

@@ -39,7 +39,7 @@ class RemoteUserGuard implements Guard
{
protected Application $application;
protected UserProvider $provider;
protected null|User $user;
protected ?User $user;
/**
* Create a new authentication guard.

4
app/Support/Authentication/RemoteUserProvider.php
View File

@@ -41,7 +41,7 @@ class RemoteUserProvider implements UserProvider
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function retrieveByCredentials(array $credentials): null|Authenticatable
public function retrieveByCredentials(array $credentials): ?Authenticatable
{
app('log')->debug(sprintf('Now at %s', __METHOD__));
@@ -88,7 +88,7 @@ class RemoteUserProvider implements UserProvider
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function retrieveByToken($identifier, $token): null|Authenticatable
public function retrieveByToken($identifier, $token): ?Authenticatable
{
app('log')->debug(sprintf('Now at %s', __METHOD__));

6
app/Validation/FireflyValidator.php
View File

@@ -645,7 +645,7 @@ class FireflyValidator extends Validator
/**
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function validateUniqueCurrencyCode(null|string $attribute, null|string $value): bool
public function validateUniqueCurrencyCode(?string $attribute, ?string $value): bool
{
return $this->validateUniqueCurrency('code', (string)$attribute, (string)$value);
}
@@ -658,12 +658,12 @@ class FireflyValidator extends Validator
return 0 === \DB::table('transaction_currencies')->where($field, $value)->whereNull('deleted_at')->count();
}
public function validateUniqueCurrencyName(null|string $attribute, null|string $value): bool
public function validateUniqueCurrencyName(?string $attribute, ?string $value): bool
{
return $this->validateUniqueCurrency('name', (string)$attribute, (string)$value);
}
public function validateUniqueCurrencySymbol(null|string $attribute, null|string $value): bool
public function validateUniqueCurrencySymbol(?string $attribute, ?string $value): bool
{
return $this->validateUniqueCurrency('symbol', (string)$attribute, (string)$value);
}