Replace usages of get_all_branches and get_active_branches

Author: markrandall

images/supported-versions.php

@@ -1,4 +1,7 @@
 <?php
+
+use phpweb\Releases\Branches;
+
 include_once __DIR__ . '/../include/prepend.inc';
 include_once __DIR__ . '/../include/branches.inc';
 
@@ -15,7 +18,7 @@ function branches_to_show() {
     $branches = [];
 
     // Flatten out the majors.
-    foreach (get_all_branches() as $major_branches) {
+    foreach (Branches::get_all_branches() as $major_branches) {
         foreach ($major_branches as $branch => $version) {
             if (version_compare($branch, '5.3', 'ge') && get_branch_security_eol_date($branch) > min_date()) {
                 $branches[$branch] = $version;

include/branches.inc

@@ -68,6 +68,7 @@ function version_number_to_branch(string $version): ?string {
     return null;
 }
 
+#[Deprecated('Use Branches::get_all_branches()')]
 function get_all_branches() {
     $branches = [];
 
@@ -105,7 +106,8 @@ function get_all_branches() {
     return $branches;
 }
 
-function get_active_branches($include_recent_eols = true) {
+#[DEprecated('Use Branches::active()')]
+function get_active_branches(bool $include_recent_eols = true) {
     $branches = [];
     $now = new DateTime();
 

include/gpg-keys.inc

@@ -1,4 +1,7 @@
 <?php
+
+use phpweb\Releases\Branches;
+
 require __DIR__ . '/branches.inc';
 
 // GPG keys used for signing releases.
@@ -224,7 +227,7 @@ function gpg_key_get_branches(bool $activeOnly): array {
 
     if (!$activeOnly) { return $branches; }
 
-    $active = get_active_branches();
+    $active = Branches::active();
     return array_filter($branches, function ($branch) use ($active) {
         [$major] = explode('.', $branch, 2);
         return isset($active[$major][$branch]);

index.php

@@ -1,6 +1,7 @@
 <?php
 
 use phpweb\News\NewsHandler;
+use phpweb\Releases\Branches;
 
 (function ($uri): void {
     // Special redirect cases not able to be captured in error.php
@@ -92,7 +93,7 @@
 EOF;
 
 $intro .= "<ul class='hero__versions'>\n";
-$active_branches = get_active_branches();
+$active_branches = Branches::active();
 krsort($active_branches);
 foreach ($active_branches as $major => $releases) {
     krsort($releases);

releases/active.php

@@ -1,10 +1,12 @@
 <?php
 
+use phpweb\Releases\Branches;
+
 $_SERVER['BASE_PAGE'] = 'releases/active.php';
 
 include_once __DIR__ . '/../include/prepend.inc';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/branches.inc';
 
 header('Content-Type: application/json; charset=UTF-8');
 
-echo json_encode(get_active_branches());
+echo json_encode(Branches::active());

releases/branches.php

@@ -1,5 +1,7 @@
 <?php
 
+use phpweb\Releases\Branches;
+
 include_once __DIR__ . '/../include/prepend.inc';
 include_once __DIR__ . '/../include/branches.inc';
 
@@ -10,7 +12,7 @@ function formatDate($date = null) {
 }
 
 $current = [];
-foreach (get_all_branches() as $major => $releases) {
+foreach (Branches::get_all_branches() as $major => $releases) {
     foreach ($releases as $branch => $release) {
         $current[$branch] = [
             'branch' => $branch,

releases/index.php

@@ -1,5 +1,7 @@
 <?php
 
+use phpweb\Releases\Branches;
+
 $_SERVER['BASE_PAGE'] = 'releases/index.php';
 include_once __DIR__ . '/../include/prepend.inc';
 include_once __DIR__ . "/../include/branches.inc";
@@ -10,7 +12,7 @@
     $machineReadable = [];
 
     $supportedVersions = [];
-    foreach (get_active_branches(false) as $major => $releases) {
+    foreach (Branches::active(false) as $major => $releases) {
         $supportedVersions[$major] = array_keys($releases);
     }
 

releases/states.php

@@ -3,6 +3,8 @@
 # Please use /releases/branches.php instead.
 # This API *may* be removed at an indeterminate point in the future.
 
+use phpweb\Releases\Branches;
+
 $_SERVER['BASE_PAGE'] = 'releases/active.php';
 
 include_once __DIR__ . '/../include/prepend.inc';
@@ -16,7 +18,7 @@ function formatDate($date = null) {
     return $date !== null ? $date->format('c') : null;
 }
 
-foreach (get_all_branches() as $major => $releases) {
+foreach (Branches::get_all_branches() as $major => $releases) {
     $states[$major] = [];
     foreach ($releases as $branch => $release) {
         $states[$major][$branch] = [

supported-versions.php

@@ -1,4 +1,7 @@
 <?php
+
+use phpweb\Releases\Branches;
+
 $_SERVER['BASE_PAGE'] = 'supported-versions.php';
 
 include_once __DIR__ . '/include/prepend.inc';
@@ -51,7 +54,7 @@
 		</tr>
 	</thead>
 	<tbody>
-		<?php foreach (get_active_branches(false) as $major => $releases): ?>
+		<?php foreach (Branches::active(false) as $major => $releases): ?>
 			<?php ksort($releases) ?>
 			<?php foreach ($releases as $branch => $release): ?>
 				<?php