csfix

Author: karlomikus

app/Exceptions/Handler.php

@@ -60,12 +60,12 @@ public function register()
             }
         });
 
-        $this->renderable(fn(NotFoundHttpException $e, $request) => response()->json([
+        $this->renderable(fn (NotFoundHttpException $e, $request) => response()->json([
             'type' => 'api_error',
             'message' => 'Resource not found.',
         ], 404));
 
-        $this->renderable(fn(MethodNotAllowedHttpException $e, $request) => response()->json([
+        $this->renderable(fn (MethodNotAllowedHttpException $e, $request) => response()->json([
             'type' => 'api_error',
             'message' => $e->getMessage(),
         ], 405));

app/External/Import/FromDataPack.php

@@ -175,7 +175,7 @@ private function importIngredients(Filesystem $dataDisk, Bar $bar, User $user):
     {
         $timerStart = microtime(true);
 
-        $existingIngredients = DB::table('ingredients')->select('id', 'name')->where('bar_id', $bar->id)->get()->keyBy(fn($ingredient) => Str::slug($ingredient->name));
+        $existingIngredients = DB::table('ingredients')->select('id', 'name')->where('bar_id', $bar->id)->get()->keyBy(fn ($ingredient) => Str::slug($ingredient->name));
 
         $ingredientsToInsert = [];
         $parentIngredientsToInsert = [];
@@ -320,7 +320,7 @@ private function importBaseCocktails(Filesystem $dataDisk, Bar $bar, User $user)
         $dbIngredients = DB::table('ingredients')->select('id', DB::raw('LOWER(name) AS name'))->where('bar_id', $bar->id)->get()->keyBy('name')->map(fn ($row) => $row->id)->toArray();
         $dbGlasses = DB::table('glasses')->select('id', DB::raw('LOWER(name) AS name'))->where('bar_id', $bar->id)->get()->keyBy('name')->map(fn ($row) => $row->id)->toArray();
         $dbMethods = DB::table('cocktail_methods')->select('id', DB::raw('LOWER(name) AS name'))->where('bar_id', $bar->id)->get()->keyBy('name')->map(fn ($row) => $row->id)->toArray();
-        $existingCocktails = DB::table('cocktails')->select('id', 'name')->where('bar_id', $bar->id)->get()->keyBy(fn($cocktail) => Str::slug($cocktail->name));
+        $existingCocktails = DB::table('cocktails')->select('id', 'name')->where('bar_id', $bar->id)->get()->keyBy(fn ($cocktail) => Str::slug($cocktail->name));
 
         $cocktailImages = [];
         $uniqueTags = [];

app/External/Model/Calculator.php

@@ -27,7 +27,7 @@ public static function fromModel(CalculatorModel $model): self
             $model->getExternalId(),
             $model->name,
             $model->description,
-            $model->blocks->map(fn(CalculatorBlock $block) => [
+            $model->blocks->map(fn (CalculatorBlock $block) => [
                 'label' => $block->label,
                 'variable_name' => $block->variable_name,
                 'value' => $block->value,

app/External/Model/Cocktail.php

@@ -45,9 +45,9 @@ private function __construct(
 
     public static function fromModel(CocktailModel $model, bool $useFileURI = false, ?Units $toUnits = null): self
     {
-        $images = $model->images->map(fn(ImageModel $image) => Image::fromModel($image, $useFileURI))->toArray();
+        $images = $model->images->map(fn (ImageModel $image) => Image::fromModel($image, $useFileURI))->toArray();
 
-        $ingredients = $model->ingredients->map(fn(CocktailIngredientModel $cocktailIngredient) => CocktailIngredient::fromModel($cocktailIngredient, $toUnits))->toArray();
+        $ingredients = $model->ingredients->map(fn (CocktailIngredientModel $cocktailIngredient) => CocktailIngredient::fromModel($cocktailIngredient, $toUnits))->toArray();
 
         return new self(
             $model->getExternalId(),
@@ -207,7 +207,7 @@ public function toJSONLD(): string
             "recipeCategory" => "Drink",
             "recipeCuisine" => "Cocktail",
             "keywords" => implode(', ', $this->tags),
-            "recipeIngredient" => array_map(fn(CocktailIngredient $ci) => (new CocktailIngredientFormatter($ci->amount, $ci->ingredient->name, $ci->optional))->format(), $this->ingredients),
+            "recipeIngredient" => array_map(fn (CocktailIngredient $ci) => (new CocktailIngredientFormatter($ci->amount, $ci->ingredient->name, $ci->optional))->format(), $this->ingredients),
         ], ['image' => $image]);
 
         if ($data = json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)) {

app/External/Model/CocktailIngredient.php

@@ -31,7 +31,7 @@ private function __construct(
 
     public static function fromModel(CocktailIngredientModel $model, ?Units $toUnits = null): self
     {
-        $substitutes = $model->substitutes->map(fn(CocktailIngredientSubstituteModel $substitute) => CocktailIngredientSubstitute::fromModel($substitute, $toUnits))->toArray();
+        $substitutes = $model->substitutes->map(fn (CocktailIngredientSubstituteModel $substitute) => CocktailIngredientSubstitute::fromModel($substitute, $toUnits))->toArray();
 
         $amount = $model->getAmount();
         if ($toUnits && !$model->getAmount()->units->isDash()) {

app/External/Model/Ingredient.php

@@ -45,11 +45,11 @@ private function __construct(
 
     public static function fromModel(IngredientModel $model, bool $useFileURI = false, ?Units $toUnits = null): self
     {
-        $images = $model->images->map(fn(ImageModel $image) => Image::fromModel($image, $useFileURI))->toArray();
+        $images = $model->images->map(fn (ImageModel $image) => Image::fromModel($image, $useFileURI))->toArray();
 
-        $ingredientParts = $model->ingredientParts->map(fn(ComplexIngredient $part) => Ingredient::fromModel($part->ingredient))->toArray();
+        $ingredientParts = $model->ingredientParts->map(fn (ComplexIngredient $part) => Ingredient::fromModel($part->ingredient))->toArray();
 
-        $ingredientPrices = $model->prices->map(fn(IngredientPriceModel $price) => IngredientPrice::fromModel($price))->toArray();
+        $ingredientPrices = $model->prices->map(fn (IngredientPriceModel $price) => IngredientPrice::fromModel($price))->toArray();
 
         $defaultIngredientUnits = $model->getDefaultUnits();
         if ($model->getDefaultUnits()?->isConvertable() && $toUnits) {

app/Http/Controllers/IngredientController.php

@@ -217,7 +217,7 @@ public function extra(Request $request, CocktailService $cocktailRepo, string $i
         $extraCocktails = Cocktail::whereIn('id', $extraShelfCocktails->diff($currentShelfCocktails)->values())->where('bar_id', '=', $ingredient->bar_id)->get();
 
         return response()->json([
-            'data' => $extraCocktails->map(fn(Cocktail $cocktail) => [
+            'data' => $extraCocktails->map(fn (Cocktail $cocktail) => [
                 'id' => $cocktail->id,
                 'slug' => $cocktail->slug,
                 'name' => $cocktail->name,

app/Http/Controllers/Public/CocktailController.php

@@ -59,7 +59,7 @@ public function index(Request $request, string $slugOrId): JsonResource
             abort(400, $e->getMessage());
         }
 
-        $cocktails = $cocktailsQuery->paginate(50);
+        $cocktails = $cocktailsQuery->paginate(52);
 
         Cache::put($cacheKey, $cocktails, 3600);
 

app/Http/Middleware/CheckMetricsAccess.php

@@ -26,7 +26,7 @@ public function handle(Request $request, Closure $next)
             return $next($request);
         }
 
-        $whitelist = array_filter(config('bar-assistant.metrics.allowed_ips', []), fn($ip) => $ip !== '');
+        $whitelist = array_filter(config('bar-assistant.metrics.allowed_ips', []), fn ($ip) => $ip !== '');
 
         if (count($whitelist) === 0) {
             abort(404);

app/Http/Middleware/EnsureRequestHasBarQuery.php

@@ -24,13 +24,13 @@ public function handle(Request $request, Closure $next): Response
             abort(400, sprintf("Missing required bar reference while requesting '%s'. Use 'Bar-Assistant-Bar-Id' header to specify bar id.", $request->path()));
         }
 
-        $bar = Cache::remember('ba:bar:' . $barId, 60 * 60 * 24, fn() => Bar::findOrFail($barId));
+        $bar = Cache::remember('ba:bar:' . $barId, 60 * 60 * 24, fn () => Bar::findOrFail($barId));
 
         if ($request->user()->cannot('access', $bar)) {
             abort(403);
         }
 
-        app()->singleton(BarContext::class, fn() => new BarContext($bar));
+        app()->singleton(BarContext::class, fn () => new BarContext($bar));
 
         return $next($request);
     }