Landing Revamp 2026 (Draft)

.docker/dev/Dockerfile

@@ -0,0 +1,46 @@
+# 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
+
+#
+# install additional development tooling
+#
+RUN apt update  \
+    && apt-get install -y --no-install-recommends git unzip \
+    && rm -rf /var/lib/apt/lists/*
+
+#
+# Composer is required for dev dependencies
+#
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
+    && php -r "if (hash_file('sha384', 'composer-setup.php') === 'c8b085408188070d5f52bcfe4ecfbee5f727afa458b2573b8eaaf77b3419b0bf2768dc67c86944da1544f06fa544fd47') { echo 'Installer verified'.PHP_EOL; } else { echo 'Installer corrupt'.PHP_EOL; unlink('composer-setup.php'); exit(1); }" \
+    && php composer-setup.php \
+    && php -r "unlink('composer-setup.php');" \
+    && mv composer.phar /usr/local/bin/composer
+
+#
+#  node.js - used for socket.dev and other front-end tooling
+#
+RUN apt-get update && apt-get install -y curl gnupg ca-certificates \
+    && mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+    && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
+    && apt-get update && apt-get install -y nodejs \
+    && rm -rf /var/lib/apt/lists/*
+
+#
+# Global dependencies and tools brought in via npm
+#
+RUN npm install -g socket
+
+WORKDIR /app

.docker/prod/Dockerfile

@@ -0,0 +1,13 @@
+# "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.4-cli
+
+# All of the files from the source location are copied into
+# the /app folder
+RUN mkdir /app
+WORKDIR /app
+COPY . /app

.dockerignore

@@ -0,0 +1,7 @@
+# .dockerignore
+.git
+.gitmodules
+.gitattributes
+.idea
+build-deploy.sh
+/var/composer

.gitignore

@@ -10,3 +10,6 @@ node_modules/
 /playwright-report/
 /blob-report/
 /playwright/.cache/
+/releases/[0-9]*_[0-9]*_[0-9]*.php
+/releases/[0-9]*_[0-9]*_[0-9]*_fr.php
+/releases/[0-9]*_[0-9]*_[0-9]*_win32.php

.router.php

@@ -4,12 +4,38 @@
 
 $filename = $_SERVER["PATH_INFO"] ?? $_SERVER["SCRIPT_NAME"];
 
-if (!file_exists($_SERVER["DOCUMENT_ROOT"] . $filename)) {
+$wantedPath = realpath($_SERVER["DOCUMENT_ROOT"] . $filename);
+if ($wantedPath === false || !str_starts_with($wantedPath, __DIR__ . '/')) {
     require_once __DIR__ . '/error.php';
 
     return;
 }
 
+/**
+ * Unfortunately, we do not yet have a dedicated public folder, meaning the entire directory
+ * structure is exposed.
+ *
+ * These rules try and lock it down some.
+ */
+foreach ([
+    '.git/*',
+    '.docker/*',
+    '.devcontainer/*',
+    '.github/*',
+    'backend/*',
+    'bin/*',
+    'data/*',
+    'src/*',
+    'tests/*',
+    'var/*',
+    '*.inc', // do not allow any .inc files
+] as $testRule) {
+    if (fnmatch(__DIR__ . '/' . $testRule, $wantedPath, FNM_CASEFOLD)) {
+        header('HTTP/1.0 403 Access Denied');
+        die('Access Denied');
+    }
+}
+
 /* This could be an image or whatever, so don't try to compress it */
 ini_set("zlib.output_compression", 0);
 return false;

bin/build.php

@@ -0,0 +1,40 @@
+<?php
+
+use phpweb\Build\BuildGlobals;
+use phpweb\Build\BuildStepFailureException;
+use phpweb\Releases\Build\ReleasePagesBuilder;
+use phpweb\Releases\ChangeLogs\ChangeLogDataLoader;
+use phpweb\Releases\Data\ReleaseAnnouncementsDataLoader;
+use phpweb\Releases\Data\ReleaseHighlightsDataLoader;
+use phpweb\Releases\ReleaseRawDataLoader;
+
+(PHP_SAPI === 'cli') or die("Please run this script using the cli sapi");
+
+require_once __DIR__ . '/../src/autoload.php';
+
+$buildSteps = [
+    ReleaseRawDataLoader::class,
+    ChangeLogDataLoader::class,
+    ReleaseHighlightsDataLoader::class,
+    ReleaseAnnouncementsDataLoader::class,
+    ReleasePagesBuilder::class,
+];
+
+/* protect us against doing silly things */
+BuildGlobals::$building = true;
+
+foreach ($buildSteps as $classId) {
+    printf("Building step %s\n", $classId);
+
+    try {
+        $classId::build();
+    } catch (BuildStepFailureException $e) {
+        fwrite(STDERR, 'Error building ' . $classId . ': ' . $e->getMessage());
+        exit(1);
+    } catch (Throwable $e) {
+        fwrite(STDERR, 'Unhandled exception building ' . $classId . ': ' . $e->getMessage() . "\n");
+        fwrite(STDERR, $e->getTraceAsString() . "\n");
+        die($e);
+        exit(1);
+    }
+}

bin/bumpRelease

@@ -3,20 +3,18 @@
 (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";
 
 if ($_SERVER['argc'] < 1) {
 	fwrite(STDERR, "Usage: {$_SERVER['argv'][0]} major_version [ minor_version ]\n");
 	exit(1);
 }
 
 $major = (int) $_SERVER['argv'][1];
-isset($RELEASES[$major]) or die("Unknown major version $major");
+isset(get_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);
-$info = $RELEASES[$major][$version] ?? null;
+$info = get_releases()[$major][$version] ?? null;
 
 if ($info === null) {
 	fwrite(STDERR, "Unable to find a current PHP release for {$major}.{$minor}\n");
@@ -34,7 +32,7 @@ $OLDRELEASES[$major] = array_merge(
 );
 
 file_put_contents(__DIR__ . "/../include/releases.inc", [
-	"<?php\n\$OLDRELEASES = ",
+	'<?php' . PHP_EOL . PHP_EOL . 'return ',
 	var_export($OLDRELEASES, true),
 	";\n",
 ]);

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,33 @@ $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, create: true);
+$announcementPath = $announcementsDir . '/' . $nameWithUnderscores . '.html';
+
+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/migrations/migrate-news.php

@@ -0,0 +1,103 @@
+<?php
+
+/**
+ * Warning! Here be horrible, horrible hacks.
+ *
+ * Creates news files retroactively by pulling from GIT repositories
+ *
+ * Because this repository itself, nor any given php-src branch, has a complete record
+ * of the individual NEWS files in raw data, to be able to create them as serialized data,
+ * we have to fetch them from the github repository.
+ *
+ * We do this by looking for the most up-to-date release of each branch, which
+ * should theoretically contain the full set of release notes.
+ *
+ * THIS SCRIPT ONLY COPIES THE NOTES INTO THE RELEVANT DATA FOLDER, IT STILL
+ * REQUIRES RUNNING THE BUILD SCRIPT TO MAKE THEM VISIBLE
+ */
+
+use phpweb\ProjectGlobals;
+use phpweb\Releases\ChangeLogs\ChangeLogDataLoader;
+use phpweb\Releases\ReleaseRawDataLoader;
+use phpweb\Util\FS;
+use phpweb\Utils;
+
+PHP_SAPI == 'cli' or die("Please run this script using the cli sapi");
+
+require_once __DIR__ . '/../../src/autoload.php';
+
+$branches = [];
+foreach (ReleaseRawDataLoader::readReleaseDataDirectoriesFromDisk() as $versionId => $releases) {
+    /*
+     * Look for the most recent version as it's the one most likely to have the fullest
+     * set of data within it
+     */
+
+    $highestVersion = null;
+    foreach (array_keys($releases) as $releaseId) {
+        [$major, $minor] = explode('.', $releaseId);
+
+        $br = $major . '.' . $minor;
+        $highestVersion = (!$highestVersion || Utils::versionCompareOp($releaseId, $highestVersion, 'gt'))
+            ? $releaseId
+            : $highestVersion;
+    }
+
+    if (!$highestVersion) {
+        printf("Warning! There is no highest release of " . $versionId . " available; skipping\n");
+        continue;
+    }
+
+    $cachePath = sys_get_temp_dir() . '/php-news-' . $highestVersion . '.txt';
+    if (!file_exists($cachePath)) {
+        /* the file could be in one of a number of locations depending on how it was committed */
+        $options = [
+            /* normal branch */
+            'https://raw.githubusercontent.com/php/php-src/refs/heads/PHP-' . $highestVersion . '/NEWS',
+
+            /* tag */
+            'https://raw.githubusercontent.com/php/php-src/refs/tags/php-' . $highestVersion . '/NEWS',
+        ];
+
+        foreach ($options as $fetchUrl) {
+            $content = @file_get_contents($fetchUrl);
+            if (!$content) {
+                fwrite(STDERR, "Could not read raw data for $fetchUrl\n");
+                continue;
+            }
+
+            fwrite(STDOUT, "Successfully imported read data from $fetchUrl\n");
+            FS::writeContents($cachePath, $content);
+        }
+
+        if (!$content) {
+            fwrite(STDERR, "Could not find a suitable data source for $highestVersion\n");
+            continue;
+        }
+    } else {
+        $content = FS::readContents($cachePath);
+    }
+
+    /*
+     * We should now, theoretically, have a complete news file that has the highest release and
+     * everything before it.
+     *
+     * Some of them have a ton of data before, some get reset at the start of each major.minor version
+     */
+    foreach (ChangeLogDataLoader::parseNewsFileToReleaseSections($content) as $releaseId => $data) {
+        /* only write the sections that belong to us */
+        if (!str_starts_with($releaseId, $versionId . '.')) {
+            continue;
+        }
+
+        /* special case for 5.1.0 which doesn't have the release in the original NEWS */
+        if ($releaseId === '5.1') {
+            $releaseId = '5.1.0';
+        }
+
+        $path =  ProjectGlobals::getDataPathForRelease($releaseId, create: true) . '/changes.txt';
+        if (FS::writeContentsIfChanged($path, $data)) {
+            printf("Writing NEWS block to %s %s\n", $path, md5($data));
+        }
+    }
+}