Apply Pint fixes

This commit is contained in:
Bubka
2024-03-29 09:42:54 +01:00
parent ca903b6fc0
commit 49fddfd331
24 changed files with 108 additions and 121 deletions

View File

@ -2,8 +2,8 @@
namespace App\Api\v1\Controllers; namespace App\Api\v1\Controllers;
use App\Api\v1\Requests\UserManagerStoreRequest;
use App\Api\v1\Requests\UserManagerPromoteRequest; use App\Api\v1\Requests\UserManagerPromoteRequest;
use App\Api\v1\Requests\UserManagerStoreRequest;
use App\Api\v1\Resources\UserManagerResource; use App\Api\v1\Resources\UserManagerResource;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Models\User; use App\Models\User;
@ -63,11 +63,10 @@ class UserManagerController extends Controller
$response = $this->broker()->sendResetLink( $response = $this->broker()->sendResetLink(
['email' => $credentials['email']] ['email' => $credentials['email']]
); );
} } else {
else {
return response()->json([ return response()->json([
'message' => 'bad request', 'message' => 'bad request',
'reason' => is_string($response) ? __($response) : __('errors.no_pwd_reset_for_this_user_type') 'reason' => is_string($response) ? __($response) : __('errors.no_pwd_reset_for_this_user_type'),
], 400); ], 400);
} }
@ -75,7 +74,7 @@ class UserManagerController extends Controller
? new UserManagerResource($user) ? new UserManagerResource($user)
: response()->json([ : response()->json([
'message' => 'bad request', 'message' => 'bad request',
'reason' => __($response) 'reason' => __($response),
], 400); ], 400);
} }
@ -196,5 +195,4 @@ class UserManagerController extends Controller
{ {
return Password::broker(); return Password::broker();
} }
} }

View File

@ -28,7 +28,7 @@ class SettingUpdateRequest extends FormRequest
$rule = [ $rule = [
'value' => [ 'value' => [
'required', 'required',
] ],
]; ];
if ($this->route()?->parameter('settingName') == 'restrictList') { if ($this->route()?->parameter('settingName') == 'restrictList') {

View File

@ -61,11 +61,10 @@ class UserManagerResource extends UserResource
$this->with = [ $this->with = [
'password_reset' => $password_reset, 'password_reset' => $password_reset,
'valid_personal_access_tokens' => $PATs_count, 'valid_personal_access_tokens' => $PATs_count,
'webauthn_credentials' => $this->resource->webAuthnCredentials()->count() 'webauthn_credentials' => $this->resource->webAuthnCredentials()->count(),
]; ];
} }
/** /**
* Determine if the token has expired. * Determine if the token has expired.
* *

View File

@ -137,7 +137,7 @@ class Install extends Command
} }
/** /**
* * Runs the passport:install command silently
*/ */
protected function installPassport() : void protected function installPassport() : void
{ {
@ -147,7 +147,7 @@ class Install extends Command
} }
/** /**
* * Runs the config:cache command silently
*/ */
protected function cacheConfig() : void protected function cacheConfig() : void
{ {
@ -157,7 +157,7 @@ class Install extends Command
} }
/** /**
* * Runs the storage:link command silently
*/ */
protected function createStorageLink() : void protected function createStorageLink() : void
{ {
@ -169,7 +169,7 @@ class Install extends Command
} }
/** /**
* * Lets the user set the main environment variables
*/ */
protected function setMainEnvVars() : void protected function setMainEnvVars() : void
{ {
@ -177,8 +177,7 @@ class Install extends Command
$appUrl = trim($this->ask('URL of this 2FAuth instance', config('app.url')), '/'); $appUrl = trim($this->ask('URL of this 2FAuth instance', config('app.url')), '/');
if (filter_var($appUrl, FILTER_VALIDATE_URL)) { if (filter_var($appUrl, FILTER_VALIDATE_URL)) {
break; break;
} } else {
else {
$this->components->error('This is not a valid URL, please retry'); $this->components->error('This is not a valid URL, please retry');
} }
} }
@ -195,7 +194,7 @@ class Install extends Command
} }
/** /**
* Prompt user for valid database credentials and set them to .env file. * Prompts user for valid database credentials and sets them to .env file.
*/ */
protected function setDbEnvVars() : void protected function setDbEnvVars() : void
{ {
@ -253,7 +252,7 @@ class Install extends Command
} }
/** /**
* * Runs db migration with --force option
*/ */
protected function migrateDatabase() : mixed protected function migrateDatabase() : mixed
{ {
@ -265,7 +264,7 @@ class Install extends Command
} }
/** /**
* * Clears some caches
*/ */
protected function clearCaches() : void protected function clearCaches() : void
{ {
@ -276,7 +275,7 @@ class Install extends Command
} }
/** /**
* * Loads the existing env file or creates it
*/ */
protected function loadEnvFile() : void protected function loadEnvFile() : void
{ {
@ -300,7 +299,7 @@ class Install extends Command
} }
/** /**
* * Generates an app key if necessary
*/ */
protected function maybeGenerateAppKey() : void protected function maybeGenerateAppKey() : void
{ {
@ -317,7 +316,7 @@ class Install extends Command
} }
/** /**
* Generate a random key for the application. * Generates a random key for the application.
*/ */
protected function generateRandomKey() : string protected function generateRandomKey() : string
{ {

View File

@ -8,7 +8,6 @@ use App\Http\Requests\UserDeleteRequest;
use App\Http\Requests\UserUpdateRequest; use App\Http\Requests\UserUpdateRequest;
use App\Models\User; use App\Models\User;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;

View File

@ -109,6 +109,4 @@ class SystemController extends Controller
return response()->json(['exit-code' => $exitCode], 200); return response()->json(['exit-code' => $exitCode], 200);
} }
} }

View File

@ -3,7 +3,6 @@
namespace App\Listeners; namespace App\Listeners;
use Illuminate\Notifications\Events\NotificationSent; use Illuminate\Notifications\Events\NotificationSent;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
class LogNotification class LogNotification

View File

@ -9,7 +9,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable; use Illuminate\Notifications\Notifiable;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Laragear\WebAuthn\WebAuthnAuthentication; use Laragear\WebAuthn\WebAuthnAuthentication;
use Laravel\Passport\HasApiTokens; use Laravel\Passport\HasApiTokens;
@ -92,7 +91,7 @@ class User extends Authenticatable implements WebAuthnAuthenticatable
/** /**
* Determine if the user is an administrator. * Determine if the user is an administrator.
* *
* @return boolean * @return bool
*/ */
public function isAdministrator() public function isAdministrator()
{ {
@ -102,7 +101,6 @@ class User extends Authenticatable implements WebAuthnAuthenticatable
/** /**
* Grant administrator permissions to the user. * Grant administrator permissions to the user.
* *
* @param bool $promote
* @return void * @return void
*/ */
public function promoteToAdministrator(bool $promote = true) public function promoteToAdministrator(bool $promote = true)

View File

@ -9,7 +9,6 @@ use Illuminate\Support\Facades\Lang;
class TestEmailSettingNotification extends Notification class TestEmailSettingNotification extends Notification
{ {
// /** // /**
// * The callback that should be used to create the reset password URL. // * The callback that should be used to create the reset password URL.
// * // *

View File

@ -12,7 +12,7 @@ class UserPolicy
/** /**
* Perform pre-authorization checks. * Perform pre-authorization checks.
*/ */
public function before(User $user, string $ability): bool|null public function before(User $user, string $ability) : ?bool
{ {
if ($user->isAdministrator()) { if ($user->isAdministrator()) {
return true; return true;

View File

@ -3,7 +3,6 @@
namespace App\Providers; namespace App\Providers;
use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Http\Resources\Json\JsonResource;
use Illuminate\Support\Facades\Blade;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
use Laravel\Passport\Console\ClientCommand; use Laravel\Passport\Console\ClientCommand;

View File

@ -31,8 +31,7 @@ class ComplyWithEmailRestrictionPolicy implements ValidationRule
if (! $validatesFilter && ! $validatesRegex) { if (! $validatesFilter && ! $validatesRegex) {
$fail('validation.custom.email.ComplyWithEmailRestrictionPolicy')->translate(); $fail('validation.custom.email.ComplyWithEmailRestrictionPolicy')->translate();
} }
} } else {
else {
if (! $validatesFilter || ! $validatesRegex) { if (! $validatesFilter || ! $validatesRegex) {
$fail('validation.custom.email.ComplyWithEmailRestrictionPolicy')->translate(); $fail('validation.custom.email.ComplyWithEmailRestrictionPolicy')->translate();
} }

View File

@ -247,7 +247,7 @@ class UserManagerControllerTest extends FeatureTestCase
'email' => self::EMAIL, 'email' => self::EMAIL,
'password' => self::PASSWORD, 'password' => self::PASSWORD,
'password_confirmation' => self::PASSWORD, 'password_confirmation' => self::PASSWORD,
'is_admin' => false 'is_admin' => false,
]) ])
->assertCreated(); ->assertCreated();
@ -456,7 +456,7 @@ class UserManagerControllerTest extends FeatureTestCase
{ {
$this->actingAs($this->admin, 'api-guard') $this->actingAs($this->admin, 'api-guard')
->json('PATCH', '/api/v1/users/' . $this->user->id . '/promote', [ ->json('PATCH', '/api/v1/users/' . $this->user->id . '/promote', [
'is_admin' => true 'is_admin' => true,
]) ])
->assertOk(); ->assertOk();
@ -475,7 +475,7 @@ class UserManagerControllerTest extends FeatureTestCase
$response = $this->actingAs($this->admin, 'api-guard') $response = $this->actingAs($this->admin, 'api-guard')
->json('PATCH', $path, [ ->json('PATCH', $path, [
'is_admin' => true 'is_admin' => true,
]); ]);
$this->user->refresh(); $this->user->refresh();
@ -483,6 +483,4 @@ class UserManagerControllerTest extends FeatureTestCase
$response->assertExactJson($resources->response($request)->getData(true)); $response->assertExactJson($resources->response($request)->getData(true));
} }
} }

View File

@ -19,7 +19,9 @@ class SystemControllerTest extends FeatureTestCase
/** /**
* @var \App\Models\User|\Illuminate\Contracts\Auth\Authenticatable * @var \App\Models\User|\Illuminate\Contracts\Auth\Authenticatable
*/ */
protected $user, $admin; protected $user;
protected $admin;
/** /**
* @test * @test
@ -77,7 +79,7 @@ class SystemControllerTest extends FeatureTestCase
'Auth guard', 'Auth guard',
'webauthn user verification', 'webauthn user verification',
'Trusted proxies', 'Trusted proxies',
'lastRadarScan' 'lastRadarScan',
], ],
]); ]);
} }

View File

@ -30,7 +30,7 @@ class GroupModelTest extends ModelTestCase
[ [
'id' => 'int', 'id' => 'int',
'twofaccounts_count' => 'integer', 'twofaccounts_count' => 'integer',
'user_id' => 'integer' 'user_id' => 'integer',
], ],
[ [
'deleting' => GroupDeleting::class, 'deleting' => GroupDeleting::class,

View File

@ -5,8 +5,8 @@ namespace Tests\Unit\Listeners;
use App\Listeners\RegisterOpenId; use App\Listeners\RegisterOpenId;
use App\Providers\Socialite\OpenId; use App\Providers\Socialite\OpenId;
use Illuminate\Support\Facades\Event; use Illuminate\Support\Facades\Event;
use Laravel\Socialite\SocialiteManager;
use Laravel\Socialite\Contracts\Factory as SocialiteFactory; use Laravel\Socialite\Contracts\Factory as SocialiteFactory;
use Laravel\Socialite\SocialiteManager;
use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\CoversClass;
use SocialiteProviders\Manager\SocialiteWasCalled; use SocialiteProviders\Manager\SocialiteWasCalled;
use Tests\TestCase; use Tests\TestCase;

View File

@ -35,7 +35,7 @@ class TwoFAccountModelTest extends ModelTestCase
[], [],
[ [
'id' => 'int', 'id' => 'int',
'user_id' => 'integer' 'user_id' => 'integer',
], ],
['deleted' => TwoFAccountDeleted::class], ['deleted' => TwoFAccountDeleted::class],
['created_at', 'updated_at'], ['created_at', 'updated_at'],