Apply fixes from StyleCI (#501)
This commit is contained in:
parent
0111ca7768
commit
ce2b2447d0
10 changed files with 19 additions and 19 deletions
|
@ -24,9 +24,9 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Extensions;
|
namespace Pterodactyl\Extensions;
|
||||||
|
|
||||||
use Illuminate\Config\Repository as ConfigRepository;
|
|
||||||
use Illuminate\Contracts\Encryption\Encrypter;
|
|
||||||
use Pterodactyl\Models\DatabaseHost;
|
use Pterodactyl\Models\DatabaseHost;
|
||||||
|
use Illuminate\Contracts\Encryption\Encrypter;
|
||||||
|
use Illuminate\Config\Repository as ConfigRepository;
|
||||||
|
|
||||||
class DynamicDatabaseConnection
|
class DynamicDatabaseConnection
|
||||||
{
|
{
|
||||||
|
|
|
@ -27,8 +27,8 @@ namespace Pterodactyl\Http\Controllers\Admin;
|
||||||
use Pterodactyl\Models\Location;
|
use Pterodactyl\Models\Location;
|
||||||
use Prologue\Alerts\AlertsMessageBag;
|
use Prologue\Alerts\AlertsMessageBag;
|
||||||
use Pterodactyl\Services\LocationService;
|
use Pterodactyl\Services\LocationService;
|
||||||
use Pterodactyl\Http\Controllers\Controller;
|
|
||||||
use Pterodactyl\Exceptions\DisplayException;
|
use Pterodactyl\Exceptions\DisplayException;
|
||||||
|
use Pterodactyl\Http\Controllers\Controller;
|
||||||
use Pterodactyl\Http\Requests\Admin\LocationRequest;
|
use Pterodactyl\Http\Requests\Admin\LocationRequest;
|
||||||
|
|
||||||
class LocationController extends Controller
|
class LocationController extends Controller
|
||||||
|
|
|
@ -29,7 +29,6 @@ use Alert;
|
||||||
use Route;
|
use Route;
|
||||||
use Javascript;
|
use Javascript;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Pterodactyl\Http\Requests\Admin\Service\EditOptionScript;
|
|
||||||
use Pterodactyl\Models\Service;
|
use Pterodactyl\Models\Service;
|
||||||
use Pterodactyl\Models\ServiceOption;
|
use Pterodactyl\Models\ServiceOption;
|
||||||
use Pterodactyl\Exceptions\DisplayException;
|
use Pterodactyl\Exceptions\DisplayException;
|
||||||
|
@ -37,6 +36,7 @@ use Pterodactyl\Http\Controllers\Controller;
|
||||||
use Pterodactyl\Repositories\OptionRepository;
|
use Pterodactyl\Repositories\OptionRepository;
|
||||||
use Pterodactyl\Repositories\VariableRepository;
|
use Pterodactyl\Repositories\VariableRepository;
|
||||||
use Pterodactyl\Exceptions\DisplayValidationException;
|
use Pterodactyl\Exceptions\DisplayValidationException;
|
||||||
|
use Pterodactyl\Http\Requests\Admin\Service\EditOptionScript;
|
||||||
use Pterodactyl\Http\Requests\Admin\Service\StoreOptionVariable;
|
use Pterodactyl\Http\Requests\Admin\Service\StoreOptionVariable;
|
||||||
|
|
||||||
class OptionController extends Controller
|
class OptionController extends Controller
|
||||||
|
|
|
@ -24,8 +24,8 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Models;
|
namespace Pterodactyl\Models;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
|
||||||
use Watson\Validating\ValidatingTrait;
|
use Watson\Validating\ValidatingTrait;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
class Location extends Model
|
class Location extends Model
|
||||||
{
|
{
|
||||||
|
|
|
@ -2,9 +2,9 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Providers;
|
namespace Pterodactyl\Providers;
|
||||||
|
|
||||||
|
use Pterodactyl\Models\User;
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
|
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
|
||||||
use Pterodactyl\Models\User;
|
|
||||||
|
|
||||||
class RouteServiceProvider extends ServiceProvider
|
class RouteServiceProvider extends ServiceProvider
|
||||||
{
|
{
|
||||||
|
|
|
@ -26,8 +26,8 @@ namespace Pterodactyl\Repositories;
|
||||||
|
|
||||||
use Illuminate\Container\Container;
|
use Illuminate\Container\Container;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Pterodactyl\Contracts\Repositories\RepositoryInterface;
|
|
||||||
use Pterodactyl\Exceptions\Repository\RepositoryException;
|
use Pterodactyl\Exceptions\Repository\RepositoryException;
|
||||||
|
use Pterodactyl\Contracts\Repositories\RepositoryInterface;
|
||||||
|
|
||||||
abstract class Repository implements RepositoryInterface
|
abstract class Repository implements RepositoryInterface
|
||||||
{
|
{
|
||||||
|
|
|
@ -24,14 +24,14 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Services;
|
namespace Pterodactyl\Services;
|
||||||
|
|
||||||
use Illuminate\Config\Repository as ConfigRepository;
|
use Pterodactyl\Models\User;
|
||||||
|
use Illuminate\Database\Connection;
|
||||||
use Illuminate\Contracts\Auth\Guard;
|
use Illuminate\Contracts\Auth\Guard;
|
||||||
use Illuminate\Contracts\Hashing\Hasher;
|
use Illuminate\Contracts\Hashing\Hasher;
|
||||||
use Illuminate\Database\Connection;
|
|
||||||
use Pterodactyl\Exceptions\DisplayException;
|
use Pterodactyl\Exceptions\DisplayException;
|
||||||
use Pterodactyl\Models\User;
|
|
||||||
use Pterodactyl\Notifications\AccountCreated;
|
use Pterodactyl\Notifications\AccountCreated;
|
||||||
use Pterodactyl\Services\Components\UuidService;
|
use Pterodactyl\Services\Components\UuidService;
|
||||||
|
use Illuminate\Config\Repository as ConfigRepository;
|
||||||
|
|
||||||
class UserService
|
class UserService
|
||||||
{
|
{
|
||||||
|
|
|
@ -13,7 +13,7 @@ trait CreatesApplication
|
||||||
*/
|
*/
|
||||||
public function createApplication()
|
public function createApplication()
|
||||||
{
|
{
|
||||||
$app = require __DIR__.'/../bootstrap/app.php';
|
$app = require __DIR__ . '/../bootstrap/app.php';
|
||||||
|
|
||||||
$app->make(Kernel::class)->bootstrap();
|
$app->make(Kernel::class)->bootstrap();
|
||||||
|
|
||||||
|
|
|
@ -24,12 +24,12 @@
|
||||||
|
|
||||||
namespace Tests\Feature\Services;
|
namespace Tests\Feature\Services;
|
||||||
|
|
||||||
use Illuminate\Validation\ValidationException;
|
|
||||||
use Pterodactyl\Exceptions\DisplayException;
|
|
||||||
use Pterodactyl\Models\Node;
|
|
||||||
use Tests\TestCase;
|
use Tests\TestCase;
|
||||||
|
use Pterodactyl\Models\Node;
|
||||||
use Pterodactyl\Models\Location;
|
use Pterodactyl\Models\Location;
|
||||||
use Pterodactyl\Services\LocationService;
|
use Pterodactyl\Services\LocationService;
|
||||||
|
use Pterodactyl\Exceptions\DisplayException;
|
||||||
|
use Illuminate\Validation\ValidationException;
|
||||||
|
|
||||||
class LocationServiceTest extends TestCase
|
class LocationServiceTest extends TestCase
|
||||||
{
|
{
|
||||||
|
@ -65,7 +65,7 @@ class LocationServiceTest extends TestCase
|
||||||
$this->assertEquals($data['short'], $response->short);
|
$this->assertEquals($data['short'], $response->short);
|
||||||
$this->assertDatabaseHas('locations', [
|
$this->assertDatabaseHas('locations', [
|
||||||
'short' => $data['short'],
|
'short' => $data['short'],
|
||||||
'long' => $data['long']
|
'long' => $data['long'],
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,11 +24,11 @@
|
||||||
|
|
||||||
namespace Tests\Feature\Services;
|
namespace Tests\Feature\Services;
|
||||||
|
|
||||||
use Illuminate\Support\Facades\Notification;
|
|
||||||
use Pterodactyl\Models\User;
|
|
||||||
use Pterodactyl\Notifications\AccountCreated;
|
|
||||||
use Pterodactyl\Services\UserService;
|
|
||||||
use Tests\TestCase;
|
use Tests\TestCase;
|
||||||
|
use Pterodactyl\Models\User;
|
||||||
|
use Pterodactyl\Services\UserService;
|
||||||
|
use Illuminate\Support\Facades\Notification;
|
||||||
|
use Pterodactyl\Notifications\AccountCreated;
|
||||||
|
|
||||||
class UserServiceTest extends TestCase
|
class UserServiceTest extends TestCase
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue