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

Code cleanup

Browse Source
This commit is contained in:
James Cole
2023-11-04 14:18:49 +01:00
parent 5a35960434
commit ba0843d0bb
211 changed files with 566 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/User.php
View File

@@ -173,8 +173,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
*/
class User extends Authenticatable
{
use Notifiable;
use HasApiTokens;
use Notifiable;
/**
* The attributes that should be cast to native types.
@@ -212,7 +212,7 @@ class User extends Authenticatable
* @return User
* @throws NotFoundHttpException
*/
public static function routeBinder(string $value): User
public static function routeBinder(string $value): self
{
if (auth()->check()) {
$userId = (int)$value;
@@ -405,11 +405,11 @@ class User extends Authenticatable
$roles[] = UserRoleEnum::OWNER->value;
$roles[] = UserRoleEnum::FULL->value;
}
app('log')->debug(sprintf('in hasRoleInGroup(%s)', join(', ', $roles)));
app('log')->debug(sprintf('in hasRoleInGroup(%s)', implode(', ', $roles)));
/** @var Collection $dbRoles */
$dbRoles = UserRole::whereIn('title', $roles)->get();
if (0 === $dbRoles->count()) {
app('log')->error(sprintf('Could not find role(s): %s. Probably migration mishap.', join(', ', $roles)));
app('log')->error(sprintf('Could not find role(s): %s. Probably migration mishap.', implode(', ', $roles)));
return false;
}
$dbRolesIds = $dbRoles->pluck('id')->toArray();
@@ -424,7 +424,7 @@ class User extends Authenticatable
'User #%d "%s" does not have roles %s in user group #%d "%s"',
$this->id,
$this->email,
join(', ', $roles),
implode(', ', $roles),
$userGroup->id,
$userGroup->title
));
@@ -448,7 +448,7 @@ class User extends Authenticatable
'User #%d "%s" does not have roles %s in user group #%d "%s"',
$this->id,
$this->email,
join(', ', $roles),
implode(', ', $roles),
$userGroup->id,
$userGroup->title
));