Run php-cs-fixer

DaneEveritt · DaneEveritt · commit 25d9ba477975 · 2021-08-15T17:20:36.000-07:00
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -3,7 +3,15 @@
 use PhpCsFixer\Config;
 use PhpCsFixer\Finder;
 
-$finder = (new Finder())->in(__DIR__)->exclude(['vendor', 'node_modules', 'storage', 'bootstrap/cache']);
+$finder = (new Finder())
+    ->in(__DIR__)
+    ->exclude([
+        'vendor',
+        'node_modules',
+        'storage',
+        'bootstrap/cache',
+    ])
+    ->notName(['_ide_helper*']);
 
 return (new Config())
     ->setRiskyAllowed(true)
diff --git a/app/Http/Controllers/Api/Client/Servers/BackupController.php b/app/Http/Controllers/Api/Client/Servers/BackupController.php
@@ -11,8 +11,8 @@
 use Illuminate\Auth\Access\AuthorizationException;
 use Pterodactyl\Services\Backups\DeleteBackupService;
 use Pterodactyl\Services\Backups\DownloadLinkService;
-use Pterodactyl\Services\Backups\InitiateBackupService;
 use Pterodactyl\Repositories\Eloquent\BackupRepository;
+use Pterodactyl\Services\Backups\InitiateBackupService;
 use Pterodactyl\Repositories\Wings\DaemonBackupRepository;
 use Pterodactyl\Transformers\Api\Client\BackupTransformer;
 use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
diff --git a/app/Http/Controllers/Api/Client/Servers/ResourceUtilizationController.php b/app/Http/Controllers/Api/Client/Servers/ResourceUtilizationController.php
@@ -12,14 +12,8 @@
 
 class ResourceUtilizationController extends ClientApiController
 {
-    /**
-     * @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
-     */
     private DaemonServerRepository $repository;
 
-    /**
-     * @var \Illuminate\Cache\Repository
-     */
     private Repository $cache;
 
     /**
diff --git a/app/Http/Controllers/Api/Remote/Servers/ServerDetailsController.php b/app/Http/Controllers/Api/Remote/Servers/ServerDetailsController.php
@@ -93,7 +93,6 @@ public function list(Request $request)
      * do not get incorrectly stuck in installing/restoring from backup states since
      * a Wings reboot would completely stop those processes.
      *
-     * @param \Illuminate\Http\Request $request
      * @return \Illuminate\Http\JsonResponse
      *
      * @throws \Throwable
diff --git a/app/Http/Controllers/Api/Remote/Servers/ServerInstallController.php b/app/Http/Controllers/Api/Remote/Servers/ServerInstallController.php
@@ -8,9 +8,9 @@
 use Illuminate\Http\JsonResponse;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Repositories\Eloquent\ServerRepository;
-use Pterodactyl\Http\Requests\Api\Remote\InstallationDataRequest;
 use Pterodactyl\Events\Server\Installed as ServerInstalled;
 use Illuminate\Contracts\Events\Dispatcher as EventDispatcher;
+use Pterodactyl\Http\Requests\Api\Remote\InstallationDataRequest;
 
 class ServerInstallController extends Controller
 {
diff --git a/app/Models/Backup.php b/app/Models/Backup.php
@@ -107,6 +107,6 @@ public function audits()
     {
         return $this->hasMany(AuditLog::class, 'metadata->backup_uuid', 'uuid')
             ->where('action', 'LIKE', 'server:backup.%');
-            // ->where('metadata->backup_uuid', $this->uuid);
+        // ->where('metadata->backup_uuid', $this->uuid);
     }
 }
diff --git a/app/Repositories/Eloquent/BackupRepository.php b/app/Repositories/Eloquent/BackupRepository.php
@@ -38,8 +38,6 @@ public function getBackupsGeneratedDuringTimespan(int $server, int $seconds = 60
 
     /**
      * Returns a query filtering only non-failed backups for a specific server.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function getNonFailedBackups(Server $server): HasMany
     {
diff --git a/app/Services/Backups/InitiateBackupService.php b/app/Services/Backups/InitiateBackupService.php
@@ -9,7 +9,6 @@
 use Pterodactyl\Models\Server;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Extensions\Backups\BackupManager;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Pterodactyl\Repositories\Eloquent\BackupRepository;
 use Pterodactyl\Repositories\Wings\DaemonBackupRepository;
 use Pterodactyl\Exceptions\Service\Backup\TooManyBackupsException;
@@ -55,11 +54,7 @@ class InitiateBackupService
     /**
      * InitiateBackupService constructor.
      *
-     * @param \Pterodactyl\Repositories\Eloquent\BackupRepository $repository
-     * @param \Illuminate\Database\ConnectionInterface $connection
-     * @param \Pterodactyl\Repositories\Wings\DaemonBackupRepository $daemonBackupRepository
      * @param \Pterodactyl\Services\Backups\DeleteBackupService $deleteBackupService
-     * @param \Pterodactyl\Extensions\Backups\BackupManager $backupManager
      */
     public function __construct(
         BackupRepository $repository,
diff --git a/config/database.php b/config/database.php
@@ -111,7 +111,7 @@
 
         'options' => [
             'cluster' => env('REDIS_CLUSTER', 'redis'),
-            'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'),
+            'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_database_'),
         ],
 
         'default' => [
diff --git a/config/services.php b/config/services.php
@@ -16,7 +16,7 @@
     'mailgun' => [
         'domain' => env('MAILGUN_DOMAIN'),
         'secret' => env('MAILGUN_SECRET'),
-        'endpoint' => env('MAILGUN_ENDPOINT')
+        'endpoint' => env('MAILGUN_ENDPOINT'),
     ],
 
     'mandrill' => [
diff --git a/database/migrations/2021_02_23_205021_add_index_for_server_and_action.php b/database/migrations/2021_02_23_205021_add_index_for_server_and_action.php
@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
 
 class AddIndexForServerAndAction extends Migration
 {
diff --git a/database/migrations/2021_02_23_212657_make_sftp_port_unsigned_int.php b/database/migrations/2021_02_23_212657_make_sftp_port_unsigned_int.php
@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
 
 class MakeSftpPortUnsignedInt extends Migration
 {
diff --git a/database/migrations/2021_03_21_104718_force_cron_month_field_to_have_value_if_missing.php b/database/migrations/2021_03_21_104718_force_cron_month_field_to_have_value_if_missing.php
@@ -1,9 +1,9 @@
 <?php
 
 use Illuminate\Support\Facades\DB;
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
 
 class ForceCronMonthFieldToHaveValueIfMissing extends Migration
 {
diff --git a/database/migrations/2021_05_01_092457_add_continue_on_failure_option_to_tasks.php b/database/migrations/2021_05_01_092457_add_continue_on_failure_option_to_tasks.php
@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
 
 class AddContinueOnFailureOptionToTasks extends Migration
 {
diff --git a/database/migrations/2021_05_01_092523_add_only_run_when_server_online_option_to_schedules.php b/database/migrations/2021_05_01_092523_add_only_run_when_server_online_option_to_schedules.php
@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
 
 class AddOnlyRunWhenServerOnlineOptionToSchedules extends Migration
 {
diff --git a/database/migrations/2021_05_03_201016_add_support_for_locking_a_backup.php b/database/migrations/2021_05_03_201016_add_support_for_locking_a_backup.php
@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
 
 class AddSupportForLockingABackup extends Migration
 {
diff --git a/database/migrations/2021_07_12_013420_remove_userinteraction.php b/database/migrations/2021_07_12_013420_remove_userinteraction.php
@@ -7,6 +7,7 @@ class RemoveUserInteraction extends Migration
 {
     /**
      * Run the migrations.
+     *
      * @return void
      */
     public function up()
diff --git a/tests/Integration/Api/Client/ClientApiIntegrationTestCase.php b/tests/Integration/Api/Client/ClientApiIntegrationTestCase.php
@@ -6,7 +6,6 @@
 use Pterodactyl\Models\Node;
 use Pterodactyl\Models\Task;
 use Pterodactyl\Models\User;
-use Webmozart\Assert\Assert;
 use InvalidArgumentException;
 use Pterodactyl\Models\Backup;
 use Pterodactyl\Models\Server;
diff --git a/tests/Integration/Api/Client/Server/ScheduleTask/CreateServerScheduleTaskTest.php b/tests/Integration/Api/Client/Server/ScheduleTask/CreateServerScheduleTaskTest.php
@@ -89,7 +89,7 @@ public function testValidationErrorsAreReturned()
     }
 
     /**
-     * Test that backups can not be tasked when the backup limit is 0
+     * Test that backups can not be tasked when the backup limit is 0.
      */
     public function testBackupsCanNotBeTaskedIfLimit0()
     {
diff --git a/tests/Integration/Jobs/Schedule/RunTaskJobTest.php b/tests/Integration/Jobs/Schedule/RunTaskJobTest.php
@@ -3,12 +3,11 @@
 namespace Pterodactyl\Tests\Integration\Jobs\Schedule;
 
 use Mockery;
-use Exception;
 use Carbon\CarbonImmutable;
-use Pterodactyl\Models\Task;
 use GuzzleHttp\Psr7\Request;
-use InvalidArgumentException;
+use Pterodactyl\Models\Task;
 use GuzzleHttp\Psr7\Response;
+use InvalidArgumentException;
 use Pterodactyl\Models\Server;
 use Pterodactyl\Models\Schedule;
 use Illuminate\Support\Facades\Bus;
diff --git a/tests/Integration/Services/Servers/BuildModificationServiceTest.php b/tests/Integration/Services/Servers/BuildModificationServiceTest.php
@@ -8,7 +8,6 @@
 use Pterodactyl\Models\Server;
 use Pterodactyl\Models\Allocation;
 use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Exception\TransferException;
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Tests\Integration\IntegrationTestCase;
 use Pterodactyl\Repositories\Wings\DaemonServerRepository;

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,6 @@ public function list(Request $request)`
`93`	`93`	`* do not get incorrectly stuck in installing/restoring from backup states since`
`94`	`94`	`* a Wings reboot would completely stop those processes.`
`95`	`95`	`*`
`96`		`- * @param \Illuminate\Http\Request $request`
`97`	`96`	`* @return \Illuminate\Http\JsonResponse`
`98`	`97`	`*`
`99`	`98`	`* @throws \Throwable`
Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,6 @@ public function audits()`
`107`	`107`	`{`
`108`	`108`	`return $this->hasMany(AuditLog::class, 'metadata->backup_uuid', 'uuid')`
`109`	`109`	`->where('action', 'LIKE', 'server:backup.%');`
`110`		`- // ->where('metadata->backup_uuid', $this->uuid);`
	`110`	`+ // ->where('metadata->backup_uuid', $this->uuid);`
`111`	`111`	`}`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,6 @@ public function getBackupsGeneratedDuringTimespan(int $server, int $seconds = 60`
`38`	`38`
`39`	`39`	`/**`
`40`	`40`	`* Returns a query filtering only non-failed backups for a specific server.`
`41`		`- *`
`42`		`- * @return \Illuminate\Database\Eloquent\Relations\HasMany`
`43`	`41`	`*/`
`44`	`42`	`public function getNonFailedBackups(Server $server): HasMany`
`45`	`43`	`{`