cs fixes

Author: SniperSister

app/Console/Commands/PerformUpdate.php

@@ -28,9 +28,9 @@ class PerformUpdate extends Command
     /**
      * Execute the console command.
      */
-    public function handle()
+    public function handle(): int
     {
-        $targetVersion = $this->getVersionChoices();
+        $targetVersion = $this->queryTargetVersion();
 
         /** @var Site $site */
         $site = Site::findOrFail($this->input->getArgument('siteId'));

app/Console/Commands/QueueUpdates.php

@@ -30,9 +30,9 @@ class QueueUpdates extends Command
     /**
      * Execute the console command.
      */
-    public function handle()
+    public function handle(): int
     {
-        $targetVersion = $this->getVersionChoices();
+        $targetVersion = $this->queryTargetVersion();
 
         $this->confirm("Are you sure you would like to push the updates for " . $targetVersion);
 

app/Console/Traits/RequestTargetVersion.php

@@ -6,15 +6,13 @@
 
 trait RequestTargetVersion
 {
-    protected function getVersionChoices()
+    protected function queryTargetVersion(): string
     {
         $releases = (new TufFetcher())->getReleases();
 
-        $targetVersion = $this->choice(
+        return $this->choice( // @phpstan-ignore-line
             "What's the target version?",
-            $releases->map(fn ($release) => $release["version"])->values()->toArray()
+            $releases->map(fn ($release) => $release["version"])->values()->toArray() // @phpstan-ignore-line
         );
-
-        return $targetVersion;
     }
 }

app/Http/Controllers/Api/V1/SiteController.php

@@ -48,8 +48,8 @@ public function register(SiteRequest $request): JsonResponse
             return $this->error($e->getMessage(), 500);
         }
 
-        // If successful save site
-        $site = new Site();
+        // If successful create or update site
+        $site = Site::where('url', $url)->where('key', $key)->first() ?? new Site();
 
         $site->key = $key;
         $site->url = $url;
@@ -77,14 +77,14 @@ public function check(SiteRequest $request): JsonResponse
 
         try {
             /** @var Site $site */
-            $site = Site::where('url', $url)->where('key', $key)->findOrFail();
+            $site = Site::where('url', $url)->where('key', $key)->firstOrFail();
         } catch (\Exception $e) {
             return $this->error("Not found", 404);
         }
 
         // Do a health check
         try {
-            $site->getConnection()->checkHealth();
+            $site->connection->checkHealth();
         } catch (ServerException|ClientException $e) {
             return $this->error($e->getMessage(), 400);
         } catch (\Exception $e) {
@@ -105,7 +105,7 @@ public function delete(SiteRequest $request): JsonResponse
         $key = $request->string('key');
 
         try {
-            $site = Site::where('url', $url)->where('key', $key)->findOrFail();
+            $site = Site::where('url', $url)->where('key', $key)->firstOrFail();
         } catch (\Exception $e) {
             return $this->error("Not found", 404);
         }

app/Jobs/UpdateSite.php

@@ -63,6 +63,7 @@ public function handle(): void
         }
 
         $prepareResult = $connection->prepareUpdate(["targetVersion" => $this->targetVersion]);
+
         // Perform the actual extraction
         $this->performExtraction($prepareResult);
 

app/RemoteSite/Connection.php

@@ -20,7 +20,7 @@
 /**
  * @method  HealthCheckResponse checkHealth()
  * @method  GetUpdateResponse getUpdate()
- * @method  PrepareUpdateResponse prepareUpdate(string $targetVersion)
+ * @method  PrepareUpdateResponse prepareUpdate(array<string,string> $data)
  * @method  FinalizeUpdateResponse finalizeUpdate()
  */
 class Connection