Landing Revamp 2026 (Draft)

.docker/dev/Dockerfile

@@ -0,0 +1,15 @@
+# Development Docker
+#
+# Provides the main runtime engine as well as tooling for running
+# during development
+#
+# NOTES:
+# - Does not copy and files in as it is expected to be handled via a mount
+
+FROM php:8.4-cli
+
+# Codebase doesn't have production flag so we negate it instead with
+# the DEVELOPMENT flag
+ENV DEVELOPMENT=1
+
+WORKDIR /app

.docker/prod/Dockerfile

@@ -0,0 +1,15 @@
+# "Production" Docker
+#
+# Provides the main runtime for PHP when deploying to a "Production"
+# or "Testing" environment that needs a full container using
+# the inbuilt server (not recommended).
+
+FROM php:8.2-cli
+
+# All of the files from the source location are copied into
+# the /app folder
+RUN mkdir /app
+WORKDIR /app
+COPY . /app
+
+RUN php -S 8080 .router

.dockerignore

@@ -0,0 +1,6 @@
+# .dockerignore
+.git
+.gitmodules
+.gitattributes
+.idea
+build-deploy.sh

.router.php

@@ -4,12 +4,19 @@
 
 $filename = $_SERVER["PATH_INFO"] ?? $_SERVER["SCRIPT_NAME"];
 
+//die(print_r($_SERVER, true));
+
+//$_SERVER['HTTP_HOST'] = '';
+//$_SERVER['BASE_PAGE'] = '/';
+//$_SERVER['SERVER_NAME'] = 'localhost';
+
 if (!file_exists($_SERVER["DOCUMENT_ROOT"] . $filename)) {
     require_once __DIR__ . '/error.php';
 
     return;
 }
 
+
 /* This could be an image or whatever, so don't try to compress it */
 ini_set("zlib.output_compression", 0);
 return false;

bin/bumpRelease

@@ -34,7 +34,7 @@ $OLDRELEASES[$major] = array_merge(
 );
 
 file_put_contents(__DIR__ . "/../include/releases.inc", [
-	"<?php\n\$OLDRELEASES = ",
+	'<?php' . PHP_EOL . PHP_EOL . '$GLOBALS[\'OLDRELEASES\'] = $OLDRELEASES = ',
 	var_export($OLDRELEASES, true),
 	";\n",
 ]);

bin/compile-release-highlights.php

@@ -0,0 +1,148 @@
+<?php
+
+if (php_sapi_name() !== 'cli') {
+    die('This script must be run from the command line.');
+}
+
+final readonly class Segment
+{
+    /**
+     * @param list<array<string, string>> $headers
+     */
+    public function __construct(
+        public array $headers,
+        public string $body,
+    ) {
+    }
+
+    public function getSingleHeader(string $key, mixed $default = null): mixed
+    {
+        return $this->headers[$key][0] ?? $default;
+    }
+
+    public function getHeader(string $key): array
+    {
+        return $this->headers[$key] ?? [];
+    }
+}
+
+/**
+ * @return array<string, Segment[]>
+ */
+function readSegmentedFile(string $path): array
+{
+    $contents = file_get_contents($path)
+        ?: throw new ValueError('Unable to read ' . $path);
+    $contents = str_replace("\r\n", "\n", $contents);
+    $contentSections = explode('==============================================', $contents);
+    $grouped = [];
+
+    foreach($contentSections as $section) {
+        $blocks = explode("\n\n", trim($section), 2);
+
+        /* like HTTP, blocks are a set of key-values, followed by a double newline, followed by  */
+        $headers = [];
+        foreach (explode("\n", $blocks[0]) as $headerLine) {
+            $parts = explode(":", trim($headerLine), 2);
+            if (count($parts) !== 2) {
+                continue;
+            }
+
+            [$id, $value] = $parts;
+            $headers[$id][] = trim($value);
+        }
+
+        $body = $blocks[1] ?? '';
+        $grouped[$headers['type'][0] ?? '_'][] = new Segment(
+            headers: $headers,
+            body: $body,
+        );
+    }
+
+    return $grouped;
+}
+
+/**
+ * @param array<string, Segment[]> $segments
+ */
+function parseSegments(array $segments): array
+{
+    $meta = $segments['meta'][0] ?? throw new ValueError('Segment "meta" cannot be found');
+
+    $examples = [];
+    foreach ($segments['example'] ?? [] as $example) {
+        $label = $example->getSingleHeader('label', '');
+        $target = $example->getSingleHeader('target', '');
+
+        if ($label === '' && $target !== '') {
+            $targetFilters = [
+                '<=' => '%s or Before',
+                '>=' => '%s or Later',
+                '<' => 'Before %s',
+                '>' => 'After %s',
+            ];
+
+            foreach ($targetFilters as $searchKey => $englishKey) {
+                if (str_starts_with($target, $searchKey)) {
+                    $label = str_replace('%s', 'PHP ' . substr($target, strlen($searchKey)), $englishKey);
+                    break;
+                }
+            }
+        }
+
+        if ($label === '' && $target !== '') {
+            $label = $target . ' or Later';
+        }
+
+        if ($label === '') {
+            $label = 'Example';
+        }
+
+        $examples[] = [
+            'label' => $label,
+            'target' => $target,
+            'format' => $example->getSingleHeader('format', 'php'),
+            'body' => $example->body,
+        ];
+    }
+
+    return [
+        'title' => $meta->getSingleHeader('title', 'Example'),
+        'about' => ($segments['about'][0] ?? null)?->body,
+        'short' => ($segments['short'][0] ?? null)?->body,
+        'rfs' => $meta->getHeader('rfc'),
+        'examples' => $examples,
+    ];
+}
+
+function parseDirectory(string $path): array
+{
+    $examples = [];
+
+    foreach (scandir($path) as $fileName) {
+        if (!str_ends_with($fileName, '.txt')) {
+            continue;
+        }
+
+        $examples[] = parseSegments(readSegmentedFile($path . '/' . $fileName));
+    }
+
+    return $examples;
+}
+
+$baseDir = __DIR__ . '/../data/releases';
+$releaseComparisons = [];
+
+foreach (scandir($baseDir) as $fileName) {
+    $dirName = $baseDir . '/' . $fileName;
+    if ($fileName[0] === '.') {
+       continue;
+    }
+
+    $releaseComparisons[$fileName] = parseDirectory($dirName . '/highlights');
+}
+
+file_put_contents(
+    __DIR__ . '/../include/releases-comparisons.inc',
+    '<?php return ' . var_export($releaseComparisons, true) . ';',
+);

bin/createNewsEntry

@@ -180,6 +180,8 @@ function parseOptions(): Entry {
 		echo "  --conf-time 'value'    When the event will be occurign (cfp and conference categories only)\n";
 		echo "  --content 'value'      Text content for the entry, may include XHTML\n";
 		echo "  --content-file 'value' Name of file to load content from, may not be specified with --content\n";
+        echo "  --summary 'value'      Short, plain-text summary of the content. Should be a single line.\n";
+        echo "  --summary-file 'value' Name of the file to load summary content from, should be a plain-text summary of the content. Should be a single line.\n";
 		echo "  --image-path 'value'   Basename of image file in " . Entry::IMAGE_PATH_REL . "\n";
 		echo "  --image-title 'value'  Title for the image provided\n";
 		echo "  --image-link 'value'   URI to direct to when clicking the image\n";
@@ -238,5 +240,22 @@ function parseOptions(): Entry {
 		exit(1);
 	}
 
+    $summary = $opts['summary'] ?? '';
+    $summaryFile = $opts['summary-file'] ?? '';
+    if ($summary && $summaryFile) {
+        fwrite(STDERR, "--summary and --summary-file may not be specified together\n");
+        exit(1);
+    } elseif ($summaryFile) {
+        $summary = file_get_contents($summaryFile);
+        if ($summary === false) {
+            fwrite(STDERR, "Summary cannot be opened, or must not be empty\n");
+            exit(1);
+        }
+    }
+
+    if ($summary) {
+        $entry->setSummary($summary);
+    }
+
 	return $entry;
 }

bin/createReleaseEntry

@@ -5,6 +5,7 @@ PHP_SAPI == 'cli' or die("Please run this script using the cli sapi");
 require_once __DIR__ . '/../src/autoload.php';
 
 use phpweb\News\Entry;
+use phpweb\ProjectGlobals;
 
 if (!file_exists(Entry::ARCHIVE_FILE_ABS)) {
 	fwrite(STDERR, "Can't find " . Entry::ARCHIVE_FILE_REL . ", are you sure you are in phpweb/?\n");
@@ -50,21 +51,34 @@ $entry = (new Entry)
 $entry->save()->updateArchiveXML();
 $addedFiles = [Entry::ARCHIVE_ENTRIES_REL . $entry->getId() . '.xml'];
 
+$nameWithUnderscores = strtr($version, '.', '_');
+
+/*
+ * Release announcements are stored as HTML within the data/releases/major.minor/announcements
+ * folder as plain HTML files, and are then included as part of other page templates
+ */
+$announcementsDir = ProjectGlobals::getDataPathForRelease($branch);
+$announcementPath = $announcementsDir . '/' . $nameWithUnderscores . '.html';
+
+is_dir($announcementsDir) or mkdir($announcementsDir, recursive: true);
+file_put_contents($announcementPath, $template);
+$addedFiles[] = $announcementPath;
+
 // Mint the releases/x_y_z.php archive.
 const RELEASES_REL = 'releases/';
 const RELEASES_ABS = __DIR__ . '/../' . RELEASES_REL;
 if (isset($opts['r'])) {
-	$release = strtr($version, '.', '_') . '.php';
-	file_put_contents(RELEASES_ABS . $release, "<?php
-\$_SERVER['BASE_PAGE'] = 'releases/$release';
-include_once __DIR__ . '/../include/prepend.inc';
-site_header('PHP $version Release Announcement');
-?>
-<h1>PHP $version Release Announcement</h1>
+    /*
+     * The announcement content is no longer embedded straight into a page, instead we
+     * invoke a page template helper, passing in the release version, and it figures
+     * the rest out itself
+     */
+	$release = $nameWithUnderscores . '.php';
+	file_put_contents(
+        RELEASES_ABS . $release,
+        str_replace('{{version}}', $version, file_get_contents(__DIR__ . '/templates/announcement-archive.txt'))
+    );
 
-$template
-<?php site_footer();
-");
 	$addedFiles[] = RELEASES_REL . $release;
 }
 

bin/move-release-announcements.php

@@ -0,0 +1,64 @@
+<?php
+
+PHP_SAPI == 'cli' or die("Please run this script using the cli sapi");
+
+/*
+ * Release announcements previously were output directly as
+ * PHP pages to /releases/major_minor_patch.php including the rendering
+ * of the header and footer.
+ *
+ * The script moves the underlying data into HTML files within the data
+ * directory, which can then be picked up dynamically and rendered via
+ * templates rather than plain files.
+ */
+
+$originalDir = realpath(__DIR__ . '/../releases');
+$replacementTemplate = file_get_contents(__DIR__ . '/templates/announcement-archive.txt');
+
+foreach (scandir($originalDir) as $file) {
+    if (!preg_match('/^(\d+_\d+_\d+)(?:_([a-zA-Z]+)).php$/', $file, $matches)) {
+        continue;
+    }
+    $lang = $matches[2] ?? '';
+
+    $fullPath = $originalDir . '/' . $file;
+    [$major, $minor, $patch] = explode('_', $matches[1]);
+
+
+    $saveDir = __DIR__ . '/../data/releases/' . $major . '.' . $minor . '/announcements';
+    is_dir($saveDir) || mkdir($saveDir, recursive: true);
+
+    $content = file_get_contents($fullPath)
+        ?: throw new RuntimeException('Unable to open file: ' . $fullPath);
+
+    /* if the content has already been migrated */
+    if (str_contains($content, 'handle_release_announcement')) {
+        continue;
+    }
+
+    $htmlStartToken = '?>';
+    $htmlStartPosition = strpos($content, $htmlStartToken);
+    if ($htmlStartPosition === false) {
+        throw new RuntimeException('Unable to find PHP closing tag in ' . $fullPath);
+    }
+
+    $htmlStartPosition+= strlen($htmlStartToken);
+
+    $htmlEndToken = '<?php';
+    $htmlEndingPosition = strpos($content, $htmlEndToken, $htmlStartPosition);
+    if ($htmlEndingPosition === false) {
+        throw new RuntimeException('Unable to find PHP opening tag in ' . $fullPath);
+    }
+
+    $htmlContent = substr(
+        $content,
+        $htmlStartPosition,
+        $htmlEndingPosition - $htmlStartPosition);
+
+    $savePath = $saveDir . '/' . $major . '_' . $minor . '_' . $patch . ($lang ? "_$lang"  : '') .'.html';
+    file_put_contents($savePath, trim($htmlContent));
+
+    /* the original file gets modified to use a version-specific template */
+    $code = str_replace('{{version}}', $major . '.' . $minor . '.' . $patch, $replacementTemplate);
+    file_put_contents($fullPath, $code);
+}

bin/news2html

@@ -2,6 +2,8 @@
 <?php
 PHP_SAPI == 'cli' or die("Please run this script using the cli sapi");
 
+require_once __DIR__ . '/util.php';
+
 // get args
 $cmd = array_shift($_SERVER['argv']);
 
@@ -109,3 +111,10 @@ if ($changelog) {
 	$log = str_replace($tag, "$tag\n\n$contents", $log);
 	file_put_contents($changelog, $log);
 }
+
+[$major, $minor] = explode($version, '.');
+$branch = $major.'.'.$minor;
+NewsParsingHelper::writeChangeMetaToBranch(
+        branch: $branch,
+        data: NewsParsingHelper::parseNewsFileToString($branch, $news_file),
+);