Fix cs

Author: SniperSister

app/Enum/WebserviceEndpoint.php

@@ -4,8 +4,8 @@
 
 enum WebserviceEndpoint: string
 {
-    case HEALTH_CHECK = "/api/index.php/v1/updates/health";
-    case FETCH_UPDATES = "/api/index.php/v1/updates/fetch";
-    case PREPARE_UPDATE = "/api/index.php/v1/updates/prepare";
-    case FINALIZE_UPDATE = "/api/index.php/v1/updates/finalize";
+    case HEALTH_CHECK = "/api/index.php/v1/joomlaupdate/healthcheck";
+    case FETCH_UPDATES = "/api/index.php/v1/joomlaupdate/fetchUpdate";
+    case PREPARE_UPDATE = "/api/index.php/v1/joomlaupdate/prepareUpdate";
+    case FINALIZE_UPDATE = "/api/index.php/v1/joomlaupdate/finalizeUpdate";
 }

app/Jobs/CheckSiteHealth.php

@@ -5,7 +5,7 @@
 namespace App\Jobs;
 
 use App\Models\Site;
-use app\Remotesite\Connection;
+use App\RemoteSite\Connection;
 use Carbon\Carbon;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;
@@ -29,19 +29,11 @@ public function handle(): void
         /** @var Connection $connection */
         $connection = $this->site->connection;
 
-        $response = $connection->checkHealth();
-
-        $healthData = collect($response);
+        $healthData = $connection->checkHealth();
 
         // Write updated data to DB
         $this->site->fill(
-            $healthData->only([
-                'php_version',
-                'db_type',
-                'db_version',
-                'cms_version',
-                'server_os'
-            ])->toArray()
+            $healthData->toArray()
         );
 
         // @phpstan-ignore-next-line

app/Jobs/UpdateSite.php

@@ -5,7 +5,7 @@
 namespace App\Jobs;
 
 use App\Models\Site;
-use app\Remotesite\Connection;
+use App\RemoteSite\Connection;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;
 

app/Models/Site.php

@@ -4,7 +4,7 @@
 
 namespace App\Models;
 
-use App\Remotesite\Connection;
+use App\RemoteSite\Connection;
 use Illuminate\Database\Eloquent\Model;
 
 class Site extends Model

app/RemoteSite/Connection.php

@@ -6,7 +6,6 @@
 
 use App\Enum\HttpMethod;
 use App\Enum\WebserviceEndpoint;
-use App\RemoteSite\Responses\HealthCheck;
 use App\RemoteSite\Responses\HealthCheck as HealthCheckResponse;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\RequestException;
@@ -21,14 +20,14 @@ public function __construct(protected readonly string $baseUrl, protected readon
     {
     }
 
-    public function checkHealth(): HealthCheck
+    public function checkHealth(): HealthCheckResponse
     {
         $healthData = $this->performWebserviceRequest(
             HttpMethod::GET,
             WebserviceEndpoint::HEALTH_CHECK
         );
 
-        return HealthCheckResponse::from($healthData);
+        return HealthCheckResponse::from($healthData['data']['attributes']);
     }
 
     public function performExtractionRequest(array $data): array
@@ -58,7 +57,7 @@ protected function performWebserviceRequest(
             $method->name,
             $this->baseUrl . $endpoint->value,
             [
-                'Authorization' => 'JUpdate-Token ' . $this->key
+                'X-JUpdate-Token' => $this->key
             ]
         );
 

app/RemoteSite/Responses/BaseResponse.php

@@ -4,7 +4,7 @@
 
 abstract class BaseResponse
 {
-    public static function from(array $data): self
+    public static function from(array $data): static
     {
         $reflect = new \ReflectionClass(static::class);
         $properties = $reflect->getProperties(\ReflectionProperty::IS_PUBLIC);
@@ -21,4 +21,9 @@ public static function from(array $data): self
 
         return $reflect->newInstanceArgs($arguments);
     }
+
+    public function toArray(): array
+    {
+        return get_object_vars($this);
+    }
 }