Apply fixes from StyleCI (pterodactyl#294)

DaneEveritt · web-flow · commit 7c916ad38f04 · 2017-02-12T15:10:39.000-05:00
diff --git a/app/Http/Controllers/API/LocationController.php b/app/Http/Controllers/API/LocationController.php
@@ -24,7 +24,6 @@
 
 namespace Pterodactyl\Http\Controllers\API;
 
-use DB;
 use Illuminate\Http\Request;
 use Pterodactyl\Models\Location;
 
diff --git a/app/Http/Controllers/API/NodeController.php b/app/Http/Controllers/API/NodeController.php
@@ -138,7 +138,7 @@ public function view(Request $request, $id, $fields = null)
 
         $node->allocations->transform(function ($item) {
             return collect($item)->only([
-                'id', 'ip', 'ip_alias', 'port', 'server_id'
+                'id', 'ip', 'ip_alias', 'port', 'server_id',
             ]);
         });
 
diff --git a/app/Http/Controllers/API/User/InfoController.php b/app/Http/Controllers/API/User/InfoController.php
@@ -24,7 +24,6 @@
 
 namespace Pterodactyl\Http\Controllers\API\User;
 
-use Pterodactyl\Models;
 use Illuminate\Http\Request;
 use Pterodactyl\Http\Controllers\API\BaseController;
 
diff --git a/app/Http/Controllers/API/UserController.php b/app/Http/Controllers/API/UserController.php
@@ -31,7 +31,6 @@
 use Pterodactyl\Repositories\UserRepository;
 use Pterodactyl\Exceptions\DisplayValidationException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException;
 
 /**
diff --git a/app/Http/Controllers/Admin/DatabaseController.php b/app/Http/Controllers/Admin/DatabaseController.php
@@ -24,7 +24,6 @@
 
 namespace Pterodactyl\Http\Controllers\Admin;
 
-use DB;
 use Log;
 use Alert;
 use Pterodactyl\Models;
diff --git a/app/Http/Controllers/Admin/LocationsController.php b/app/Http/Controllers/Admin/LocationsController.php
@@ -24,7 +24,6 @@
 
 namespace Pterodactyl\Http\Controllers\Admin;
 
-use DB;
 use Alert;
 use Pterodactyl\Models;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Admin/PackController.php b/app/Http/Controllers/Admin/PackController.php
@@ -24,7 +24,6 @@
 
 namespace Pterodactyl\Http\Controllers\Admin;
 
-use DB;
 use Log;
 use Alert;
 use Storage;
@@ -50,7 +49,7 @@ public function listAll(Request $request)
     public function listByOption(Request $request, $id)
     {
         return view('admin.services.packs.byoption', [
-            'option' => Models\ServiceOptions::with('service', 'packs')->findOrFail($id)
+            'option' => Models\ServiceOptions::with('service', 'packs')->findOrFail($id),
         ]);
     }
 
diff --git a/app/Http/Controllers/Admin/ServersController.php b/app/Http/Controllers/Admin/ServersController.php
@@ -24,7 +24,6 @@
 
 namespace Pterodactyl\Http\Controllers\Admin;
 
-use DB;
 use Log;
 use Alert;
 use Pterodactyl\Models;
@@ -62,7 +61,6 @@ public function getNew(Request $request)
 
     public function getView(Request $request, $id)
     {
-
         $server = Models\Server::withTrashed()->with(
             'user', 'option.variables', 'variables',
             'node.allocations', 'databases.host'
diff --git a/app/Http/Controllers/Admin/ServiceController.php b/app/Http/Controllers/Admin/ServiceController.php
@@ -24,7 +24,6 @@
 
 namespace Pterodactyl\Http\Controllers\Admin;
 
-use DB;
 use Log;
 use Alert;
 use Storage;
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
@@ -29,7 +29,6 @@
 use Alert;
 use Illuminate\Http\Request;
 use Pterodactyl\Models\User;
-use Pterodactyl\Models\Server;
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Repositories\UserRepository;
diff --git a/app/Http/Controllers/Base/IndexController.php b/app/Http/Controllers/Base/IndexController.php
@@ -26,7 +26,6 @@
 namespace Pterodactyl\Http\Controllers\Base;
 
 use Illuminate\Http\Request;
-use Pterodactyl\Models\Server;
 use Pterodactyl\Http\Controllers\Controller;
 
 class IndexController extends Controller
diff --git a/app/Http/Controllers/Server/SubuserController.php b/app/Http/Controllers/Server/SubuserController.php
@@ -24,7 +24,6 @@
 
 namespace Pterodactyl\Http\Controllers\Server;
 
-use DB;
 use Log;
 use Auth;
 use Alert;
diff --git a/app/Models/Allocation.php b/app/Models/Allocation.php
@@ -68,10 +68,10 @@ public function getAliasAttribute($value)
       * Accessor to quickly determine if this allocation has an alias.
       *
       * @param  null|string $value
-      * @return boolean
+      * @return bool
       */
      public function getHasAliasAttribute($value)
      {
-         return (! is_null($this->ip_alias));
+         return ! is_null($this->ip_alias);
      }
 }
diff --git a/app/Models/Permission.php b/app/Models/Permission.php
@@ -28,11 +28,10 @@
 
 class Permission extends Model
 {
-
     /**
      * Should timestamps be used on this model.
      *
-     * @var boolean
+     * @var bool
      */
     public $timestamps = false;
 
diff --git a/app/Models/ServiceVariables.php b/app/Models/ServiceVariables.php
@@ -54,8 +54,8 @@ class ServiceVariables extends Model
          'required' => 'integer',
      ];
 
-     public function serverVariables()
-     {
-         return $this->hasMany(ServerVariables::class, 'variable_id');
-     }
+    public function serverVariables()
+    {
+        return $this->hasMany(ServerVariables::class, 'variable_id');
+    }
 }
diff --git a/app/Models/Subuser.php b/app/Models/Subuser.php
@@ -24,7 +24,6 @@
 
 namespace Pterodactyl\Models;
 
-use Auth;
 use Illuminate\Database\Eloquent\Model;
 
 class Subuser extends Model
@@ -50,11 +49,11 @@ class Subuser extends Model
      */
     protected $guarded = ['id', 'created_at', 'updated_at'];
 
-     /**
-      * Cast values to correct type.
-      *
-      * @var array
-      */
+    /**
+     * Cast values to correct type.
+     *
+     * @var array
+     */
     protected $casts = [
         'user_id' => 'integer',
         'server_id' => 'integer',
diff --git a/app/Repositories/ServiceRepository/Pack.php b/app/Repositories/ServiceRepository/Pack.php
@@ -177,8 +177,6 @@ public function update($id, array $data)
             'selectable' => isset($data['selectable']),
             'visible' => isset($data['visible']),
         ]);
-
-        return;
     }
 
     public function delete($id)
diff --git a/app/Repositories/ServiceRepository/Variable.php b/app/Repositories/ServiceRepository/Variable.php
@@ -80,7 +80,7 @@ public function delete($id)
 
         DB::beginTransaction();
         try {
-            foreach($variable->serverVariables as $svar) {
+            foreach ($variable->serverVariables as $svar) {
                 $svar->delete();
             }
             $variable->delete();
diff --git a/app/Repositories/SubuserRepository.php b/app/Repositories/SubuserRepository.php
@@ -25,8 +25,6 @@
 namespace Pterodactyl\Repositories;
 
 use DB;
-use Mail;
-use Settings;
 use Validator;
 use Pterodactyl\Models;
 use Pterodactyl\Services\UuidService;
@@ -229,7 +227,7 @@ public function delete($id)
                 ],
             ]);
 
-            foreach($subuser->permissions as &$permission) {
+            foreach ($subuser->permissions as &$permission) {
                 $permission->delete();
             }
             $subuser->delete();
@@ -273,7 +271,7 @@ public function update($id, array $data)
         DB::beginTransaction();
 
         try {
-            foreach($subuser->permissions as &$permission) {
+            foreach ($subuser->permissions as &$permission) {
                 $permission->delete();
             }
 
diff --git a/app/Services/NotificationService.php b/app/Services/NotificationService.php
@@ -24,7 +24,6 @@
 
 namespace Pterodactyl\Services;
 
-use Pterodactyl\Models\User;
 use Pterodactyl\Models\Server;
 use Pterodactyl\Notifications\Daemon;
 
diff --git a/database/migrations/2017_02_09_174834_SetupPermissionsPivotTable.php b/database/migrations/2017_02_09_174834_SetupPermissionsPivotTable.php
@@ -1,10 +1,10 @@
 <?php
 
+use Pterodactyl\Models\Subuser;
+use Pterodactyl\Models\Permission;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
-use Pterodactyl\Models\Subuser;
-use Pterodactyl\Models\Permission;
 
 class SetupPermissionsPivotTable extends Migration
 {
@@ -20,7 +20,7 @@ public function up()
         });
 
         DB::transaction(function () {
-            foreach(Subuser::all() as &$subuser) {
+            foreach (Subuser::all() as &$subuser) {
                 Permission::where('user_id', $subuser->user_id)->where('server_id', $subuser->server_id)->update([
                     'subuser_id' => $subuser->id,
                 ]);
@@ -55,7 +55,7 @@ public function down()
         });
 
         DB::transaction(function () {
-            foreach(Subuser::all() as &$subuser) {
+            foreach (Subuser::all() as &$subuser) {
                 Permission::where('subuser_id', $subuser->id)->update([
                     'user_id' => $subuser->user_id,
                     'server_id' => $subuser->server_id,

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@`
`24`	`24`
`25`	`25`	`namespace Pterodactyl\Http\Controllers\Admin;`
`26`	`26`
`27`		`-use DB;`
`28`	`27`	`use Log;`
`29`	`28`	`use Alert;`
`30`	`29`	`use Storage;`
`@@ -50,7 +49,7 @@ public function listAll(Request $request)`
`50`	`49`	`public function listByOption(Request $request, $id)`
`51`	`50`	`{`
`52`	`51`	`return view('admin.services.packs.byoption', [`
`53`		`- 'option' => Models\ServiceOptions::with('service', 'packs')->findOrFail($id)`
	`52`	`+ 'option' => Models\ServiceOptions::with('service', 'packs')->findOrFail($id),`
`54`	`53`	`]);`
`55`	`54`	`}`
`56`	`55`