cs fix

.github/workflows/tests.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
 jobs:
   integration_tests:
+    if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[ci skip]')"
     runs-on: ubuntu-latest
     services:
       mysql:

app/Console/Commands/Migration/CleanOrphanedApiKeysCommand.php

@@ -38,7 +38,7 @@ class CleanOrphanedApiKeysCommand extends Command
     /**
      * Delete all orphaned API keys from the database when upgrading from 0.6 to 0.7.
      *
-     * @return null|void
+     * @return void|null
      */
     public function handle()
     {

app/Contracts/Repository/SessionRepositoryInterface.php

@@ -19,7 +19,7 @@ interface SessionRepositoryInterface extends RepositoryInterface
      *
      * @param int $user
      * @param string $session
-     * @return null|int
+     * @return int|null
      */
     public function deleteUserSession(int $user, string $session);
 }

app/Contracts/Repository/TaskRepositoryInterface.php

@@ -21,7 +21,7 @@ interface TaskRepositoryInterface extends RepositoryInterface
      *
      * @param int $schedule
      * @param int $index
-     * @return null|\Pterodactyl\Models\Task
+     * @return \Pterodactyl\Models\Task|null
      */
     public function getNextTask(int $schedule, int $index);
 }

app/Http/Requests/Api/Application/Nodes/StoreNodeRequest.php

@@ -21,7 +21,7 @@ class StoreNodeRequest extends ApplicationApiRequest
     /**
      * Validation rules to apply to this request.
      *
-     * @param null|array $rules
+     * @param array|null $rules
      * @return array
      */
     public function rules(array $rules = null): array

app/Repositories/Concerns/Searchable.php

@@ -7,7 +7,7 @@ trait Searchable
     /**
      * The search term to use when filtering results.
      *
-     * @var null|string
+     * @var string|null
      */
     protected $searchTerm;
 

app/Repositories/Eloquent/DatabaseRepository.php

@@ -140,7 +140,7 @@ class DatabaseRepository extends EloquentRepository implements DatabaseRepositor
      */
     public function createUser(string $username, string $remote, string $password, $max_connections): bool
     {
-        if (!$max_connections) {
+        if (! $max_connections) {
             return $this->run(sprintf('CREATE USER `%s`@`%s` IDENTIFIED BY \'%s\'', $username, $remote, $password));
         } else {
             return $this->run(sprintf('CREATE USER `%s`@`%s` IDENTIFIED BY \'%s\' WITH MAX_USER_CONNECTIONS %s', $username, $remote, $password, $max_connections));

app/Repositories/Eloquent/SessionRepository.php

@@ -34,7 +34,7 @@ class SessionRepository extends EloquentRepository implements SessionRepositoryI
      *
      * @param int $user
      * @param string $session
-     * @return null|int
+     * @return int|null
      */
     public function deleteUserSession(int $user, string $session)
     {

app/Repositories/Eloquent/TaskRepository.php

@@ -41,7 +41,7 @@ class TaskRepository extends EloquentRepository implements TaskRepositoryInterfa
      *
      * @param int $schedule
      * @param int $index
-     * @return null|\Pterodactyl\Models\Task
+     * @return \Pterodactyl\Models\Task|null
      */
     public function getNextTask(int $schedule, int $index)
     {

app/Services/Helpers/AssetHashService.php

@@ -24,7 +24,7 @@ class AssetHashService
     private $application;
 
     /**
-     * @var null|array
+     * @var array|null
      */
     protected static $manifest;
 

bootstrap/tests.php

@@ -27,7 +27,7 @@ if (config('database.default') !== 'testing') {
  * Perform database migrations and reseeding before continuing with
  * running the tests.
  */
-if (!env('SKIP_MIGRATIONS')) {
+if (! env('SKIP_MIGRATIONS')) {
     $output->writeln(PHP_EOL . '<info>Refreshing database for Integration tests...</info>');
     $kernel->call('migrate:fresh', ['--database' => 'testing']);
 

config/logging.php

@@ -3,7 +3,6 @@
 use Monolog\Handler\StreamHandler;
 
 return [
-
     /*
     |--------------------------------------------------------------------------
     | Default Log Channel
@@ -77,5 +76,4 @@ return [
             'level' => 'debug',
         ],
     ],
-
 ];

database/migrations/2017_07_24_194433_DeleteTaskWhenParentServerIsDeleted.php

@@ -23,6 +23,5 @@ class DeleteTaskWhenParentServerIsDeleted extends Migration
      */
     public function down()
     {
-        //
     }
 }

database/migrations/2020_04_17_203438_allow_nullable_descriptions.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 AllowNullableDescriptions extends Migration
 {

database/migrations/2020_04_22_055500_add_max_connections_column.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 AddMaxConnectionsColumn extends Migration
 {

database/migrations/2020_04_26_111208_add_backup_limit_to_servers.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 AddBackupLimitToServers extends Migration
 {

database/seeds/EggSeeder.php

@@ -117,6 +117,7 @@ class EggSeeder extends Seeder
             $decoded = json_decode($file->getContents());
             if (json_last_error() !== JSON_ERROR_NONE) {
                 $this->command->error('JSON decode exception for ' . $file->getFilename() . ': ' . json_last_error_msg());
+
                 return;
             }