From 2249738446ef6ccd6676774b696e3b9d90c77c9e Mon Sep 17 00:00:00 2001
From: AVMG20 <rijstenpap1234@hotmail.com>
Date: Wed, 13 Oct 2021 22:34:05 +0200
Subject: [PATCH] Return value was placed in an array, this altered the
 response from the array which could break existing implementations

---
 app/Http/Controllers/Api/ServerController.php  | 10 ++++++----
 app/Http/Controllers/Api/UserController.php    |  6 ++++--
 app/Http/Controllers/Api/VoucherController.php |  6 ++++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Api/ServerController.php b/app/Http/Controllers/Api/ServerController.php
index 566bec71..1b9468c0 100644
--- a/app/Http/Controllers/Api/ServerController.php
+++ b/app/Http/Controllers/Api/ServerController.php
@@ -7,14 +7,15 @@ use App\Models\Server;
 use Exception;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Spatie\QueryBuilder\QueryBuilder;
 
 class ServerController extends Controller
 {
-    const ALLOWED_INCLUDES = ['product', 'user'];
-    const ALLOWED_FILTERS = ['name', 'suspended', 'identifier', 'pterodactyl_id', 'user_id', 'product_id'];
+    public const ALLOWED_INCLUDES = ['product', 'user'];
+    public const ALLOWED_FILTERS = ['name', 'suspended', 'identifier', 'pterodactyl_id', 'user_id', 'product_id'];
 
     /**
      * Display a listing of the resource.
@@ -35,7 +36,8 @@ class ServerController extends Controller
      * Display the specified resource.
      *
      * @param Server $server
-     * @return Server|Collection
+     *
+     * @return Server|Collection|Model
      */
     public function show(Server $server)
     {
@@ -43,7 +45,7 @@ class ServerController extends Controller
             ->where('id', '=', $server->id)
             ->allowedIncludes(self::ALLOWED_INCLUDES);
 
-        return $query->get();
+        return $query->firstOrFail();
     }
 
     /**
diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php
index fbf0c0e8..07a7a698 100644
--- a/app/Http/Controllers/Api/UserController.php
+++ b/app/Http/Controllers/Api/UserController.php
@@ -13,6 +13,7 @@ use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\App;
@@ -47,7 +48,8 @@ class UserController extends Controller
      * Display the specified resource.
      *
      * @param int $id
-     * @return User|Collection
+     *
+     * @return User|Builder|Collection|Model
      */
     public function show(int $id)
     {
@@ -62,7 +64,7 @@ class UserController extends Controller
                 $builder->where('id', '=', $id);
             });
 
-        return $query->get();
+        return $query->firstOrFail();
     }
 
 
diff --git a/app/Http/Controllers/Api/VoucherController.php b/app/Http/Controllers/Api/VoucherController.php
index 69f0176f..a094fe1d 100644
--- a/app/Http/Controllers/Api/VoucherController.php
+++ b/app/Http/Controllers/Api/VoucherController.php
@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Models\Voucher;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Validation\Rule;
@@ -63,7 +64,8 @@ class VoucherController extends Controller
      * Display the specified resource.
      *
      * @param int $id
-     * @return Collection|Voucher
+     *
+     * @return Voucher|Collection|Model
      */
     public function show(int $id)
     {
@@ -71,7 +73,7 @@ class VoucherController extends Controller
             ->where('id', '=', $id)
             ->allowedIncludes(self::ALLOWED_INCLUDES);
 
-        return $query->get();
+        return $query->firstOrFail();
     }
 
     /**