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

composer: upgrade dependencies

Browse source
This commit is contained in:
Matthew Penner 2021-07-24 15:01:14 -06:00
parent 14940d666b
commit 31847a8566
5 changed files with 555 additions and 379 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/tests.yml vendored
View file

@ -3,6 +3,7 @@ on:
push: push:
branches: branches:
- 'develop' - 'develop'
- 'feature/react-admin'
pull_request: pull_request:
jobs: jobs:
tests: tests:

1
app/Http/Controllers/Api/Client/Servers/ScheduleController.php
View file

@ -15,6 +15,7 @@ use Pterodactyl\Services\Schedules\ProcessScheduleService;
use Pterodactyl\Transformers\Api\Client\ScheduleTransformer; use Pterodactyl\Transformers\Api\Client\ScheduleTransformer;
use Pterodactyl\Http\Controllers\Api\Client\ClientApiController; use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Pterodactyl\Http\Requests\Api\Client\Servers\Schedules\ViewScheduleRequest; use Pterodactyl\Http\Requests\Api\Client\Servers\Schedules\ViewScheduleRequest;
use Pterodactyl\Http\Requests\Api\Client\Servers\Schedules\StoreScheduleRequest; use Pterodactyl\Http\Requests\Api\Client\Servers\Schedules\StoreScheduleRequest;
use Pterodactyl\Http\Requests\Api\Client\Servers\Schedules\DeleteScheduleRequest; use Pterodactyl\Http\Requests\Api\Client\Servers\Schedules\DeleteScheduleRequest;

10
composer.json
View file

@ -19,12 +19,12 @@
"ext-zip": "*", "ext-zip": "*",
"asbiin/laravel-webauthn": "^1.1", "asbiin/laravel-webauthn": "^1.1",
"aws/aws-sdk-php": "^3.185", "aws/aws-sdk-php": "^3.185",
"doctrine/dbal": "^2.13", "doctrine/dbal": "^3.1",
"fideloper/proxy": "^4.4", "fideloper/proxy": "^4.4",
"guzzlehttp/guzzle": "^7.3", "guzzlehttp/guzzle": "^7.3",
"hashids/hashids": "^4.1", "hashids/hashids": "^4.1",
"laracasts/utilities": "^3.2", "laracasts/utilities": "^3.2",
"laravel/framework": "^8.50", "laravel/framework": "^8.51",
"laravel/helpers": "^1.4", "laravel/helpers": "^1.4",
"laravel/tinker": "^2.6", "laravel/tinker": "^2.6",
"laravel/ui": "^3.3", "laravel/ui": "^3.3",
@ -32,7 +32,7 @@
"league/flysystem-aws-s3-v3": "^1.0", "league/flysystem-aws-s3-v3": "^1.0",
"league/flysystem-memory": "^1.0", "league/flysystem-memory": "^1.0",
"matriphe/iso-639": "^1.2", "matriphe/iso-639": "^1.2",
"pragmarx/google2fa": "^5.0", "pragmarx/google2fa": "^8.0",
"predis/predis": "^1.1", "predis/predis": "^1.1",
"prologue/alerts": "^0.4", "prologue/alerts": "^0.4",
"psr/cache": "1.0.1", "psr/cache": "1.0.1",
@ -40,7 +40,7 @@
"spatie/laravel-fractal": "^5.8", "spatie/laravel-fractal": "^5.8",
"spatie/laravel-query-builder": "^3.5", "spatie/laravel-query-builder": "^3.5",
"staudenmeir/belongs-to-through": "^2.11", "staudenmeir/belongs-to-through": "^2.11",
"symfony/yaml": "^4.4", "symfony/yaml": "^5.3",
"webmozart/assert": "^1.10" "webmozart/assert": "^1.10"
}, },
"require-dev": { "require-dev": {
@ -48,7 +48,7 @@
"barryvdh/laravel-ide-helper": "^2.10", "barryvdh/laravel-ide-helper": "^2.10",
"facade/ignition": "^2.11", "facade/ignition": "^2.11",
"fakerphp/faker": "^1.15", "fakerphp/faker": "^1.15",
"friendsofphp/php-cs-fixer": "^2.19", "friendsofphp/php-cs-fixer": "^3.0",
"laravel/dusk": "^6.15", "laravel/dusk": "^6.15",
"mockery/mockery": "^1.4", "mockery/mockery": "^1.4",
"nunomaduro/collision": "^5.5", "nunomaduro/collision": "^5.5",

919
composer.lock generated
View file

File diff suppressed because it is too large Load diff

3
tests/Unit/Http/Middleware/RequireTwoFactorAuthenticationTest.php
View file

@ -1,12 +1,11 @@
<?php <?php
namespace Http\Middleware; namespace Pterodactyl\Tests\Unit\Http\Middleware;
use Mockery as m; use Mockery as m;
use Pterodactyl\Models\User; use Pterodactyl\Models\User;
use Pterodactyl\Models\WebauthnKey; use Pterodactyl\Models\WebauthnKey;
use Prologue\Alerts\AlertsMessageBag; use Prologue\Alerts\AlertsMessageBag;
use Pterodactyl\Tests\Unit\Http\Middleware\MiddlewareTestCase;
use Pterodactyl\Http\Middleware\RequireTwoFactorAuthentication; use Pterodactyl\Http\Middleware\RequireTwoFactorAuthentication;
use Pterodactyl\Exceptions\Http\TwoFactorAuthRequiredException; use Pterodactyl\Exceptions\Http\TwoFactorAuthRequiredException;