Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: apply php-cs-fixer fixes

Browse Source
This commit is contained in:
Steven Qiu 2025-06-26 21:16:56 +08:00
parent cdfb972bd0
commit 24ad29ea99
No known key found for this signature in database
GPG Key ID: 8ACE9DCFC76F38B9
22 changed files with 101 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/AdminController.php
View File

@ -86,7 +86,7 @@ class AdminController extends Controller
Request $request,
PluginManager $plugins,
Filesystem $filesystem,
Filter $filter
Filter $filter,
) {
$db = config('database.connections.'.config('database.default'));
$dbType = Arr::get([

6
app/Http/Controllers/AuthController.php
View File

@ -50,7 +50,7 @@ class AuthController extends Controller
Request $request,
Rules\Captcha $captcha,
Dispatcher $dispatcher,
Filter $filter
Filter $filter,
) {
$data = $request->validate([
'identification' => 'required',
@ -151,7 +151,7 @@ class AuthController extends Controller
Request $request,
Rules\Captcha $captcha,
Dispatcher $dispatcher,
Filter $filter
Filter $filter,
) {
$can = $filter->apply('can_register', null);
if ($can instanceof Rejection) {
@ -248,7 +248,7 @@ class AuthController extends Controller
Request $request,
Rules\Captcha $captcha,
Dispatcher $dispatcher,
Filter $filter
Filter $filter,
) {
$data = $request->validate([
'email' => 'required|email',

4
app/Http/Controllers/ClosetController.php
View File

@ -75,7 +75,7 @@ class ClosetController extends Controller
public function add(
Request $request,
Dispatcher $dispatcher,
Filter $filter
Filter $filter,
) {
['tid' => $tid, 'name' => $name] = $request->validate([
'tid' => 'required|integer',
@ -132,7 +132,7 @@ class ClosetController extends Controller
Request $request,
Dispatcher $dispatcher,
Filter $filter,
$tid
$tid,
) {
['name' => $name] = $request->validate(['name' => 'required']);
/** @var User */

8
app/Http/Controllers/PlayerController.php
View File

@ -124,7 +124,7 @@ class PlayerController extends Controller
public function delete(
Dispatcher $dispatcher,
Filter $filter,
Player $player
Player $player,
) {
/** @var User */
$user = auth()->user();
@ -157,7 +157,7 @@ class PlayerController extends Controller
Request $request,
Dispatcher $dispatcher,
Filter $filter,
Player $player
Player $player,
) {
$name = $request->validate([
'name' => [
@ -194,7 +194,7 @@ class PlayerController extends Controller
Request $request,
Dispatcher $dispatcher,
Filter $filter,
Player $player
Player $player,
) {
/** @var User */
$user = auth()->user();
@ -234,7 +234,7 @@ class PlayerController extends Controller
Request $request,
Dispatcher $dispatcher,
Filter $filter,
Player $player
Player $player,
) {
$types = $request->input('type', []);

8
app/Http/Controllers/PlayersManagementController.php
View File

@ -44,7 +44,7 @@ class PlayersManagementController extends Controller
public function name(
Player $player,
Request $request,
Dispatcher $dispatcher
Dispatcher $dispatcher,
) {
$name = $request->validate([
'player_name' => [
@ -70,7 +70,7 @@ class PlayersManagementController extends Controller
public function owner(
Player $player,
Request $request,
Dispatcher $dispatcher
Dispatcher $dispatcher,
) {
$uid = $request->validate(['uid' => 'required|integer'])['uid'];
@ -96,7 +96,7 @@ class PlayersManagementController extends Controller
public function texture(
Player $player,
Request $request,
Dispatcher $dispatcher
Dispatcher $dispatcher,
) {
$data = $request->validate([
'tid' => 'required|integer',
@ -123,7 +123,7 @@ class PlayersManagementController extends Controller
public function delete(
Player $player,
Dispatcher $dispatcher
Dispatcher $dispatcher,
) {
$dispatcher->dispatch('player.deleting', [$player]);

2
app/Http/Controllers/ReportController.php
View File

@ -77,7 +77,7 @@ class ReportController extends Controller
public function review(
Report $report,
Request $request,
Dispatcher $dispatcher
Dispatcher $dispatcher,
) {
$data = $request->validate([
'action' => ['required', Rule::in(['delete', 'ban', 'reject'])],

4
app/Http/Controllers/SetupController.php
View File

@ -20,7 +20,7 @@ class SetupController extends Controller
Request $request,
Filesystem $filesystem,
Connection $connection,
DatabaseManager $manager
DatabaseManager $manager,
) {
if ($request->isMethod('get')) {
try {
@ -121,7 +121,7 @@ class SetupController extends Controller
'database/migrations',
'vendor/laravel/passport/database/migrations',
],
]);
]);
$siteUrl = url('/');
if (Str::endsWith($siteUrl, '/index.php')) {

6
app/Http/Controllers/SkinlibController.php
View File

@ -189,7 +189,7 @@ class SkinlibController extends Controller
public function handleUpload(
Request $request,
Filter $filter,
Dispatcher $dispatcher
Dispatcher $dispatcher,
) {
$file = $request->file('file');
if ($file && !$file->isValid()) {
@ -386,7 +386,7 @@ class SkinlibController extends Controller
Request $request,
Dispatcher $dispatcher,
Filter $filter,
Texture $texture
Texture $texture,
) {
$data = $request->validate(['name' => [
'required',
@ -416,7 +416,7 @@ class SkinlibController extends Controller
Request $request,
Dispatcher $dispatcher,
Filter $filter,
Texture $texture
Texture $texture,
) {
$data = $request->validate([
'type' => ['required', Rule::in(['steve', 'alex', 'cape'])],

4
app/Http/Controllers/TranslationsController.php
View File

@ -40,7 +40,7 @@ class TranslationsController extends Controller
Request $request,
Application $app,
JavaScript $js,
LanguageLine $line
LanguageLine $line,
) {
$data = $request->validate(['text' => 'required|string']);
@ -57,7 +57,7 @@ class TranslationsController extends Controller
public function delete(
Application $app,
JavaScript $js,
LanguageLine $line
LanguageLine $line,
) {
$line->delete();

8
app/Http/Middleware/CheckRole.php
View File

@ -9,10 +9,10 @@ use Illuminate\Http\Request;
class CheckRole
{
protected $roles = [
'banned' => USER::BANNED,
'normal' => USER::NORMAL,
'admin' => USER::ADMIN,
'super-admin' => USER::SUPER_ADMIN,
'banned' => User::BANNED,
'normal' => User::NORMAL,
'admin' => User::ADMIN,
'super-admin' => User::SUPER_ADMIN,
];
public function handle(Request $request, Closure $next, $role)

2
app/Http/View/Composers/FootComposer.php
View File

@ -22,7 +22,7 @@ class FootComposer
Request $request,
JavaScript $javascript,
Dispatcher $dispatcher,
Filter $filter
Filter $filter,
) {
$this->request = $request;
$this->javascript = $javascript;

2
app/Http/View/Composers/HeadComposer.php
View File

@ -20,7 +20,7 @@ class HeadComposer
public function __construct(
Dispatcher $dispatcher,
Request $request,
Filter $filter
Filter $filter,
) {
$this->dispatcher = $dispatcher;
$this->request = $request;

7
app/Models/Player.php
View File

@ -3,7 +3,6 @@
namespace App\Models;
use App\Events\PlayerProfileUpdated;
use App\Models;
use DateTimeInterface;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
@ -57,17 +56,17 @@ class Player extends Model
public function user()
{
return $this->belongsTo(Models\User::class, 'uid');
return $this->belongsTo(User::class, 'uid');
}
public function skin()
{
return $this->belongsTo(Models\Texture::class, 'tid_skin');
return $this->belongsTo(Texture::class, 'tid_skin');
}
public function cape()
{
return $this->belongsTo(Models\Texture::class, 'tid_cape');
return $this->belongsTo(Texture::class, 'tid_cape');
}
public function getModelAttribute()

2
app/Services/OptionForm.php
View File

@ -203,7 +203,7 @@ class OptionForm
/**
* Handle the HTTP post request and update modified options.
*/
public function handle(callable $callback = null): self
public function handle(?callable $callback = null): self
{
$request = request();
$allPostData = $request->all();

4
app/Services/PluginManager.php
View File

@ -36,7 +36,7 @@ class PluginManager
Application $app,
Option $option,
Dispatcher $dispatcher,
Filesystem $filesystem
Filesystem $filesystem,
) {
$this->app = $app;
$this->option = $option;
@ -366,7 +366,7 @@ class PluginManager
*/
public function formatUnresolved(
Collection $unsatisfied,
Collection $conflicts
Collection $conflicts,
): array {
$unsatisfied = $unsatisfied->map(function ($detail, $name) {
if ($name === 'blessing-skin-server') {

2
app/Services/Translations/JavaScript.php
View File

@ -20,7 +20,7 @@ class JavaScript
public function __construct(
Filesystem $filesystem,
Repository $cache,
PluginManager $plugins
PluginManager $plugins,
) {
$this->filesystem = $filesystem;
$this->cache = $cache;

58
tests/HttpTest/ControllersTest/AuthControllerTest.php
View File

@ -25,7 +25,7 @@ class AuthControllerTest extends TestCase
protected function setUp(): void
{
parent::setUp();
app()->instance(Captcha::class, new class() extends Captcha {
app()->instance(Captcha::class, new class extends Captcha {
public function passes($attribute, $value)
{
return true;
@ -35,7 +35,7 @@ class AuthControllerTest extends TestCase
public function testLogin()
{
$filter = Fakes\Filter::fake();
$filter = Filter::fake();
$this->get('/auth/login')->assertSee('Log in');
$filter->assertApplied('auth_page_rows:login');
@ -60,28 +60,28 @@ class AuthControllerTest extends TestCase
// Should return a warning if length of `password` is lower than 6
$this->postJson(
'/auth/login', [
'identification' => $user->email,
'password' => '123',
])->assertJsonValidationErrors('password');
'identification' => $user->email,
'password' => '123',
])->assertJsonValidationErrors('password');
// Should return a warning if length of `password` is greater than 32
$this->postJson(
'/auth/login', [
'identification' => $user->email,
'password' => Str::random(80),
])->assertJsonValidationErrors('password');
'identification' => $user->email,
'password' => Str::random(80),
])->assertJsonValidationErrors('password');
$this->flushSession();
// Should return a warning if user isn't existed
$this->postJson(
'/auth/login', [
'identification' => 'nope@nope.net',
'password' => '12345678',
])->assertJson([
'code' => 2,
'message' => trans('auth.validation.user'),
]);
'identification' => 'nope@nope.net',
'password' => '12345678',
])->assertJson([
'code' => 2,
'message' => trans('auth.validation.user'),
]);
Event::assertDispatched('auth.login.attempt', function ($event, $payload) {
$this->assertEquals('nope@nope.net', $payload[0]);
$this->assertEquals('12345678', $payload[1]);
@ -103,15 +103,15 @@ class AuthControllerTest extends TestCase
// Logging in should be failed if password is wrong
$this->postJson(
'/auth/login', [
'identification' => $user->email,
'password' => 'wrong-password',
])->assertJson(
[
'code' => 1,
'message' => trans('auth.validation.password'),
'data' => ['login_fails' => 1],
]
);
'identification' => $user->email,
'password' => 'wrong-password',
])->assertJson(
[
'code' => 1,
'message' => trans('auth.validation.password'),
'data' => ['login_fails' => 1],
]
);
$filter->assertApplied('client_ip', function ($value) use ($ip) {
$this->assertEquals($ip, $value);
@ -143,8 +143,8 @@ class AuthControllerTest extends TestCase
Cache::put($loginFailsCacheKey, 4);
$this->postJson(
'/auth/login', [
'identification' => $user->email,
'password' => '12345678',
'identification' => $user->email,
'password' => '12345678',
])->assertJsonValidationErrors('captcha');
Cache::flush();
@ -183,9 +183,9 @@ class AuthControllerTest extends TestCase
auth()->logout();
$this->postJson(
'/auth/login', [
'identification' => $player->name,
'password' => '12345678',
]
'identification' => $player->name,
'password' => '12345678',
]
)->assertJson(
[
'code' => 0,
@ -240,7 +240,7 @@ class AuthControllerTest extends TestCase
public function testRegister()
{
$filter = Fakes\Filter::fake();
$filter = Filter::fake();
$this->get('/auth/register')->assertSee('Register');
$filter->assertApplied('auth_page_rows:register');

16
tests/HttpTest/ControllersTest/ClosetControllerTest.php
View File

@ -41,20 +41,20 @@ class ClosetControllerTest extends TestCase
$user->closet()->attach($cape->tid, ['item_name' => 'custom_name']);
$this->getJson('/user/closet/list?category=cape')
->assertJson(['data' => [[
'tid' => $cape->tid,
'type' => 'cape',
'pivot' => ['item_name' => 'custom_name'],
],
'tid' => $cape->tid,
'type' => 'cape',
'pivot' => ['item_name' => 'custom_name'],
],
]]);
// Search by keyword
$random = $textures->random();
$this->getJson('/user/closet/list?q='.$random->name)
->assertJson(['data' => [[
'tid' => $random->tid,
'name' => $random->name,
'type' => $random->type,
],
'tid' => $random->tid,
'name' => $random->name,
'type' => $random->type,
],
]]);
}

14
tests/HttpTest/ControllersTest/PlayerControllerTest.php
View File

@ -430,13 +430,13 @@ class PlayerControllerTest extends TestCase
// success
$this->deleteJson(route('user.player.clear', ['player' => $player]), [
'skin' => true,
'cape' => true,
'nope' => true, // invalid texture type is acceptable
])->assertJson([
'code' => 0,
'message' => trans('user.player.clear.success', ['name' => $player->name]),
]);
'skin' => true,
'cape' => true,
'nope' => true, // invalid texture type is acceptable
])->assertJson([
'code' => 0,
'message' => trans('user.player.clear.success', ['name' => $player->name]),
]);
$this->assertEquals(0, Player::find($player->pid)->tid_skin);
$this->assertEquals(0, Player::find($player->pid)->tid_cape);
Event::assertDispatched(Events\PlayerProfileUpdated::class);

28
tests/HttpTest/ControllersTest/SkinlibControllerTest.php
View File

@ -480,15 +480,15 @@ class SkinlibControllerTest extends TestCase
$texture->uploader = $user->uid;
$texture->save();
$this->postJson(route('texture.upload'), [
'name' => 'texture',
'public' => true,
'type' => 'steve',
'file' => $upload,
])->assertJson([
'code' => 2,
'message' => trans('skinlib.upload.repeated'),
'data' => ['tid' => $texture->tid],
]);
'name' => 'texture',
'public' => true,
'type' => 'steve',
'file' => $upload,
])->assertJson([
'code' => 2,
'message' => trans('skinlib.upload.repeated'),
'data' => ['tid' => $texture->tid],
]);
// rejected
$filter->add('can_upload_texture', function ($can, $file, $name) {
@ -498,11 +498,11 @@ class SkinlibControllerTest extends TestCase
return new Rejection('rejected');
});
$this->postJson(route('texture.upload'), [
'name' => 'texture',
'public' => true,
'type' => 'steve',
'file' => $upload,
])->assertJson(['code' => 1, 'message' => 'rejected']);
'name' => 'texture',
'public' => true,
'type' => 'steve',
'file' => $upload,
])->assertJson(['code' => 1, 'message' => 'rejected']);
$disk->delete($texture->hash);
}

12
tests/HttpTest/ControllersTest/UserControllerTest.php
View File

@ -489,12 +489,12 @@ class UserControllerTest extends TestCase
// Administrator cannot be deleted
$this->actingAs(User::factory()->admin()->create())
->postJson('/user/profile', [
'action' => 'delete',
'password' => '87654321',
])->assertJson([
'code' => 1,
'message' => trans('user.profile.delete.admin'),
]);
'action' => 'delete',
'password' => '87654321',
])->assertJson([
'code' => 1,
'message' => trans('user.profile.delete.admin'),
]);
}
public function testSetAvatar()

4
tests/ServicesTest/PluginManagerTest.php
View File

@ -425,7 +425,7 @@ class PluginManagerTest extends TestCase
->with('/mayaka/callbacks.php')
->once()
->andReturn([
\App\Events\PluginWasDeleted::class => function ($plugin) {
Events\PluginWasDeleted::class => function ($plugin) {
$this->assertInstanceOf(Plugin::class, $plugin);
$this->assertEquals('mayaka', $plugin->name);
},
@ -434,7 +434,7 @@ class PluginManagerTest extends TestCase
app()->forgetInstance(PluginManager::class);
resolve(PluginManager::class)->boot();
event(new \App\Events\PluginWasDeleted(new Plugin('/mayaka', ['name' => 'mayaka'])));
event(new Events\PluginWasDeleted(new Plugin('/mayaka', ['name' => 'mayaka'])));
}
public function testRegisterAutoload()