Fix more issues with variable declaration at top level of files...

Author: markrandall

include/branches.inc

@@ -3,13 +3,17 @@
 include_once __DIR__ . '/releases.inc';
 include_once __DIR__ . '/version.inc';
 
-$BRANCHES = require __DIR__ . '/branch-overrides.inc';
-
 /* Time to keep EOLed branches in the array returned by get_active_branches(),
  * which is used on the front page download links and the supported versions
  * page. (Currently 28 days.) */
 $KEEP_EOL = new DateInterval('P28D');
 
+function get_branch_overrides(): array
+{
+    static $cache = null;
+    return $cache ??= require __DIR__ . '/branch-overrides.inc';
+}
+
 function format_interval($from, DateTime $to) {
     try {
         $from_obj = $from instanceof DateTime ? $from : new DateTime($from);
@@ -225,8 +229,9 @@ function get_initial_release($branch) {
         return $GLOBALS['OLDRELEASES'][$major]["$branch.0"];
     }
 
-    if(isset($GLOBALS['BRANCHES'][$branch])) {
-        return $GLOBALS['BRANCHES'][$branch];
+    $overrides = get_branch_overrides();
+    if(isset($overrides[$branch])) {
+        return $overrides[$branch];
     }
 
     /* If there's only been one release on the branch, it won't be in
@@ -276,8 +281,9 @@ function get_final_release($branch) {
 //#[Deprecated('Use VersionData->bugfixesEOL')]
 function get_branch_bug_eol_date($branch): ?DateTime
 {
-    if (isset($GLOBALS['BRANCHES'][$branch]['stable'])) {
-        return new DateTime($GLOBALS['BRANCHES'][$branch]['stable']);
+    $overrides = get_branch_overrides();
+    if (isset($overrides[$branch]['stable'])) {
+        return new DateTime($overrides[$branch]['stable']);
     }
 
     $date = get_branch_release_date($branch);
@@ -296,8 +302,9 @@ function get_branch_bug_eol_date($branch): ?DateTime
 //#[Deprecated('Use VersionData->securityEOL')]
 function get_branch_security_eol_date($branch): ?DateTime
 {
-    if (isset($GLOBALS['BRANCHES'][$branch]['security'])) {
-        return new DateTime($GLOBALS['BRANCHES'][$branch]['security']);
+    $overrides = get_branch_overrides();
+    if (isset($overrides[$branch]['security'])) {
+        return new DateTime($overrides[$branch]['security']);
     }
 
     /* Versions before 5.3 are based solely on the final release date in