diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e72212b11..e9412ec60 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -44,7 +44,7 @@ jobs: coverage: none - run: cp .env.ci .env - 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 - name: execute unit tests run: vendor/bin/phpunit --bootstrap vendor/autoload.php tests/Unit diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 60ee4d542..c8d46da3f 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -268,7 +268,6 @@ class Handler extends ExceptionHandler * Extracts all of the previous exceptions that lead to the one passed into this * function being thrown. * - * @param \Throwable $e * @return \Throwable[] */ protected function extractPrevious(Throwable $e): array diff --git a/app/Http/Controllers/Api/Remote/Servers/ServerDetailsController.php b/app/Http/Controllers/Api/Remote/Servers/ServerDetailsController.php index 3ed27de90..785544052 100644 --- a/app/Http/Controllers/Api/Remote/Servers/ServerDetailsController.php +++ b/app/Http/Controllers/Api/Remote/Servers/ServerDetailsController.php @@ -6,8 +6,8 @@ use Illuminate\Http\Request; use Pterodactyl\Models\Server; use Illuminate\Http\JsonResponse; use Pterodactyl\Facades\Activity; -use Pterodactyl\Http\Controllers\Controller; use Illuminate\Database\ConnectionInterface; +use Pterodactyl\Http\Controllers\Controller; use Pterodactyl\Services\Eggs\EggConfigurationService; use Pterodactyl\Repositories\Eloquent\ServerRepository; use Pterodactyl\Http\Resources\Wings\ServerConfigurationCollection; @@ -15,9 +15,6 @@ use Pterodactyl\Services\Servers\ServerConfigurationStructureService; class ServerDetailsController extends Controller { - /** - * @var \Illuminate\Database\ConnectionInterface - */ protected ConnectionInterface $connection; /** diff --git a/app/Http/Controllers/Base/LocaleController.php b/app/Http/Controllers/Base/LocaleController.php index cffec156b..8cd83b5ef 100644 --- a/app/Http/Controllers/Base/LocaleController.php +++ b/app/Http/Controllers/Base/LocaleController.php @@ -5,8 +5,8 @@ namespace Pterodactyl\Http\Controllers\Base; use Illuminate\Http\Request; use Illuminate\Http\JsonResponse; use Illuminate\Translation\Translator; -use Pterodactyl\Http\Controllers\Controller; use Illuminate\Contracts\Translation\Loader; +use Pterodactyl\Http\Controllers\Controller; class LocaleController extends Controller { diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 8084dc220..f23d9f830 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -27,8 +27,8 @@ use Pterodactyl\Http\Middleware\Api\AuthenticateIPAccess; use Illuminate\Foundation\Http\Middleware\ValidatePostSize; use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse; use Pterodactyl\Http\Middleware\Api\Daemon\DaemonAuthenticate; -use Pterodactyl\Http\Middleware\RequireTwoFactorAuthentication; use Pterodactyl\Http\Middleware\Api\Client\RequireClientApiKey; +use Pterodactyl\Http\Middleware\RequireTwoFactorAuthentication; use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull; use Pterodactyl\Http\Middleware\Api\Client\SubstituteClientBindings; use Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance; diff --git a/app/Listeners/Auth/AuthenticationListener.php b/app/Listeners/Auth/AuthenticationListener.php index 50f6f4d65..888cf1d93 100644 --- a/app/Listeners/Auth/AuthenticationListener.php +++ b/app/Listeners/Auth/AuthenticationListener.php @@ -2,8 +2,8 @@ namespace Pterodactyl\Listeners\Auth; -use Pterodactyl\Facades\Activity; use Illuminate\Auth\Events\Login; +use Pterodactyl\Facades\Activity; use Illuminate\Auth\Events\Failed; use Illuminate\Contracts\Events\Dispatcher; use Pterodactyl\Extensions\Illuminate\Events\Contracts\SubscribesToEvents; diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index cc06f944f..bc95e9206 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -3,8 +3,8 @@ namespace Pterodactyl\Providers; use Laravel\Sanctum\Sanctum; -use Pterodactyl\Models\Server; use Pterodactyl\Models\ApiKey; +use Pterodactyl\Models\Server; use Pterodactyl\Policies\ServerPolicy; use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; diff --git a/app/Services/Activity/AcitvityLogBatchService.php b/app/Services/Activity/AcitvityLogBatchService.php index af62e9e4d..8e2d142f0 100644 --- a/app/Services/Activity/AcitvityLogBatchService.php +++ b/app/Services/Activity/AcitvityLogBatchService.php @@ -48,7 +48,6 @@ class AcitvityLogBatchService * Executes the logic provided within the callback in the scope of an activity * log batch transaction. * - * @param \Closure $callback * @return mixed */ public function transaction(\Closure $callback) diff --git a/config/sanctum.php b/config/sanctum.php index adb410a56..21129a888 100644 --- a/config/sanctum.php +++ b/config/sanctum.php @@ -1,8 +1,6 @@ Pterodactyl\Http\Middleware\VerifyCsrfToken::class, 'encrypt_cookies' => Pterodactyl\Http\Middleware\EncryptCookies::class, ], - ];