Replace usages of branch status and date functions

Author: markrandall

bin/bumpRelease

@@ -1,10 +1,11 @@
 #!/usr/bin/env php
 <?php
+
+use phpweb\Releases\Branches;
+
 (PHP_SAPI === 'cli') or die("Please run this script using the cli sapi");
 
-require_once __DIR__ . "/../include/branches.inc";
-require_once __DIR__ . "/../include/version.inc";
-require_once __DIR__ . "/../include/releases.inc";
+require_once __DIR__ . "/../src/Releases/Branches.php";
 
 if ($_SERVER['argc'] < 1) {
 	fwrite(STDERR, "Usage: {$_SERVER['argv'][0]} major_version [ minor_version ]\n");
@@ -15,7 +16,7 @@ $major = (int) $_SERVER['argv'][1];
 isset($RELEASES[$major]) or die("Unknown major version $major");
 $minor = isset($_SERVER['argv'][2]) ? (int) $_SERVER['argv'][2] : null;
 
-$version = get_current_release_for_branch($major, $minor);
+$version = Branches::get_current_release_for_branch($major, $minor);
 $info = $RELEASES[$major][$version] ?? null;
 
 if ($info === null) {

images/supported-versions.php

@@ -137,9 +137,9 @@ function date_horiz_coord(DateTime $date) {
 	<g class="branches">
 		<?php foreach ($branches as $branch => $version): ?>
 			<?php
-            $x_release = date_horiz_coord(get_branch_release_date($branch));
-            $x_bug = date_horiz_coord(get_branch_bug_eol_date($branch));
-            $x_eol = date_horiz_coord(get_branch_security_eol_date($branch));
+            $x_release = date_horiz_coord(Branches::getBranchReleaseDate($branch));
+            $x_bug = date_horiz_coord(Branches::getBranchBugsEOLDate($branch));
+            $x_eol = date_horiz_coord(Branches::getBranchSecurityEOLDate($branch));
             ?>
 			<rect class="stable" x="<?php echo $x_release ?>" y="<?php echo $version['top'] ?>" width="<?php echo $x_bug - $x_release ?>" height="<?php echo $branch_height ?>" />
 			<rect class="security" x="<?php echo $x_bug ?>" y="<?php echo $version['top'] ?>" width="<?php echo $x_eol - $x_bug ?>" height="<?php echo $branch_height ?>" />

include/branches.inc

@@ -1,5 +1,7 @@
 <?php
 
+use phpweb\Releases\Branches;
+
 include_once __DIR__ . '/releases.inc';
 include_once __DIR__ . '/version.inc';
 
@@ -219,6 +221,7 @@ function get_eol_branches($always_include = null) {
  * MAJOR.MINOR.REVISION (the REVISION will be ignored if provided). This will
  * return either null (if no release exists on the given branch), or the usual
  * version metadata from $RELEASES for a single release. */
+#[Deprecated('Use Branches::getInitialRelease')]
 function get_initial_release($branch) {
     $branch = version_number_to_branch($branch);
     if (!$branch) {
@@ -247,6 +250,7 @@ function get_initial_release($branch) {
     return null;
 }
 
+#[Deprecated('Use Branches::getFinalRelease')]
 function get_final_release($branch) {
     $branch = version_number_to_branch($branch);
     if (!$branch) {
@@ -418,7 +422,7 @@ function get_current_release_for_branch(int $major, ?int $minor): ?string {
 
 // Get latest release version and info.
 function release_get_latest() {
-    global $RELEASES;
+    $RELEASES = Branches::getReleaseData();
 
     $version = '0.0.0';
     $current = null;
@@ -436,7 +440,7 @@ function release_get_latest() {
 
 function show_source_releases()
 {
-    global $RELEASES;
+    $RELEASES = Branches::getReleaseData();
 
     $SHOW_COUNT = 4;
 

releases/branches.php

@@ -18,9 +18,9 @@ function formatDate($date = null) {
             'branch' => $branch,
             'latest' => ($release['version'] ?? null),
             'state' => get_branch_support_state($branch),
-            'initial_release' => formatDate(get_branch_release_date($branch)),
-            'active_support_end' => formatDate(get_branch_bug_eol_date($branch)),
-            'security_support_end' => formatDate(get_branch_security_eol_date($branch)),
+            'initial_release' => formatDate(Branches::getBranchReleaseDate($branch)),
+            'active_support_end' => formatDate(Branches::getBranchBugsEOLDate($branch)),
+            'security_support_end' => formatDate(Branches::getBranchSecurityEOLDate($branch)),
         ];
     }
 }

releases/states.php

@@ -22,10 +22,10 @@ function formatDate($date = null) {
     $states[$major] = [];
     foreach ($releases as $branch => $release) {
         $states[$major][$branch] = [
-            'state' => get_branch_support_state($branch),
-            'initial_release' => formatDate(get_branch_release_date($branch)),
-            'active_support_end' => formatDate(get_branch_bug_eol_date($branch)),
-            'security_support_end' => formatDate(get_branch_security_eol_date($branch)),
+            'state' => Branches::getBranchSupportStatus($branch),
+            'initial_release' => formatDate(Branches::getBranchReleaseDate($branch)),
+            'active_support_end' => formatDate(Branches::getBranchBugsEOLDate($branch)),
+            'security_support_end' => formatDate(Branches::getBranchSecurityEOLDate($branch)),
         ];
     }
     krsort($states[$major]);

src/Releases/Branches.php

@@ -407,7 +407,7 @@ public static function getBranchReleaseDate(string $branch): ?DateTime
         return isset($initial['date']) ? new DateTime($initial['date']) : null;
     }
 
-    public static function findBranchSupportStatus(string $branch): ?string
+    public static function getBranchSupportStatus(string $branch): ?string
     {
         $initial = self::getBranchReleaseDate($branch);
         $bug = self::getBranchBugsEOLDate($branch);

supported-versions.php

@@ -58,10 +58,10 @@
 			<?php ksort($releases) ?>
 			<?php foreach ($releases as $branch => $release): ?>
 				<?php
-                $state = get_branch_support_state($branch);
-                $initial = get_branch_release_date($branch);
-                $until = get_branch_bug_eol_date($branch);
-                $eol = get_branch_security_eol_date($branch);
+                $state = Branches::getBranchSupportStatus($branch);
+                $initial = Branches::getBranchReleaseDate($branch);
+                $until = Branches::getBranchBugsEOLDate($branch);
+                $eol = Branches::getBranchSecurityEOLDate($branch);
                 $now = new DateTime('now');
                 ?>
 				<tr class="<?php echo $state ?>">