Store config in global variable instead

nanaya · Nov 6, 2023 · 85d570e · 85d570e
1 parent 32485bc
commit 85d570e
Show file tree

Hide file tree

Showing 211 changed files with 469 additions and 462 deletions.
diff --git a/app/Console/Commands/BuildsUpdatePropagationHistory.php b/app/Console/Commands/BuildsUpdatePropagationHistory.php
@@ -48,7 +48,7 @@ public function handle()
             $date = Carbon::now();
 
             $builds = Build::propagationHistory()
-                ->whereIn('stream_id', config('osu.changelog.update_streams'))
+                ->whereIn('stream_id', $GLOBALS['cfg']['osu']['changelog']['update_streams'])
                 ->get();
 
             foreach ($builds as $build) {

diff --git a/app/Console/Commands/DbCreate.php b/app/Console/Commands/DbCreate.php
@@ -16,15 +16,15 @@ class DbCreate extends Command
 
     public function handle()
     {
-        $defaultConnection = config('database.connections.mysql');
+        $defaultConnection = $GLOBALS['cfg']['database']['connections']['mysql'];
 
         $dsn = isset($defaultConnection['unix_socket'])
             ? "mysql:unix_socket={$defaultConnection['unix_socket']}"
             : "mysql:host={$defaultConnection['host']};port={$defaultConnection['port']}";
 
         $pdo = new PDO($dsn, $defaultConnection['username'], $defaultConnection['password']);
 
-        foreach (config('database.connections') as $connection) {
+        foreach ($GLOBALS['cfg']['database']['connections'] as $connection) {
             $db = $connection['database'];
 
             $this->info("Creating database '{$db}'");

diff --git a/app/Console/Commands/EsCreateSearchBlacklist.php b/app/Console/Commands/EsCreateSearchBlacklist.php
@@ -31,7 +31,7 @@ class EsCreateSearchBlacklist extends Command
      */
     public function handle()
     {
-        $alias = config('osu.elasticsearch.prefix').'blacklist';
+        $alias = $GLOBALS['cfg']['osu']['elasticsearch']['prefix'].'blacklist';
         $client = Es::getClient();
 
         /** @var array $response The type-hint in the doc is wrong. */

diff --git a/app/Console/Commands/MigrateFreshAllCommand.php b/app/Console/Commands/MigrateFreshAllCommand.php
@@ -16,7 +16,7 @@ public function handle()
             return 1;
         }
 
-        $connections = config('database.connections');
+        $connections = $GLOBALS['cfg']['database']['connections'];
 
         $this->warn('This will drop tables in the following databases:');
 

diff --git a/app/Console/Commands/ModdingRankCommand.php b/app/Console/Commands/ModdingRankCommand.php
@@ -56,20 +56,20 @@ private function rankAll($modeInt)
             ->where('approved_date', '>=', now()->subDays())
             ->count();
 
-        $rankableQuota = config('osu.beatmapset.rank_per_day') - $rankedTodayCount;
+        $rankableQuota = $GLOBALS['cfg']['osu']['beatmapset']['rank_per_day'] - $rankedTodayCount;
 
         $this->info("{$rankedTodayCount} beatmapsets ranked last 24 hours. Can rank {$rankableQuota} more");
 
         if ($rankableQuota <= 0) {
             return;
         }
 
-        $toRankLimit = min(config('osu.beatmapset.rank_per_run'), $rankableQuota);
+        $toRankLimit = min($GLOBALS['cfg']['osu']['beatmapset']['rank_per_run'], $rankableQuota);
 
         $toBeRankedQuery = Beatmapset::qualified()
             ->withoutTrashed()
             ->withModesForRanking($modeInt)
-            ->where('queued_at', '<', now()->subDays(config('osu.beatmapset.minimum_days_for_rank')));
+            ->where('queued_at', '<', now()->subDays($GLOBALS['cfg']['osu']['beatmapset']['minimum_days_for_rank']));
 
         $rankingQueue = $toBeRankedQuery->count();
 

diff --git a/app/Console/Commands/NotificationsCleanup.php b/app/Console/Commands/NotificationsCleanup.php
@@ -21,7 +21,7 @@ class NotificationsCleanup extends Command
 
     public function handle()
     {
-        $total = config('osu.notification.cleanup.max_delete_per_run');
+        $total = $GLOBALS['cfg']['osu']['notification']['cleanup']['max_delete_per_run'];
 
         if ($total === 0) {
             return;
@@ -46,7 +46,7 @@ public function handle()
 
         for ($i = 0; $i < $loops; $i++) {
             $deleted = Notification::where('id', '<', $maxNotificationId)->limit($perLoop)->delete();
-            Datadog::increment(config('datadog-helper.prefix_web').'.notifications_cleanup.notifications', 1, null, $deleted);
+            Datadog::increment($GLOBALS['cfg']['datadog-helper']['prefix_web'].'.notifications_cleanup.notifications', 1, null, $deleted);
 
             $deletedTotal += $deleted;
         }

diff --git a/app/Console/Commands/OAuthDeleteExpiredTokens.php b/app/Console/Commands/OAuthDeleteExpiredTokens.php
@@ -24,7 +24,7 @@ class OAuthDeleteExpiredTokens extends Command
 
     public function handle()
     {
-        $this->expiredBefore = now()->subDays(config('osu.oauth.retain_expired_tokens_days'));
+        $this->expiredBefore = now()->subDays($GLOBALS['cfg']['osu']['oauth']['retain_expired_tokens_days']);
         $this->line("Deleting before {$this->expiredBefore}");
 
         $this->deleteAuthCodes();

diff --git a/app/Console/Commands/UserNotificationsCleanup.php b/app/Console/Commands/UserNotificationsCleanup.php
@@ -18,7 +18,7 @@ class UserNotificationsCleanup extends Command
 
     public function handle()
     {
-        $total = config('osu.notification.cleanup.max_delete_per_run');
+        $total = $GLOBALS['cfg']['osu']['notification']['cleanup']['max_delete_per_run'];
 
         if ($total === 0) {
             return;
@@ -27,7 +27,7 @@ public function handle()
         $perLoop = min($total, 10000);
         $loops = $total / $perLoop;
 
-        $createdBefore = now()->subDays(config('osu.notification.cleanup.keep_days'));
+        $createdBefore = now()->subDays($GLOBALS['cfg']['osu']['notification']['cleanup']['keep_days']);
         $this->line("Deleting user notifications before {$createdBefore}");
 
         $progress = $this->output->createProgressBar($total);
@@ -59,7 +59,7 @@ public function handle()
                 );
                 $deleted = count($notificationIds);
                 $deletedTotal += $deleted;
-                Datadog::increment(config('datadog-helper.prefix_web').'.notifications_cleanup.user_notifications', 1, null, $deleted);
+                Datadog::increment($GLOBALS['cfg']['datadog-helper']['prefix_web'].'.notifications_cleanup.user_notifications', 1, null, $deleted);
                 $progress->advance($deleted);
             }
 

diff --git a/app/Events/NotificationEventBase.php b/app/Events/NotificationEventBase.php
@@ -24,6 +24,6 @@ public static function generateChannelName($notifiable, $subtype)
 
     public function __construct()
     {
-        $this->broadcastQueue = config('osu.notification.queue_name');
+        $this->broadcastQueue = $GLOBALS['cfg']['osu']['notification']['queue_name'];
     }
 }
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -99,7 +99,8 @@ public function report(Throwable $e)
             return;
         }
 
-        if (config('sentry.dsn')) {
+        // Fallback in case error happening before config is initialised
+        if ($GLOBALS['cfg']['sentry']['dsn'] ?? false) {
             $this->reportWithSentry($e);
         }
 
@@ -134,7 +135,7 @@ public function render($request, Throwable $e)
 
         $isJsonRequest = is_json_request();
 
-        if (config('app.debug') || ($isJsonRequest && static::isOAuthServerException($e))) {
+        if ($GLOBALS['cfg']['app']['debug'] || ($isJsonRequest && static::isOAuthServerException($e))) {
             $response = parent::render($request, $e);
         } else {
             $message = static::exceptionMessage($e);

diff --git a/app/Http/Controllers/Account/GithubUsersController.php b/app/Http/Controllers/Account/GithubUsersController.php
@@ -111,8 +111,8 @@ public function destroy()
     private function makeGithubOAuthProvider(): GithubProvider
     {
         return new GithubProvider([
-            'clientId' => config('osu.github.client_id'),
-            'clientSecret' => config('osu.github.client_secret'),
+            'clientId' => $GLOBALS['cfg']['osu']['github']['client_id'],
+            'clientSecret' => $GLOBALS['cfg']['osu']['github']['client_secret'],
         ]);
     }
 }
diff --git a/app/Http/Controllers/BeatmapsetsController.php b/app/Http/Controllers/BeatmapsetsController.php
@@ -369,7 +369,7 @@ private function getSearchResponse(?array $params = null)
 
         $records = datadog_timing(function () use ($search) {
             return $search->records();
-        }, config('datadog-helper.prefix_web').'.search', ['type' => 'beatmapset']);
+        }, $GLOBALS['cfg']['datadog-helper']['prefix_web'].'.search', ['type' => 'beatmapset']);
 
         $error = $search->getError();
 

diff --git a/app/Http/Controllers/ChangelogController.php b/app/Http/Controllers/ChangelogController.php
@@ -191,7 +191,7 @@ public function index()
         } else {
             $chartConfig = Cache::remember(
                 'chart_config_global',
-                config('osu.changelog.build_history_interval'),
+                $GLOBALS['cfg']['osu']['changelog']['build_history_interval'],
                 function () {
                     return $this->chartConfig(null);
                 }
@@ -203,7 +203,7 @@ function () {
 
     public function github()
     {
-        $token = config('osu.changelog.github_token');
+        $token = $GLOBALS['cfg']['osu']['changelog']['github_token'];
 
         $signatureHeader = explode('=', request()->header('X-Hub-Signature') ?? '');
 
@@ -371,7 +371,7 @@ public function build($streamName, $version)
 
         $chartConfig = Cache::remember(
             "chart_config:v2:{$build->updateStream->getKey()}",
-            config('osu.changelog.build_history_interval'),
+            $GLOBALS['cfg']['osu']['changelog']['build_history_interval'],
             function () use ($build) {
                 return $this->chartConfig($build->updateStream);
             }
@@ -400,8 +400,8 @@ private function getUpdateStreams()
     {
         return $this->updateStreams ??= json_collection(
             UpdateStream::whereHasBuilds()
-                ->orderByField('stream_id', config('osu.changelog.update_streams'))
-                ->find(config('osu.changelog.update_streams'))
+                ->orderByField('stream_id', $GLOBALS['cfg']['osu']['changelog']['update_streams'])
+                ->find($GLOBALS['cfg']['osu']['changelog']['update_streams'])
                 ->sortBy(function ($i) {
                     return $i->isFeatured() ? 0 : 1;
                 }),
@@ -412,7 +412,7 @@ private function getUpdateStreams()
 
     private function chartConfig($stream)
     {
-        $history = BuildPropagationHistory::changelog(optional($stream)->getKey(), config('osu.changelog.chart_days'))->get();
+        $history = BuildPropagationHistory::changelog(optional($stream)->getKey(), $GLOBALS['cfg']['osu']['changelog']['chart_days'])->get();
 
         if ($stream === null) {
             $chartOrder = array_map(function ($b) {

diff --git a/app/Http/Controllers/ChatController.php b/app/Http/Controllers/ChatController.php
@@ -19,7 +19,7 @@ public function __construct()
 
         // TODO: notification server and chat client needs some updating
         // to handle verification_requirement_change properly.
-        if (config('osu.user.post_action_verification')) {
+        if ($GLOBALS['cfg']['osu']['user']['post_action_verification']) {
             $this->middleware('verify-user');
         }
 

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
@@ -43,7 +43,7 @@ protected function login($user, $remember = false)
         $session->regenerateToken();
         $session->put('requires_verification', VerifyUserAlways::isRequired($user));
         Auth::login($user, $remember);
-        if (config('osu.user.bypass_verification')) {
+        if ($GLOBALS['cfg']['osu']['user']['bypass_verification']) {
             UserVerificationState::fromCurrentRequest()->markVerified();
         }
         $session->migrate(true, $user->getKey());

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
@@ -80,7 +80,7 @@ public function getDownload()
         };
 
         return ext_view('home.download', [
-            'lazerUrl' => config("osu.urls.lazer_dl.{$platform}"),
+            'lazerUrl' => $GLOBALS['cfg']['osu']['urls']['lazer_dl'][$platform],
             'lazerPlatformName' => $lazerPlatformNames[$platform],
         ]);
     }
@@ -197,7 +197,7 @@ public function search()
 
     public function setLocale()
     {
-        $newLocale = get_valid_locale(Request::input('locale')) ?? config('app.fallback_locale');
+        $newLocale = get_valid_locale(Request::input('locale')) ?? $GLOBALS['cfg']['app']['fallback_locale'];
         App::setLocale($newLocale);
 
         if (Auth::check()) {
@@ -327,12 +327,12 @@ public function supportTheGame()
                         'more_beatmaps' => [
                             'icons' => ['fas fa-file-upload'],
                             'translation_options' => [
-                                'base' => config('osu.beatmapset.upload_allowed'),
-                                'bonus' => config('osu.beatmapset.upload_bonus_per_ranked'),
-                                'bonus_max' => config('osu.beatmapset.upload_bonus_per_ranked_max'),
-                                'supporter_base' => config('osu.beatmapset.upload_allowed_supporter'),
-                                'supporter_bonus' => config('osu.beatmapset.upload_bonus_per_ranked_supporter'),
-                                'supporter_bonus_max' => config('osu.beatmapset.upload_bonus_per_ranked_max_supporter'),
+                                'base' => $GLOBALS['cfg']['osu']['beatmapset']['upload_allowed'],
+                                'bonus' => $GLOBALS['cfg']['osu']['beatmapset']['upload_bonus_per_ranked'],
+                                'bonus_max' => $GLOBALS['cfg']['osu']['beatmapset']['upload_bonus_per_ranked_max'],
+                                'supporter_base' => $GLOBALS['cfg']['osu']['beatmapset']['upload_allowed_supporter'],
+                                'supporter_bonus' => $GLOBALS['cfg']['osu']['beatmapset']['upload_bonus_per_ranked_supporter'],
+                                'supporter_bonus_max' => $GLOBALS['cfg']['osu']['beatmapset']['upload_bonus_per_ranked_max_supporter'],
                             ],
                         ],
                         'early_access' => [
@@ -351,15 +351,15 @@ public function supportTheGame()
                         'more_favourites' => [
                             'icons' => ['fas fa-star'],
                             'translation_options' => [
-                                'normally' => config('osu.beatmapset.favourite_limit'),
-                                'supporter' => config('osu.beatmapset.favourite_limit_supporter'),
+                                'normally' => $GLOBALS['cfg']['osu']['beatmapset']['favourite_limit'],
+                                'supporter' => $GLOBALS['cfg']['osu']['beatmapset']['favourite_limit_supporter'],
                             ],
                         ],
                         'more_friends' => [
                             'icons' => ['fas fa-user-friends'],
                             'translation_options' => [
-                                'normally' => config('osu.user.max_friends'),
-                                'supporter' => config('osu.user.max_friends_supporter'),
+                                'normally' => $GLOBALS['cfg']['osu']['user']['max_friends'],
+                                'supporter' => $GLOBALS['cfg']['osu']['user']['max_friends_supporter'],
                             ],
                         ],
                         'friend_filtering' => [

diff --git a/app/Http/Controllers/InterOp/BeatmapsetsController.php b/app/Http/Controllers/InterOp/BeatmapsetsController.php
@@ -37,7 +37,7 @@ public function broadcastRevive($id)
     public function destroy($id)
     {
         $beatmapset = Beatmapset::findOrFail($id);
-        $user = User::findOrFail(config('osu.legacy.bancho_bot_user_id'));
+        $user = User::findOrFail($GLOBALS['cfg']['osu']['legacy']['bancho_bot_user_id']);
 
         (new BeatmapsetDelete($beatmapset, $user))->handle();
 
@@ -47,7 +47,7 @@ public function destroy($id)
     public function disqualify($id)
     {
         $beatmapset = Beatmapset::findOrFail($id);
-        $user = User::findOrFail(config('osu.legacy.bancho_bot_user_id'));
+        $user = User::findOrFail($GLOBALS['cfg']['osu']['legacy']['bancho_bot_user_id']);
 
         $message = request('message') ?? null;
 

diff --git a/app/Http/Controllers/LegacyInterOpController.php b/app/Http/Controllers/LegacyInterOpController.php
@@ -288,7 +288,7 @@ public function userBatchSendMessage()
                 ];
             }
 
-            Datadog::increment(config('datadog-helper.prefix_web').'.chat.batch', 1, [
+            Datadog::increment($GLOBALS['cfg']['datadog-helper']['prefix_web'].'.chat.batch', 1, [
                 'status' => $result['status'],
             ]);
 

diff --git a/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php b/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php
@@ -169,7 +169,7 @@ public function store($roomId, $playlistId)
         $params = request()->all();
 
         $buildId = ClientCheck::findBuild($user, $params)?->getKey()
-            ?? config('osu.client.default_build_id');
+            ?? $GLOBALS['cfg']['osu']['client']['default_build_id'];
 
         $scoreToken = $room->startPlay($user, $playlistItem, $buildId);
 

diff --git a/app/Http/Controllers/NotificationsController.php b/app/Http/Controllers/NotificationsController.php
@@ -128,7 +128,7 @@ public function markRead()
 
     private function endpointUrl()
     {
-        $url = config('osu.notification.endpoint');
+        $url = $GLOBALS['cfg']['osu']['notification']['endpoint'];
 
         if (($url[0] ?? null) === '/') {
             $host = request()->getHttpHost();

diff --git a/app/Http/Controllers/Payments/XsollaController.php b/app/Http/Controllers/Payments/XsollaController.php
@@ -33,7 +33,7 @@ public function __construct()
 
     public function token()
     {
-        $projectId = config('payments.xsolla.project_id');
+        $projectId = $GLOBALS['cfg']['payments']['xsolla']['project_id'];
         $user = Auth::user();
         $order = Order::whereOrderNumber(request('orderNumber'))
             ->whereCanCheckout()
@@ -45,7 +45,7 @@ public function token()
 
         $tokenRequest = new TokenRequest($projectId, (string) $user->user_id);
         $tokenRequest
-            ->setSandboxMode(config('payments.sandbox'))
+            ->setSandboxMode($GLOBALS['cfg']['payments']['sandbox'])
             ->setExternalPaymentId($order->getOrderNumber())
             ->setUserEmail($user->user_email)
             ->setUserName($user->username)
@@ -57,14 +57,14 @@ public function token()
             ]);
 
         $xsollaClient = XsollaClient::factory([
-            'merchant_id' => config('payments.xsolla.merchant_id'),
-            'api_key' => config('payments.xsolla.api_key'),
+            'merchant_id' => $GLOBALS['cfg']['payments']['xsolla']['merchant_id'],
+            'api_key' => $GLOBALS['cfg']['payments']['xsolla']['api_key'],
         ]);
 
         // This will be used for XPayStationWidget options.
         return [
             'access_token' => $xsollaClient->createPaymentUITokenFromRequest($tokenRequest),
-            'sandbox' => config('payments.sandbox'),
+            'sandbox' => $GLOBALS['cfg']['payments']['sandbox'],
         ];
     }
 

diff --git a/app/Http/Controllers/RankingController.php b/app/Http/Controllers/RankingController.php
@@ -145,7 +145,7 @@ public function index($mode, $type)
                 });
 
             if ($type === 'performance') {
-                $isExperimentalRank = config('osu.scores.experimental_rank_as_default');
+                $isExperimentalRank = $GLOBALS['cfg']['osu']['scores']['experimental_rank_as_default'];
                 if ($this->country !== null) {
                     $stats->where('country_acronym', $this->country['acronym']);
                     // preferrable to rank_score when filtering by country.

diff --git a/app/Http/Controllers/ScoreTokensController.php b/app/Http/Controllers/ScoreTokensController.php
@@ -48,7 +48,7 @@ public function store($beatmapId)
         try {
             $scoreToken = ScoreToken::create([
                 'beatmap_id' => $beatmap->getKey(),
-                'build_id' => $build?->getKey() ?? config('osu.client.default_build_id'),
+                'build_id' => $build?->getKey() ?? $GLOBALS['cfg']['osu']['client']['default_build_id'],
                 'ruleset_id' => $params['ruleset_id'],
                 'user_id' => $user->getKey(),
             ]);
-Original file line number
+Diff line change
@@ Expand Up / @@ -288,7 +288,7 @@ public function userBatchSendMessage() @@
                     ];
                 }
-                Datadog::increment(config('datadog-helper.prefix_web').'.chat.batch', 1, [
+                Datadog::increment($GLOBALS['cfg']['datadog-helper']['prefix_web'].'.chat.batch', 1, [
                     'status' => $result['status'],
                 ]);
@@ Expand Down @@