Refactor Version class

pascalchevrel · Apr 2, 2024 · fcf172d · fcf172d
1 parent 3a1c0a8
commit fcf172d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 22 deletions.
diff --git a/app/classes/ReleaseInsights/Release.php b/app/classes/ReleaseInsights/Release.php
@@ -22,7 +22,7 @@ public function __construct(
         public readonly string $product_details = 'https://product-details.mozilla.org/1.0/',
     )
     {
-        $this->version = Version::get($version);
+        $this->version = (new Version($version))->normalized;
     }
 
     /**
@@ -85,7 +85,7 @@ public function getSchedule(): array
 
         if (! in_array( (int) $this->version, $this->no_planned_dot_releases)) {
             $schedule += ['planned_dot_release' => $date($release->modify('+2 weeks 00:00'))];
-        }
+       }
 
         // Sort the schedule by date, needed for schedules with a fixup
         asort($schedule);

diff --git a/app/classes/ReleaseInsights/Version.php b/app/classes/ReleaseInsights/Version.php
@@ -6,6 +6,21 @@
 
 class Version
 {
+    public readonly string $short;
+
+    /**
+     * Get the major version number (91) from a string such as 91.0.1
+     */
+    public readonly int $int;
+    public readonly string $normalized;
+
+    public function __construct(public readonly string $version)
+    {
+        $this->short = explode('.', $version)[0];
+        $this->int = (int) $this->short;
+        $this->normalized = $this->get($version);
+    }
+
     /**
      * Get the version number provided by the user in the query string
      * via the $_GET['version'] global and return a sanitized for a major
@@ -40,13 +55,6 @@ public static function get(?string $version = null): string
         return (string) number_format(abs((int) $version), 1, '.', '');
     }
 
-    /**
-     * Get the major version number (91) from a string such as 91.0.1
-     */
-    public static function getMajor(string $version): int
-    {
-        return (int) explode('.', $version)[0];
-    }
 
     /**
      * Decrement a version number (91) provided as a string such as 91.0

diff --git a/app/models/calendar.php b/app/models/calendar.php
@@ -21,7 +21,7 @@
 
     $future += [
         $version => [
-            'version'       => Version::getMajor($version),
+            'version'       => (new Version($version))->int,
             'release_date'  => $date,
             'nightly_start' => $version_data['nightly_start'],
             'soft_freeze'   => $version_data['soft_code_freeze'],

diff --git a/app/models/esr_release.php b/app/models/esr_release.php
@@ -12,7 +12,7 @@
 
 foreach ($upcoming_releases as $k => $v) {
     $esr_calendar[] = [
-        'release' => Version::getMajor($k),
+        'release' => (new Version($k))->int,
         'esr'     => ESR::getMainDotVersion(ESR::getVersion((int) $k)),
         'old_esr' => is_null(ESR::getOlderSupportedVersion((int) $k))
             ? ''

diff --git a/app/models/home.php b/app/models/home.php
@@ -59,7 +59,8 @@
 
 $latest_nightly = $latest_nightly['platforms']['WINNT_x86_64-msvc']['locales']['en-US']['buildID'] ?? 'N/A';
 
-$beta_is_the_next_ESR = Version::getMajor(FIREFOX_BETA) == (int) ESR::getVersion(Version::getMajor(FIREFOX_BETA));
+$beta_version = (new Version(FIREFOX_BETA))->int;
+$beta_is_the_next_ESR = $beta_version == (int) ESR::getVersion($beta_version);
 
 return [
     $beta_cycle_dates,

diff --git a/tests/Unit/ReleaseInsights/VersionTest.php b/tests/Unit/ReleaseInsights/VersionTest.php
@@ -27,16 +27,6 @@
 
 });
 
-test('Version::getMajor', function ($input, $output) {
-    expect($output)->toEqual(Version::getMajor($input));
-})->with([
-    ['91.1.0', 91],
-    ['100', 100],
-    ['100.5', 100],
-    ['78.0.3', 78],
-]);
-
-
 test('Version::decrement', function ($version, $number, $output) {
     expect($output)->toEqual(Version::decrement($version, $number));
 })->with([