run pint

Author: tarrow

app/Services/MediaWikiHostResolver.php

@@ -4,28 +4,25 @@
 
 use App\Wiki;
 
-class MediaWikiHostResolver
-{
+class MediaWikiHostResolver {
     // TODO: Move this mapping to a config file that doesn't require updating this code when doing a MW update?
     /** @var array<string, string> Map of DB version strings to MediaWiki backend version strings */
     private const DB_VERSION_TO_MW_VERSION = [
         'mw1.39-wbs1' => '139-app',
-        'mw1.43-wbs1' => '143-app'
+        'mw1.43-wbs1' => '143-app',
     ];
 
     // This service could have other methods in future, e.g. getBackendHostForWiki()
     // public function getBackendHostForWiki(Wiki $wiki): string {
     //     return $this->getBackendHostForDomain($wiki->domain);
     // }
 
-    public function getBackendHostForDomain(string $domain): string
-    {
+    public function getBackendHostForDomain(string $domain): string {
         // TODO: should 'backend.default.svc.cluster.local' be an env var e.g. PLATFORM_MW_BACKEND_HOST_SUFFIX?
         return sprintf('mediawiki-%s-backend.default.svc.cluster.local', $this->getMwVersionForDomain($domain));
     }
 
-    public function getMwVersionForDomain(string $domain): string
-    {
+    public function getMwVersionForDomain(string $domain): string {
         $dbVersion = Wiki::where('domain', $domain)
             ->whereNull('deleted_at')
             ->leftJoin('wiki_dbs', 'wiki_id', '=', 'wikis.id')

app/Wiki.php

@@ -73,7 +73,7 @@ public function wikiDbVersion() {
         /**
          * @psalm-suppress InvalidArgument
          */
-        return $this->hasOne(WikiDb::class)->select(['id', 'wiki_id', 'version']);
+        return $this->hasOne(WikiDb::class)->version;
     }
 
     // TODO these should just be on the backend model? =] Or marked as a private relationship or something?

tests/Services/MediaWikiHostResolverTest.php

@@ -5,19 +5,16 @@
 use App\Services\MediaWikiHostResolver;
 use App\Wiki;
 use App\WikiDb;
-use App\WikiDomain;
 use Faker\Factory;
-use Faker\Generator;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
-class MediaWikiHostResolverTest extends TestCase
-{
+class MediaWikiHostResolverTest extends TestCase {
     use RefreshDatabase;
-    public function testResolverRoutesToCorrectHost(): void
-    {
-        $domain = (new Factory())->create()->unique()->text(30);
+
+    public function testResolverRoutesToCorrectHost(): void {
+        $domain = (new Factory)->create()->unique()->text(30);
         $this->createWiki($domain, 'mw1.39-wbs1');
-        $resolver = new MediaWikiHostResolver();
+        $resolver = new MediaWikiHostResolver;
         $this->assertEquals(
             'mediawiki-139-app-backend.default.svc.cluster.local',
             $resolver->getBackendHostForDomain($domain)
@@ -36,8 +33,7 @@ private function createWiki(string $domain, string $version) {
         ]);
     }
 
-    public function testResolverThrowsIfUnableToFindHostInMap(): void
-    {
+    public function testResolverThrowsIfUnableToFindHostInMap(): void {
         $this->assertTrue(true);
     }
 }