fediport/pixelfed
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update laravel to v7.0

Browse source
This commit is contained in:
Daniel Supernault 2020-05-29 01:01:32 -06:00
parent aab09b454c
commit 11e28adab0
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
3 changed files with 1406 additions and 2478 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Exceptions/Handler.php
View file

@ -2,8 +2,8 @@
namespace App\Exceptions; namespace App\Exceptions;
use Exception;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Throwable;
class Handler extends ExceptionHandler class Handler extends ExceptionHandler
{ {
@ -33,7 +33,7 @@ class Handler extends ExceptionHandler
* *
* @return void * @return void
*/ */
public function report(Exception $exception) public function report(Throwable $exception)
{ {
parent::report($exception); parent::report($exception);
} }
@ -46,7 +46,7 @@ class Handler extends ExceptionHandler
* *
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function render($request, Exception $exception) public function render($request, Throwable $exception)
{ {
return parent::render($request, $exception); return parent::render($request, $exception);
} }

20
composer.json
View file

@ -13,22 +13,22 @@
"ext-json": "*", "ext-json": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"ext-openssl": "*", "ext-openssl": "*",
"barryvdh/laravel-cors": "^0.11.4",
"beyondcode/laravel-self-diagnosis": "^1.0.2", "beyondcode/laravel-self-diagnosis": "^1.0.2",
"brick/math": "^0.8",
"doctrine/dbal": "^2.7", "doctrine/dbal": "^2.7",
"fideloper/proxy": "^4.0", "fideloper/proxy": "^4.0",
"intervention/image": "^2.4", "intervention/image": "^2.4",
"jenssegers/agent": "^2.6", "jenssegers/agent": "^2.6",
"laravel/framework": "^6.0", "laravel/framework": "^7.0",
"laravel/helpers": "^1.1", "laravel/helpers": "^1.1",
"laravel/horizon": "^3.3", "laravel/horizon": "^4.0",
"laravel/passport": "^7.0", "laravel/passport": "^7.0",
"laravel/tinker": "^1.0", "laravel/tinker": "^2.0",
"laravel/ui": "^2.0",
"league/flysystem-aws-s3-v3": "~1.0", "league/flysystem-aws-s3-v3": "~1.0",
"league/flysystem-cached-adapter": "~1.0", "league/flysystem-cached-adapter": "~1.0",
"league/iso3166": "^2.1", "league/iso3166": "^2.1",
"brick/math": "^0.8", "pbmedia/laravel-ffmpeg": "^7.0",
"pbmedia/laravel-ffmpeg": "5.0.*",
"phpseclib/phpseclib": "~2.0", "phpseclib/phpseclib": "~2.0",
"pixelfed/bacon-qr-code": "^3.0", "pixelfed/bacon-qr-code": "^3.0",
"pixelfed/fractal": "^0.18.0", "pixelfed/fractal": "^0.18.0",
@ -41,13 +41,11 @@
"stevebauman/purify": "3.0.*" "stevebauman/purify": "3.0.*"
}, },
"require-dev": { "require-dev": {
"barryvdh/laravel-debugbar": "dev-master", "facade/ignition": "^2.0",
"facade/ignition": "^1.4",
"fzaninotto/faker": "^1.4", "fzaninotto/faker": "^1.4",
"mockery/mockery": "^1.0", "mockery/mockery": "^1.0",
"nunomaduro/collision": "^3.0", "nunomaduro/collision": "^4.1",
"nunomaduro/phpinsights": "^1.9", "phpunit/phpunit": "^8.5"
"phpunit/phpunit": "^8.0"
}, },
"autoload": { "autoload": {
"classmap": [ "classmap": [

3858
composer.lock generated
View file

File diff suppressed because it is too large Load diff