浏览代码

Update framework, 5.6 => 5.7

Daniel Supernault 6 年之前
父节点
当前提交
bc2d8555fb
共有 4 个文件被更改,包括 641 次插入124 次删除
  1. 6 4
      composer.json
  2. 631 119
      composer.lock
  3. 2 1
      storage/framework/cache/.gitignore
  4. 2 0
      storage/framework/cache/data/.gitignore

+ 6 - 4
composer.json

@@ -6,20 +6,21 @@
     "type": "project",
     "require": {
         "php": "^7.1.3",
-        "beyondcode/laravel-self-diagnosis": "^0.4.0",
+        "beyondcode/laravel-self-diagnosis": "^1.0.2",
         "bitverse/identicon": "^1.1",
         "doctrine/dbal": "^2.7",
         "fideloper/proxy": "^4.0",
         "greggilbert/recaptcha": "dev-master",
         "intervention/image": "^2.4",
-        "laravel/framework": "5.6.*",
+        "laravel/framework": "5.7.*",
         "laravel/horizon": "^1.2",
-        "laravel/passport": "^6.0",
+        "laravel/passport": "^7.0",
         "laravel/tinker": "^1.0",
         "league/flysystem-aws-s3-v3": "~1.0",
         "league/flysystem-cached-adapter": "~1.0",
         "moontoast/math": "^1.1",
         "phpseclib/phpseclib": "~2.0",
+        "pbmedia/laravel-ffmpeg": "3.0.0",
         "pixelfed/bacon-qr-code": "^3.0",
         "pixelfed/dotenv-editor": "^2.0",
         "pixelfed/fractal": "^0.18.0",
@@ -29,7 +30,8 @@
         "predis/predis": "^1.1",
         "spatie/laravel-backup": "^5.0.0",
         "spatie/laravel-image-optimizer": "^1.1",
-        "spatie/laravel-partialcache": "^1.3"
+        "spatie/laravel-partialcache": "^1.3",
+        "stevebauman/purify": "2.0.*"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.1",

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


+ 2 - 1
storage/framework/cache/.gitignore

@@ -1,2 +1,3 @@
 *
-!.gitignore
+!data/
+!.gitignore

+ 2 - 0
storage/framework/cache/data/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

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