refactor release data to DTO for proper type hinting #20

joomla-projects · Jan 18, 2025 · 3d7ca42 · 3d7ca42
1 parent 5b6f70a
commit 3d7ca42
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 13 deletions.
diff --git a/app/Jobs/UpdateSite.php b/app/Jobs/UpdateSite.php
@@ -6,6 +6,7 @@
 
 use App\Models\Site;
 use App\RemoteSite\Connection;
+use App\RemoteSite\Responses\HealthCheck;
 use App\RemoteSite\Responses\PrepareUpdate;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;

diff --git a/app/TUF/ReleaseData.php b/app/TUF/ReleaseData.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\TUF;
+
+use App\DTO\BaseDTO;
+
+class ReleaseData extends BaseDTO
+{
+    public function __construct(
+        public readonly string $version,
+        public readonly string $stability
+    ) {
+    }
+}
diff --git a/app/TUF/TufFetcher.php b/app/TUF/TufFetcher.php
@@ -41,18 +41,20 @@ function () {
                             throw new MetadataException("Empty target custom attribute");
                         }
 
-                        return [$target['custom']['version'] => $target['custom']];
+                        $release = ReleaseData::from($target['custom']);
+
+                        return [$release->version => $release];
                     });
             }
         );
     }
 
     public function getLatestVersionForBranch(int $branch): string
     {
-        return $this->getReleases()->filter(function ($release) {
-            return $release["stability"] === "Stable";
-        })->sort(function ($releaseA, $releaseB) {
-            return version_compare($releaseA["version"], $releaseB["version"], '<');
+        return $this->getReleases()->filter(function (ReleaseData $release) {
+            return $release->stability === "Stable";
+        })->sort(function (ReleaseData $releaseA, ReleaseData $releaseB) {
+            return version_compare($releaseA->version, $releaseB->version, '<');
         })->pluck('version')->first();
     }
 }
diff --git a/tests/Unit/TUF/TufFetcherTest.php b/tests/Unit/TUF/TufFetcherTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Unit\TUF;
 
 use App\TUF\EloquentModelStorage;
+use App\TUF\ReleaseData;
 use App\TUF\TufFetcher;
 use Illuminate\Support\Facades\App;
 use Tests\TestCase;
@@ -24,13 +25,15 @@ public function testGetReleasesConvertsLegitResponse()
             "Joomla_5.1.2-Stable-Upgrade_Package.zip" => [
                 "custom" => [
                     "description" => "Joomla! 5.1.2 Release",
-                    "version" => "5.1.2"
+                    "version" => "5.1.2",
+                    "stability" => "stable",
                 ]
             ],
             "Joomla_5.2.1-Stable-Upgrade_Package.zip" => [
                 "custom" => [
                     "description" => "Joomla! 5.2.1 Release",
-                    "version" => "5.2.1"
+                    "version" => "5.2.1",
+                    "stability" => "stable",
                 ]
             ]
         ]));
@@ -39,14 +42,16 @@ public function testGetReleasesConvertsLegitResponse()
         $result = $object->getReleases();
 
         $this->assertEquals([
-            "5.1.2" => [
+            "5.1.2" => ReleaseData::from([
                 "description" => "Joomla! 5.1.2 Release",
-                "version" => "5.1.2"
-            ],
-            "5.2.1" => [
+                "version" => "5.1.2",
+                "stability" => "stable",
+            ]),
+            "5.2.1" => ReleaseData::from([
                 "description" => "Joomla! 5.2.1 Release",
-                "version" => "5.2.1"
-            ],
+                "version" => "5.2.1",
+                "stability" => "stable",
+            ]),
         ], $result->toArray());
     }