Fix cs-fix run

This commit is contained in:
DaneEveritt 2022-06-26 16:21:07 -04:00
parent c166f1305b
commit 271197e823
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
9 changed files with 6 additions and 14 deletions

View file

@ -44,7 +44,7 @@ jobs:
coverage: none coverage: none
- run: cp .env.ci .env - run: cp .env.ci .env
- run: composer install --prefer-dist --no-interaction --no-progress - run: composer install --prefer-dist --no-interaction --no-progress
- run: vendor/bin/php-cs-fixer fix --dry-run --diff --diff-format=udiff --config .php-cs-fixer.dist.php - run: vendor/bin/php-cs-fixer fix --dry-run --diff
continue-on-error: true continue-on-error: true
- name: execute unit tests - name: execute unit tests
run: vendor/bin/phpunit --bootstrap vendor/autoload.php tests/Unit run: vendor/bin/phpunit --bootstrap vendor/autoload.php tests/Unit

View file

@ -268,7 +268,6 @@ class Handler extends ExceptionHandler
* Extracts all of the previous exceptions that lead to the one passed into this * Extracts all of the previous exceptions that lead to the one passed into this
* function being thrown. * function being thrown.
* *
* @param \Throwable $e
* @return \Throwable[] * @return \Throwable[]
*/ */
protected function extractPrevious(Throwable $e): array protected function extractPrevious(Throwable $e): array

View file

@ -6,8 +6,8 @@ use Illuminate\Http\Request;
use Pterodactyl\Models\Server; use Pterodactyl\Models\Server;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Pterodactyl\Facades\Activity; use Pterodactyl\Facades\Activity;
use Pterodactyl\Http\Controllers\Controller;
use Illuminate\Database\ConnectionInterface; use Illuminate\Database\ConnectionInterface;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Services\Eggs\EggConfigurationService; use Pterodactyl\Services\Eggs\EggConfigurationService;
use Pterodactyl\Repositories\Eloquent\ServerRepository; use Pterodactyl\Repositories\Eloquent\ServerRepository;
use Pterodactyl\Http\Resources\Wings\ServerConfigurationCollection; use Pterodactyl\Http\Resources\Wings\ServerConfigurationCollection;
@ -15,9 +15,6 @@ use Pterodactyl\Services\Servers\ServerConfigurationStructureService;
class ServerDetailsController extends Controller class ServerDetailsController extends Controller
{ {
/**
* @var \Illuminate\Database\ConnectionInterface
*/
protected ConnectionInterface $connection; protected ConnectionInterface $connection;
/** /**

View file

@ -5,8 +5,8 @@ namespace Pterodactyl\Http\Controllers\Base;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Translation\Translator; use Illuminate\Translation\Translator;
use Pterodactyl\Http\Controllers\Controller;
use Illuminate\Contracts\Translation\Loader; use Illuminate\Contracts\Translation\Loader;
use Pterodactyl\Http\Controllers\Controller;
class LocaleController extends Controller class LocaleController extends Controller
{ {

View file

@ -27,8 +27,8 @@ use Pterodactyl\Http\Middleware\Api\AuthenticateIPAccess;
use Illuminate\Foundation\Http\Middleware\ValidatePostSize; use Illuminate\Foundation\Http\Middleware\ValidatePostSize;
use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse; use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
use Pterodactyl\Http\Middleware\Api\Daemon\DaemonAuthenticate; use Pterodactyl\Http\Middleware\Api\Daemon\DaemonAuthenticate;
use Pterodactyl\Http\Middleware\RequireTwoFactorAuthentication;
use Pterodactyl\Http\Middleware\Api\Client\RequireClientApiKey; use Pterodactyl\Http\Middleware\Api\Client\RequireClientApiKey;
use Pterodactyl\Http\Middleware\RequireTwoFactorAuthentication;
use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull; use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
use Pterodactyl\Http\Middleware\Api\Client\SubstituteClientBindings; use Pterodactyl\Http\Middleware\Api\Client\SubstituteClientBindings;
use Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance; use Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance;

View file

@ -2,8 +2,8 @@
namespace Pterodactyl\Listeners\Auth; namespace Pterodactyl\Listeners\Auth;
use Pterodactyl\Facades\Activity;
use Illuminate\Auth\Events\Login; use Illuminate\Auth\Events\Login;
use Pterodactyl\Facades\Activity;
use Illuminate\Auth\Events\Failed; use Illuminate\Auth\Events\Failed;
use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;
use Pterodactyl\Extensions\Illuminate\Events\Contracts\SubscribesToEvents; use Pterodactyl\Extensions\Illuminate\Events\Contracts\SubscribesToEvents;

View file

@ -3,8 +3,8 @@
namespace Pterodactyl\Providers; namespace Pterodactyl\Providers;
use Laravel\Sanctum\Sanctum; use Laravel\Sanctum\Sanctum;
use Pterodactyl\Models\Server;
use Pterodactyl\Models\ApiKey; use Pterodactyl\Models\ApiKey;
use Pterodactyl\Models\Server;
use Pterodactyl\Policies\ServerPolicy; use Pterodactyl\Policies\ServerPolicy;
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;

View file

@ -48,7 +48,6 @@ class AcitvityLogBatchService
* Executes the logic provided within the callback in the scope of an activity * Executes the logic provided within the callback in the scope of an activity
* log batch transaction. * log batch transaction.
* *
* @param \Closure $callback
* @return mixed * @return mixed
*/ */
public function transaction(\Closure $callback) public function transaction(\Closure $callback)

View file

@ -1,8 +1,6 @@
<?php <?php
return [ return [
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Stateful Domains | Stateful Domains
@ -62,5 +60,4 @@ return [
'verify_csrf_token' => Pterodactyl\Http\Middleware\VerifyCsrfToken::class, 'verify_csrf_token' => Pterodactyl\Http\Middleware\VerifyCsrfToken::class,
'encrypt_cookies' => Pterodactyl\Http\Middleware\EncryptCookies::class, 'encrypt_cookies' => Pterodactyl\Http\Middleware\EncryptCookies::class,
], ],
]; ];