Revert "Revert "merge 1""

This reverts commit 0c463d1f10.

composer.json

@@ -10,7 +10,6 @@
     "require": {
         "php": "^8.0",
         "ext-json": "*",
-        "arcanedev/log-viewer": "^9.0.0",
         "doctrine/dbal": "^2.10",
         "fruitcake/laravel-cors": "^2.1",
         "geo-sot/laravel-env-editor": "^1.1.0",
@@ -21,11 +20,12 @@
         "laravel-notification-channels/pusher-push-notifications": "^3.0",
         "laravel/framework": "^9.0",
         "laravel/slack-notification-channel": "^2.0",
-        "laravel/socialite": "^5.2",
+        "laravel/socialite": "^5.5",
         "laravel/tinker": "^2.0",
         "laravel/ui": "^3.0",
         "mcamara/laravel-localization": "^1.7",
         "mpociot/teamwork": "^7.0",
+        "opcodesio/log-viewer": "^1.2",
         "pragmarx/google2fa-laravel": "^1.3",
         "sentry/sentry-laravel": "2.11.*",
         "socialiteproviders/discord": "^4.1",
@@ -35,7 +35,9 @@
         "ext-xdebug": "*",
         "amirami/localizator": "^0.9.0@alpha",
         "barryvdh/laravel-debugbar": "^3.3",
+        "barryvdh/laravel-ide-helper": "^2.12",
         "fakerphp/faker": "^1.19",
+        "laravel/sail": "^1.15",
         "mockery/mockery": "^1.3.1",
         "nunomaduro/collision": "^6.1",
         "phpunit/phpunit": "^9.3",