Bläddra i källkod

Add php 8.2 support. Bump laravel version, v9 => v10

Daniel Supernault 2 år sedan
förälder
incheckning
fb4ac4ebd6
3 ändrade filer med 191 tillägg och 332 borttagningar
  1. 0 3
      app/Providers/AuthServiceProvider.php
  2. 7 9
      composer.json
  3. 184 320
      composer.lock

+ 0 - 3
app/Providers/AuthServiceProvider.php

@@ -24,10 +24,7 @@ class AuthServiceProvider extends ServiceProvider
      */
      */
     public function boot()
     public function boot()
     {
     {
-        $this->registerPolicies();
-
         if(config_cache('pixelfed.oauth_enabled') == true) {
         if(config_cache('pixelfed.oauth_enabled') == true) {
-            Passport::routes(null, ['middleware' => ['twofactor', \Fruitcake\Cors\HandleCors::class]]);
             Passport::tokensExpireIn(now()->addDays(config('instance.oauth.token_expiration', 356)));
             Passport::tokensExpireIn(now()->addDays(config('instance.oauth.token_expiration', 356)));
             Passport::refreshTokensExpireIn(now()->addDays(config('instance.oauth.refresh_expiration', 400)));
             Passport::refreshTokensExpireIn(now()->addDays(config('instance.oauth.refresh_expiration', 400)));
             Passport::enableImplicitGrant();
             Passport::enableImplicitGrant();

+ 7 - 9
composer.json

@@ -5,7 +5,7 @@
 	"license": "AGPL-3.0-only",
 	"license": "AGPL-3.0-only",
 	"type": "project",
 	"type": "project",
 	"require": {
 	"require": {
-		"php": "^8.0.2|^8.1",
+		"php": "^8.1|^8.2",
 		"ext-bcmath": "*",
 		"ext-bcmath": "*",
 		"ext-ctype": "*",
 		"ext-ctype": "*",
 		"ext-curl": "*",
 		"ext-curl": "*",
@@ -16,17 +16,16 @@
 		"bacon/bacon-qr-code": "^2.0.3",
 		"bacon/bacon-qr-code": "^2.0.3",
 		"beyondcode/laravel-websockets": "^1.13",
 		"beyondcode/laravel-websockets": "^1.13",
 		"brick/math": "^0.9.3",
 		"brick/math": "^0.9.3",
-		"buzz/laravel-h-captcha": "1.0.3",
-		"doctrine/dbal": "^2.7",
-		"fruitcake/laravel-cors": "^2.0",
+		"buzz/laravel-h-captcha": "1.0.4",
+		"doctrine/dbal": "^3.0",
 		"intervention/image": "^2.4",
 		"intervention/image": "^2.4",
 		"jenssegers/agent": "^2.6",
 		"jenssegers/agent": "^2.6",
-		"laravel/framework": "^9.0",
+		"laravel/framework": "^10.0",
 		"laravel/helpers": "^1.1",
 		"laravel/helpers": "^1.1",
 		"laravel/horizon": "^5.0",
 		"laravel/horizon": "^5.0",
-		"laravel/passport": "^10.0",
+		"laravel/passport": "^11.0",
 		"laravel/tinker": "^2.0",
 		"laravel/tinker": "^2.0",
-		"laravel/ui": "^2.0|^3.4",
+		"laravel/ui": "^4.2",
 		"league/flysystem-aws-s3-v3": "^3.0",
 		"league/flysystem-aws-s3-v3": "^3.0",
 		"league/iso3166": "^2.1|^4.0",
 		"league/iso3166": "^2.1|^4.0",
 		"pbmedia/laravel-ffmpeg": "^8.0",
 		"pbmedia/laravel-ffmpeg": "^8.0",
@@ -38,7 +37,7 @@
 		"predis/predis": "^2.0",
 		"predis/predis": "^2.0",
 		"spatie/laravel-backup": "^8.0.0",
 		"spatie/laravel-backup": "^8.0.0",
 		"spatie/laravel-image-optimizer": "^1.7",
 		"spatie/laravel-image-optimizer": "^1.7",
-		"stevebauman/purify": "4.0.*",
+		"stevebauman/purify": "6.0.*",
 		"symfony/http-client": "^6.1",
 		"symfony/http-client": "^6.1",
 		"symfony/http-kernel": "^6.0.0",
 		"symfony/http-kernel": "^6.0.0",
 		"symfony/mailgun-mailer": "^6.1"
 		"symfony/mailgun-mailer": "^6.1"
@@ -95,6 +94,5 @@
 		"sort-packages": true,
 		"sort-packages": true,
 		"optimize-autoloader": true
 		"optimize-autoloader": true
 	},
 	},
-	"minimum-stability": "dev",
 	"prefer-stable": true
 	"prefer-stable": true
 }
 }

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 184 - 320
composer.lock


Vissa filer visades inte eftersom för många filer har ändrats