Explorar el Código

Update Laravel 8 => 9

Daniel Supernault hace 2 años
padre
commit
18f3fcc663
Se han modificado 5 ficheros con 284 adiciones y 297 borrados
  1. 1 1
      app/Http/Middleware/TrustProxies.php
  2. 2 0
      app/Providers/AppServiceProvider.php
  3. 12 13
      composer.json
  4. 266 283
      composer.lock
  5. 3 0
      config/filesystems.php

+ 1 - 1
app/Http/Middleware/TrustProxies.php

@@ -2,7 +2,7 @@
 
 
 namespace App\Http\Middleware;
 namespace App\Http\Middleware;
 
 
-use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 
 
 class TrustProxies extends Middleware
 class TrustProxies extends Middleware

+ 2 - 0
app/Providers/AppServiceProvider.php

@@ -29,6 +29,7 @@ use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Pagination\Paginator;
+use Illuminate\Support\Facades\Validator;
 
 
 class AppServiceProvider extends ServiceProvider
 class AppServiceProvider extends ServiceProvider
 {
 {
@@ -54,6 +55,7 @@ class AppServiceProvider extends ServiceProvider
 		Horizon::auth(function ($request) {
 		Horizon::auth(function ($request) {
 			return Auth::check() && $request->user()->is_admin;
 			return Auth::check() && $request->user()->is_admin;
 		});
 		});
+		Validator::includeUnvalidatedArrayKeys();
 	}
 	}
 
 
 	/**
 	/**

+ 12 - 13
composer.json

@@ -5,7 +5,7 @@
 	"license": "AGPL-3.0-only",
 	"license": "AGPL-3.0-only",
 	"type": "project",
 	"type": "project",
 	"require": {
 	"require": {
-		"php": "^7.4|^8.0",
+		"php": "^8.0.2|^8.1",
 		"ext-bcmath": "*",
 		"ext-bcmath": "*",
 		"ext-ctype": "*",
 		"ext-ctype": "*",
 		"ext-curl": "*",
 		"ext-curl": "*",
@@ -18,37 +18,36 @@
 		"brick/math": "^0.9.3",
 		"brick/math": "^0.9.3",
 		"buzz/laravel-h-captcha": "1.0.3",
 		"buzz/laravel-h-captcha": "1.0.3",
 		"doctrine/dbal": "^2.7",
 		"doctrine/dbal": "^2.7",
-		"fideloper/proxy": "^4.0",
 		"fruitcake/laravel-cors": "^2.0",
 		"fruitcake/laravel-cors": "^2.0",
 		"intervention/image": "^2.4",
 		"intervention/image": "^2.4",
 		"jenssegers/agent": "^2.6",
 		"jenssegers/agent": "^2.6",
-		"laravel/framework": "^8.0",
+		"laravel/framework": "^9.0",
 		"laravel/helpers": "^1.1",
 		"laravel/helpers": "^1.1",
 		"laravel/horizon": "^5.0",
 		"laravel/horizon": "^5.0",
 		"laravel/passport": "^10.0",
 		"laravel/passport": "^10.0",
 		"laravel/tinker": "^2.0",
 		"laravel/tinker": "^2.0",
 		"laravel/ui": "^2.0|^3.4",
 		"laravel/ui": "^2.0|^3.4",
-		"league/flysystem-aws-s3-v3": "~1.0",
-		"league/flysystem-cached-adapter": "~1.0",
+		"league/flysystem-aws-s3-v3": "^3.0",
 		"league/iso3166": "^2.1|^4.0",
 		"league/iso3166": "^2.1|^4.0",
-		"pbmedia/laravel-ffmpeg": "^7.0",
+		"pbmedia/laravel-ffmpeg": "^8.0",
 		"phpseclib/phpseclib": "~2.0",
 		"phpseclib/phpseclib": "~2.0",
 		"pixelfed/fractal": "^0.18.0",
 		"pixelfed/fractal": "^0.18.0",
 		"pixelfed/laravel-snowflake": "^2.0",
 		"pixelfed/laravel-snowflake": "^2.0",
-		"pixelfed/zttp": "^0.4",
+		"pixelfed/zttp": "^0.5",
 		"pragmarx/google2fa": "^8.0",
 		"pragmarx/google2fa": "^8.0",
 		"predis/predis": "^1.1",
 		"predis/predis": "^1.1",
-		"spatie/laravel-backup": "^6.0.0",
-		"spatie/laravel-image-optimizer": "^1.1",
-		"stevebauman/purify": "3.0.*",
-		"symfony/http-kernel": "5.4.8"
+		"spatie/laravel-backup": "^8.0.0",
+		"spatie/laravel-image-optimizer": "^1.7",
+		"stevebauman/purify": "4.0.*",
+		"symfony/http-client": "^6.1",
+		"symfony/http-kernel": "^6.0.0",
+		"symfony/mailgun-mailer": "^6.1"
 	},
 	},
 	"require-dev": {
 	"require-dev": {
 		"brianium/paratest": "^6.1",
 		"brianium/paratest": "^6.1",
-		"facade/ignition": "^2.3.6",
 		"laravel/telescope": "^4.9",
 		"laravel/telescope": "^4.9",
 		"mockery/mockery": "^1.0",
 		"mockery/mockery": "^1.0",
-		"nunomaduro/collision": "^5.0",
+		"nunomaduro/collision": "^6.1",
 		"phpunit/phpunit": "^9.0"
 		"phpunit/phpunit": "^9.0"
 	},
 	},
 	"autoload": {
 	"autoload": {

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 266 - 283
composer.lock


+ 3 - 0
config/filesystems.php

@@ -53,6 +53,7 @@ return [
             'root'       => storage_path('app/public'),
             'root'       => storage_path('app/public'),
             'url'        => env('APP_URL').'/storage',
             'url'        => env('APP_URL').'/storage',
             'visibility' => 'public',
             'visibility' => 'public',
+            'throw' => true,
         ],
         ],
 
 
         's3' => [
         's3' => [
@@ -65,6 +66,7 @@ return [
             'url'      => env('AWS_URL'),
             'url'      => env('AWS_URL'),
             'endpoint' => env('AWS_ENDPOINT'),
             'endpoint' => env('AWS_ENDPOINT'),
             'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
             'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
+            'throw' => true,
         ],
         ],
 
 
         'spaces' => [
         'spaces' => [
@@ -79,6 +81,7 @@ return [
                 'CacheControl' => 'max-age=31536000'
                 'CacheControl' => 'max-age=31536000'
             ],
             ],
             'root' => env('DO_SPACES_ROOT','/'),
             'root' => env('DO_SPACES_ROOT','/'),
+            'throw' => true,
         ],
         ],
 
 
         'backup' => [
         'backup' => [

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio