Completed
Push — development ( 6d5a30...14e171 )
by Claudio
04:47
created
app/Http/Controllers/PageController.php 1 patch
Switch Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@  discard block
 block discarded – undo
1
-<?php
1
+ <?php
2 2
 
3
-namespace App\Http\Controllers;
3
+ namespace App\Http\Controllers;
4 4
 
5
-use Illuminate\Http\Response;
6
-use Laravel\Lumen\Routing\Controller as BaseController;
5
+ use Illuminate\Http\Response;
6
+ use Laravel\Lumen\Routing\Controller as BaseController;
7 7
 
8 8
 /**
9 9
  * Class PageController.
10 10
  */
11
-class PageController extends BaseController
12
-{
13
-    /**
11
+ class PageController extends BaseController
12
+ {
13
+     /**
14 14
      * Render a HabboWEB Page.
15 15
      *
16 16
      * @param string $pageCategory
@@ -18,14 +18,14 @@  discard block
 block discarded – undo
18 18
      *
19 19
      * @return Response
20 20
      */
21
-    public function show(string $pageCategory, string $pageFile): Response
22
-    {
23
-        $pageArray = explode('.', $pageFile);
21
+     public function show(string $pageCategory, string $pageFile): Response
22
+     {
23
+         $pageArray = explode('.', $pageFile);
24 24
 
25
-        return response(view("habbo-web-pages.{$pageCategory}.{$pageArray[0]}"));
26
-    }
25
+         return response(view("habbo-web-pages.{$pageCategory}.{$pageArray[0]}"));
26
+     }
27 27
 
28
-    /**
28
+     /**
29 29
      * Render a HabboPage.
30 30
      *
31 31
      * @WARNING: Categories can still be pages
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
35 35
      *
36 36
      * @return Response
37 37
      */
38
-    public function habboPage(string $category, string $page = '')
39
-    {
40
-        return response(view(empty($page) ? "habbo-pages.{$category}" : "habbo-pages.{$category}.{$page}"));
41
-    }
38
+     public function habboPage(string $category, string $page = '')
39
+     {
40
+         return response(view(empty($page) ? "habbo-pages.{$category}" : "habbo-pages.{$category}.{$page}"));
41
+     }
42 42
 }
Please login to merge, or discard this patch.
app/Http/Controllers/HomePageController.php 1 patch
Switch Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,23 +1,23 @@
 block discarded – undo
1
-<?php
1
+ <?php
2 2
 
3
-namespace App\Http\Controllers;
3
+ namespace App\Http\Controllers;
4 4
 
5
-use Illuminate\Http\Response;
6
-use Illuminate\Support\Facades\Redirect;
7
-use Laravel\Lumen\Routing\Controller as BaseController;
5
+ use Illuminate\Http\Response;
6
+ use Illuminate\Support\Facades\Redirect;
7
+ use Laravel\Lumen\Routing\Controller as BaseController;
8 8
 
9 9
 /**
10 10
  * Class HomePageController.
11 11
  */
12
-class HomePageController extends BaseController
13
-{
14
-    /**
12
+ class HomePageController extends BaseController
13
+ {
14
+     /**
15 15
      * Render the Home Page.
16 16
      *
17 17
      * @return Response|Redirect
18 18
      */
19
-    public function show()
20
-    {
21
-        return response(view('habbo-web-pages.habbo-web'));
22
-    }
19
+     public function show()
20
+     {
21
+         return response(view('habbo-web-pages.habbo-web'));
22
+     }
23 23
 }
Please login to merge, or discard this patch.
app/Http/Controllers/ClientController.php 1 patch
Switch Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -1,53 +1,53 @@
 block discarded – undo
1
-<?php
1
+ <?php
2 2
 
3
-namespace App\Http\Controllers;
3
+ namespace App\Http\Controllers;
4 4
 
5
-use App\Facades\User;
6
-use Illuminate\Http\Request;
7
-use Illuminate\Http\Response;
8
-use Illuminate\Support\Facades\Config;
9
-use Laravel\Lumen\Routing\Controller as BaseController;
5
+ use App\Facades\User;
6
+ use Illuminate\Http\Request;
7
+ use Illuminate\Http\Response;
8
+ use Illuminate\Support\Facades\Config;
9
+ use Laravel\Lumen\Routing\Controller as BaseController;
10 10
 
11 11
 /**
12 12
  * Class ClientController.
13 13
  */
14
-class ClientController extends BaseController
15
-{
16
-    /**
14
+ class ClientController extends BaseController
15
+ {
16
+     /**
17 17
      * Returns the Client URL.
18 18
      *
19 19
      * @param Request $request
20 20
      *
21 21
      * @return Response
22 22
      */
23
-    public function getUrl(Request $request)
24
-    {
25
-        $hotelUrl = Config::get('chocolatey.hotelUrl');
23
+     public function getUrl(Request $request)
24
+     {
25
+         $hotelUrl = Config::get('chocolatey.hotelUrl');
26 26
 
27
-        return response()->json(['clienturl' => "{$hotelUrl}/client/habbo-client"], 200, [], JSON_UNESCAPED_SLASHES);
28
-    }
27
+         return response()->json(['clienturl' => "{$hotelUrl}/client/habbo-client"], 200, [], JSON_UNESCAPED_SLASHES);
28
+     }
29 29
 
30
-    /**
30
+     /**
31 31
      * Get Client View.
32 32
      *
33 33
      * @return Response
34 34
      */
35
-    public function showClient(): Response
36
-    {
37
-        User::updateSession(['auth_ticket' => ($userToken = uniqid('HabboWEB', true))]);
35
+     public function showClient(): Response
36
+     {
37
+         User::updateSession(['auth_ticket' => ($userToken = uniqid('HabboWEB', true))]);
38 38
 
39
-        return response(view('habbo-web-pages.habbo-client', ['token' => $userToken, 'newUser' => in_array('NEW_USER', User::getUser()->traits)]));
40
-    }
39
+         return response(view('habbo-web-pages.habbo-client', ['token' => $userToken, 'newUser' => in_array('NEW_USER', User::getUser()->traits)]));
40
+     }
41 41
 
42
-    /**
42
+     /**
43 43
      * Get HabboWEB Ads Interstitial.
44 44
      *
45 45
      * @param string $interstitialType
46 46
      *
47 47
      * @return Response
48 48
      */
49
-    public function getInterstitial(string $interstitialType): Response
50
-    {
51
-        return response(view('habbo-web-ads.interstitial'));
52
-    }
49
+     public function getInterstitial(string $interstitialType): Response
50
+     {
51
+         return response(view('habbo-web-ads.interstitial'));
52
+     }
53 53
 }
Please login to merge, or discard this patch.
app/Exceptions/Handler.php 1 patch
Switch Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -1,33 +1,33 @@  discard block
 block discarded – undo
1
-<?php
1
+ <?php
2 2
 
3
-namespace App\Exceptions;
3
+ namespace App\Exceptions;
4 4
 
5
-use Exception;
6
-use Illuminate\Auth\Access\AuthorizationException;
7
-use Illuminate\Database\Eloquent\ModelNotFoundException;
8
-use Illuminate\Validation\ValidationException;
9
-use Laravel\Lumen\Exceptions\Handler as ExceptionHandler;
10
-use Symfony\Component\HttpKernel\Exception\HttpException;
11
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
5
+ use Exception;
6
+ use Illuminate\Auth\Access\AuthorizationException;
7
+ use Illuminate\Database\Eloquent\ModelNotFoundException;
8
+ use Illuminate\Validation\ValidationException;
9
+ use Laravel\Lumen\Exceptions\Handler as ExceptionHandler;
10
+ use Symfony\Component\HttpKernel\Exception\HttpException;
11
+ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
12 12
 
13 13
 /**
14 14
  * Class Handler.
15 15
  */
16
-class Handler extends ExceptionHandler
17
-{
18
-    /**
16
+ class Handler extends ExceptionHandler
17
+ {
18
+     /**
19 19
      * A list of the exception types that should not be reported.
20 20
      *
21 21
      * @var array
22 22
      */
23
-    protected $dontReport = [
24
-        AuthorizationException::class,
25
-        HttpException::class,
26
-        ModelNotFoundException::class,
27
-        ValidationException::class,
28
-    ];
23
+     protected $dontReport = [
24
+         AuthorizationException::class,
25
+         HttpException::class,
26
+         ModelNotFoundException::class,
27
+         ValidationException::class,
28
+     ];
29 29
 
30
-    /**
30
+     /**
31 31
      * Report or log an exception.
32 32
      *
33 33
      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
@@ -36,12 +36,12 @@  discard block
 block discarded – undo
36 36
      *
37 37
      * @return void
38 38
      */
39
-    public function report(Exception $e)
40
-    {
41
-        parent::report($e);
42
-    }
39
+     public function report(Exception $e)
40
+     {
41
+         parent::report($e);
42
+     }
43 43
 
44
-    /**
44
+     /**
45 45
      * Render an exception into an HTTP response.
46 46
      *
47 47
      * @param \Illuminate\Http\Request $request
@@ -49,12 +49,12 @@  discard block
 block discarded – undo
49 49
      *
50 50
      * @return \Illuminate\Http\Response
51 51
      */
52
-    public function render($request, Exception $e)
53
-    {
54
-        if ($e instanceof NotFoundHttpException) {
55
-            return response(view('habbo-web-pages.habbo-web'));
56
-        }
52
+     public function render($request, Exception $e)
53
+     {
54
+         if ($e instanceof NotFoundHttpException) {
55
+             return response(view('habbo-web-pages.habbo-web'));
56
+         }
57 57
 
58
-        return parent::render($request, $e);
59
-    }
58
+         return parent::render($request, $e);
59
+     }
60 60
 }
Please login to merge, or discard this patch.
app/Helpers/Session.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
     /**
66 66
      * Check if a Key exists in the Session.
67 67
      *
68
-     * @param mixed $key
68
+     * @param string $key
69 69
      *
70 70
      * @return bool
71 71
      */
Please login to merge, or discard this patch.
app/Http/Controllers/RoomsController.php 1 patch
Switch Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -1,17 +1,17 @@  discard block
 block discarded – undo
1
-<?php
1
+ <?php
2 2
 
3
-namespace App\Http\Controllers;
3
+ namespace App\Http\Controllers;
4 4
 
5
-use App\Models\Room;
6
-use Illuminate\Http\JsonResponse;
7
-use Laravel\Lumen\Routing\Controller as BaseController;
5
+ use App\Models\Room;
6
+ use Illuminate\Http\JsonResponse;
7
+ use Laravel\Lumen\Routing\Controller as BaseController;
8 8
 
9 9
 /**
10 10
  * Class RoomsController.
11 11
  */
12
-class RoomsController extends BaseController
13
-{
14
-    /**
12
+ class RoomsController extends BaseController
13
+ {
14
+     /**
15 15
      * Get LeaderBoard Data.
16 16
      *
17 17
      * @TODO: Make Possible Filter with all the Possible Criteria
@@ -22,26 +22,26 @@  discard block
 block discarded – undo
22 22
      *
23 23
      * @return JsonResponse
24 24
      */
25
-    public function getLeader($countryId, $roomRange, $roomInterval): JsonResponse
26
-    {
27
-        $leaderRank = 1;
25
+     public function getLeader($countryId, $roomRange, $roomInterval): JsonResponse
26
+     {
27
+         $leaderRank = 1;
28 28
 
29
-        foreach (($leaderBoard = Room::where('state', '!=', 'invisible')->orderBy('score', 'DESC')->orderBy('users', 'DESC')->limit(50)->get()) as $room) {
30
-            $room->leaderboardRank = $leaderRank++;
31
-        }
29
+         foreach (($leaderBoard = Room::where('state', '!=', 'invisible')->orderBy('score', 'DESC')->orderBy('users', 'DESC')->limit(50)->get()) as $room) {
30
+             $room->leaderboardRank = $leaderRank++;
31
+         }
32 32
 
33
-        return response()->json($leaderBoard, 200, [], JSON_UNESCAPED_SLASHES);
34
-    }
33
+         return response()->json($leaderBoard, 200, [], JSON_UNESCAPED_SLASHES);
34
+     }
35 35
 
36
-    /**
36
+     /**
37 37
      * Get a specific Room Data.
38 38
      *
39 39
      * @param int $roomId
40 40
      *
41 41
      * @return JsonResponse
42 42
      */
43
-    public function getRoom($roomId): JsonResponse
44
-    {
45
-        return response()->json(Room::find($roomId) ?? ['error' => 'not-found'], 200, [], JSON_UNESCAPED_SLASHES);
46
-    }
43
+     public function getRoom($roomId): JsonResponse
44
+     {
45
+         return response()->json(Room::find($roomId) ?? ['error' => 'not-found'], 200, [], JSON_UNESCAPED_SLASHES);
46
+     }
47 47
 }
Please login to merge, or discard this patch.
app/Models/ShopCategory.php 1 patch
Switch Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -1,64 +1,64 @@
 block discarded – undo
1
-<?php
1
+ <?php
2 2
 
3
-namespace App\Models;
3
+ namespace App\Models;
4 4
 
5 5
 /**
6 6
  * Class ShopCategory.
7 7
  */
8
-class ShopCategory extends ChocolateyModel
9
-{
10
-    /**
8
+ class ShopCategory extends ChocolateyModel
9
+ {
10
+     /**
11 11
      * Disable Timestamps.
12 12
      *
13 13
      * @var bool
14 14
      */
15
-    public $timestamps = false;
15
+     public $timestamps = false;
16 16
 
17
-    /**
17
+     /**
18 18
      * The table associated with the model.
19 19
      *
20 20
      * @var string
21 21
      */
22
-    protected $table = 'chocolatey_shop_items_categories';
22
+     protected $table = 'chocolatey_shop_items_categories';
23 23
 
24
-    /**
24
+     /**
25 25
      * Primary Key of the Table.
26 26
      *
27 27
      * @var string
28 28
      */
29
-    protected $primaryKey = 'category_name';
29
+     protected $primaryKey = 'category_name';
30 30
 
31
-    /**
31
+     /**
32 32
      * The Appender(s) of the Model.
33 33
      *
34 34
      * @var array
35 35
      */
36
-    protected $appends = ['category'];
36
+     protected $appends = ['category'];
37 37
 
38
-    /**
38
+     /**
39 39
      * Store an Shop Country.
40 40
      *
41 41
      * @param string $categoryName
42 42
      *
43 43
      * @return ShopCategory
44 44
      */
45
-    public function store(string $categoryName): ShopCategory
46
-    {
47
-        $this->attributes['category_name'] = $categoryName;
48
-        $this->timestamps = false;
45
+     public function store(string $categoryName): ShopCategory
46
+     {
47
+         $this->attributes['category_name'] = $categoryName;
48
+         $this->timestamps = false;
49 49
 
50
-        $this->save();
50
+         $this->save();
51 51
 
52
-        return $this;
53
-    }
52
+         return $this;
53
+     }
54 54
 
55
-    /**
55
+     /**
56 56
      * Get Shop Category Name.
57 57
      *
58 58
      * @return string
59 59
      */
60
-    public function getCategoryAttribute(): string
61
-    {
62
-        return $this->attributes['category_name'];
63
-    }
60
+     public function getCategoryAttribute(): string
61
+     {
62
+         return $this->attributes['category_name'];
63
+     }
64 64
 }
Please login to merge, or discard this patch.
app/Models/Ban.php 1 patch
Switch Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -1,34 +1,34 @@  discard block
 block discarded – undo
1
-<?php
1
+ <?php
2 2
 
3
-namespace App\Models;
3
+ namespace App\Models;
4 4
 
5 5
 /**
6 6
  * Class Ban.
7 7
  */
8
-class Ban extends ChocolateyModel
9
-{
10
-    /**
8
+ class Ban extends ChocolateyModel
9
+ {
10
+     /**
11 11
      * Disable Timestamps.
12 12
      *
13 13
      * @var bool
14 14
      */
15
-    public $timestamps = false;
15
+     public $timestamps = false;
16 16
 
17
-    /**
17
+     /**
18 18
      * The table associated with the model.
19 19
      *
20 20
      * @var string
21 21
      */
22
-    protected $table = 'bans';
22
+     protected $table = 'bans';
23 23
 
24
-    /**
24
+     /**
25 25
      * Primary Key of the Table.
26 26
      *
27 27
      * @var string
28 28
      */
29
-    protected $primaryKey = 'id';
29
+     protected $primaryKey = 'id';
30 30
 
31
-    /**
31
+     /**
32 32
      * Store an User Ban.
33 33
      *
34 34
      * @param int    $userId
@@ -41,30 +41,30 @@  discard block
 block discarded – undo
41 41
      *
42 42
      * @return Ban
43 43
      */
44
-    public function store(int $userId, int $userStaffId, string $banReason, $banType = 'account', $banExpire = 0, $ipAddress = '', $machineId = ''): Ban
45
-    {
46
-        $this->attributes['user_id'] = $userId;
47
-        $this->attributes['user_staff_id'] = $userStaffId;
48
-        $this->attributes['ban_reason'] = $banReason;
49
-        $this->attributes['ban_expire'] = $banExpire;
50
-        $this->attributes['timestamp'] = time();
51
-        $this->attributes['ip'] = $ipAddress;
52
-        $this->attributes['type'] = $banType;
53
-        $this->attributes['machine_id'] = $machineId;
54
-        $this->timestamps = false;
44
+     public function store(int $userId, int $userStaffId, string $banReason, $banType = 'account', $banExpire = 0, $ipAddress = '', $machineId = ''): Ban
45
+     {
46
+         $this->attributes['user_id'] = $userId;
47
+         $this->attributes['user_staff_id'] = $userStaffId;
48
+         $this->attributes['ban_reason'] = $banReason;
49
+         $this->attributes['ban_expire'] = $banExpire;
50
+         $this->attributes['timestamp'] = time();
51
+         $this->attributes['ip'] = $ipAddress;
52
+         $this->attributes['type'] = $banType;
53
+         $this->attributes['machine_id'] = $machineId;
54
+         $this->timestamps = false;
55 55
 
56
-        $this->save();
56
+         $this->save();
57 57
 
58
-        return $this;
59
-    }
58
+         return $this;
59
+     }
60 60
 
61
-    /**
61
+     /**
62 62
      * Get Ban Expire Attribute.
63 63
      *
64 64
      * @return string
65 65
      */
66
-    public function getBanExpireAttribute(): string
67
-    {
68
-        return date('M/d/Y h:m A', $this->attributes['ban_expire']);
69
-    }
66
+     public function getBanExpireAttribute(): string
67
+     {
68
+         return date('M/d/Y h:m A', $this->attributes['ban_expire']);
69
+     }
70 70
 }
Please login to merge, or discard this patch.
app/Models/TrustedDevice.php 1 patch
Switch Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -1,41 +1,41 @@  discard block
 block discarded – undo
1
-<?php
1
+ <?php
2 2
 
3
-namespace App\Models;
3
+ namespace App\Models;
4 4
 
5 5
 /**
6 6
  * Class TrustedDevice.
7 7
  */
8
-class TrustedDevice extends ChocolateyModel
9
-{
10
-    /**
8
+ class TrustedDevice extends ChocolateyModel
9
+ {
10
+     /**
11 11
      * Disable Timestamps.
12 12
      *
13 13
      * @var bool
14 14
      */
15
-    public $timestamps = false;
15
+     public $timestamps = false;
16 16
 
17
-    /**
17
+     /**
18 18
      * The table associated with the model.
19 19
      *
20 20
      * @var string
21 21
      */
22
-    protected $table = 'chocolatey_users_security_trusted';
22
+     protected $table = 'chocolatey_users_security_trusted';
23 23
 
24
-    /**
24
+     /**
25 25
      * Primary Key of the Table.
26 26
      *
27 27
      * @var string
28 28
      */
29
-    protected $primaryKey = 'id';
29
+     protected $primaryKey = 'id';
30 30
 
31
-    /**
31
+     /**
32 32
      * The attributes excluded from the model's JSON form.
33 33
      *
34 34
      * @var array
35 35
      */
36
-    protected $hidden = ['id'];
36
+     protected $hidden = ['id'];
37 37
 
38
-    /**
38
+     /**
39 39
      * Store a new TrustedDevice.
40 40
      *
41 41
      * @param int    $userId
@@ -43,14 +43,14 @@  discard block
 block discarded – undo
43 43
      *
44 44
      * @return TrustedDevice
45 45
      */
46
-    public function store(int $userId, string $ipAddress): TrustedDevice
47
-    {
48
-        $this->attributes['user_id'] = $userId;
49
-        $this->attributes['ip_address'] = $ipAddress;
50
-        $this->timestamps = false;
46
+     public function store(int $userId, string $ipAddress): TrustedDevice
47
+     {
48
+         $this->attributes['user_id'] = $userId;
49
+         $this->attributes['ip_address'] = $ipAddress;
50
+         $this->timestamps = false;
51 51
 
52
-        $this->save();
52
+         $this->save();
53 53
 
54
-        return $this;
55
-    }
54
+         return $this;
55
+     }
56 56
 }
Please login to merge, or discard this patch.