diff --git a/app/Models/Allocation.php b/app/Models/Allocation.php index f987223f..81e59652 100644 --- a/app/Models/Allocation.php +++ b/app/Models/Allocation.php @@ -2,8 +2,6 @@ namespace Pterodactyl\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; - /** * @property int $id * @property int $node_id @@ -23,8 +21,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; */ class Allocation extends Model { - 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 index c382cf04..3b15ca99 100644 --- a/app/Models/ApiKey.php +++ b/app/Models/ApiKey.php @@ -3,7 +3,6 @@ namespace Pterodactyl\Models; use Pterodactyl\Services\Acl\Api\AdminAcl; -use Illuminate\Database\Eloquent\Factories\HasFactory; /** * @property int $id @@ -19,8 +18,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; */ class ApiKey extends Model { - 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 index e2bca482..6569d9f3 100644 --- a/app/Models/Backup.php +++ b/app/Models/Backup.php @@ -3,7 +3,6 @@ namespace Pterodactyl\Models; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Eloquent\Factories\HasFactory; /** * @property int $id @@ -25,7 +24,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; */ class Backup extends Model { - use HasFactory; use SoftDeletes; const RESOURCE_NAME = 'backup'; diff --git a/app/Models/Database.php b/app/Models/Database.php index d02a1931..8e66219f 100644 --- a/app/Models/Database.php +++ b/app/Models/Database.php @@ -2,8 +2,6 @@ namespace Pterodactyl\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; - /** * @property int $id * @property int $server_id @@ -21,8 +19,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; */ class Database extends Model { - 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 index 655e160f..750ca0de 100644 --- a/app/Models/DatabaseHost.php +++ b/app/Models/DatabaseHost.php @@ -2,12 +2,8 @@ namespace Pterodactyl\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; - class DatabaseHost extends Model { - 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 index d448a0de..03d5fa5f 100644 --- a/app/Models/Egg.php +++ b/app/Models/Egg.php @@ -2,8 +2,6 @@ namespace Pterodactyl\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; - /** * @property int $id * @property string $uuid @@ -48,8 +46,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; */ class Egg extends Model { - 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 index b248414a..2adc3513 100644 --- a/app/Models/EggVariable.php +++ b/app/Models/EggVariable.php @@ -2,8 +2,6 @@ namespace Pterodactyl\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; - /** * @property int $id * @property int $egg_id @@ -27,8 +25,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; */ class EggVariable extends Model { - 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 index db4e973a..74fed181 100644 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -2,8 +2,6 @@ namespace Pterodactyl\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; - /** * @property int $id * @property string $short @@ -16,8 +14,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; */ class Location extends Model { - 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 index f6b94a3a..86a8cfcb 100644 --- a/app/Models/Model.php +++ b/app/Models/Model.php @@ -6,11 +6,14 @@ use Illuminate\Support\Str; use Illuminate\Validation\Rule; use Illuminate\Container\Container; use Illuminate\Contracts\Validation\Factory; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model as IlluminateModel; use Pterodactyl\Exceptions\Model\DataValidationException; 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 index e038bece..770c5baf 100644 --- a/app/Models/Nest.php +++ b/app/Models/Nest.php @@ -2,8 +2,6 @@ namespace Pterodactyl\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; - /** * @property int $id * @property string $uuid @@ -18,8 +16,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; */ class Nest extends Model { - 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 index 1925501f..8258ae86 100644 --- a/app/Models/Node.php +++ b/app/Models/Node.php @@ -6,7 +6,6 @@ use Symfony\Component\Yaml\Yaml; use Illuminate\Container\Container; use Illuminate\Notifications\Notifiable; use Illuminate\Contracts\Encryption\Encrypter; -use Illuminate\Database\Eloquent\Factories\HasFactory; /** * @property int $id @@ -39,7 +38,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; */ class Node extends Model { - use HasFactory; use Notifiable; /** diff --git a/app/Models/Schedule.php b/app/Models/Schedule.php index 3535fa1b..6d23f5c1 100644 --- a/app/Models/Schedule.php +++ b/app/Models/Schedule.php @@ -6,7 +6,6 @@ use Cron\CronExpression; use Carbon\CarbonImmutable; use Illuminate\Container\Container; use Pterodactyl\Contracts\Extensions\HashidsInterface; -use Illuminate\Database\Eloquent\Factories\HasFactory; /** * @property int $id @@ -31,8 +30,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; */ class Schedule extends Model { - 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 index f01902fc..aace86d0 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -5,7 +5,6 @@ namespace Pterodactyl\Models; use Illuminate\Notifications\Notifiable; use Illuminate\Database\Query\JoinClause; use Znck\Eloquent\Traits\BelongsToThrough; -use Illuminate\Database\Eloquent\Factories\HasFactory; /** * @property int $id @@ -55,7 +54,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; class Server extends Model { use BelongsToThrough; - use HasFactory; use Notifiable; /** diff --git a/app/Models/Subuser.php b/app/Models/Subuser.php index a1f73038..ab85b85d 100644 --- a/app/Models/Subuser.php +++ b/app/Models/Subuser.php @@ -3,7 +3,6 @@ namespace Pterodactyl\Models; use Illuminate\Notifications\Notifiable; -use Illuminate\Database\Eloquent\Factories\HasFactory; /** * @property int $id @@ -18,7 +17,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; */ class Subuser extends Model { - use HasFactory; use Notifiable; /** diff --git a/app/Models/Task.php b/app/Models/Task.php index 69558f12..f241b071 100644 --- a/app/Models/Task.php +++ b/app/Models/Task.php @@ -5,7 +5,6 @@ namespace Pterodactyl\Models; use Illuminate\Container\Container; use Znck\Eloquent\Traits\BelongsToThrough; use Pterodactyl\Contracts\Extensions\HashidsInterface; -use Illuminate\Database\Eloquent\Factories\HasFactory; /** * @property int $id @@ -26,7 +25,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; class Task extends Model { use BelongsToThrough; - use HasFactory; /** * The resource name for this model when it is transformed into an diff --git a/app/Models/User.php b/app/Models/User.php index 2583d501..24ef981f 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -11,7 +11,6 @@ use Illuminate\Database\Eloquent\Builder; use Illuminate\Auth\Passwords\CanResetPassword; use Pterodactyl\Traits\Helpers\AvailableLanguages; use Illuminate\Foundation\Auth\Access\Authorizable; -use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract; use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract; use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract; @@ -50,7 +49,6 @@ class User extends Model implements use Authorizable; use AvailableLanguages; use CanResetPassword; - use HasFactory; use Notifiable; const USER_LEVEL_USER = 0; diff --git a/tests/Integration/Api/Client/Server/Schedule/UpdateServerScheduleTest.php b/tests/Integration/Api/Client/Server/Schedule/UpdateServerScheduleTest.php index 42263d91..b1e6e79f 100644 --- a/tests/Integration/Api/Client/Server/Schedule/UpdateServerScheduleTest.php +++ b/tests/Integration/Api/Client/Server/Schedule/UpdateServerScheduleTest.php @@ -35,7 +35,7 @@ class UpdateServerScheduleTest extends ClientApiIntegrationTestCase [$user, $server] = $this->generateTestAccount($permissions); /** @var \Pterodactyl\Models\Schedule $schedule */ - $schedule = factory(Schedule::class)->create(['server_id' => $server->id]); + $schedule = Schedule::factory()->create(['server_id' => $server->id]); $expected = Utilities::getScheduleNextRunDate('5', '*', '*', '*', '*'); $response = $this->actingAs($user)