Apply fixes from StyleCI (#35)

app/Console/Commands/ExecuteInstallation.php

@@ -15,6 +15,7 @@ public function handle()
     {
         if (\App\Http\Controllers\SetupController::checkTablesExist()) {
             $this->info('You have installed Blessing Skin Server. Nothing to do.');
+
             return;
         }
 

app/Http/Controllers/AdminController.php

@@ -23,6 +23,7 @@ public function chartData()
 
         $xAxis = Collection::times(30, function ($number) use ($today) {
             $time = Carbon::createFromTimestamp($today - (31 - $number) * 86400);
+
             return $time->format('m-d');
         });
 
@@ -57,13 +58,13 @@ public function chartData()
         return [
             'labels' => [
                 trans('admin.index.user-registration'),
-                trans('admin.index.texture-uploads')
+                trans('admin.index.texture-uploads'),
             ],
             'xAxis' => $xAxis,
             'data' => [
                 $xAxis->map($aligning($userRegistration)),
                 $xAxis->map($aligning($textureUploads)),
-            ]
+            ],
         ];
     }
 
@@ -108,7 +109,7 @@ public function customize(Request $request)
 
         return view('admin.customize', [
             'forms' => compact('homepage', 'customJsCss'),
-            'extra' => ['currentSkin' => option('color_scheme')]
+            'extra' => ['currentSkin' => option('color_scheme')],
         ]);
     }
 
@@ -455,7 +456,7 @@ public function userAjaxHandler(Request $request)
             return json(trans('admin.users.operations.score.success'), 0);
         } elseif ($action == 'permission') {
             $user->permission = $this->validate($request, [
-                'permission' => 'required|in:-1,0,1'
+                'permission' => 'required|in:-1,0,1',
             ])['permission'];
             $user->save();
 

app/Http/Controllers/AuthController.php

@@ -75,6 +75,7 @@ public function logout()
     {
         if (Auth::check()) {
             Auth::logout();
+
             return json(trans('auth.logout.success'), 0);
         } else {
             return json(trans('auth.logout.fail'), 1);
@@ -89,7 +90,7 @@ public function register()
                     'player' => (bool) option('register_with_player_name'),
                     'recaptcha' => option('recaptcha_sitekey'),
                     'invisible' => (bool) option('recaptcha_invisible'),
-                ]
+                ],
             ]);
         } else {
             throw new PrettyPageException(trans('auth.register.close'), 7);
@@ -166,7 +167,7 @@ public function forgot()
                 'extra' => [
                     'recaptcha' => option('recaptcha_sitekey'),
                     'invisible' => (bool) option('recaptcha_invisible'),
-                ]
+                ],
             ]);
         } else {
             throw new PrettyPageException(trans('auth.forgot.disabled'), 8);

app/Http/Controllers/MarketController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use Exception;
-use ZipArchive;
 use Illuminate\Support\Arr;
 use Illuminate\Http\Request;
 use App\Services\PluginManager;
@@ -93,6 +92,7 @@ public function download(Request $request, PluginManager $manager, PackageManage
         } catch (Exception $e) {
             return json($e->getMessage(), 1);
         }
+
         return json(trans('admin.plugins.market.install-success'), 0);
     }
 

app/Http/Controllers/PlayerController.php

@@ -58,7 +58,7 @@ public function index()
                 'length' => trans(
                     'user.player.player-name-length',
                     ['min' => option('player_name_length_min'), 'max' => option('player_name_length_max')]
-                )
+                ),
             ]);
     }
 
@@ -186,6 +186,7 @@ public function clearTexture(Request $request)
             }
         }, ['skin', 'cape']);
         $this->player->save();
+
         return json(trans('user.player.clear.success', ['name' => $this->player->name]), 0);
     }
 

app/Http/Controllers/ReportController.php

@@ -14,7 +14,7 @@ public function submit(Request $request)
     {
         $data = $this->validate($request, [
             'tid' => 'required|exists:textures',
-            'reason' => 'required'
+            'reason' => 'required',
         ]);
         $reporter = auth()->user();
 
@@ -71,6 +71,7 @@ public function manage(Request $request)
                             if ($report->informer) {
                                 $report->reporterName = $report->informer->nickname;
                             }
+
                             return $report;
                         });
 
@@ -84,7 +85,7 @@ public function review(Request $request)
     {
         $data = $this->validate($request, [
             'id' => 'required|exists:reports',
-            'action' => ['required', Rule::in(['delete', 'ban', 'reject'])]
+            'action' => ['required', Rule::in(['delete', 'ban', 'reject'])],
         ]);
         $report = Report::find($data['id']);
 
@@ -102,6 +103,7 @@ public function review(Request $request)
             }
             $report->status = Report::REJECTED;
             $report->save();
+
             return json(trans('general.op-success'), 0, ['status' => Report::REJECTED]);
         }
 

app/Http/Controllers/SetupController.php

@@ -32,6 +32,7 @@ public function database(Request $request)
         if ($request->isMethod('get')) {
             try {
                 DB::getPdo();
+
                 return redirect('setup/info');
                 // @codeCoverageIgnoreStart
             } catch (\Exception $e) {

app/Http/Controllers/TextureController.php

@@ -111,6 +111,7 @@ public function avatarByTid($tid, $size = 128)
                         return $responses[0];       // @codeCoverageIgnore
                     } else {
                         $png = Minecraft::generateAvatarFromSkin(Storage::disk('textures')->read($t->hash), $size);
+
                         return Response::png(png($png));
                     }
                 }
@@ -209,6 +210,7 @@ protected function getPlayerInstance($player_name)
     {
         $player = Player::where('name', $player_name)->first();
         abort_if($player->isBanned(), 403, trans('general.player-banned'));
+
         return $player;
     }
 

app/Http/Controllers/UpdateController.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use Log;
 use Exception;
 use Illuminate\Support\Arr;
 use Illuminate\Http\Request;
@@ -32,6 +31,7 @@ public function showUpdatePage()
         ];
         $error = $this->error;
         $extra = ['canUpdate' => $this->canUpdate()];
+
         return view('admin.update', compact('info', 'error', 'extra'));
     }
 
@@ -51,9 +51,11 @@ public function download(Request $request, PackageManager $package)
             case 'download':
                 try {
                     $package->download($this->info['url'], $path)->extract(base_path());
+
                     return json(trans('admin.update.complete'), 0);
                 } catch (Exception $e) {
                     report($e);
+
                     return json($e->getMessage(), 1);
                 }
             case 'progress':
@@ -79,12 +81,14 @@ protected function getUpdateInfo()
                 $this->error = $e->getMessage();
             }
         }
+
         return $this->info;
     }
 
     protected function canUpdate()
     {
         $this->getUpdateInfo();
+
         return Comparator::greaterThan(Arr::get($this->info, 'latest'), $this->currentVersion);
     }
 }

app/Http/Controllers/UserController.php

@@ -158,6 +158,7 @@ public function sendVerificationEmail()
     public function profile()
     {
         $user = Auth::user();
+
         return view('user.profile')
             ->with('extra', [
                 'unverified' => option('require_verification') && ! $user->verified,
@@ -282,6 +283,7 @@ public function setAvatar(Request $request)
         if ($tid == 0) {
             $user->avatar = 0;
             $user->save();
+
             return json(trans('user.profile.avatar.success'), 0);
         }
 
@@ -293,6 +295,7 @@ public function setAvatar(Request $request)
 
             $user->avatar = $tid;
             $user->save();
+
             return json(trans('user.profile.avatar.success'), 0);
         } else {
             return json(trans('skinlib.non-existent'), 1);

app/Http/Middleware/CheckAdministrator.php

@@ -7,6 +7,7 @@ class CheckAdministrator
     public function handle($request, \Closure $next)
     {
         abort_unless(auth()->user()->isAdmin(), 403, trans('auth.check.admin'));
+
         return $next($request);
     }
 }

app/Http/Middleware/CheckSuperAdmin.php

@@ -10,6 +10,7 @@ class CheckSuperAdmin
     public function handle($request, Closure $next)
     {
         abort_if(auth()->user()->permission != User::SUPER_ADMIN, 403, trans('auth.check.super-admin'));
+
         return $next($request);
     }
 }

app/Http/Middleware/CheckUserVerified.php

@@ -7,6 +7,7 @@ class CheckUserVerified
     public function handle($request, \Closure $next)
     {
         abort_if(option('require_verification') && ! auth()->user()->verified, 403, trans('auth.check.verified'));
+
         return $next($request);
     }
 }

app/Listeners/CacheAvatarPreview.php

@@ -17,6 +17,7 @@ public function handle(GetAvatarPreview $event)
 
         $content = Cache::rememberForever($key, function () use ($texture, $size) {
             $res = Storage::disk('textures')->read($texture->hash);
+
             return png(Minecraft::generateAvatarFromSkin($res, $size));
         });
 

app/Listeners/CachePlayerExists.php

@@ -3,7 +3,6 @@
 namespace App\Listeners;
 
 use Cache;
-use Storage;
 use App\Events;
 use App\Models\Player;
 use Illuminate\Events\Dispatcher;
@@ -25,6 +24,7 @@ public function remember(Events\CheckPlayerExists $event)
 
             if (! $player) {
                 Cache::forever($key, '1');
+
                 return false;
             } else {
                 return true;

app/Listeners/CachePlayerJson.php

@@ -3,7 +3,6 @@
 namespace App\Listeners;
 
 use Cache;
-use Storage;
 use App\Models\Player;
 use App\Events\GetPlayerJson;
 use App\Events\PlayerProfileUpdated;

app/Listeners/CacheSkinPreview.php

@@ -27,7 +27,7 @@ public function handle(\App\Events\GetSkinPreview $event)
         });
 
         return response()->png($content, 200, [
-            'Last-Modified' => Storage::disk('textures')->lastModified($texture->hash)
+            'Last-Modified' => Storage::disk('textures')->lastModified($texture->hash),
         ]);
     }
 }

app/Models/Report.php

@@ -9,7 +9,7 @@ class Report extends Model
     public const CREATED_AT = 'report_at';
     public const UPDATED_AT = null;
 
-    public const PENDING  = 0;
+    public const PENDING = 0;
     public const RESOLVED = 1;
     public const REJECTED = 2;
 

app/Models/User.php

@@ -68,6 +68,7 @@ public function closet()
     public function getPlayerNameAttribute()
     {
         $player = $this->players->first();
+
         return $player ? $player->name : '';
     }
 

app/Rules/Captcha.php

@@ -22,10 +22,11 @@ public function passes($attribute, $value)
                     'form_params' => [
                         'secret' => $secretkey,
                         'response' => $value,
-                    ]
+                    ],
                 ]);
                 if ($response->getStatusCode() == 200) {
                     $body = json_decode((string) $response->getBody());
+
                     return $body->success;
                 }
             } catch (\GuzzleHttp\Exception\RequestException $e) {

app/Services/PackageManager.php

@@ -28,7 +28,7 @@ public function download($url, $path, $shasum = null)
         try {
             $this->guzzle->request('GET', $url, [
                 'sink' => $path,
-                'progress' => $this->onProgress
+                'progress' => $this->onProgress,
             ]);
         } catch (Exception $e) {
             throw new Exception(trans('admin.download.errors.download', ['error' => $e->getMessage()]));

app/Services/Plugin.php

@@ -71,17 +71,11 @@ public function __construct($path, $packageInfo)
         $this->packageInfo = $packageInfo;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function __get($name)
     {
         return $this->packageInfoAttribute(snake_case($name, '-'));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function __isset($name)
     {
         return isset($this->{$name}) || $this->packageInfoAttribute(snake_case($name, '-'));

app/Services/PluginManager.php

@@ -4,7 +4,6 @@
 
 use Storage;
 use App\Events;
-use App\Services\Option;
 use Composer\Semver\Semver;
 use Illuminate\Support\Arr;
 use Composer\Semver\Comparator;

app/helpers.php

@@ -3,7 +3,6 @@
 use Carbon\Carbon;
 use App\Models\User;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Str;
 
 if (! function_exists('webpack_assets')) {
     function webpack_assets($relativeUri)
@@ -13,6 +12,7 @@ function webpack_assets($relativeUri)
         } else {
             $path = app('webpack')->$relativeUri;
             $cdn = option('cdn_address');
+
             return $cdn ? "$cdn/app/$path" : url("/app/$path");
         }
     }
@@ -192,6 +192,7 @@ function option($key = null, $default = null, $raw = false)
 
         if (is_array($key)) {
             $options->set($key);
+
             return;
         }
 
@@ -360,6 +361,7 @@ function png($resource)
         $image = ob_get_contents();
         ob_end_clean();
         imagedestroy($resource);
+
         return $image;
     }
 }