浏览代码

Update laravel to v7.0

Daniel Supernault 5 年之前
父节点
当前提交
11e28adab0
共有 3 个文件被更改,包括 327 次插入326 次删除
  1. 3 3
      app/Exceptions/Handler.php
  2. 9 11
      composer.json
  3. 315 312
      composer.lock

+ 3 - 3
app/Exceptions/Handler.php

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

+ 9 - 11
composer.json

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

文件差异内容过多而无法显示
+ 315 - 312
composer.lock


部分文件因为文件数量过多而无法显示