Skip to content

Commit b11029a

Browse files
authored
Apply fixes from StyleCI (pterodactyl#312)
* Bump for release * Apply fixes from StyleCI
1 parent ed4068b commit b11029a

File tree

8 files changed

+8
-11
lines changed

8 files changed

+8
-11
lines changed

app/Http/Controllers/Base/APIController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ public function revoke(Request $request, $key)
8080
return response('', 204);
8181
} catch (\Exception $ex) {
8282
Log::error($ex);
83+
8384
return response()->json([
8485
'error' => 'An error occured while attempting to remove this key.',
8586
], 503);

app/Policies/ServerPolicy.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131

3232
class ServerPolicy
3333
{
34-
3534
/**
3635
* Create a new policy instance.
3736
*
@@ -62,7 +61,7 @@ private function checkPermission(User $user, Server $server, $permission)
6261
})->values();
6362
});
6463

65-
return ($permissions->search($permission, true) !== false);
64+
return $permissions->search($permission, true) !== false;
6665
}
6766

6867
/**

app/Repositories/APIRepository.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ public function revoke($key)
225225

226226
try {
227227
$model = Models\APIKey::with('permissions')->where('public', $key)->where('user_id', $this->user->id)->firstOrFail();
228-
foreach($model->permissions as &$permission) {
228+
foreach ($model->permissions as &$permission) {
229229
$permission->delete();
230230
}
231231

app/Repositories/Daemon/CommandRepository.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
namespace Pterodactyl\Repositories\Daemon;
2626

27-
use GuzzleHttp\Client;
2827
use Pterodactyl\Models;
2928
use GuzzleHttp\Exception\RequestException;
3029
use Pterodactyl\Exceptions\DisplayException;

app/Repositories/Daemon/PowerRepository.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
namespace Pterodactyl\Repositories\Daemon;
2626

27-
use GuzzleHttp\Client;
2827
use Pterodactyl\Models;
2928
use Pterodactyl\Exceptions\DisplayException;
3029

app/Repositories/ServerRepository.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -791,8 +791,8 @@ public function deleteNow($id, $force = false)
791791
Models\ServerVariable::where('server_id', $server->id)->delete();
792792

793793
// Remove SubUsers
794-
foreach(Models\Subuser::with('permissions')->where('server_id', $server->id)->get() as &$subuser) {
795-
foreach($subuser->permissions as &$permission) {
794+
foreach (Models\Subuser::with('permissions')->where('server_id', $server->id)->get() as &$subuser) {
795+
foreach ($subuser->permissions as &$permission) {
796796
$permission->delete();
797797
}
798798
$subuser->delete();

app/Repositories/UserRepository.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
use Pterodactyl\Models;
3535
use Pterodactyl\Services\UuidService;
3636
use Pterodactyl\Exceptions\DisplayException;
37-
use Pterodactyl\Notifications\AccountCreated;
3837
use Pterodactyl\Exceptions\DisplayValidationException;
3938

4039
class UserRepository
@@ -177,8 +176,8 @@ public function delete($id)
177176
DB::beginTransaction();
178177

179178
try {
180-
foreach(Models\Subuser::with('permissions')->where('user_id', $id)->get() as &$subuser) {
181-
foreach($subuser->permissions as &$permission) {
179+
foreach (Models\Subuser::with('permissions')->where('user_id', $id)->get() as &$subuser) {
180+
foreach ($subuser->permissions as &$permission) {
182181
$permission->delete();
183182
}
184183

config/app.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
'env' => env('APP_ENV', 'production'),
66

7-
'version' => env('APP_VERSION', 'canary'),
7+
'version' => env('APP_VERSION', '0.6.0-pre.4'),
88

99
'phrase_in_context' => env('PHRASE_IN_CONTEXT', false),
1010

0 commit comments

Comments
 (0)