Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

composer: upgrade dependencies (#3427)

Browse source
This commit is contained in:
Matthew Penner 2021-07-11 11:27:15 -06:00 committed by GitHub
parent 1260965dfd
commit d33522c857
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 789 additions and 649 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
composer.json
View file

@ -33,6 +33,7 @@
"pragmarx/google2fa": "^5.0",
"predis/predis": "^1.1",
"prologue/alerts": "^0.4",
"psr/cache": "1.0.1",
"s1lentium/iptools": "^1.1",
"spatie/laravel-fractal": "^5.8",
"spatie/laravel-query-builder": "^3.3",

1419
composer.lock generated
View file

File diff suppressed because it is too large Load diff

4
database/Factories/AllocationFactory.php
View file

@ -20,8 +20,8 @@ class AllocationFactory extends Factory
public function definition(): array
{
return [
'ip' => $this->faker->ipv4,
'port' => $this->faker->randomNumber(5),
'ip' => $this->faker->unique()->ipv4,
'port' => $this->faker->unique()->randomNumber(5),
];
}
}

4
database/Factories/ApiKeyFactory.php
View file

@ -25,8 +25,8 @@ class ApiKeyFactory extends Factory
return [
'key_type' => ApiKey::TYPE_APPLICATION,
'identifier' => Str::random(\Pterodactyl\Models\ApiKey::IDENTIFIER_LENGTH),
'token' => $token ?: $token = encrypt(Str::random(\Pterodactyl\Models\ApiKey::KEY_LENGTH)),
'identifier' => Str::random(ApiKey::IDENTIFIER_LENGTH),
'token' => $token ?: $token = encrypt(Str::random(ApiKey::KEY_LENGTH)),
'allowed_ips' => null,
'memo' => 'Test Function Key',
'created_at' => Carbon::now(),

2
database/Factories/EggVariableFactory.php
View file

@ -21,7 +21,7 @@ class EggVariableFactory extends Factory
public function definition(): array
{
return [
'name' => $this->faker->firstName,
'name' => $this->faker->unique()->firstName,
'description' => $this->faker->sentence(),
'env_variable' => Str::upper(Str::replaceArray(' ', ['_'], $this->faker->words(2, true))),
'default_value' => $this->faker->colorName,

4
database/Factories/NodeFactory.php
View file

@ -25,8 +25,8 @@ class NodeFactory extends Factory
return [
'uuid' => Uuid::uuid4()->toString(),
'public' => true,
'name' => $this->faker->firstName,
'fqdn' => $this->faker->ipv4,
'name' => $this->faker->unique()->firstName,
'fqdn' => $this->faker->unique()->ipv4,
'scheme' => 'http',
'behind_proxy' => false,
'memory' => 1024,

4
database/Factories/UserFactory.php
View file

@ -26,8 +26,8 @@ class UserFactory extends Factory
return [
'external_id' => $this->faker->unique()->isbn10,
'uuid' => Uuid::uuid4()->toString(),
'username' => $this->faker->userName,
'email' => $this->faker->safeEmail,
'username' => $this->faker->unique()->userName,
'email' => $this->faker->unique()->safeEmail,
'name_first' => $this->faker->firstName,
'name_last' => $this->faker->lastName,
'password' => $password ?: $password = bcrypt('password'),