Fix code style

.github/workflows/laravel.yml

@@ -31,7 +31,7 @@ jobs:
  run: php artisan key:generate
 
  - name: Check coding style
- run: vendor/bin/ecs check
+ run: vendor/bin/ecs --clear-cache && vendor/bin/ecs check
 
  - name: Execute tests (Unit and Feature tests) via PHPUnit
  run: vendor/bin/phpunit tests/

app/Console/Commands/BarExportCocktails.php

@@ -3,8 +3,8 @@
 namespace Kami\Cocktail\Console\Commands;
 
 use Illuminate\Console\Command;
-use Kami\Cocktail\Models\Cocktail;
 use Symfony\Component\Yaml\Yaml;
+use Kami\Cocktail\Models\Cocktail;
 
 class BarExportCocktails extends Command
 {

app/Console/Commands/BarSearchRefresh.php

@@ -3,8 +3,8 @@
 namespace Kami\Cocktail\Console\Commands;
 
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Artisan;
 use Kami\Cocktail\SearchActions;
+use Illuminate\Support\Facades\Artisan;
 
 class BarSearchRefresh extends Command
 {

app/Console/Commands/OpenBar.php

@@ -2,23 +2,23 @@
 
 namespace Kami\Cocktail\Console\Commands;
 
+use Throwable;
+use Illuminate\Support\Str;
+use Kami\Cocktail\Models\Tag;
 use Illuminate\Console\Command;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Artisan;
+use Kami\Cocktail\Models\Image;
+use Kami\Cocktail\SearchActions;
+use Symfony\Component\Yaml\Yaml;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Str;
 use Kami\Cocktail\Models\Cocktail;
-use Kami\Cocktail\Models\CocktailIngredient;
-use Kami\Cocktail\Models\CocktailIngredientSubstitute;
-use Kami\Cocktail\Models\Image;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Hash;
 use Kami\Cocktail\Models\Ingredient;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Artisan;
+use Kami\Cocktail\Models\CocktailIngredient;
 use Kami\Cocktail\Models\IngredientCategory;
-use Kami\Cocktail\Models\Tag;
-use Kami\Cocktail\SearchActions;
-use Symfony\Component\Yaml\Yaml;
-use Throwable;
+use Kami\Cocktail\Models\CocktailIngredientSubstitute;
 
 class OpenBar extends Command
 {

app/Console/Commands/ScrapIBACocktails.php

@@ -2,14 +2,14 @@
 
 namespace Kami\Cocktail\Console\Commands;
 
+use Throwable;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
-use Symfony\Component\BrowserKit\HttpBrowser;
 use Symfony\Component\DomCrawler\Crawler;
-use Symfony\Component\HttpClient\CachingHttpClient;
 use Symfony\Component\HttpClient\HttpClient;
+use Symfony\Component\BrowserKit\HttpBrowser;
 use Symfony\Component\HttpKernel\HttpCache\Store;
-use Throwable;
+use Symfony\Component\HttpClient\CachingHttpClient;
 
 class ScrapIBACocktails extends Command
 {

app/Console/Commands/TestScrap.php

@@ -3,11 +3,11 @@
 namespace Kami\Cocktail\Console\Commands;
 
 use Illuminate\Console\Command;
-use Symfony\Component\BrowserKit\HttpBrowser;
 use Symfony\Component\DomCrawler\Crawler;
-use Symfony\Component\HttpClient\CachingHttpClient;
 use Symfony\Component\HttpClient\HttpClient;
+use Symfony\Component\BrowserKit\HttpBrowser;
 use Symfony\Component\HttpKernel\HttpCache\Store;
+use Symfony\Component\HttpClient\CachingHttpClient;
 
 class TestScrap extends Command
 {

app/Exceptions/Handler.php

@@ -2,12 +2,12 @@
 
 namespace Kami\Cocktail\Exceptions;
 
-use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Throwable;
 use Illuminate\Database\RecordsNotFoundException;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Throwable;
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 
 class Handler extends ExceptionHandler
 {

app/Http/Controllers/Controller.php

@@ -4,10 +4,10 @@
 
 namespace Kami\Cocktail\Http\Controllers;
 
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 
 class Controller extends BaseController
 {

app/Http/Controllers/GlassController.php

@@ -4,12 +4,12 @@
 
 namespace Kami\Cocktail\Http\Controllers;
 
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Response;
+use Kami\Cocktail\Models\Glass;
+use Illuminate\Http\JsonResponse;
 use Kami\Cocktail\Http\Requests\GlassRequest;
 use Kami\Cocktail\Http\Resources\GlassResource;
-use Kami\Cocktail\Models\Glass;
+use Illuminate\Http\Resources\Json\JsonResource;
 
 class GlassController extends Controller
 {

app/Http/Controllers/ShoppingListController.php

@@ -4,12 +4,12 @@
 
 namespace Kami\Cocktail\Http\Controllers;
 
+use Throwable;
 use Illuminate\Http\Request;
+use Kami\Cocktail\Models\UserShoppingList;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Kami\Cocktail\Http\Resources\SuccessActionResource;
 use Kami\Cocktail\Http\Resources\UserShoppingListResource;
-use Kami\Cocktail\Models\UserShoppingList;
-use Throwable;
 
 class ShoppingListController extends Controller
 {

app/Http/Middleware/TrustProxies.php

@@ -2,8 +2,8 @@
 
 namespace Kami\Cocktail\Http\Middleware;
 
-use Illuminate\Http\Middleware\TrustProxies as Middleware;
 use Illuminate\Http\Request;
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 
 class TrustProxies extends Middleware
 {

app/Models/Cocktail.php

@@ -4,15 +4,15 @@
 
 namespace Kami\Cocktail\Models;
 
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-use Kami\Cocktail\SearchActions;
 use Laravel\Scout\Searchable;
 use Spatie\Sluggable\HasSlug;
+use Kami\Cocktail\SearchActions;
 use Spatie\Sluggable\SlugOptions;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 class Cocktail extends Model implements SiteSearchable
 {

app/Models/CocktailFavorite.php

@@ -4,9 +4,9 @@
 
 namespace Kami\Cocktail\Models;
 
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class CocktailFavorite extends Model
 {

app/Models/CocktailIngredient.php

@@ -4,10 +4,10 @@
 
 namespace Kami\Cocktail\Models;
 
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class CocktailIngredient extends Model
 {

app/Models/CocktailIngredientSubstitute.php

@@ -4,9 +4,9 @@
 
 namespace Kami\Cocktail\Models;
 
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class CocktailIngredientSubstitute extends Model
 {

app/Models/Glass.php

@@ -4,8 +4,8 @@
 
 namespace Kami\Cocktail\Models;
 
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class Glass extends Model
 {

app/Models/HasImages.php

@@ -4,10 +4,10 @@
 
 namespace Kami\Cocktail\Models;
 
+use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Str;
 
 trait HasImages
 {

app/Models/Image.php

@@ -4,10 +4,10 @@
 
 namespace Kami\Cocktail\Models;
 
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class Image extends Model
 {

app/Models/Ingredient.php

@@ -4,16 +4,16 @@
 
 namespace Kami\Cocktail\Models;
 
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Support\Collection;
-use Kami\Cocktail\SearchActions;
 use Laravel\Scout\Searchable;
 use Spatie\Sluggable\HasSlug;
+use Kami\Cocktail\SearchActions;
 use Spatie\Sluggable\SlugOptions;
+use Illuminate\Support\Collection;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 class Ingredient extends Model implements SiteSearchable
 {

app/Models/IngredientCategory.php

@@ -4,8 +4,8 @@
 
 namespace Kami\Cocktail\Models;
 
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class IngredientCategory extends Model
 {

app/Models/Tag.php

@@ -4,8 +4,8 @@
 
 namespace Kami\Cocktail\Models;
 
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class Tag extends Model
 {

app/Models/User.php

@@ -5,12 +5,12 @@
 namespace Kami\Cocktail\Models;
 
 // use Illuminate\Contracts\Auth\MustVerifyEmail;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Laravel\Sanctum\HasApiTokens;
+use Illuminate\Notifications\Notifiable;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\Relations\HasManyThrough;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
-use Illuminate\Notifications\Notifiable;
-use Laravel\Sanctum\HasApiTokens;
+use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 
 class User extends Authenticatable
 {

app/Models/UserIngredient.php

@@ -4,8 +4,8 @@
 
 namespace Kami\Cocktail\Models;
 
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class UserIngredient extends Model
 {

app/Models/UserShoppingList.php

@@ -4,9 +4,9 @@
 
 namespace Kami\Cocktail\Models;
 
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class UserShoppingList extends Model
 {

app/Providers/BroadcastServiceProvider.php

@@ -2,8 +2,8 @@
 
 namespace Kami\Cocktail\Providers;
 
-use Illuminate\Support\Facades\Broadcast;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Facades\Broadcast;
 
 class BroadcastServiceProvider extends ServiceProvider
 {

app/Providers/EventServiceProvider.php

@@ -2,10 +2,10 @@
 
 namespace Kami\Cocktail\Providers;
 
+use Illuminate\Support\Facades\Event;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-use Illuminate\Support\Facades\Event;
 
 class EventServiceProvider extends ServiceProvider
 {

app/Providers/RouteServiceProvider.php

@@ -2,11 +2,11 @@
 
 namespace Kami\Cocktail\Providers;
 
-use Illuminate\Cache\RateLimiting\Limit;
-use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\Facades\Route;
+use Illuminate\Cache\RateLimiting\Limit;
+use Illuminate\Support\Facades\RateLimiter;
+use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 
 class RouteServiceProvider extends ServiceProvider
 {

app/Scraper/Scraper.php

@@ -4,11 +4,11 @@
 
 namespace Kami\Cocktail\Scraper;
 
-use Symfony\Component\BrowserKit\HttpBrowser;
 use Symfony\Component\DomCrawler\Crawler;
-use Symfony\Component\HttpClient\CachingHttpClient;
 use Symfony\Component\HttpClient\HttpClient;
+use Symfony\Component\BrowserKit\HttpBrowser;
 use Symfony\Component\HttpKernel\HttpCache\Store;
+use Symfony\Component\HttpClient\CachingHttpClient;
 
 class Scraper
 {