Apply fixes from StyleCI

Apply fixes from StyleCI
This commit is contained in:
Rico
2024-03-18 18:50:47 +01:00
committed by GitHub
57 changed files with 148 additions and 131 deletions

View File

@@ -2,9 +2,9 @@
namespace App\Console\Commands; namespace App\Console\Commands;
use GuzzleHttp\Client;
use GuzzleHttp\Exception\GuzzleException; use GuzzleHttp\Exception\GuzzleException;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use GuzzleHttp\Client;
use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\App;
class CloudflarePurgeCommand extends Command class CloudflarePurgeCommand extends Command
@@ -25,7 +25,7 @@ class CloudflarePurgeCommand extends Command
$response = $client->request( $response = $client->request(
'POST', 'POST',
"https://api.cloudflare.com/client/v4/zones/" . $cf_zone_id . "/purge_cache", 'https://api.cloudflare.com/client/v4/zones/'.$cf_zone_id.'/purge_cache',
[ [
'headers' => [ 'headers' => [
'Authorization' => 'Bearer '.$cf_auth_bearer, 'Authorization' => 'Bearer '.$cf_auth_bearer,

View File

@@ -35,6 +35,7 @@ class UserCreateCommand extends Command
if ($password !== $password_confirmation) { if ($password !== $password_confirmation) {
$this->error('Passwords do not match!'); $this->error('Passwords do not match!');
return; return;
} }

View File

@@ -1,7 +1,7 @@
<?php <?php
use Intervention\Image\ImageManager;
use Intervention\Image\Drivers\Gd\Driver; use Intervention\Image\Drivers\Gd\Driver;
use Intervention\Image\ImageManager;
function getRoleIcon($roleName): string function getRoleIcon($roleName): string
{ {
@@ -45,7 +45,7 @@ function getAverageColorFromImageUrl($imageUrl): string
$avgG = $totalG / $pixelCount; $avgG = $totalG / $pixelCount;
$avgB = $totalB / $pixelCount; $avgB = $totalB / $pixelCount;
return sprintf("#%02x%02x%02x", $avgR, $avgG, $avgB); return sprintf('#%02x%02x%02x', $avgR, $avgG, $avgB);
} }
function getRoleIconSvg($roleName): string function getRoleIconSvg($roleName): string

View File

@@ -28,7 +28,7 @@ class ContactSubmissionController extends Controller
'title' => "{$contactSubmission->category->humanReadable()} - {$contactSubmission->subject}", 'title' => "{$contactSubmission->category->humanReadable()} - {$contactSubmission->subject}",
'description' => $descriptionContent, 'description' => $descriptionContent,
'color' => '#ff8a4c', 'color' => '#ff8a4c',
] ],
]); ]);
return redirect()->route('contact.index')->with('success', 'Your message has been sent!'); return redirect()->route('contact.index')->with('success', 'Your message has been sent!');

View File

@@ -6,7 +6,6 @@ use App\Models\Champion;
use App\Models\ChampionSkin; use App\Models\ChampionSkin;
use App\Models\SummonerIcon; use App\Models\SummonerIcon;
use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Cache;
use Spatie\Sheets\Facades\Sheets; use Spatie\Sheets\Facades\Sheets;
class HTMLSitemapController extends Controller class HTMLSitemapController extends Controller
@@ -20,7 +19,6 @@ class HTMLSitemapController extends Controller
$icons = Cache::remember('sitemap_iconsCache', $twentyHoursInSeconds, fn () => SummonerIcon::orderBy('title')->get()); $icons = Cache::remember('sitemap_iconsCache', $twentyHoursInSeconds, fn () => SummonerIcon::orderBy('title')->get());
$posts = Sheets::all()->sortByDesc('date'); $posts = Sheets::all()->sortByDesc('date');
return view('sitemap.index', compact('champions', 'skins', 'icons', 'posts')); return view('sitemap.index', compact('champions', 'skins', 'icons', 'posts'));
} }
} }

View File

@@ -2,9 +2,9 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use CreativeCrafts\Paginate\Facades\Paginate;
use Spatie\Sheets\Facades\Sheets; use Spatie\Sheets\Facades\Sheets;
use Spatie\Sheets\Sheet; use Spatie\Sheets\Sheet;
use CreativeCrafts\Paginate\Facades\Paginate;
class PostsController extends Controller class PostsController extends Controller
{ {

View File

@@ -14,6 +14,7 @@ class SaleController extends Controller
true true
); );
$salesData = array_filter($shopData, static fn ($collection) => $collection['path'] === '/event/sales'); $salesData = array_filter($shopData, static fn ($collection) => $collection['path'] === '/event/sales');
return reset($salesData)['dynamicCollection']['discountedProductsByProductType'] ?? []; return reset($salesData)['dynamicCollection']['discountedProductsByProductType'] ?? [];
}); });

View File

@@ -15,7 +15,7 @@ class ContactSubmissionRequest extends FormRequest
'category' => ['required', 'in:question,advertising,bug_report,feedback,other'], 'category' => ['required', 'in:question,advertising,bug_report,feedback,other'],
'subject' => ['required', 'max:254'], 'subject' => ['required', 'max:254'],
'message' => ['required', 'unique:contact_submissions', 'max:3500'], 'message' => ['required', 'unique:contact_submissions', 'max:3500'],
'h-captcha-response' => 'required|HCaptcha' 'h-captcha-response' => 'required|HCaptcha',
]; ];
} }

View File

@@ -39,21 +39,21 @@ class Champion extends Model
public function getResourceTypeAttribute($value): string public function getResourceTypeAttribute($value): string
{ {
$resourceTypes = [ $resourceTypes = [
'BLOOD_WELL' => "Blood", 'BLOOD_WELL' => 'Blood',
"MANA" => "Mana", 'MANA' => 'Mana',
"ENERGY" => "Energy", 'ENERGY' => 'Energy',
"NONE" => "None", 'NONE' => 'None',
"HEALTH" => "Health", 'HEALTH' => 'Health',
"RAGE" => "Rage", 'RAGE' => 'Rage',
"COURAGE" => "Courage", 'COURAGE' => 'Courage',
"SHIELD" => "Shield", 'SHIELD' => 'Shield',
"FURY" => "Fury", 'FURY' => 'Fury',
"FEROCITY" => "Ferocity", 'FEROCITY' => 'Ferocity',
"HEAT" => "Heat", 'HEAT' => 'Heat',
"GRIT" => "Grit", 'GRIT' => 'Grit',
"BLOODTHIRST" => "Bloodthirst", 'BLOODTHIRST' => 'Bloodthirst',
"FLOW" => "Flow", 'FLOW' => 'Flow',
"SOUL_UNBOUND" => "Soul Unbound", 'SOUL_UNBOUND' => 'Soul Unbound',
]; ];
return $resourceTypes[$value]; return $resourceTypes[$value];
@@ -101,7 +101,6 @@ class Champion extends Model
return $centered ? $url.'/centered' : $url; return $centered ? $url.'/centered' : $url;
} }
public function getChampionImageLoadingAttribute(): string public function getChampionImageLoadingAttribute(): string
{ {
return 'https://cdn.communitydragon.org/latest/champion/'.$this->champion_id.'/portrait'; return 'https://cdn.communitydragon.org/latest/champion/'.$this->champion_id.'/portrait';

View File

@@ -2,8 +2,8 @@
namespace App\Models; namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use App\Enums\ContactCategory; use App\Enums\ContactCategory;
use Illuminate\Database\Eloquent\Model;
class ContactSubmission extends Model class ContactSubmission extends Model
{ {

View File

@@ -41,6 +41,7 @@ class SummonerIcon extends Model
public function getSqidAttribute(): string public function getSqidAttribute(): string
{ {
$sqids = new Sqids(minLength: 5); $sqids = new Sqids(minLength: 5);
return $sqids->encode([$this->icon_id]); return $sqids->encode([$this->icon_id]);
} }

View File

@@ -57,8 +57,6 @@ class AppServiceProvider extends ServiceProvider
return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip()); return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
}); });
Route::bind('post', function ($path) { Route::bind('post', function ($path) {
return $this->app->make(Sheets::class) return $this->app->make(Sheets::class)
->collection('posts') ->collection('posts')

View File

@@ -10,6 +10,7 @@ class Current_sales extends Component
public function __construct(public array $sales) public function __construct(public array $sales)
{ {
} }
public function render(): View public function render(): View
{ {
return view('components.sales.current_sales'); return view('components.sales.current_sales');

View File

@@ -3,8 +3,8 @@
namespace App\View\Components\Skins; namespace App\View\Components\Skins;
use Illuminate\Contracts\View\View; use Illuminate\Contracts\View\View;
use Illuminate\View\Component;
use Illuminate\Pagination\LengthAwarePaginator as Paginator; use Illuminate\Pagination\LengthAwarePaginator as Paginator;
use Illuminate\View\Component;
class Paginatedlist extends Component class Paginatedlist extends Component
{ {

View File

@@ -6,7 +6,6 @@ return [
'login_route' => env('LOGIN_ROUTE_NAME', 'login'), 'login_route' => env('LOGIN_ROUTE_NAME', 'login'),
'aliases' => Facade::defaultAliases()->merge([ 'aliases' => Facade::defaultAliases()->merge([
'HCaptcha' => Scyllaly\HCaptcha\Facades\HCaptcha::class, 'HCaptcha' => Scyllaly\HCaptcha\Facades\HCaptcha::class,
// 'Example' => App\Facades\Example::class, // 'Example' => App\Facades\Example::class,

View File

@@ -19,7 +19,7 @@ return [
'posts' => [ 'posts' => [
'driver' => 'local', 'driver' => 'local',
'root' => base_path('content/posts'), 'root' => base_path('content/posts'),
] ],
], ],
]; ];

View File

@@ -15,6 +15,6 @@ return [
| |
*/ */
'driver' => 'gd' 'driver' => 'gd',
]; ];

View File

@@ -9,6 +9,6 @@ return [
'path_parser' => Spatie\Sheets\PathParsers\SlugParser::class, 'path_parser' => Spatie\Sheets\PathParsers\SlugParser::class,
'content_parser' => Spatie\Sheets\ContentParsers\MarkdownWithFrontMatterParser::class, 'content_parser' => Spatie\Sheets\ContentParsers\MarkdownWithFrontMatterParser::class,
'extension' => 'md', 'extension' => 'md',
] ],
], ],
]; ];

View File

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
return new class () extends Migration { return new class() extends Migration
{
/** /**
* Run the migrations. * Run the migrations.
*/ */

View File

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
return new class () extends Migration { return new class() extends Migration
{
/** /**
* Run the migrations. * Run the migrations.
*/ */

View File

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
return new class () extends Migration { return new class() extends Migration
{
/** /**
* Run the migrations. * Run the migrations.
*/ */

View File

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
return new class () extends Migration { return new class() extends Migration
{
/** /**
* Run the migrations. * Run the migrations.
*/ */

View File

@@ -4,7 +4,8 @@ use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
use Laravel\Pulse\Support\PulseMigration; use Laravel\Pulse\Support\PulseMigration;
return new class () extends PulseMigration { return new class() extends PulseMigration
{
/** /**
* Run the migrations. * Run the migrations.
*/ */

View File

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
return new class () extends Migration { return new class() extends Migration
{
/** /**
* Run the migrations. * Run the migrations.
*/ */

View File

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
return new class () extends Migration { return new class() extends Migration
{
/** /**
* Run the migrations. * Run the migrations.
*/ */

View File

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
return new class () extends Migration { return new class() extends Migration
{
/** /**
* Run the migrations. * Run the migrations.
*/ */

View File

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
return new class () extends Migration { return new class() extends Migration
{
/** /**
* Run the migrations. * Run the migrations.
*/ */

View File

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
return new class () extends Migration { return new class() extends Migration
{
/** /**
* Run the migrations. * Run the migrations.
*/ */

View File

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
return new class () extends Migration { return new class() extends Migration
{
/** /**
* Run the migrations. * Run the migrations.
*/ */

View File

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
return new class () extends Migration { return new class() extends Migration
{
/** /**
* Run the migrations. * Run the migrations.
*/ */

View File

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
return new class () extends Migration { return new class() extends Migration
{
/** /**
* Run the migrations. * Run the migrations.
*/ */

View File

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
return new class () extends Migration { return new class() extends Migration
{
/** /**
* Run the migrations. * Run the migrations.
*/ */

View File

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
return new class () extends Migration { return new class() extends Migration
{
/** /**
* Run the migrations. * Run the migrations.
*/ */

View File

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
return new class () extends Migration { return new class() extends Migration
{
/** /**
* Run the migrations. * Run the migrations.
*/ */

View File

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
return new class () extends Migration { return new class() extends Migration
{
public function up(): void public function up(): void
{ {
Schema::create('summoner_icons', function (Blueprint $table) { Schema::create('summoner_icons', function (Blueprint $table) {

View File

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
return new class () extends Migration { return new class() extends Migration
{
public function up(): void public function up(): void
{ {
Schema::create('summoner_emotes', function (Blueprint $table) { Schema::create('summoner_emotes', function (Blueprint $table) {

View File

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
return new class () extends Migration { return new class() extends Migration
{
public function up(): void public function up(): void
{ {
Schema::table('users', function (Blueprint $table) { Schema::table('users', function (Blueprint $table) {

View File

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
return new class () extends Migration { return new class() extends Migration
{
public function up(): void public function up(): void
{ {
Schema::create('contact_submissions', function (Blueprint $table) { Schema::create('contact_submissions', function (Blueprint $table) {

View File

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
return new class () extends Migration { return new class() extends Migration
{
/** /**
* Run the migrations. * Run the migrations.
*/ */

View File

@@ -2,9 +2,9 @@
namespace Database\Seeders; namespace Database\Seeders;
use Illuminate\Database\Seeder;
use App\Models\ChampionRoles;
use App\Models\Champion; use App\Models\Champion;
use App\Models\ChampionRoles;
use Illuminate\Database\Seeder;
use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;

View File

@@ -4,8 +4,8 @@ namespace Database\Seeders;
// use Illuminate\Database\Console\Seeds\WithoutModelEvents; // use Illuminate\Database\Console\Seeds\WithoutModelEvents;
use Illuminate\Database\Seeder; use Illuminate\Database\Seeder;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Log;
class DatabaseSeeder extends Seeder class DatabaseSeeder extends Seeder
{ {

View File

@@ -20,9 +20,9 @@ class SummonerEmoteSeeder extends Seeder
foreach ($emoteData as $emote) { foreach ($emoteData as $emote) {
if (str_contains($emote['name'], 'game_summoner_emote_name_') if (str_contains($emote['name'], 'game_summoner_emote_name_')
|| $emote['inventoryIcon'] === "" || $emote['inventoryIcon'] === ''
|| empty($emote['inventoryIcon']) || empty($emote['inventoryIcon'])
|| $emote['inventoryIcon'] === "/lol-game-data/assets/" || $emote['inventoryIcon'] === '/lol-game-data/assets/'
|| $emote['id'] === 0) { || $emote['id'] === 0) {
continue; continue;
} }

View File

@@ -17,6 +17,6 @@ return static function (RectorConfig $rectorConfig): void {
SetList::DEAD_CODE, SetList::DEAD_CODE,
SetList::EARLY_RETURN, SetList::EARLY_RETURN,
SetList::STRICT_BOOLEANS, SetList::STRICT_BOOLEANS,
LevelSetList::UP_TO_PHP_82 LevelSetList::UP_TO_PHP_82,
]); ]);
}; };

View File

@@ -1,6 +1,5 @@
<?php <?php
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| API Routes | API Routes

View File

@@ -13,7 +13,6 @@ use Illuminate\Support\Facades\Schedule;
| |
*/ */
Schedule::command('db:seed --force')->twiceDaily(1, 13)->timezone('Europe/Amsterdam'); Schedule::command('db:seed --force')->twiceDaily(1, 13)->timezone('Europe/Amsterdam');
Schedule::command('sitemap:generate')->weekly(); Schedule::command('sitemap:generate')->weekly();

View File

@@ -16,8 +16,8 @@ use App\Http\Requests\ContactSubmissionRequest;
use App\Models\Champion; use App\Models\Champion;
use App\Models\SummonerIcon; use App\Models\SummonerIcon;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
use Spatie\Sheets\Sheet;
use Spatie\Honeypot\ProtectAgainstSpam; use Spatie\Honeypot\ProtectAgainstSpam;
use Spatie\Sheets\Sheet;
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------