Skip to content

Commit 1d791ad

Browse files
upgrade to laravel 12.x
1 parent 4434733 commit 1d791ad

9 files changed

Lines changed: 1167 additions & 1047 deletions

File tree

app/Http/Requests/Api/Client/Servers/Subusers/StoreSubuserRequest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace Pterodactyl\Http\Requests\Api\Client\Servers\Subusers;
44

5-
use Pterodactyl\Rules\UserEmail;
65
use Pterodactyl\Models\Permission;
76

87
class StoreSubuserRequest extends SubuserRequest
@@ -15,7 +14,7 @@ public function permission(): string
1514
public function rules(): array
1615
{
1716
return [
18-
'email' => ['required', 'email:strict', 'between:1,191', new UserEmail()],
17+
'email' => 'required|email:strict|between:1,191',
1918
'permissions' => 'required|array',
2019
'permissions.*' => 'string',
2120
];

app/Models/User.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Pterodactyl\Models;
44

55
use Pterodactyl\Rules\Username;
6-
use Pterodactyl\Rules\UserEmail;
76
use Pterodactyl\Facades\Activity;
87
use Illuminate\Support\Collection;
98
use Illuminate\Validation\Rules\In;
@@ -190,7 +189,6 @@ public static function getRules(): array
190189

191190
$rules['language'][] = new In(array_keys((new self())->getAvailableLanguages()));
192191
$rules['username'][] = new Username();
193-
$rules['email'][] = new UserEmail();
194192

195193
return $rules;
196194
}

app/Rules/UserEmail.php

Lines changed: 0 additions & 33 deletions
This file was deleted.

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@
2828
"guzzlehttp/guzzle": "^7.9.2",
2929
"hashids/hashids": "^5.0.2",
3030
"laracasts/utilities": "~3.2.3",
31-
"laravel/framework": "^11.31.0",
31+
"laravel/framework": "^12.60.0",
3232
"laravel/helpers": "^1.8.0",
3333
"laravel/sanctum": "^4.2.0",
3434
"laravel/tinker": "^2.10.0",
35-
"laravel/ui": "~4.5.2",
35+
"laravel/ui": "~4.6.3",
3636
"lcobucci/jwt": "^5.6.0",
3737
"league/flysystem-aws-s3-v3": "^3.30.1",
3838
"league/flysystem-memory": "^3.29.0",
3939
"matriphe/iso-639": "~2.0",
40-
"phpseclib/phpseclib": "^3.0.47",
40+
"phpseclib/phpseclib": "^3.0.52",
4141
"pragmarx/google2fa": "~8.0.3",
4242
"predis/predis": "^3.3.0",
4343
"prologue/alerts": "^1.3.0",
@@ -59,10 +59,10 @@
5959
"itsgoingd/clockwork": "^5.3",
6060
"larastan/larastan": "^3.8",
6161
"mockery/mockery": "^1.6",
62-
"nunomaduro/collision": "^8.5",
62+
"nunomaduro/collision": "^8.9",
6363
"phpstan/phpstan": "^2.1",
6464
"phpstan/phpstan-webmozart-assert": "^2.0",
65-
"phpunit/phpunit": "^10.5.62",
65+
"phpunit/phpunit": "^11.5",
6666
"spatie/laravel-ignition": "^2.9"
6767
},
6868
"autoload": {

0 commit comments

Comments
 (0)