From 9ced9a83f339d2ae7d3850392cf9cdf6905edda4 Mon Sep 17 00:00:00 2001 From: Rico van Zelst Date: Wed, 1 Nov 2023 14:09:25 +0100 Subject: [PATCH] style: laravel pint lint --- app/Http/Controllers/SkinChromaController.php | 2 +- app/Models/Champion.php | 22 +++++++++---------- app/Models/ChampionSkin.php | 10 ++++----- app/Models/SkinChroma.php | 7 +++--- app/Policies/SkinChromaPolicy.php | 1 - database/factories/UserFactory.php | 1 - database/seeders/ChampionSeeder.php | 11 +++++----- database/seeders/ChampionSkinSeeder.php | 16 +++++++------- database/seeders/DatabaseSeeder.php | 2 +- database/seeders/SkinChromaSeeder.php | 20 +++++++++-------- 10 files changed, 47 insertions(+), 45 deletions(-) diff --git a/app/Http/Controllers/SkinChromaController.php b/app/Http/Controllers/SkinChromaController.php index cdd0232..ad564c1 100644 --- a/app/Http/Controllers/SkinChromaController.php +++ b/app/Http/Controllers/SkinChromaController.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers; -use App\Models\SkinChroma; use App\Http\Requests\StoreSkinChromaRequest; use App\Http\Requests\UpdateSkinChromaRequest; +use App\Models\SkinChroma; class SkinChromaController extends Controller { diff --git a/app/Models/Champion.php b/app/Models/Champion.php index 1eac51f..3986f74 100644 --- a/app/Models/Champion.php +++ b/app/Models/Champion.php @@ -35,8 +35,8 @@ class Champion extends Model { return [ 'slug' => [ - 'source' => 'name' - ] + 'source' => 'name', + ], ]; } @@ -47,46 +47,46 @@ class Champion extends Model public function getChampionImageAttribute() { - return 'https://cdn.communitydragon.org/latest/champion/' . $this->champion_id . '/splash-art'; + return 'https://cdn.communitydragon.org/latest/champion/'.$this->champion_id.'/splash-art'; } public function getChampionImageLoadingAttribute() { - return 'https://cdn.communitydragon.org/latest/champion/' . $this->champion_id . '/portrait'; + return 'https://cdn.communitydragon.org/latest/champion/'.$this->champion_id.'/portrait'; } public function getChampionImageTileAttribute() { - return 'https://cdn.communitydragon.org/latest/champion/' . $this->champion_id . '/tile'; + return 'https://cdn.communitydragon.org/latest/champion/'.$this->champion_id.'/tile'; } public function getChampionSquareImageAttribute() { - return 'https://cdn.communitydragon.org/latest/champion/' . $this->champion_id . '/square'; + return 'https://cdn.communitydragon.org/latest/champion/'.$this->champion_id.'/square'; } public function getChampionAbilityIconQAttribute() { - return 'https://cdn.communitydragon.org/latest/champion/' . $this->champion_id . '/ability-icon/q'; + return 'https://cdn.communitydragon.org/latest/champion/'.$this->champion_id.'/ability-icon/q'; } public function getChampionAbilityIconWAttribute() { - return 'https://cdn.communitydragon.org/latest/champion/' . $this->champion_id . '/ability-icon/w'; + return 'https://cdn.communitydragon.org/latest/champion/'.$this->champion_id.'/ability-icon/w'; } public function getChampionAbilityIconEAttribute() { - return 'https://cdn.communitydragon.org/latest/champion/' . $this->champion_id . '/ability-icon/e'; + return 'https://cdn.communitydragon.org/latest/champion/'.$this->champion_id.'/ability-icon/e'; } public function getChampionAbilityIconRAttribute() { - return 'https://cdn.communitydragon.org/latest/champion/' . $this->champion_id . '/ability-icon/r'; + return 'https://cdn.communitydragon.org/latest/champion/'.$this->champion_id.'/ability-icon/r'; } public function getChampionAbilityIconPAttribute() { - return 'https://cdn.communitydragon.org/latest/champion/' . $this->champion_id . '/ability-icon/p'; + return 'https://cdn.communitydragon.org/latest/champion/'.$this->champion_id.'/ability-icon/p'; } } diff --git a/app/Models/ChampionSkin.php b/app/Models/ChampionSkin.php index 5fb28c2..9cafbe1 100644 --- a/app/Models/ChampionSkin.php +++ b/app/Models/ChampionSkin.php @@ -42,8 +42,8 @@ class ChampionSkin extends Model { return [ 'slug' => [ - 'source' => 'skin_name' - ] + 'source' => 'skin_name', + ], ]; } @@ -59,16 +59,16 @@ class ChampionSkin extends Model public function getSkinImageAttribute() { - return 'https://cdn.communitydragon.org/latest/champion/' . $this->champion_id . '/splash-art/centered/skin/' . $this->skin_id; + return 'https://cdn.communitydragon.org/latest/champion/'.$this->champion_id.'/splash-art/centered/skin/'.$this->skin_id; } public function getSkinImageLoadingAttribute() { - return 'https://cdn.communitydragon.org/latest/champion/' . $this->champion_id . '/portrait/skin/' . $this->skin_id; + return 'https://cdn.communitydragon.org/latest/champion/'.$this->champion_id.'/portrait/skin/'.$this->skin_id; } public function getSkinImageTileAttribute() { - return 'https://cdn.communitydragon.org/latest/champion/' . $this->champion_id . '/tile/skin/' . $this->skin_id; + return 'https://cdn.communitydragon.org/latest/champion/'.$this->champion_id.'/tile/skin/'.$this->skin_id; } } diff --git a/app/Models/SkinChroma.php b/app/Models/SkinChroma.php index 3d070a7..86415e5 100644 --- a/app/Models/SkinChroma.php +++ b/app/Models/SkinChroma.php @@ -25,11 +25,12 @@ class SkinChroma extends Model public function sluggable(): array { - $slug = $this->chroma_name . ' ' . $this->skin_name; + $slug = $this->chroma_name.' '.$this->skin_name; + return [ 'slug' => [ - 'source' => $slug - ] + 'source' => $slug, + ], ]; } diff --git a/app/Policies/SkinChromaPolicy.php b/app/Policies/SkinChromaPolicy.php index adbcc8a..36e917f 100644 --- a/app/Policies/SkinChromaPolicy.php +++ b/app/Policies/SkinChromaPolicy.php @@ -4,7 +4,6 @@ namespace App\Policies; use App\Models\SkinChroma; use App\Models\User; -use Illuminate\Auth\Access\Response; class SkinChromaPolicy { diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index 73a012e..a991ec8 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -3,7 +3,6 @@ namespace Database\Factories; use Illuminate\Database\Eloquent\Factories\Factory; -use Illuminate\Support\Str; /** * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\User> diff --git a/database/seeders/ChampionSeeder.php b/database/seeders/ChampionSeeder.php index 560d7ae..275ae4a 100644 --- a/database/seeders/ChampionSeeder.php +++ b/database/seeders/ChampionSeeder.php @@ -2,8 +2,8 @@ namespace Database\Seeders; -use Illuminate\Database\Seeder; use App\Models\Champion; +use Illuminate\Database\Seeder; use Illuminate\Support\Facades\Log; class ChampionSeeder extends Seeder @@ -13,7 +13,7 @@ class ChampionSeeder extends Seeder */ public function run(): void { - $championDataUrl = "http://cdn.merakianalytics.com/riot/lol/resources/latest/en-US/champions.json"; + $championDataUrl = 'http://cdn.merakianalytics.com/riot/lol/resources/latest/en-US/champions.json'; $championData = json_decode(file_get_contents($championDataUrl), true); foreach ($championData as $champion) { @@ -39,10 +39,10 @@ class ChampionSeeder extends Seeder // Check if the champion already exists and if any attributes have changed, if so update the champion. If the champion doesn't exist, create it. // This is to prevent the champion data from being updated every time the seeder is run. As I'll probably run this on a cron job. if ($championExists && $this->hasAttributesChanged($championExists, $championAttributes)) { - Log::info('Champion ' . $champion['name'] . ' has changed, updating...'); + Log::info('Champion '.$champion['name'].' has changed, updating...'); $championExists->update($championAttributes); - } elseif (!$championExists) { - Log::info('New champion detected! Creating ' . $champion['name'] . '...'); + } elseif (! $championExists) { + Log::info('New champion detected! Creating '.$champion['name'].'...'); Champion::create($championAttributes); } } @@ -55,6 +55,7 @@ class ChampionSeeder extends Seeder return true; } } + return false; } } diff --git a/database/seeders/ChampionSkinSeeder.php b/database/seeders/ChampionSkinSeeder.php index 2e2debe..0800f21 100644 --- a/database/seeders/ChampionSkinSeeder.php +++ b/database/seeders/ChampionSkinSeeder.php @@ -2,7 +2,6 @@ namespace Database\Seeders; -use App\Models\Champion; use App\Models\ChampionSkin; use Illuminate\Database\Seeder; use Illuminate\Support\Facades\Log; @@ -14,7 +13,7 @@ class ChampionSkinSeeder extends Seeder */ public function run(): void { - $championDataUrl = "http://cdn.merakianalytics.com/riot/lol/resources/latest/en-US/champions.json"; + $championDataUrl = 'http://cdn.merakianalytics.com/riot/lol/resources/latest/en-US/champions.json'; $championData = json_decode(file_get_contents($championDataUrl), true); foreach ($championData as $champion) { @@ -23,11 +22,11 @@ class ChampionSkinSeeder extends Seeder $skinExists = ChampionSkin::where('full_skin_id', $skinId)->first(); // Original is just the base skin (so, none) so we don't need to store it. - if ($skin['name'] === "Original") { + if ($skin['name'] === 'Original') { continue; } - if ($skin['cost'] == "Special") { + if ($skin['cost'] == 'Special') { $skin['cost'] = 99999; } @@ -35,7 +34,7 @@ class ChampionSkinSeeder extends Seeder 'champion_id' => $champion['id'], 'full_skin_id' => $skin['id'], 'skin_id' => substr($skin['id'], 3), - 'skin_name' => $skin['name'] . ' ' . $champion['name'], + 'skin_name' => $skin['name'].' '.$champion['name'], 'lore' => $skin['lore'], 'availability' => $skin['availability'], 'loot_eligible' => $skin['lootEligible'], @@ -60,10 +59,10 @@ class ChampionSkinSeeder extends Seeder // Check if the skin already exists and if any attributes have changed, if so update the skin. If the skin doesn't exist, create it. // This is to prevent the skin data from being updated every time the seeder is run. As I'll probably run this on a cron job. if ($skinExists && $this->hasAttributesChanged($skinExists, $skinAttributes)) { - Log::info('Skin ' . $skin['name'] . ' ' . $champion['name'] . ' has changed, updating...'); + Log::info('Skin '.$skin['name'].' '.$champion['name'].' has changed, updating...'); $skinExists->update($skinAttributes); - } elseif (!$skinExists) { - Log::info('New skin detected! Creating ' . $skin['name'] . ' ' . $champion['name'] . '...'); + } elseif (! $skinExists) { + Log::info('New skin detected! Creating '.$skin['name'].' '.$champion['name'].'...'); ChampionSkin::create($skinAttributes); } } @@ -77,6 +76,7 @@ class ChampionSkinSeeder extends Seeder return true; } } + return false; } } diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 148952d..5ea0217 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -17,6 +17,6 @@ class DatabaseSeeder extends Seeder $this->call(ChampionSkinSeeder::class); $this->call(SkinChromaSeeder::class); - Log::info('Seeding complete at ' . date('Y-m-d H:i:s')); + Log::info('Seeding complete at '.date('Y-m-d H:i:s')); } } diff --git a/database/seeders/SkinChromaSeeder.php b/database/seeders/SkinChromaSeeder.php index 6842c5d..a26a59c 100644 --- a/database/seeders/SkinChromaSeeder.php +++ b/database/seeders/SkinChromaSeeder.php @@ -2,9 +2,8 @@ namespace Database\Seeders; -use Illuminate\Database\Console\Seeds\WithoutModelEvents; -use Illuminate\Database\Seeder; use App\Models\SkinChroma; +use Illuminate\Database\Seeder; use Illuminate\Support\Facades\Log; class SkinChromaSeeder extends Seeder @@ -14,16 +13,18 @@ class SkinChromaSeeder extends Seeder */ public function run(): void { - $championDataUrl = "http://cdn.merakianalytics.com/riot/lol/resources/latest/en-US/champions.json"; + $championDataUrl = 'http://cdn.merakianalytics.com/riot/lol/resources/latest/en-US/champions.json'; $championData = json_decode(file_get_contents($championDataUrl), true); foreach ($championData as $champion) { foreach ($champion['skins'] as $skin) { - if ($skin['name'] === "Original") { + if ($skin['name'] === 'Original') { continue; } foreach ($skin['chromas'] as $chroma) { - if ($chroma === null) continue; // To address: https://github.com/meraki-analytics/lolstaticdata/issues/71 + if ($chroma === null) { + continue; + } // To address: https://github.com/meraki-analytics/lolstaticdata/issues/71 $chromaId = $chroma['id']; @@ -31,7 +32,7 @@ class SkinChromaSeeder extends Seeder $chromaAttributes = [ 'chroma_id' => $chromaId, 'full_skin_id' => $skin['id'], - 'skin_name' => $skin['name'] . ' ' . $champion['name'], + 'skin_name' => $skin['name'].' '.$champion['name'], 'chroma_name' => $chroma['name'], 'chroma_colors' => $chroma['colors'], 'chroma_image' => $chroma['chromaPath'], @@ -43,10 +44,10 @@ class SkinChromaSeeder extends Seeder } if ($chromaExists && $this->hasAttributesChanged($chromaExists, $chromaAttributes)) { - Log::info('Updating chroma: ' . $chromaId); + Log::info('Updating chroma: '.$chromaId); $chromaExists->update($chromaAttributes); - } else if (!$chromaExists) { - Log::info('Creating chroma: ' . $chromaId); + } elseif (! $chromaExists) { + Log::info('Creating chroma: '.$chromaId); SkinChroma::create($chromaAttributes); } } @@ -61,6 +62,7 @@ class SkinChromaSeeder extends Seeder return true; } } + return false; } }