From bbf9fd12aef3b9f84fb39d2adfd42f3f9abdd476 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Fri, 24 Feb 2017 18:23:03 -0500 Subject: [PATCH] Apply fixes from StyleCI (#325) --- app/Http/Controllers/Admin/ServersController.php | 3 ++- app/Http/Middleware/AdminAuthenticate.php | 1 - app/Models/Server.php | 4 ++-- app/Repositories/ServerRepository.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Admin/ServersController.php b/app/Http/Controllers/Admin/ServersController.php index be96d3ea4..6372d042a 100644 --- a/app/Http/Controllers/Admin/ServersController.php +++ b/app/Http/Controllers/Admin/ServersController.php @@ -128,8 +128,9 @@ class ServersController extends Controller public function postNewServerGetNodes(Request $request) { $nodes = Models\Node::with('allocations')->where('location_id', $request->input('location'))->get(); + return $nodes->map(function ($item) { - $filtered = $item->allocations->where('server_id', null)->map(function($map) { + $filtered = $item->allocations->where('server_id', null)->map(function ($map) { return collect($map)->only(['id', 'ip', 'port']); }); diff --git a/app/Http/Middleware/AdminAuthenticate.php b/app/Http/Middleware/AdminAuthenticate.php index ed286d0b9..d533fc49d 100644 --- a/app/Http/Middleware/AdminAuthenticate.php +++ b/app/Http/Middleware/AdminAuthenticate.php @@ -24,7 +24,6 @@ namespace Pterodactyl\Http\Middleware; -use Theme; use Closure; use Illuminate\Contracts\Auth\Guard; diff --git a/app/Models/Server.php b/app/Models/Server.php index 106ae000f..252646ba9 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -29,8 +29,8 @@ use Cache; use Javascript; use Illuminate\Database\Eloquent\Model; use Illuminate\Notifications\Notifiable; -use Nicolaslopezj\Searchable\SearchableTrait; use Illuminate\Database\Eloquent\SoftDeletes; +use Nicolaslopezj\Searchable\SearchableTrait; class Server extends Model { @@ -86,7 +86,7 @@ class Server extends Model 'installed' => 'integer', ]; - protected $searchable = [ + protected $searchable = [ 'columns' => [ 'servers.name' => 10, 'servers.username' => 10, diff --git a/app/Repositories/ServerRepository.php b/app/Repositories/ServerRepository.php index 9d40ecc35..9a2b4eac3 100644 --- a/app/Repositories/ServerRepository.php +++ b/app/Repositories/ServerRepository.php @@ -268,7 +268,7 @@ class ServerRepository // Add Additional Allocations if (isset($data['allocation_additional']) && is_array($data['allocation_additional'])) { - foreach($data['allocation_additional'] as $allocation) { + foreach ($data['allocation_additional'] as $allocation) { $model = Models\Allocation::where('id', $allocation)->where('node_id', $data['node_id'])->whereNull('server_id')->first(); if (! $model) { continue;