Merge branch 'develop' into dane/restore-backups

database/migrations/2016_11_04_000949_add_ark_service_option_fixed.php

@@ -13,7 +13,7 @@ class AddArkServiceOptionFixed extends Migration
             $service = DB::table('services')->select('id')->where('author', 'ptrdctyl-v040-11e6-8b77-86f30ca893d3')->where('name', 'Source Engine')->first();
 
             // No SRCDS Service, Skipping
-            if (! $service) {
+            if (!$service) {
                 return;
             }
 

database/migrations/2017_03_05_212803_DeleteServiceExecutableOption.php

@@ -11,13 +11,11 @@ class DeleteServiceExecutableOption extends Migration
      */
     public function up()
     {
-        DB::transaction(function () {
-            Schema::table('services', function (Blueprint $table) {
-                $table->renameColumn('file', 'folder');
-                $table->dropColumn('executable');
-                $table->text('description')->nullable()->change();
-                $table->text('startup')->nullable()->change();
-            });
+        Schema::table('services', function (Blueprint $table) {
+            $table->renameColumn('file', 'folder');
+            $table->dropColumn('executable');
+            $table->text('description')->nullable()->change();
+            $table->text('startup')->nullable()->change();
         });
     }
 

database/migrations/2017_03_10_173607_MigrateToNewServiceSystem.php

@@ -17,12 +17,12 @@ class MigrateToNewServiceSystem extends Migration
     {
         DB::transaction(function () {
             $service = DB::table('services')->where('author', config('pterodactyl.service.core'))->where('folder', 'srcds')->first();
-            if (! $service) {
+            if (!$service) {
                 return;
             }
 
             $options = DB::table('service_options')->where('service_id', $service->id)->get();
-            $options->each(function ($item) use ($options) {
+            $options->each(function ($item) {
                 if ($item->tag === 'srcds' && $item->name === 'Insurgency') {
                     $item->tag = 'insurgency';
                 } elseif ($item->tag === 'srcds' && $item->name === 'Team Fortress 2') {

database/migrations/2017_09_13_211810_UpdateOldPermissionsToPointToNewScheduleSystem.php

@@ -13,7 +13,7 @@ class UpdateOldPermissionsToPointToNewScheduleSystem extends Migration
         $permissions = DB::table('permissions')->where('permission', 'like', '%-task%')->get();
         foreach ($permissions as $record) {
             $parts = explode('-', $record->permission);
-            if (! in_array(array_get($parts, 1), ['tasks', 'task']) || count($parts) !== 2) {
+            if (!in_array(array_get($parts, 1), ['tasks', 'task']) || count($parts) !== 2) {
                 continue;
             }
 
@@ -31,7 +31,7 @@ class UpdateOldPermissionsToPointToNewScheduleSystem extends Migration
         $permissions = DB::table('permissions')->where('permission', 'like', '%-schedule%')->get();
         foreach ($permissions as $record) {
             $parts = explode('-', $record->permission);
-            if (! in_array(array_get($parts, 1), ['schedules', 'schedule']) || count($parts) !== 2) {
+            if (!in_array(array_get($parts, 1), ['schedules', 'schedule']) || count($parts) !== 2) {
                 continue;
             }
 

database/migrations/2018_01_13_142012_SetupTableForKeyEncryption.php

@@ -10,6 +10,7 @@ class SetupTableForKeyEncryption extends Migration
      * Run the migrations.
      *
      * @return void
+     *
      * @throws \Exception
      * @throws \Throwable
      */
@@ -29,6 +30,7 @@ class SetupTableForKeyEncryption extends Migration
      * Reverse the migrations.
      *
      * @return void
+     *
      * @throws \Exception
      * @throws \Throwable
      */

database/migrations/2020_03_22_163911_merge_permissions_table_into_subusers.php

@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
 use Pterodactyl\Models\Permission;
 use Illuminate\Support\Facades\Schema;
 use Pterodactyl\Models\Permission as P;
@@ -83,7 +83,7 @@ class MergePermissionsTableIntoSubusers extends Migration
                     ->map(function ($value) {
                         return self::$permissionsMap[$value] ?? null;
                     })->filter(function ($value) {
-                        return ! is_null($value) && $value !== Permission::ACTION_WEBSOCKET_CONNECT;
+                        return !is_null($value) && $value !== Permission::ACTION_WEBSOCKET_CONNECT;
                     })
                     // All subusers get this permission, so make sure it gets pushed into the array.
                     ->merge([Permission::ACTION_WEBSOCKET_CONNECT])
@@ -109,13 +109,13 @@ class MergePermissionsTableIntoSubusers extends Migration
             $values = [];
             foreach (json_decode($datum->permissions, true) as $permission) {
                 $v = $flipped[$permission] ?? null;
-                if (! empty($v)) {
+                if (!empty($v)) {
                     $values[] = $datum->id;
                     $values[] = $v;
                 }
             }
 
-            if (! empty($values)) {
+            if (!empty($values)) {
                 $string = 'VALUES ' . implode(', ', array_fill(0, count($values) / 2, '(?, ?)'));
 
                 DB::insert('INSERT INTO permissions(`subuser_id`, `permission`) ' . $string, $values);

database/migrations/2020_04_03_230614_create_backups_table.php

@@ -20,13 +20,13 @@ class CreateBackupsTable extends Migration
         // to use. For now, just rename them to maintain the data.
         $results = DB::select('SELECT TABLE_NAME FROM information_schema.tables WHERE table_schema = ? AND table_name LIKE ? AND table_name NOT LIKE \'%_plugin_bak\'', [
             config("database.connections.{$db}.database"),
-            'backup%'
+            'backup%',
         ]);
 
         // Take any of the results, most likely "backups" and "backup_logs" and rename them to have a
         // suffix so data isn't completely lost, but they're no longer in the way of this migration...
         foreach ($results as $result) {
-            Schema::rename($result->TABLE_NAME, $result->TABLE_NAME. '_plugin_bak');
+            Schema::rename($result->TABLE_NAME, $result->TABLE_NAME . '_plugin_bak');
         }
 
         Schema::create('backups', function (Blueprint $table) {

database/migrations/2020_04_10_141024_store_node_tokens_as_encrypted_value.php

@@ -14,6 +14,7 @@ class StoreNodeTokensAsEncryptedValue extends Migration
      * Run the migrations.
      *
      * @return void
+     *
      * @throws \Exception
      */
     public function up()

database/migrations/2020_04_26_111208_add_backup_limit_to_servers.php

@@ -19,7 +19,7 @@ class AddBackupLimitToServers extends Migration
         // here. If we find a result we'll actually keep the column around since we can maintain that backup
         // limit, but we need to correct the column definition a bit.
         $results = DB::select('SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = ? AND TABLE_NAME = \'servers\' AND COLUMN_NAME = \'backup_limit\'', [
-            config("database.connections.{$db}.database")
+            config("database.connections.{$db}.database"),
         ]);
 
         if (count($results) === 1) {

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

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

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

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

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

database/migrations/2020_09_13_110007_drop_packs_from_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 DropPacksFromServers extends Migration
 {

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

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

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

database/migrations/2020_10_10_165437_change_unique_database_name_to_account_for_server.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 ChangeUniqueDatabaseNameToAccountForServer extends Migration
 {
@@ -36,6 +36,5 @@ class ChangeUniqueDatabaseNameToAccountForServer extends Migration
         Schema::table('databases', function (Blueprint $table) {
             $table->unique(['database_host_id', 'database']);
         });
-
     }
 }

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

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

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

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

database/migrations/2021_01_10_153937_add_file_denylist_to_egg_configs.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 AddFileDenylistToEggConfigs extends Migration
 {

database/migrations/2021_01_13_013420_add_cron_month.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddCronMonth extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('schedules', function (Blueprint $table) {
+            $table->string('cron_month')->after('cron_day_of_week');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('schedules', function (Blueprint $table) {
+            $table->dropColumn('cron_month');
+        });
+    }
+}