chore: update app for laravel 11

Signed-off-by: Matthew Penner <[email protected]>
pterodactyl · Oct 21, 2024 · bd8ac59 · bd8ac59
1 parent d65d55d
commit bd8ac59
Show file tree

Hide file tree

Showing 37 changed files with 313 additions and 182 deletions.
diff --git a/app/Console/Commands/Maintenance/CleanServiceBackupFilesCommand.php b/app/Console/Commands/Maintenance/CleanServiceBackupFilesCommand.php
@@ -36,7 +36,7 @@ public function handle()
 
         collect($files)->each(function (\SplFileInfo $file) {
             $lastModified = Carbon::createFromTimestamp($this->disk->lastModified($file->getPath()));
-            if ($lastModified->diffInMinutes(Carbon::now()) > self::BACKUP_THRESHOLD_MINUTES) {
+            if ((int) $lastModified->diffInMinutes(Carbon::now()) > self::BACKUP_THRESHOLD_MINUTES) {
                 $this->disk->delete($file->getPath());
                 $this->info(trans('command/messages.maintenance.deleting_service_backup', ['file' => $file->getFilename()]));
             }

diff --git a/app/Models/Allocation.php b/app/Models/Allocation.php
@@ -3,6 +3,7 @@
 namespace Pterodactyl\Models;
 
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 /**
  * Pterodactyl\Models\Allocation.
@@ -40,6 +41,9 @@
  */
 class Allocation extends Model
 {
+    /** @use HasFactory<\Database\Factories\AllocationFactory> */
+    use HasFactory;
+
     /**
      * The resource name for this model when it is transformed into an
      * API representation using fractal.

diff --git a/app/Models/ApiKey.php b/app/Models/ApiKey.php
@@ -6,6 +6,7 @@
 use Webmozart\Assert\Assert;
 use Pterodactyl\Services\Acl\Api\AdminAcl;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 /**
  * Pterodactyl\Models\ApiKey.
@@ -61,6 +62,9 @@
  */
 class ApiKey extends Model
 {
+    /** @use HasFactory<\Database\Factories\ApiKeyFactory> */
+    use HasFactory;
+
     /**
      * The resource name for this model when it is transformed into an
      * API representation using fractal.

diff --git a/app/Models/Backup.php b/app/Models/Backup.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 /**
  * @property int $id
@@ -26,6 +27,8 @@
  */
 class Backup extends Model
 {
+    /** @use HasFactory<\Database\Factories\BackupFactory> */
+    use HasFactory;
     use SoftDeletes;
 
     public const RESOURCE_NAME = 'backup';

diff --git a/app/Models/Database.php b/app/Models/Database.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Container\Container;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Pterodactyl\Contracts\Extensions\HashidsInterface;
 
 /**
@@ -22,6 +23,9 @@
  */
 class Database extends Model
 {
+    /** @use HasFactory<\Database\Factories\DatabaseFactory> */
+    use HasFactory;
+
     /**
      * The resource name for this model when it is transformed into an
      * API representation using fractal.

diff --git a/app/Models/DatabaseHost.php b/app/Models/DatabaseHost.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 /**
  * @property int $id
@@ -19,6 +20,9 @@
  */
 class DatabaseHost extends Model
 {
+    /** @use HasFactory<\Database\Factories\DatabaseHostFactory> */
+    use HasFactory;
+
     /**
      * The resource name for this model when it is transformed into an
      * API representation using fractal.

diff --git a/app/Models/Egg.php b/app/Models/Egg.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 /**
  * @property int $id
@@ -48,6 +49,9 @@
  */
 class Egg extends Model
 {
+    /** @use HasFactory<\Database\Factories\EggFactory> */
+    use HasFactory;
+
     /**
      * The resource name for this model when it is transformed into an
      * API representation using fractal.

diff --git a/app/Models/EggVariable.php b/app/Models/EggVariable.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 /**
  * @property int $id
@@ -27,6 +28,9 @@
  */
 class EggVariable extends Model
 {
+    /** @use HasFactory<\Database\Factories\EggVariableFactory> */
+    use HasFactory;
+
     /**
      * The resource name for this model when it is transformed into an
      * API representation using fractal.

diff --git a/app/Models/Location.php b/app/Models/Location.php
@@ -3,6 +3,7 @@
 namespace Pterodactyl\Models;
 
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 
 /**
@@ -16,6 +17,9 @@
  */
 class Location extends Model
 {
+    /** @use HasFactory<\Database\Factories\LocationFactory> */
+    use HasFactory;
+
     /**
      * The resource name for this model when it is transformed into an
      * API representation using fractal.

diff --git a/app/Models/Model.php b/app/Models/Model.php
@@ -10,15 +10,12 @@
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Validation\Validator;
 use Illuminate\Validation\ValidationException;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Pterodactyl\Exceptions\Model\DataValidationException;
 use Illuminate\Database\Eloquent\Model as IlluminateModel;
 use Illuminate\Contracts\Validation\Factory as ValidationFactory;
 
 abstract class Model extends IlluminateModel
 {
-    use HasFactory;
-
     /**
      * Set to true to return immutable Carbon date instances from the model.
      */

diff --git a/app/Models/Nest.php b/app/Models/Nest.php
@@ -3,6 +3,7 @@
 namespace Pterodactyl\Models;
 
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 /**
  * @property int $id
@@ -17,6 +18,9 @@
  */
 class Nest extends Model
 {
+    /** @use HasFactory<\Database\Factories\NestFactory> */
+    use HasFactory;
+
     /**
      * The resource name for this model when it is transformed into an
      * API representation using fractal.

diff --git a/app/Models/Node.php b/app/Models/Node.php
@@ -9,6 +9,7 @@
 use Illuminate\Contracts\Encryption\Encrypter;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 
 /**
@@ -41,6 +42,8 @@
  */
 class Node extends Model
 {
+    /** @use HasFactory<\Database\Factories\NodeFactory> */
+    use HasFactory;
     use Notifiable;
 
     /**

diff --git a/app/Models/Schedule.php b/app/Models/Schedule.php
@@ -7,6 +7,7 @@
 use Illuminate\Container\Container;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Pterodactyl\Contracts\Extensions\HashidsInterface;
 
 /**
@@ -31,6 +32,9 @@
  */
 class Schedule extends Model
 {
+    /** @use HasFactory<\Database\Factories\ScheduleFactory> */
+    use HasFactory;
+
     /**
      * The resource name for this model when it is transformed into an
      * API representation using fractal.

diff --git a/app/Models/Server.php b/app/Models/Server.php
@@ -8,6 +8,7 @@
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Pterodactyl\Exceptions\Http\Server\ServerStateConflictException;
@@ -104,6 +105,8 @@
  */
 class Server extends Model
 {
+    /** @use HasFactory<\Database\Factories\ServerFactory> */
+    use HasFactory;
     use BelongsToThrough;
     use Notifiable;
 

diff --git a/app/Models/Subuser.php b/app/Models/Subuser.php
@@ -5,6 +5,7 @@
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 /**
  * @property int $id
@@ -18,6 +19,8 @@
  */
 class Subuser extends Model
 {
+    /** @use HasFactory<\Database\Factories\SubuserFactory> */
+    use HasFactory;
     use Notifiable;
 
     /**

diff --git a/app/Models/Task.php b/app/Models/Task.php
@@ -5,6 +5,7 @@
 use Illuminate\Container\Container;
 use Znck\Eloquent\Traits\BelongsToThrough;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Pterodactyl\Contracts\Extensions\HashidsInterface;
 
 /**
@@ -24,6 +25,8 @@
  */
 class Task extends Model
 {
+    /** @use HasFactory<\Database\Factories\TaskFactory> */
+    use HasFactory;
     use BelongsToThrough;
 
     /**

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -14,6 +14,7 @@
 use Pterodactyl\Traits\Helpers\AvailableLanguages;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Foundation\Auth\Access\Authorizable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
@@ -89,6 +90,8 @@ class User extends Model implements
     use CanResetPassword;
     use HasAccessTokens;
     use Notifiable;
+    /** @use HasFactory<\Database\Factories\UserFactory> */
+    use HasFactory;
 
     public const USER_LEVEL_USER = 0;
     public const USER_LEVEL_ADMIN = 1;

diff --git a/app/Models/UserSSHKey.php b/app/Models/UserSSHKey.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 /**
  * \Pterodactyl\Models\UserSSHKey.
@@ -39,6 +40,8 @@
  */
 class UserSSHKey extends Model
 {
+    /** @use HasFactory<\Database\Factories\UserSSHKeyFactory> */
+    use HasFactory;
     use SoftDeletes;
 
     public const RESOURCE_NAME = 'ssh_key';

diff --git a/app/Services/Backups/InitiateBackupService.php b/app/Services/Backups/InitiateBackupService.php
@@ -82,7 +82,7 @@ public function handle(Server $server, string $name = null, bool $override = fal
             if ($previous->count() >= $limit) {
                 $message = sprintf('Only %d backups may be generated within a %d second span of time.', $limit, $period);
 
-                throw new TooManyRequestsHttpException(CarbonImmutable::now()->diffInSeconds($previous->last()->created_at->addSeconds($period)), $message);
+                throw new TooManyRequestsHttpException((int) CarbonImmutable::now()->diffInSeconds($previous->last()->created_at->addSeconds($period)), $message);
             }
         }
 

diff --git a/composer.json b/composer.json
@@ -58,6 +58,7 @@
         "friendsofphp/php-cs-fixer": "~3.64.0",
         "itsgoingd/clockwork": "~5.2.2",
         "larastan/larastan": "~2.9.9",
+        "laravel/pail": "~1.1.5",
         "laravel/sail": "~1.36.0",
         "mockery/mockery": "~1.6.12",
         "nunomaduro/collision": "~8.5.0",
@@ -91,7 +92,9 @@
             "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
         ],
         "post-create-project-cmd": [
-            "@php artisan key:generate --ansi"
+            "@php artisan key:generate --ansi",
+            "@php -r \"file_exists('database/database.sqlite') || touch('database/database.sqlite');\"",
+            "@php artisan migrate --graceful --ansi"
         ]
     },
     "config": {