Merge pull request #11040 from nanaya/singletons

Put singletons in single directory

Author: notbakaneko

app/Http/Middleware/LegacyInterOpAuth.php

@@ -5,7 +5,7 @@
 
 namespace App\Http\Middleware;
 
-use App\Libraries\OsuAuthorize;
+use App\Singletons\OsuAuthorize;
 use Carbon\Carbon;
 use Closure;
 

app/Providers/AppServiceProvider.php

@@ -6,24 +6,11 @@
 namespace App\Providers;
 
 use App\Hashing\OsuHashManager;
-use App\Libraries\AssetsManifest;
-use App\Libraries\ChatFilters;
-use App\Libraries\CleanHTML;
-use App\Libraries\Countries;
-use App\Libraries\Groups;
-use App\Libraries\Ip2Asn;
-use App\Libraries\LayoutCache;
-use App\Libraries\LocalCacheManager;
-use App\Libraries\Medals;
-use App\Libraries\Mods;
 use App\Libraries\MorphMap;
-use App\Libraries\OsuAuthorize;
 use App\Libraries\OsuCookieJar;
 use App\Libraries\OsuMessageSelector;
 use App\Libraries\RateLimiter;
-use App\Libraries\RouteSection;
-use App\Libraries\Smilies;
-use App\Libraries\User\ScorePins;
+use App\Singletons;
 use Datadog;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Http\Request;
@@ -39,23 +26,23 @@
 class AppServiceProvider extends ServiceProvider
 {
     const LOCAL_CACHE_SINGLETONS = [
-        'chat-filters' => ChatFilters::class,
-        'countries' => Countries::class,
-        'groups' => Groups::class,
-        'layout-cache' => LayoutCache::class,
-        'medals' => Medals::class,
-        'smilies' => Smilies::class,
+        'chat-filters' => Singletons\ChatFilters::class,
+        'countries' => Singletons\Countries::class,
+        'groups' => Singletons\Groups::class,
+        'layout-cache' => Singletons\LayoutCache::class,
+        'medals' => Singletons\Medals::class,
+        'smilies' => Singletons\Smilies::class,
     ];
 
     const SINGLETONS = [
-        'OsuAuthorize' => OsuAuthorize::class,
-        'assets-manifest' => AssetsManifest::class,
-        'clean-html' => CleanHTML::class,
-        'ip2asn' => Ip2Asn::class,
-        'local-cache-manager' => LocalCacheManager::class,
-        'mods' => Mods::class,
-        'route-section' => RouteSection::class,
-        'score-pins' => ScorePins::class,
+        'OsuAuthorize' => Singletons\OsuAuthorize::class,
+        'assets-manifest' => Singletons\AssetsManifest::class,
+        'clean-html' => Singletons\CleanHTML::class,
+        'ip2asn' => Singletons\Ip2Asn::class,
+        'local-cache-manager' => Singletons\LocalCacheManager::class,
+        'mods' => Singletons\Mods::class,
+        'route-section' => Singletons\RouteSection::class,
+        'score-pins' => Singletons\UserScorePins::class,
     ];
 
     /**

app/Libraries/AssetsManifest.php app/Singletons/AssetsManifest.php

@@ -5,7 +5,7 @@
 
 declare(strict_types=1);
 
-namespace App\Libraries;
+namespace App\Singletons;
 
 use Exception;
 use Illuminate\Support\HtmlString;

app/Libraries/ChatFilters.php app/Singletons/ChatFilters.php

@@ -3,7 +3,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
-namespace App\Libraries;
+namespace App\Singletons;
 
 use App\Models\ChatFilter;
 use App\Traits\Memoizes;

app/Libraries/CleanHTML.php app/Singletons/CleanHTML.php

@@ -3,7 +3,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
-namespace App\Libraries;
+namespace App\Singletons;
 
 use HTMLPurifier;
 use HTMLPurifier_Config;

app/Libraries/Countries.php app/Singletons/Countries.php

@@ -5,7 +5,7 @@
 
 declare(strict_types=1);
 
-namespace App\Libraries;
+namespace App\Singletons;
 
 use App\Models\Country;
 use App\Traits\Memoizes;

app/Libraries/Groups.php app/Singletons/Groups.php

@@ -3,7 +3,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
-namespace App\Libraries;
+namespace App\Singletons;
 
 use App\Models\Group;
 use App\Traits\Memoizes;

app/Libraries/Ip2Asn.php app/Singletons/Ip2Asn.php

@@ -5,9 +5,10 @@
 
 declare(strict_types=1);
 
-namespace App\Libraries;
+namespace App\Singletons;
 
 use App\Enums\Ip;
+use App\Libraries\Ip2AsnUpdater;
 use Exception;
 use WeakMap;
 

app/Libraries/LayoutCache.php app/Singletons/LayoutCache.php

@@ -5,7 +5,7 @@
 
 declare(strict_types=1);
 
-namespace App\Libraries;
+namespace App\Singletons;
 
 use App\Traits\Memoizes;
 

app/Libraries/LocalCacheManager.php app/Singletons/LocalCacheManager.php

@@ -5,7 +5,7 @@
 
 declare(strict_types=1);
 
-namespace App\Libraries;
+namespace App\Singletons;
 
 class LocalCacheManager
 {

app/Libraries/Medals.php app/Singletons/Medals.php

@@ -5,7 +5,7 @@
 
 declare(strict_types=1);
 
-namespace App\Libraries;
+namespace App\Singletons;
 
 use App\Models\Achievement;
 use App\Traits\Memoizes;

app/Libraries/Mods.php app/Singletons/Mods.php

@@ -5,7 +5,7 @@
 
 declare(strict_types=1);
 
-namespace App\Libraries;
+namespace App\Singletons;
 
 use App\Exceptions\InvariantException;
 use Ds\Set;

app/Libraries/OsuAuthorize.php app/Singletons/OsuAuthorize.php

@@ -3,9 +3,11 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
-namespace App\Libraries;
+namespace App\Singletons;
 
 use App\Exceptions\AuthorizationCheckException;
+use App\Libraries\AuthorizationResult;
+use App\Libraries\Commentable;
 use App\Models\Beatmap;
 use App\Models\BeatmapDiscussion;
 use App\Models\BeatmapDiscussionPost;

app/Libraries/RouteSection.php app/Singletons/RouteSection.php

@@ -3,7 +3,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
-namespace App\Libraries;
+namespace App\Singletons;
 
 class RouteSection
 {

app/Libraries/Smilies.php app/Singletons/Smilies.php

@@ -5,7 +5,7 @@
 
 declare(strict_types=1);
 
-namespace App\Libraries;
+namespace App\Singletons;
 
 use App\Models\Smiley;
 use App\Traits\Memoizes;

app/Libraries/User/ScorePins.php app/Singletons/UserScorePins.php

@@ -5,15 +5,15 @@
 
 declare(strict_types=1);
 
-namespace App\Libraries\User;
+namespace App\Singletons;
 
 use App\Libraries\MorphMap;
 use App\Models\Beatmap;
 use App\Models\Score;
 use App\Models\ScorePin;
 use App\Models\Solo;
 
-class ScorePins
+class UserScorePins
 {
     const REQUEST_ATTRIBUTE_KEY_PREFIX = 'current_user_score_pins:';
 

tests/Libraries/Ip2AsnTest.php tests/Singletons/Ip2AsnTest.php

@@ -3,9 +3,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
-namespace Tests\Libraries;
+namespace Tests\Singletons;
 
-use App\Libraries\Ip2Asn;
+use App\Singletons\Ip2Asn;
 use Tests\TestCase;
 
 class Ip2AsnTest extends TestCase

tests/Libraries/ModsTest.php tests/Singletons/ModsTest.php

@@ -3,7 +3,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
-namespace Tests\Libraries;
+namespace Tests\Singletons;
 
 use App\Enums\Ruleset;
 use App\Exceptions\InvariantException;