Apply fixes from StyleCI
This commit is contained in:
parent
54554465f2
commit
8f14ee989d
12 changed files with 59 additions and 59 deletions
|
@ -24,15 +24,15 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Http\Controllers\Server\Files;
|
namespace Pterodactyl\Http\Controllers\Server\Files;
|
||||||
|
|
||||||
use GuzzleHttp\Exception\RequestException;
|
|
||||||
use Illuminate\Contracts\Session\Session;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Illuminate\Log\Writer;
|
use Illuminate\Log\Writer;
|
||||||
use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Contracts\Session\Session;
|
||||||
|
use GuzzleHttp\Exception\RequestException;
|
||||||
use Pterodactyl\Exceptions\DisplayException;
|
use Pterodactyl\Exceptions\DisplayException;
|
||||||
use Pterodactyl\Http\Controllers\Controller;
|
use Pterodactyl\Http\Controllers\Controller;
|
||||||
use Pterodactyl\Http\Requests\Server\UpdateFileContentsFormRequest;
|
|
||||||
use Pterodactyl\Traits\Controllers\JavascriptInjection;
|
use Pterodactyl\Traits\Controllers\JavascriptInjection;
|
||||||
|
use Pterodactyl\Http\Requests\Server\UpdateFileContentsFormRequest;
|
||||||
|
use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
|
||||||
|
|
||||||
class FileActionsController extends Controller
|
class FileActionsController extends Controller
|
||||||
{
|
{
|
||||||
|
|
|
@ -24,13 +24,13 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Http\Controllers\Server\Files;
|
namespace Pterodactyl\Http\Controllers\Server\Files;
|
||||||
|
|
||||||
use GuzzleHttp\Exception\RequestException;
|
|
||||||
use Illuminate\Contracts\Config\Repository as ConfigRepository;
|
|
||||||
use Illuminate\Contracts\Session\Session;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Illuminate\Log\Writer;
|
use Illuminate\Log\Writer;
|
||||||
use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Contracts\Session\Session;
|
||||||
|
use GuzzleHttp\Exception\RequestException;
|
||||||
use Pterodactyl\Http\Controllers\Controller;
|
use Pterodactyl\Http\Controllers\Controller;
|
||||||
|
use Illuminate\Contracts\Config\Repository as ConfigRepository;
|
||||||
|
use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
|
||||||
|
|
||||||
class RemoteRequestController extends Controller
|
class RemoteRequestController extends Controller
|
||||||
{
|
{
|
||||||
|
|
|
@ -25,12 +25,12 @@
|
||||||
namespace Pterodactyl\Http\Middleware;
|
namespace Pterodactyl\Http\Middleware;
|
||||||
|
|
||||||
use Closure;
|
use Closure;
|
||||||
use Illuminate\Contracts\Session\Session;
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
|
|
||||||
use Pterodactyl\Models\Server;
|
use Pterodactyl\Models\Server;
|
||||||
use Illuminate\Contracts\Config\Repository as ConfigRepository;
|
use Illuminate\Contracts\Session\Session;
|
||||||
use Illuminate\Auth\AuthenticationException;
|
use Illuminate\Auth\AuthenticationException;
|
||||||
|
use Illuminate\Contracts\Config\Repository as ConfigRepository;
|
||||||
|
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
|
||||||
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||||
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
|
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
|
||||||
|
|
||||||
|
|
|
@ -25,11 +25,11 @@
|
||||||
namespace Pterodactyl\Http\Middleware;
|
namespace Pterodactyl\Http\Middleware;
|
||||||
|
|
||||||
use Closure;
|
use Closure;
|
||||||
use Illuminate\Auth\AuthenticationException;
|
|
||||||
use Illuminate\Contracts\Session\Session;
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Pterodactyl\Exceptions\Service\Server\UserNotLinkedToServerException;
|
use Illuminate\Contracts\Session\Session;
|
||||||
|
use Illuminate\Auth\AuthenticationException;
|
||||||
use Pterodactyl\Services\Servers\ServerAccessHelperService;
|
use Pterodactyl\Services\Servers\ServerAccessHelperService;
|
||||||
|
use Pterodactyl\Exceptions\Service\Server\UserNotLinkedToServerException;
|
||||||
|
|
||||||
class SubuserAccessAuthenticate
|
class SubuserAccessAuthenticate
|
||||||
{
|
{
|
||||||
|
|
|
@ -24,15 +24,15 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Http\Requests\Server;
|
namespace Pterodactyl\Http\Requests\Server;
|
||||||
|
|
||||||
|
use Illuminate\Log\Writer;
|
||||||
|
use Illuminate\Contracts\Session\Session;
|
||||||
use GuzzleHttp\Exception\RequestException;
|
use GuzzleHttp\Exception\RequestException;
|
||||||
use Illuminate\Contracts\Config\Repository;
|
use Illuminate\Contracts\Config\Repository;
|
||||||
use Illuminate\Contracts\Session\Session;
|
|
||||||
use Illuminate\Log\Writer;
|
|
||||||
use Pterodactyl\Exceptions\DisplayException;
|
use Pterodactyl\Exceptions\DisplayException;
|
||||||
use Pterodactyl\Exceptions\Http\Server\FileSizeTooLargeException;
|
|
||||||
use Pterodactyl\Exceptions\Http\Server\FileTypeNotEditableException;
|
|
||||||
use Pterodactyl\Http\Requests\FrontendUserFormRequest;
|
use Pterodactyl\Http\Requests\FrontendUserFormRequest;
|
||||||
|
use Pterodactyl\Exceptions\Http\Server\FileSizeTooLargeException;
|
||||||
use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
|
use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
|
||||||
|
use Pterodactyl\Exceptions\Http\Server\FileTypeNotEditableException;
|
||||||
|
|
||||||
class UpdateFileContentsFormRequest extends FrontendUserFormRequest
|
class UpdateFileContentsFormRequest extends FrontendUserFormRequest
|
||||||
{
|
{
|
||||||
|
|
|
@ -24,13 +24,13 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Services\Servers;
|
namespace Pterodactyl\Services\Servers;
|
||||||
|
|
||||||
use Pterodactyl\Exceptions\Service\Server\UserNotLinkedToServerException;
|
|
||||||
use Pterodactyl\Models\Server;
|
|
||||||
use Pterodactyl\Models\User;
|
use Pterodactyl\Models\User;
|
||||||
|
use Pterodactyl\Models\Server;
|
||||||
use Illuminate\Cache\Repository as CacheRepository;
|
use Illuminate\Cache\Repository as CacheRepository;
|
||||||
use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
|
use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
|
||||||
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
|
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
|
||||||
use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
|
use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
|
||||||
|
use Pterodactyl\Exceptions\Service\Server\UserNotLinkedToServerException;
|
||||||
|
|
||||||
class ServerAccessHelperService
|
class ServerAccessHelperService
|
||||||
{
|
{
|
||||||
|
|
|
@ -24,10 +24,10 @@
|
||||||
|
|
||||||
namespace Tests\Assertions;
|
namespace Tests\Assertions;
|
||||||
|
|
||||||
use Illuminate\Http\JsonResponse;
|
|
||||||
use Illuminate\Http\Response;
|
|
||||||
use Illuminate\View\View;
|
use Illuminate\View\View;
|
||||||
|
use Illuminate\Http\Response;
|
||||||
use PHPUnit_Framework_Assert;
|
use PHPUnit_Framework_Assert;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Http\RedirectResponse;
|
use Illuminate\Http\RedirectResponse;
|
||||||
|
|
||||||
trait ControllerAssertionsTrait
|
trait ControllerAssertionsTrait
|
||||||
|
|
|
@ -24,16 +24,16 @@
|
||||||
|
|
||||||
namespace Tests\Unit\Http\Controllers\Base;
|
namespace Tests\Unit\Http\Controllers\Base;
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Mockery as m;
|
use Mockery as m;
|
||||||
use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
|
|
||||||
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
|
|
||||||
use Pterodactyl\Http\Controllers\Base\IndexController;
|
|
||||||
use Pterodactyl\Models\Server;
|
|
||||||
use Pterodactyl\Models\User;
|
|
||||||
use Pterodactyl\Services\Servers\ServerAccessHelperService;
|
|
||||||
use Tests\Assertions\ControllerAssertionsTrait;
|
|
||||||
use Tests\TestCase;
|
use Tests\TestCase;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Pterodactyl\Models\User;
|
||||||
|
use Pterodactyl\Models\Server;
|
||||||
|
use Tests\Assertions\ControllerAssertionsTrait;
|
||||||
|
use Pterodactyl\Http\Controllers\Base\IndexController;
|
||||||
|
use Pterodactyl\Services\Servers\ServerAccessHelperService;
|
||||||
|
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
|
||||||
|
use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
|
||||||
|
|
||||||
class IndexControllerTest extends TestCase
|
class IndexControllerTest extends TestCase
|
||||||
{
|
{
|
||||||
|
|
|
@ -24,19 +24,19 @@
|
||||||
|
|
||||||
namespace Tests\Unit\Http\Controllers\Base;
|
namespace Tests\Unit\Http\Controllers\Base;
|
||||||
|
|
||||||
use Illuminate\Contracts\Config\Repository;
|
|
||||||
use Illuminate\Contracts\Session\Session;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Mockery as m;
|
use Mockery as m;
|
||||||
|
use Tests\TestCase;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Pterodactyl\Models\User;
|
||||||
use Prologue\Alerts\AlertsMessageBag;
|
use Prologue\Alerts\AlertsMessageBag;
|
||||||
|
use Illuminate\Contracts\Session\Session;
|
||||||
|
use Illuminate\Contracts\Config\Repository;
|
||||||
|
use Tests\Assertions\ControllerAssertionsTrait;
|
||||||
|
use Pterodactyl\Services\Users\TwoFactorSetupService;
|
||||||
|
use Pterodactyl\Services\Users\ToggleTwoFactorService;
|
||||||
|
use Pterodactyl\Http\Controllers\Base\SecurityController;
|
||||||
use Pterodactyl\Contracts\Repository\SessionRepositoryInterface;
|
use Pterodactyl\Contracts\Repository\SessionRepositoryInterface;
|
||||||
use Pterodactyl\Exceptions\Service\User\TwoFactorAuthenticationTokenInvalid;
|
use Pterodactyl\Exceptions\Service\User\TwoFactorAuthenticationTokenInvalid;
|
||||||
use Pterodactyl\Http\Controllers\Base\SecurityController;
|
|
||||||
use Pterodactyl\Models\User;
|
|
||||||
use Pterodactyl\Services\Users\ToggleTwoFactorService;
|
|
||||||
use Pterodactyl\Services\Users\TwoFactorSetupService;
|
|
||||||
use Tests\Assertions\ControllerAssertionsTrait;
|
|
||||||
use Tests\TestCase;
|
|
||||||
|
|
||||||
class SecurityControllerTest extends TestCase
|
class SecurityControllerTest extends TestCase
|
||||||
{
|
{
|
||||||
|
|
|
@ -24,13 +24,13 @@
|
||||||
|
|
||||||
namespace Tests\Unit\Http\Controllers\Server;
|
namespace Tests\Unit\Http\Controllers\Server;
|
||||||
|
|
||||||
use Illuminate\Contracts\Session\Session;
|
|
||||||
use Mockery as m;
|
use Mockery as m;
|
||||||
use Pterodactyl\Http\Controllers\Server\ConsoleController;
|
|
||||||
use Pterodactyl\Models\Server;
|
|
||||||
use Tests\Assertions\ControllerAssertionsTrait;
|
|
||||||
use Tests\TestCase;
|
use Tests\TestCase;
|
||||||
|
use Pterodactyl\Models\Server;
|
||||||
|
use Illuminate\Contracts\Session\Session;
|
||||||
use Illuminate\Contracts\Config\Repository;
|
use Illuminate\Contracts\Config\Repository;
|
||||||
|
use Tests\Assertions\ControllerAssertionsTrait;
|
||||||
|
use Pterodactyl\Http\Controllers\Server\ConsoleController;
|
||||||
|
|
||||||
class ConsoleControllerTest extends TestCase
|
class ConsoleControllerTest extends TestCase
|
||||||
{
|
{
|
||||||
|
|
|
@ -25,14 +25,14 @@
|
||||||
namespace Tests\Unit\Http\Controllers\Server\Files;
|
namespace Tests\Unit\Http\Controllers\Server\Files;
|
||||||
|
|
||||||
use Mockery as m;
|
use Mockery as m;
|
||||||
use Illuminate\Cache\Repository;
|
use Tests\TestCase;
|
||||||
use Illuminate\Contracts\Session\Session;
|
|
||||||
use phpmock\phpunit\PHPMock;
|
use phpmock\phpunit\PHPMock;
|
||||||
use Pterodactyl\Http\Controllers\Server\Files\DownloadController;
|
|
||||||
use Pterodactyl\Models\Node;
|
use Pterodactyl\Models\Node;
|
||||||
use Pterodactyl\Models\Server;
|
use Pterodactyl\Models\Server;
|
||||||
|
use Illuminate\Cache\Repository;
|
||||||
|
use Illuminate\Contracts\Session\Session;
|
||||||
use Tests\Assertions\ControllerAssertionsTrait;
|
use Tests\Assertions\ControllerAssertionsTrait;
|
||||||
use Tests\TestCase;
|
use Pterodactyl\Http\Controllers\Server\Files\DownloadController;
|
||||||
|
|
||||||
class DownloadControllerTest extends TestCase
|
class DownloadControllerTest extends TestCase
|
||||||
{
|
{
|
||||||
|
|
|
@ -24,18 +24,18 @@
|
||||||
|
|
||||||
namespace Tests\Unit\Http\Controllers\Server\Files;
|
namespace Tests\Unit\Http\Controllers\Server\Files;
|
||||||
|
|
||||||
use GuzzleHttp\Exception\RequestException;
|
|
||||||
use Illuminate\Contracts\Session\Session;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Illuminate\Log\Writer;
|
|
||||||
use Mockery as m;
|
use Mockery as m;
|
||||||
use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
|
|
||||||
use Pterodactyl\Exceptions\DisplayException;
|
|
||||||
use Pterodactyl\Http\Controllers\Server\Files\FileActionsController;
|
|
||||||
use Pterodactyl\Http\Requests\Server\UpdateFileContentsFormRequest;
|
|
||||||
use Pterodactyl\Models\Server;
|
|
||||||
use Tests\Assertions\ControllerAssertionsTrait;
|
|
||||||
use Tests\TestCase;
|
use Tests\TestCase;
|
||||||
|
use Illuminate\Log\Writer;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Pterodactyl\Models\Server;
|
||||||
|
use Illuminate\Contracts\Session\Session;
|
||||||
|
use GuzzleHttp\Exception\RequestException;
|
||||||
|
use Pterodactyl\Exceptions\DisplayException;
|
||||||
|
use Tests\Assertions\ControllerAssertionsTrait;
|
||||||
|
use Pterodactyl\Http\Requests\Server\UpdateFileContentsFormRequest;
|
||||||
|
use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
|
||||||
|
use Pterodactyl\Http\Controllers\Server\Files\FileActionsController;
|
||||||
|
|
||||||
class FileActionsControllerTest extends TestCase
|
class FileActionsControllerTest extends TestCase
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue