Skip to content

Commit c3aa257

Browse files
committed
Update dependencies to latest versions
1 parent ba0c78d commit c3aa257

File tree

4 files changed

+1809
-866
lines changed

4 files changed

+1809
-866
lines changed

app/Exceptions/Handler.php

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

55
use Exception;
6+
use Throwable;
67
use PDOException;
78
use Psr\Log\LoggerInterface;
89
use Swift_TransportException;
@@ -72,12 +73,12 @@ class Handler extends ExceptionHandler
7273
* services such as AWS Cloudwatch or other monitoring you can replace the
7374
* contents of this function with a call to the parent reporter.
7475
*
75-
* @param \Exception $exception
76+
* @param \Throwable $exception
7677
* @return mixed
7778
*
78-
* @throws \Exception
79+
* @throws \Throwable
7980
*/
80-
public function report(Exception $exception)
81+
public function report(Throwable $exception)
8182
{
8283
if (! config('app.exceptions.report_all', false) && $this->shouldntReport($exception)) {
8384
return null;
@@ -103,7 +104,7 @@ public function report(Exception $exception)
103104
return $logger->error($exception);
104105
}
105106

106-
private function generateCleanedExceptionStack(Exception $exception)
107+
private function generateCleanedExceptionStack(Throwable $exception)
107108
{
108109
$cleanedStack = '';
109110
foreach ($exception->getTrace() as $index => $item) {
@@ -133,12 +134,12 @@ class_basename($exception),
133134
* Render an exception into an HTTP response.
134135
*
135136
* @param \Illuminate\Http\Request $request
136-
* @param \Exception $exception
137+
* @param \Throwable $exception
137138
* @return \Symfony\Component\HttpFoundation\Response
138139
*
139-
* @throws \Exception
140+
* @throws \Throwable
140141
*/
141-
public function render($request, Exception $exception)
142+
public function render($request, Throwable $exception)
142143
{
143144
$connections = Container::getInstance()->make(Connection::class);
144145

@@ -200,11 +201,11 @@ public function invalidJson($request, ValidationException $exception)
200201
/**
201202
* Return the exception as a JSONAPI representation for use on API requests.
202203
*
203-
* @param \Exception $exception
204+
* @param \Throwable $exception
204205
* @param array $override
205206
* @return array
206207
*/
207-
public static function convertToArray(Exception $exception, array $override = []): array
208+
public static function convertToArray(Throwable $exception, array $override = []): array
208209
{
209210
$error = [
210211
'code' => class_basename($exception),
@@ -259,10 +260,10 @@ protected function unauthenticated($request, AuthenticationException $exception)
259260
* Converts an exception into an array to render in the response. Overrides
260261
* Laravel's built-in converter to output as a JSONAPI spec compliant object.
261262
*
262-
* @param \Exception $exception
263+
* @param \Throwable $exception
263264
* @return array
264265
*/
265-
protected function convertExceptionToArray(Exception $exception)
266+
protected function convertExceptionToArray(Throwable $exception)
266267
{
267268
return self::convertToArray($exception);
268269
}

composer.json

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212
],
1313
"require": {
14-
"php": ">=7.2",
14+
"php": "^7.2",
1515
"ext-mbstring": "*",
1616
"ext-pdo_mysql": "*",
1717
"ext-zip": "*",
@@ -23,30 +23,32 @@
2323
"guzzlehttp/guzzle": "^6.5",
2424
"hashids/hashids": "^4.0",
2525
"laracasts/utilities": "^3.1",
26-
"laravel/framework": "^6.18",
26+
"laravel/framework": "^7.17",
2727
"laravel/helpers": "^1.2",
28-
"laravel/tinker": "^1.0",
28+
"laravel/tinker": "^2.4",
29+
"laravel/ui": "^2.0",
2930
"lcobucci/jwt": "^3.3",
3031
"league/flysystem-aws-s3-v3": "^1.0",
3132
"league/flysystem-memory": "^1.0",
3233
"matriphe/iso-639": "^1.2",
3334
"pragmarx/google2fa": "^5.0",
3435
"predis/predis": "^1.1",
3536
"prologue/alerts": "^0.4",
37+
"psy/psysh": "^0.10.4",
3638
"s1lentium/iptools": "^1.1",
3739
"spatie/laravel-fractal": "^5.7",
38-
"staudenmeir/belongs-to-through": "^2.9",
40+
"staudenmeir/belongs-to-through": "^2.10",
3941
"symfony/yaml": "^4.4",
40-
"webmozart/assert": "^1.7"
42+
"webmozart/assert": "^1.9"
4143
},
4244
"require-dev": {
43-
"barryvdh/laravel-debugbar": "^3.2",
44-
"barryvdh/laravel-ide-helper": "^2.6",
45+
"barryvdh/laravel-debugbar": "^3.3",
46+
"barryvdh/laravel-ide-helper": "^2.7",
4547
"codedungeon/phpunit-result-printer": "0.25.1",
46-
"friendsofphp/php-cs-fixer": "^2.16.1",
47-
"laravel/dusk": "^5.11",
48+
"friendsofphp/php-cs-fixer": "2.16.1",
49+
"laravel/dusk": "^6.3",
4850
"php-mock/php-mock-phpunit": "^2.6",
49-
"phpunit/phpunit": "^7"
51+
"phpunit/phpunit": "^8.5"
5052
},
5153
"autoload": {
5254
"classmap": [

0 commit comments

Comments
 (0)