Merge branch 'master' into fix/include

Author: sy-records

phpstan.neon.dist

@@ -17,5 +17,5 @@ parameters:
 			- var/ (?)
 			- public/manual/en
 			- include/releases.inc
-			- include/pregen-news.inc
-			- include/pregen-confs.inc
+			- public/include/pregen-news.inc
+			- public/include/pregen-confs.inc

public/images/supported-versions.php

@@ -1,6 +1,8 @@
 <?php
+use phpweb\ProjectGlobals;
+
 require_once __DIR__ . '/../../include/prepend.inc';
-require_once __DIR__ . '/../../include/branches.inc';
+require_once ProjectGlobals::getProjectRoot(). '/include/branches.inc';
 
 // Sizing constants.
 $margin_left = 80;
@@ -55,6 +57,7 @@ function date_horiz_coord(DateTime $date) {
 
 if (!isset($non_standalone)) {
     header('Content-Type: image/svg+xml');
+    header('Cache-Control: public, max-age=10800'); // 3 hours
     echo '<?xml version="1.0"?>';
 }
 

include/pregen-confs.inc public/include/pregen-confs.incinclude/pregen-confs.inc renamed to public/include/pregen-confs.inc

@@ -8,5 +8,6 @@
 require_once __DIR__ . '/../../include/branches.inc';
 
 header('Content-Type: application/json; charset=UTF-8');
+header('Cache-Control: public, max-age=900');
 
 echo json_encode(get_active_branches());

include/pregen-news.inc public/include/pregen-news.incinclude/pregen-news.inc renamed to public/include/pregen-news.inc

@@ -1,8 +1,10 @@
 <?php
 
+use phpweb\ProjectGlobals;
+
 $_SERVER['BASE_PAGE'] = 'releases/index.php';
 require_once __DIR__ . '/../../include/prepend.inc';
-require_once __DIR__ . "/../../include/branches.inc";
+require_once ProjectGlobals::getProjectRoot(). '/include/branches.inc';
 
 if (isset($_GET["serialize"]) || isset($_GET["json"])) {
     $RELEASES = $RELEASES + $OLDRELEASES;

public/releases/active.php

@@ -1,10 +1,19 @@
 <?php
+
+use phpweb\ProjectGlobals;
+
 $_SERVER['BASE_PAGE'] = 'supported-versions.php';
 
 require_once __DIR__ . '/../include/prepend.inc';
-require_once __DIR__ . '/../include/branches.inc';
+require_once ProjectGlobals::getProjectRoot(). '/include/branches.inc';
 
-site_header('Supported Versions', ['css' => ['supported-versions.css']]);
+site_header(
+	'Supported Versions',
+	[
+		'css' => ['supported-versions.css'],
+		'cache_control' => 3 * 60 * 60, // 3 hours
+	]
+);
 
 // Version notes: if you need to make a note about a version having an unusual
 // support lifetime, add it under a heading with an anchor, and add the anchor